发布v2.6.8版本

webmain/system/table/rock_table_list.php

@@ -4,7 +4,7 @@ $(document).ready(function(){
 	
 	var a = $('#view_{rand}').bootstable({
 		tablename:'table',fanye:true,modedir:'{mode}:{dir}',storebeforeaction:'tablebefore',celleditor:true,
-		cellurl:js.getajaxurl('tablesm','{mode}','{dir}'),
+		cellurl:js.getajaxurl('tablesm','{mode}','{dir}'),storeafteraction:'tableafter',
 		columns:[{
 			text:'表名',dataIndex:'id',sortable:true
 		},{
@@ -19,12 +19,19 @@ $(document).ready(function(){
 			text:'字符集',dataIndex:'TABLE_COLLATION'
 		},{
 			text:'更新时间',dataIndex:'gxsj',sortable:true
+		},{
+			text:'操作',dataIndex:'gengxin',renderer:function(v,d){
+				return '<input type="button" onclick="up{rand}.dbupdatess(\''+d.id+'\',-1)" id="table{rand}_'+d.id+'" class="btn btn-default btn-xs" value="更新" />';
+			}
 		}],
 		itemclick:function(){
 			btn(false);
 		},
 		beforeload:function(){
 			btn(true);
+		},
+		loadbefore:function(d){
+			$('#dbupurl_{rand}').val(d.dbupurl);
 		}
 	});
 	
@@ -45,9 +52,48 @@ $(document).ready(function(){
 			a.setparams({
 				key:get('key_{rand}').value
 			},true);
+		},
+		dbupdate:function(){
+			//js.msg('success', '暂无功能');return;
+			this.data = a.getData();
+			this.dbupdates(0);
+		},
+		dbupdates:function(i){
+			var d = this.data[i]
+			if(!d){
+				js.msg('success', '更新完成');
+				return;
+			}
+			js.msg('wait', '更新中('+this.data.length+'/'+(i+1)+')'+d.id+'...');
+			this.dbupdatess(d.id, i);
+		},
+		dbupdatess:function(tab, i){
+			var o = get('table{rand}_'+tab+'');
+			if(o){
+				o.disabled = true
+				o.value='更新中..';
+			}
+			js.ajax(js.getajaxurl('dbupdate','{mode}','{dir}'), {tab:tab}, function(ret){
+				if(ret.success){
+					o.value=ret.data;
+					if(i>-1)c.dbupdates(i+1)
+				}else{
+					o.value='失败';
+					js.msg('msg', ret.msg);
+				}	
+			},'get,json');
+		},
+		savedbupurl:function(o){
+			var dz = o.value;
+			js.ajax(js.getajaxurl('savedbupurl','{mode}','{dir}'), {dz:jm.base64encode(dz)});
 		}
 	};
 	js.initbtn(c);
+	$('#dbupurl_{rand}').blur(function(){
+		c.savedbupurl(this)
+	})
+	
+	up{rand} = c
 });
 </script>
 
@@ -63,14 +109,16 @@ $(document).ready(function(){
 		<button class="btn btn-default" click="search" type="button">搜索</button>
 	</td>
 	
-	<td  width="80%" style="padding-left:10px">
+	<td  width="80%" style="padding-right:10px">
 		
 		
 	</td>
 	
 	
 	<td align="right" nowrap>
-		<button class="btn btn-info" id="edit_{rand}" click="clickwin,1" disabled type="button"><i class="icon-edit"></i> 编辑 </button>&nbsp;
+		<input class="form-control" style="width:180px" id="dbupurl_{rand}"  placeholder="默认更新地址">&nbsp;
+		<button class="btn btn-info" click="dbupdate" type="button">一键更新</button>&nbsp;
+		<button class="btn btn-info" id="edit_{rand}" click="clickwin,1" disabled type="button"><i class="icon-edit"></i> 表结构 </button>&nbsp;
 		<button class="btn btn-default" id="kanbtn_{rand}" click="kanjili" disabled type="button">查看记录</button>
 	</td>
 	</tr>
@@ -79,4 +127,4 @@ $(document).ready(function(){
 </div>
 <div class="blank10"></div>
 <div id="view_{rand}"></div>
-<div class="tishi">数据库表格管理请谨慎操作！</div>
+<div class="tishi">数据库表格管理请谨慎操作，一键更新，只是更新表结果。</div>

webmain/system/table/tableAction.php

@@ -20,6 +20,13 @@ class tableClassAction extends Action
 		);
 	}
 	
+	public function tableafter($table, $rows)
+	{
+		return array(
+			'dbupurl' => m('option')->getval('dbupurl')
+		);
+	}
+	
 	//保存表备注
 	public function tablesmAjax()
 	{
@@ -123,8 +130,43 @@ class tableClassAction extends Action
 				);
 			}
 		}
+		foreach($rows as $k=>$rs){
+			foreach($rs as $k1=>$v1){
+				if($v1===null){
+					$rows[$k][$k1]='NULL';
+					$rows[$k][''.$k1.'_color']='#aaaaaa';
+				}
+			}
+		}
 		return array(
-			'fieldsarr' => $fieldsar
+			'fieldsarr' => $fieldsar,
+			'rows' => $rows,
 		);
 	}
+	
+	public function savedbupurlAjax()
+	{
+		$dz = $this->get('dz');
+		$dz = $this->jm->base64decode($dz);
+		m('option')->setval('dbupurl', $dz);
+		return 'ok';
+	}
+	
+	public function dbupdateAjax()
+	{
+		$url = m('option')->getval('dbupurl');
+		if(!$url)return returnerror('未设置更新地址');
+		if(substr($url,0,4)!='http')return returnerror('更新地址有问题');
+		$tab  = $this->get('tab');
+		$tab  = str_replace(PREFIX,'', $tab);
+		$url .= 'api.php?m=login&a=dbinfo&tab='.$tab.'&xinhukey='.getconfig('xinhukey').'';
+		$result = c('curl')->getcurl($url);
+		if(substr($result, 0, 1)!='{')return returnsuccess($result);
+		$msg  = m('beifen')->updatefabric($result);
+		if($msg=='ok'){
+			return returnsuccess('已更新');
+		}else{
+			return returnsuccess($msg);
+		}
+	}
 }