From 7269b13382e015ccc87bf818d07cf79749ab00e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=95=E9=87=91=E6=B3=BD?= <1098696801@qq.com> Date: Sat, 1 Jan 2022 14:28:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96pd-dialog=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E8=8F=9C=E5=8D=95icon?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/magic-api/api/后台/安全/登录.ms | 2 +- .../api/后台/菜单管理/当前用户菜单.ms | 326 +----------------- .../api/后台/菜单管理/获取菜单tree.ms | 6 +- db/magic-boot.sql | 2 +- magic-boot-ui/package.json | 1 - .../src/components/Psyduck/pd-dialog.vue | 31 +- magic-boot-ui/src/icons/svg/404.svg | 1 - magic-boot-ui/src/icons/svg/bug.svg | 1 - magic-boot-ui/src/icons/svg/chart.svg | 1 - magic-boot-ui/src/icons/svg/clipboard.svg | 1 - magic-boot-ui/src/icons/svg/component.svg | 1 - magic-boot-ui/src/icons/svg/dashboard.svg | 1 - magic-boot-ui/src/icons/svg/documentation.svg | 1 - magic-boot-ui/src/icons/svg/drag.svg | 1 - magic-boot-ui/src/icons/svg/edit.svg | 1 - magic-boot-ui/src/icons/svg/education.svg | 1 - magic-boot-ui/src/icons/svg/email.svg | 1 - magic-boot-ui/src/icons/svg/example.svg | 1 - magic-boot-ui/src/icons/svg/excel.svg | 1 - .../src/icons/svg/exit-fullscreen.svg | 1 - magic-boot-ui/src/icons/svg/eye-open.svg | 1 - magic-boot-ui/src/icons/svg/eye.svg | 1 - magic-boot-ui/src/icons/svg/form.svg | 1 - magic-boot-ui/src/icons/svg/fullscreen.svg | 1 - magic-boot-ui/src/icons/svg/guide.svg | 1 - magic-boot-ui/src/icons/svg/icon.svg | 1 - magic-boot-ui/src/icons/svg/international.svg | 1 - magic-boot-ui/src/icons/svg/language.svg | 1 - magic-boot-ui/src/icons/svg/link.svg | 1 - magic-boot-ui/src/icons/svg/list.svg | 1 - magic-boot-ui/src/icons/svg/lock.svg | 1 - magic-boot-ui/src/icons/svg/message.svg | 1 - magic-boot-ui/src/icons/svg/money.svg | 1 - magic-boot-ui/src/icons/svg/nested.svg | 1 - magic-boot-ui/src/icons/svg/password.svg | 1 - magic-boot-ui/src/icons/svg/pdf.svg | 1 - magic-boot-ui/src/icons/svg/people.svg | 1 - magic-boot-ui/src/icons/svg/peoples.svg | 1 - magic-boot-ui/src/icons/svg/qq.svg | 1 - magic-boot-ui/src/icons/svg/search.svg | 1 - magic-boot-ui/src/icons/svg/settings.svg | 1 + magic-boot-ui/src/icons/svg/shopping.svg | 1 - magic-boot-ui/src/icons/svg/size.svg | 1 - magic-boot-ui/src/icons/svg/skill.svg | 1 - magic-boot-ui/src/icons/svg/star.svg | 1 - magic-boot-ui/src/icons/svg/tab.svg | 1 - magic-boot-ui/src/icons/svg/table.svg | 1 - magic-boot-ui/src/icons/svg/theme.svg | 1 - magic-boot-ui/src/icons/svg/tree-table.svg | 1 - magic-boot-ui/src/icons/svg/tree.svg | 1 - magic-boot-ui/src/icons/svg/wechat.svg | 1 - magic-boot-ui/src/icons/svg/zip.svg | 1 - magic-boot-ui/src/router/index.js | 2 +- magic-boot-ui/src/scripts/svg-icons.js | 10 + magic-boot-ui/src/views/magic/magic-api.vue | 33 -- .../src/views/system/menu/menu-icons.vue | 76 ++++ .../src/views/system/menu/menu-list.vue | 96 ++++-- .../src/views/system/user/user-form.vue | 28 +- .../src/views/system/user/user-list.vue | 10 +- .../quartz/ScheduledTasksController.java | 2 +- 60 files changed, 189 insertions(+), 482 deletions(-) delete mode 100644 magic-boot-ui/src/icons/svg/404.svg delete mode 100644 magic-boot-ui/src/icons/svg/bug.svg delete mode 100644 magic-boot-ui/src/icons/svg/chart.svg delete mode 100644 magic-boot-ui/src/icons/svg/clipboard.svg delete mode 100644 magic-boot-ui/src/icons/svg/component.svg delete mode 100644 magic-boot-ui/src/icons/svg/dashboard.svg delete mode 100644 magic-boot-ui/src/icons/svg/documentation.svg delete mode 100644 magic-boot-ui/src/icons/svg/drag.svg delete mode 100644 magic-boot-ui/src/icons/svg/edit.svg delete mode 100644 magic-boot-ui/src/icons/svg/education.svg delete mode 100644 magic-boot-ui/src/icons/svg/email.svg delete mode 100644 magic-boot-ui/src/icons/svg/example.svg delete mode 100644 magic-boot-ui/src/icons/svg/excel.svg delete mode 100644 magic-boot-ui/src/icons/svg/exit-fullscreen.svg delete mode 100644 magic-boot-ui/src/icons/svg/eye-open.svg delete mode 100644 magic-boot-ui/src/icons/svg/eye.svg delete mode 100644 magic-boot-ui/src/icons/svg/form.svg delete mode 100644 magic-boot-ui/src/icons/svg/fullscreen.svg delete mode 100644 magic-boot-ui/src/icons/svg/guide.svg delete mode 100644 magic-boot-ui/src/icons/svg/icon.svg delete mode 100644 magic-boot-ui/src/icons/svg/international.svg delete mode 100644 magic-boot-ui/src/icons/svg/language.svg delete mode 100644 magic-boot-ui/src/icons/svg/link.svg delete mode 100644 magic-boot-ui/src/icons/svg/list.svg delete mode 100644 magic-boot-ui/src/icons/svg/lock.svg delete mode 100644 magic-boot-ui/src/icons/svg/message.svg delete mode 100644 magic-boot-ui/src/icons/svg/money.svg delete mode 100644 magic-boot-ui/src/icons/svg/nested.svg delete mode 100644 magic-boot-ui/src/icons/svg/password.svg delete mode 100644 magic-boot-ui/src/icons/svg/pdf.svg delete mode 100644 magic-boot-ui/src/icons/svg/people.svg delete mode 100644 magic-boot-ui/src/icons/svg/peoples.svg delete mode 100644 magic-boot-ui/src/icons/svg/qq.svg delete mode 100644 magic-boot-ui/src/icons/svg/search.svg create mode 100644 magic-boot-ui/src/icons/svg/settings.svg delete mode 100644 magic-boot-ui/src/icons/svg/shopping.svg delete mode 100644 magic-boot-ui/src/icons/svg/size.svg delete mode 100644 magic-boot-ui/src/icons/svg/skill.svg delete mode 100644 magic-boot-ui/src/icons/svg/star.svg delete mode 100644 magic-boot-ui/src/icons/svg/tab.svg delete mode 100644 magic-boot-ui/src/icons/svg/table.svg delete mode 100644 magic-boot-ui/src/icons/svg/theme.svg delete mode 100644 magic-boot-ui/src/icons/svg/tree-table.svg delete mode 100644 magic-boot-ui/src/icons/svg/tree.svg delete mode 100644 magic-boot-ui/src/icons/svg/wechat.svg delete mode 100644 magic-boot-ui/src/icons/svg/zip.svg create mode 100644 magic-boot-ui/src/scripts/svg-icons.js delete mode 100644 magic-boot-ui/src/views/magic/magic-api.vue create mode 100644 magic-boot-ui/src/views/system/menu/menu-icons.vue diff --git a/data/magic-api/api/后台/安全/登录.ms b/data/magic-api/api/后台/安全/登录.ms index 0c30cf0..ca94fd3 100644 --- a/data/magic-api/api/后台/安全/登录.ms +++ b/data/magic-api/api/后台/安全/登录.ms @@ -5,7 +5,7 @@ "groupId" : "1952f25c81084e24b55b11385767dc38", "name" : "登录", "createTime" : null, - "updateTime" : 1635925201035, + "updateTime" : 1641016807364, "lock" : "0", "method" : "POST", "path" : "/login", diff --git a/data/magic-api/api/后台/菜单管理/当前用户菜单.ms b/data/magic-api/api/后台/菜单管理/当前用户菜单.ms index 14bb07e..c7fee56 100644 --- a/data/magic-api/api/后台/菜单管理/当前用户菜单.ms +++ b/data/magic-api/api/后台/菜单管理/当前用户菜单.ms @@ -4,8 +4,8 @@ "script" : null, "groupId" : "67b2ce258e24491194b74992958c74aa", "name" : "当前用户菜单", - "createTime" : 1634724871169, - "updateTime" : 1634724871169, + "createTime" : null, + "updateTime" : 1641016811595, "lock" : "0", "method" : "POST", "path" : "/current/menus", @@ -14,7 +14,7 @@ "requestBody" : "", "headers" : [ ], "paths" : [ ], - "responseBody" : "{\n \"code\": 200,\n \"message\": \"success\",\n \"data\": [\n {\n \"id\": \"b1851d1b13594e71840103c11a37a669\",\n \"name\": \"系统设置\",\n \"pid\": \"82de38c53fbe4c4185e31d972d8c2d5e\",\n \"isShow\": 1,\n \"url\": \"/system\",\n \"sort\": 10,\n \"component\": \"Layout\",\n \"path\": \"/system\",\n \"meta\": {\n \"title\": \"系统设置\"\n },\n \"redirect\": \"noRedirect\",\n \"alwaysShow\": true,\n \"children\": [\n {\n \"id\": \"39be13ef6f0745568c80bf35202ddb2b\",\n \"name\": \"菜单管理\",\n \"pid\": \"b1851d1b13594e71840103c11a37a669\",\n \"isShow\": 1,\n \"url\": \"/system/menu/menu-list\",\n \"sort\": 10,\n \"component\": \"/system/menu/menu-list\",\n \"path\": \"/system/menu/menu-list\",\n \"meta\": {\n \"title\": \"菜单管理\"\n }\n },\n {\n \"id\": \"6f3594d0-5445-41e1-a13c-890a57485036\",\n \"name\": \"组织机构\",\n \"pid\": \"b1851d1b13594e71840103c11a37a669\",\n \"isShow\": 1,\n \"url\": \"/system/office/office-list\",\n \"sort\": 20,\n \"component\": \"/system/office/office-list\",\n \"path\": \"/system/office/office-list\",\n \"meta\": {\n \"title\": \"组织机构\"\n }\n },\n {\n \"id\": \"8e9455740091486c914495cfb0c7faa5\",\n \"name\": \"角色管理\",\n \"pid\": \"b1851d1b13594e71840103c11a37a669\",\n \"isShow\": 1,\n \"url\": \"/system/role/role-list\",\n \"sort\": 40,\n \"component\": \"/system/role/role-list\",\n \"path\": \"/system/role/role-list\",\n \"meta\": {\n \"title\": \"角色管理\"\n }\n },\n {\n \"id\": \"06b8a427e4cd4c1ba11752070f565f20\",\n \"name\": \"用户管理\",\n \"pid\": \"b1851d1b13594e71840103c11a37a669\",\n \"isShow\": 1,\n \"url\": \"/system/user/user-list\",\n \"sort\": 50,\n \"component\": \"/system/user/user-list\",\n \"path\": \"/system/user/user-list\",\n \"meta\": {\n \"title\": \"用户管理\"\n }\n },\n {\n \"id\": \"c5f407478c4e4c9cbcdbee6389d2c909\",\n \"name\": \"数据字典\",\n \"pid\": \"b1851d1b13594e71840103c11a37a669\",\n \"isShow\": 1,\n \"url\": \"/system/dict/dict-list\",\n \"sort\": 60,\n \"component\": \"/system/dict/dict-list\",\n \"path\": \"/system/dict/dict-list\",\n \"meta\": {\n \"title\": \"数据字典\"\n }\n },\n {\n \"id\": \"da801842-9d64-4d3c-a912-732d47373061\",\n \"name\": \"接口管理\",\n \"pid\": \"b1851d1b13594e71840103c11a37a669\",\n \"isShow\": 1,\n \"url\": \"/magic/magic-api\",\n \"sort\": 70,\n \"component\": \"/magic/magic-api\",\n \"path\": \"/magic/magic-api\",\n \"meta\": {\n \"title\": \"接口管理\"\n }\n }\n ]\n },\n {\n \"id\": \"641253af-8ea1-4b5d-8bc3-a7165ef60ff2\",\n \"name\": \"一些例子\",\n \"pid\": \"82de38c53fbe4c4185e31d972d8c2d5e\",\n \"isShow\": 1,\n \"url\": \"/examples\",\n \"sort\": 20,\n \"component\": \"Layout\",\n \"path\": \"/examples\",\n \"meta\": {\n \"title\": \"一些例子\"\n },\n \"redirect\": \"noRedirect\",\n \"alwaysShow\": true,\n \"children\": [\n {\n \"id\": \"dc332875-831e-4937-86ff-0c7420915ce9\",\n \"name\": \"三级联动\",\n \"pid\": \"641253af-8ea1-4b5d-8bc3-a7165ef60ff2\",\n \"isShow\": 1,\n \"url\": \"/examples/three-linkage\",\n \"sort\": 10,\n \"component\": \"/examples/three-linkage\",\n \"path\": \"/examples/three-linkage\",\n \"meta\": {\n \"title\": \"三级联动\"\n }\n },\n {\n \"id\": \"f09410d5-5043-4164-9f68-8d135de71b29\",\n \"name\": \"上传文件\",\n \"pid\": \"641253af-8ea1-4b5d-8bc3-a7165ef60ff2\",\n \"isShow\": 1,\n \"url\": \"/examples/upload-file\",\n \"sort\": 20,\n \"component\": \"/examples/upload-file\",\n \"path\": \"/examples/upload-file\",\n \"meta\": {\n \"title\": \"上传文件\"\n }\n },\n {\n \"id\": \"74c852ea-be4b-4533-b146-cfbd776045d5\",\n \"name\": \"富文本\",\n \"pid\": \"641253af-8ea1-4b5d-8bc3-a7165ef60ff2\",\n \"isShow\": 1,\n \"url\": \"/examples/ueditor-example\",\n \"sort\": 30,\n \"component\": \"/examples/ueditor-example\",\n \"path\": \"/examples/ueditor-example\",\n \"meta\": {\n \"title\": \"富文本\"\n }\n },\n {\n \"id\": \"91bdb7d742a64a8c8a8fdc6d3bb61581\",\n \"name\": \"可编辑表格\",\n \"pid\": \"641253af-8ea1-4b5d-8bc3-a7165ef60ff2\",\n \"isShow\": 1,\n \"url\": \"/examples/editor-table\",\n \"sort\": 40,\n \"component\": \"/examples/editor-table\",\n \"path\": \"/examples/editor-table\",\n \"meta\": {\n \"title\": \"可编辑表格\"\n }\n },\n {\n \"id\": \"0ca23f378d794b23b935d6045bb54915\",\n \"name\": \"页面设计\",\n \"pid\": \"641253af-8ea1-4b5d-8bc3-a7165ef60ff2\",\n \"isShow\": 1,\n \"url\": \"/examples/page-design\",\n \"sort\": 50,\n \"component\": \"/examples/page-design\",\n \"path\": \"/examples/page-design\",\n \"meta\": {\n \"title\": \"页面设计\"\n }\n },\n {\n \"id\": \"2664b76cb2904227bce5b0f7d1dd6e7b\",\n \"name\": \"下拉框\",\n \"pid\": \"641253af-8ea1-4b5d-8bc3-a7165ef60ff2\",\n \"isShow\": 1,\n \"url\": \"/examples/select-example\",\n \"sort\": 60,\n \"component\": \"/examples/select-example\",\n \"path\": \"/examples/select-example\",\n \"meta\": {\n \"title\": \"下拉框\"\n }\n }\n ]\n }\n ],\n \"timestamp\": 1634135501673,\n \"executeTime\": 20\n}", + "responseBody" : "{\n \"code\": 402,\n \"message\": \"凭证已过期\",\n \"data\": null,\n \"timestamp\": 1641016803295,\n \"executeTime\": null\n}", "description" : null, "requestBodyDefinition" : null, "responseBodyDefinition" : { @@ -30,7 +30,7 @@ "expression" : "", "children" : [ { "name" : "code", - "value" : "200", + "value" : "402", "description" : "", "required" : false, "dataType" : "Integer", @@ -42,7 +42,7 @@ "children" : [ ] }, { "name" : "message", - "value" : "success", + "value" : "凭证已过期", "description" : "", "required" : false, "dataType" : "String", @@ -54,319 +54,19 @@ "children" : [ ] }, { "name" : "data", - "value" : "", + "value" : "null", "description" : "", "required" : false, - "dataType" : "Array", + "dataType" : "Object", "type" : null, "defaultValue" : null, "validateType" : "", "error" : "", "expression" : "", - "children" : [ { - "name" : "82de38c53fbe4c4185e31d972d8c2d5e", - "value" : "", - "description" : "", - "required" : false, - "dataType" : "Object", - "type" : null, - "defaultValue" : null, - "validateType" : "", - "error" : "", - "expression" : "", - "children" : [ { - "name" : "id", - "value" : "b1851d1b13594e71840103c11a37a669", - "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" : "pid", - "value" : "82de38c53fbe4c4185e31d972d8c2d5e", - "description" : "", - "required" : false, - "dataType" : "String", - "type" : null, - "defaultValue" : null, - "validateType" : "", - "error" : "", - "expression" : "", - "children" : [ ] - }, { - "name" : "isShow", - "value" : "1", - "description" : "", - "required" : false, - "dataType" : "Integer", - "type" : null, - "defaultValue" : null, - "validateType" : "", - "error" : "", - "expression" : "", - "children" : [ ] - }, { - "name" : "url", - "value" : "/system", - "description" : "", - "required" : false, - "dataType" : "String", - "type" : null, - "defaultValue" : null, - "validateType" : "", - "error" : "", - "expression" : "", - "children" : [ ] - }, { - "name" : "sort", - "value" : "10", - "description" : "", - "required" : false, - "dataType" : "Integer", - "type" : null, - "defaultValue" : null, - "validateType" : "", - "error" : "", - "expression" : "", - "children" : [ ] - }, { - "name" : "component", - "value" : "Layout", - "description" : "", - "required" : false, - "dataType" : "String", - "type" : null, - "defaultValue" : null, - "validateType" : "", - "error" : "", - "expression" : "", - "children" : [ ] - }, { - "name" : "path", - "value" : "/system", - "description" : "", - "required" : false, - "dataType" : "String", - "type" : null, - "defaultValue" : null, - "validateType" : "", - "error" : "", - "expression" : "", - "children" : [ ] - }, { - "name" : "meta", - "value" : "", - "description" : "", - "required" : false, - "dataType" : "Object", - "type" : null, - "defaultValue" : null, - "validateType" : "", - "error" : "", - "expression" : "", - "children" : [ { - "name" : "title", - "value" : "系统设置", - "description" : "", - "required" : false, - "dataType" : "String", - "type" : null, - "defaultValue" : null, - "validateType" : "", - "error" : "", - "expression" : "", - "children" : [ ] - } ] - }, { - "name" : "redirect", - "value" : "noRedirect", - "description" : "", - "required" : false, - "dataType" : "String", - "type" : null, - "defaultValue" : null, - "validateType" : "", - "error" : "", - "expression" : "", - "children" : [ ] - }, { - "name" : "alwaysShow", - "value" : "true", - "description" : "", - "required" : false, - "dataType" : "Boolean", - "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" : "id", - "value" : "39be13ef6f0745568c80bf35202ddb2b", - "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" : "pid", - "value" : "b1851d1b13594e71840103c11a37a669", - "description" : "", - "required" : false, - "dataType" : "String", - "type" : null, - "defaultValue" : null, - "validateType" : "", - "error" : "", - "expression" : "", - "children" : [ ] - }, { - "name" : "isShow", - "value" : "1", - "description" : "", - "required" : false, - "dataType" : "Integer", - "type" : null, - "defaultValue" : null, - "validateType" : "", - "error" : "", - "expression" : "", - "children" : [ ] - }, { - "name" : "url", - "value" : "/system/menu/menu-list", - "description" : "", - "required" : false, - "dataType" : "String", - "type" : null, - "defaultValue" : null, - "validateType" : "", - "error" : "", - "expression" : "", - "children" : [ ] - }, { - "name" : "sort", - "value" : "10", - "description" : "", - "required" : false, - "dataType" : "Integer", - "type" : null, - "defaultValue" : null, - "validateType" : "", - "error" : "", - "expression" : "", - "children" : [ ] - }, { - "name" : "component", - "value" : "/system/menu/menu-list", - "description" : "", - "required" : false, - "dataType" : "String", - "type" : null, - "defaultValue" : null, - "validateType" : "", - "error" : "", - "expression" : "", - "children" : [ ] - }, { - "name" : "path", - "value" : "/system/menu/menu-list", - "description" : "", - "required" : false, - "dataType" : "String", - "type" : null, - "defaultValue" : null, - "validateType" : "", - "error" : "", - "expression" : "", - "children" : [ ] - }, { - "name" : "meta", - "value" : "", - "description" : "", - "required" : false, - "dataType" : "Object", - "type" : null, - "defaultValue" : null, - "validateType" : "", - "error" : "", - "expression" : "", - "children" : [ { - "name" : "title", - "value" : "菜单管理", - "description" : "", - "required" : false, - "dataType" : "String", - "type" : null, - "defaultValue" : null, - "validateType" : "", - "error" : "", - "expression" : "", - "children" : [ ] - } ] - } ] - } ] - } ] - } ] + "children" : [ ] }, { "name" : "timestamp", - "value" : "1634135501673", + "value" : "1641016803295", "description" : "", "required" : false, "dataType" : "Long", @@ -378,10 +78,10 @@ "children" : [ ] }, { "name" : "executeTime", - "value" : "20", + "value" : "null", "description" : "", "required" : false, - "dataType" : "Integer", + "dataType" : "Object", "type" : null, "defaultValue" : null, "validateType" : "", @@ -403,7 +103,8 @@ var menus = db.select(""" sm.pid, sm.is_show, sm.url, - sm.sort + sm.sort, + sm.icon FROM sys_menu sm left JOIN sys_role_menu srm ON sm.id = srm.menu_id @@ -417,6 +118,7 @@ for(menu in menus){ menu.path = (menu.component == 'Layout' ? "/" : menu.component); menu.meta = {} menu.meta.title = menu.name + menu.meta.icon = menu.icon } var nodes = menus.toMap(it => it.id) nodes.each((key, node) => { diff --git a/data/magic-api/api/后台/菜单管理/获取菜单tree.ms b/data/magic-api/api/后台/菜单管理/获取菜单tree.ms index cea1c05..d6ea5b4 100644 --- a/data/magic-api/api/后台/菜单管理/获取菜单tree.ms +++ b/data/magic-api/api/后台/菜单管理/获取菜单tree.ms @@ -4,8 +4,8 @@ "script" : null, "groupId" : "67b2ce258e24491194b74992958c74aa", "name" : "获取菜单tree", - "createTime" : 1634724871168, - "updateTime" : 1634724871168, + "createTime" : null, + "updateTime" : 1641016870466, "lock" : "0", "method" : "GET", "path" : "/tree", @@ -94,7 +94,7 @@ } ================================ var toTree = (list,pid) => select t.*,toTree(list,t.id) children from list t where t.pid = pid -var list = toTree(db.select('select id,name,pid,is_show,url,sort,permission,desc_ribe from sys_menu where is_del = 0 order by sort'),'0') +var list = toTree(db.select('select id,name,pid,is_show,url,sort,permission,desc_ribe,icon from sys_menu where is_del = 0 order by sort'),'0') return { list: list, diff --git a/db/magic-boot.sql b/db/magic-boot.sql index 049339d..ec35a3b 100644 --- a/db/magic-boot.sql +++ b/db/magic-boot.sql @@ -11,7 +11,7 @@ Target Server Version : 50729 File Encoding : 65001 - Date: 02/11/2021 14:09:08 + Date: 05/11/2021 23:39:45 */ SET NAMES utf8mb4; diff --git a/magic-boot-ui/package.json b/magic-boot-ui/package.json index 94058da..2b21ba1 100644 --- a/magic-boot-ui/package.json +++ b/magic-boot-ui/package.json @@ -21,7 +21,6 @@ "jquery": "^1.7.2", "js-cookie": "2.2.0", "jsoneditor": "^9.3.0", - "magic-editor": "1.6.3", "normalize.css": "7.0.0", "nprogress": "0.2.0", "path-to-regexp": "2.4.0", diff --git a/magic-boot-ui/src/components/Psyduck/pd-dialog.vue b/magic-boot-ui/src/components/Psyduck/pd-dialog.vue index 4abe10d..b4bf894 100644 --- a/magic-boot-ui/src/components/Psyduck/pd-dialog.vue +++ b/magic-boot-ui/src/components/Psyduck/pd-dialog.vue @@ -1,5 +1,5 @@