2
0

25 Ревизии 125366c788 ... ac2c5ffc1e

Автор SHA1 Съобщение Дата
  wu ac2c5ffc1e Merge branch 'master' of http://git.dever.cc:3000/dever-package/manage into fengyong преди 8 месеца
  rabin 6eaf9ad02b edit преди 11 месеца
  rabin bb778395fd edit преди 1 година
  rabin 57a79f3904 edit преди 1 година
  rabin 0e0e58e7cd edit преди 1 година
  rabin cca7cec92a edit преди 1 година
  rabin 56471ec093 edit преди 1 година
  rabin ecce423773 edit преди 1 година
  rabin 258fd91eee edit преди 1 година
  rabin ffe64b3691 edit преди 1 година
  rabin 7dfca0aa0f edit преди 1 година
  rabin 01b5fb2746 edit преди 1 година
  rabin c7577fd83d edit преди 1 година
  rabin 4aab239b3f edit преди 1 година
  rabin 684346f7bc edit преди 1 година
  rabin 3f4b579ac2 edit преди 1 година
  rabin 8e52ce2a40 edit преди 1 година
  rabin 9904a5aa62 edit преди 1 година
  rabin 5b0de91ff3 edit преди 1 година
  rabin a80dc7a2bd edit преди 1 година
  rabin a2c1a9febe edit преди 1 година
  rabin aae27681f4 edit преди 1 година
  rabin 1c0c680430 edit преди 1 година
  rabin 27ccf55050 edit преди 1 година
  rabin 1a443ebb03 edit преди 1 година

+ 2 - 2
assets/layadmin/html/inc/script.html

@@ -16,7 +16,7 @@
 <script type="text/javascript" src="../script/lib/valid/jquery.validationEngine.min.js?v3"></script>
 
 <!-- 加载文本编辑器 -->
-<script type="text/javascript" src="../script/lib/kindeditor/kindeditor-all-min.js?v9"></script>
+<script type="text/javascript" src="../script/lib/kindeditor/kindeditor-all-min.js?v10"></script>
 <script type="text/javascript" src="../script/lib/kindeditor/lang/zh-CN.js?v7"></script>
 
 <script type="text/javascript" src="../script/lib/ui/ui.min.js"></script>
@@ -41,4 +41,4 @@
 <script type="text/javascript" src="../script/lib/layui/xm-select/xm-select.js"></script>
 
 <!-- 加载主要js,很乱,后续优化 -->
-<script type="text/javascript" src="../script/lib/manage/main.js?720"></script>
+<script type="text/javascript" src="../script/lib/manage/main.js?728"></script>

+ 2 - 0
assets/layadmin/html/project/database/update.html

@@ -58,6 +58,8 @@
     <input type="hidden" name="fast" id="fast" />
     <input type="hidden" name="dever_submit" id="dever_submit" />
     <input type="hidden" name="menu_id" id="menu_id" />
+    <input type="hidden" name="mul_ids" id="mul_ids" />
+    <input type="hidden" name="mul_load" id="mul_load" />
     <input type="hidden" name="update_where_id" id="update_where_id"/>
     <input type="hidden" name="copy_num" id="copy_num" value="0"/>
     <iframe id="f1" name="f1" style="display:none;"></iframe>

+ 32 - 17
database/admin.php

@@ -1,7 +1,7 @@
 <?php
 /*
 |--------------------------------------------------------------------------
-| admin.php 管理员
+| admin.php 账户
 |--------------------------------------------------------------------------
 */
 # 定义几个常用的选项
@@ -34,7 +34,7 @@ if($cur && $cur['role'] > 1)
 		'role_id' => implode(',', $child),
 	));
 
-	# 配置当前列表页的参数 只能查看自己下属的管理员
+	# 配置当前列表页的参数 只能查看自己下属的账户
 	Dever::$global['model']['manage/admin-list'] = array
 	(
 		'option' => array
@@ -102,7 +102,7 @@ return array
 	# 表名
 	'name' => 'admin',
 	# 显示给用户看的名称
-	'lang' => '管理账户设置',
+	'lang' => '账户管理',
 	'desc' => $desc,
 	# 表类型 值为\innodb\myisam\,默认为innodb,仅在mysql类型有效
 	'type' => 'innodb',
@@ -152,7 +152,7 @@ return array
 	# 显示到后台快捷发布中,值为排序
 	'fast' => 1,
 	*/
-	'order' => 9,
+	'order' => 100,
 
 	# 检测email必须唯一
 	'check' => 'email',
@@ -169,6 +169,7 @@ return array
 			'type' => 'delete',
 		),
 
+		/*
 		'manage/admin_group' => array
 		(
 			# 更新时的条件,另外一个表的字段 => 本表的字段
@@ -177,7 +178,7 @@ return array
 			'update' => array('group_id' => 'group'),
 			# 同步更新的类型,delete为先删再插入,update为先查询是否存在,存在直接更新,不存在则插入, only为仅更新
 			'type' => 'delete',
-		)
+		)*/
 	),
 	/*
 	# 查询出数据时,填充默认数据
@@ -229,7 +230,7 @@ return array
 		'id' 		=> array
 		(
 			'type' 		=> 'int-11',
-			'name' 		=> '管理员ID',
+			'name' 		=> '账户ID',
 			'default' 	=> '',
 			'desc' 		=> '',
 			'match' 	=> 'is_numeric',
@@ -250,9 +251,9 @@ return array
 		'username'		=> array
 		(
 			'type' 		=> 'varchar-24',
-			'name' 		=> '管理员名',
+			'name' 		=> '账户名',
 			'default' 	=> '',
-			'desc' 		=> '请输入管理员名',
+			'desc' 		=> '请输入账户名',
 			'match' 	=> 'is_string',
 			'update'	=> 'text',
 			# 自动完成功能,第一个参数是请求的地址,请自行实现,第二个参数是要使用的字段,共有id和value两个选择,id会特殊处理,value则直接把当前值写入,第三个参数是直接替换当前的值,第四个参数是当前表里的字段名,一般为分类的id
@@ -273,7 +274,7 @@ return array
 		'email'		=> array
 		(
 			'type' 		=> 'varchar-150',
-			'name' 		=> '邮箱-可用于登录,请准确填写,不允许重复',
+			'name' 		=> '登录邮箱',
 			'default' 	=> '',
 			'desc' 		=> '请输入邮箱',
 			'match' 	=> Dever::rule('email'),
@@ -635,7 +636,7 @@ return array
 		'mobile'		=> array
 		(
 			'type' 		=> 'varchar-32',
-			'name' 		=> '手机号',
+			'name' 		=> '登录手机号',
 			'default' 	=> '',
 			'desc' 		=> '请输入手机号',
 			'match' 	=> Dever::rule('mobile'),
@@ -650,9 +651,9 @@ return array
 		'password'		=> array
 		(
 			'type' 		=> 'varchar-64',
-			'name' 		=> '管理员密码',
+			'name' 		=> '账户密码',
 			'default' 	=> '',
-			'desc' 		=> '请输入管理员密码',
+			'desc' 		=> '请输入账户密码',
 			'match' 	=> 'option',
 			'update'	=> 'password',
 			'callback'	=> 'hash.sha256',
@@ -661,9 +662,9 @@ return array
 		'config'		=> array
 		(
 			'type' 		=> 'int-11',
-			'name' 		=> '人性化配置',
+			'name' 		=> '后台配置',
 			'default' 	=> '1',
-			'desc' 		=> '个性化配置',
+			'desc' 		=> '后台配置',
 			'match' 	=> 'is_numeric',
 			'option' 	=> $config,
 			'update'	=> 'select',
@@ -699,7 +700,7 @@ return array
 			'desc' 		=> '请选择所属部门',
 			'match' 	=> 'option',
 			'option' 	=> $company_group,
-			'update'	=> 'checkbox',
+			//'update'	=> 'checkbox',
 			/*
 			'option' 	=> $company,
 			'update'	=> 'checkbox',
@@ -718,11 +719,23 @@ return array
                     'update_search' => 'scm_product/lib/manage.searchProduct?{id}{role,company}',
                 ),
 			),*/
-			'list'		=> 'Dever::load("manage/company.getGroupName", "{company}", "{group}")',
+			'list'		=> 'Dever::load("manage/company.getGroupName", {id})',
 			# 取代option,从接口里读取选项
 			//'update_search' => 'goods/lib/manage.search_sku',
 		),
 
+		'manage/admin_group'=> array
+        (
+            'name'      => '公司部门设置',
+            'default'   => '',
+            'desc'      => '公司部门设置',
+            'match'     => 'option',
+            # 同步更新另外一个表的内容,两个表相关联的id,更新另一个表的字段
+            'sync'      => array('admin_id' => 'id'),
+            'update'    => array(1),
+            'update_type' => 2,
+        ),
+
 		'auth'		=> array
 		(
 			'type' 		=> 'text-255',
@@ -802,6 +815,8 @@ return array
 
 	'manage' => array
 	(
+		'insert_end' => 'manage/group.syncOne',
+		'update_end' => 'manage/group.syncOne',
 		# 开放子管理权限,该列表和所有操作都有权限控制
 		//'auth' => true,
 		# 设置公司权限
@@ -907,7 +922,7 @@ return array
         (
             //'新增兑换码' => array('fast', 1, 'config&where_id=1'),
             '公司设置' => array('list', 'company&oper_parent=admin'),
-            '部门设置' => array('list', 'group&oper_parent=admin'),
+            //'部门设置' => array('list', 'group&oper_parent=admin'),
         ),
 	),
 	

+ 57 - 7
database/admin_group.php

@@ -4,7 +4,11 @@
 | admin.php 管理员表
 |--------------------------------------------------------------------------
 */
-
+$type = array
+(
+	1 => '普通员工',
+	2 => '部门主管',
+);
 return array
 (
 	# 表名
@@ -12,6 +16,11 @@ return array
 	# 显示给用户看的名称
 	'lang' => '管理员部门关联表',
 	'menu' => false,
+	'end' => array
+	(
+		'insert' => 'manage/group.update',
+		'update' => 'manage/group.update',
+	),
 
 	# 数据结构
 	'struct' => array
@@ -34,19 +43,60 @@ return array
 			'default' 	=> '',
 			'desc' 		=> '管理员ID',
 			'match' 	=> 'is_numeric',
-			'update'	=> 'text',
-			'list'		=> true,
+			'update'	=> 'hidden',
+			//'list'		=> true,
+			'value'		=> Dever::input('search_option_admin_id'),
+		),
+
+		'company'		=> array
+		(
+			'type' 		=> 'varchar-800',
+			'name' 		=> '公司与部门',
+			'default' 	=> '',
+			'desc' 		=> '公司与部门',
+			'match' 	=> 'is_numeric',
+			'search'	=> 'linkage',
+			'update'	=> 'linkage',
+			'option'	=> Dever::url('group.get', 'manage'),
+		),
+
+		'company_id'		=> array
+		(
+			'type' 		=> 'int-11',
+			'name' 		=> '公司',
+			'default' 	=> '',
+			'desc' 		=> '公司',
+			'match' 	=> 'is_numeric',
 		),
 
 		'group_id'		=> array
 		(
 			'type' 		=> 'int-11',
-			'name' 		=> '部门ID',
+			'name' 		=> '部门',
 			'default' 	=> '',
-			'desc' 		=> '部门ID',
+			'desc' 		=> '部门',
 			'match' 	=> 'is_numeric',
-			'update'	=> 'text',
-			'list'		=> true,
+		),
+
+		'type'		=> array
+		(
+			'type' 		=> 'int-11',
+			'name' 		=> '类型',
+			'default' 	=> '1',
+			'desc' 		=> '类型',
+			'match' 	=> 'is_numeric',
+			'option' 	=> $type,
+			'update'	=> 'radio',
+			//'list'		=> true,
+		),
+
+		'state'		=> array
+		(
+			'type' 		=> 'tinyint-1',
+			'name' 		=> '状态',
+			'default' 	=> '1',
+			'desc' 		=> '请选择状态',
+			'match' 	=> 'option',
 		),
 		
 		'cdate'		=> array

+ 1 - 0
database/api.php

@@ -40,6 +40,7 @@ return array
 	'html' => $html,
 	'doc' => $doc,
 	'gettype' => $type,
+	'menu' => false,
 	# 数据结构
 	'struct' => array
 	(

+ 31 - 3
database/company.php

@@ -82,7 +82,19 @@ return array
             'show'      => 'is_project=2',
             //'list'      => true,
         ),
-        
+
+        'manage/group'=> array
+        (
+            'name'      => '部门设置',
+            'default'   => '',
+            'desc'      => '部门设置',
+            'match'     => 'option',
+            # 同步更新另外一个表的内容,两个表相关联的id,更新另一个表的字段
+            'sync'      => array('company_id' => 'id'),
+            'update'    => array(1),
+            'update_type' => 2,
+        ),
+         
         'state'     => array
         (
             'type'      => 'tinyint-1',
@@ -116,6 +128,8 @@ return array
     # 管理功能
     'manage' => array
     (
+        'insert_check' => 'manage/group',
+        'update_check' => 'manage/group',
         'delete' => false,
         'insert' => false,
         'edit' => false,
@@ -123,12 +137,12 @@ return array
         # 自定义快捷新增和编辑
         'button' => array
         (
-        '新增' => array('fast'),
+            '新增' => array('fast'),
         ),
         # 快捷更新
         'list_button' => array
         (
-        'edit' => array('编辑'),
+            'edit' => array('编辑'),
         ),
     ),
 
@@ -157,5 +171,19 @@ return array
             'order' => array('id' => 'asc'),
             'col' => '*',
         ),
+
+        'getAll' => array
+        (
+            # 匹配的正则或函数 选填项
+            'option' => array
+            (
+                'ids' => array('yes-id', 'in'),
+                'noid' => array('yes-id', 'not in'),
+                'state' => 1,
+            ),
+            'type' => 'all',
+            'order' => array('id' => 'desc'),
+            'col' => 'id,id as value, name',
+        ),
     ),
 );

+ 13 - 2
database/config.php

@@ -37,8 +37,9 @@ return array
 	# 表名
 	'name' => 'config',
 	# 显示给用户看的名称
-	'lang' => '个性化配置',
-	'order' => 10,
+	'lang' => '后台配置',
+	'order' => 70,
+	'info' => '后台配置设置之后,每个后台账户会根据该配置展示信息',
 	# 数据结构
 	'struct' => array
 	(
@@ -188,6 +189,16 @@ return array
 	),
 	*/
 
+	'manage' => array
+	(
+		'link' => 'parent=config',
+		'button' => array
+        (
+            '后台公告' => array('list', 'notice'),
+            '后台帮助' => array('list', 'help'),
+        ),
+	),
+
 	# 默认值
 	'default' => array
 	(

+ 1 - 0
database/cron.php

@@ -47,6 +47,7 @@ return array
 	1. 常规任务:请将 ```* * * * * root php '.$path.'daemon/main.php``` 放到cron中[建议每分钟执行一次] 
 	2. 用户触发:请在 ```config/base.php里开启cron=true``` [一般适用于虚拟主机]
 	3. 长期运行:请执行 ```php '.$path.'daemon/loop.php 1>/dev/null 2>&1 &``` 指令,放置后台运行[一般用于队列等需要长期运行的项目]'),
+	'menu' => false,
 	# 数据结构
 	'struct' => array
 	(

+ 21 - 20
database/group.php

@@ -10,16 +10,6 @@ $option = array
 	1 => '可用',
 	2 => '不可用',
 );
-$company = function()
-{
-    $array = array();
-    $data = Dever::db('manage/company')->state();
-    if($data)
-    {
-        $array += $data;
-    }
-    return $array;
-};
 $area = function()
 {
 	return Dever::load('setting/area-getAll', array('where_area_id_parent' => 0));
@@ -52,15 +42,11 @@ $config = array
 		'company_id'      => array
         (
             'type'      => 'int-11',
-            'name'      => '选择公司',
+            'name'      => '公司名称',
             'default'   => '',
             'desc'      => '公司名称',
             'match'     => 'is_numeric',
-            'update'    => 'radio',
-            'list_name' => '公司名称',
-            'option'    => $company,
-            'list'      => true,
-            'search'    => 'select',
+            'update'    => 'hidden',
         ),
 		
 		'name'		=> array
@@ -91,14 +77,14 @@ $config = array
 		'reorder'		=> array
 		(
 			'type' 		=> 'int-11',
-			'name' 		=> '排序',
+			'name' 		=> '排序-数字越大越靠前',
 			'default' 	=> '1',
 			'desc' 		=> '请输入排序',
 			'match' 	=> 'option',
-			//'update'	=> 'text',
-			//'search'	=> 'order',
+			'update'	=> 'text',
+			'search'	=> 'order',
 			//'list'		=> true,
-			//'order'		=> 'desc',
+			'order'		=> 'desc',
 			//'edit'		=> true,
 		),
 
@@ -179,6 +165,21 @@ $config = array
             'order' => array('id' => 'desc'),
             'col' => '*',
         ),
+
+        'getAll' => array
+		(
+			# 匹配的正则或函数 选填项
+			'option' => array
+			(
+				'company_id' => 'yes',
+				'ids' => array('yes-id', 'in'),
+				'noid' => array('yes-id', 'not in'),
+				'state' => 1,
+			),
+			'type' => 'all',
+			'order' => array('id' => 'desc'),
+			'col' => 'id,id as value, name',
+		),
     ),
 );
 

+ 3 - 2
database/help.php

@@ -21,8 +21,9 @@ return array
     # 表名
     'name' => 'help',
     # 显示给用户看的名称
-    'lang' => '帮助管理',
-    'order' => 6,
+    'lang' => '后台帮助',
+    'order' => 68,
+    'menu' => false,
     # 数据结构
     'struct' => array
     (

+ 9 - 1
database/log.php

@@ -29,7 +29,7 @@ return array
 	# 表名
 	'name' => 'log',
 	# 显示给用户看的名称
-	'lang' => '管理操作日志',
+	'lang' => '操作日志',
 	# 关闭验证重复提交功能
 	'submit' => false,
 	'config_type' => $type,
@@ -41,6 +41,7 @@ return array
 		'value' => array(2000,2010),//分区的值
 		'exp' => 'LESS THEN',//LESS THEN还是in等表达式
 	),
+	'order' => 66,
 
 	# 表类型 值为\innodb\myisam\,默认为innodb,仅在mysql类型有效
 	//'type' => 'innodb',
@@ -183,6 +184,13 @@ return array
 		'delete' => false,
 		'edit' => false,
 		'insert' => false,
+		'link' => 'parent=log',
+		'button' => array
+        (
+            '字段记录' => array('list', 'opt'),
+            '计划任务' => array('list', 'cron'),
+            '接口列表' => array('list', 'api'),
+        ),
 	),
 	
 	# 索引

+ 2 - 2
database/menu.php

@@ -60,8 +60,8 @@ return array
 	# 表名
 	'name' => 'menu',
 	# 显示给用户看的名称
-	'lang' => '管理菜单设置',
-	'order' => 2,
+	'lang' => '菜单管理',
+	'order' => 80,
 	'check' => 'key',
 	'end' => array
 	(

+ 2 - 2
database/menu_group.php

@@ -56,7 +56,7 @@ return array
 		(
 			'type' 		=> 'varchar-100',
 			'name' 		=> '图标代码-请<a href="'.$link.'" target="_blank">点此</a>查看图标代码',
-			'default' 	=> 'glyphicon glyphicon-folder-close',
+			'default' 	=> '',
 			'desc' 		=> '请输入图标代码',
 			'match' 	=> 'is_string',
 			//'option' 	=> $icon,
@@ -103,7 +103,7 @@ return array
 		'col' => 'name,reorder,state,cdate',
 		'value' => array
 		(
-			'"基本功能",1,1,' . DEVER_TIME,
+			'"主页",1,1,' . DEVER_TIME,
 		),
 	),
 	

+ 3 - 2
database/notice.php

@@ -21,8 +21,9 @@ return array
 	# 表名
 	'name' => 'notice',
 	# 显示给用户看的名称
-	'lang' => '后台公告管理',
-	'order' => 7,
+	'lang' => '后台公告',
+	'order' => 69,
+	'menu' => false,
 	# 数据结构
 	'struct' => array
 	(

+ 2 - 1
database/opt.php

@@ -45,12 +45,13 @@ return array
 	# 表名
 	'name' => 'opt',
 	# 显示给用户看的名称
-	'lang' => '字段记录表',
+	'lang' => '字段日志',
 	'desc' => Dever::markdown('**本表记录所有数据表文件里的request方法:**
 	1. 启用本表的记录功能,不会影响所有业务逻辑的执行效率,但会消耗服务器资源。建议仅在测试环境下开启或短时间内开启。请在config/base项中添加opt来确定是否启用。 
 	2. 在这里可以根据相应的记录,手动添加索引。'),
 	# 表类型 值为\innodb\myisam\,默认为innodb,仅在mysql类型有效
 	'type' => 'innodb',
+	'menu' => false,
 	# 数据结构
 	'struct' => array
 	(

+ 2 - 2
database/role.php

@@ -110,9 +110,9 @@ $config = array
 	# 表名
 	'name' => 'role',
 	# 显示给用户看的名称
-	'lang' => '管理角色设置',
+	'lang' => '角色管理',
 	'desc' => $desc,
-	'order' => 8,
+	'order' => 90,
 	# 表类型 值为\innodb\myisam\,默认为innodb,仅在mysql类型有效
 	'type' => 'innodb',
 	# 数据结构

+ 3 - 2
src/Auth.php

@@ -31,8 +31,8 @@ class Auth
      */
     public function __construct()
     {
-        $this->save = new Oper(false, 'cookie');
-        $this->name = md5('manage_' . Dever::config('host')->host);
+        $this->save = new Oper(false, 'session');
+        $this->name = md5('manage_in_' . Dever::config('host')->host);
     }
 
     public function test()
@@ -364,6 +364,7 @@ class Auth
         }
 
         if ($user && $user['password'] == $password) {
+            $user = $this->real($user);
             $this->save($user);
 
             $refer = Dever::input('refer');

+ 38 - 12
src/Company.php

@@ -7,10 +7,11 @@ use Manage\Src\Lib\Save;
 class Company extends Save
 {
     private $company = array();
+
     # 获取当前权限
     public function getAuth()
     {
-        $auth = Dever::load('manage/auth')->info();
+        $auth = Dever::load('manage/auth')->data();
         if ($auth && $auth['company']) {
             
             return $auth['company'];
@@ -230,20 +231,45 @@ class Company extends Save
         return 'ok';
     }
 
-    public function getGroupName($company, $group)
+    public function getGroupName($id)
     {
-        if (!$group) {
-            return '';
-        }
-        $html = array();
-        $where['ids'] = $group;
-        $group = Dever::db('manage/group')->getData($where);
-        foreach ($group as $k => $v) {
-            $html[] = $v['name'];
+        $data = Dever::db('manage/admin_group')->select(array('admin_id' => $id));
+
+        if ($data) {
+            $company = array();
+            foreach ($data as $k => $v) {
+                $company[$v['company_id']][] = $v['group_id'];
+            }
+
+            if ($company) {
+                $result = array();
+                foreach ($company as $k => $v) {
+                    $info = Dever::db('manage/company')->find($k);
+                    $group = array();
+                    foreach ($v as $k1 => $v1) {
+                        $temp = Dever::db('manage/group')->find($v1);
+                        $group[$v1] = $temp['name'];
+                    }
+                    $result[$info['name']] = implode(',', $group);
+                }
+
+                return Dever::table($result);
+            }
         }
 
-        $html = implode(',', $html);
+        return '';
+    }
+
+    public function showGroup_api()
+    {
+        $value = Dever::input('value');
+        $data = array();
+        $config['group_id'] = Dever::db('manage/admin_group')->config['struct']['group_id'];
+        $config['group_id']['update'] = 'select';
+        $config['group_id']['option'] = 'manage/group.search?company_id=' . $value;
 
-        return $html;
+        $data = Dever::load('manage/database')->update_struct(array('struct' => $config), false, $data, -1, '', false, false);
+        
+        return $data;
     }
 }

+ 38 - 12
src/Database.php

@@ -514,6 +514,8 @@ class Database
             'parent' => '',
             'parent_value' => Dever::input('parent'),
             'alias' => Dever::input('alias'),
+            'mul_ids' => Dever::input('mul_ids'),
+            'mul_load' => Dever::input('mul_load'),
         );
 
         if ($this->parent) {
@@ -1457,12 +1459,15 @@ class Database
                     $url .= '&manage_log=update.' . $this->project . '.' . $this->table . '&manage_oper=' . $k;
                     $result .= '&nbsp;&nbsp;<a class="btn btn-default layui-btn layuiadmin-btn-list layui-btn-danger" href="javascript:;" onclick="load(\'' . $url . '\', \'' . $content . '\', \'' . $title . '\')">' . $k . '</a>';
                 } elseif ($v[0] == 'oper_mul') {
-                    $url = Dever::url($v[1]);
-                    if (!isset($v[2])) {
-                        $v[2] = 1;
+                    if (isset($v[2])) {
+                        $url = $this->url($v[1], false, false, $suffix);
+                        $result .= '&nbsp;&nbsp;<a class="btn btn-default layui-btn layuiadmin-btn-list" href="javascript:;" onclick="fastEdit($(this),\''.$url.'\',\''.$k.'\', \''.$v[2].'\', false, false, 1, \''.$v[3].'\')">' . $k . '</a>';
+                        //$result .= '&nbsp;&nbsp;<a class="btn btn-default layui-btn layuiadmin-btn-list layui-btn-danger" href="javascript:;" onclick="$(\'#form1\').attr(\'action\', \'' . $this->url('list', false, false, $suffix) . '\');list_mul($(this), 1, \''.$url.'\')">' . $k . '</a>';
+                    } else {
+                        $url = Dever::url($v[1]);
+                        $result .= '&nbsp;&nbsp;<a class="btn btn-default layui-btn layuiadmin-btn-list layui-btn-danger" href="javascript:;" onclick="$(\'#form1\').attr(\'action\', \'' . $this->url('list', false, false, $suffix) . '\');list_mul($(this), 1, \''.$url.'\')">' . $k . '</a>';
                     }
-                    //$url .= '&manage_log=update.' . $this->project . '.' . $this->table . '&manage_oper=' . $k;
-                    $result .= '&nbsp;&nbsp;<a class="btn btn-default layui-btn layuiadmin-btn-list layui-btn-danger" href="javascript:;" onclick="$(\'#form1\').attr(\'action\', \'' . $this->url('list', false, false, $suffix) . '\');list_mul($(this), 1, \''.$url.'\')">' . $k . '</a>';
+                    
                 } elseif ($v[0] == 'show') {
                     $url = Dever::url($v[1]);
                     $submit = '';
@@ -3293,6 +3298,7 @@ class Database
 
             $this->list_search_select($result, $mul, $prefix . 'type' . '" id="' . $prefix . 'type', '请选择要批量操作的数据', $option, $default);
 
+            $state = false;
             foreach ($config['struct'] as $k => $v) {
                 if ($k == 'state' && (!isset($config['manage']['delete']) || (isset($config['manage']['delete']) && $config['manage']['delete']))) {
                     $v['option'] = Dever::config('base')->state;
@@ -3307,6 +3313,7 @@ class Database
                 $select = false;
                 if (isset($v['mul'])) {
                     $select = $v['mul'];
+                    $state = true;
                 } elseif (isset($v['edit'])) {
                     $select = $v['edit'];
                 }
@@ -3322,7 +3329,11 @@ class Database
                 }
             }
 
-            $result .= $btn . $node[1];
+            if ($state) {
+                $result .= $btn . $node[1];
+            } else {
+                $result = '';
+            }
         }
 
         //print_r($result);die;
@@ -3338,7 +3349,7 @@ class Database
         if (isset($data['cur_value'])) {
             if ($value == 'time') {
                 return $data['cur_value'] ? date('Y-m-d H:i', $data['cur_value']) : '-';
-            } elseif (!strstr($value, 'Dever::load') && !strstr($value, '&') && (strstr($value, '/') || strstr($value, '.'))) {
+            } elseif (!strstr($value, 'Dever') && !strstr($value, '&') && !strstr($value, '<br />') && !strstr($value, '{') && (strstr($value, '/') || strstr($value, '.'))) {
                 return $data['cur_value'] ? Dever::load($value, $data['cur_value']) : '-';
             }
         }
@@ -3953,11 +3964,13 @@ class Database
                     $table_header = '<thead><tr>';
                     $table_body = '<tbody>';
                     $table_key = '';
+
                     if (isset($param['option'])) {
+                        $param['value'] = $param['value'] + $param['option'];
                         $table_key = '1';
                         if (isset($param['value']) && $param['value']) {
                             $table_body .= '<tr class="table_copy" style="display:none;">';
-                            $table_up = 'up';
+                            $table_up = 'dever_up';
                         } else {
                             $table_body .= '<tr>';
                             $table_up = 'update';
@@ -3965,7 +3978,7 @@ class Database
                     } else {
                         $table_body .= '<tr class="table_copy" style="display:none;">';
                         $table_key = '-1';
-                        $table_up = 'up';
+                        $table_up = 'dever_up';
                     }
 
                     if ($table_key) {
@@ -4101,7 +4114,7 @@ class Database
                             if ($hv['update'] == 'linkage') {
                                 $hv['update_width'] = '30%';
                             }
-                            $this->update_html($hv, $hk, $hk, array(), $s, '', 'up');
+                            $this->update_html($hv, $hk, $hk, array(), $s, '', 'dever_up');
                             if ($hv['update'] == 'hidden') {
                                 $table_header .= '<td style="display:none;">'.$n.'</td>';
                                 $table_body .= '<td style="display:none;">'.$s.'</td>';
@@ -4433,6 +4446,7 @@ class Database
      */
     public function update_action_commit_api()
     {
+        $mul_ids = Dever::input('mul_ids');
         $key = Dever::input('dever_submit_key');
         $col = Dever::input('col');
         $value = Dever::input('value');
@@ -4776,6 +4790,15 @@ class Database
             //print_r($update_other);die;
             //print_r($config['struct']);die;
 
+            if ($mul_ids) {
+                $mul_load = Dever::input('mul_load');
+                if ($mul_load) {
+                    Dever::load($mul_load, $mul_ids, '', $update[0]);
+                }
+                Dever::out('yes');
+                return;
+            }
+
             $this->checkSpec($config);
             # 增加复制的数量
             $copy_num = Dever::input('copy_num');
@@ -4801,7 +4824,7 @@ class Database
                     $old = $this->load('one', $v['where_id']);
                 }
 
-                if (!$fast && $method == 'insert' && isset($config['manage']['insert_check'])) {
+                if ($method == 'insert' && isset($config['manage']['insert_check'])) {
                     $insert_check = explode(',', $config['manage']['insert_check']);
                     foreach ($insert_check as $k1 => $v1) {
                         if (strstr($v1, '-')) {
@@ -4817,7 +4840,7 @@ class Database
                         }
                     }
                 }
-                if (!$fast && $method == 'update' && isset($config['manage']['update_check'])) {
+                if ($method == 'update' && isset($config['manage']['update_check'])) {
                     $update_check = explode(',', $config['manage']['update_check']);
                     foreach ($update_check as $k1 => $v1) {
                         if (strstr($v1, '-')) {
@@ -4901,6 +4924,9 @@ class Database
                     if ($method == 'insert' && isset($config['manage']['insert_end'])) {
                         Dever::load($config['manage']['insert_end'], $id);
                     }
+                    if ($method == 'update' && isset($config['manage']['update_end'])) {
+                        Dever::load($config['manage']['update_end'], $id);
+                    }
                 }
             }
         }

+ 0 - 4192
src/Database.php.bak.php

@@ -1,4192 +0,0 @@
-<?php
-# 此类很大,以后优化,放到Database目录中,拆分为工厂模式
-# 必须要优化了...当时为了快速实现直接扔这一个里面了,近期优化
-namespace Manage\Src;
-
-use Dever;
-use Manage\Src\Lib\Input as Html;
-use Manage\Src\Lib\Log;
-
-class Database
-{
-    /**
-     * project
-     *
-     * @var string
-     */
-    private $project;
-
-    /**
-     * table
-     *
-     * @var string
-     */
-    private $table;
-
-    /**
-     * menu
-     *
-     * @var string
-     */
-    private $menu;
-
-    /**
-     * menu_id
-     *
-     * @var string
-     */
-    private $menu_id;
-
-    /**
-     * id
-     *
-     * @var string
-     */
-    private $id;
-
-    /**
-     * config
-     *
-     * @var array
-     */
-    private $config;
-
-    /**
-     * search
-     *
-     * @var bool
-     */
-    private $search = false;
-
-    /**
-     * chart
-     *
-     * @var array
-     */
-    private $chart = false;
-
-    /**
-     * __construct
-     *
-     * @return mixed
-     */
-    public function __construct()
-    {
-        $this->setting();
-
-        $this->top = Dever::input('top');
-        if ($this->top) {
-            Dever::load('manage/top.update_action', $this->top);
-        }
-    }
-
-    public function setting()
-    {
-        $this->project = Dever::input('project');
-        $this->table = Dever::input('table');
-        $this->menu = Dever::input('menu');
-        $this->menu_id = Dever::input('menu_id');
-        $this->id = Dever::input('update_where_id', Dever::input('where_id'));
-        $this->name = $this->project . '/' . $this->table;
-
-        return $this;
-    }
-
-    /**
-     * 提供给异步获取数据的接口
-     *
-     * @return array
-     */
-    public function getAjax($data)
-    {
-        $key = Dever::input('key');
-        $value = Dever::input('value');
-        $source = Dever::input('source');
-        
-        $config = Dever::db($source)->config['struct'][$key];
-        $config['value'] = $value;
-        $config['option'] = $data;
-        return $this->create_update_html($key, $config);
-    }
-
-    /**
-     * url
-     *
-     * @return array
-     */
-    public function url($key = false, $id = 0, $table = false, $suffix = '', $project = '', $param = array())
-    {
-        $table = $table ? $table : $this->table;
-
-
-        if (strpos($table, 'http://') !== false || strpos($table, 'javascript') !== false) {
-            return $table;
-        }
-
-        $config = array
-        (
-            'project'           => 'project/database?project=' . $this->project,
-            'list'              => 'project/database/list?{param}',
-            'search'              => 'project/database/list?{param}',
-            'add'               => 'project/database/update?{param}',
-            'update'            => 'project/database/update?{param}&where_id=' . $id,
-            # 增加快捷更新
-            'edit'            => 'project/database/update?{param}&where_id=' . $id,
-            'updateAction'      => 'database.update_action',
-            'url'               => '',
-            'delete'      => 'database.delete_action?{param}&where_id=' . $id,
-            'recovery'    => 'database.recovery_action?{param}&where_id=' . $id,
-            'stat'              => 'project/database/stat?{param}',
-            'excel'             => 'database.list_excel?{param}',
-            'stat_excel'        => 'database.stat_excel?{param}',
-            'reset'              => 'project/database/list?project=' . $this->project . '&table=' . $table . '&menu=' . $this->menu . '&menu_id=' . $this->menu_id,
-            'diy'               => 'list?{param}',
-        );
-        $state = $this->getState();
-        if ($key == 'delete' && $state == 2) {
-            $key = 'recovery';
-        }
-
-        if (strpos($key, 'list') !== false) {
-            $config[$key] = $config['list'];
-        } elseif (strpos($key, 'add') !== false) {
-            $config[$key] = $config['add'];
-        } elseif (strpos($key, 'edit') !== false) {
-            $config[$key] = $config['edit'];
-        }
-
-        if (isset($config[$key])) {
-            if (strpos($config[$key], '{param}')) {
-                $param = $this->getUrlParam($key, $table, $suffix, $state, $project, $param);
-                $config[$key] = str_replace('{param}', $param, $config[$key]);
-            }
-            return Dever::url($config[$key]);
-        }
-        return $config;
-    }
-
-    /**
-     * 获取url需要的参数
-     *
-     * @return string
-     */
-    private function getUrlParam($key, $table, $suffix, $state, $project = '', $input = array())
-    {
-        $index = md5($key . '_' . $project . '_' . $table . '_' . $suffix . '_' . http_build_query($input));
-        if (isset($this->param[$index])) {
-            //return $this->param[$index];
-        }
-        $param = '';
-        $array = array('project', 'search', 'add', 'list', 'update', 'edit');
-        //if (in_array($key, $array) && !strstr($table, 'oper_')) {
-        if (!strstr($table, 'oper_')) {
-            $where = Dever::preInput('search_', $input);
-            if ($where) {
-                if (isset($where['where_id'])) {
-                    //unset($where['where_id']);
-                }
-                unset($where['search_option_state']);
-                $param .= '&' . http_build_query($where);
-            }
-
-            $oper = Dever::preInput('send_', $input);
-            if ($oper) {
-                $param .= '&' . http_build_query($oper);
-            }
-
-            if ($key != 'listData') {
-                $oper = Dever::preInput('oper_', $input);
-                if ($oper) {
-                    $param .= '&' . http_build_query($oper);
-                }
-            }
-
-            $top = Dever::preInput('top_', $input);
-            if ($top) {
-                $param .= '&' . http_build_query($top);
-            }
-        }
-
-        if ($key == 'search' && $search_limit = Dever::input('search_limit')) {
-            $param .= '&search_limit=' . $search_limit;
-        }
-        
-        if (strpos($suffix, 'search_option_state') !== false) {
-            $state = '';
-        } else {
-            $state = '&search_option_state=' . $state;
-        }
-        $page_type = Dever::input('page_type');
-        if ($page_type) {
-            $param .= '&page_type=' . $page_type . '';
-        }
-        $menu_id = Dever::input('menu_id');
-        if ($menu_id && !strstr($param, 'menu_id')) {
-            $param .= '&menu_id=' . $menu_id . '';
-        }
-        if (!$project) {
-            if ($key == 'add' || $key == 'update' || $key == 'delete' || $key == 'recovery') {
-                $project = $this->project;
-            } else {
-                $project = Dever::input('oper_project', $this->project);
-            }
-        }
-        
-        $param = 'project=' . $project . $param . '&table=' . $table . '&menu=' . $this->menu . '&menu_id=' . $this->menu_id . $state . $suffix;
-
-        //echo $key . "\r\n";
-        //echo $param ."\r\n";
-
-        $this->param[$index] = $param;
-
-        return $param;
-    }
-
-    /**
-     * 获得refer
-     *
-     * @return string
-     */
-    private function refer($type = 'project')
-    {
-        return '';
-
-        switch ($type) {
-            case 'project':
-                $name = '数据库操作';
-                break;
-            case 'list':
-                $name = '数据列表';
-                break;
-            case 'url':
-                $name = '项目列表';
-                break;
-        }
-
-        $name = '返回上一级';
-
-        $url = $this->url($type);
-
-        $refer = '-[<a href="' . $url . '">' . $name . '</a>]';
-
-        return $refer;
-    }
-
-    /**
-     * getAdminInfo
-     *
-     * @return array
-     */
-    private function getAdminInfo($data)
-    {
-        $admin = Dever::load('manage/auth.info');
-        $data['my_admin_id'] = $admin['id'];
-        $data['my_role_id'] = $admin['role'];
-        return $data;
-    }
-
-    /**
-     * cookie 处理cookie
-     *
-     * @return array
-     */
-    public function cookie()
-    {
-        $cookie = $_COOKIE;
-        $array = array();
-        # 判断手机版
-        $mobile = Dever::mobile();
-        if ((isset($cookie['left_menu']) && $cookie['left_menu'] == 'close') || $mobile) {
-            $array['wrapper'] = 'enlarged forced';
-        } else {
-            $array['wrapper'] = 'forced';
-        }
-        return $array;
-    }
-
-    /**
-     * listStyle
-     *
-     * @return array
-     */
-    public function listStyle()
-    {
-        $mobile = Dever::mobile();
-        if ($mobile) {
-            $style = '.container_list .panel-heading .form-control,#mul .form-control,#page .form-control
-                {
-                    width:70%;
-                }
-                .row 
-                {
-                    margin-right: -15px; 
-                    margin-left: -15px;
-                }
-                #dever_modal_body img
-                {
-                    max-width:300px;
-                }
-            ';
-        } else {
-            $style = '#dever_modal_body img
-                {
-                    max-width:300px;
-                }';
-        }
-        return $style;
-    }
-
-    /**
-     * info 处理一些基本的信息,供模板使用
-     *
-     * @return array
-     */
-    public function info()
-    {
-        $config = $this->config();
-
-        $menu = isset($config['lang']) ? $config['lang'] : $this->project . '-' . $this->table;
-
-        if (isset($config['state']) && $config['state'] == 2) {
-            $menu .= '[回收站]';
-        }
-
-        $top = Dever::load('manage/top.get');
-        //print_r($top);die;
-
-        $display = '';
-
-        # 新增权限
-        $insert_state = Dever::load('manage/auth.oper', 4);
-
-        if ((isset($config['manage']['insert']) && $config['manage']['insert'] == false) || !isset($config['manage']['insert']) || $insert_state == false) {
-            $display = 'display:none';
-        }
-
-        $info = array
-        (
-            'action' => $this->url('updateAction'),
-            'list' => $this->url('list'),
-            'search' => $this->url('search'),
-            'mul' => $this->url('list'),
-            //'add'                 => 'location.href=\'' . $this->url('add') . '\'',
-            'add' => $this->url('add'),
-            'add_state' => $display,
-
-            'state' => $this->getState(),
-            'l' => 'project/database/list',
-            'project' => $this->project,
-            'table' => $this->table,
-            'menu' => $this->menu,
-            'menu_id' => $this->menu_id,
-            'id' => $this->id,
-            'main' => '数据管理' . $this->refer('url'),
-
-            'list_header' => $menu,
-            'list_desc' => '数据列表',
-            'project_name' => Dever::load('manage/project.name', $this->project),
-            'update_header' => $menu,
-            'update_desc' => '更新数据',
-
-            'updateMul' => (!$this->id && isset($config['manage']['updateMul']) && $config['manage']['updateMul']) ? '增加一条' : false,
-            'updateDesc' => isset($config['manage']['desc']) ? $config['manage']['desc'] : '',
-            'listInfo' => isset($config['info']) ? $config['info'] : '',
-            'listDesc' => isset($config['desc']) ? $config['desc'] : '',
-            'struct' => isset($config['manage']['struct']) ? $config['manage']['struct'] : '',
-            'stat_desc' => '主动统计',
-            'search_param' => '',
-        );
-
-        # 此处为了兼容旧版本的一些设置
-        $info['parent'] = Dever::input('oper_table', Dever::input('oper_parent'));
-
-        # 返回上一页
-        if ($info['parent']) {
-            $oper = Dever::preInput('oper_');
-            if ($oper) {
-                $info['parent'] .= '&' . str_replace('oper_', '', http_build_query($oper));
-            }
-            $search = Dever::preInput('search_');
-            if ($search) {
-                $info['parent'] .= '&' . http_build_query($search);
-            }
-            $send = Dever::preInput('send_');
-            if ($send) {
-                $info['parent'] .= '&' . http_build_query($send);
-            }
-            $top = Dever::preInput('top_');
-            if ($top) {
-                $top_query = http_build_query($top);
-                if (strstr($top_query, '.')) {
-                    foreach ($top as $k => $v) {
-                        $temp = explode('.', $v);
-                        $k = str_replace('top_', '', $k);
-                        $info['parent'] .= '&oper_' . $k . '=' . $temp[0];
-                        if (isset($temp[1])) {
-                            $info['parent'] .= '&top_' . $k . '=' . $temp[1];
-                        }
-                    }
-                } else {
-                    $info['parent'] .= '&' . str_replace('top_', 'oper_', $top_query);
-                }
-            }
-            $info['parent_project'] = Dever::input('oper_project');
-
-            $info['parent'] = $this->url(Dever::input('oper_index', 'listData'), 0, $info['parent'], '', $info['parent_project']);
-            $info['parent_state'] = '';
-        } else {
-            $info['parent_state'] = 'display:none';
-        }
-
-        # 保存页面
-        $info['save'] = Dever::input('oper_save_table', Dever::input('oper_save_jump'));
-        if ($info['save']) {
-            $info['save_project'] = Dever::input('oper_save_project');
-            $info['list'] = $this->url(Dever::input('oper_index', 'list'), 0, $info['save'], '', $info['save_project']);
-        }
-
-        $search = Dever::preInput('search_');
-        if ($search) {
-            $info['mul'] .= '&' . http_build_query($search);
-
-            if (layadmin()) {
-                foreach ($search as $k => $v) {
-                    if (!strstr($k, 'search_option_')) {
-                        if (is_array($v)) {
-                            $v = implode(',', $v);
-                        }
-                        $info['search_param'] .= '<input type="hidden" name="'.$k.'"  value="'.$v.'"/>';
-                    }
-                }
-            }
-        }
-
-        if ($this->id) {
-            $info['update_header'] = $menu . '-更新数据' . $this->refer('list');
-        }
-
-        return $info;
-    }
-
-    /**
-     * 获取表名
-     *
-     * @return array
-     */
-    public function getTableName($project, $table)
-    {
-        if ($project == 'other') {
-            return '无数据表';
-        }
-
-        $path = Dever::load('manage/project.path', $project);
-
-        $config = $this->config($project, $path, $table);
-
-        $data = isset($config['lang']) ? $config['lang'] : $project;
-        return $data;
-    }
-
-    private function getState()
-    {
-        return Dever::input('search_option_state', 1);
-    }
-
-    /**
-     * config
-     *
-     * @return array
-     */
-    public function config($project = false, $path = false, $table = false)
-    {
-        if (!$project) {
-            $project = $this->project;
-            $table = $this->table;
-        }
-        if (!$project) {
-            return array();
-        }
-        Dever::$global['manage']['project'] = $project;
-
-        $config = Dever::load('manage/project.config', $project);
-        if (!is_array($config)) {
-            Dever::alert($project . ' error');
-        }
-        $project = $config['name'];
-
-        if (!$path) {
-            if (isset($config['base']) && isset($config['rel'])) {
-                $path = DEVER_INCLUDE_PATH . $config['rel'];
-            } else {
-                $path = $config['path'];
-            }
-        }
-
-        if ($project && $path && empty($this->config[$path])) {
-            $this->config[$path] = array();
-            $dir = $path . 'database/';
-            if (is_dir($dir)) {
-                $database = scandir($dir);
-
-                foreach ($database as $k => $v) {
-                    if (strpos($v, '.php') !== false) {
-                        $k = str_replace('.php', '', $v);
-                        $this->config[$path][$k] = $this->struct($dir . $v, $project);
-                    }
-                }
-            }
-        }
-
-        return ($table && isset($this->config[$path][$table])) ? $this->config[$path][$table] : $this->config[$path];
-    }
-
-    /**
-     * 对database配置文件进行解析
-     *
-     * @return array
-     */
-    private function struct($file, $project = false)
-    {
-        $config = include $file;
-
-        if (isset($config['struct']) && is_array($config['struct']['id'])) {
-            $config['update'] = false;
-
-            $config['manage']['struct'] = '<table border=1 width=100% height=100%>';
-
-            $config['level'] = 1;
-
-            foreach ($config['struct'] as $k => $v) {
-                if (isset($v['level'])) {
-                    $config['level'] = 3;
-                }
-
-                if (isset($v['search_parent'])) {
-                    $config['manage']['search_parent'][$v['search_parent']] = $k;
-                    $config['manage']['search_child'][$k] = $v['search_parent'];
-                }
-
-                if (!isset($config['search'])) {
-                    if (isset($v['search']) && is_string($v['search'])) {
-
-                        $search = array();
-
-                        if (strpos($v['name'], '-') !== false) {
-                            $t = explode('-', $v['name']);
-                            $v['name'] = $t[0];
-                        }
-                        $search['lang'] = $v['name'];
-                        if ($v['search'] == 'fulltext' && isset($v['match'])) {
-                            $config['request']['list']['option'][$k] = array('option', 'like_score');
-                        }
-
-                        if (isset($v['search_option'])) {
-                            $search['option'] = $v['search_option'];
-                        } elseif (isset($v['exist'])) {
-                            $search['option'] = $v['exist'];
-                        } elseif (isset($v['option'])) {
-                            $search['option'] = $v['option'];
-                        }
-                        
-                        if (isset($v['default'])) {
-                            $search['default'] = $v['default'];
-                        }
-                        if (isset($v['search_after'])) {
-                            $search['after'] = $v['search_after'];
-                        }
-                        if (isset($v['search_name'])) {
-                            $search['lang'] = $v['search_name'];
-                        }
-                        if (isset($v['search_order'])) {
-                            $search['order'] = $v['search_order'];
-                        }
-
-                        $config['manage']['search'][$v['search']][$k] = $search;
-                    } elseif (isset($v['search']) && is_array($v['search'])) {
-                        if (isset($v['search']['api'])) {
-                            $config['manage']['search']['api'][$k] = $v['search'];
-                            $config['manage']['search']['api'][$k]['lang'] = $v['name'];
-                        }
-                    }
-
-                    if (isset($v['search_button'])) {
-                        $config['manage']['search']['button'][$k] = $v['search_button'];
-                    }
-                }
-
-                /*
-                if (isset($v['table']) && !isset($config['end'])) {
-                    $config['end']['insert'] = $v['value'];
-                }
-                */
-
-                
-
-                if (isset($v['update'])) {
-                    if (!isset($config['manage']['insert'])) {
-                        $config['manage']['insert'] = true;
-                    }
-                    $config['update'] = true;
-                }
-
-                if (isset($v['type'])) {
-                    $config['manage']['struct'] .= Dever::tbody(array($k, $v['type'], $v['name']));
-                }
-
-            }
-
-            $config['manage']['struct'] .= '</table>';
-
-            $config['manage']['_list'] = array
-                (
-                'col' => 'manage',
-                'name' => '管理',
-                'value' => array(),
-            );
-
-            if (!isset($config['manage']['edit']) || (isset($config['manage']['edit']) && $config['manage']['edit'] == true)) {
-                if (!isset($config['manage']['list_button']['update'])) {
-                    $config['manage']['_list']['value']['update'] = '编辑';
-                }
-            }
-            
-            if (isset($config['manage']['list'][0]) && is_array($config['manage']['list'][0])) {
-                $config['manage']['_list']['value'] += $config['manage']['list'][0];
-                unset($config['manage']['list'][0]);
-            } elseif (isset($config['manage']['list_button'])) {
-                $config['manage']['_list']['value'] += $config['manage']['list_button'];
-            }
-
-            if (!isset($config['manage']['delete']) || (isset($config['manage']['delete']) && $config['manage']['delete'] == true)) {
-                if (!isset($config['manage']['list_button']['delete'])) {
-                    $config['manage']['_list']['value']['delete'] = '删除';
-                }
-            }
-
-            if (!$config['manage']['_list']['value']) {
-                unset($config['manage']['_list']);
-            }
-
-            if (isset($config['manage']['list_type'])) {
-                $config['manage']['list_table'] = 'html';
-            }
-        }
-
-        $config['state'] = $this->getState();
-        $config['project'] = $project;
-
-        # 新增排序
-        $l = isset($_GET['l']) ? $_GET['l'] : '';
-        if ($l == 'project/database/list' || $l == 'database.list_excel') {
-            $list_order = array();
-            $i = 0;
-            foreach ($config['struct'] as $ki => $vi) {
-                if (isset($vi['list_order'])) {
-                    $list_order[] = $vi['list_order'];
-                } else {
-                    $config['struct'][$ki]['list_order'] = $i;
-                    $list_order[] = $i;
-                }
-                $i++;
-            }
-
-            if ($list_order) {
-                array_multisort($list_order, SORT_ASC, SORT_NUMERIC, $config['struct']);
-            }
-        }
-
-        return $config;
-    }
-
-    /**
-     * 自定义列表页面
-     *
-     * @return array
-     */
-    public function page($key = 'list')
-    {
-        $key = Dever::input('page_value', $key);
-        $type = Dever::input('page_type', 1);
-        $config = $this->config();
-
-        $result = array();
-        $result['s1'] = 'display:none';
-        $result['s2'] = 'display:';
-        $result['content'] = '';
-
-        $key = 'page_' . $key;
-
-        if (isset($config['manage'][$key]) && $type == 1) {
-            if ($config['manage'][$key] == 'photo' && isset($config['manage']['photo'])) {
-                $result['content'] = Dever::view('list/photo', false, 'manage');
-            } else {
-                $result['content'] = Dever::view($config['manage'][$key], 'manage', $this->project);
-            }
-            
-            //echo $result['content'];die;
-            if ($result['content']) {
-                Dever::setInput('page_content', 1);
-                $result['s1'] = 'display:';
-                $result['s2'] = 'display:none';
-
-                # 添加底部
-                if ($key != 'page_list_table') {
-                    $result['content'] .= Dever::view('inc/foot', false, 'manage');
-                }
-            }
-        } elseif (strstr($key, 'list_table')) {
-            Dever::setInput('page_type', 2);
-        }
-
-        return $result;
-    }
-
-    /**
-     * 自定义列表页面
-     *
-     * @return array
-     */
-    public function page_list()
-    {
-        return $this->page('list');
-    }
-
-    /**
-     * 自定义列表页面 只接管table部分,同时必须传值page_type=1
-     *
-     * @return array
-     */
-    public function page_list_table()
-    {
-        $type = Dever::input('page_type', 2);
-        if ($type == 1) {
-            return $this->page('list_table');
-        } else {
-            return $this->page('list_table_default');
-        }
-    }
-
-    /**
-     * 自定义列表页面
-     *
-     * @return array
-     */
-    public function page_update()
-    {
-        return $this->page('update');
-    }
-
-    /**
-     * 载入自定义资源
-     *
-     * @return array
-     */
-    public function res()
-    {
-        $result = array
-        (
-            'js' => '',
-            'css' => '',
-        );
-
-        if (!$this->project) {
-            return $result;
-        }
-        $config = $this->config();
-
-        if (isset($config['manage']['res'])) {
-            foreach ($config['manage']['res'] as $k => $v) {
-                $result[$k] = $this->getRes($k, $v);
-            }
-        }
-
-        return $result;
-    }
-
-    /**
-     * getRes
-     *
-     * @return string
-     */
-    protected function getRes($path, $value)
-    {
-        if (is_array($value)) {
-            $res = '';
-            foreach ($value as $k => $v) {
-                $res .= $this->getRes($path, $v);
-            }
-            return $res;
-        } else {
-            if ($this->project != 'manage') {
-                $base = str_replace('assets/', 'assets/manage/', Dever::config('host', $this->project)->$path);
-            } else {
-                $base = Dever::config('host', $this->project)->$path;
-            }
-            
-            $file = $base . $value . '.' . $path;
-            if ($path == 'js') {
-                $res = '<script type="text/javascript" src="'.$file.'"></script>';
-            } else {
-                $res = '<link rel="stylesheet" type="text/css" href="'.$file.'">
-';
-            }
-            
-            return $res;
-        }
-    }
-
-    /**
-     * 头部banner
-     *
-     * @return array
-     */
-    public function banner()
-    {
-        if (!$this->project) {
-            return '';
-        }
-        $config = $this->config();
-
-        $result = '';
-
-        if (isset($config['manage']['banner'])) {
-            foreach ($config['manage']['banner'] as $k => $v) {
-                $config['manage']['banner'][$k] = $this->value($v, 'yes');
-            }
-            if (empty($config['manage']['banner']['link'])) {
-                $config['manage']['banner']['link'] = '#';
-                $config['manage']['banner']['target'] = '_self';
-            }
-            if (empty($config['manage']['banner']['target'])) {
-                $config['manage']['banner']['target'] = '_blank';
-            }
-            $result = '<a target="' . $config['manage']['banner']['target'] . '" href="' . $config['manage']['banner']['link'] . '"><img src="' . $config['manage']['banner']['img'] . '"></a>
-                    <span>' . $config['manage']['banner']['name'] . '</span>';
-        }
-
-        return $result;
-    }
-
-    /**
-     * 列表页搜索
-     *
-     * @return array
-     */
-    public function list_search_select(&$result, $search, $name, $lang, $option, $default = false, $bind = array(), $parent = '')
-    {
-        $value = array();
-        if (strpos($lang, '-')) {
-            $temp = explode('-', $lang);
-            $lang = $temp[0];
-        }
-        $value['name'] = $name;
-        $value['lang'] = $lang;
-        $value['option'] = $option;
-        if (isset($search[$name])) {
-            $value['value'] = $search[$name];
-        }
-        if ($default) {
-            //$value['default'] = $default;
-        }
-        if ($bind) {
-            $value['bind'] = $bind;
-        }
-        $value['parent'] = $parent;
-        $result .= Html::select($value, false);
-    }
-
-    /**
-     * 列表页搜索
-     *
-     * @return array
-     */
-    public function list_search_group(&$result, $search, $name, $lang, $option, $default = false)
-    {
-        $value = array();
-        $value['name'] = $name;
-        $value['lang'] = $lang;
-        $value['option'] = $option;
-        if (isset($search[$name])) {
-            $value['value'] = $search[$name];
-        }
-        if ($default) {
-            //$value['default'] = $default;
-        }
-        $result .= Html::group($value, false);
-    }
-
-    /**
-     * 列表页搜索
-     *
-     * @return array
-     */
-    public function list_search_linkage(&$result, $search, $name, $lang, $option, $default = false)
-    {
-        $value = array();
-        $value['name'] = $name;
-        $value['lang'] = $lang;
-        $value['option'] = $option;
-        $value['search_state'] = true;
-        if (isset($search[$name])) {
-            $value['value'] = $search[$name];
-        }
-        if ($default) {
-            //$value['default'] = $default;
-        }
-        $result .= Html::linkage($value, 'span');
-    }
-
-    /**
-     * 列表页搜索
-     *
-     * @return array
-     */
-    public function list_search_time(&$result, $search, $prefix, $key, $lang, $type = 'time')
-    {
-        $value['name'] = $prefix . 'option_start_' . $key;
-        $value['lang'] = '>=' . $lang;
-        if (isset($search[$value['name']])) {
-            $value['value'] = Dever::maketime($search[$value['name']]);
-            Dever::setInput($value['name'], $value['value'], 'search_');
-        }
-        $result .= Html::$type($value, false);
-
-        $value['name'] = $prefix . 'option_end_' . $key;
-        $value['lang'] = '<=' . $lang;
-        if (isset($search[$value['name']])) {
-            $value['value'] = Dever::maketime($search[$value['name']]);
-            Dever::setInput($value['name'], $value['value'], 'search_');
-        }
-        $result .= Html::$type($value, false);
-    }
-
-    /**
-     * 列表页头部按钮
-     *
-     * @return array
-     */
-    public function list_button()
-    {
-        if (Dever::load('manage/auth.oper', 2) == false) {
-            return '';
-        }
-
-        $config = $this->config();
-
-        $result = '';
-
-        # 增加主动统计按钮
-        if (isset($config['manage']['stat'])) {
-            $name = '数据统计';
-            if (is_string($config['manage']['stat'])) {
-                $name = $config['manage']['stat'];
-            }
-            $config['manage']['button'][$name] = $this->url('stat');
-        }
-
-        # 增加下载报表按钮
-        if (isset($config['manage']['excel']) && $config['manage']['excel']) {
-            $url = $this->url('excel');
-            if (is_array($config['manage']['excel'])) {
-                foreach ($config['manage']['excel'] as $k => $v) {
-                    if (is_array($v)) {
-                        $name = $v[0];
-                        $u = $url . '&excel_name='.$v[1].'&excel_load=' . $v[2];
-                        $config['manage']['button'][$name] = 'onclick="jump(\''.$u.'\', \'#form1\')"';
-                    } else {
-                        $name = $v;
-                        $config['manage']['button'][$name] = 'onclick="jump(\''.$url.'\', \'#form1\')"';
-                    }
-                }
-            } else {
-                $name = '导出数据';
-                if (is_string($config['manage']['excel']) && !strstr($config['manage']['excel'], '.')) {
-                    $name = $config['manage']['excel'];
-                }
-                $config['manage']['button'][$name] = 'onclick="jump(\''.$url.'\', \'#form1\')"';
-            }
-            
-        }
-        # 增加回收站
-        if (Dever::load('manage/auth.oper', 5) != false && isset($config['struct']['state']) && (!isset($config['manage']['delete']) || (isset($config['manage']['delete']) && $config['manage']['delete'] && isset($config['manage']['_list']['value']['delete'])))) {
-            if ($config['state'] == 2) {
-                $config['manage']['button']['返回数据列表'] = $this->url('list', 0, false, '&search_option_state=1', $this->project);
-            } else {
-                $config['manage']['button']['回收站'] = $this->url('list', 0, false, '&search_option_state=2', $this->project);
-            }
-        }
-
-        # 列表页按钮
-        if (isset($config['manage']['button'])) {
-            $result .= $this->button_list($config['manage']['button']);
-        }
-        /*
-        if (Dever::load('manage/auth.oper', 6) != false && isset($config['manage']['button'])) {
-            $result .= $this->button_list($config['manage']['button']);
-        }*/
-
-        return $result;
-    }
-
-    /**
-     * 更新页按钮
-     *
-     * @return array
-     */
-    public function update_button()
-    {
-        # 新增权限
-        if (Dever::load('manage/auth.oper', 2) == false) {
-            Dever::alert('你没有权限');
-        }
-
-        $info = $this->info();
-
-        $result = '<button type="button" class="btn btn-primary save-data layui-btn layuiadmin-btn-list"><i class="fa fa-save"></i> 提交保存</button>
-            <a href="' . $info['list'] . '" class="btn btn-danger layui-btn layuiadmin-btn-list layui-btn-danger" onclicks="msg({status:1,msg:\'yes\'})">放弃保存</a>';
-
-        $config = $this->config();
-
-        if (isset($config['manage']['update_button']) && $config['manage']['update_button']) {
-            $result = '';
-            foreach ($config['manage']['update_button'] as $k => $v) {
-                if ($v == 'save-data') {
-                    $result .= '<button type="button" class="btn btn-primary save-data layui-btn layuiadmin-btn-list"><i class="fa fa-save"></i> ' . $k . '</button>';
-                } elseif ($v == 'copy-data') {
-                    $result .= '<a href="javascript:;" class="btn btn-danger layui-btn layuiadmin-btn-list layui-btn-danger" onclick="set_update(\'#copy_num\', 1);set_update(\'#update_where_id\', 0);submit_action();">' . $k . '</a>';
-                } elseif ($v == 'copy-datas') {
-                    $result .= '<a href="javascript:;" class="btn btn-danger layui-btn layuiadmin-btn-list layui-btn-danger" onclick="copy_data($(this))">' . $k . '</a>';
-                } else {
-                    $result .= '<a href="javascript:;" class="btn btn-danger layui-btn layuiadmin-btn-list layui-btn-danger" onclick="' . $v . '">' . $k . '</a>';
-                }
-            }
-        }
-
-        return $result;
-    }
-
-    private function button_list($button)
-    {
-        $result = '';
-        $refer = Dever::input('refer');
-        if ($refer) {
-            $button['返回上一页'] = array('location', Dever::decode($refer));
-        }
-        foreach ($button as $k => $v) {
-            if (is_array($v)) {
-                if ($v[0] == 'location') {
-                    if ($v[1] == 'add') {
-                        $url = $this->url('add');
-                    } elseif ($v[1] == 'list') {
-                        $url = $this->url('list');
-                    } else {
-                        $url = Dever::url($v[1]);
-                    }
-                    $result .= '&nbsp;&nbsp;<a class="btn btn-default layui-btn layuiadmin-btn-list" onclick="location.href=\''.$url.'\'">' . $k . '</a>';
-                } elseif ($v[0] == 'excel' || $v[0] == 'search') {
-                    $url = Dever::url($v[1]);
-                    $result .= '&nbsp;&nbsp;<a class="btn btn-default layui-btn layuiadmin-btn-list" href="javascript:;" onclick="jump(\''.$url.'\', \'#form1\')">' . $k . '</a>';
-                } elseif ($v[0] == 'oper') {
-                    $url = Dever::url($v[1]);
-                    $content = '';
-                    if (isset($v[2])) {
-                        $content = $v[2];
-                    }
-                    $title = '';
-                    if (isset($v[3])) {
-                        $title = $v[3];
-                    }
-                    $result .= '&nbsp;&nbsp;<a class="btn btn-default layui-btn layuiadmin-btn-list layui-btn-danger" href="javascript:;"onclick="load(\'' . $url . '\', \'' . $content . '\', \'' . $title . '\')">' . $k . '</a>';
-                } elseif ($v[0] == 'show') {
-                    $url = Dever::url($v[1]);
-                    $submit = '';
-                    if (isset($v[2])) {
-                        $submit = Dever::url($v[2]);
-                    }
-                    
-                    $result .= '&nbsp;&nbsp;<a class="btn btn-default layui-btn layuiadmin-btn-list" onclick="loadPage(\''.$url.'\', \''.$k.'\',\''.$submit.'\')">' . $k . '</a>';
-                } elseif ($v[0] == 'fast') {
-                    if (isset($v[2]) && $v[2]) {
-                        $url = $this->url('add', $v[1], $v[2]);
-                    } elseif (isset($v[1]) && $v[1]) {
-                        $url = Dever::url($v[1]);
-                    } else {
-                        $url = $this->url('add');
-                    }
-                    $result .= '&nbsp;&nbsp;<a class="btn btn-default layui-btn layuiadmin-btn-list" href="javascript:;" onclick="fastEdit($(this),\''.$url.'\',\''.$k.'\', \'\')">' . $k . '</a>';
-                } elseif ($v[0] == 'fasts') {
-                    $result .= '&nbsp;&nbsp;<a class="btn btn-default layui-btn layuiadmin-btn-list" href="javascript:;" onclick="fastEdit($(this),\''.$this->url('add').'\',\''.$k.'\', \'\', 1)">' . $k . '</a>';
-                } elseif ($v[0] == 'onclick') {
-                    $result .= '&nbsp;&nbsp;<a href="javascript:;" class="btn btn-warning layui-btn layuiadmin-btn-list layui-btn-warm" onclick="' . $v[1] . '">' . $k . '</a>';
-                } else {
-                    $result .= '&nbsp;&nbsp;<a class="btn btn-default layui-btn layuiadmin-btn-list" href="' . $this->url($v[0], false, $v[1]) . '">' . $k . '</a>';
-                }
-                
-            } elseif (strpos($v, 'modal|') !== false) {
-                $t = explode('modal|', $v);
-                $result .= '&nbsp;&nbsp;<a href="javascript:;"  class="btn btn-default layui-btn layuiadmin-btn-list" onclick="showAlert(\'' . $t[1] . '\')">' . $k . '</a>';
-            } elseif (strpos($v, '|') !== false) {
-                $t = explode('|', $v);
-                $result .= $t[0] . '&nbsp;&nbsp;<a href="javascript:;" class="btn btn-warning layui-btn layuiadmin-btn-list layui-btn-warm" ' . $t[1] . '>' . $k . '</a>';
-            } elseif (strpos($v, 'onclick') !== false) {
-                $result .= '&nbsp;&nbsp;<a href="javascript:;" class="btn btn-warning layui-btn layuiadmin-btn-list layui-btn-warm" ' . $v . '>' . $k . '</a>';
-            } elseif (strpos($v, 'http://') !== false || strpos($v, 'https://') !== false) {
-                //$result .= '&nbsp;&nbsp;<a href="javascript:;" class="btn btn-default" onclick="jump(\''.Dever::url($v).'\')">'.$k.'</a>';
-                $result .= '&nbsp;&nbsp;<a class="btn btn-default layui-btn layuiadmin-btn-list" href="' . Dever::url($v) . '">' . $k . '</a>';
-            } else {
-                $result .= '&nbsp;&nbsp;<a href="javascript:;" class="btn btn-danger layui-btn layuiadmin-btn-list layui-btn-danger" onclick="load(\'' . Dever::url($v) . '\')">' . $k . '</a>';
-            }
-        }
-
-        return $result;
-    }
-
-    /**
-     * 列表页搜索
-     *
-     * @return array
-     */
-    public function list_search()
-    {
-        # 新增权限
-        if (Dever::load('manage/auth.oper', 2) == false) {
-            return '';
-        }
-
-        $config = $this->config();
-
-        $result = '';
-
-        # 搜索
-        if (isset($config['struct']) && isset($config['manage']['search']) && $config['manage']['search']) {
-            print_r($config['manage']['search']);die;
-            $search = Dever::preInput('search_');
-
-            $node = Html::node(array(' style="margin-top:0px;"', ''));
-
-            $btn = '<div class="layui-inline"><input type="hidden" value="2" name="excel" id="excel">';
-
-            if (isset($config['manage']['search']['button'])) {
-                foreach ($config['manage']['search']['button'] as $k => $v) {
-                    $i = 0;
-                    foreach ($v['option'] as $k1 => $v1) {
-                        $value = $k . '~' . $v['sum'] . '~' . $k1;
-                        if (isset($v['group'])) {
-                            $value .= '~' . $v['group'];
-                        }
-                        if (!isset($search['search_button']) && $i == 0) {
-                            $search['search_button'] = $value;
-                        }
-                        if (isset($search['search_button']) && $search['search_button'] == $value) {
-                            $class = 'layui-btn-normal';
-                        } else {
-                            $class = 'layui-btn-primary';
-                        }
-
-                        $url = $this->url('list', 0, false, '&search_button=' . $value);
-                        $btn .= '<a class="btn btn-primary layui-btn layuiadmin-btn-list '.$class.'" href="'.$url.'" type="button" style="height: 38px;margin-left:0px;margin-top:-2px;">'.$v1.'</a>&nbsp;&nbsp;';
-                    }
-                }
-            }
-
-            $btn .= '<button class="btn btn-primary layui-btn layuiadmin-btn-list" onclick="$(\'#form1\').attr(\'action\', \'' . $this->url('search') . '\');list_search($(this))" type="button" style="height: 38px;margin-left:0px;margin-top:-2px;">搜索</button><a class="btn btn-primary layui-btn layuiadmin-btn-list layui-btn-primary" href=" '. $this->url('reset') . '" type="button" style="height: 38px;margin-right:5px;margin-top:-2px;display:none;">重置</a></div>';
-
-            //$result .= '<form id="f1" action="'.$this->url('list').'" method="post">';
-
-            $prefix = 'search_';
-
-            $result .= $node[0];
-
-            if (isset($config['manage']['search']['linkage'])) {
-                foreach ($config['manage']['search']['linkage'] as $k => $v) {
-                    $this->list_search_linkage($result, $search, $prefix . 'linkage_' . $k, $v['lang'], $this->option($v['option']), $v['default']);
-                    if (!layadmin()) {
-                        $result .= '<br />';
-                    }
-                }
-            }
-
-            if (isset($config['manage']['search']['select'])) {
-                $this->list_search_br($result);
-                foreach ($config['manage']['search']['select'] as $k => $v) {
-                    if (!isset($v['option'])) {
-                        continue;
-                    }
-                    $bind = array();
-                    $parent = '';
-                    $option = $this->option($v['option']);
-                    if (isset($config['manage']['search_parent'][$k])) {
-                        $bind = array
-                        (
-                            'onchange',
-                            'setOption',
-                            'search_option_' . $config['manage']['search_parent'][$k]
-                        );
-                    }
-                    elseif (isset($config['manage']['search_child'][$k])) {
-                        $parent = $config['manage']['search_child'][$k];
-                    }
-                    $this->list_search_select($result, $search, $prefix . 'option_' . $k, $v['lang'], $option, $v['default'], $bind, $parent);
-
-                    if (isset($v['after']) && $v['after']) {
-                        $result .= $v['after'];
-                    }
-                }
-            }
-
-            if (isset($config['manage']['search']['exist'])) {
-                $this->list_search_br($result);
-                foreach ($config['manage']['search']['exist'] as $k => $v) {
-                    if (!isset($v['option'])) {
-                        continue;
-                    }
-                    $this->list_search_select($result, $search, $prefix . 'exist_' . $k, $v['lang'], $this->option($v['option']), '');
-                    if (isset($v['after']) && $v['after']) {
-                        $result .= $v['after'];
-                    }
-                }
-            }
-
-            if (isset($config['manage']['search']['group'])) {
-                $this->list_search_br($result);
-                foreach ($config['manage']['search']['group'] as $k => $v) {
-                    if (!isset($v['option'])) {
-                        continue;
-                    }
-                    $this->list_search_group($result, $search, $prefix . 'option_' . $k, $v['lang'], $this->option($v['option']), $v['default']);
-                    if (isset($v['after']) && $v['after']) {
-                        $result .= $v['after'];
-                    }
-                }
-            }
-
-            if (isset($config['manage']['search']['api'])) {
-                $this->list_search_br($result);
-                foreach ($config['manage']['search']['api'] as $k => $v) {
-                    $value = array();
-                    $value['name'] = $prefix . 'api_' . $k;
-                    $value['class'] = 'form-control';
-                    if (isset($search[$value['name']])) {
-                        $value['value'] = $search[$value['name']];
-                    }
-                    $value['placeholder'] = $v['lang'];
-
-                    if (isset($v['option']) && $v['option']) {
-                        $value['option'] = $this->option($v['option']);
-                        $result .= Html::select($value, false);
-                    } else {
-                        $result .= Html::text($value, false);
-                    }
-
-                    if (isset($v['after']) && $v['after']) {
-                        $result .= $v['after'];
-                    }
-                    
-                }
-            }
-
-            if (isset($config['manage']['search']['text'])) {
-                $this->list_search_br($result);
-                foreach ($config['manage']['search']['text'] as $k => $v) {
-                    $value = array();
-                    $value['name'] = $prefix . 'option_' . $k;
-                    $value['class'] = 'form-control';
-                    if (isset($search[$value['name']])) {
-                        $value['value'] = $search[$value['name']];
-                    }
-                    $value['placeholder'] = $v['lang'];
-                    $result .= Html::text($value, false);
-                    if (isset($v['after']) && $v['after']) {
-                        $result .= $v['after'];
-                    }
-                }
-            }
-
-            if (isset($config['manage']['search']['hidden'])) {
-                $this->list_search_br($result);
-                foreach ($config['manage']['search']['hidden'] as $k => $v) {
-                    $value = array();
-                    $value['name'] = $prefix . 'option_' . $k;
-                    $value['class'] = 'form-control';
-                    if (isset($search[$value['name']])) {
-                        $value['value'] = $search[$value['name']];
-                    }
-                    $value['placeholder'] = $v['lang'];
-                    $value['type'] = 'hidden';
-                    $result .= Html::hidden($value, false);
-                    if (isset($v['after']) && $v['after']) {
-                        $result .= $v['after'];
-                    }
-                }
-            }
-
-            if (isset($config['manage']['search']['ins'])) {
-                $this->list_search_br($result);
-                foreach ($config['manage']['search']['ins'] as $k => $v) {
-                    $value = array();
-                    $value['name'] = $prefix . 'option_' . $k;
-                    $value['class'] = 'form-control';
-                    if (isset($search[$value['name']])) {
-                        $value['value'] = $search[$value['name']];
-                    }
-                    $value['placeholder'] = $v['lang'];
-                    $result .= Html::text($value, false);
-                    if (isset($v['after']) && $v['after']) {
-                        $result .= $v['after'];
-                    }
-                }
-            }
-
-            if (isset($config['manage']['search']['fulltext'])) {
-                $this->list_search_br($result);
-                foreach ($config['manage']['search']['fulltext'] as $k => $v) {
-                    $value = array();
-                    $value['name'] = $prefix . 'fulltext_' . $k;
-                    $value['class'] = 'form-control';
-                    if (isset($search[$value['name']])) {
-                        $value['value'] = $search[$value['name']];
-                    }
-                    
-                    $value['placeholder'] = $v['lang'];
-                    $result .= Html::text($value, false);
-                    if (isset($v['after']) && $v['after']) {
-                        $result .= $v['after'];
-                    }
-                }
-            }
-
-            if (isset($config['manage']['search']['exp'])) {
-                $result .= '<br />';
-
-                $this->list_search_select($result, $search, $prefix . 'exp_col', '选择检索项', $config['manage']['search']['exp']);
-
-                $this->list_search_select($result, $search, $prefix . 'exp_type', '', array
-                (
-                    3 => '大于',
-                    4 => '大于等于',
-                    5 => '小于',
-                    6 => '小于等于',
-                ), 1);
-
-                $value = array();
-                $value['name'] = $prefix . 'exp_value';
-                $value['class'] = 'form-control';
-                if (isset($search[$value['name']])) {
-                    $value['value'] = $search[$value['name']];
-                }
-                $value['placeholder'] = '填写值';
-                $result .= Html::text($value, false);
-            }
-
-            if (isset($config['manage']['search']['day'])) {
-                foreach ($config['manage']['search']['day'] as $k => $v) {
-                    $this->list_search_time($result, $search, $prefix, $k, $v['lang'], 'day');
-                }
-            }
-
-            if (isset($config['manage']['search']['date'])) {
-                foreach ($config['manage']['search']['date'] as $k => $v) {
-                    $this->list_search_time($result, $search, $prefix, $k, $v['lang'], 'date');
-                }
-            }
-
-            if (isset($config['manage']['search']['year'])) {
-                foreach ($config['manage']['search']['year'] as $k => $v) {
-                    $this->list_search_time($result, $search, $prefix, $k, $v['lang'], 'year');
-                }
-            }
-
-            if (isset($config['manage']['search']['month'])) {
-                foreach ($config['manage']['search']['month'] as $k => $v) {
-                    $this->list_search_time($result, $search, $prefix, $k, $v['lang'], 'month');
-                }
-            }
-
-            if (isset($config['manage']['search']['sday'])) {
-                $result .= '<br />';
-                foreach ($config['manage']['search']['sday'] as $k => $v) {
-                    $this->list_search_time($result, $search, $prefix, $k, $v['lang'], 'sday');
-                }
-                $sday = Dever::input('search_option_sday');
-
-                $s1 = $s2 = $s3 = '';
-                if ($sday == 7) {
-                    $s2 = 'sday_button_border';
-                } elseif ($sday == 30) {
-                    $s3 = 'sday_button_border';
-                } elseif ($sday) {
-                    $s1 = 'sday_button_border';
-                }
-                $result .= '<button class="btn btn-primary layui-btn layuiadmin-btn-list layui-btn-primary sday_button '.$s1.'" type="button" style="height: 38px;margin-right:5px;margin-top:-4px;" onclick="setDay($(this), 0)">今日</button>';
-
-                $result .= '<button class="btn btn-primary layui-btn layuiadmin-btn-list layui-btn-primary sday_button '.$s2.'" onclick="setDay($(this), 7)" type="button" style="height: 38px;margin-right:5px;margin-top:-4px;">7日</button>';
-
-                $result .= '<button class="btn btn-primary layui-btn layuiadmin-btn-list layui-btn-primary sday_button '.$s3.'" onclick="setDay($(this), 30)" type="button" style="height: 38px;margin-right:20px;margin-top:-4px;">30日</button><style>.sday_button_border{border-color: #009688;}</style>';
-
-                $result .= '<input type="hidden" name="search_option_sday" id="search_option_sday" value="0">';
-            } elseif (isset($config['manage']['search']['sdate'])) {
-                $result .= '<br />';
-                foreach ($config['manage']['search']['sdate'] as $k => $v) {
-                    $this->list_search_time($result, $search, $prefix, $k, $v['lang'], 'sdate');
-                }
-                $sdate = Dever::input('search_option_sdate');
-
-                $s1 = $s2 = $s3 = '';
-                if ($sdate == 7) {
-                    $s2 = 'sdate_button_border';
-                } elseif ($sdate == 30) {
-                    $s3 = 'sdate_button_border';
-                } elseif ($sdate) {
-                    $s1 = 'sdate_button_border';
-                }
-                $result .= '<button class="btn btn-primary layui-btn layuiadmin-btn-list layui-btn-primary sdate_button '.$s1.'" type="button" style="height: 38px;margin-right:5px;margin-top:-4px;" onclick="setDate($(this), 0)">今日</button>';
-
-                $result .= '<button class="btn btn-primary layui-btn layuiadmin-btn-list layui-btn-primary sdate_button '.$s2.'" onclick="setDate($(this), 7)" type="button" style="height: 38px;margin-right:5px;margin-top:-4px;">7日</button>';
-
-                $result .= '<button class="btn btn-primary layui-btn layuiadmin-btn-list layui-btn-primary sdate_button '.$s3.'" onclick="setDate($(this), 30)" type="button" style="height: 38px;margin-right:20px;margin-top:-4px;">30日</button><style>.sdate_button_border{border-color: #009688;}</style>';
-
-                $result .= '<input type="hidden" name="search_option_sdate" id="search_option_sdate" value="0">';
-            }
-
-            # 列表页按钮
-            if (isset($config['manage']['search_button'])) {
-                $btn .= $this->button_list($config['manage']['search_button']);
-            }
-
-            $result .= $btn . $node[1];
-
-            //$result .= '</form>';
-
-            # 增加每页显示条数
-            $config['manage']['num'] = $this->getNumConfig($config);
-            
-            /*
-            if ($config['manage']['num']) {
-                $result = $this->num($result, $config['manage']['num']);
-            }
-            */
-        }
-
-        //print_r($result);die;
-
-        $oper = Dever::preInput('oper_');
-        if ($oper) {
-            foreach ($oper as $k => $v) {
-                $result .= '<input type="hidden" value="'.$v.'" name="'.$k.'" id="'.$k.'" />';
-            }
-        }
-
-        $top = Dever::input('top_parent');
-        if ($top) {
-            $result .= '<input type="hidden" value="'.$top.'" name="top_parent" id="top_parent" />';
-        }
-
-        $page_type = Dever::input('page_type');
-        if ($page_type) {
-            $result .= '<input type="hidden" value="'.$page_type.'" name="page_type" id="page_type" />';
-        }
-
-        return $result;
-    }
-
-    private function list_search_br(&$result)
-    {
-        if (strpos($result, '&nbsp;&nbsp;') && !strpos($result, '<br />')) {
-            $result .= '<br />';
-        }
-    }
-
-    /**
-     * 获取条数配置
-     *
-     * @return array
-     */
-    private function getNumConfig($config)
-    {
-        if (isset($config['manage']['list_type'])) {
-            return false;
-        }
-        if (isset($config['manage']['num']) && $config['manage']['num'] == false) {
-            return false;
-        }
-        if (!isset($config['manage']['num'])) {
-            $config['manage']['num'] = array(20,30,40,50,60,70,80,90,100);
-        }
-        Dever::config('base')->page_num = $config['manage']['num'];
-        return $config['manage']['num'];
-    }
-
-    /**
-     * 生成条数的html
-     *
-     * @return string
-     */
-    private function num($result, $config)
-    {
-        return $result;
-        $limit = '';
-        $cur = Dever::input('search_limit', 0);
-        foreach($config as $k => $v) {
-            if ($cur == $k) {
-                $btn = 'success';
-            } else {
-                $btn = 'default';
-            }
-            $url = $this->url('list', 0, false, '&search_limit=' . $k);
-            $limit .= '<a href="'.$url.'" style="width:60px;font-weight:bold;" class="btn btn-'.$btn.' layui-btn layui-btn-radius layui-btn-primary">'.$v.'</a> ';
-        }
-         
-        $num = '<div class="form-group layui-inline"><div style="padding-top:10px;margin-bottom: -10px;"><label style="color:#bababa;margin-left:8px;margin-right:10px;font-size:14px;font-weight:bold;">每页显示条数:</label>'.$limit.'</div></div>';
-
-        /*
-        if (layadmin()) {
-            $num = '';
-        }*/
-
-        $result .= $num;
-
-        return $result;
-    }
-
-    /**
-     * 列表页表格头
-     *
-     * @return array
-     */
-    public function list_thead($type = false)
-    {
-        # 新增权限
-        if (Dever::load('manage/auth.oper', 1) == false) {
-            Dever::alert('你没有权限');
-        }
-
-        $config = $this->config();
-
-        if ($type == 'layui') {
-            if (!isset($config['manage']['list_table']) || (isset($config['manage']['list_table']) && $config['manage']['list_table'] == 'html')) {
-                return false;
-            }
-        } else {
-            if (isset($config['manage']['list_table']) && $config['manage']['list_table'] == 'js') {
-                return '';
-            }
-        }
-
-        $result = array();
-
-        if (isset($config['struct'])) {
-            if (isset($config['manage']['list']) && $config['manage']['list'] == 'update') {
-                # 验证头部权限 这里如果是多个选择权限的话,暂时无法实现。。。
-                if (isset($config['top']) && is_string($config['top'])) {
-                    $top = Dever::load('manage/auth.getTop', array($config['top']));
-                    if ($top) {
-                        $url = $this->url('update', $top['value']);
-                    }
-                } else {
-                    $url = $this->url('update', 1);
-                }
-
-                return Dever::location($url);
-            } else {
-                if (isset($config['manage']['mul']) && $config['manage']['mul']) {
-                    if ($type == 'layui') {
-                        $layui = array
-                        (
-                            'field' => 'checkbox',
-                            'title' => '<input type="checkbox" class="checkbox-checkall" name="checkall" id="checkall" value="list" lay-ignore/>',
-                            //'fixed' => 'left',
-                        );
-                        $result[] = $layui;
-                    } else {
-                        $result[] = '<th><input type="checkbox" class="checkbox-checkall" name="checkall" id="checkall" value="list"/></th>';
-                    }
-                }
-                $data = array();
-                $data = $this->getAdminInfo($data);
-                foreach ($config['struct'] as $k => $v) {
-                    if (isset($v['list']) && $v['list']) {
-                        # 处理权限
-                        if (isset($v['auth'])) {
-                            $auth = $this->value($v['auth'], $data);
-                            if (!$auth) {
-                                continue;
-                            }
-                        }
-                        if (isset($v['list_name'])) {
-                            $v['name'] = $v['list_name'];
-                        } else {
-                            $temp = Html::cue(array('name' => $v['name']));
-                            $v['name'] = $temp['name'];
-                        }
-
-                        if (!isset($v['level'])) {
-                            $v['level'] = $config['level'];
-                        }
-
-                        if (isset($v['search']) && is_string($v['search']) && strpos($v['search'], 'order') !== false) {
-                            $link = Dever::url();
-                            $order = 'search_order_' . $k . '';
-                            if (strpos($link, $order) !== false) {
-                                $link = preg_replace('/[?|&]' . $order . '=(desc|asc)/i', '{order}', $link);
-                            } else {
-                                $link .= '{order}';
-                            }
-
-                            $search = Dever::input($order);
-
-                            $cancel = '';
-                            if ($search) {
-                                $asc = $search;
-                                $cancel = '&nbsp;<a class="glyphicon glyphicon-remove-sign layui-icon layui-icon-close" style="color:black;" href="' . str_replace('{order}', '', $link) . '" title="取消排序"></a>';
-                            } else {
-                                $asc = 'desc';
-                                if (!isset($v['order']) && $k != 'id') {
-                                    //$cancel = '&nbsp;<a class="glyphicon glyphicon-circle-arrow-down layui-icon layui-icon-up" style="color:black;" href="' . str_replace('{order}', '&' . $order . '=desc', $link) . '" title="降序"></a>';
-                                }
-                            }
-
-                            if ($asc == 'asc') {
-                                $asc = 'desc';
-                                $icon = 'down';
-                                $text = '降序';
-                            } else {
-                                $asc = 'asc';
-                                $icon = 'up';
-                                $text = '升序';
-                            }
-
-                            $link = str_replace('{order}', '&' . $order . '=' . $asc, $link);
-
-
-                            if ($type == 'layui') {
-                                $layui = array
-                                (
-                                    'field' => $k,
-                                    'title' => '<a href="' . $link . '" title="' . $text . '" style="color:black;">' . $v['name'] . '&nbsp;<span class="layui-icon layui-icon-' . $icon . '" style="font-size:12px"></span></a>',
-                                );
-                                $result[] = $layui;
-                                
-                            } else {
-                                $result[] = '<th data-priority="'.$v['level'].'"><a href="' . $link . '" title="' . $text . '" style="color:black;">' . $v['name'] . '&nbsp;<span class="glyphicon glyphicon-circle-arrow-' . $icon . ' layui-icon layui-icon-' . $icon . '"></span></a>' . $cancel . '</th>';
-                            }
-                            
-                        } else {
-                            
-                            if ($type == 'layui') {
-                                if ($k == 'id' || isset($v['fixed'])) {
-                                    $layui = array
-                                    (
-                                        'field' => $k,
-                                        'title' => $v['name'],
-                                        //'fixed' => 'left',
-                                    );
-                                } else {
-                                    $layui = array
-                                    (
-                                        'field' => $k,
-                                        'title' => $v['name'],
-                                    );
-                                }
-                                if (isset($v['list_header']) && $v['list_header']) {
-                                    $layui += $v['list_header'];
-                                }
-                                $result[] = $layui;
-                            } else {
-                                $result[] = '<th data-priority="'.$v['level'].'">' . $v['name'] . '</th>';
-                            }
-                        }
-                    }
-                }
-                if ((Dever::load('manage/auth.oper', 3) != false || Dever::load('manage/auth.oper', 5) != false) && isset($config['manage']['_list']['value'])) {
-                    if ($type == 'layui') {
-                        $layui = array
-                        (
-                            'field' => $config['manage']['_list']['col'],
-                            'title' => $config['manage']['_list']['name'],
-                            //'fixed' => 'right',
-                        );
-                        $result[] = $layui;
-                    } else {
-                        $result[] = '<th data-priority="1" class="dever-manage">' . $config['manage']['_list']['name'] . '</th>';
-                    }
-                }
-            }
-        }
-
-        return $result;
-    }
-
-    # layui表头
-    public function list_thead_layui()
-    {
-        $html = 'config.table = {};config.table.cols = [];';
-
-        $data = $this->list_thead('layui');
-        if ($data) {
-            $data = array($data);
-            $data = Dever::json_encode($data);
-
-            $html .= 'config.table.cols = ' . $data;
-            return $html;
-        } else {
-            $html .= 'config.table.cols = []';
-            return $html;
-        }
-        
-    }
-
-    # layui表的数据 没有使用其异步方式
-    public function list_tbody_layui()
-    {
-        $html = 'config.table.data = [];';
-
-        $data = $this->list_tbody(false, 'layui');
-        $data = Dever::json_encode($data);
-        $html .= 'config.table.data = ' . $data;
-        return $html;
-    }
-
-    /**
-     * 导出列表
-     *
-     * @return array
-     */
-    public function list_excel_api()
-    {
-        Dever::$global['base']['excel'] = 1;
-        $this->list_search();
-        $data = $this->list_tbody(true);
-        
-        if ($data) {
-            $config = $this->config();
-            if (isset($config['manage']['excel']) && $config['manage']['excel']) {
-                $method = 'excel';
-                $info = $this->info();
-                $load = Dever::input('excel_load');
-                if ($load) {
-                    return Dever::load($load, $data);
-                } elseif (is_string($config['manage']['excel']) && strstr($config['manage']['excel'], '.')) {
-                    return Dever::load($config['manage']['excel'], $data);
-                } else {
-                    $data = $this->getAdminInfo($data);
-                    return $this->excel($info, $data, $config);
-                }
-            }
-        } else {
-            Dever::alert('无导出数据');
-        }
-
-        //print_r($data);die;
-    }
-
-    private function excel($info, $data, $config)
-    {
-        $file = Dever::input('excel_name');
-        if (!$file) {
-            $file = $info['list_header'] . '的' . $info['list_desc'] . '-' . $info['project_name'];
-        }
-
-        $header = $body = array();
-        $i = 0;
-        foreach ($config['struct'] as $k => $v) {
-            if (isset($v['list']) && $v['list']) {
-                # 处理权限
-                if (isset($v['auth'])) {
-                    $auth = $this->value($v['auth'], $data);
-                    if (!$auth) {
-                        continue;
-                    }
-                }
-                //$v['name'] = mb_convert_encoding($v['name'],'gb2312','utf-8');
-                if (isset($v['list_name']) && $v['list_name']) {
-                    $v['name'] = $v['list_name'];
-                }
-                $header[$i] = $v['name'];
-                $j = 0;
-                foreach ($data as $ki => $vi) {
-                    if (is_array($vi)) {
-                        $body[$j][$i] = '';
-                        //if (isset($vi[$k])) {
-                        # 处理同步
-                        if (isset($v['sync']) && strpos($k, '-')) {
-                            $temp = explode('-', $k);
-
-                            if ($vi[$v['sync'][0]] > 0) {
-                                $load = Dever::load($temp[0] . '/' . $temp[1] . '-one', array('option_' . $v['sync'][1] => $vi[$v['sync'][0]]));
-                            } else {
-                                $load = Dever::load($temp[0] . '/' . $temp[1] . '-one', array('option_' . $v['sync'][3] => $vi[$v['sync'][2]], 'option_' . $v['sync'][4] => $vi[$v['sync'][0]]));
-                            }
-                            
-                            $data[$ki][$k] = $vi[$k] = isset($load[$temp[2]]) ? $load[$temp[2]] : $v['default'];
-                        }
-                        if (true) {
-                            $value = $vi[$k];
-
-                            if (is_string($v['list'])) {
-                                $value = $this->value($v['list'], $data[$ki], $config['struct']);
-                            }
-                            if (isset($v['option'])) {
-                                $value = $this->getOptionValue($value, $v);
-                            }
-
-                            //$value = mb_convert_encoding($value,'gb2312','utf-8');
-
-                            $body[$j][$i] = $value;
-                            $j++;
-                        }
-                    }
-                }
-                $i++;
-            }
-        }
-
-        return Dever::excelExport($body, $header, $file);
-    }
-
-    private function getOptionValue($value, $v)
-    {
-        # 验证option是否是匿名函数
-        $v['option'] = $this->option($v['option']);
-        # 位运算
-        if (isset($v['bit'])) {
-            $ts = array();
-            foreach ($v['option'] as $tm => $tv) {
-                if (isset($v['bit'][$tm]) && ($value & $tm) > 0) {
-                    $ts[] = $tv;
-                }
-            }
-            $value = implode(',', $ts);
-        }
-        if ((isset($v['child_name']) || (isset($v['show']) && is_string($v['show'])))) {
-            if (isset($v['option'][$value]) && is_array($v['option'][$value])) {
-                $value = $v['option'][$value]['name'];
-            } else {
-                $value = isset($v['option'][$value]) ? $v['option'][$value] : $value;
-            }
-        } else {
-            if (strstr($value, ',')) {
-                $temp = explode(',', $value);
-                $t = array();
-                foreach ($temp as $vv) {
-                    if (isset($v['option'][$vv]) && is_array($v['option'][$vv])) {
-                        $t[] = $v['option'][$vv]['name'];
-                    } elseif(isset($v['option'][$vv])) {
-                        $t[] = $v['option'][$vv];
-                    } else {
-                        $t[] = $vv;
-                    }
-                }
-                $value = implode("\r\n", $t);
-            } elseif (isset($v['option'][$value]) && is_array($v['option'][$value])) {
-                $value = $v['option'][$value]['name'];
-            } else {
-                $value = isset($v['option'][$value]) ? $v['option'][$value] : $value;
-            }
-        }
-        return $value;
-    }
-
-    private function _getChr($start, $num)
-    {
-        $num = $start + $num;
-        $max = floor($num / 91);
-
-        if ($max > 0) {
-            $num = $num - (91 * $max) + $start;
-            $num = chr($start) . chr($num);
-        } else {
-            $num = chr($num);
-        }
-
-        return $num;
-    }
-
-    /**
-     * 列表页数据列表 检索
-     *
-     * @return array
-     */
-    private function list_tbody_search($config, $param, $high, $search)
-    {
-        # 根据api的数据检索到id
-        $api = Dever::preInput('search_api_');
-        if ($api) {
-            foreach ($api as $k => $v) {
-                if ($v) {
-                    unset($search[$k]);
-                    $k = str_replace('search_api_', '', $k);
-                    # 设定检索高亮
-                    $high[$k] = $v;
-                    if (isset($config['manage']['search']['api'][$k]['api'])) {
-                        $col = $config['manage']['search']['api'][$k]['col'];
-                        $v = ltrim($v);
-                        $v = rtrim($v);
-                        if ($v == 'no') {
-                            $param['option_no'] = $config['manage']['search']['api'][$k]['no'];
-                        } else {
-                            $option = array($col => $v);
-                            $v = Dever::load($config['manage']['search']['api'][$k]['api'], $option);
-                            $result = $config['manage']['search']['api'][$k]['result'];
-                            if ($v && is_array($v)) {
-                                if (isset($v[$result])) {
-                                    $v = $v[$result];
-                                } else {
-                                    if ($result == 'id') {
-                                        $v = array_keys($v);
-                                    } else {
-                                        $t = array();
-                                        foreach ($v as $k1 => $v1) {
-                                            $t[] = $v1[$result];
-                                        }
-                                        $v = $t;
-                                    }
-                                    if (isset($config['manage']['search']['api'][$k]['search'])) {
-                                        $param['option'][$config['manage']['search']['api'][$k]['search']] = array('yes', 'in');
-                                    } else {
-                                        $param['option'][$k] = array('yes', 'in');
-                                    }
-                                }
-                            } else {
-                                $v = '-100';
-                            }
-                        }
-                    }
-
-                    if (!isset($param['option_no'])) {
-                        if (isset($config['manage']['search']['api'][$k]['search'])) {
-                            $param['option_' . $config['manage']['search']['api'][$k]['search']] = $v;
-                        } else {
-                            $param['option_' . $k] = $v;
-                        }
-                    }
-                }
-            }
-        }
-
-        # 检索有无值
-        $exist = Dever::preInput('search_exist_');
-        if ($exist) {
-            foreach ($exist as $k => $v) {
-                if ($v) {
-                    unset($search[$k]);
-                    $k = str_replace('search_exist_', '', $k);
-                    if ($v == 'yes') {
-                        # 有值
-                        $param['option'][$k] = array('yes', '!=');
-                        $param['option_' . $k] = 'null';
-                    } elseif ($v == 'no') {
-                        # 无值
-                        $param['option'][$k] = array('yes', '=');
-                        $param['option_' . $k] = 'null';
-                    } elseif (strpos($v, '|')) {
-                        # 有无值或者自定义的值
-                        $temp = explode('|', $v);
-                        $param['option_' . $k] = $temp[1];
-                        if ($temp[0] == 'yes') {
-                            $param['option'][$k] = array('yes', '!=');
-                            $param['option'][$k . '_t1'] = array('yes-' . $k, '!=');
-                        } else {
-                            $param['option'][$k] = array('yes', '=', 'and(');
-                            $param['option'][$k . '_t1'] = array('yes-' . $k, '=', 'or)');
-                        }
-                        $param['option_' . $k . '_t1'] = 'null';
-                    } else {
-                        # 自定义的值
-                        $param['option_' . $k] = $v;
-                    }
-                }
-            }
-        }
-
-        # 检索in
-        $in = Dever::preInput('search_in_');
-        if ($in) {
-            $in_state = false;
-            foreach ($in as $k => $v) {
-                if ($v) {
-                    unset($search[$k]);
-                    $k = str_replace('search_in_', '', $k);
-                    $param['option'][$k] = array('yes', 'in');
-                    $param['option_' . $k] = $v;
-
-                    # 设定检索高亮
-                    $high[$k] = $v;
-
-                    $in_state = true;
-                }
-            }
-            $this->search = true;
-        }
-
-        $fulltext = Dever::preInput('search_fulltext_');
-        if ($fulltext) {
-            $fulltext_state = false;
-            foreach ($fulltext as $k => $v) {
-                if ($v) {
-                    unset($search[$k]);
-                    $k = str_replace('search_fulltext_', '', $k);
-                    $param['option_' . $k] = $v;
-
-                    # 设定检索高亮
-                    $high[$k] = $v;
-
-                    $fulltext_state = true;
-                }
-            }
-            $this->search = true;
-        }
-
-        $linkage = Dever::preInput('search_linkage_');
-
-        if ($linkage) {
-            foreach ($linkage as $k => $v) {
-                if ($v && $v != -1) {
-                    unset($search[$k]);
-                    $k = str_replace('search_linkage_', '', $k);
-                    if (isset($config['struct'][$k]['search_col'])) {
-                        $temp = explode(',', $config['struct'][$k]['search_col']);
-                        if (!is_array($v)) {
-                            $v = explode(',', $v);
-                        }
-                        foreach ($temp as $k1 => $v1) {
-                            if (isset($v[$k1]) && $v[$k1] != -1) {
-                                $param['option_' . $v1] = $v[$k1];
-                            }
-                        }
-                    } else {
-                        if (is_array($v)) {
-                            $v = implode(',', $v);
-                        }
-                        
-                        if ($v != -1) {
-                            $v = Dever::defaultValue($v);
-
-                            $param['option_' . $k] = $v;
-
-                            # 设定检索高亮
-                            $high[$k] = $v;
-                        }
-                    }
-                }
-            }
-            $this->search = true;
-        }
-
-        $exp = Dever::preInput('search_exp_');
-        if ($exp) {
-            $k = $search['search_exp_col'];
-            $v = $search['search_exp_value'];
-            $param['option_' . $k] = $v;
-            $param['search_type'] = $search['search_exp_type'];
-
-            $this->search = true;
-        }
-
-        $order = Dever::preInput('search_order_');
-        if ($order) {
-            foreach ($order as $k => $v) {
-                $k = str_replace('search_order_', '', $k);
-                $param['order'][0][$k] = $v;
-                unset($search[$k]);
-            }
-        }
-        foreach ($search as $k => $v) {
-            if ($v) {
-                if (strpos($k, '-') !== false) {
-                    $k = str_replace('search_option_', '', $k);
-                    $temp = explode('-', $k);
-                    if (isset($config['struct'][$k]) && isset($config['struct'][$k]['sync'])) {
-                        
-                    }
-                    $sync = $config['struct'][$k];
-                    if ($v[$vi['sync'][0]] > 0) {
-                        $load = Dever::load($temp[0] . '/' . $temp[1] . '-one', array('option_' . $vi['sync'][1] => $v[$vi['sync'][0]]));
-                    } else {
-                        $lw = array('option_' . $vi['sync'][3] => $v[$vi['sync'][2]], 'option_' . $vi['sync'][4] => $v[$vi['sync'][0]]);
-                        $load = Dever::load($temp[0] . '/' . $temp[1] . '-one', $lw);
-                    }
-                    
-                    $data[$k][$ki] = $v[$ki] = isset($load[$temp[2]]) ? $load[$temp[2]] : $vi['default'];
-                } elseif (strpos($k, 'dever_') !== false) {
-                    continue;
-                } elseif (strpos($k, 'option_') !== false) {
-                    //Dever::setInput(str_replace('search_', '', $k), $v);
-                    if (is_array($v)) {
-                        if ($v[0] == 0) {
-                            continue;
-                        }
-                        $v = str_replace(',0', '', implode(',', $v));
-                        $t = explode(',', $v);
-                        $parent = end($t);
-                        $v .= '%';
-                    }
-                    $param[str_replace('search_', '', $k)] = $v;
-                    $this->search = true;
-                } elseif ($k == 'search_limit') {
-                    $num = $this->getNumConfig($config);
-                    if ($num) {
-                        $param['page'][0] = $num[$v];
-                    }
-                }
-            }
-        }
-
-        return array($param, $high);
-    }
-
-    private function list_tbody_mul($send)
-    {
-        $mul = Dever::load('manage/auth.oper', 3) ? Dever::preInput('mul_') : false;
-
-        if (Dever::input('method') == 'mul' && $mul && $mul['mul_type'] > 0) {
-            if ($mul['mul_type'] == 1 && empty($mul['mul_where_id'])) {
-                Dever::alert('您还未选择任何数据条目');
-            }
-            Dever::config('base')->mul_type = $mul['mul_type'];
-            /*
-            if (isset($param['page'])) {
-                unset($param['page']);
-            }
-            */
-            unset($mul['mul_type']);
-            $param = array();
-            foreach ($mul as $k => $v) {
-                if ($v) {
-                    if (is_array($v)) {
-                        $v = implode(',', $v);
-                    }
-                    $param[str_replace('mul_', '', $k)] = $v;
-                }
-            }
-
-            if (isset($param)) {
-                $method = $this->project . '/' . $this->table . '-updatemul';
-                $state = Dever::load($method, $param);
-
-            }
-
-            Dever::alert('reload');
-        }
-    }
-
-    /**
-     * 列表页数据列表:图片形式
-     *
-     * @return array
-     */
-    public function list_photo()
-    {
-        $config = $this->config();
-        $result = array();
-        if (isset($config['manage']['photo'])) {
-
-            $high = array();
-        
-            $search = Dever::load('manage/auth.oper', 2) ? Dever::preInput('search_') : false;
-
-            $param = array();
-
-            $parent = 0;
-            if ($search) {
-                list($param, $high) = $this->list_tbody_search($config, $param, $high, $search);
-            }
-
-            if (empty($param['page'])) {
-                $num = $this->getNumConfig($config);
-                if ($num) {
-                    $param['page'][0] = $num[0];
-                }
-            }
-
-            $method = $this->project . '/' . $this->table . '-list';
-            $result = Dever::load($method, $param);
-            if ($result) {
-                foreach ($result as $k => $v) {
-                    $result[$k] = Dever::load($config['manage']['photo'], $v);
-                    $result[$k]['button'] = $this->list_tbody_button($config, $v, 'div');
-                }
-            }
-        }
-
-        return $result;
-    }
-
-    /**
-     * 列表页数据列表:表格形式
-     *
-     * @return array
-     */
-    public function list_tbody($excel = false, $type = false)
-    {
-        # 新增权限
-        if (Dever::load('manage/auth.oper', 1) == false) {
-            Dever::alert('你没有权限');
-        }
-
-        if (Dever::input('page_content') == 1) {
-            return;
-        }
-
-        $config = $this->config();
-
-        if (!$excel) {
-            if ($type == 'layui') {
-                if (!isset($config['manage']['list_table']) || (isset($config['manage']['list_table']) && $config['manage']['list_table'] == 'html')) {
-                    return array();
-                }
-            } else {
-                if (isset($config['manage']['list_table']) && $config['manage']['list_table'] == 'js') {
-                    return '';
-                }
-            }
-        }
-        
-
-        $high = array();
-        
-        $search = Dever::load('manage/auth.oper', 2) ? Dever::preInput('search_') : false;
-
-        $param = array();
-
-        $parent = 0;
-        if ($search) {
-            list($param, $high) = $this->list_tbody_search($config, $param, $high, $search);
-        }
-
-        $num = $this->getNumConfig($config);
-
-        if (empty($param['page']) && $num) {
-            $param['page'][0] = $num[0];
-        }
-
-        # 批量更新
-        $this->list_tbody_mul($param);
-
-        $result = $return = array();
-
-        if (isset($config['top_option']) && $config['top_option']) {
-            if (isset($config['top_option'][0])) {
-                foreach ($config['top_option'] as $k => $v) {
-                    $param['option'][$v['col']] = array($v['value'], 'in');
-                }
-            } else {
-                $param['option'][$config['top_option']['col']] = array($config['top_option']['value'], 'in');
-            }
-        }
-
-        if ($excel == true) {
-            $method = $this->project . '/' . $this->table . '-list';//all
-        } else {
-            $method = $this->project . '/' . $this->table . '-list';
-        }
-
-        //print_r($param);
-        $data = Dever::load($method, $param);
-        //print_r(Dever::sql());die;
-
-        if (isset($config['manage']['list_type']) && $config['manage']['list_type'] == 'parent') {
-            $parent = array();
-            $child = array();
-            foreach ($data as $k => $v) {
-                if ($v[$config['name'] . '_id'] <= 0) {
-                    $parent[$k] = $v;
-                } else {
-                    $v['name'] = '|-----' . $v['name'];
-                    $child[$v[$config['name'] . '_id']][$k] = $v;
-                }
-            }
-
-            if ($parent) {
-                $data = array();
-                foreach ($parent as $k => $v) {
-                    $data[$v['id']] = $v;
-                    if (isset($child[$v['id']])) {
-                        foreach ($child[$v['id']] as $i => $j) {
-                            $data[$j['id']] = $j;
-                        }
-                    }
-                }
-            }
-        } elseif (isset($config['manage']['list_type']) && $config['manage']['list_type'] == 'tree') {
-            $data = $this->tree($data, $config, -1);
-        }
-
-        if ($excel == true) {
-            return $data;
-        }
-
-        if (Dever::input('page_type') == 1) {
-            Dever::$global['manage']['list_data'] = $data;
-            return;
-        }
-
-        //print_r($data);die;
-        //print_r(Helper::page("current"));die;
-
-        if ($data && isset($config['struct'])) {
-            $i = 0;
-            $pg = Dever::input('pg', 1);
-            $cur = Dever::input('search_limit', 0);
-            
-            foreach ($data as $k => $v) {
-                $data[$k] = $this->getAdminInfo($data[$k]);
-                $data[$k]['i'] = $i;
-                $ii = isset($num[$cur]) ? intval($num[$cur])*($pg-1) : 0;
-                $data[$k]['r'] = $i+1+$ii;
-                $result[$k] = '<tr>';
-                $return[$i] = array();
-
-                if (isset($config['manage']['mul']) && $config['manage']['mul']) {
-                    $mul_state = false;
-                    if ($config['manage']['mul'] && is_string($config['manage']['mul'])) {
-                        $mul_state = $this->value($config['manage']['mul'], $data[$k]);
-                    } else {
-                        $mul_state = true;
-                    }
-                    if ($mul_state) {
-                        $checkbox = '<input type="checkbox" name="mul_where_id[]" class="checkbox-checkall-list" lay-ignore value="' . $v['id'] . '"/>';
-                    } else {
-                        $checkbox = '<input type="checkbox" name="mul_where_id[]" class="checkbox-checkall-list" lay-ignore value="-1" disabled/>';
-                    }
-
-                    $result[$k] .= '<td>'.$checkbox.'</td>';
-                    $return[$i]['checkbox'] = $checkbox;
-                }
-
-                foreach ($config['struct'] as $ki => $vi) {
-                    # 处理同步
-                    if (isset($vi['sync']) && strpos($ki, '-')) {
-                        $temp = explode('-', $ki);
-                        if ($v[$vi['sync'][0]] > 0) {
-                            $load = Dever::load($temp[0] . '/' . $temp[1] . '-one', array('option_' . $vi['sync'][1] => $v[$vi['sync'][0]]));
-                        } else {
-                            $lw = array('option_' . $vi['sync'][3] => $v[$vi['sync'][2]], 'option_' . $vi['sync'][4] => $v[$vi['sync'][0]]);
-                            $load = Dever::load($temp[0] . '/' . $temp[1] . '-one', $lw);
-                        }
-                        
-                        $data[$k][$ki] = $v[$ki] = isset($load[$temp[2]]) ? $load[$temp[2]] : $vi['default'];
-                    }
-
-                    if (isset($vi['list']) && $vi['list']) {
-                        if (empty($v[$ki])) {
-                            $v[$ki] = isset($vi['default']) ? $vi['default'] : '';
-                        }
-                        # 处理权限
-                        if (isset($vi['auth'])) {
-                            $auth = $this->value($vi['auth'], $data[$k]);
-                            if (!$auth) {
-                                continue;
-                            }
-                        }
-
-                        $show = $v[$ki];
-
-                        if (is_string($vi['list'])) {
-                            $show = $this->value($vi['list'], $data[$k], $config['struct']);
-                        }
-                        if (isset($vi['key']) && $vi['update'] != 'editor') {
-                            $show = Dever::upload($show);
-                        }
-                        if (isset($vi['modal'])) {
-                            $show = Html::modal($this->value($vi['modal'], $data[$k], $config['struct']), $show);
-                        } elseif (isset($vi['option']) && !is_string($vi['list'])) {
-                            # 验证option是否是匿名函数
-                            if ((isset($vi['edit']) && $vi['edit'])) {
-                                $vi['option'] = $this->option($vi['option'], $vi['edit']);
-                            } else {
-                                $vi['option'] = $this->option($vi['option']);
-                            }
-                            # 位运算
-                            if (isset($vi['bit'])) {
-                                $ts = array();
-                                foreach ($vi['option'] as $tm => $tv) {
-                                    if (isset($vi['bit'][$tm]) && ($show & $tm) > 0) {
-                                        $ts[] = $tv;
-                                    }
-                                }
-                                $show = implode(',', $ts);
-                            }
-                            if ((isset($vi['child_name']) || (isset($vi['show']) && is_string($vi['show'])))) {
-                                if (isset($vi['option'][$show]) && is_array($vi['option'][$show])) {
-                                    $show = $vi['option'][$show]['name'];
-                                } else {
-                                    $show = isset($vi['option'][$show]) ? $vi['option'][$show] : $show;
-                                }
-                            }
-                            //elseif ($config['state'] == 1 && (isset($vi['edit']) && $vi['edit']) || $ki == 'status')
-                            elseif ($config['state'] == 1 && (isset($vi['edit']) && $vi['edit']))
-                            {
-                                $vi['name'] = 'up_col_' . $ki;
-                                $vi['value'] = $v[$ki];
-                                $m = 'select';
-                                if (isset($vi['update']) && $vi['update'] == 'group') {
-                                    $m = 'group';
-                                }
-
-                                $show_edit = $this->value($vi['edit'], $data[$k], $config['struct']);
-                                if ($show_edit) {
-                                    $show = Html::$m($vi, 'form-list', '', 'style="min-width: 100px;" data-old="'.$show.'" onchange="update($(this), \'' . $v['id'] . '\', \'' . $this->project . '\', \'' . $this->table . '\', \'\', \'' . $this->menu_id . '\')"');
-                                } else {
-                                    if (isset($vi['option'][$show]) && is_array($vi['option'][$show])) {
-                                        $show = $vi['option'][$show]['name'];
-                                    } else {
-                                        $show = isset($vi['option'][$show]) ? $vi['option'][$show] : $show;
-                                    }
-                                    $show = '';
-                                }
-
-                            } else {
-                                if (strstr($show, ',')) {
-                                    $temp = explode(',', $show);
-                                    $t = array();
-                                    foreach ($temp as $vv) {
-                                        if (isset($vi['option'][$vv]) && is_array($vi['option'][$vv])) {
-                                            $t[] = $vi['option'][$vv]['name'];
-                                        } elseif(isset($vi['option'][$vv])) {
-                                            $t[] = $vi['option'][$vv];
-                                        } else {
-                                            $t[] = $vv;
-                                        }
-                                    }
-                                    $show = implode('<br />', $t);
-                                } elseif (isset($vi['option'][$show]) && is_array($vi['option'][$show])) {
-                                    if (isset($vi['option'][$show]['style'])) {
-                                        $vi['option'][$show]['name'] = '<font style="'.$vi['option'][$show]['style'].'">' . $vi['option'][$show]['name'] . '</font>';
-                                    }
-                                    $show = $vi['option'][$show]['name'];
-                                    
-                                } else {
-                                    $show = isset($vi['option'][$show]) ? $vi['option'][$show] : $show;
-                                }
-                            }
-                        }
-
-                        $text = $show;
-                        if ($high && isset($high[$ki])) {
-                            if (isset($v['s_' . $ki])) {
-                                $text = $v['s_' . $ki];
-                                $text = str_replace('<em class="dever_highlight">', '<font color="red" class="dever_highlight">', $text);
-                                $text = str_replace('</em>', '</font>', $text);
-                            } elseif (strlen($high[$ki]) > 1) {
-                                $text = preg_replace('/('.$high[$ki].')/i', '<font color="red" class="dever_highlight">${1}</font>', $text, 1);
-                            }
-                        }
-
-                        if (!isset($vi['option']) && isset($vi['edit']) && $vi['edit']) {
-                            //$url = Dever::url($vi['edit'] . '?where_id=' . $v['id'] . '&col=' . $vi['col']. '&key=' . $this->project . '&table=' . $this->table);
-
-                            $url = $this->url('updateAction');
-
-                            $vi['edit'] = $vi['edit'] == 'textarea' ? $vi['edit'] : 'text';
-
-                            $text = '<span class="edit" data-col="' . $ki . '" data-url="' . $url . '" data-id="' . $v['id'] . '" data-project="' . $this->project . '" data-table="' . $this->table . '" data-content="' . $show . '" data-type="' . $vi['edit'] . '">'.$text.'</span>';
-
-                            $result[$k] .= '<td >' . $text . '</td>';
-
-                            if (isset($return[$i][$ki])) {
-                                $text = $return[$i][$ki] . $text;
-                            }
-                            $return[$i][$ki] = $text;
-                        } else {
-                            $result[$k] .= '<td>' . $text . '</td>';
-
-                            if (isset($return[$i][$ki])) {
-                                $text = $return[$i][$ki] . $text;
-                            }
-                            $return[$i][$ki] = $text;
-
-                        }
-
-                        if (isset($config['manage']['chart'])) {
-                            $this->chart($config['manage']['chart'], $ki, $return[$i][$ki], $vi);
-                        }
-                    }
-                }
-
-                $button = $this->list_tbody_button($config, $data[$k]);
-                $result[$k] .= $button;
-
-                $return[$i]['manage'] = str_replace(array('<td>', '</td>'), '', $button);
-
-                $result[$k] .= '</tr>';
-
-                $i++;
-            }
-        }
-
-        /*
-        if ($result) { 
-            $thead = $this->list_thead();
-            if ($thead) {
-                $k = $k + 1;
-                $result[$k] = '<tr>';
-                foreach ($thead as $k => $v) {
-                    $result[$k] .= $v;
-                }
-                $result[$k] .= '</tr>';
-            }
-        }
-        */
-
-        if ($type) {
-            return $return;
-        }
-        return $result;
-    }
-
-    private function list_tbody_button($config, $data, $type = 'td')
-    {
-        $result = '';
-        if ((Dever::load('manage/auth.oper', 3) != false || Dever::load('manage/auth.oper', 5) != false) && isset($config['manage']['_list']['value'])) {
-            $result = '<'.$type.'>';
-            if ($config['state'] == 2) {
-                if (isset($config['manage']['_list']['value']['update'])) {
-                    unset($config['manage']['_list']['value']['update']);
-                }
-                if (isset($config['manage']['_list']['value']['delete'])) {
-                    $config['manage']['_list']['value']['delete'] = '恢复';
-                }
-            }
-
-            foreach ($config['manage']['_list']['value'] as $kj => $vj) {
-                $pj = false;
-
-                $h = '<span class="am-icon-pencil-square-o"></span>';
-                $oper = true;
-                if ($kj == 'update') {
-                    $oper = Dever::load('manage/auth.oper', 3);
-                } elseif ($kj == 'delete') {
-                    $oper = Dever::load('manage/auth.oper', 5);
-
-                    $h = '<span class="am-icon-trash-o"></span>';
-                }
-
-                if (is_array($vj) && isset($vj[1])) {
-                    if (isset($vj[2])) {
-                        $oper = $this->value($vj[2], $data);
-                    }
-                    if ($oper && strpos($vj[1], 'modal|') === false) {
-                        $pj = $this->value($vj[1], $data);
-                        $vjn = $vj[0];
-                    }
-                } else {
-                    $vjn = $vj;
-                }
-
-                if ($oper == true) {
-                    if ($kj == 'delete') {
-                        $class = 'layui-btn layui-btn-danger';
-                    } else {
-                        $class = 'layui-btn';
-                    }
-                    if (layadmin()) {
-                        $class .= ' layui-btn-xs';
-                    }
-                    if (strpos($kj, 'fast_list') !== false) {
-                        if (!isset($vj[3])) {
-                            $vj[3] = '';
-                        }
-  
-                        $result .= '<a href="javascript:;" onclick="fastEdit($(this), \'' . $this->url('list', $data['id'], $pj) . '\', \''.$vj[0].'\', \''.$vj[3].'\', 1, 1)"><button type="button" class="btn btn-info btn-rounded waves-effect waves-light m-b-5 '.$class.'">' . $vj[0] . '</button></a>&nbsp;&nbsp;';
-                    } elseif (strpos($kj, 'fast_add') !== false) {
-                        if (!isset($vj[3])) {
-                            $vj[3] = '';
-                        }
-  
-                        $result .= '<a href="javascript:;" onclick="fastEdit($(this), \'' . $this->url('update', false, $pj) . '\', \''.$vj[0].'\', \''.$vj[3].'\', 1)"><button type="button" class="btn btn-info btn-rounded waves-effect waves-light m-b-5 '.$class.'">' . $vj[0] . '</button></a>&nbsp;&nbsp;';
-                    } elseif (strpos($kj, 'fast') !== false) {
-                        if (!isset($vj[3])) {
-                            $vj[3] = '';
-                        }
-  
-                        $result .= '<a href="javascript:;" onclick="fastEdit($(this), \'' . $this->url('update', $data['id'], $pj) . '\', \''.$vj[0].'\', \''.$vj[3].'\', 1)"><button type="button" class="btn btn-info btn-rounded waves-effect waves-light m-b-5 '.$class.'">' . $vj[0] . '</button></a>&nbsp;&nbsp;';
-                    } elseif (strpos($kj, 'edits') !== false) {
-                        if (!isset($vj[1])) {
-                            $vj[1] = '';
-                        }
-                        $result .= '<a href="javascript:;" onclick="fastEdit($(this), \'' . $this->url($kj, $data['id']) . '\', \''.$vj[0].'\', \''.$vj[1].'\', 1)"><button type="button" class="btn btn-info btn-rounded waves-effect waves-light m-b-5 '.$class.'">' . $vj[0] . '</button></a>&nbsp;&nbsp;';
-                    } elseif (strpos($kj, 'edit') !== false) {
-                        if (!isset($vj[1])) {
-                            $vj[1] = '';
-                        }
-                        if (strstr($vj[1], 'http')) {
-                            $url = $vj[1] . '&id=' . $data['id'];
-                        } else {
-                            $url = $this->url($kj, $data['id']);
-                        }
-                        $result .= '<a href="javascript:;" onclick="fastEdit($(this), \'' . $url . '\', \''.$vj[0].'\', \''.$vj[1].'\')"><button type="button" class="btn btn-info btn-rounded waves-effect waves-light m-b-5 '.$class.'">' . $vj[0] . '</button></a>&nbsp;&nbsp;';
-                    } elseif (strpos($kj, 'location') !== false) {
-                        if (!isset($vj[1])) {
-                            $vj[1] = '';
-                        }
-                        if (strstr($vj[1], 'http')) {
-                            $url = $vj[1] . '&id=' . $data['id'];
-                        } else {
-                            $url = $this->url($kj, $data['id']);
-                        }
-                        $result .= '<a href="'.$url.'"><button type="button" class="btn btn-info btn-rounded waves-effect waves-light m-b-5 '.$class.'">' . $vj[0] . '</button></a>&nbsp;&nbsp;';
-                    } elseif (strpos($kj, 'oper') !== false) {
-                        $content = '';
-                        $title = '';
-                        if (isset($vj[3])) {
-                            $content = $this->value($vj[3], $data);
-                        }
-                        if (isset($vj[4])) {
-                            $title = $vj[4];
-                        }
-                        $result .= '<a href="javascript:;" onclick="load(\'' . Dever::url($pj) . '\', \'' . $content . '\', \'' . $title . '\')"><button type="button" class="btn btn-info btn-rounded waves-effect waves-light m-b-5 '.$class.'">' . $vj[0] . '</button></a>&nbsp;&nbsp;';
-                    } elseif (strpos($kj, 'new') !== false) {
-                        if (!isset($vj[1])) {
-                            $vj[1] = '';
-                        }
-                        if (!isset($vj[2])) {
-                            $vj[2] = '';
-                        }
-                        if (strstr($vj[1], 'http')) {
-                            $url = $vj[1] . '&id=' . $data['id'];
-                        } elseif($vj[2]) {
-                            $url = Dever::url($this->value($vj[1], $data), $vj[2]);
-                        } else {
-                            $url = $this->url($kj, $data['id']);
-                        }
-
-                        $result .= '<a href="' . $url . '" target="_blank" class="oper_' . $kj . '"><button type="button" class="btn btn-info btn-rounded waves-effect waves-light m-b-5 '.$class.'">' . $h . $vjn . '</button></a>&nbsp;&nbsp;';
-                    } elseif (isset($vj[1]) && strpos($vj[1], 'modal|') !== false) {
-                        $t = explode('|', $vj[1]);
-                        $result .= '<a href="#dever_modal" data-toggle="modal"  class="btn btn-info btn-rounded waves-effect waves-light m-b-5 '.$class.'" onclick=' . $t[1] . ' msg-send="' . $this->value($t[2], $data) . '">' . $vj[0] . '</a>&nbsp;&nbsp;';
-                    } elseif (isset($vj[1])) {
-                        $result .= '<a href="' . $this->url($kj, $data['id'], $pj) . '" class="oper_' . $kj . '"><button type="button" class="btn btn-info btn-rounded waves-effect waves-light m-b-5 '.$class.'">' . $h . $vjn . '</button></a>&nbsp;&nbsp;';
-                    } else {
-                        $result .= '<span style="margin-left:5px;margin-right:10px;">' . $vj[0] . '</span>';
-                    }
-                }
-            }
-            $result .= '</'.$type.'>';
-        }
-
-        return $result;
-    }
-
-    /**
-     * 多级分类
-     *
-     * @return array
-     */
-    private function tree($data, $config, $parent = 0)
-    {
-        $key = $config['name'] . '_id';
-        $result = array();
-        $this->treeData($data, $result, $key, $parent);
-
-        return $result;
-    }
-
-    private function treeData($array, &$result, $key, $parent_id = 0, $level = 0)
-    {
-        if (empty($array)) {
-            return;
-        }
-
-        $level++;
-
-        foreach ($array as $k => $v) {
-            if (isset($v[$key]) && $v[$key] == $parent_id) {
-                $v['level'] = $level;
-                $v['name'] = $this->treeName($v['name'], $level);
-                $result[] = $v;
-                unset($array[$k]);
-                $this->treeData($array, $result, $key, $v['id'], $level);
-            }
-        }
-    }
-
-    private function treeName($name, $level = 1)
-    {
-        $string = '';
-
-        if ($level > 1) {
-            /*
-            $num = 4;
-            $string = '-';
-            //STR_PAD_LEFT
-            $string = str_pad('|', $level * $num, $string);
-            */
-            $string = str_repeat(' ',$level-1);
-
-            $string .= '|—';
-        }
-
-        return $string . $name;
-    }
-
-    /**
-     * 列表页批量管理
-     *
-     * @return array
-     */
-    public function list_mul()
-    {
-        # 新增权限:更新权限
-        if (Dever::load('manage/auth.oper', 3) == false) {
-            return '';
-        }
-
-        $config = $this->config();
-
-        $result = '';
-
-        if (isset($config['struct']) && isset($config['manage']['mul']) && $config['manage']['mul']) {
-            $mul = Dever::preInput('mul_');
-
-            $node = Html::node(array('class="am-u-sm-12" style="margin-top:10px;"', 'class="am-form-group am-input-group-sm"'));
-            $btn = '<button class="btn btn-danger layui-btn layui-btn-danger" onclick="$(\'#form1\').attr(\'action\', \'' . $this->url('list') . '\');list_mul($(this))" type="button" style="height: 38px;margin-left:10px;">更新</button>';
-
-            $prefix = 'mul_';
-
-            $result .= $node[0];
-
-            $default = 0;
-
-            $option = array
-            (
-                1 => '本页选中的数据',
-            );
-
-            # 只有当有搜索条件时才会出现
-            if (Dever::load('manage/auth.oper', 2) && $this->search == true) {
-                //$option[2] = '所有页面的数据';
-                //$default = 2;
-            }
-
-            $this->list_search_select($result, $mul, $prefix . 'type' . '" id="' . $prefix . 'type', '请选择要更新的数据', $option, $default);
-
-            foreach ($config['struct'] as $k => $v) {
-                if ($k == 'state' && (!isset($config['manage']['delete']) || (isset($config['manage']['delete']) && $config['manage']['delete']))) {
-                    $v['option'] = Dever::config('base')->state;
-                    if ($this->getState() == 2) {
-                        unset($v['option'][2]);
-                    } else {
-                        unset($v['option'][1]);
-                    }
-                    
-                    $v['edit'] = true;
-                }
-                $select = false;
-                if (isset($v['mul'])) {
-                    $select = $v['mul'];
-                } elseif (isset($v['edit'])) {
-                    $select = $v['edit'];
-                }
-                if ($select) {
-
-                    if (isset($v['mul_option']) && (is_array($v['mul_option']) || is_object($v['mul_option']))) {
-                        $result .= '&nbsp;&nbsp;';
-                        $this->list_search_select($result, $mul, $prefix . 'set_' . $k, $v['name'], $this->option($v['mul_option'], $select), $v['default']);
-                    } elseif (isset($v['option']) && (is_array($v['option']) || is_object($v['option']))) {
-                        $result .= '&nbsp;&nbsp;';
-                        $this->list_search_select($result, $mul, $prefix . 'set_' . $k, $v['name'], $this->option($v['option'], $select), $v['default']);
-                    }
-                }
-            }
-
-            $result .= $btn . $node[1];
-        }
-
-        //print_r($result);die;
-
-        return $result;
-    }
-
-    private function value($value, $data, $struct = array())
-    {
-        if (!$data) {
-            return $value;
-        }
-        if (strstr($value, '={') && !strstr($value, '"')) {
-            $value = '"' . $value . '"';
-        }
-        if (is_string($data)) {
-            $eval = '$value = ' . $value . ';';
-            eval($eval);
-
-            return $value;
-        }
-        if ($value == 'table' && $struct) {
-            $result = $this->struct_data($struct, $data);
-            $value = Dever::table($result);
-        } elseif (strpos($value, '{') !== false && strpos($value, '{"') === false) {
-            # 这里用到了/e,注意这里无论如何不能传入$_GET之类的用户参数 2015/7/21更新为callback方式
-            //$eval = '$value = ' . preg_replace('/{(.*?)}/e', "\$data['$1']", $value) . ';';
-            $func = function ($r) use ($data) {
-                if (isset($data[$r[1]])) {
-                    return $data[$r[1]];
-                }
-                return false;
-            };
-
-            $value = preg_replace_callback('/{(.*?)}/', $func, $value);
-            if (strstr($value, '<script>')) {
-                $value = str_replace('<script>', '<script>$(document).ready(function(){', $value);
-                $value = str_replace('</script>', '});</script>', $value);
-            }
-            $eval = '$value = ' . $value . ';';
-
-            eval($eval);
-        }
-
-        return $value;
-
-    }
-
-    /**
-     * update
-     *
-     * @return array
-     */
-    public function update()
-    {
-        $config = $this->config();
-
-        $result = array();
-
-        $prefix = 'update';
-
-        $data = array();
-
-        if ($this->id) {
-            # 新增权限
-            if (Dever::load('manage/auth.oper', 3) == false) {
-                Dever::alert('你没有权限');
-            }
-
-            $data = $this->load('one', $this->id);
-
-            if ($data) {
-                //$prefix = 'set';
-            }
-        } else {
-            # 新增权限
-            if (Dever::load('manage/auth.oper', 4) == false) {
-                //Dever::alert('你没有权限');
-            }
-        }
-
-        //print_r($config['manage']['update']);die;
-        $data = $this->getAdminInfo($data);
-        $col = Dever::input('col');
-
-        foreach ($config['struct'] as $k => $v) {
-            if (isset($v['update']) && $v['update']) {
-                if ($col && !strstr(',' . $col . ',', ',' . $k . ',')) {
-                    continue;
-                }
-                //处理权限
-                if (isset($v['auth'])) {
-                    $auth = $this->value($v['auth'], $data);
-                    if (!$auth) {
-                        continue;
-                    }
-                }
-                # 处理show模式下的class
-                $class = $this->update_class($k, $v, '', $data);
-
-                $result[$k] = '<div class="form-group ' . $class . '"><div class="margin-top">';
-
-                if (layadmin()) {
-                    $result[$k] = '<div class="layui-form-item ' . $class . '"><div classs="layui-col-lg6">';
-
-                    if (isset($v['update']) && $v['update'] && is_array($v['update'])) {
-                        $result[$k] = '<div class="layui-form-item ' . $class . '"><div class="layui-tab-card">';
-                    }
-                }
-
-                $result[$k] .= $this->create_update_html($k, $v, $data);
-
-                $result[$k] .= '</div></div>';
-
-            } elseif (!$col && isset($v['class'])) {
-                # 分割线
-                $v['name'] = $this->value($v['name'], array('test' => 1));
-                if (isset($v['right'])) {
-                    $this->card_right = true;
-                }
-                $this->card = true;
-                $result[$k] = Html::hr($v);
-            }
-        }
-
-        if (Dever::input('ajax') == 1) {
-            return implode('', $result);
-        }
-
-        //print_r($result);die;
-
-        return $result;
-    }
-
-    public function card()
-    {
-        if (isset($this->card_right)) {
-            return 'layui-col-md6';
-        }
-        return 'layui-col-md12';
-    }
-
-    public function layui_card()
-    {
-        if (isset($this->card)) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * update_class
-     *
-     * @return string
-     */
-    public function update_class($name, $param, $prefix = '', $data = array())
-    {
-        $class = '';
-        $key = 'show';
-        if (isset($param[$key]) && $param[$key]) {
-            $parent = array();
-            $child = array();
-            if (is_string($param[$key])) {
-                parse_str($param[$key], $param[$key]);
-            }
-            if (is_array($param[$key])) {
-                foreach ($param[$key] as $k => $v) {
-                    if ($k == 'no') {
-                        $child[$k . '_' . $v] = $key . '_no';
-                    } elseif (strpos($v, '/')) {
-                        $parent[$k] = $key . '_' . $k;
-                        $k = $k . '_ajax';
-                        $value = '';
-                        if (isset($data[$name])) {
-                            $value = $data[$name];
-                        }
-                        $v = str_replace('?', '?key='.$name.'&value='.$value.'&source='.$this->name.'&', $v);
-                        $child[$k] = $key . '_' . $k .'" dever-ajax="'.Dever::url($v).'"';
-                    } else {
-                        if (strpos($v, ',')) {
-                            $temp = explode(',', $v);
-                            foreach ($temp as $v1) {
-                                $show = $k . '_' . $v1;
-                                if ($prefix) {
-                                    $k = str_replace($name, $k, $prefix);
-                                    $show = str_replace($name, $show, $prefix);
-                                }
-                                $parent[$k] = $key . '_' . $k;
-                                $child[$show] = $key . '_' . $show;
-                            }
-                        } else {
-                            $show = $k . '_' . $v;
-                            if ($prefix) {
-                                $k = str_replace($name, $k, $prefix);
-                                $show = str_replace($name, $show, $prefix);
-                            }
-                            $parent[$k] = $key . '_' . $k;
-                            $child[$show] = $key . '_' . $show;
-                        }
-                    }
-                }
-            }
-
-            $class = implode(' ', $parent) . ' ' . implode(' ', $child);
-        } 
-        if (isset($param['control'])) {
-            $class .= ' ' . $key . '_input';
-        }
-
-        return $class;
-    }
-
-    /**
-     * update_html
-     *
-     * @return string
-     */
-    public function create_update_html($key, $value, $data = array())
-    {
-        $result = '';
-
-        $value['ext'] = $value['col'] = $key;
-
-        $value['update'] = $value['update'] ? $value['update'] : 'text';
-
-        if (isset($value['match']) && $value['match'] != 'option') {
-            if (is_string($value['match']) && strpos($value['match'], '/') !== false) {
-                if (strstr($value['match'], 'option||')) {
-                    $value['valid'] = 'validate[custom[' . $key . ']]';
-                } else {
-                    $value['valid'] = 'validate[required,custom[' . $key . ']]';
-                }
-            } else {
-                $value['valid'] = 'validate[required]';
-            }
-        }
-
-        if (is_string($value['update']) && strpos($value['update'], 'copy.') !== false) {
-            $value['value'] = $value['update'];
-            $value['update'] = 'hidden';
-        }
-
-        $this->update_html($value, $key, $key, $data, $result);
-
-        return $result;
-    }
-
-    /**
-     * update_html
-     *
-     * @return string
-     */
-    public function update_html($param, $key, $index, $data, &$result)
-    {
-        if (isset($param['name']) && $param['update'] != 'hidden' && isset($param['update'])) {
-            $result .= Html::pageLeft($param);
-        }
-
-        if ($param['update']) {
-            # 名称带前缀
-            $param['name'] = 'update_' . $param['ext'];
-            $param['index'] = $index;
-
-            //$param['value'] = '';
-
-            # 得到当前的值
-            //if (isset($data[$index]) && !isset($param['value'])) {
-            if (isset($data[$index]) && $data[$index]) {
-                $param['value'] = $data[$index];
-            }
-
-            # 得到下级的值
-            if (isset($param['child_value']) && isset($data['id'])) {
-                $param['child_value'] = $this->value($param['child_value'], $data);
-            }
-
-            # 验证option是否是匿名函数
-            if (isset($param['option'])) {
-                $param['option'] = $this->option($param['option']);
-            }
-
-            if (isset($data[$index]) && !isset($param['value']) && isset($param['key']) && $param['update'] != 'editor') {
-                $param['value'] = Dever::upload($data[$index]);
-            }
-
-            # 处理下级字段
-            if (isset($param['child'])) {
-                $param['child'] = $this->option($param['child']);
-                if (isset($data[$key . '_parent'])) {
-                    $param['parent_value'] = $data[$key . '_parent'];
-                }
-            }
-
-            # 设置默认值
-            if (isset($param['default'])) {
-                $param['default'] = $this->option($param['default']);
-            }
-
-            # 处理同步
-            if (isset($param['sync']) && isset($data[$param['sync'][0]]) && strpos($key, '-')) {
-                $temp = explode('-', $key);
-                if ($data[$param['sync'][0]] > 0) {
-                    $load = Dever::load($temp[0] . '/' . $temp[1] . '-one', array('option_' . $param['sync'][1] => $data[$param['sync'][0]]));
-                } else {
-                    $load = Dever::load($temp[0] . '/' . $temp[1] . '-one', array('option_' . $param['sync'][3] => $data[$param['sync'][2]], 'option_' . $param['sync'][4] => $data[$param['sync'][0]]));
-                }
-
-                $param['value'] = isset($load[$temp[2]]) ? $load[$temp[2]] : $param['default'];
-            }
-
-            $method = $param['update'];
-
-            if (is_array($method)) {
-                $c = '';
-                if (layadmin()) {
-                    $c = 'layui-tab-title';
-                }
-
-                $delete = true;
-                if (isset($param['option'])) {
-                    $delete = false;
-                    $result .= '<ul class="nav nav-tabs '.$c.'">{tab}</ul>';
-
-                    $order = array
-                    (
-                        'col'       => $key,
-                        'name'      => $param['desc'],
-                        'default'   => '1',
-                        'desc'      => $param['desc'],
-                        'match'     => 'is_string',
-                        'update'    => 'hidden',
-                        'option'    => $param['option']
-                    );
-                    array_unshift($method, $order);
-
-                    if (isset($param['value']) && $param['value']) {
-                        $value = Dever::array_decode($param['value']);
-                        $param['value'] = array();
-                        foreach ($param['option'] as $k => $v) {
-                            foreach ($value[$k-1] as $k1 => $v1) {
-                                $param['value'][$v][$k1] = $v1;
-                            }
-                        }
-                    } else {
-                        $param['value'] = array();
-                        foreach ($param['option'] as $k => $v) {
-                            $param['value'][$v][$key] = $k;
-                        }
-                    }
-
-                } else {
-                    $result .= '<ul class="nav nav-tabs '.$c.'">{tab}<li><a href="javascript:;" class="dever_form_add" toggle_key="' . $key . '">增加一条</a></li></ul>';
-
-                    $order = array
-                    (
-                        'col'       => 'order',
-                        'name'      => '排序-按照数字正序排列',
-                        'default'   => '1',
-                        'desc'      => '排序',
-                        'match'     => 'is_string',
-                        'update'    => 'text',
-                    );
-                    array_unshift($method, $order);
-                }
-
-                $tab = '';
-
-                $this->update_child(array(), $method, $key, $result, -1, $delete);
-
-                if (isset($param['value']) && $param['value']) {
-
-                    if (!is_array($param['value'])) {
-                        $param['value'] = Dever::array_decode($param['value']);
-                    }
-
-                    if (is_array($param['value'])) {
-                        $i = 0;
-                        foreach ($param['value'] as $k => $v) {
-                            $n = $k;
-                            if (is_string($k)) {
-                                $k = $i;
-                            }
-                            $this->update_child($v, $method, $key, $result, $k, $delete);
-
-                            $active = '';
-                            if ($k == 0) {
-                                $active = 'active';
-                            }
-                            if (layadmin() && $active) {
-                                $active .= ' layui-this';
-                            }
-                            $k = $k + 1;
-                            if (!is_string($n)) {
-                                $n = '第' . $k . '条';
-                            }
-                            $tab .= '<li class="' . $active . '"><a href="javascript:;" id="tab-' . $key . '-child-' . $k . '" toggle_key="' . $key . '" toggle_id="' . $k . '" toggle_child=".dever_' . $key . '_child" toggle="#' . $key . '-child-' . $k . '" onclick="showToggle($(this))">'.$n.'</a></li>';
-                            $i++;
-                        }
-                    }
-                    
-                } else {
-                    $this->update_child(array(), $method, $key, $result, 0, $delete);
-
-                    $tab = '<li class="active layui-this"><a href="javascript:;" id="tab-' . $key . '-child-1" toggle_key="' . $key . '" toggle_id="1" toggle_child=".dever_' . $param['col'] . '_child" toggle="#' . $key . '-child-1" onclick="showToggle($(this))">第1条</a></li>';
-                }
-
-                $result = str_replace('{tab}', $tab, $result);
-            } else {
-                if (isset($param['update_input']) && isset($data[$index . '_input'])) {
-                    $param['update_input_data'] = explode(',', $data[$index . '_input']);
-                }
-                $param['project'] = $this->project;
-                $param['table'] = $this->table;
-                if (isset($param['upload_search'])) {
-                    $param['upload_search'] = $this->value($param['upload_search'], $data + $param);
-                }
-                if (isset($param['upload_search_value'])) {
-                    $param['upload_search_value'] = $this->value($param['upload_search_value'], $data + $param);
-                }
-                $result .= Html::$method($param);
-            }
-
-            if (isset($param['desc']) && ($param['update'] == 'text' || $param['update'] == 'password')) {
-                $result .= Html::desc($param['desc']);
-            }
-        }
-    }
-
-    /**
-     * update_action
-     *
-     * @return array
-     */
-    private function update_child($data, $param, $key, &$result, $index, $delete = true)
-    {
-        $style = 'style="margin:10px"';
-        if ($index != 0) {
-            $style = 'style="display:none;margin:10px"';
-        }
-        $result .= '<div id="' . $key . '-child-' . ($index + 1) . '" class="dever_' . $key . '_child dever_form_add_child" ' . $style . '>';
-
-        if ($delete) {
-            $result .= '<div class="dever_form_delete">[删除]</div>';
-        }
-
-        foreach ($param as $k => $v) {
-            $v['type'] = $v['update'];
-
-            $prefix = '';
-            if ($index < 0) {
-                $v['ext'] = $key . '_c_' . $v['col'];
-                $prefix = $v['ext'];
-            } else {
-                $v['ext'] = $key . '_c_' . $index . '_i_' . $v['col'];
-                $prefix = $v['ext'];
-            }
-
-            if ($v['col'] == 'order') {
-                $v['default'] = $index+1;
-            }
-
-            
-            $class = $this->update_class($v['col'], $v, $prefix);
-
-            $result .= '<div class="form-group ' . $class . '" style="margin-top:10px">';
-
-            $this->update_html($v, $key, $v['col'], $data, $result);
-
-            $result .= '</div>';
-        }
-
-        $result .= '</div>';
-    }
-
-    /**
-     * update_action
-     *
-     * @return array
-     */
-    public function update_action_api()
-    {
-        $method = false;
-
-        $config = $this->config();
-
-        $input = Dever::preInput('update_');
-
-        if ($this->id) {
-            # 新增权限
-            if (Dever::load('manage/auth.oper', 3) == false) {
-                Dever::alert('你没有权限');
-            }
-
-            Dever::setInput('where_id', $this->id);
-            //Dever::setInput('update_where_id', $this->id);
-
-            $info = $this->load('one', $this->id);
-            if ($info) {
-
-                $method = 'update';
-
-                $col = Dever::input('col');
-                $value = Dever::input('value');
-
-                if ($col && $value) {
-                    $method = 'update_' . $col;
-                    //Dever::setInput('set_' . $col, $value);
-                    //Dever::setInput('update_' . $col, $value);
-
-                    $param['where_id'] = $this->id;
-                    $param['set_' . $col] = $value;
-                    $this->load($method, $param);
-
-                    $struct = $this->struct_data($config['struct'], array($col => $value));
-                    Log::add($this->project, $this->table, $this->menu_id, '', $method, $struct, $this->id);
-
-                    Dever::out('yes');
-
-                    return;
-                }
-
-                $prefix = 'set';
-            } else {
-                $method = 'insert';
-                $prefix = 'add';
-            }
-        }
-        if (!$method) {
-            # 新增权限
-            if (Dever::load('manage/auth.oper', 4) == false) {
-                Dever::alert('你没有权限');
-            }
-
-            $method = 'insert';
-            $prefix = 'add';
-        }
-        if ($method && $input) {
-            $update = $order = array();
-            $i = 0;
-            $c = array();
-            foreach ($input as $k => $v) {
-                if ($v === '') {
-                    $v = 'null';
-                }
-                if ($v && is_string($v) && strpos($v, 'copy.') !== false) {
-                    $temp = str_replace('copy.', '', $v);
-                    if (isset($input['update_' . $temp])) {
-                        $v = $input['update_' . $temp];
-                    }
-                }
-                if (strpos($k, '_c_') !== false) {
-                    if ($v == 'null') {
-                        $v = '';
-                    }
-                    $temp = explode('_c_', $k);
-                    $k = str_replace('update_', $prefix . '_', $temp[0]);
-                    if (!isset($c[$k])) {
-                        $c[$k] = array();
-                    }
-                    if (strpos($temp[1], '_i_') !== false) {
-                        $temp = explode('_i_', $temp[1]);
-
-                        if (!isset($c[$k][$temp[1]])) {
-                            $c[$k][$temp[1]] = 0;
-                        } else {
-                            $c[$k][$temp[1]]++;
-                        }
-
-                        $num = $c[$k][$temp[1]];
-
-                        $update[$i][$k][$num][$temp[1]] = $v;
-                        if ($temp[1] == 'order') {
-                            $order[$i][$k][$num] = $v;
-                        }
-                    } else {
-                        //$update[$i][$k][$c][$temp[1]] = $v;
-                    }
-                } elseif (strpos($k, '__') !== false) {
-                    $temp1 = explode('__', $k);
-                    $temp2 = explode('_', $temp1[0]);
-                    $i = $temp2[1] - 1;
-
-                    if (strpos($k, 'where_id') !== false) {
-                        //$update[$i]['where_id'] = $v;
-                    } else {
-                        $update[$i]['add_' . $temp1[1]] = $v;
-                    }
-                } else {
-                    $ki = str_replace('update_', $prefix . '_', $k);
-
-                    if (strpos($ki, 'where_id') !== false) {
-                        if ($method != 'insert') {
-                            $update[$i]['where_id'] = $v;
-                        }
-                    } else {
-                        if (strpos($k, '-')) {
-                            $k = str_replace('update_', '', $k);
-                            if (isset($config['struct'][$k]) && isset($config['struct'][$k]['sync'])) {
-                                $s_col = $config['struct'][$k]['sync'][0];
-                                $m_col = $config['struct'][$k]['sync'][1];
-                                if ($s_col == 'id') {
-                                    $s_value = $this->id;
-                                } else {
-                                    $s_one = $this->load('one', $this->id);
-                                    $s_value = $s_one[$s_col];
-                                }
-                                $temp = explode('-', $k);
-                                $index = $temp[0] . '/' . $temp[1];
-
-                                $update_other_set[$index]['set_' . $temp[2]] = $v;
-                                //$update_other_set[$index]['set_' . $m_col] = $s_value;
-
-                                $update_other_add[$index]['add_' . $temp[2]] = $v;
-                                $update_other_add[$index]['add_' . $m_col] = $s_value;
-
-                                $update_other_id[$index]['option_' . $m_col] = $s_value;
-                            }
-                        } else {
-                            if (is_array($v)) {
-                                $k = str_replace('update_', '', $k);
-                                $kd = $k . '_id';
-                                if (isset($config['struct'][$kd])) {
-                                    foreach ($v as $vk => $vt) {
-                                        if ($vt == -1) {
-                                            if ($vk != 0) {
-                                                unset($v[$vk]);
-                                            }
-                                        }
-                                    }
-                                    if ($v) {
-                                        $vd = end($v);
-                                        $kdi = $prefix . '_' . $kd;
-                                        $update[$i][$kdi] = $vd;
-                                    }
-                                }
-                                if (isset($config['struct'][$k]) && strpos($config['struct'][$k]['type'], 'int') !== false) {
-                                    $v = end($v);
-                                }
-                            }
-                            $update[$i][$ki] = $v;
-                        }
-                    }
-                }
-            }
-
-            //print_r($update_other_set);die;
-            //print_r($input);
-            //print_r($update_other);die;
-            //print_r($config['struct']);die;
-            # 增加复制的数量
-            $copy_num = Dever::input('copy_num');
-            if ($copy_num > 0) {
-                $update[0]['where_id'] = 0;
-                for ($i = 1; $i < $copy_num; $i++) {
-                    $update[$i] = $update[0];
-                    # 缓存处理
-                    $update[$i]['rank'] = $i;
-                }
-            }
-
-            if ($this->id && !$info) {
-                $update[0]['add_id'] = $this->id;
-            }
-            //print_r($update);die;
-            foreach ($update as $k => $v) {
-                $method = 'insert';
-                $old = array();
-                if (isset($v['where_id']) && $v['where_id']) {
-                    $method = 'update';
-                    $old = $this->load('one', $v['where_id']);
-                }
-                if (isset($order[$k])) {
-                    foreach ($order[$k] as $i => $j) {
-                        array_multisort($j, SORT_ASC, $v[$i]);
-                    }
-                }
-                if (isset($v['set_password']) && (!$v['set_password'] || $v['set_password'] == 'null')) {
-                    unset($v['set_password']);
-                }
-                $id = $this->load($method, $v);
-
-                if ($id) {
-                    $struct = $this->struct_data($config['struct'], $v, $old);
-                    Log::add($this->project, $this->table, $this->menu_id, '', $method, $struct, $id ? $id : $this->id);
-                }
-
-                if (isset($update_other_id) && $update_other_id) {
-                    foreach ($update_other_set as $k => $v) {
-                        $check = Dever::load($k . '-one', $update_other_id[$k]);
-                        //print_r($check);die;
-                        if ($check) {
-                            $v['where_id'] = $check['id'];
-                            Dever::load($k . '-update', $v);
-                        } else {
-                            Dever::load($k . '-insert', $update_other_add[$k]);
-                        }
-                    }
-                }
-            }
-        }
-
-        Dever::out('yes');
-    }
-
-    private function struct_data($struct, $data, $old = array())
-    {
-        $log = $tlog = array();
-        foreach ($struct as $i => $j) {
-            /*
-            if ($i == 'reorder' || $i == 'id') {
-                continue;
-            }
-            */
-            if (isset($j['list_name'])) {
-                $j['name'] = $j['list_name'];
-            } elseif (strpos($j['name'], '-')) {
-                $temp = explode('-', $j['name']);
-                $j['name'] = $temp[0];
-            }
-
-            if (isset($j['list_table'])) {
-                $j['list'] = $j['list_table'];
-                if ($j['list'] == false) {
-                    $data[$i] = false;
-                }
-            }
-
-            $list = (isset($j['list']) && is_string($j['list']) && $j['list'] != 'table');
-            $update = true;
-            if ($old) {
-                $update = (isset($j['update']) && is_string($j['update']) && $j['update'] != 'linkage');
-            }
-
-            if (isset($data['where_' . $i]) && $data['where_' . $i]) {
-                $log[$j['name']] = $data['where_' . $i];
-            } elseif (isset($data['set_' . $i]) && $data['set_' . $i]) {
-                $log[$j['name']] = $data['set_' . $i];
-            } elseif (isset($data['add_' . $i]) && $data['add_' . $i]) {
-                $log[$j['name']] = $data['add_' . $i];
-            } elseif (isset($data[$i]) && $data[$i]) {
-                $log[$j['name']] = $list ? $this->value($j['list'], $data) : $data[$i];
-            }
-
-            if (isset($log[$j['name']])) {
-                $tlog[$j['name']] = $log[$j['name']];
-                if (is_array($tlog[$j['name']])) {
-                    if (isset($tlog[$j['name']][0]) && is_array($tlog[$j['name']][0])) {
-                        $tlog[$j['name']] = json_encode($tlog[$j['name']]);
-
-                        if (isset($old[$i]) && is_array($old[$i])) {
-                            $old[$i] = json_encode($old[$i]);
-                        }
-
-                    } elseif (isset($tlog[$j['name']][0])) {
-                        $tlog[$j['name']] = implode(',', $tlog[$j['name']]);
-
-                        if (isset($old[$i]) && is_array($old[$i])) {
-                            $old[$i] = implode(',', $old[$i]);
-                        }
-                    }
-                } elseif (strpos($log[$j['name']], 'http://wx.qlogo.cn/') !== false || strpos($log[$j['name']], '.jpg') !== false || strpos($log[$j['name']], '.gif') !== false || strpos($log[$j['name']], '.png') !== false) {
-                    $log[$j['name']] = '<img layer-src="' . $log[$j['name']] . '" src="' . $log[$j['name']] . '" width="150">';
-
-                    if (isset($old[$i]) && $old[$i]) {
-                        $old[$i] = Dever::pic($old[$i]);
-                        $old[$i] = '<img layer-src="' . $old[$i] . '" src="' . $old[$i] . '" width="150">';
-                    }
-
-                } elseif (is_numeric($log[$j['name']]) && (strpos($i, 'time') !== false || strpos($i, 'date') !== false)) {
-                    $log[$j['name']] = date("Y-m-d H:i:s", $log[$j['name']]);
-                    if (isset($old[$i]) && $old[$i]) {
-                        $old[$i] = date("Y-m-d H:i:s", $old[$i]);
-                    }
-                } elseif (isset($j['decode'])) {
-                    $log[$j['name']] = Dever::array_decode($log[$j['name']]);
-
-                    if (isset($old[$i]) && $old[$i]) {
-                        $old[$i] = Dever::array_decode($old[$i]);
-                    }
-                }
-                
-                if (isset($j['option']) && !$list && $update) {
-                    $name = array();
-                    $option = $this->option($j['option']);
-
-                    if (is_array($option)) {
-                       foreach ($option as $a => $b) {
-                            if (!is_array($log[$j['name']])) {
-                                if ($a == $log[$j['name']]) {
-                                    $name[] = (is_array($b) && isset($b['name'])) ? $b['name'] : $b;
-                                }
-                            } elseif (in_array($a, $log[$j['name']])) {
-                                $name[] = (is_array($b) && isset($b['name'])) ? $b['name'] : $b;
-                            }
-                        }
-                    }
-                    
-
-                    $log[$j['name']] = implode(',', $name);
-                }
-
-                if ($log[$j['name']] == 'null') {
-                    unset($log[$j['name']]);
-                }
-
-                if ($old && strstr($i, 'area')) {
-                    $old[$i] = Dever::load('area/api')->string($old[$i]);
-                    if (isset($log[$j['name']]) && $log[$j['name']]) {
-                        $log[$j['name']] = Dever::load('area/api')->string($log[$j['name']]);
-                    }
-                }
-
-                if (isset($log[$j['name']]) && isset($old[$i]) && $old[$i] != $tlog[$j['name']] && $old[$i] != $log[$j['name']]) {
-                    $log[$j['name']] = array('更新前' => $old[$i], '更新后' => $log[$j['name']]);
-                } elseif ($old) {
-                    //unset($log[$j['name']]);
-                }
-            }
-        }
-
-        return $log;
-    }
-
-    /**
-     * delete_action
-     *
-     * @return array
-     */
-    public function delete_action_api()
-    {
-        if (Dever::load('manage/auth.oper', 5) == false) {
-            Dever::alert('您没有权限');
-        }
-
-        $config = $this->config();
-        if (isset($config['struct']['state']) && (!isset($config['manage']['delete']) || (isset($config['manage']['delete']) && $config['manage']['delete']))) {
-            $name = '逻辑删除';
-            $this->load('update', array('where_id' => $this->id, 'state' => 2));
-        } else {
-            $name = '物理删除';
-            $this->load('delete', $this->id);
-        }
-
-        Log::add($this->project, $this->table, $this->menu_id, '', 3, array('ID' => $this->id, '方式' => $name), $this->id);
-
-        return 'reload';
-        return 'reloaderror';
-    }
-
-    /**
-     * recovery_action
-     *
-     * @return array
-     */
-    public function recovery_action_api()
-    {
-        if (Dever::load('manage/auth.oper', 5) == false) {
-            Dever::alert('您没有权限');
-        }
-
-        $this->load('update', array('where_id' => $this->id, 'state' => 1));
-
-        Log::add($this->project, $this->table, $this->menu_id, '', 4, array('ID' => $this->id, '方式' => '逻辑恢复'), $this->id);
-
-        return 'reload';
-    }
-
-    /**
-     * list_data
-     *
-     * @return array
-     */
-    public function list_data()
-    {
-        $config = $this->config();
-        $data = array();
-        if (isset($config['manage']['data'])) {
-            foreach ($config['manage']['data'] as $k => $v) {
-                if (is_object($v[1])) {
-                    $function = $v[1];
-                    $v[1] = $function();
-                }
-                $data[] = '<li class="layui-col-xs3">
-                <a class="layadmin-backlog-body"><h3>'.$v[0].'</h3>
-                  <p><cite>'.$v[1].'</cite></p></a></li>';
-            }
-        }
-        
-        return $data;
-    }
-
-    /**
-     * list_data
-     *
-     * @return array
-     */
-    public function list_data_show()
-    {
-        $config = $this->config();
-        if (isset($config['manage']['data'])) {
-            return 'display:block';
-        }
-        
-        return 'display:none';
-    }
-
-    /**
-     * chart
-     *
-     * @return array
-     */
-    public function chart($config, $key, $data, $struct)
-    {
-        if (!$this->chart) {
-            $this->chart = array();
-            $this->chart['x'] = array();
-            $this->chart['data'] = array();
-        }
-
-        if ($config['x'] == $key) {
-            $this->chart['x'][] = $data;
-        } elseif (in_array($key, $config['data'])) {
-            if (!isset($this->chart['data'][$key])) {
-                $this->chart['data'][$key] = array
-                (
-                    'name' => $struct['name'],
-                    'type' => 'line',
-                    'stack' => 'Total',
-                    'data' => array(),
-                );
-            }
-
-            $this->chart['data'][$key]['data'][] = $data;
-        }
-    }
-
-    /**
-     * chart_data
-     *
-     * @return array
-     */
-    public function list_chart()
-    {
-        $config = $this->config();
-        $chart = '';
-        if (isset($config['manage']['chart']) && $this->chart) {
-            $this->chart['x'] = array_reverse($this->chart['x']);
-            $x = Dever::json_encode($this->chart['x']);
-            $this->chart['data'] = array_values($this->chart['data']);
-            foreach ($this->chart['data'] as $k => $v) {
-                $this->chart['data'][$k]['data'] = array_reverse($this->chart['data'][$k]['data']);
-            }
-            $data = Dever::json_encode($this->chart['data']);
-            $echarts = Dever::assets('lib/echarts/echarts.common.min.js', 'script');
-            $chart = '<script type="text/javascript" src="'.$echarts.'"></script><script>var chartDom = document.getElementById("chart");var myChart = echarts.init(chartDom);';
-            $chart .= "var option = {
-              tooltip: {
-                trigger: 'axis'
-              },
-             
-              toolbox: {
-                feature: {
-                  saveAsImage: {}
-                }
-              },
-              xAxis: {
-                type: 'category',
-                boundaryGap: false,
-                data: ".$x."
-              },
-              yAxis: {
-                type: 'value'
-              },
-              series: ".$data."
-            };option && myChart.setOption(option);</script>";
-        }
-        
-        return $chart;
-    }
-
-    /**
-     * chart_data
-     *
-     * @return array
-     */
-    public function list_chart_show()
-    {
-        $config = $this->config();
-        if (isset($config['manage']['chart'])) {
-            return 'display:block';
-        }
-        
-        return 'display:none';
-    }
-
-    /**
-     * stat 为主动统计提供相关数据
-     *
-     * @return array
-     */
-    public function stat()
-    {
-        //bundle 包依赖工具
-        $config = $this->config();
-
-        if (empty($config['manage']['stat'])) {
-            Dever::alert('该项目主动统计功能未开放');
-        }
-
-        $data = $config['manage'];
-
-        $data['table'] = '';
-
-        $method = $this->project . '/' . $this->table . '-all';
-
-        $gp = Dever::input('gp', 'month,day');
-
-        $col = is_string($gp) ? explode(',', $gp) : $gp;
-
-        $data['search'] = $this->stat_search($config['struct'], $gp, $config['manage']['stat'], $config['manage']['search']);
-
-        foreach ($col as $k => $v) {
-            $this->stat_data($data, $config['struct'], $v, $method);
-        }
-
-        return $data;
-    }
-
-    /**
-     * stat 为主动统计提供导出数据 后续优化
-     *
-     * @return array
-     */
-    public function stat_excel()
-    {
-        Dever::$global['base']['excel'] = 1;
-        //print_r($data['thead']);die;
-        $data = $this->stat();
-        if ($data && isset($data['list'])) {
-            $xls = new \PHPExcel();
-
-            $xls->getProperties()->setCreator("Maze Stat Excel")
-                ->setLastModifiedBy("Maze Stat Excel")
-                ->setTitle("Office 2007 XLSX Maze Document")
-                ->setSubject("Office 2007 XLSX Maze Document")
-                ->setDescription("Dever Stat Excel")
-                ->setKeywords("Dever Stat Excel")
-                ->setCategory("Dever Stat Excel");
-
-            $info = $this->info();
-
-            $name = $info['list_header'] . '的' . $info['stat_desc'] . '-' . $info['project_name'];
-
-            $start = 65;
-
-            $s = 0;
-            foreach ($data['thead'] as $k => $v) {
-                if ($s > 0) {
-                    $xls->createSheet();
-                }
-
-                $act = $xls->setActiveSheetIndex($s);
-                $act->setTitle($v[0]);
-
-                $s++;
-                $i = 0;
-                foreach ($v as $kj => $vj) {
-                    $num = 1;
-                    $cell = $this->_getChr($start, $i);
-                    $act->setCellValue($cell . '' . $num, $vj);
-                    $act->getColumnDimension($cell)->setWidth(20);
-                    $i++;
-
-                    if (isset($data['list'][$k])) {
-                        foreach ($data['list'][$k] as $ki => $vi) {
-                            if (isset($vi[$kj])) {
-                                $num += 1;
-                                $act->setCellValue($cell . $num, $vi[$kj]);
-                            }
-                        }
-                    }
-                }
-            }
-
-            //$act->getStyle('A1:'.$k.'20')->getAlignment()->setVertical(PHPExcel_Style_Alignment::VERTICAL_CENTER);   // 垂直居中
-            //$act->getStyle('A1:'.$k.'20')->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_CENTER);// 水平居中
-            $xls->setActiveSheetIndex(0);
-
-            $filename = $name . '.xlsx';
-            header('Pragma: public');
-            header('Expires: 0');
-            header('Cache-Control:must-revalidate,post-check=0,pre-check=0');
-            header('Content-Type:application/force-download');
-            header('Content-Type:application/vnd.ms-execl');
-            header('Content-Type:application/octet-stream');
-            header('Content-Type:application/download');
-            header("Content-Disposition:attachment;filename='" . $filename . "'");
-            header('Content-Transfer-Encoding:binary');
-
-            $write = \PHPExcel_IOFactory::createWriter($xls, 'Excel2007');
-            $write->save('php://output');
-        }
-    }
-
-    /**
-     * stat_search
-     *
-     * @return mixed
-     */
-    private function stat_search($struct, $col, $stat, $search)
-    {
-        unset($struct['id']);
-        unset($struct['cdate']);
-
-        if ($stat) {
-            $stat = explode(',', $stat);
-            foreach ($stat as $k => $v) {
-                if (isset($struct[$v])) {
-                    unset($struct[$v]);
-                }
-            }
-        }
-
-        $struct['day']['name'] = '天';
-        $struct['month']['name'] = '月';
-        $struct['year']['name'] = '年';
-        $param['update'] = 'checkbox';
-        $param['name'] = 'gp';
-        $param['value'] = $col;
-        $param['option'] = $struct;
-
-        $html = '<form action="' . $this->url('stat') . '" method="post" id="f1">';
-        $html .= '<div class="form-group">';
-        $html .= Html::pageLeft(array('name' => '统计项', 'col' => 'col'));
-        $html .= Html::radio($param);
-        $html .= '</div>';
-
-        $input = Dever::preInput('search_');
-
-        if (isset($search['date'])) {
-            foreach ($search['date'] as $k => $v) {
-                $html .= '<div class="form-group">';
-                $this->list_search_time($html, $input, 'search_', $k, $v, 'date');
-                $html .= '</div>';
-            }
-
-            $input = Dever::preInput('search_');
-
-            if ($input) {
-                foreach ($input as $k => $v) {
-                    if ($v && strpos($k, 'option_') !== false) {
-                        Dever::setInput(str_replace('search_', '', $k), $v);
-                    }
-                }
-            }
-        }
-
-        if (isset($search['fulltext'])) {
-            $html .= '<div class="form-group">';
-            $this->list_search_select($html, $input, 'search_fulltext', '选择检索项', $search['fulltext']);
-
-            $this->list_search_select($html, $input, 'search_fulltext_type', '', array
-                (
-                    1 => '精确匹配',
-                    2 => '模糊匹配',
-                    3 => '大于',
-                    4 => '大于等于',
-                    5 => '小于',
-                    6 => '小于等于',
-                ), 1);
-
-            $value = array();
-            $value['name'] = 'search_fulltext_value';
-            $value['class'] = 'form-control';
-            if (isset($input[$value['name']])) {
-                $value['value'] = $input[$value['name']];
-
-                $fix = '';
-                if ($input['search_fulltext_type'] == 2) {
-                    $fix = '%';
-                }
-
-                Dever::setInput('option_' . $input['search_fulltext'], $fix . $value['value'] . $fix);
-
-                //print_r(Dever::input('option_name'));die;
-            }
-            $html .= Html::text($value, false);
-            $html .= '</div>';
-        }
-
-        $html .= '<input type="hidden" name="excel" id="excel"  value="2"><a href="javascript:;" class="btn btn-primary" onclick="$(\'#f1\').attr(\'action\', \'' . $this->url('stat') . '\').submit();">确定</a>';
-
-        $html .= '&nbsp;&nbsp;<a href="javascript:;" class="btn btn-warning" onclick="$(\'#f1\').attr(\'action\', \'' . $this->url('stat_excel') . '\').submit();">下载报表</a>';
-
-        $html .= '</form>';
-
-        return $html;
-    }
-
-    /**
-     * stat_data
-     *
-     * @return mixed
-     */
-    private function stat_data(&$data, $struct, $col, $method)
-    {
-        Dever::setInput('group', $col);
-        switch ($col) {
-            case 'year':
-                $name = '按年统计';
-                break;
-            case 'month':
-                $name = '按月统计';
-                break;
-            case 'day':
-                $name = '按天统计';
-                break;
-            default:
-                $name = $struct[$col]['name'];
-                break;
-        }
-        $list = Dever::load($method, array('group' => $col, 'col' => 'count(1) as total,id'));
-
-        $data['table'] .= '<div style="overflow-y:auto;width:100%;max-height:600px;"><table class="table table-bordered table-striped">';
-
-        $data['table'] .= '<thead><tr><th>' . $name . '</th><th>统计数字</th></tr></thead>';
-
-        $data['thead'][$col] = array($name, '统计数字');
-
-        if ($list) {
-            $data['table'] .= '<tbody>';
-            $total = 0;
-            foreach ($list as $k => $v) {
-                if (isset($v[$col])) {
-                    if (isset($struct[$col]['option'])) {
-                        $option = $this->option($struct[$col]['option']);
-                        if (isset($option[$v[$col]])) {
-                            $v[$col] = $option[$v[$col]];
-                            if (is_array($v[$col])) {
-                                $v[$col] = $v[$col]['name'];
-                            }
-                        }
-                    }
-
-                    $data['table'] .= '<tr><td width="60%" style="word-break:break-all;word-wrap:break-word;">' . $v[$col] . '</td><td>' . $v['total'] . '</td></tr>';
-                    $total += $v['total'];
-
-                    $data['list'][$col][] = array($v[$col], $v['total']);
-                }
-
-            }
-
-            $data['table'] .= '</tbody>';
-
-            if ($total > 0 && $k > 0) {
-                $data['table'] .= '<tr><td style="font-weight:bold">汇总</td><td style="font-weight:bold">' . $total . '</td></tr>';
-                $data['list'][$col][] = array('汇总', $total);
-            }
-
-        }
-
-        $data['table'] .= '</table></div>';
-    }
-
-    /**
-     * load
-     *
-     * @return mixed
-     */
-    private function load($method = 'one', $param = array())
-    {
-        return Dever::load($this->project . '/' . $this->table . '-' . $method, $param);
-    }
-
-    /**
-     * __call
-     *
-     * @return object
-     */
-    public function __call($method, $param)
-    {
-        if (strpos($method, 'html_') !== false) {
-            return Html::text($param);
-        }
-
-        return $this;
-    }
-
-    /**
-     * option
-     *
-     * @return string
-     */
-    private function option($option, $value = false)
-    {
-        if (is_object($option)) {
-            $function = $option;
-            $option = $function();
-        }
-
-        if ($value && is_array($value)) {
-            $state = false;
-            foreach ($value as $k => $v) {
-                if ($v === true) {
-                    $state = true;
-                    break;
-                }
-            }
-            if ($state) {
-                $option = array_intersect_key($option, $value);
-            } else {
-                $option = $value;
-            }
-        }
-
-        return $option;
-    }
-
-    /**
-     * option
-     *
-     * @return string
-     */
-    public function manage()
-    {
-        $config = $this->config();
-
-        return $config;
-    }
-
-    /**
-     * valid
-     *
-     * @return string
-     */
-    public function valid()
-    {
-        //http://placehold.it/350x150
-        $config = $this->config();
-        if (isset($config['struct'])) {
-            $rule = array();
-            $rule['required']['regex'] = 'none';
-            $rule['required']['alertText'] = '此项不能为空';
-            $rule['required']['alertTextCheckboxMultiple'] = '请选择一个选项';
-            $rule['required']['alertTextCheckboxe'] = '请选择一个选项';
-            $rule['required']['alertTextDateRange'] = '日期范围不可空白';
-
-            foreach ($config['struct'] as $k => $v) {
-                if (isset($v['match']) && $v['match'] != 'option' && is_string($v['match']) && strpos($v['match'], '/') !== false) {
-                    if (strstr($v['match'], 'option||')) {
-                        $v['match'] = str_replace('option||', '', $v['match']);
-                    }
-                    $rule[$k]['regex'] = $v['match'];
-                    $rule[$k]['alertText'] = $v['desc'];
-                }
-            }
-        }
-
-        $script = '<script>';
-
-        //参考https://blog.csdn.net/wangzl1163/article/details/51071826
-        //http://code.ciaoca.com/jquery/validation-engine/demo/demoOnForm
-        $script .= '(function($){
-        $.fn.validationEngineLanguage = function(){
-        };
-        $.validationEngineLanguage = {
-            newLang: function(){
-                $.validationEngineLanguage.allRules = ';
-        //此处进行了转义过滤,其实也可以使用json_encode的第二个参数,不过只支持5.4以上版本,考虑到虚拟主机就放弃了
-        $script .= str_replace(array('\\\\', '\\/', '"/', '/"', '/u"', '/g"', '/i"', '\x{4e00}-\x{9fa5}', '\x'), array('\\', '/', '/', '/', '/u', '/g', '/i', '\u4e00-\u9fa5', '\u'), json_encode($rule)) . ';';
-        $script .= '}
-            };
-            $.validationEngineLanguage.newLang();
-        })(jQuery);';
-        $script .= '$(document).ready(function(){
-        $(".form1").validationEngine("attach",{onSuccess:function(){submit();},onFailure:function(){submit();}});
-        });';
-        $script .= '</script>';
-
-        //print_r($script);die;
-
-        return $script;
-    }
-
-    /**
-     * save
-     *
-     * @return string
-     */
-    public function save()
-    {
-        $config = $this->config();
-
-        if (isset($config['manage']['save'])) {
-            return 'yes';
-        }
-
-        return 'no';
-    }
-}

+ 128 - 0
src/Group.php

@@ -0,0 +1,128 @@
+<?php
+
+namespace Manage\src;
+
+use Dever;
+
+class Group
+{
+    private $default = array
+    (
+        'value' => -1,
+        'name' => '请选择',
+    );
+
+    private $search_default = array
+    (
+        'value' => -1,
+        'name' => '选择公司',
+    );
+
+    public function get_api()
+    {
+        # 当前联动级别
+        $level_num = Dever::input('level_num');
+        # 一般为id
+        $level_id = Dever::input('level_id');
+        # 是否是搜索列表页
+        $level_search = Dever::input('level_search');
+        if ($level_search) {
+            $default = $this->search_default;
+            if ($level_num == 1) {
+                $default['name'] = '选择公司';
+            } elseif ($level_num == 2) {
+                $default['name'] = '选择部门';
+            }
+        } else {
+            $default = $this->default;
+        }
+
+        if ($level_id < 0) {
+            Dever::alert('error');
+        }
+
+        if ($level_num == 1) {
+            $data = Dever::db('manage/company')->getAll();
+        } elseif ($level_num == 2) {
+            $data = Dever::db('manage/group')->getAll(array('company_id' => $level_id));
+        }
+
+        if (!$data) {
+            Dever::alert('error');
+        }
+
+        if ($level_search || $level_num >= 1) {
+            array_unshift($data, $default);
+        }
+        $result['level_total'] = 2;
+        $result['list'] = $data;
+        return $result;
+    }
+
+    public function string($info, $im = ',')
+    {
+        if ($info) {
+            if (is_string($info)) {
+                $info = explode(',', $info);
+            }
+            
+            $result = array();
+            foreach ($info as $k => $v) {
+                if ($k == 0) {
+                	$company = Dever::db('manage/company')->one($v);
+                    $result[$k] = $company['name'];
+                } elseif ($k == 1) {
+                    $group = Dever::db('manage/group')->one($v);
+                    $result[$k] = $group['name'];
+                }
+            }
+            return implode($im, $result);
+        }
+        return '';
+    }
+
+    public function update($id, $name, $data)
+    {
+        $info = Dever::db('manage/admin_group')->find($id);
+        $company = Dever::param('company', $data);
+        if ($company) {
+            $update['where_id'] = $info['id'];
+            $update['company_id'] = $company[0];
+            $update['group_id'] = $company[1];
+            Dever::db('manage/admin_group')->update($update);
+        }
+    }
+
+    # 同步
+    public function syncOne($id)
+    {
+        $data = Dever::db('manage/admin_group')->select(array('admin_id' => $id));
+        if ($data) {
+            $company = $group = array();
+            foreach ($data as $k => $v) {
+                $company[$v['company_id']] = $v['company_id'];
+                $group[$v['group_id']] = $v['group_id'];
+            }
+            $company = implode(',', $company);
+            $group = implode(',', $group);
+
+            $up['where_id'] = $id;
+            $up['company'] = $company;
+            $up['group'] = $group;
+            Dever::db('manage/admin')->update($up);
+        }
+    }
+
+    # 同步
+    public function sync_api()
+    {
+        $data = Dever::db('manage/admin')->select();
+        if ($data) {
+            foreach ($data as $k => $v) {
+                $this->syncOne($v['id']);
+            }
+        }
+
+        return 'ok';
+    }
+}

+ 3 - 2
src/Lib/Input.php

@@ -347,6 +347,7 @@ class Input
         } else {
             $pic = 'src="" style=display:none;';
         }
+        $pic_value = $param['value'] ?? "";
 
         $class = 'width:100px;display:inline;';
         if (layadmin()) {
@@ -366,7 +367,7 @@ class Input
         
         '.$param['placeimg'].'
 
-        <a href="javascript:;" title="打开图片管理工具" onclick="picManage($(this), \'' . $param['name'] . '_' . $param['index'] . '\', \''.$param['key'].'\', 1, \''.$param['name'] . '_info_value\', \''.$param['place'].'\')"><img ' . $pic . ' class="update_value cropper_img" update_type="src" id="show_' . $param['name'] . '_' . $param['index'] . '" width="150" /></a></div>
+        <a title="打开图片管理工具" onclick="picManage($(this), \'' . $param['name'] . '_' . $param['index'] . '\', \''.$param['key'].'\', 1, \''.$param['name'] . '_info_value\', \''.$param['place'].'\')"><img ' . $pic . ' class="update_value cropper_img" update_type="src" id="show_' . $param['name'] . '_' . $param['index'] . '" width="150" /></a></div>
         <input type="text" class="update_value form-control ' . (isset($param['valid']) ? $param['valid'] : '') . '" name="' . $param['name'] . '" id="' . $param['name'] . '_' . $param['index'] . '" value="' . (isset($param['value']) ? $param['value'] : (isset($param['default']) ? $param['default'] : '')) . '">';
     }
 
@@ -388,7 +389,7 @@ class Input
                     $temp = explode('.cr', $v);
                     $data_src = $temp[0];
                 }
-                $pic .= '<a href="javascript:;" title="打开图片管理工具" onclick="picManage($(this), \'' . $param['name'] . '_' . $param['index'] . '\', \''.$param['key'].'\', 2, \''.$param['name'] . '_info_value\', \''.$param['place'].'\')"><img class="cropper_img" data-src="'.$data_src.'" src="' . $v . '" id="show_' . $param['name'] . '_' . $param['index'] . '_' . $k . '" width="150"  style="margin-left:5px;" alt="打开图片管理工具"/></a>';
+                $pic .= '<a title="打开图片管理工具" onclick="picManage($(this), \'' . $param['name'] . '_' . $param['index'] . '\', \''.$param['key'].'\', 2, \''.$param['name'] . '_info_value\', \''.$param['place'].'\')"><img class="cropper_img" data-src="'.$data_src.'" src="' . $v . '" id="show_' . $param['name'] . '_' . $param['index'] . '_' . $k . '" width="150"  style="margin-left:5px;" alt="打开图片管理工具"/></a>';
             }
         }
         $class = 'width:100px;display:inline;';

+ 1 - 1
src/Menu.php

@@ -688,7 +688,7 @@ class Menu
         if (layadmin()) {
             $i = 0;
             foreach ($data as $k => $v) {
-                $v['icon'] = $v['icon'] ? "layui-icon " . $v['icon'] : "layui-icon layui-icon-home";
+                $v['icon'] = $v['icon'] ? "layui-icon " . $v['icon'] : "";
                 $cur = '';
                 if ($cur_group) {
                     if ($v['id'] == $cur_group) {

+ 2 - 0
template/layadmin/project/database/update.php

@@ -22,6 +22,8 @@ $view
 ->fetch('#project@value',		'manage/database.info#project')
 ->fetch('#table@value',		'manage/database.info#table') 
 ->fetch('#menu_id@value',		'manage/database.info#menu_id') 
+->fetch('#mul_ids@value',       'manage/database.info#mul_ids') 
+->fetch('#mul_load@value',       'manage/database.info#mul_load') 
 ->fetch('#update_where_id@value',	'manage/database.info#id')
 ->fetch('#url@value',		'manage/database.info#submit')
 ->fetch('#alias@value',		'manage/database.info#alias')