From 178e024cf87cd4121fe38d43a8e5e122a405d29b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=95=E9=87=91=E6=B3=BD?= <1098696801@qq.com> Date: Sun, 27 Mar 2022 22:44:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E3=80=81?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../magic-api/api/后台/代码生成/查出所有表.ms | 99 ----- .../api/{后台 => 系统功能}/group.json | 6 +- .../{后台 => 系统功能}/代码生成/group.json | 2 +- data/magic-api/api/系统功能/代码生成/保存.ms | 40 ++ .../api/{后台 => 系统功能}/代码生成/列表.ms | 84 ++-- data/magic-api/api/系统功能/代码生成/删除.ms | 25 ++ .../api/系统功能/代码生成/执行生成.ms | 362 ++++++++++++++++++ .../api/系统功能/代码生成/查出所有表.ms | 135 +++++++ .../代码生成/根据表名查出所有列.ms | 41 +- data/magic-api/api/系统功能/代码生成/详情.ms | 27 ++ .../{后台 => 系统功能}/在线用户/group.json | 2 +- .../api/{后台 => 系统功能}/在线用户/列表.ms | 0 .../api/{后台 => 系统功能}/在线用户/踢人.ms | 0 .../api/{后台 => 系统功能}/安全/group.json | 2 +- .../api/{后台 => 系统功能}/安全/登录.ms | 2 +- .../安全/获取当前用户权限code.ms | 0 .../api/{后台 => 系统功能}/安全/退出登录.ms | 0 .../api/{后台 => 系统功能}/安全/验证token.ms | 0 .../api/{后台 => 系统功能}/安全/验证码.ms | 0 .../api/{后台 => 系统功能}/富文本/group.json | 2 +- .../api/{后台 => 系统功能}/富文本/上传图片.ms | 0 .../api/{后台 => 系统功能}/富文本/上传文件.ms | 0 .../api/{后台 => 系统功能}/富文本/入口get.ms | 0 .../api/{后台 => 系统功能}/富文本/入口post.ms | 0 .../api/{后台 => 系统功能}/富文本/配置.ms | 0 .../{后台 => 系统功能}/数据字典/group.json | 2 +- .../api/{后台 => 系统功能}/数据字典/保存.ms | 0 .../api/{后台 => 系统功能}/数据字典/列表.ms | 0 .../api/{后台 => 系统功能}/数据字典/删除.ms | 0 .../数据字典/字典项/group.json | 0 .../数据字典/字典项/保存.ms | 0 .../数据字典/字典项/列表.ms | 0 .../数据字典/字典项/删除.ms | 0 .../数据字典/字典项/获取所有字典项.ms | 0 .../数据字典/字典项/获取排序号.ms | 0 .../{后台 => 系统功能}/数据字典/所有字典.ms | 0 .../{后台 => 系统功能}/数据字典/获取排序号.ms | 0 .../{后台 => 系统功能}/文件管理/group.json | 2 +- .../api/{后台 => 系统功能}/文件管理/上传.ms | 0 .../api/{后台 => 系统功能}/文件管理/删除.ms | 0 .../api/{后台 => 系统功能}/文件管理/排序.ms | 0 .../文件管理/获取文件列表.ms | 0 .../api/{后台 => 系统功能}/文件管理/裁剪.ms | 0 .../{后台 => 系统功能}/日志管理/group.json | 2 +- .../{后台 => 系统功能}/日志管理/操作日志.ms | 0 .../{后台 => 系统功能}/日志管理/登录日志.ms | 0 .../{后台 => 系统功能}/测试数据/group.json | 2 +- .../api/{后台 => 系统功能}/测试数据/保存.ms | 0 .../api/{后台 => 系统功能}/测试数据/列表.ms | 0 .../{后台 => 系统功能}/用户管理/group.json | 2 +- .../用户管理/个人信息修改.ms | 0 .../api/{后台 => 系统功能}/用户管理/保存.ms | 0 .../用户管理/修改登录状态.ms | 0 .../api/{后台 => 系统功能}/用户管理/列表.ms | 0 .../api/{后台 => 系统功能}/用户管理/删除.ms | 0 .../{后台 => 系统功能}/用户管理/所有机构.ms | 0 .../用户管理/根据用户id获取角色列表.ms | 0 .../用户管理/获取用户信息.ms | 0 .../api/{后台 => 系统功能}/组件/group.json | 2 +- .../api/{后台 => 系统功能}/组件/列表.ms | 8 +- .../api/{后台 => 系统功能}/组件/选择组件.ms | 0 .../{后台 => 系统功能}/组织机构/group.json | 2 +- .../api/{后台 => 系统功能}/组织机构/上移.ms | 0 .../api/{后台 => 系统功能}/组织机构/下移.ms | 0 .../api/{后台 => 系统功能}/组织机构/保存.ms | 0 .../api/{后台 => 系统功能}/组织机构/列表.ms | 0 .../api/{后台 => 系统功能}/组织机构/删除.ms | 0 .../组织机构/根据角色获取组织机构.ms | 0 .../{后台 => 系统功能}/组织机构/获取排序号.ms | 0 .../{后台 => 系统功能}/菜单管理/group.json | 2 +- .../api/{后台 => 系统功能}/菜单管理/上移.ms | 0 .../api/{后台 => 系统功能}/菜单管理/下移.ms | 0 .../api/{后台 => 系统功能}/菜单管理/保存.ms | 0 .../菜单管理/修改是否显示.ms | 0 .../api/{后台 => 系统功能}/菜单管理/删除.ms | 0 .../菜单管理/当前用户菜单.ms | 0 .../菜单管理/根据菜单id清除缓存.ms | 0 .../菜单管理/根据角色获取菜单.ms | 0 .../{后台 => 系统功能}/菜单管理/获取排序号.ms | 0 .../菜单管理/获取菜单tree.ms | 0 .../{后台 => 系统功能}/角色管理/group.json | 2 +- .../api/{后台 => 系统功能}/角色管理/保存.ms | 0 .../api/{后台 => 系统功能}/角色管理/全部.ms | 0 .../api/{后台 => 系统功能}/角色管理/列表.ms | 0 .../api/{后台 => 系统功能}/角色管理/删除.ms | 0 .../角色管理/根据角色id删除缓存.ms | 0 .../api/{后台 => 系统功能}/配置/group.json | 2 +- .../{后台 => 系统功能}/配置/获取所有配置.ms | 0 .../component/系统管理/字典管理/列表.ms | 2 +- .../src/components/magic/advanced/mb-list.vue | 2 +- .../magic/basic/mb-editor-table.vue | 9 +- .../src/components/magic/basic/mb-table.vue | 8 +- .../components/magic/form/mb-upload-file.vue | 2 +- .../components/magic/form/mb-upload-image.vue | 6 +- magic-boot-ui/src/layout/layout.vue | 2 +- magic-boot-ui/src/permission.js | 2 +- magic-boot-ui/src/scripts/common.js | 16 +- .../src/scripts/gen/gen-magic-api.js | 6 + magic-boot-ui/src/scripts/gen/gen-mb-list.js | 61 ++- magic-boot-ui/src/scripts/global.js | 2 +- .../src/views/examples/editor-table.vue | 55 ++- .../src/views/examples/test-mb-list.vue | 20 +- .../src/views/lowcode/code-gen-form.vue | 335 +++++++++++++++- .../src/views/lowcode/code-gen-list.vue | 36 +- .../src/views/lowcode/magic-editor.vue | 2 +- .../src/views/system/dict/dict-items.vue | 2 +- .../src/views/system/dict/dict-list.vue | 2 +- .../src/views/system/menu/menu-form.vue | 2 +- .../src/views/system/monitor/druid.vue | 2 +- .../src/views/system/monitor/login-log.vue | 2 +- .../src/views/system/monitor/oper-log.vue | 2 +- .../src/views/system/role/role-list.vue | 2 +- .../src/views/system/test/test-list.vue | 2 +- .../src/views/system/user/user-form.vue | 1 + .../src/views/system/user/user-list.vue | 2 +- 115 files changed, 1140 insertions(+), 302 deletions(-) delete mode 100644 data/magic-api/api/后台/代码生成/查出所有表.ms rename data/magic-api/api/{后台 => 系统功能}/group.json (52%) rename data/magic-api/api/{后台 => 系统功能}/代码生成/group.json (77%) create mode 100644 data/magic-api/api/系统功能/代码生成/保存.ms rename data/magic-api/api/{后台 => 系统功能}/代码生成/列表.ms (63%) create mode 100644 data/magic-api/api/系统功能/代码生成/删除.ms create mode 100644 data/magic-api/api/系统功能/代码生成/执行生成.ms create mode 100644 data/magic-api/api/系统功能/代码生成/查出所有表.ms rename data/magic-api/api/{后台 => 系统功能}/代码生成/根据表名查出所有列.ms (69%) create mode 100644 data/magic-api/api/系统功能/代码生成/详情.ms rename data/magic-api/api/{后台 => 系统功能}/在线用户/group.json (77%) rename data/magic-api/api/{后台 => 系统功能}/在线用户/列表.ms (100%) rename data/magic-api/api/{后台 => 系统功能}/在线用户/踢人.ms (100%) rename data/magic-api/api/{后台 => 系统功能}/安全/group.json (76%) rename data/magic-api/api/{后台 => 系统功能}/安全/登录.ms (99%) rename data/magic-api/api/{后台 => 系统功能}/安全/获取当前用户权限code.ms (100%) rename data/magic-api/api/{后台 => 系统功能}/安全/退出登录.ms (100%) rename data/magic-api/api/{后台 => 系统功能}/安全/验证token.ms (100%) rename data/magic-api/api/{后台 => 系统功能}/安全/验证码.ms (100%) rename data/magic-api/api/{后台 => 系统功能}/富文本/group.json (90%) rename data/magic-api/api/{后台 => 系统功能}/富文本/上传图片.ms (100%) rename data/magic-api/api/{后台 => 系统功能}/富文本/上传文件.ms (100%) rename data/magic-api/api/{后台 => 系统功能}/富文本/入口get.ms (100%) rename data/magic-api/api/{后台 => 系统功能}/富文本/入口post.ms (100%) rename data/magic-api/api/{后台 => 系统功能}/富文本/配置.ms (100%) rename data/magic-api/api/{后台 => 系统功能}/数据字典/group.json (76%) rename data/magic-api/api/{后台 => 系统功能}/数据字典/保存.ms (100%) rename data/magic-api/api/{后台 => 系统功能}/数据字典/列表.ms (100%) rename data/magic-api/api/{后台 => 系统功能}/数据字典/删除.ms (100%) rename data/magic-api/api/{后台 => 系统功能}/数据字典/字典项/group.json (100%) rename data/magic-api/api/{后台 => 系统功能}/数据字典/字典项/保存.ms (100%) rename data/magic-api/api/{后台 => 系统功能}/数据字典/字典项/列表.ms (100%) rename data/magic-api/api/{后台 => 系统功能}/数据字典/字典项/删除.ms (100%) rename data/magic-api/api/{后台 => 系统功能}/数据字典/字典项/获取所有字典项.ms (100%) rename data/magic-api/api/{后台 => 系统功能}/数据字典/字典项/获取排序号.ms (100%) rename data/magic-api/api/{后台 => 系统功能}/数据字典/所有字典.ms (100%) rename data/magic-api/api/{后台 => 系统功能}/数据字典/获取排序号.ms (100%) rename data/magic-api/api/{后台 => 系统功能}/文件管理/group.json (76%) rename data/magic-api/api/{后台 => 系统功能}/文件管理/上传.ms (100%) rename data/magic-api/api/{后台 => 系统功能}/文件管理/删除.ms (100%) rename data/magic-api/api/{后台 => 系统功能}/文件管理/排序.ms (100%) rename data/magic-api/api/{后台 => 系统功能}/文件管理/获取文件列表.ms (100%) rename data/magic-api/api/{后台 => 系统功能}/文件管理/裁剪.ms (100%) rename data/magic-api/api/{后台 => 系统功能}/日志管理/group.json (76%) rename data/magic-api/api/{后台 => 系统功能}/日志管理/操作日志.ms (100%) rename data/magic-api/api/{后台 => 系统功能}/日志管理/登录日志.ms (100%) rename data/magic-api/api/{后台 => 系统功能}/测试数据/group.json (76%) rename data/magic-api/api/{后台 => 系统功能}/测试数据/保存.ms (100%) rename data/magic-api/api/{后台 => 系统功能}/测试数据/列表.ms (100%) rename data/magic-api/api/{后台 => 系统功能}/用户管理/group.json (76%) rename data/magic-api/api/{后台 => 系统功能}/用户管理/个人信息修改.ms (100%) rename data/magic-api/api/{后台 => 系统功能}/用户管理/保存.ms (100%) rename data/magic-api/api/{后台 => 系统功能}/用户管理/修改登录状态.ms (100%) rename data/magic-api/api/{后台 => 系统功能}/用户管理/列表.ms (100%) rename data/magic-api/api/{后台 => 系统功能}/用户管理/删除.ms (100%) rename data/magic-api/api/{后台 => 系统功能}/用户管理/所有机构.ms (100%) rename data/magic-api/api/{后台 => 系统功能}/用户管理/根据用户id获取角色列表.ms (100%) rename data/magic-api/api/{后台 => 系统功能}/用户管理/获取用户信息.ms (100%) rename data/magic-api/api/{后台 => 系统功能}/组件/group.json (76%) rename data/magic-api/api/{后台 => 系统功能}/组件/列表.ms (83%) rename data/magic-api/api/{后台 => 系统功能}/组件/选择组件.ms (100%) rename data/magic-api/api/{后台 => 系统功能}/组织机构/group.json (77%) rename data/magic-api/api/{后台 => 系统功能}/组织机构/上移.ms (100%) rename data/magic-api/api/{后台 => 系统功能}/组织机构/下移.ms (100%) rename data/magic-api/api/{后台 => 系统功能}/组织机构/保存.ms (100%) rename data/magic-api/api/{后台 => 系统功能}/组织机构/列表.ms (100%) rename data/magic-api/api/{后台 => 系统功能}/组织机构/删除.ms (100%) rename data/magic-api/api/{后台 => 系统功能}/组织机构/根据角色获取组织机构.ms (100%) rename data/magic-api/api/{后台 => 系统功能}/组织机构/获取排序号.ms (100%) rename data/magic-api/api/{后台 => 系统功能}/菜单管理/group.json (76%) rename data/magic-api/api/{后台 => 系统功能}/菜单管理/上移.ms (100%) rename data/magic-api/api/{后台 => 系统功能}/菜单管理/下移.ms (100%) rename data/magic-api/api/{后台 => 系统功能}/菜单管理/保存.ms (100%) rename data/magic-api/api/{后台 => 系统功能}/菜单管理/修改是否显示.ms (100%) rename data/magic-api/api/{后台 => 系统功能}/菜单管理/删除.ms (100%) rename data/magic-api/api/{后台 => 系统功能}/菜单管理/当前用户菜单.ms (100%) rename data/magic-api/api/{后台 => 系统功能}/菜单管理/根据菜单id清除缓存.ms (100%) rename data/magic-api/api/{后台 => 系统功能}/菜单管理/根据角色获取菜单.ms (100%) rename data/magic-api/api/{后台 => 系统功能}/菜单管理/获取排序号.ms (100%) rename data/magic-api/api/{后台 => 系统功能}/菜单管理/获取菜单tree.ms (100%) rename data/magic-api/api/{后台 => 系统功能}/角色管理/group.json (76%) rename data/magic-api/api/{后台 => 系统功能}/角色管理/保存.ms (100%) rename data/magic-api/api/{后台 => 系统功能}/角色管理/全部.ms (100%) rename data/magic-api/api/{后台 => 系统功能}/角色管理/列表.ms (100%) rename data/magic-api/api/{后台 => 系统功能}/角色管理/删除.ms (100%) rename data/magic-api/api/{后台 => 系统功能}/角色管理/根据角色id删除缓存.ms (100%) rename data/magic-api/api/{后台 => 系统功能}/配置/group.json (76%) rename data/magic-api/api/{后台 => 系统功能}/配置/获取所有配置.ms (100%) create mode 100644 magic-boot-ui/src/scripts/gen/gen-magic-api.js diff --git a/data/magic-api/api/后台/代码生成/查出所有表.ms b/data/magic-api/api/后台/代码生成/查出所有表.ms deleted file mode 100644 index d247a68..0000000 --- a/data/magic-api/api/后台/代码生成/查出所有表.ms +++ /dev/null @@ -1,99 +0,0 @@ -{ - "properties" : { }, - "id" : "6db309d3d6d0461c97419641849a99b4", - "script" : null, - "groupId" : "f2538e0f370a4cabab0ae920f5e77ae7", - "name" : "查出所有表", - "createTime" : null, - "updateTime" : 1647561263994, - "lock" : null, - "createBy" : null, - "updateBy" : null, - "path" : "/tables", - "method" : "GET", - "parameters" : [ ], - "options" : [ ], - "requestBody" : null, - "headers" : [ ], - "paths" : [ ], - "responseBody" : "{\n \"code\": 402,\n \"message\": \"凭证已过期\",\n \"data\": null,\n \"timestamp\": 1647561224202,\n \"executeTime\": null\n}", - "description" : null, - "requestBodyDefinition" : null, - "responseBodyDefinition" : { - "name" : "", - "value" : "", - "description" : "", - "required" : false, - "dataType" : "Object", - "type" : null, - "defaultValue" : null, - "validateType" : "", - "error" : "", - "expression" : "", - "children" : [ { - "name" : "code", - "value" : "402", - "description" : "", - "required" : false, - "dataType" : "Integer", - "type" : null, - "defaultValue" : null, - "validateType" : "", - "error" : "", - "expression" : "", - "children" : [ ] - }, { - "name" : "message", - "value" : "凭证已过期", - "description" : "", - "required" : false, - "dataType" : "String", - "type" : null, - "defaultValue" : null, - "validateType" : "", - "error" : "", - "expression" : "", - "children" : [ ] - }, { - "name" : "data", - "value" : "null", - "description" : "", - "required" : false, - "dataType" : "Object", - "type" : null, - "defaultValue" : null, - "validateType" : "", - "error" : "", - "expression" : "", - "children" : [ ] - }, { - "name" : "timestamp", - "value" : "1647561224202", - "description" : "", - "required" : false, - "dataType" : "Long", - "type" : null, - "defaultValue" : null, - "validateType" : "", - "error" : "", - "expression" : "", - "children" : [ ] - }, { - "name" : "executeTime", - "value" : "null", - "description" : "", - "required" : false, - "dataType" : "Object", - "type" : null, - "defaultValue" : null, - "validateType" : "", - "error" : "", - "expression" : "", - "children" : [ ] - } ] - } -} -================================ -return db.select(""" - select table_name, table_comment from information_schema.tables where table_schema = database() -""") \ No newline at end of file diff --git a/data/magic-api/api/后台/group.json b/data/magic-api/api/系统功能/group.json similarity index 52% rename from data/magic-api/api/后台/group.json rename to data/magic-api/api/系统功能/group.json index 939057e..0be85d4 100644 --- a/data/magic-api/api/后台/group.json +++ b/data/magic-api/api/系统功能/group.json @@ -1,10 +1,10 @@ { "properties" : { }, - "id" : "02df51e4d7184780a98b632f43dc5848", - "name" : "后台", + "id" : "acff5ad7aae64de2acb03e1d16a58ce2", + "name" : "系统功能", "type" : "api", "parentId" : "0", - "path" : "", + "path" : null, "paths" : [ ], "options" : [ ] } \ No newline at end of file diff --git a/data/magic-api/api/后台/代码生成/group.json b/data/magic-api/api/系统功能/代码生成/group.json similarity index 77% rename from data/magic-api/api/后台/代码生成/group.json rename to data/magic-api/api/系统功能/代码生成/group.json index 1db5a3b..d7e0f4c 100644 --- a/data/magic-api/api/后台/代码生成/group.json +++ b/data/magic-api/api/系统功能/代码生成/group.json @@ -3,7 +3,7 @@ "id" : "f2538e0f370a4cabab0ae920f5e77ae7", "name" : "代码生成", "type" : "api", - "parentId" : "02df51e4d7184780a98b632f43dc5848", + "parentId" : "acff5ad7aae64de2acb03e1d16a58ce2", "path" : "/code/gen", "paths" : [ ], "options" : [ ] diff --git a/data/magic-api/api/系统功能/代码生成/保存.ms b/data/magic-api/api/系统功能/代码生成/保存.ms new file mode 100644 index 0000000..1b0044c --- /dev/null +++ b/data/magic-api/api/系统功能/代码生成/保存.ms @@ -0,0 +1,40 @@ +{ + "properties" : { }, + "id" : "5ce5b7d99dd044a9b837c57df7aa9ca5", + "script" : null, + "groupId" : "f2538e0f370a4cabab0ae920f5e77ae7", + "name" : "保存", + "createTime" : null, + "updateTime" : 1648391254377, + "lock" : null, + "createBy" : null, + "updateBy" : null, + "path" : "/save", + "method" : "POST", + "parameters" : [ ], + "options" : [ { + "name" : "wrap_request_parameter", + "value" : "data", + "description" : "包装请求参数到一个变量中", + "required" : false, + "dataType" : "String", + "type" : null, + "defaultValue" : null, + "validateType" : null, + "error" : null, + "expression" : null, + "children" : null + } ], + "requestBody" : "", + "headers" : [ ], + "paths" : [ ], + "responseBody" : null, + "description" : null, + "requestBodyDefinition" : null, + "responseBodyDefinition" : null +} +================================ +if(data.id){ + data.updateDate = new Date() +} +return db.table("sys_gen_info").primary("id").save(data) \ No newline at end of file diff --git a/data/magic-api/api/后台/代码生成/列表.ms b/data/magic-api/api/系统功能/代码生成/列表.ms similarity index 63% rename from data/magic-api/api/后台/代码生成/列表.ms rename to data/magic-api/api/系统功能/代码生成/列表.ms index 096487c..02770a2 100644 --- a/data/magic-api/api/后台/代码生成/列表.ms +++ b/data/magic-api/api/系统功能/代码生成/列表.ms @@ -5,7 +5,7 @@ "groupId" : "f2538e0f370a4cabab0ae920f5e77ae7", "name" : "列表", "createTime" : null, - "updateTime" : 1647563302987, + "updateTime" : 1648391602307, "lock" : null, "createBy" : null, "updateBy" : null, @@ -16,7 +16,7 @@ "requestBody" : "", "headers" : [ ], "paths" : [ ], - "responseBody" : "{\n \"code\": 200,\n \"message\": \"success\",\n \"data\": {\n \"list\": [{\n \"tableName\": \"sys_user\",\n \"tableComment\": \"用户表\"\n }],\n \"total\": 1\n },\n \"timestamp\": 1647563302700,\n \"executeTime\": 8\n}", + "responseBody" : "{\n \"code\": 200,\n \"message\": \"success\",\n \"data\": {\n \"total\": 0,\n \"list\": null\n },\n \"timestamp\": 1648372190810,\n \"executeTime\": 10\n}", "description" : null, "requestBodyDefinition" : null, "responseBodyDefinition" : { @@ -66,56 +66,8 @@ "error" : "", "expression" : "", "children" : [ { - "name" : "list", - "value" : "", - "description" : "", - "required" : false, - "dataType" : "Array", - "type" : null, - "defaultValue" : null, - "validateType" : "", - "error" : "", - "expression" : "", - "children" : [ { - "name" : "", - "value" : "", - "description" : "", - "required" : false, - "dataType" : "Object", - "type" : null, - "defaultValue" : null, - "validateType" : "", - "error" : "", - "expression" : "", - "children" : [ { - "name" : "tableName", - "value" : "sys_user", - "description" : "", - "required" : false, - "dataType" : "String", - "type" : null, - "defaultValue" : null, - "validateType" : "", - "error" : "", - "expression" : "", - "children" : [ ] - }, { - "name" : "tableComment", - "value" : "用户表", - "description" : "", - "required" : false, - "dataType" : "String", - "type" : null, - "defaultValue" : null, - "validateType" : "", - "error" : "", - "expression" : "", - "children" : [ ] - } ] - } ] - }, { "name" : "total", - "value" : "1", + "value" : "0", "description" : "", "required" : false, "dataType" : "Integer", @@ -125,10 +77,22 @@ "error" : "", "expression" : "", "children" : [ ] + }, { + "name" : "list", + "value" : "null", + "description" : "", + "required" : false, + "dataType" : "Array", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] } ] }, { "name" : "timestamp", - "value" : "1647563302700", + "value" : "1648372190810", "description" : "", "required" : false, "dataType" : "Long", @@ -140,7 +104,7 @@ "children" : [ ] }, { "name" : "executeTime", - "value" : "8", + "value" : "10", "description" : "", "required" : false, "dataType" : "Integer", @@ -154,10 +118,10 @@ } } ================================ -return { - list: [{ - tableName: 'sys_user', - tableComment: '用户表' - }], - total: 1 -} \ No newline at end of file +return db.page(""" + select id,table_name,table_comment,create_date,update_date from sys_gen_info where 1=1 + ?{tableName, and table_name like concat('%',#{tableName},'%')} + ?{tableComment, and table_comment like concat('%',#{tableComment},'%')} + ?{createDate && createDate.split(',')[0], and create_date >= #{createDate.split(',')[0]}} + ?{createDate && createDate.split(',')[1], and create_date <= #{createDate.split(',')[1]}} +""") \ No newline at end of file diff --git a/data/magic-api/api/系统功能/代码生成/删除.ms b/data/magic-api/api/系统功能/代码生成/删除.ms new file mode 100644 index 0000000..165d029 --- /dev/null +++ b/data/magic-api/api/系统功能/代码生成/删除.ms @@ -0,0 +1,25 @@ +{ + "properties" : { }, + "id" : "8062a0e5c99e4bcca316f0a0594a804b", + "script" : null, + "groupId" : "f2538e0f370a4cabab0ae920f5e77ae7", + "name" : "删除", + "createTime" : 1648390993959, + "updateTime" : null, + "lock" : null, + "createBy" : null, + "updateBy" : null, + "path" : "delete", + "method" : "DELETE", + "parameters" : [ ], + "options" : [ ], + "requestBody" : "", + "headers" : [ ], + "paths" : [ ], + "responseBody" : null, + "description" : null, + "requestBodyDefinition" : null, + "responseBodyDefinition" : null +} +================================ +return db.table("sys_gen_info").where().eq("id",id).delete() \ No newline at end of file diff --git a/data/magic-api/api/系统功能/代码生成/执行生成.ms b/data/magic-api/api/系统功能/代码生成/执行生成.ms new file mode 100644 index 0000000..ce3e24f --- /dev/null +++ b/data/magic-api/api/系统功能/代码生成/执行生成.ms @@ -0,0 +1,362 @@ +{ + "properties" : { }, + "id" : "bb23ca6e863b41b8ad81994b87a4fc0d", + "script" : null, + "groupId" : "f2538e0f370a4cabab0ae920f5e77ae7", + "name" : "执行生成", + "createTime" : null, + "updateTime" : 1648309158280, + "lock" : null, + "createBy" : null, + "updateBy" : null, + "path" : "/execute", + "method" : "GET", + "parameters" : [ ], + "options" : [ ], + "requestBody" : "", + "headers" : [ ], + "paths" : [ ], + "responseBody" : "{\n \"code\": 200,\n \"message\": \"success\",\n \"data\": [{\n \"node\": {\n \"properties\": {},\n \"id\": \"02df51e4d7184780a98b632f43dc5848\",\n \"name\": \"后台\",\n \"type\": \"api\",\n \"parentId\": \"0\",\n \"path\": \"\",\n \"paths\": [],\n \"options\": []\n },\n \"children\": [{\n \"node\": {\n \"properties\": {},\n \"id\": \"67b2ce258e24491194b74992958c74aa\",\n \"name\": \"菜单管理\",\n \"type\": \"api\",\n \"parentId\": \"02df51e4d7184780a98b632f43dc5848\",\n \"path\": \"/menu\",\n \"paths\": [],\n \"options\": []\n },\n \"children\": []\n }, {\n \"node\": {\n \"properties\": {},\n \"id\": \"9ec6f9ec92d24a369952bb13eddc134f\",\n \"name\": \"日志管理\",\n \"type\": \"api\",\n \"parentId\": \"02df51e4d7184780a98b632f43dc5848\",\n \"path\": \"/log\",\n \"paths\": [],\n \"options\": []\n },\n \"children\": []\n }, {\n \"node\": {\n \"properties\": {},\n \"id\": \"c7ce65f5b3cf4aaa913f6fec7d35d176\",\n \"name\": \"数据字典\",\n \"type\": \"api\",\n \"parentId\": \"02df51e4d7184780a98b632f43dc5848\",\n \"path\": \"/dict\",\n \"paths\": [],\n \"options\": []\n },\n \"children\": [{\n \"node\": {\n \"properties\": {},\n \"id\": \"376f26eb43a44a3daeafd27020a96f48\",\n \"name\": \"字典项\",\n \"type\": \"api\",\n \"parentId\": \"c7ce65f5b3cf4aaa913f6fec7d35d176\",\n \"path\": \"/items\",\n \"paths\": [],\n \"options\": []\n },\n \"children\": []\n }]\n }, {\n \"node\": {\n \"properties\": {},\n \"id\": \"7eeba36706c24c1484ee4e84ad829f9b\",\n \"name\": \"富文本\",\n \"type\": \"api\",\n \"parentId\": \"02df51e4d7184780a98b632f43dc5848\",\n \"path\": \"/ueditor\",\n \"paths\": [],\n \"options\": [{\n \"name\": \"require_login\",\n \"value\": \"false\",\n \"description\": \"该接口需要登录才允许访问\",\n \"required\": false,\n \"dataType\": \"String\",\n \"type\": null,\n \"defaultValue\": null,\n \"validateType\": null,\n \"error\": null,\n \"expression\": null,\n \"children\": null\n }]\n },\n \"children\": []\n }, {\n \"node\": {\n \"properties\": {},\n \"id\": \"89130d496f6f467c88b22ae4a7f688eb\",\n \"name\": \"角色管理\",\n \"type\": \"api\",\n \"parentId\": \"02df51e4d7184780a98b632f43dc5848\",\n \"path\": \"/role\",\n \"paths\": [],\n \"options\": []\n },\n \"children\": []\n }, {\n \"node\": {\n \"properties\": {},\n \"id\": \"5c36bdc1de454d6e9d1a464d87c96091\",\n \"name\": \"配置\",\n \"type\": \"api\",\n \"parentId\": \"02df51e4d7184780a98b632f43dc5848\",\n \"path\": \"/config\",\n \"paths\": [],\n \"options\": []\n },\n \"children\": []\n }, {\n \"node\": {\n \"properties\": {},\n \"id\": \"1952f25c81084e24b55b11385767dc38\",\n \"name\": \"安全\",\n \"type\": \"api\",\n \"parentId\": \"02df51e4d7184780a98b632f43dc5848\",\n \"path\": \"/security\",\n \"paths\": [],\n \"options\": []\n },\n \"children\": []\n }, {\n \"node\": {\n \"properties\": {},\n \"id\": \"6f106ebdee21489db34b956f7770ff03\",\n \"name\": \"组件\",\n \"type\": \"api\",\n \"parentId\": \"02df51e4d7184780a98b632f43dc5848\",\n \"path\": \"/component\",\n \"paths\": [],\n \"options\": []\n },\n \"children\": []\n }, {\n \"node\": {\n \"properties\": {},\n \"id\": \"fd3d225a1cf141bf9998c4ec4bf4a6ab\",\n \"name\": \"文件管理\",\n \"type\": \"api\",\n \"parentId\": \"02df51e4d7184780a98b632f43dc5848\",\n \"path\": \"/file\",\n \"paths\": [],\n \"options\": []\n },\n \"children\": []\n }, {\n \"node\": {\n \"properties\": {},\n \"id\": \"d95a58e77d314370862ffc4cdfdb8283\",\n \"name\": \"在线用户\",\n \"type\": \"api\",\n \"parentId\": \"02df51e4d7184780a98b632f43dc5848\",\n \"path\": \"/online\",\n \"paths\": [],\n \"options\": []\n },\n \"children\": []\n }, {\n \"node\": {\n \"properties\": {},\n \"id\": \"4f0230049d7e4f39b1e0897cc0f46f9a\",\n \"name\": \"用户管理\",\n \"type\": \"api\",\n \"parentId\": \"02df51e4d7184780a98b632f43dc5848\",\n \"path\": \"/user\",\n \"paths\": [],\n \"options\": []\n },\n \"children\": []\n }, {\n \"node\": {\n \"properties\": {},\n \"id\": \"42d241c0bb18476f8dabf92c2e4e2324\",\n \"name\": \"测试数据\",\n \"type\": \"api\",\n \"parentId\": \"02df51e4d7184780a98b632f43dc5848\",\n \"path\": \"/test\",\n \"paths\": [],\n \"options\": []\n },\n \"children\": []\n }, {\n \"node\": {\n \"properties\": {},\n \"id\": \"8295fc13678d4144bf7363c465247a50\",\n \"name\": \"组织机构\",\n \"type\": \"api\",\n \"parentId\": \"02df51e4d7184780a98b632f43dc5848\",\n \"path\": \"/office\",\n \"paths\": [],\n \"options\": []\n },\n \"children\": []\n }, {\n \"node\": {\n \"properties\": {},\n \"id\": \"f2538e0f370a4cabab0ae920f5e77ae7\",\n \"name\": \"代码生成\",\n \"type\": \"api\",\n \"parentId\": \"02df51e4d7184780a98b632f43dc5848\",\n \"path\": \"/code/gen\",\n \"paths\": [],\n \"options\": []\n },\n \"children\": []\n }]\n }],\n \"timestamp\": 1648309156632,\n \"executeTime\": 5\n}", + "description" : null, + "requestBodyDefinition" : null, + "responseBodyDefinition" : { + "name" : "", + "value" : "", + "description" : "", + "required" : false, + "dataType" : "Object", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ { + "name" : "code", + "value" : "200", + "description" : "", + "required" : false, + "dataType" : "Integer", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + }, { + "name" : "message", + "value" : "success", + "description" : "", + "required" : false, + "dataType" : "String", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + }, { + "name" : "data", + "value" : "", + "description" : "", + "required" : false, + "dataType" : "Object", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ { + "name" : "", + "value" : "", + "description" : "", + "required" : false, + "dataType" : "Object", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ { + "name" : "node", + "value" : "", + "description" : "", + "required" : false, + "dataType" : "Object", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ { + "name" : "properties", + "value" : "", + "description" : "", + "required" : false, + "dataType" : "Object", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + }, { + "name" : "id", + "value" : "02df51e4d7184780a98b632f43dc5848", + "description" : "", + "required" : false, + "dataType" : "String", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + }, { + "name" : "name", + "value" : "后台", + "description" : "", + "required" : false, + "dataType" : "String", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + }, { + "name" : "type", + "value" : "api", + "description" : "", + "required" : false, + "dataType" : "String", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + }, { + "name" : "parentId", + "value" : "0", + "description" : "", + "required" : false, + "dataType" : "String", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + }, { + "name" : "path", + "value" : "", + "description" : "", + "required" : false, + "dataType" : "String", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + }, { + "name" : "paths", + "value" : "", + "description" : "", + "required" : false, + "dataType" : "Array", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + }, { + "name" : "options", + "value" : "", + "description" : "", + "required" : false, + "dataType" : "Array", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + } ] + }, { + "name" : "children", + "value" : "", + "description" : "", + "required" : false, + "dataType" : "Array", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ { + "name" : "", + "value" : "", + "description" : "", + "required" : false, + "dataType" : "Object", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ { + "name" : "node", + "value" : "", + "description" : "", + "required" : false, + "dataType" : "Object", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ { + "name" : "properties", + "value" : "", + "description" : "", + "required" : false, + "dataType" : "Object", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + }, { + "name" : "id", + "value" : "67b2ce258e24491194b74992958c74aa", + "description" : "", + "required" : false, + "dataType" : "String", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + }, { + "name" : "name", + "value" : "菜单管理", + "description" : "", + "required" : false, + "dataType" : "String", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + }, { + "name" : "type", + "value" : "api", + "description" : "", + "required" : false, + "dataType" : "String", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + }, { + "name" : "parentId", + "value" : "02df51e4d7184780a98b632f43dc5848", + "description" : "", + "required" : false, + "dataType" : "String", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + }, { + "name" : "path", + "value" : "/menu", + "description" : "", + "required" : false, + "dataType" : "String", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + }, { + "name" : "paths", + "value" : "", + "description" : "", + "required" : false, + "dataType" : "Array", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + }, { + "name" : "options", + "value" : "", + "description" : "", + "required" : false, + "dataType" : "Array", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + } ] + }, { + "name" : "children", + "value" : "", + "description" : "", + "required" : false, + "dataType" : "Array", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + } ] + } ] + } ] + } ] + }, { + "name" : "timestamp", + "value" : "1648309156632", + "description" : "", + "required" : false, + "dataType" : "Long", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + }, { + "name" : "executeTime", + "value" : "5", + "description" : "", + "required" : false, + "dataType" : "Integer", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + } ] + } +} +================================ +import org.ssssssss.magicapi.core.service.MagicResourceService +return MagicResourceService.tree('api').children.filter(it => it.node.path == '')[0].node.id \ No newline at end of file diff --git a/data/magic-api/api/系统功能/代码生成/查出所有表.ms b/data/magic-api/api/系统功能/代码生成/查出所有表.ms new file mode 100644 index 0000000..ff9afa4 --- /dev/null +++ b/data/magic-api/api/系统功能/代码生成/查出所有表.ms @@ -0,0 +1,135 @@ +{ + "properties" : { }, + "id" : "6db309d3d6d0461c97419641849a99b4", + "script" : null, + "groupId" : "f2538e0f370a4cabab0ae920f5e77ae7", + "name" : "查出所有表", + "createTime" : null, + "updateTime" : 1648389273779, + "lock" : null, + "createBy" : null, + "updateBy" : null, + "path" : "/tables", + "method" : "GET", + "parameters" : [ ], + "options" : [ ], + "requestBody" : "", + "headers" : [ ], + "paths" : [ ], + "responseBody" : "{\n \"code\": 200,\n \"message\": \"success\",\n \"data\": [{\n \"label\": \"magic_backup_record_v2()\",\n \"value\": \"magic_backup_record_v2\"\n }, {\n \"label\": \"sys_dict(字典表)\",\n \"value\": \"sys_dict\"\n }, {\n \"label\": \"sys_dict_items(字典项表)\",\n \"value\": \"sys_dict_items\"\n }, {\n \"label\": \"sys_file(文件表)\",\n \"value\": \"sys_file\"\n }, {\n \"label\": \"sys_gen_info(生成表信息)\",\n \"value\": \"sys_gen_info\"\n }, {\n \"label\": \"sys_gen_test()\",\n \"value\": \"sys_gen_test\"\n }, {\n \"label\": \"sys_login_log()\",\n \"value\": \"sys_login_log\"\n }, {\n \"label\": \"sys_menu(菜单表)\",\n \"value\": \"sys_menu\"\n }, {\n \"label\": \"sys_office(组织机构表)\",\n \"value\": \"sys_office\"\n }, {\n \"label\": \"sys_oper_log(操作日志)\",\n \"value\": \"sys_oper_log\"\n }, {\n \"label\": \"sys_permission_code(权限code表)\",\n \"value\": \"sys_permission_code\"\n }, {\n \"label\": \"sys_role(角色表)\",\n \"value\": \"sys_role\"\n }, {\n \"label\": \"sys_role_menu(角色和菜单关联表)\",\n \"value\": \"sys_role_menu\"\n }, {\n \"label\": \"sys_role_office(用户组织机构关联表)\",\n \"value\": \"sys_role_office\"\n }, {\n \"label\": \"sys_test_data()\",\n \"value\": \"sys_test_data\"\n }, {\n \"label\": \"sys_user(用户表)\",\n \"value\": \"sys_user\"\n }, {\n \"label\": \"sys_user_code(用户权限code关联表)\",\n \"value\": \"sys_user_code\"\n }, {\n \"label\": \"sys_user_role(用户与角色关联表)\",\n \"value\": \"sys_user_role\"\n }],\n \"timestamp\": 1648372075872,\n \"executeTime\": 24\n}", + "description" : null, + "requestBodyDefinition" : null, + "responseBodyDefinition" : { + "name" : "", + "value" : "", + "description" : "", + "required" : false, + "dataType" : "Object", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ { + "name" : "code", + "value" : "200", + "description" : "", + "required" : false, + "dataType" : "Integer", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + }, { + "name" : "message", + "value" : "success", + "description" : "", + "required" : false, + "dataType" : "String", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + }, { + "name" : "data", + "value" : "", + "description" : "", + "required" : false, + "dataType" : "Object", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ { + "name" : "", + "value" : "", + "description" : "", + "required" : false, + "dataType" : "Object", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ { + "name" : "label", + "value" : "magic_backup_record_v2()", + "description" : "", + "required" : false, + "dataType" : "String", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + }, { + "name" : "value", + "value" : "magic_backup_record_v2", + "description" : "", + "required" : false, + "dataType" : "String", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + } ] + } ] + }, { + "name" : "timestamp", + "value" : "1648372075872", + "description" : "", + "required" : false, + "dataType" : "Long", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + }, { + "name" : "executeTime", + "value" : "24", + "description" : "", + "required" : false, + "dataType" : "Object", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + } ] + } +} +================================ +return db.select(""" + select table_name, table_comment from information_schema.tables where table_schema = database() +""").map(it => { label: it.tableName + `(${it.tableComment})`, value: it.tableName }) \ No newline at end of file diff --git a/data/magic-api/api/后台/代码生成/根据表名查出所有列.ms b/data/magic-api/api/系统功能/代码生成/根据表名查出所有列.ms similarity index 69% rename from data/magic-api/api/后台/代码生成/根据表名查出所有列.ms rename to data/magic-api/api/系统功能/代码生成/根据表名查出所有列.ms index 93be3ef..59feea1 100644 --- a/data/magic-api/api/后台/代码生成/根据表名查出所有列.ms +++ b/data/magic-api/api/系统功能/代码生成/根据表名查出所有列.ms @@ -5,7 +5,7 @@ "groupId" : "f2538e0f370a4cabab0ae920f5e77ae7", "name" : "根据表名查出所有列", "createTime" : null, - "updateTime" : 1647564370396, + "updateTime" : 1648312786910, "lock" : null, "createBy" : null, "updateBy" : null, @@ -28,7 +28,7 @@ "requestBody" : "", "headers" : [ ], "paths" : [ ], - "responseBody" : "{\n \"code\": 200,\n \"message\": \"success\",\n \"data\": {\n \"columns\": [{\n \"columnName\": \"username\",\n \"columnComment\": \"登录名\",\n \"dataType\": \"varchar\"\n }, {\n \"columnName\": \"name\",\n \"columnComment\": \"姓名/昵称\",\n \"dataType\": \"varchar\"\n }, {\n \"columnName\": \"password\",\n \"columnComment\": \"密码\",\n \"dataType\": \"varchar\"\n }, {\n \"columnName\": \"status\",\n \"columnComment\": \"状态\",\n \"dataType\": \"char\"\n }, {\n \"columnName\": \"phone\",\n \"columnComment\": \"手机号\",\n \"dataType\": \"varchar\"\n }, {\n \"columnName\": \"head_portrait\",\n \"columnComment\": \"头像\",\n \"dataType\": \"varchar\"\n }, {\n \"columnName\": \"is_login\",\n \"columnComment\": \"禁止登录：0未禁用，1已禁用\",\n \"dataType\": \"int\"\n }, {\n \"columnName\": \"sort\",\n \"columnComment\": \"排序\",\n \"dataType\": \"int\"\n }, {\n \"columnName\": \"office_id\",\n \"columnComment\": \"组织机构id\",\n \"dataType\": \"varchar\"\n }],\n \"primary\": {\n \"columnName\": \"id\"\n }\n },\n \"timestamp\": 1647564344902,\n \"executeTime\": 34\n}", + "responseBody" : "{\n \"code\": 200,\n \"message\": \"success\",\n \"data\": {\n \"columns\": [{\n \"columnName\": \"username\",\n \"columnComment\": \"登录名\",\n \"dataType\": \"varchar\",\n \"required\": 1\n }, {\n \"columnName\": \"name\",\n \"columnComment\": \"姓名/昵称\",\n \"dataType\": \"varchar\",\n \"required\": 0\n }, {\n \"columnName\": \"password\",\n \"columnComment\": \"密码\",\n \"dataType\": \"varchar\",\n \"required\": 0\n }, {\n \"columnName\": \"status\",\n \"columnComment\": \"状态\",\n \"dataType\": \"char\",\n \"required\": 0\n }, {\n \"columnName\": \"phone\",\n \"columnComment\": \"手机号\",\n \"dataType\": \"varchar\",\n \"required\": 0\n }, {\n \"columnName\": \"head_portrait\",\n \"columnComment\": \"头像\",\n \"dataType\": \"varchar\",\n \"required\": 0\n }, {\n \"columnName\": \"is_login\",\n \"columnComment\": \"禁止登录：0未禁用，1已禁用\",\n \"dataType\": \"int\",\n \"required\": 0\n }, {\n \"columnName\": \"sort\",\n \"columnComment\": \"排序\",\n \"dataType\": \"int\",\n \"required\": 0\n }, {\n \"columnName\": \"office_id\",\n \"columnComment\": \"组织机构id\",\n \"dataType\": \"varchar\",\n \"required\": 0\n }],\n \"primary\": \"id\"\n },\n \"timestamp\": 1648312726132,\n \"executeTime\": 12\n}", "description" : null, "requestBodyDefinition" : null, "responseBodyDefinition" : { @@ -135,36 +135,36 @@ "error" : "", "expression" : "", "children" : [ ] + }, { + "name" : "required", + "value" : "1", + "description" : "", + "required" : false, + "dataType" : "Integer", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] } ] } ] }, { "name" : "primary", - "value" : "", + "value" : "id", "description" : "", "required" : false, - "dataType" : "Object", + "dataType" : "String", "type" : null, "defaultValue" : null, "validateType" : "", "error" : "", "expression" : "", - "children" : [ { - "name" : "columnName", - "value" : "id", - "description" : "", - "required" : false, - "dataType" : "String", - "type" : null, - "defaultValue" : null, - "validateType" : "", - "error" : "", - "expression" : "", - "children" : [ ] - } ] + "children" : [ ] } ] }, { "name" : "timestamp", - "value" : "1647564344902", + "value" : "1648312726132", "description" : "", "required" : false, "dataType" : "Long", @@ -176,7 +176,7 @@ "children" : [ ] }, { "name" : "executeTime", - "value" : "34", + "value" : "12", "description" : "", "required" : false, "dataType" : "Integer", @@ -195,7 +195,8 @@ return { SELECT column_name, column_comment, - data_type + column_type, + case when is_nullable = 'YES' then 0 else 1 end required FROM information_schema.COLUMNS WHERE diff --git a/data/magic-api/api/系统功能/代码生成/详情.ms b/data/magic-api/api/系统功能/代码生成/详情.ms new file mode 100644 index 0000000..f57ffc4 --- /dev/null +++ b/data/magic-api/api/系统功能/代码生成/详情.ms @@ -0,0 +1,27 @@ +{ + "properties" : { }, + "id" : "2574df3366c24feeb913bea8bd477ec7", + "script" : null, + "groupId" : "f2538e0f370a4cabab0ae920f5e77ae7", + "name" : "详情", + "createTime" : null, + "updateTime" : 1648386086354, + "lock" : null, + "createBy" : null, + "updateBy" : null, + "path" : "/get", + "method" : "GET", + "parameters" : [ ], + "options" : [ ], + "requestBody" : "", + "headers" : [ ], + "paths" : [ ], + "responseBody" : null, + "description" : null, + "requestBodyDefinition" : null, + "responseBodyDefinition" : null +} +================================ +return db.selectOne(""" + select * from sys_gen_info where id = #{id} +""") \ No newline at end of file diff --git a/data/magic-api/api/后台/在线用户/group.json b/data/magic-api/api/系统功能/在线用户/group.json similarity index 77% rename from data/magic-api/api/后台/在线用户/group.json rename to data/magic-api/api/系统功能/在线用户/group.json index b551373..6faa1e7 100644 --- a/data/magic-api/api/后台/在线用户/group.json +++ b/data/magic-api/api/系统功能/在线用户/group.json @@ -3,7 +3,7 @@ "id" : "d95a58e77d314370862ffc4cdfdb8283", "name" : "在线用户", "type" : "api", - "parentId" : "02df51e4d7184780a98b632f43dc5848", + "parentId" : "acff5ad7aae64de2acb03e1d16a58ce2", "path" : "/online", "paths" : [ ], "options" : [ ] diff --git a/data/magic-api/api/后台/在线用户/列表.ms b/data/magic-api/api/系统功能/在线用户/列表.ms similarity index 100% rename from data/magic-api/api/后台/在线用户/列表.ms rename to data/magic-api/api/系统功能/在线用户/列表.ms diff --git a/data/magic-api/api/后台/在线用户/踢人.ms b/data/magic-api/api/系统功能/在线用户/踢人.ms similarity index 100% rename from data/magic-api/api/后台/在线用户/踢人.ms rename to data/magic-api/api/系统功能/在线用户/踢人.ms diff --git a/data/magic-api/api/后台/安全/group.json b/data/magic-api/api/系统功能/安全/group.json similarity index 76% rename from data/magic-api/api/后台/安全/group.json rename to data/magic-api/api/系统功能/安全/group.json index 57758fb..e0490b0 100644 --- a/data/magic-api/api/后台/安全/group.json +++ b/data/magic-api/api/系统功能/安全/group.json @@ -3,7 +3,7 @@ "id" : "1952f25c81084e24b55b11385767dc38", "name" : "安全", "type" : "api", - "parentId" : "02df51e4d7184780a98b632f43dc5848", + "parentId" : "acff5ad7aae64de2acb03e1d16a58ce2", "path" : "/security", "paths" : [ ], "options" : [ ] diff --git a/data/magic-api/api/后台/安全/登录.ms b/data/magic-api/api/系统功能/安全/登录.ms similarity index 99% rename from data/magic-api/api/后台/安全/登录.ms rename to data/magic-api/api/系统功能/安全/登录.ms index d64b86c..eb063a5 100644 --- a/data/magic-api/api/后台/安全/登录.ms +++ b/data/magic-api/api/系统功能/安全/登录.ms @@ -5,7 +5,7 @@ "groupId" : "1952f25c81084e24b55b11385767dc38", "name" : "登录", "createTime" : null, - "updateTime" : 1647790320949, + "updateTime" : 1648307403240, "lock" : "0", "createBy" : null, "updateBy" : null, diff --git a/data/magic-api/api/后台/安全/获取当前用户权限code.ms b/data/magic-api/api/系统功能/安全/获取当前用户权限code.ms similarity index 100% rename from data/magic-api/api/后台/安全/获取当前用户权限code.ms rename to data/magic-api/api/系统功能/安全/获取当前用户权限code.ms diff --git a/data/magic-api/api/后台/安全/退出登录.ms b/data/magic-api/api/系统功能/安全/退出登录.ms similarity index 100% rename from data/magic-api/api/后台/安全/退出登录.ms rename to data/magic-api/api/系统功能/安全/退出登录.ms diff --git a/data/magic-api/api/后台/安全/验证token.ms b/data/magic-api/api/系统功能/安全/验证token.ms similarity index 100% rename from data/magic-api/api/后台/安全/验证token.ms rename to data/magic-api/api/系统功能/安全/验证token.ms diff --git a/data/magic-api/api/后台/安全/验证码.ms b/data/magic-api/api/系统功能/安全/验证码.ms similarity index 100% rename from data/magic-api/api/后台/安全/验证码.ms rename to data/magic-api/api/系统功能/安全/验证码.ms diff --git a/data/magic-api/api/后台/富文本/group.json b/data/magic-api/api/系统功能/富文本/group.json similarity index 90% rename from data/magic-api/api/后台/富文本/group.json rename to data/magic-api/api/系统功能/富文本/group.json index 82c76fb..1fdd739 100644 --- a/data/magic-api/api/后台/富文本/group.json +++ b/data/magic-api/api/系统功能/富文本/group.json @@ -3,7 +3,7 @@ "id" : "7eeba36706c24c1484ee4e84ad829f9b", "name" : "富文本", "type" : "api", - "parentId" : "02df51e4d7184780a98b632f43dc5848", + "parentId" : "acff5ad7aae64de2acb03e1d16a58ce2", "path" : "/ueditor", "paths" : [ ], "options" : [ { diff --git a/data/magic-api/api/后台/富文本/上传图片.ms b/data/magic-api/api/系统功能/富文本/上传图片.ms similarity index 100% rename from data/magic-api/api/后台/富文本/上传图片.ms rename to data/magic-api/api/系统功能/富文本/上传图片.ms diff --git a/data/magic-api/api/后台/富文本/上传文件.ms b/data/magic-api/api/系统功能/富文本/上传文件.ms similarity index 100% rename from data/magic-api/api/后台/富文本/上传文件.ms rename to data/magic-api/api/系统功能/富文本/上传文件.ms diff --git a/data/magic-api/api/后台/富文本/入口get.ms b/data/magic-api/api/系统功能/富文本/入口get.ms similarity index 100% rename from data/magic-api/api/后台/富文本/入口get.ms rename to data/magic-api/api/系统功能/富文本/入口get.ms diff --git a/data/magic-api/api/后台/富文本/入口post.ms b/data/magic-api/api/系统功能/富文本/入口post.ms similarity index 100% rename from data/magic-api/api/后台/富文本/入口post.ms rename to data/magic-api/api/系统功能/富文本/入口post.ms diff --git a/data/magic-api/api/后台/富文本/配置.ms b/data/magic-api/api/系统功能/富文本/配置.ms similarity index 100% rename from data/magic-api/api/后台/富文本/配置.ms rename to data/magic-api/api/系统功能/富文本/配置.ms diff --git a/data/magic-api/api/后台/数据字典/group.json b/data/magic-api/api/系统功能/数据字典/group.json similarity index 76% rename from data/magic-api/api/后台/数据字典/group.json rename to data/magic-api/api/系统功能/数据字典/group.json index db56423..26df462 100644 --- a/data/magic-api/api/后台/数据字典/group.json +++ b/data/magic-api/api/系统功能/数据字典/group.json @@ -3,7 +3,7 @@ "id" : "c7ce65f5b3cf4aaa913f6fec7d35d176", "name" : "数据字典", "type" : "api", - "parentId" : "02df51e4d7184780a98b632f43dc5848", + "parentId" : "acff5ad7aae64de2acb03e1d16a58ce2", "path" : "/dict", "paths" : [ ], "options" : [ ] diff --git a/data/magic-api/api/后台/数据字典/保存.ms b/data/magic-api/api/系统功能/数据字典/保存.ms similarity index 100% rename from data/magic-api/api/后台/数据字典/保存.ms rename to data/magic-api/api/系统功能/数据字典/保存.ms diff --git a/data/magic-api/api/后台/数据字典/列表.ms b/data/magic-api/api/系统功能/数据字典/列表.ms similarity index 100% rename from data/magic-api/api/后台/数据字典/列表.ms rename to data/magic-api/api/系统功能/数据字典/列表.ms diff --git a/data/magic-api/api/后台/数据字典/删除.ms b/data/magic-api/api/系统功能/数据字典/删除.ms similarity index 100% rename from data/magic-api/api/后台/数据字典/删除.ms rename to data/magic-api/api/系统功能/数据字典/删除.ms diff --git a/data/magic-api/api/后台/数据字典/字典项/group.json b/data/magic-api/api/系统功能/数据字典/字典项/group.json similarity index 100% rename from data/magic-api/api/后台/数据字典/字典项/group.json rename to data/magic-api/api/系统功能/数据字典/字典项/group.json diff --git a/data/magic-api/api/后台/数据字典/字典项/保存.ms b/data/magic-api/api/系统功能/数据字典/字典项/保存.ms similarity index 100% rename from data/magic-api/api/后台/数据字典/字典项/保存.ms rename to data/magic-api/api/系统功能/数据字典/字典项/保存.ms diff --git a/data/magic-api/api/后台/数据字典/字典项/列表.ms b/data/magic-api/api/系统功能/数据字典/字典项/列表.ms similarity index 100% rename from data/magic-api/api/后台/数据字典/字典项/列表.ms rename to data/magic-api/api/系统功能/数据字典/字典项/列表.ms diff --git a/data/magic-api/api/后台/数据字典/字典项/删除.ms b/data/magic-api/api/系统功能/数据字典/字典项/删除.ms similarity index 100% rename from data/magic-api/api/后台/数据字典/字典项/删除.ms rename to data/magic-api/api/系统功能/数据字典/字典项/删除.ms diff --git a/data/magic-api/api/后台/数据字典/字典项/获取所有字典项.ms b/data/magic-api/api/系统功能/数据字典/字典项/获取所有字典项.ms similarity index 100% rename from data/magic-api/api/后台/数据字典/字典项/获取所有字典项.ms rename to data/magic-api/api/系统功能/数据字典/字典项/获取所有字典项.ms diff --git a/data/magic-api/api/后台/数据字典/字典项/获取排序号.ms b/data/magic-api/api/系统功能/数据字典/字典项/获取排序号.ms similarity index 100% rename from data/magic-api/api/后台/数据字典/字典项/获取排序号.ms rename to data/magic-api/api/系统功能/数据字典/字典项/获取排序号.ms diff --git a/data/magic-api/api/后台/数据字典/所有字典.ms b/data/magic-api/api/系统功能/数据字典/所有字典.ms similarity index 100% rename from data/magic-api/api/后台/数据字典/所有字典.ms rename to data/magic-api/api/系统功能/数据字典/所有字典.ms diff --git a/data/magic-api/api/后台/数据字典/获取排序号.ms b/data/magic-api/api/系统功能/数据字典/获取排序号.ms similarity index 100% rename from data/magic-api/api/后台/数据字典/获取排序号.ms rename to data/magic-api/api/系统功能/数据字典/获取排序号.ms diff --git a/data/magic-api/api/后台/文件管理/group.json b/data/magic-api/api/系统功能/文件管理/group.json similarity index 76% rename from data/magic-api/api/后台/文件管理/group.json rename to data/magic-api/api/系统功能/文件管理/group.json index 52deb7b..6e658be 100644 --- a/data/magic-api/api/后台/文件管理/group.json +++ b/data/magic-api/api/系统功能/文件管理/group.json @@ -3,7 +3,7 @@ "id" : "fd3d225a1cf141bf9998c4ec4bf4a6ab", "name" : "文件管理", "type" : "api", - "parentId" : "02df51e4d7184780a98b632f43dc5848", + "parentId" : "acff5ad7aae64de2acb03e1d16a58ce2", "path" : "/file", "paths" : [ ], "options" : [ ] diff --git a/data/magic-api/api/后台/文件管理/上传.ms b/data/magic-api/api/系统功能/文件管理/上传.ms similarity index 100% rename from data/magic-api/api/后台/文件管理/上传.ms rename to data/magic-api/api/系统功能/文件管理/上传.ms diff --git a/data/magic-api/api/后台/文件管理/删除.ms b/data/magic-api/api/系统功能/文件管理/删除.ms similarity index 100% rename from data/magic-api/api/后台/文件管理/删除.ms rename to data/magic-api/api/系统功能/文件管理/删除.ms diff --git a/data/magic-api/api/后台/文件管理/排序.ms b/data/magic-api/api/系统功能/文件管理/排序.ms similarity index 100% rename from data/magic-api/api/后台/文件管理/排序.ms rename to data/magic-api/api/系统功能/文件管理/排序.ms diff --git a/data/magic-api/api/后台/文件管理/获取文件列表.ms b/data/magic-api/api/系统功能/文件管理/获取文件列表.ms similarity index 100% rename from data/magic-api/api/后台/文件管理/获取文件列表.ms rename to data/magic-api/api/系统功能/文件管理/获取文件列表.ms diff --git a/data/magic-api/api/后台/文件管理/裁剪.ms b/data/magic-api/api/系统功能/文件管理/裁剪.ms similarity index 100% rename from data/magic-api/api/后台/文件管理/裁剪.ms rename to data/magic-api/api/系统功能/文件管理/裁剪.ms diff --git a/data/magic-api/api/后台/日志管理/group.json b/data/magic-api/api/系统功能/日志管理/group.json similarity index 76% rename from data/magic-api/api/后台/日志管理/group.json rename to data/magic-api/api/系统功能/日志管理/group.json index 8577380..ba5e28c 100644 --- a/data/magic-api/api/后台/日志管理/group.json +++ b/data/magic-api/api/系统功能/日志管理/group.json @@ -3,7 +3,7 @@ "id" : "9ec6f9ec92d24a369952bb13eddc134f", "name" : "日志管理", "type" : "api", - "parentId" : "02df51e4d7184780a98b632f43dc5848", + "parentId" : "acff5ad7aae64de2acb03e1d16a58ce2", "path" : "/log", "paths" : [ ], "options" : [ ] diff --git a/data/magic-api/api/后台/日志管理/操作日志.ms b/data/magic-api/api/系统功能/日志管理/操作日志.ms similarity index 100% rename from data/magic-api/api/后台/日志管理/操作日志.ms rename to data/magic-api/api/系统功能/日志管理/操作日志.ms diff --git a/data/magic-api/api/后台/日志管理/登录日志.ms b/data/magic-api/api/系统功能/日志管理/登录日志.ms similarity index 100% rename from data/magic-api/api/后台/日志管理/登录日志.ms rename to data/magic-api/api/系统功能/日志管理/登录日志.ms diff --git a/data/magic-api/api/后台/测试数据/group.json b/data/magic-api/api/系统功能/测试数据/group.json similarity index 76% rename from data/magic-api/api/后台/测试数据/group.json rename to data/magic-api/api/系统功能/测试数据/group.json index f15f827..486db57 100644 --- a/data/magic-api/api/后台/测试数据/group.json +++ b/data/magic-api/api/系统功能/测试数据/group.json @@ -3,7 +3,7 @@ "id" : "42d241c0bb18476f8dabf92c2e4e2324", "name" : "测试数据", "type" : "api", - "parentId" : "02df51e4d7184780a98b632f43dc5848", + "parentId" : "acff5ad7aae64de2acb03e1d16a58ce2", "path" : "/test", "paths" : [ ], "options" : [ ] diff --git a/data/magic-api/api/后台/测试数据/保存.ms b/data/magic-api/api/系统功能/测试数据/保存.ms similarity index 100% rename from data/magic-api/api/后台/测试数据/保存.ms rename to data/magic-api/api/系统功能/测试数据/保存.ms diff --git a/data/magic-api/api/后台/测试数据/列表.ms b/data/magic-api/api/系统功能/测试数据/列表.ms similarity index 100% rename from data/magic-api/api/后台/测试数据/列表.ms rename to data/magic-api/api/系统功能/测试数据/列表.ms diff --git a/data/magic-api/api/后台/用户管理/group.json b/data/magic-api/api/系统功能/用户管理/group.json similarity index 76% rename from data/magic-api/api/后台/用户管理/group.json rename to data/magic-api/api/系统功能/用户管理/group.json index 0f0c572..f3c898f 100644 --- a/data/magic-api/api/后台/用户管理/group.json +++ b/data/magic-api/api/系统功能/用户管理/group.json @@ -3,7 +3,7 @@ "id" : "4f0230049d7e4f39b1e0897cc0f46f9a", "name" : "用户管理", "type" : "api", - "parentId" : "02df51e4d7184780a98b632f43dc5848", + "parentId" : "acff5ad7aae64de2acb03e1d16a58ce2", "path" : "/user", "paths" : [ ], "options" : [ ] diff --git a/data/magic-api/api/后台/用户管理/个人信息修改.ms b/data/magic-api/api/系统功能/用户管理/个人信息修改.ms similarity index 100% rename from data/magic-api/api/后台/用户管理/个人信息修改.ms rename to data/magic-api/api/系统功能/用户管理/个人信息修改.ms diff --git a/data/magic-api/api/后台/用户管理/保存.ms b/data/magic-api/api/系统功能/用户管理/保存.ms similarity index 100% rename from data/magic-api/api/后台/用户管理/保存.ms rename to data/magic-api/api/系统功能/用户管理/保存.ms diff --git a/data/magic-api/api/后台/用户管理/修改登录状态.ms b/data/magic-api/api/系统功能/用户管理/修改登录状态.ms similarity index 100% rename from data/magic-api/api/后台/用户管理/修改登录状态.ms rename to data/magic-api/api/系统功能/用户管理/修改登录状态.ms diff --git a/data/magic-api/api/后台/用户管理/列表.ms b/data/magic-api/api/系统功能/用户管理/列表.ms similarity index 100% rename from data/magic-api/api/后台/用户管理/列表.ms rename to data/magic-api/api/系统功能/用户管理/列表.ms diff --git a/data/magic-api/api/后台/用户管理/删除.ms b/data/magic-api/api/系统功能/用户管理/删除.ms similarity index 100% rename from data/magic-api/api/后台/用户管理/删除.ms rename to data/magic-api/api/系统功能/用户管理/删除.ms diff --git a/data/magic-api/api/后台/用户管理/所有机构.ms b/data/magic-api/api/系统功能/用户管理/所有机构.ms similarity index 100% rename from data/magic-api/api/后台/用户管理/所有机构.ms rename to data/magic-api/api/系统功能/用户管理/所有机构.ms diff --git a/data/magic-api/api/后台/用户管理/根据用户id获取角色列表.ms b/data/magic-api/api/系统功能/用户管理/根据用户id获取角色列表.ms similarity index 100% rename from data/magic-api/api/后台/用户管理/根据用户id获取角色列表.ms rename to data/magic-api/api/系统功能/用户管理/根据用户id获取角色列表.ms diff --git a/data/magic-api/api/后台/用户管理/获取用户信息.ms b/data/magic-api/api/系统功能/用户管理/获取用户信息.ms similarity index 100% rename from data/magic-api/api/后台/用户管理/获取用户信息.ms rename to data/magic-api/api/系统功能/用户管理/获取用户信息.ms diff --git a/data/magic-api/api/后台/组件/group.json b/data/magic-api/api/系统功能/组件/group.json similarity index 76% rename from data/magic-api/api/后台/组件/group.json rename to data/magic-api/api/系统功能/组件/group.json index 9ba1e2a..3313772 100644 --- a/data/magic-api/api/后台/组件/group.json +++ b/data/magic-api/api/系统功能/组件/group.json @@ -3,7 +3,7 @@ "id" : "6f106ebdee21489db34b956f7770ff03", "name" : "组件", "type" : "api", - "parentId" : "02df51e4d7184780a98b632f43dc5848", + "parentId" : "acff5ad7aae64de2acb03e1d16a58ce2", "path" : "/component", "paths" : [ ], "options" : [ ] diff --git a/data/magic-api/api/后台/组件/列表.ms b/data/magic-api/api/系统功能/组件/列表.ms similarity index 83% rename from data/magic-api/api/后台/组件/列表.ms rename to data/magic-api/api/系统功能/组件/列表.ms index b04e22c..541511e 100644 --- a/data/magic-api/api/后台/组件/列表.ms +++ b/data/magic-api/api/系统功能/组件/列表.ms @@ -16,7 +16,7 @@ "requestBody" : "", "headers" : [ ], "paths" : [ ], - "responseBody" : "{\n \"code\": 200,\n \"message\": \"success\",\n \"data\": [{\n \"name\": \"sys-dict-list\",\n \"code\": \"\\n\\n\\n\"\n }],\n \"timestamp\": 1648017503577,\n \"executeTime\": 12\n}", + "responseBody" : "{\n \"code\": 200,\n \"message\": \"success\",\n \"data\": [{\n \"name\": \"sys-dict-list\",\n \"code\": \"\\n\\n\\n\"\n }],\n \"timestamp\": 1648017503577,\n \"executeTime\": 12\n}", "description" : null, "requestBodyDefinition" : null, "responseBodyDefinition" : { @@ -90,7 +90,7 @@ "children" : [ ] }, { "name" : "code", - "value" : "\\n\\n\\n", + "value" : "\\n\\n\\n", "description" : "", "required" : false, "dataType" : "String", @@ -132,7 +132,7 @@ ================================ import org.ssssssss.magicapi.utils.PathUtils import org.ssssssss.magicapi.core.service.MagicResourceService -return MagicResourceService.files('component').map(it => { +return MagicResourceService.files('component').map(it => { name: PathUtils.replaceSlash(String.format("%s-%s", MagicResourceService.getGroupPath(it.groupId), it.path)).replace('/', '-'), code: it.script -}) \ No newline at end of file +}) diff --git a/data/magic-api/api/后台/组件/选择组件.ms b/data/magic-api/api/系统功能/组件/选择组件.ms similarity index 100% rename from data/magic-api/api/后台/组件/选择组件.ms rename to data/magic-api/api/系统功能/组件/选择组件.ms diff --git a/data/magic-api/api/后台/组织机构/group.json b/data/magic-api/api/系统功能/组织机构/group.json similarity index 77% rename from data/magic-api/api/后台/组织机构/group.json rename to data/magic-api/api/系统功能/组织机构/group.json index d3491dc..5b529ee 100644 --- a/data/magic-api/api/后台/组织机构/group.json +++ b/data/magic-api/api/系统功能/组织机构/group.json @@ -3,7 +3,7 @@ "id" : "8295fc13678d4144bf7363c465247a50", "name" : "组织机构", "type" : "api", - "parentId" : "02df51e4d7184780a98b632f43dc5848", + "parentId" : "acff5ad7aae64de2acb03e1d16a58ce2", "path" : "/office", "paths" : [ ], "options" : [ ] diff --git a/data/magic-api/api/后台/组织机构/上移.ms b/data/magic-api/api/系统功能/组织机构/上移.ms similarity index 100% rename from data/magic-api/api/后台/组织机构/上移.ms rename to data/magic-api/api/系统功能/组织机构/上移.ms diff --git a/data/magic-api/api/后台/组织机构/下移.ms b/data/magic-api/api/系统功能/组织机构/下移.ms similarity index 100% rename from data/magic-api/api/后台/组织机构/下移.ms rename to data/magic-api/api/系统功能/组织机构/下移.ms diff --git a/data/magic-api/api/后台/组织机构/保存.ms b/data/magic-api/api/系统功能/组织机构/保存.ms similarity index 100% rename from data/magic-api/api/后台/组织机构/保存.ms rename to data/magic-api/api/系统功能/组织机构/保存.ms diff --git a/data/magic-api/api/后台/组织机构/列表.ms b/data/magic-api/api/系统功能/组织机构/列表.ms similarity index 100% rename from data/magic-api/api/后台/组织机构/列表.ms rename to data/magic-api/api/系统功能/组织机构/列表.ms diff --git a/data/magic-api/api/后台/组织机构/删除.ms b/data/magic-api/api/系统功能/组织机构/删除.ms similarity index 100% rename from data/magic-api/api/后台/组织机构/删除.ms rename to data/magic-api/api/系统功能/组织机构/删除.ms diff --git a/data/magic-api/api/后台/组织机构/根据角色获取组织机构.ms b/data/magic-api/api/系统功能/组织机构/根据角色获取组织机构.ms similarity index 100% rename from data/magic-api/api/后台/组织机构/根据角色获取组织机构.ms rename to data/magic-api/api/系统功能/组织机构/根据角色获取组织机构.ms diff --git a/data/magic-api/api/后台/组织机构/获取排序号.ms b/data/magic-api/api/系统功能/组织机构/获取排序号.ms similarity index 100% rename from data/magic-api/api/后台/组织机构/获取排序号.ms rename to data/magic-api/api/系统功能/组织机构/获取排序号.ms diff --git a/data/magic-api/api/后台/菜单管理/group.json b/data/magic-api/api/系统功能/菜单管理/group.json similarity index 76% rename from data/magic-api/api/后台/菜单管理/group.json rename to data/magic-api/api/系统功能/菜单管理/group.json index 9f9aa20..bd814de 100644 --- a/data/magic-api/api/后台/菜单管理/group.json +++ b/data/magic-api/api/系统功能/菜单管理/group.json @@ -3,7 +3,7 @@ "id" : "67b2ce258e24491194b74992958c74aa", "name" : "菜单管理", "type" : "api", - "parentId" : "02df51e4d7184780a98b632f43dc5848", + "parentId" : "acff5ad7aae64de2acb03e1d16a58ce2", "path" : "/menu", "paths" : [ ], "options" : [ ] diff --git a/data/magic-api/api/后台/菜单管理/上移.ms b/data/magic-api/api/系统功能/菜单管理/上移.ms similarity index 100% rename from data/magic-api/api/后台/菜单管理/上移.ms rename to data/magic-api/api/系统功能/菜单管理/上移.ms diff --git a/data/magic-api/api/后台/菜单管理/下移.ms b/data/magic-api/api/系统功能/菜单管理/下移.ms similarity index 100% rename from data/magic-api/api/后台/菜单管理/下移.ms rename to data/magic-api/api/系统功能/菜单管理/下移.ms diff --git a/data/magic-api/api/后台/菜单管理/保存.ms b/data/magic-api/api/系统功能/菜单管理/保存.ms similarity index 100% rename from data/magic-api/api/后台/菜单管理/保存.ms rename to data/magic-api/api/系统功能/菜单管理/保存.ms diff --git a/data/magic-api/api/后台/菜单管理/修改是否显示.ms b/data/magic-api/api/系统功能/菜单管理/修改是否显示.ms similarity index 100% rename from data/magic-api/api/后台/菜单管理/修改是否显示.ms rename to data/magic-api/api/系统功能/菜单管理/修改是否显示.ms diff --git a/data/magic-api/api/后台/菜单管理/删除.ms b/data/magic-api/api/系统功能/菜单管理/删除.ms similarity index 100% rename from data/magic-api/api/后台/菜单管理/删除.ms rename to data/magic-api/api/系统功能/菜单管理/删除.ms diff --git a/data/magic-api/api/后台/菜单管理/当前用户菜单.ms b/data/magic-api/api/系统功能/菜单管理/当前用户菜单.ms similarity index 100% rename from data/magic-api/api/后台/菜单管理/当前用户菜单.ms rename to data/magic-api/api/系统功能/菜单管理/当前用户菜单.ms diff --git a/data/magic-api/api/后台/菜单管理/根据菜单id清除缓存.ms b/data/magic-api/api/系统功能/菜单管理/根据菜单id清除缓存.ms similarity index 100% rename from data/magic-api/api/后台/菜单管理/根据菜单id清除缓存.ms rename to data/magic-api/api/系统功能/菜单管理/根据菜单id清除缓存.ms diff --git a/data/magic-api/api/后台/菜单管理/根据角色获取菜单.ms b/data/magic-api/api/系统功能/菜单管理/根据角色获取菜单.ms similarity index 100% rename from data/magic-api/api/后台/菜单管理/根据角色获取菜单.ms rename to data/magic-api/api/系统功能/菜单管理/根据角色获取菜单.ms diff --git a/data/magic-api/api/后台/菜单管理/获取排序号.ms b/data/magic-api/api/系统功能/菜单管理/获取排序号.ms similarity index 100% rename from data/magic-api/api/后台/菜单管理/获取排序号.ms rename to data/magic-api/api/系统功能/菜单管理/获取排序号.ms diff --git a/data/magic-api/api/后台/菜单管理/获取菜单tree.ms b/data/magic-api/api/系统功能/菜单管理/获取菜单tree.ms similarity index 100% rename from data/magic-api/api/后台/菜单管理/获取菜单tree.ms rename to data/magic-api/api/系统功能/菜单管理/获取菜单tree.ms diff --git a/data/magic-api/api/后台/角色管理/group.json b/data/magic-api/api/系统功能/角色管理/group.json similarity index 76% rename from data/magic-api/api/后台/角色管理/group.json rename to data/magic-api/api/系统功能/角色管理/group.json index dd9840a..7fd7042 100644 --- a/data/magic-api/api/后台/角色管理/group.json +++ b/data/magic-api/api/系统功能/角色管理/group.json @@ -3,7 +3,7 @@ "id" : "89130d496f6f467c88b22ae4a7f688eb", "name" : "角色管理", "type" : "api", - "parentId" : "02df51e4d7184780a98b632f43dc5848", + "parentId" : "acff5ad7aae64de2acb03e1d16a58ce2", "path" : "/role", "paths" : [ ], "options" : [ ] diff --git a/data/magic-api/api/后台/角色管理/保存.ms b/data/magic-api/api/系统功能/角色管理/保存.ms similarity index 100% rename from data/magic-api/api/后台/角色管理/保存.ms rename to data/magic-api/api/系统功能/角色管理/保存.ms diff --git a/data/magic-api/api/后台/角色管理/全部.ms b/data/magic-api/api/系统功能/角色管理/全部.ms similarity index 100% rename from data/magic-api/api/后台/角色管理/全部.ms rename to data/magic-api/api/系统功能/角色管理/全部.ms diff --git a/data/magic-api/api/后台/角色管理/列表.ms b/data/magic-api/api/系统功能/角色管理/列表.ms similarity index 100% rename from data/magic-api/api/后台/角色管理/列表.ms rename to data/magic-api/api/系统功能/角色管理/列表.ms diff --git a/data/magic-api/api/后台/角色管理/删除.ms b/data/magic-api/api/系统功能/角色管理/删除.ms similarity index 100% rename from data/magic-api/api/后台/角色管理/删除.ms rename to data/magic-api/api/系统功能/角色管理/删除.ms diff --git a/data/magic-api/api/后台/角色管理/根据角色id删除缓存.ms b/data/magic-api/api/系统功能/角色管理/根据角色id删除缓存.ms similarity index 100% rename from data/magic-api/api/后台/角色管理/根据角色id删除缓存.ms rename to data/magic-api/api/系统功能/角色管理/根据角色id删除缓存.ms diff --git a/data/magic-api/api/后台/配置/group.json b/data/magic-api/api/系统功能/配置/group.json similarity index 76% rename from data/magic-api/api/后台/配置/group.json rename to data/magic-api/api/系统功能/配置/group.json index 25eef8f..a5b857b 100644 --- a/data/magic-api/api/后台/配置/group.json +++ b/data/magic-api/api/系统功能/配置/group.json @@ -3,7 +3,7 @@ "id" : "5c36bdc1de454d6e9d1a464d87c96091", "name" : "配置", "type" : "api", - "parentId" : "02df51e4d7184780a98b632f43dc5848", + "parentId" : "acff5ad7aae64de2acb03e1d16a58ce2", "path" : "/config", "paths" : [ ], "options" : [ ] diff --git a/data/magic-api/api/后台/配置/获取所有配置.ms b/data/magic-api/api/系统功能/配置/获取所有配置.ms similarity index 100% rename from data/magic-api/api/后台/配置/获取所有配置.ms rename to data/magic-api/api/系统功能/配置/获取所有配置.ms diff --git a/data/magic-api/component/系统管理/字典管理/列表.ms b/data/magic-api/component/系统管理/字典管理/列表.ms index 503fdb2..7e05033 100644 --- a/data/magic-api/component/系统管理/字典管理/列表.ms +++ b/data/magic-api/component/系统管理/字典管理/列表.ms @@ -178,7 +178,7 @@ function getTemp() { } function reloadTable() { - table.value.reloadList() + table.value.reload() } function getSort() { diff --git a/magic-boot-ui/src/components/magic/advanced/mb-list.vue b/magic-boot-ui/src/components/magic/advanced/mb-list.vue index 7279dc5..39052d6 100644 --- a/magic-boot-ui/src/components/magic/advanced/mb-list.vue +++ b/magic-boot-ui/src/components/magic/advanced/mb-list.vue @@ -44,7 +44,7 @@ }) function reload(){ - tableRef.value.reloadList() + tableRef.value.reload() } function selectionChange(columns) { diff --git a/magic-boot-ui/src/components/magic/basic/mb-editor-table.vue b/magic-boot-ui/src/components/magic/basic/mb-editor-table.vue index 918c037..8332fed 100644 --- a/magic-boot-ui/src/components/magic/basic/mb-editor-table.vue +++ b/magic-boot-ui/src/components/magic/basic/mb-editor-table.vue @@ -1,6 +1,6 @@