edit

api/Admin.php

@@ -115,7 +115,7 @@ class Admin extends Auth
         if ($this->user['module_data'] && !strstr($this->user['module_data'], $module_id . '-' . $data_id)) {
             Dever::error('无模块权限');
         }
-        $result = Dever::load('common', 'manage')->token($this->user['id'], $this->user['mobile'], $this->user['select']['partition'], $this->user['select']['system_key'], $this->user['select']['system_id'], $this->user['select']['info_id'], $module_id, $data_id);
+        $result = Dever::load('util', 'manage')->token($this->user['id'], $this->user['mobile'], $this->user['select']['partition'], $this->user['select']['system_key'], $this->user['select']['system_id'], $this->user['select']['info_id'], $module_id, $data_id);
         return $result;
     }
 
@@ -129,7 +129,7 @@ class Admin extends Auth
             $data['name'] = $username;
         }
         if ($password) {
-            $data += Dever::load('common', 'manage')->createPwd($password);
+            $data += Dever::load('util', 'manage')->createPwd($password);
         }
         $state = false;
         if ($data) {

api/Login.php

@@ -36,7 +36,7 @@ class Login
             $info['partition'] = $system['partition'];
             $info['system_key'] = $system['key'];
             $info['system_id'] = $system['id'];
-            $partition = Dever::load('common', 'manage')->system($info);
+            $partition = Dever::load('util', 'manage')->system($info);
             $db = Dever::db($system['user_table'], '', true, 'default', $partition);
             $role_db = Dever::db($system['role_table'], '', true, 'default', $partition);
         }
@@ -49,7 +49,7 @@ class Login
                 $insert['name'] = Str::hide($where['mobile']);
                 $insert['mobile'] = $where['mobile'];
                 $insert['role'] = 1;
-                $insert += Dever::load('common', 'manage')->createPwd($password);
+                $insert += Dever::load('util', 'manage')->createPwd($password);
                 $id = $db->insert($insert);
                 $admin = $db->find($id);
             } else {
@@ -62,7 +62,7 @@ class Login
         if ($admin['status'] == 2) {
             Dever::error('登录失败，账户已被封禁');
         }
-        if (Dever::load('common', 'manage')->hash($password, $admin['salt']) != $admin['password']) {
+        if (Dever::load('util', 'manage')->hash($password, $admin['salt']) != $admin['password']) {
             Dever::error('登录失败，账户密码无效');
         }
         # 根据角色获取module_id
@@ -106,7 +106,7 @@ class Login
         if (!$module_id || !$data_id) {
             Dever::error('登录失败，账户无效');
         }
-        return Dever::load('common', 'manage')->token($admin['id'], $admin['mobile'], $system['partition'], $system['key'], $system['id'], $info['id'], $module_id, $data_id);
+        return Dever::load('util', 'manage')->token($admin['id'], $admin['mobile'], $system['partition'], $system['key'], $system['id'], $info['id'], $module_id, $data_id);
     }
     private function checkCode()
     {

api/Page/Data.php

@@ -14,7 +14,7 @@ class Data extends Page
         if ($this->menu && $this->menu['show'] == 1 && !$this->getFunc('list', '列表', 1)) {
             Dever::error('无访问权限');
         }
-        $data['title'] = '';
+        $data['title'] = $this->config['title'] ?? '';
         $data['button'] = $this->button();
         $data['recycler'] = $this->recycler;
         $data = array_merge($data, $this->out());
@@ -101,6 +101,7 @@ class Data extends Page
 
     public function handleData($k, $v)
     {
+        $result = $v;
         $result['index'] = $k+1*Dever::input('pg', '', '', 1);
         $button = $this->button('data_button', $v);
         if ($button) {
@@ -141,7 +142,7 @@ class Data extends Page
             } elseif (isset($value['show'])) {
                 $result[$key] = $this->getShow($value['show'], $v);
             }
-            if ($html == 2) {
+            if ($html == 2 && is_string($result[$key])) {
                 $result[$key] = strip_tags($result[$key]);
             }
         }

api/Page/Diy.php

@@ -12,7 +12,7 @@ class Diy extends Page
     {
         $this->checkFunc();
         if (is_string($this->config)) {
-            $data = Dever::call($this->config, [$this]);
+            $data = Dever::call($this->config, [$this->info]);
         } else {
             $data = $this->config;
         }

api/Page/Pdf.php

@@ -12,7 +12,7 @@ class Pdf extends Page
     {
         $this->checkFunc();
         if (is_string($this->config)) {
-            $data = Dever::call($this->config, [$this]);
+            $data = Dever::call($this->config, [$this->info]);
         } else {
             $data = $this->config;
         }

api/Page/Update.php

@@ -39,7 +39,7 @@ class Update extends Page
                 }
             }
             if (isset($v['spec_data'])) {
-                $spec[$v['key']] = [$k, $v['spec_data'], $v['key'] . '_spec', $v['spec'], $v['spec_field'], $v['spec_template']];
+                $spec[$v['key']] = [$k, $v['spec_data'], $v['key'] . '_spec', $v['spec'], $v['spec_field'], $v['spec_template'] ?? ''];
             }
             if (isset($v['show']) && is_string($v['show'])) {
                 $show[$v['key']] = [$k, $v['show']];
@@ -175,6 +175,11 @@ class Update extends Page
                     }
                     $info[$k] = $v;
                 }
+                # 处理一下select，后续优化
+                if (isset($field[$k]) && isset($field[$k]['type']) && $field[$k]['type'] == 'select' && !$v) {
+                    $v = $info[$k] = '';
+                }
+
                 if (isset($field[$k]) && isset($field[$k]['update'])) {
                     $v = $field[$k]['update'];
                 }
@@ -340,16 +345,16 @@ class Update extends Page
     {
         $field = $this->input('field', '');
         $data['layout'] = [];
-        if (!$field && isset($this->config['layout'])) {
+        if (isset($this->config['layout'])) {
             foreach ($this->config['layout'] as $k => $v) {
                 $field = [];
-                $data['layout'][] = $this->getUpdate($v, $data['update'], $field);
+                $data['layout'][] = $this->getUpdate($v, $data['update'], $field, '100%');
             }
             $data['update'] = [];
         }
     }
 
-    private function getUpdate($set, $update, &$field)
+    private function getUpdate($set, $update, &$field, $width = '')
     {
         $result = [];
         if (is_string($set)) {
@@ -357,6 +362,7 @@ class Update extends Page
             foreach ($set as $k => $v) {
                 foreach ($update as $value) {
                     if ($value['key'] == $v) {
+                        $width && $value['width'] = $width;
                         $result[] = $value;
                         $field[] = $v;
                     }
@@ -366,6 +372,7 @@ class Update extends Page
             foreach ($set as $k => $v) {
                 foreach ($update as $value) {
                     if ($value['key'] == $k) {
+                        $width && $value['width'] = $width;
                         $result[] = array('span' => $v, 'update' => [$value]);
                         $field[] = $k;
                     }
@@ -470,8 +477,9 @@ class Update extends Page
     private function doData(&$data, $key, $value, $field = [], $control = [])
     {
         if (is_array($value)) {
-            if (isset($value[0])) {
-                $value = ltrim(implode(',', $value), ',');
+            # 用最傻的办法做，往往是最好的。。
+            if (isset($value[0]) && !is_array($value[0])) {
+                $value = implode(',', $value);
             } else {
                 $value = Dever::json_encode($value);
             }

api/Page/View.php

@@ -12,7 +12,7 @@ class View extends Page
     {
         $this->checkFunc();
         if (is_string($this->config)) {
-            $data = Dever::call($this->config, [$this]);
+            $data = Dever::call($this->config, [$this->info]);
         } else {
             $data = $this->config;
         }

lib/Auth.php

@@ -12,7 +12,7 @@ class Auth
     public $data = [];
     public function __construct()
     {
-        $info = Dever::load('common', 'manage')->auth();
+        $info = Dever::load('util', 'manage')->auth();
         if (!$info && $this->login) {
             $info['uid'] = 1;
             $info['extend']['system_id'] = 'no';

lib/Group.php

@@ -24,14 +24,14 @@ class Group extends Auth
             $data['system_id'] = $system['id'];
             $data['info_id'] = $data['id'];
             $data['partition'] = $system['partition'];
-            $db = Dever::db($system['user_table'], '', 'default', Dever::load('common', 'manage')->system($data));
+            $db = Dever::db($system['user_table'], '', 'default', Dever::load('util', 'manage')->system($data));
             $info = $db->find(1);
             if (!$info) {
                 $password = '123456';
                 $insert['name'] = Str::hide($data['mobile']);
                 $insert['mobile'] = $data['mobile'];
                 $insert['role'] = 1;
-                $insert += Dever::load('common')->createPwd($password);
+                $insert += Dever::load('common', 'manage')->createPwd($password);
                 $db->insert($insert);
             }
         }
@@ -47,7 +47,7 @@ class Group extends Auth
             $data['system_id'] = $system['id'];
             $data['info_id'] = 1;
             $data['partition'] = $system['partition'];
-            $db = Dever::db($system['user_table'], '', 'default', Dever::load('common', 'manage')->system($data));
+            $db = Dever::db($system['user_table'], '', 'default', Dever::load('util', 'manage')->system($data));
 
             $info = $db->find(['mobile' => $mobile]);
             if ($state && $info) {
@@ -60,10 +60,10 @@ class Group extends Auth
             $insert['role'] = 2;
             $insert['module_data'] = $module['id'] . '-' . $data_id;
             if (!$info) {
-                $insert += Dever::load('common')->createPwd($password);
+                $insert += Dever::load('common', 'manage')->createPwd($password);
                 $db->insert($insert);
             } else {
-                $insert += Dever::load('common')->createPwd($password);
+                $insert += Dever::load('common', 'manage')->createPwd($password);
                 $module_data = $insert['module_data'];
                 unset($insert['module_data']);
                 if (!strstr($info['module_data'], $module_data)) {

lib/Page.php

@@ -21,7 +21,7 @@ class Page extends Auth
         if (!$load) {
             $load = Dever::input('load');
         }
-        list($this->db, $this->menu) = Dever::load('common', 'manage')->db($load);
+        list($this->db, $this->menu) = Dever::load('util', 'manage')->db($load);
         if ($this->menu && $this->menu['show'] == 1) {
             $this->checkMenu($this->menu['id'], false);
         }
@@ -464,7 +464,7 @@ class Page extends Auth
         $upload['cate_id'] = 1;
         $upload['group_key'] = $this->db->config['table'] . '-' . $key;
         $upload['group_name'] = $this->db->config['name'];
-        $upload['user_token'] = Dever::load('common', 'manage')->getToken();
+        $upload['user_token'] = Dever::load('util', 'manage')->getToken();
         $upload['user_table'] = $this->user['table'];
         $upload['user_id'] = $this->user['id'];
         return $upload;
@@ -648,7 +648,7 @@ class Page extends Auth
                         if (empty($value[3])) {
                             $value[3] = 0;
                         }
-                        $p['param']['set']['authorization'] = Dever::load('common', 'manage')->setAuth($value[0], $value[1], $data[$value[2]] ?? $temvaluep[2], $data[$value[3]] ?? $value[3]);
+                        $p['param']['set']['authorization'] = Dever::load('util', 'manage')->setAuth($value[0], $value[1], $data[$value[2]] ?? $temvaluep[2], $data[$value[3]] ?? $value[3]);
                     }
                 }
                 $v = $v[0];
@@ -776,7 +776,7 @@ class Page extends Auth
                 if (isset($v['search'])) {
                     if (is_callable($v['search'])) {
                         $value = $v['search']($v['key'], $v['type'], $value);
-                    } elseif (isset($v['search']['table'])) {
+                    } elseif (is_array($v['search']) && isset($v['search']['table'])) {
                         $v['search']['where'] = Dever::json_decode(str_replace('{value}', $value, Dever::json_encode($v['search']['where'])));
                         $search = Dever::db($v['search']['table'])->select($v['search']['where'], $v['search']['set'] ?? []);
                         $value = [];
@@ -790,6 +790,11 @@ class Page extends Auth
                         if (isset($v['search']['key'])) {
                             $v['key'] = $v['search']['key'];
                         }
+                    } else {
+                        $r = Dever::call($v['search'], [$value]);
+                        $v['key'] = $r[0];
+                        $v['type'] = $r[1];
+                        $value = $r[2];
                     }
                 }
                 if ($v['type'] == 'select_text') {
@@ -820,7 +825,13 @@ class Page extends Auth
                         $value = $value[1];
                     }
                 }
-                if ($v['type'] == 'group') {
+                if (isset($v['col'])) {
+                    $temp = explode(',', $v['col']);
+                    $value = explode(',', $value);
+                    foreach ($temp as $tk => $tv) {
+                        $where[$tv] = $value[$tk];
+                    }
+                } elseif ($v['type'] == 'group') {
                     $where[$v['key']] = ['group', $value];
                 } elseif ($v['type'] == 'selects') {
                     $where[$v['key']] = ['group', $value];
@@ -829,8 +840,9 @@ class Page extends Auth
                     if (is_array($value)) {
                         $t = implode(',', $value);
                     }
-                    //$where[$v['key']] = ['group', $t];
-                    $where[$v['key']] = $t;
+                    $where[$v['key']] = ['group', $t];
+                    //$where[$v['key']] = $t;
+                    //print_r($where);die;
                 } elseif ($v['type'] == 'like') {
                     $where[$v['key']] = ['like', $value];
                 } elseif ($v['type'] == 'in') {

lib/Recycler.php

@@ -14,7 +14,7 @@ class Recycler extends Auth
         $data['field'] = $page->setting('field', $data['head']);
 
         $set['num'] = Dever::input('pgnum', '', '', 10);
-        list($db, $menu) = Dever::load('common', 'manage')->db($where['table']);
+        list($db, $menu) = Dever::load('util', 'manage')->db($where['table']);
         $recycler = Dever::db('recycler', 'manage')->select(['table' => $db->config['load']], $set);
         foreach ($recycler as $k => $v) {
             $content = Dever::json_decode($v['content']);

lib/Role.php

@@ -38,7 +38,7 @@ class Role extends Auth
     public function getAuthData()
     {
         $result = [];
-        $extend = Dever::load('common', 'manage')->extend();
+        $extend = Dever::load('util', 'manage')->extend();
         if ($extend && $extend['system_id']) {
             $system_id = $extend['system_id'];
         } else {

lib/System.php

@@ -25,18 +25,18 @@ class System extends Auth
             $data['system_id'] = $system['id'];
             $data['info_id'] = $data['id'];
             $data['partition'] = $system['partition'];
-            $db = Dever::db($system['user_table'], '', true, 'default', Dever::load('common', 'manage')->system($data));
+            $db = Dever::db($system['user_table'], '', true, 'default', Dever::load('util', 'manage')->system($data));
             $info = $db->find(['mobile' => $data['mobile']]);
             if (!$info) {
                 $password = '123456';
                 $insert['name'] = Str::hide($data['mobile']);
                 $insert['mobile'] = $data['mobile'];
                 $insert['role'] = 1;
-                $insert += Dever::load('common', 'manage')->createPwd($password);
+                $insert += Dever::load('util', 'manage')->createPwd($password);
                 $db->insert($insert);
             }
 
-            $db = Dever::db($system['role_table'], '', true, 'default', Dever::load('common', 'manage')->system($data));
+            $db = Dever::db($system['role_table'], '', true, 'default', Dever::load('util', 'manage')->system($data));
             $info = $db->find(['id' => 1]);
             if (!$info) {
                 $insert = [];
@@ -57,7 +57,7 @@ class System extends Auth
                 $set['system_id'] = $system['id'];
                 $set['info_id'] = 1;
                 $set['partition'] = $system['partition'];
-                $db = Dever::db($system['user_table'], '', 'default', Dever::load('common', 'manage')->system($set));
+                $db = Dever::db($system['user_table'], '', 'default', Dever::load('util', 'manage')->system($set));
 
                 $user = $db->find(['mobile' => $data['mobile']]);
                 if ($state && $user) {
@@ -69,7 +69,7 @@ class System extends Auth
                 $insert['mobile'] = $data['mobile'];
                 $insert['role'] = 2;
                 $insert['module_data'] = $module['id'] . '-' . $info['id'];
-                $insert += Dever::load('common', 'manage')->createPwd($data['password']);
+                $insert += Dever::load('util', 'manage')->createPwd($data['password']);
                 if (!$user) {
                     $db->insert($insert);
                 } else {

lib/Common.php → lib/Util.php

@@ -4,14 +4,46 @@ use Dever\Helper\Str;
 use Dever\Helper\Env;
 use Dever\Helper\Secure;
 use Dever\Helper\Date;
-class Common
+class Util
 {
     # 获取后台传入的数据
-    public function get($col)
+    public function request($col)
     {
         return Dever::input(['set', 'field'])[$col] ?? 0;
     }
 
+    # 快速生成tip
+    public function createTip($call)
+    {
+        $name = '-';
+        $content = [];
+        $call($name, $content);
+        $result['name'] = $name;
+        if ($content) {
+            $result['content'] = ['type' => 'line', 'content' => $content];
+        }
+        return $result;
+    }
+
+    # 加入cron
+    public function cron($name, $project, $api, $time = 3600)
+    {
+        $data = ['project' => $project, 'interface' => $api];
+        $info = Dever::db('cron', 'manage')->find($data);
+        if (!$info) {
+            $data['name'] = $name;
+            $data['ldate'] = time();
+            $data['time'] = 3600;
+            Dever::db('cron', 'manage')->insert($data);
+        }
+    }
+
+    # 快速使用tip里的content
+    public function getTip($data, $key)
+    {
+        return $data['content']['content'][$key]['content'] ?? '';
+    }
+
     public function info()
     {
         $auth = $this->auth();
@@ -41,7 +73,7 @@ class Common
     public function extend()
     {
         # 先从query的set中获取，这个不影响用户登录
-        $auth = $this->get('authorization');
+        $auth = $this->request('authorization');
         if ($auth) {
             $auth = Str::decode($auth);
             $info = Secure::checkLogin($auth);
@@ -134,6 +166,7 @@ class Common
     }
 
     # 将token设置到route权限中，方便后续读取
+    # 系统、模块、模块账户、数据id
     public function setAuth($system, $module_id, $info_id, $data_id = '')
     {
         if (is_string($system)) {

manage/admin.php

@@ -67,7 +67,7 @@ return [
             'cdate',
         ],
         # 扩展展示内容
-        //'expand' => 'manage/common.show',
+        //'expand' => 'manage/util.show',
 
         /*
         'type' => 'article',
@@ -175,7 +175,7 @@ return [
         # 列表页导出
         'export' => [
             'out' => '导出',
-            'manage/common.out' => '自定义导出',
+            'manage/util.out' => '自定义导出',
         ],
         # 搜索字段 fulltext 模糊查询
         'search'    => [
@@ -184,7 +184,7 @@ return [
             'role' => 'group',
         ],
         # 统计
-        //'stat' => 'manage/common.stat',
+        //'stat' => 'manage/util.stat',
     ],
     
     # 更新页配置
@@ -420,7 +420,7 @@ return [
                 # 更新时的值，始终是空的，有值才更新
                 'update' => '',
                 # 对更新的值进行处理
-                'handle' => 'manage/common.createPwd',
+                'handle' => 'manage/util.createPwd',
                 # 空值不允许入库
                 'empty'  => false,
                 'rules'     => [
@@ -457,6 +457,7 @@ return [
                 'field' => 'sign_arg',
                 'name' => '签名参数',
                 'where'  => ['api_id' => 'id'],
+                'type' => 'text',
             ],
             'api/api_notify##' => [
                 'field' => 'sign_id',
@@ -495,7 +496,7 @@ return [
     ],
 
     # 详情页配置
-    'view' => 'manage/common.view',
+    'view' => 'manage/util.view',
 
     # 自定义页配置
     //'diy1' => 'manage/test.diy',

manage/cron.php

@@ -20,6 +20,10 @@ return [
                 'inactive_value' => 2,
             ],
         ],
+
+        'button' => [
+            //'新增' => ['fastadd'],
+        ],
     ],
 
     'update' => [
@@ -31,7 +35,7 @@ return [
                 'type' => 'date',
                 'date_type' => 'datetime',
                 //'value_format' => 'YYYY-MM-DD HH:mm:ss',
-                'handle' => 'manage/common.crateDate',
+                'handle' => 'manage/util.crateDate',
                 'rules' => true,
             ],
             'time' => [

table/cron.php

@@ -10,7 +10,7 @@ return [
         'project'       => [
             'type'      => 'varchar(30)',
             'name'      => '项目',
-            'value'     => 'Dever::call("manage/common.project")',
+            'value'     => 'Dever::call("manage/util.project")',
         ],
         
         'interface'     => [

table/group_org.php

@@ -1,7 +1,7 @@
 <?php
 return [
     'name' => '集团组织',
-    'partition' => 'Dever::call("manage/common.system")',
+    'partition' => 'Dever::call("manage/util.system")',
     'order' => 'sort asc',
     'struct' => [
         'name' => [

table/group_org_job.php

@@ -1,7 +1,7 @@
 <?php
 return [
     'name' => '组织职位',
-    'partition' => 'Dever::call("manage/common.system")',
+    'partition' => 'Dever::call("manage/util.system")',
     'order' => 'sort asc',
     'struct' => [
         'org_id'      => [

table/group_role.php

@@ -1,7 +1,7 @@
 <?php
 return [
     'name' => '集团角色',
-    'partition' => 'Dever::call("manage/common.system")',
+    'partition' => 'Dever::call("manage/util.system")',
     'struct' => [
         'name' => [
             'name'      => '名称',

table/group_user.php

@@ -2,7 +2,7 @@
 return [
     'name' => '集团账户',
     # 定义数据分离
-    'partition' => 'Dever::call("manage/common.system")',
+    'partition' => 'Dever::call("manage/util.system")',
     'struct' => [
         'name' => [
             'name'      => '姓名',