From 03f0757642c6017f13f0ea14e7834c94799af6a0 Mon Sep 17 00:00:00 2001 From: hawind Date: Sun, 28 Nov 2021 12:11:58 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=A1=B9=E7=9B=AElogo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Changelog.md | 3 +- .../Model/Controllers/FieldController.php | 2 + public/model_user.json | 557 ------------------ 3 files changed, 4 insertions(+), 558 deletions(-) delete mode 100644 public/model_user.json diff --git a/Changelog.md b/Changelog.md index bcd8e53e..90bb4ec6 100644 --- a/Changelog.md +++ b/Changelog.md @@ -65,7 +65,8 @@ SQL更新 2.去掉市场费用模块，将来更专注开发进销存，故而去掉行业性模块。 3.整理前端代码架构。 4.优化首页部件显示逻辑，加入信息块筛选。 - 4.清理部分SQL表结构。 + 5.清理部分SQL表结构。 + 6.更新项目logo。 修正 1.修正日历因事件提醒无法保存bug。 SQL安装 diff --git a/app/Gdoo/Model/Controllers/FieldController.php b/app/Gdoo/Model/Controllers/FieldController.php index f8679414..6eae51c2 100644 --- a/app/Gdoo/Model/Controllers/FieldController.php +++ b/app/Gdoo/Model/Controllers/FieldController.php @@ -329,11 +329,13 @@ class FieldController extends DefaultController $model->fill($gets); $model->save(); + /* $_model = DB::table('model')->where('id', $model_id)->first(); $_model['fields'] = DB::table('model_field')->where('model_id', $model_id)->get(); $abc = json_encode($_model, JSON_UNESCAPED_UNICODE | JSON_PRETTY_PRINT); file_put_contents('model_'.$_model['table'].'.json', $abc); + */ return $this->json('恭喜你，操作成功。', url('index', ['model_id' => $gets['model_id']])); } diff --git a/public/model_user.json b/public/model_user.json deleted file mode 100644 index 72157fc1..00000000 --- a/public/model_user.json +++ /dev/null @@ -1,557 +0,0 @@ -{ - "id": 28, - "parent_id": 0, - "type": 0, - "name": "用户", - "relation": "", - "table": "user", - "audit_type": 0, - "is_sort": 0, - "setting": "", - "status": 0, - "lft": 57, - "rgt": 58, - "sort": 255, - "is_trash": 0, - "created_by": null, - "created_at": 0, - "updated_at": 1638068092, - "updated_by": "系统管理员", - "created_id": 0, - "updated_id": 1, - "module_id": null, - "fields": [ - { - "id": 166, - "model_id": 28, - "field": "id", - "name": "ID", - "type": "INT", - "length": "11", - "index": "", - "tips": "", - "form_type": "text", - "validate": "", - "is_index": 1, - "is_search": 1, - "is_sort": 1, - "is_import": 0, - "is_menu": 0, - "not_null": 0, - "setting": "{\"align\":\"center\",\"width\":\"\",\"css\":\"\",\"row_count\":\"\",\"total_count\":\"\",\"default\":\"\"}", - "sort": 18, - "status": 1, - "data_link": "", - "data_field": "", - "data_type": "", - "data_relation": "", - "data_format": null, - "default": null, - "bill_id": null - }, - { - "id": 167, - "model_id": 28, - "field": "name", - "name": "姓名", - "type": "VARCHAR", - "length": "60", - "index": "", - "tips": "", - "form_type": "text", - "validate": "", - "is_index": 1, - "is_search": 1, - "is_sort": 0, - "is_import": 0, - "is_menu": 0, - "not_null": 0, - "setting": "{\"align\":\"\",\"width\":\"\",\"css\":\"\",\"row_count\":\"\",\"cell_count\":\"\",\"default\":\"\"}", - "sort": 1, - "status": 1, - "data_link": "", - "data_field": "", - "data_type": "", - "data_relation": "", - "data_format": null, - "default": null, - "bill_id": null - }, - { - "id": 168, - "model_id": 28, - "field": "username", - "name": "用户名", - "type": "VARCHAR", - "length": "30", - "index": "", - "tips": "", - "form_type": "text", - "validate": "", - "is_index": 1, - "is_search": 1, - "is_sort": 0, - "is_import": 0, - "is_menu": 0, - "not_null": 0, - "setting": "{\"align\":\"center\",\"width\":\"\",\"css\":\"\",\"row_count\":\"\",\"total_count\":\"\",\"default\":\"\"}", - "sort": 2, - "status": 1, - "data_link": "", - "data_field": "", - "data_type": "", - "data_relation": "", - "data_format": null, - "default": null, - "bill_id": null - }, - { - "id": 169, - "model_id": 28, - "field": "phone", - "name": "手机号", - "type": "VARCHAR", - "length": "30", - "index": "", - "tips": "", - "form_type": "text", - "validate": "", - "is_index": 1, - "is_search": 1, - "is_sort": 0, - "is_import": 0, - "is_menu": 0, - "not_null": 0, - "setting": "{\"align\":\"\",\"width\":\"\",\"css\":\"\",\"row_count\":\"\",\"cell_count\":\"\",\"default\":\"\"}", - "sort": 3, - "status": 1, - "data_link": "", - "data_field": "", - "data_type": "", - "data_relation": "", - "data_format": null, - "default": null, - "bill_id": null - }, - { - "id": 170, - "model_id": 28, - "field": "department_id", - "name": "所属部门", - "type": "INT", - "length": "11", - "index": "INDEX", - "tips": "", - "form_type": "dialog", - "validate": "", - "is_index": 1, - "is_search": 1, - "is_sort": 0, - "is_import": 0, - "is_menu": 0, - "not_null": 0, - "setting": "{\"align\":\"center\",\"width\":\"160\",\"css\":\"\",\"type\":\"department\",\"default\":\"\",\"single\":\"1\"}", - "sort": 11, - "status": 1, - "data_link": "department_id", - "data_field": "name", - "data_type": "department", - "data_relation": "", - "data_format": null, - "default": null, - "bill_id": null - }, - { - "id": 183, - "model_id": 28, - "field": "avatar", - "name": "头像", - "type": "VARCHAR", - "length": "100", - "index": "", - "tips": "", - "form_type": "images", - "validate": "", - "is_index": 0, - "is_search": 0, - "is_sort": 0, - "is_import": 0, - "is_menu": 0, - "not_null": 0, - "setting": "{\"align\":\"\",\"path\":\"\",\"size\":\"\"}", - "sort": 0, - "status": 1, - "data_link": "", - "data_field": "", - "data_type": "", - "data_relation": "", - "data_format": null, - "default": null, - "bill_id": null - }, - { - "id": 186, - "model_id": 28, - "field": "birthday", - "name": "生日", - "type": "DATE", - "length": "", - "index": "", - "tips": "", - "form_type": "date", - "validate": "", - "is_index": 0, - "is_search": 0, - "is_sort": 0, - "is_import": 0, - "is_menu": 0, - "not_null": 0, - "setting": "{\"type\":\"Y-m-d\",\"save\":\"date\",\"min_date\":\"\",\"max_date\":\"\",\"align\":\"center\",\"width\":\"\",\"css\":\"\",\"default\":\"0\"}", - "sort": 5, - "status": 1, - "data_link": "", - "data_field": "", - "data_type": "", - "data_relation": "", - "data_format": null, - "default": null, - "bill_id": null - }, - { - "id": 187, - "model_id": 28, - "field": "gender", - "name": "性别", - "type": "TINYINT", - "length": "3", - "index": "INDEX", - "tips": "", - "form_type": "option", - "validate": "", - "is_index": 1, - "is_search": 1, - "is_sort": 0, - "is_import": 0, - "is_menu": 0, - "not_null": 0, - "setting": "{\"align\":\"center\",\"width\":\"\",\"css\":\"\",\"type\":\"user.gender\",\"default\":\"\",\"single\":\"1\"}", - "sort": 8, - "status": 1, - "data_link": "", - "data_field": "", - "data_type": "", - "data_relation": "", - "data_format": null, - "default": null, - "bill_id": null - }, - { - "id": 188, - "model_id": 28, - "field": "post_id", - "name": "岗位", - "type": "TINYINT", - "length": "3", - "index": "INDEX", - "tips": null, - "form_type": "dialog", - "validate": "", - "is_index": 0, - "is_search": 0, - "is_sort": 0, - "is_import": 0, - "is_menu": 0, - "not_null": 0, - "setting": "{\"align\":\"center\",\"width\":null,\"css\":null,\"type\":\"position\",\"query_key\":null,\"query_value\":null,\"query\":null,\"default\":null,\"single\":\"1\"}", - "sort": 6, - "status": 1, - "data_link": "post_id", - "data_field": "name", - "data_type": "user_post", - "data_relation": "", - "data_format": null, - "default": null, - "bill_id": null - }, - { - "id": 189, - "model_id": 28, - "field": "role_id", - "name": "所属角色", - "type": "INT", - "length": "11", - "index": "INDEX", - "tips": "", - "form_type": "dialog", - "validate": "", - "is_index": 1, - "is_search": 1, - "is_sort": 0, - "is_import": 0, - "is_menu": 0, - "not_null": 0, - "setting": "{\"align\":\"center\",\"width\":\"180\",\"css\":\"\",\"type\":\"role\",\"default\":\"\",\"single\":\"1\"}", - "sort": 12, - "status": 1, - "data_link": "role_id", - "data_field": "name", - "data_type": "role", - "data_relation": "", - "data_format": null, - "default": null, - "bill_id": null - }, - { - "id": 190, - "model_id": 28, - "field": "status", - "name": "状态", - "type": "TINYINT", - "length": "3", - "index": "INDEX", - "tips": "", - "form_type": "select", - "validate": "", - "is_index": 0, - "is_search": 0, - "is_sort": 0, - "is_import": 0, - "is_menu": 0, - "not_null": 0, - "setting": "{\"align\":null,\"width\":null,\"content\":\"启用|1\\r\\n禁用|0\",\"query_key\":null,\"query_value\":null,\"query\":null,\"default\":\"1\",\"single\":\"0\"}", - "sort": 17, - "status": 1, - "data_link": "", - "data_field": "", - "data_type": "", - "data_relation": "", - "data_format": null, - "default": null, - "bill_id": null - }, - { - "id": 191, - "model_id": 28, - "field": "auth_secret", - "name": "安全密钥", - "type": "VARCHAR", - "length": "60", - "index": "", - "tips": "", - "form_type": "custom", - "validate": "", - "is_index": 0, - "is_search": 0, - "is_sort": 0, - "is_import": 0, - "is_menu": 0, - "not_null": 0, - "setting": "{\"align\":\"\",\"method\":\"\",\"width\":\"\",\"css\":\"\",\"default\":\"\"}", - "sort": 15, - "status": 1, - "data_link": "", - "data_field": "", - "data_type": "", - "data_relation": "", - "data_format": null, - "default": null, - "bill_id": null - }, - { - "id": 192, - "model_id": 28, - "field": "auth_totp", - "name": "二次验证", - "type": "TINYINT", - "length": "3", - "index": "INDEX", - "tips": "", - "form_type": "checkbox", - "validate": "", - "is_index": 0, - "is_search": 0, - "is_sort": 0, - "is_import": 0, - "is_menu": 0, - "not_null": 0, - "setting": "{\"align\":\"\",\"content\":\"\\u4e8c\\u6b21\\u9a8c\\u8bc1|1\",\"default\":\"\"}", - "sort": 16, - "status": 1, - "data_link": "", - "data_field": "", - "data_type": "", - "data_relation": "", - "data_format": null, - "default": null, - "bill_id": null - }, - { - "id": 193, - "model_id": 28, - "field": "leader_id", - "name": "直属领导", - "type": "INT", - "length": "11", - "index": "", - "tips": "", - "form_type": "dialog", - "validate": "", - "is_index": 0, - "is_search": 0, - "is_sort": 0, - "is_import": 0, - "is_menu": 0, - "not_null": 0, - "setting": "{\"align\":\"center\",\"width\":\"\",\"css\":\"\",\"type\":\"user\",\"default\":\"\",\"single\":\"1\"}", - "sort": 13, - "status": 1, - "data_link": "leader_id", - "data_field": "name", - "data_type": "user", - "data_relation": "", - "data_format": null, - "default": null, - "bill_id": null - }, - { - "id": 194, - "model_id": 28, - "field": "password", - "name": "密码", - "type": "VARCHAR", - "length": "64", - "index": "", - "tips": "不修改密码请留空", - "form_type": "password", - "validate": "", - "is_index": 0, - "is_search": 0, - "is_sort": 0, - "is_import": 0, - "is_menu": 0, - "not_null": 0, - "setting": "{\"align\":\"\",\"width\":\"\",\"css\":\"\",\"default\":\"\"}", - "sort": 14, - "status": 1, - "data_link": "", - "data_field": "", - "data_type": "", - "data_relation": "", - "data_format": null, - "default": null, - "bill_id": null - }, - { - "id": 195, - "model_id": 28, - "field": "email", - "name": "电子邮箱", - "type": "VARCHAR", - "length": "30", - "index": "", - "tips": "", - "form_type": "text", - "validate": "", - "is_index": 1, - "is_search": 1, - "is_sort": 0, - "is_import": 0, - "is_menu": 0, - "not_null": 0, - "setting": "{\"align\":\"\",\"width\":\"auto\",\"css\":\"\",\"row_count\":\"\",\"total_count\":\"\",\"default\":\"\"}", - "sort": 10, - "status": 1, - "data_link": "", - "data_field": "", - "data_type": "", - "data_relation": "", - "data_format": null, - "default": null, - "bill_id": null - }, - { - "id": 3356, - "model_id": 28, - "field": "tel", - "name": "电话", - "type": "NVARCHAR", - "length": "30", - "index": null, - "tips": null, - "form_type": "text", - "validate": null, - "is_index": null, - "is_search": null, - "is_sort": null, - "is_import": null, - "is_menu": null, - "not_null": 1, - "setting": "{\"align\":\"\",\"width\":\"\",\"css\":\"\",\"row_count\":\"\",\"cell_count\":\"\",\"default\":\"\"}", - "sort": 4, - "status": 1, - "data_link": null, - "data_field": null, - "data_type": null, - "data_relation": null, - "data_format": null, - "default": "NULL", - "bill_id": null - }, - { - "id": 3370, - "model_id": 28, - "field": "level_id", - "name": "职级", - "type": "SMALLINT", - "length": "5", - "index": "INDEX", - "tips": null, - "form_type": "select", - "validate": null, - "is_index": 1, - "is_search": 1, - "is_sort": null, - "is_import": null, - "is_menu": null, - "not_null": 0, - "setting": "{\"align\":null,\"width\":null,\"content\":null,\"query_key\":null,\"query_value\":null,\"query\":null,\"default\":null,\"single\":\"1\"}", - "sort": 7, - "status": null, - "data_link": "level_id", - "data_field": "name", - "data_type": "user_level", - "data_relation": null, - "data_format": null, - "default": "NULL", - "bill_id": null - }, - { - "id": 3374, - "model_id": 28, - "field": "group_id", - "name": "用户组", - "type": "INT", - "length": "11", - "index": "INDEX", - "tips": null, - "form_type": "select", - "validate": null, - "is_index": 1, - "is_search": 1, - "is_sort": null, - "is_import": null, - "is_menu": null, - "not_null": 0, - "setting": "{\"align\":null,\"width\":null,\"content\":null,\"query_key\":null,\"query_value\":null,\"query\":null,\"default\":null,\"single\":\"1\"}", - "sort": 9, - "status": null, - "data_link": "group_id", - "data_field": "name", - "data_type": "user_group", - "data_relation": null, - "data_format": null, - "default": "NULL", - "bill_id": null - } - ] -} \ No newline at end of file