diff --git a/data/magic-api/api/系统管理/菜单管理/当前用户菜单.ms b/data/magic-api/api/系统管理/菜单管理/当前用户菜单.ms
index a371f58..b8fac54 100644
--- a/data/magic-api/api/系统管理/菜单管理/当前用户菜单.ms
+++ b/data/magic-api/api/系统管理/菜单管理/当前用户菜单.ms
@@ -5,7 +5,7 @@
"groupId" : "67b2ce258e24491194b74992958c74aa",
"name" : "当前用户菜单",
"createTime" : null,
- "updateTime" : 1656390120715,
+ "updateTime" : 1657368580988,
"lock" : "0",
"createBy" : null,
"updateBy" : null,
@@ -16,7 +16,7 @@
"requestBody" : "{\n\n}",
"headers" : [ ],
"paths" : [ ],
- "responseBody" : "{\n \"code\": 200,\n \"message\": \"success\",\n \"data\": [{\n \"id\": \"b1851d1b13594e71840103c11a37a669\",\n \"name\": \"系统设置\",\n \"pid\": \"0\",\n \"isShow\": 1,\n \"url\": \"/system\",\n \"sort\": 10,\n \"icon\": \"settings\",\n \"keepAlive\": 0,\n \"code\": null,\n \"componentname\": null,\n \"component\": \"Layout\",\n \"path\": \"/system\",\n \"meta\": {\n \"title\": \"系统设置\",\n \"icon\": \"settings\",\n \"keepAlive\": false\n },\n \"redirect\": \"noRedirect\",\n \"alwaysShow\": true,\n \"children\": [{\n \"id\": \"39be13ef6f0745568c80bf35202ddb2b\",\n \"name\": \"菜单管理\",\n \"pid\": \"b1851d1b13594e71840103c11a37a669\",\n \"isShow\": 1,\n \"url\": \"/system/menu/menu-list\",\n \"sort\": 10,\n \"icon\": \"menu\",\n \"keepAlive\": 1,\n \"code\": null,\n \"componentname\": null,\n \"component\": \"/system/menu/menu-list\",\n \"path\": \"/system/menu/menu-list\",\n \"meta\": {\n \"title\": \"菜单管理\",\n \"icon\": \"menu\",\n \"keepAlive\": true\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 \"icon\": \"office\",\n \"keepAlive\": 0,\n \"code\": null,\n \"componentname\": null,\n \"component\": \"/system/office/office-list\",\n \"path\": \"/system/office/office-list\",\n \"meta\": {\n \"title\": \"组织机构\",\n \"icon\": \"office\",\n \"keepAlive\": false\n }\n }, {\n \"id\": \"8e9455740091486c914495cfb0c7faa5\",\n \"name\": \"角色管理\",\n \"pid\": \"b1851d1b13594e71840103c11a37a669\",\n \"isShow\": 1,\n \"url\": \"/system/role/role-list\",\n \"sort\": 40,\n \"icon\": \"role\",\n \"keepAlive\": 0,\n \"code\": null,\n \"componentname\": null,\n \"component\": \"/system/role/role-list\",\n \"path\": \"/system/role/role-list\",\n \"meta\": {\n \"title\": \"角色管理\",\n \"icon\": \"role\",\n \"keepAlive\": false\n }\n }, {\n \"id\": \"06b8a427e4cd4c1ba11752070f565f20\",\n \"name\": \"用户管理\",\n \"pid\": \"b1851d1b13594e71840103c11a37a669\",\n \"isShow\": 1,\n \"url\": \"/system/user/user-list\",\n \"sort\": 50,\n \"icon\": \"user\",\n \"keepAlive\": 0,\n \"code\": null,\n \"componentname\": null,\n \"component\": \"/system/user/user-list\",\n \"path\": \"/system/user/user-list\",\n \"meta\": {\n \"title\": \"用户管理\",\n \"icon\": \"user\",\n \"keepAlive\": false\n }\n }, {\n \"id\": \"c5f407478c4e4c9cbcdbee6389d2c909\",\n \"name\": \"数据字典\",\n \"pid\": \"b1851d1b13594e71840103c11a37a669\",\n \"isShow\": 1,\n \"url\": \"/system/dict/dict-list\",\n \"sort\": 60,\n \"icon\": \"dict\",\n \"keepAlive\": 0,\n \"code\": null,\n \"componentname\": null,\n \"component\": \"/system/dict/dict-list\",\n \"path\": \"/system/dict/dict-list\",\n \"meta\": {\n \"title\": \"数据字典\",\n \"icon\": \"dict\",\n \"keepAlive\": false\n }\n }, {\n \"id\": \"10fc3bdde0c642aea2af34d281a49cf9\",\n \"name\": \"测试数据\",\n \"pid\": \"b1851d1b13594e71840103c11a37a669\",\n \"isShow\": 1,\n \"url\": \"/system/test/test-list\",\n \"sort\": 100,\n \"icon\": \"home\",\n \"keepAlive\": 1,\n \"code\": null,\n \"componentname\": null,\n \"component\": \"/system/test/test-list\",\n \"path\": \"/system/test/test-list\",\n \"meta\": {\n \"title\": \"测试数据\",\n \"icon\": \"home\",\n \"keepAlive\": true\n }\n }]\n }, {\n \"id\": \"641253af-8ea1-4b5d-8bc3-a7165ef60ff2\",\n \"name\": \"一些例子\",\n \"pid\": \"0\",\n \"isShow\": 1,\n \"url\": \"/examples\",\n \"sort\": 20,\n \"icon\": \"examples\",\n \"keepAlive\": 0,\n \"code\": null,\n \"componentname\": null,\n \"component\": \"Layout\",\n \"path\": \"/examples\",\n \"meta\": {\n \"title\": \"一些例子\",\n \"icon\": \"examples\",\n \"keepAlive\": false\n },\n \"redirect\": \"noRedirect\",\n \"alwaysShow\": true,\n \"children\": [{\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 \"icon\": \"\",\n \"keepAlive\": 0,\n \"code\": null,\n \"componentname\": null,\n \"component\": \"/examples/three-linkage\",\n \"path\": \"/examples/three-linkage\",\n \"meta\": {\n \"title\": \"三级联动\",\n \"icon\": \"\",\n \"keepAlive\": false\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 \"icon\": \"\",\n \"keepAlive\": 0,\n \"code\": null,\n \"componentname\": null,\n \"component\": \"/examples/upload-file\",\n \"path\": \"/examples/upload-file\",\n \"meta\": {\n \"title\": \"上传文件\",\n \"icon\": \"\",\n \"keepAlive\": false\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 \"icon\": \"\",\n \"keepAlive\": 0,\n \"code\": null,\n \"componentname\": null,\n \"component\": \"/examples/ueditor-example\",\n \"path\": \"/examples/ueditor-example\",\n \"meta\": {\n \"title\": \"富文本\",\n \"icon\": \"\",\n \"keepAlive\": false\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 \"icon\": \"\",\n \"keepAlive\": 0,\n \"code\": null,\n \"componentname\": null,\n \"component\": \"/examples/editor-table\",\n \"path\": \"/examples/editor-table\",\n \"meta\": {\n \"title\": \"可编辑表格\",\n \"icon\": \"\",\n \"keepAlive\": false\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 \"icon\": \"\",\n \"keepAlive\": 0,\n \"code\": null,\n \"componentname\": null,\n \"component\": \"/examples/page-design\",\n \"path\": \"/examples/page-design\",\n \"meta\": {\n \"title\": \"页面设计\",\n \"icon\": \"\",\n \"keepAlive\": false\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 \"icon\": \"\",\n \"keepAlive\": 0,\n \"code\": null,\n \"componentname\": null,\n \"component\": \"/examples/select-example\",\n \"path\": \"/examples/select-example\",\n \"meta\": {\n \"title\": \"下拉框\",\n \"icon\": \"\",\n \"keepAlive\": false\n }\n }]\n }, {\n \"id\": \"d7f8d052d4864bd285c575c3cf2dce69\",\n \"name\": \"低代码\",\n \"pid\": \"0\",\n \"isShow\": 1,\n \"url\": \"/lowcode\",\n \"sort\": 30,\n \"icon\": null,\n \"keepAlive\": 1,\n \"code\": null,\n \"componentname\": null,\n \"component\": \"Layout\",\n \"path\": \"/lowcode\",\n \"meta\": {\n \"title\": \"低代码\",\n \"icon\": null,\n \"keepAlive\": true\n },\n \"redirect\": \"noRedirect\",\n \"alwaysShow\": true,\n \"children\": [{\n \"id\": \"9de78e0a6042469c891af82fbc21ba90\",\n \"name\": \"组件管理\",\n \"pid\": \"d7f8d052d4864bd285c575c3cf2dce69\",\n \"isShow\": 1,\n \"url\": \"/lowcode/component-list\",\n \"sort\": 10,\n \"icon\": null,\n \"keepAlive\": 1,\n \"code\": null,\n \"componentname\": null,\n \"component\": \"/lowcode/component-list\",\n \"path\": \"/lowcode/component-list\",\n \"meta\": {\n \"title\": \"组件管理\",\n \"icon\": null,\n \"keepAlive\": true\n }\n }, {\n \"id\": \"c7445e2ac6144a15a76d723607fbfb9d\",\n \"name\": \"接口管理\",\n \"pid\": \"d7f8d052d4864bd285c575c3cf2dce69\",\n \"isShow\": 1,\n \"url\": \"/lowcode/magic-editor\",\n \"sort\": 20,\n \"icon\": null,\n \"keepAlive\": 1,\n \"code\": null,\n \"componentname\": null,\n \"component\": \"/lowcode/magic-editor\",\n \"path\": \"/lowcode/magic-editor\",\n \"meta\": {\n \"title\": \"接口管理\",\n \"icon\": null,\n \"keepAlive\": true\n }\n }]\n }],\n \"timestamp\": 1646400974566,\n \"executeTime\": 41\n}",
+ "responseBody" : "{\n \"code\": 200,\n \"message\": \"success\",\n \"data\": [{\n \"id\": \"b1851d1b13594e71840103c11a37a669\",\n \"title\": \"系统设置\",\n \"pid\": \"0\",\n \"isShow\": 1,\n \"url\": \"/system\",\n \"sort\": 10,\n \"icon\": \"settings\",\n \"keepAlive\": 0,\n \"componentName\": null,\n \"openMode\": \"0\",\n \"component\": \"Layout\",\n \"path\": \"/system\",\n \"meta\": {\n \"title\": \"系统设置\",\n \"icon\": \"settings\",\n \"keepAlive\": false\n },\n \"redirect\": \"noRedirect\",\n \"alwaysShow\": true,\n \"children\": [{\n \"id\": \"39be13ef6f0745568c80bf35202ddb2b\",\n \"title\": \"菜单管理\",\n \"pid\": \"b1851d1b13594e71840103c11a37a669\",\n \"isShow\": 1,\n \"url\": \"/system/menu/menu-list\",\n \"sort\": 10,\n \"icon\": \"menu\",\n \"keepAlive\": 1,\n \"componentName\": null,\n \"openMode\": \"0\",\n \"component\": \"/system/menu/menu-list\",\n \"path\": \"/system/menu/menu-list\",\n \"meta\": {\n \"title\": \"菜单管理\",\n \"icon\": \"menu\",\n \"keepAlive\": true\n }\n }, {\n \"id\": \"6f3594d0-5445-41e1-a13c-890a57485036\",\n \"title\": \"组织机构\",\n \"pid\": \"b1851d1b13594e71840103c11a37a669\",\n \"isShow\": 1,\n \"url\": \"/system/office/office-list\",\n \"sort\": 20,\n \"icon\": \"office\",\n \"keepAlive\": 1,\n \"componentName\": null,\n \"openMode\": \"0\",\n \"component\": \"/system/office/office-list\",\n \"path\": \"/system/office/office-list\",\n \"meta\": {\n \"title\": \"组织机构\",\n \"icon\": \"office\",\n \"keepAlive\": true\n }\n }, {\n \"id\": \"8e9455740091486c914495cfb0c7faa5\",\n \"title\": \"角色管理\",\n \"pid\": \"b1851d1b13594e71840103c11a37a669\",\n \"isShow\": 1,\n \"url\": \"/system/role/role-list\",\n \"sort\": 40,\n \"icon\": \"role\",\n \"keepAlive\": 1,\n \"componentName\": null,\n \"openMode\": \"0\",\n \"component\": \"/system/role/role-list\",\n \"path\": \"/system/role/role-list\",\n \"meta\": {\n \"title\": \"角色管理\",\n \"icon\": \"role\",\n \"keepAlive\": true\n }\n }, {\n \"id\": \"06b8a427e4cd4c1ba11752070f565f20\",\n \"title\": \"用户管理\",\n \"pid\": \"b1851d1b13594e71840103c11a37a669\",\n \"isShow\": 1,\n \"url\": \"/system/user/user-list\",\n \"sort\": 50,\n \"icon\": \"user\",\n \"keepAlive\": 1,\n \"componentName\": null,\n \"openMode\": \"0\",\n \"component\": \"Layout\",\n \"path\": \"/system/user/user-list\",\n \"meta\": {\n \"title\": \"用户管理\",\n \"icon\": \"user\",\n \"keepAlive\": true\n },\n \"redirect\": \"noRedirect\",\n \"alwaysShow\": true,\n \"children\": [{\n \"id\": \"10fc3bdde0c642aea2af34d281a49cf9\",\n \"title\": \"测试数据\",\n \"pid\": \"06b8a427e4cd4c1ba11752070f565f20\",\n \"isShow\": 0,\n \"url\": \"/system/test/test-list\",\n \"sort\": 100,\n \"icon\": \"home\",\n \"keepAlive\": 1,\n \"componentName\": \"data-test-list\",\n \"openMode\": \"0\",\n \"component\": \"/system/test/test-list\",\n \"path\": \"/system/test/test-list\",\n \"meta\": {\n \"title\": \"测试数据\",\n \"icon\": \"home\",\n \"keepAlive\": true\n }\n }]\n }, {\n \"id\": \"c5f407478c4e4c9cbcdbee6389d2c909\",\n \"title\": \"数据字典\",\n \"pid\": \"b1851d1b13594e71840103c11a37a669\",\n \"isShow\": 1,\n \"url\": \"/system/dict/dict-list\",\n \"sort\": 60,\n \"icon\": \"dict\",\n \"keepAlive\": 1,\n \"componentName\": null,\n \"openMode\": \"0\",\n \"component\": \"/system/dict/dict-list\",\n \"path\": \"/system/dict/dict-list\",\n \"meta\": {\n \"title\": \"数据字典\",\n \"icon\": \"dict\",\n \"keepAlive\": true\n }\n }, {\n \"id\": \"7ad229f12c8f4b57bbb9349e2ffd8932\",\n \"title\": \"配置中心\",\n \"pid\": \"b1851d1b13594e71840103c11a37a669\",\n \"isShow\": 1,\n \"url\": \"/system/configure/configure-list\",\n \"sort\": 110,\n \"icon\": \"configure\",\n \"keepAlive\": 0,\n \"componentName\": \"\",\n \"openMode\": \"0\",\n \"component\": \"/system/configure/configure-list\",\n \"path\": \"/system/configure/configure-list\",\n \"meta\": {\n \"title\": \"配置中心\",\n \"icon\": \"configure\",\n \"keepAlive\": false\n }\n }]\n }, {\n \"id\": \"641253af-8ea1-4b5d-8bc3-a7165ef60ff2\",\n \"title\": \"一些例子\",\n \"pid\": \"0\",\n \"isShow\": 1,\n \"url\": \"/examples\",\n \"sort\": 20,\n \"icon\": \"examples\",\n \"keepAlive\": 0,\n \"componentName\": null,\n \"openMode\": \"0\",\n \"component\": \"Layout\",\n \"path\": \"/examples\",\n \"meta\": {\n \"title\": \"一些例子\",\n \"icon\": \"examples\",\n \"keepAlive\": false\n },\n \"redirect\": \"noRedirect\",\n \"alwaysShow\": true,\n \"children\": [{\n \"id\": \"dc332875-831e-4937-86ff-0c7420915ce9\",\n \"title\": \"三级联动\",\n \"pid\": \"641253af-8ea1-4b5d-8bc3-a7165ef60ff2\",\n \"isShow\": 1,\n \"url\": \"/examples/three-linkage\",\n \"sort\": 10,\n \"icon\": \"\",\n \"keepAlive\": 0,\n \"componentName\": null,\n \"openMode\": \"0\",\n \"component\": \"/examples/three-linkage\",\n \"path\": \"/examples/three-linkage\",\n \"meta\": {\n \"title\": \"三级联动\",\n \"icon\": \"\",\n \"keepAlive\": false\n }\n }, {\n \"id\": \"f09410d5-5043-4164-9f68-8d135de71b29\",\n \"title\": \"上传文件\",\n \"pid\": \"641253af-8ea1-4b5d-8bc3-a7165ef60ff2\",\n \"isShow\": 1,\n \"url\": \"/examples/upload-file\",\n \"sort\": 20,\n \"icon\": \"\",\n \"keepAlive\": 0,\n \"componentName\": null,\n \"openMode\": \"0\",\n \"component\": \"/examples/upload-file\",\n \"path\": \"/examples/upload-file\",\n \"meta\": {\n \"title\": \"上传文件\",\n \"icon\": \"\",\n \"keepAlive\": false\n }\n }, {\n \"id\": \"74c852ea-be4b-4533-b146-cfbd776045d5\",\n \"title\": \"富文本\",\n \"pid\": \"641253af-8ea1-4b5d-8bc3-a7165ef60ff2\",\n \"isShow\": 1,\n \"url\": \"/examples/ueditor-example\",\n \"sort\": 30,\n \"icon\": \"\",\n \"keepAlive\": 0,\n \"componentName\": null,\n \"openMode\": \"0\",\n \"component\": \"/examples/ueditor-example\",\n \"path\": \"/examples/ueditor-example\",\n \"meta\": {\n \"title\": \"富文本\",\n \"icon\": \"\",\n \"keepAlive\": false\n }\n }, {\n \"id\": \"91bdb7d742a64a8c8a8fdc6d3bb61581\",\n \"title\": \"可编辑表格\",\n \"pid\": \"641253af-8ea1-4b5d-8bc3-a7165ef60ff2\",\n \"isShow\": 1,\n \"url\": \"/examples/editor-table\",\n \"sort\": 40,\n \"icon\": \"\",\n \"keepAlive\": 0,\n \"componentName\": null,\n \"openMode\": \"0\",\n \"component\": \"/examples/editor-table\",\n \"path\": \"/examples/editor-table\",\n \"meta\": {\n \"title\": \"可编辑表格\",\n \"icon\": \"\",\n \"keepAlive\": false\n }\n }, {\n \"id\": \"2664b76cb2904227bce5b0f7d1dd6e7b\",\n \"title\": \"下拉框\",\n \"pid\": \"641253af-8ea1-4b5d-8bc3-a7165ef60ff2\",\n \"isShow\": 1,\n \"url\": \"/examples/select-example\",\n \"sort\": 60,\n \"icon\": \"\",\n \"keepAlive\": 0,\n \"componentName\": null,\n \"openMode\": \"0\",\n \"component\": \"/examples/select-example\",\n \"path\": \"/examples/select-example\",\n \"meta\": {\n \"title\": \"下拉框\",\n \"icon\": \"\",\n \"keepAlive\": false\n }\n }, {\n \"id\": \"c50388914fab408c8b74f83d0d43e557\",\n \"title\": \"测试列表\",\n \"pid\": \"641253af-8ea1-4b5d-8bc3-a7165ef60ff2\",\n \"isShow\": 1,\n \"url\": \"/examples/test-mb-list\",\n \"sort\": 70,\n \"icon\": null,\n \"keepAlive\": 0,\n \"componentName\": null,\n \"openMode\": \"0\",\n \"component\": \"/examples/test-mb-list\",\n \"path\": \"/examples/test-mb-list\",\n \"meta\": {\n \"title\": \"测试列表\",\n \"icon\": null,\n \"keepAlive\": false\n }\n }, {\n \"id\": \"713626516eaa4ba98c9daf55009b481e\",\n \"title\": \"测试表单\",\n \"pid\": \"641253af-8ea1-4b5d-8bc3-a7165ef60ff2\",\n \"isShow\": 1,\n \"url\": \"/examples/test-mb-form\",\n \"sort\": 80,\n \"icon\": \"\",\n \"keepAlive\": 0,\n \"componentName\": \"\",\n \"openMode\": \"0\",\n \"component\": \"/examples/test-mb-form\",\n \"path\": \"/examples/test-mb-form\",\n \"meta\": {\n \"title\": \"测试表单\",\n \"icon\": \"\",\n \"keepAlive\": false\n }\n }, {\n \"id\": \"9385945c7f5f476ab38885976907db2a\",\n \"title\": \"测试外链\",\n \"pid\": \"641253af-8ea1-4b5d-8bc3-a7165ef60ff2\",\n \"isShow\": 1,\n \"url\": \"http://localhost:8081/magic/web/index.html\",\n \"sort\": 90,\n \"icon\": \"\",\n \"keepAlive\": 0,\n \"componentName\": \"\",\n \"openMode\": \"0\",\n \"component\": \"http://localhost:8081/magic/web/index.html\",\n \"path\": \"http://localhost:8081/magic/web/index.html\",\n \"meta\": {\n \"title\": \"测试外链\",\n \"icon\": \"\",\n \"keepAlive\": false\n }\n }]\n }, {\n \"id\": \"d7f8d052d4864bd285c575c3cf2dce69\",\n \"title\": \"低代码\",\n \"pid\": \"0\",\n \"isShow\": 1,\n \"url\": \"/lowcode\",\n \"sort\": 30,\n \"icon\": \"examples\",\n \"keepAlive\": 1,\n \"componentName\": null,\n \"openMode\": \"0\",\n \"component\": \"Layout\",\n \"path\": \"/lowcode\",\n \"meta\": {\n \"title\": \"低代码\",\n \"icon\": \"examples\",\n \"keepAlive\": true\n },\n \"redirect\": \"noRedirect\",\n \"alwaysShow\": true,\n \"children\": [{\n \"id\": \"c7445e2ac6144a15a76d723607fbfb9d\",\n \"title\": \"接口管理\",\n \"pid\": \"d7f8d052d4864bd285c575c3cf2dce69\",\n \"isShow\": 1,\n \"url\": \"/lowcode/magic-editor\",\n \"sort\": 20,\n \"icon\": \"interface\",\n \"keepAlive\": 1,\n \"componentName\": \"\",\n \"openMode\": \"0\",\n \"component\": \"/lowcode/magic-editor\",\n \"path\": \"/lowcode/magic-editor\",\n \"meta\": {\n \"title\": \"接口管理\",\n \"icon\": \"interface\",\n \"keepAlive\": true\n }\n }, {\n \"id\": \"99c6e9aeb6694c349f5db66e2516f069\",\n \"title\": \"代码生成\",\n \"pid\": \"d7f8d052d4864bd285c575c3cf2dce69\",\n \"isShow\": 1,\n \"url\": \"/lowcode/code-gen-list\",\n \"sort\": 30,\n \"icon\": \"examples\",\n \"keepAlive\": 1,\n \"componentName\": \"\",\n \"openMode\": \"0\",\n \"component\": \"/lowcode/code-gen-list\",\n \"path\": \"/lowcode/code-gen-list\",\n \"meta\": {\n \"title\": \"代码生成\",\n \"icon\": \"examples\",\n \"keepAlive\": true\n }\n }, {\n \"id\": \"bf5c1e44546341de9acee52d148d5a76\",\n \"title\": \"测试生成\",\n \"pid\": \"d7f8d052d4864bd285c575c3cf2dce69\",\n \"isShow\": 1,\n \"url\": \"/data/test\",\n \"sort\": 40,\n \"icon\": null,\n \"keepAlive\": 1,\n \"componentName\": \"data-test-list\",\n \"openMode\": \"0\",\n \"component\": \"/data/test\",\n \"path\": \"/data/test\",\n \"meta\": {\n \"title\": \"测试生成\",\n \"icon\": null,\n \"keepAlive\": true\n }\n }]\n }, {\n \"id\": \"4a57f57fc7324c94b6390f1a2dd1f49a\",\n \"title\": \"系统监控\",\n \"pid\": \"0\",\n \"isShow\": 1,\n \"url\": \"/system/monitor\",\n \"sort\": 40,\n \"icon\": \"monitor\",\n \"keepAlive\": 0,\n \"componentName\": null,\n \"openMode\": \"0\",\n \"component\": \"Layout\",\n \"path\": \"/system/monitor\",\n \"meta\": {\n \"title\": \"系统监控\",\n \"icon\": \"monitor\",\n \"keepAlive\": false\n },\n \"redirect\": \"noRedirect\",\n \"alwaysShow\": true,\n \"children\": [{\n \"id\": \"4fc65edbe0544c369b58fdfed1523537\",\n \"title\": \"操作日志\",\n \"pid\": \"4a57f57fc7324c94b6390f1a2dd1f49a\",\n \"isShow\": 1,\n \"url\": \"/system/monitor/oper-log\",\n \"sort\": 10,\n \"icon\": \"oper-log\",\n \"keepAlive\": 0,\n \"componentName\": null,\n \"openMode\": \"0\",\n \"component\": \"/system/monitor/oper-log\",\n \"path\": \"/system/monitor/oper-log\",\n \"meta\": {\n \"title\": \"操作日志\",\n \"icon\": \"oper-log\",\n \"keepAlive\": false\n }\n }, {\n \"id\": \"eee27ca353fb440aa5ac0bd7b38cad1d\",\n \"title\": \"登录日志\",\n \"pid\": \"4a57f57fc7324c94b6390f1a2dd1f49a\",\n \"isShow\": 1,\n \"url\": \"/system/monitor/login-log\",\n \"sort\": 20,\n \"icon\": \"login-log\",\n \"keepAlive\": 0,\n \"componentName\": null,\n \"openMode\": \"0\",\n \"component\": \"/system/monitor/login-log\",\n \"path\": \"/system/monitor/login-log\",\n \"meta\": {\n \"title\": \"登录日志\",\n \"icon\": \"login-log\",\n \"keepAlive\": false\n }\n }, {\n \"id\": \"3a0e3107402449698d86ee3cbc5272c0\",\n \"title\": \"数据库监控\",\n \"pid\": \"4a57f57fc7324c94b6390f1a2dd1f49a\",\n \"isShow\": 1,\n \"url\": \"/system/monitor/druid\",\n \"sort\": 30,\n \"icon\": \"database\",\n \"keepAlive\": 0,\n \"componentName\": null,\n \"openMode\": \"0\",\n \"component\": \"/system/monitor/druid\",\n \"path\": \"/system/monitor/druid\",\n \"meta\": {\n \"title\": \"数据库监控\",\n \"icon\": \"database\",\n \"keepAlive\": false\n }\n }, {\n \"id\": \"fdbdcf8b8d674ae38154bc1e57498a91\",\n \"title\": \"在线用户\",\n \"pid\": \"4a57f57fc7324c94b6390f1a2dd1f49a\",\n \"isShow\": 1,\n \"url\": \"/system/monitor/online-user\",\n \"sort\": 40,\n \"icon\": \"user\",\n \"keepAlive\": 0,\n \"componentName\": \"\",\n \"openMode\": \"0\",\n \"component\": \"/system/monitor/online-user\",\n \"path\": \"/system/monitor/online-user\",\n \"meta\": {\n \"title\": \"在线用户\",\n \"icon\": \"user\",\n \"keepAlive\": false\n }\n }]\n }],\n \"timestamp\": 1657368503505,\n \"executeTime\": 18\n}",
"description" : null,
"requestBodyDefinition" : {
"name" : "",
@@ -101,7 +101,7 @@
"expression" : "",
"children" : [ ]
}, {
- "name" : "name",
+ "name" : "title",
"value" : "系统设置",
"description" : "",
"required" : false,
@@ -185,7 +185,7 @@
"expression" : "",
"children" : [ ]
}, {
- "name" : "code",
+ "name" : "componentName",
"value" : "null",
"description" : "",
"required" : false,
@@ -197,11 +197,11 @@
"expression" : "",
"children" : [ ]
}, {
- "name" : "componentname",
- "value" : "null",
+ "name" : "openMode",
+ "value" : "0",
"description" : "",
"required" : false,
- "dataType" : "Object",
+ "dataType" : "String",
"type" : null,
"defaultValue" : null,
"validateType" : "",
@@ -339,7 +339,7 @@
"expression" : "",
"children" : [ ]
}, {
- "name" : "name",
+ "name" : "title",
"value" : "菜单管理",
"description" : "",
"required" : false,
@@ -423,7 +423,7 @@
"expression" : "",
"children" : [ ]
}, {
- "name" : "code",
+ "name" : "componentName",
"value" : "null",
"description" : "",
"required" : false,
@@ -435,11 +435,11 @@
"expression" : "",
"children" : [ ]
}, {
- "name" : "componentname",
- "value" : "null",
+ "name" : "openMode",
+ "value" : "0",
"description" : "",
"required" : false,
- "dataType" : "Object",
+ "dataType" : "String",
"type" : null,
"defaultValue" : null,
"validateType" : "",
@@ -524,7 +524,7 @@
} ]
}, {
"name" : "timestamp",
- "value" : "1646400974566",
+ "value" : "1657368503505",
"description" : "",
"required" : false,
"dataType" : "Long",
@@ -536,7 +536,7 @@
"children" : [ ]
}, {
"name" : "executeTime",
- "value" : "41",
+ "value" : "18",
"description" : "",
"required" : false,
"dataType" : "Object",
@@ -573,7 +573,7 @@ var menus = db.select("""
select role_id from sys_user_role where user_id = #{userId}
)
)
- } and sm.is_del = '0' and sm.is_show = 1 order by sm.sort
+ } and sm.is_del = '0' and (sm.is_show = 1 or (sm.component_name is not null and sm.component_name != '')) order by sm.sort
""")
for(menu in menus){
diff --git a/magic-boot-ui/src/components/magic/data/mb-table-column.vue b/magic-boot-ui/src/components/magic/data/mb-table-column.vue
index 0436a8c..07ec02c 100644
--- a/magic-boot-ui/src/components/magic/data/mb-table-column.vue
+++ b/magic-boot-ui/src/components/magic/data/mb-table-column.vue
@@ -40,8 +40,8 @@
下载
diff --git a/magic-boot-ui/src/layout/sidebar/sidebar-item.vue b/magic-boot-ui/src/layout/sidebar/sidebar-item.vue
index e38d7a1..7dcae50 100644
--- a/magic-boot-ui/src/layout/sidebar/sidebar-item.vue
+++ b/magic-boot-ui/src/layout/sidebar/sidebar-item.vue
@@ -1,5 +1,5 @@
-
+
diff --git a/magic-boot-ui/src/scripts/routerPermission.js b/magic-boot-ui/src/scripts/routerPermission.js
index 523151f..0ae818f 100644
--- a/magic-boot-ui/src/scripts/routerPermission.js
+++ b/magic-boot-ui/src/scripts/routerPermission.js
@@ -14,11 +14,15 @@ export const filterAsyncRouter = (routers, level) => {
router.props = { url: router.url }
router.path = "/" + sha256(router.url)
}
- if(router.url.startsWith('http')){
+ var setLayout = () => {
+ router.path = "/" + common.uuid()
+ router.component = level > 0 ? layoutModules[`../layout/none.vue`] : loadLayoutView()
+ }
+ if(router.url && router.url.startsWith('http')){
if(router.openMode == '0'){
setIframe()
}
- } else if(router.url.startsWith('/') && router.url.indexOf('.htm') != -1) {
+ } else if(router.url && router.url.startsWith('/') && router.url.indexOf('.htm') != -1) {
if(router.openMode == '0'){
setIframe()
}else{
@@ -30,16 +34,30 @@ export const filterAsyncRouter = (routers, level) => {
} else if (router.component) {
const component = router.component
if (component === 'Layout') {
- router.path = "/" + common.uuid()
- router.component = level > 0 ? layoutModules[`../layout/none.vue`] : loadLayoutView(component)
+ if (router.children && router.children.length > 0) {
+ const children = filterAsyncRouter(router.children, level + 1);
+ if(!children.some(it => it.isShow == 0)){
+ router.children = children
+ setLayout()
+ }else{
+ router.children = undefined
+ router.alwaysShow = false
+ router.redirect = ''
+ router.path = router.path.startsWith('/') ? router.path : '/' + router.path
+ router.component = loadView(router.path) || layoutModules[`../layout/empty.vue`]
+ }
+ }else{
+ setLayout()
+ }
} else {
router.path = router.path.startsWith('/') ? router.path : '/' + router.path
router.component = loadView(component) || layoutModules[`../layout/empty.vue`]
}
}
- if (router.children && router.children.length) {
- router.children = filterAsyncRouter(router.children, level + 1)
- }
+ return true
+ } else if (router.componentName) {
+ router.component = loadView(`/common/show-component`)
+ router.props = { name: router.componentName }
return true
}
return false
@@ -47,7 +65,7 @@ export const filterAsyncRouter = (routers, level) => {
return accessedRouters
}
-export const loadLayoutView = (view) => {
+export const loadLayoutView = () => {
return layoutModules[`../layout/layout.vue`]
}