From f3c0c0c4c8f1e5b985b3258dc5cf101a4c49732d Mon Sep 17 00:00:00 2001 From: chenqw Date: Wed, 20 Aug 2025 11:08:28 +0800 Subject: [PATCH 1/9] adjust --- package.json | 3 ++- src/resources/assets/css/theme.less | 1 + src/resources/assets/languages/term/en.json | 8 ++++++++ src/resources/assets/languages/term/zh.json | 8 ++++++++ 4 files changed, 19 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index b3743f0b..78765967 100755 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ }, "dependencies": { "@antv/data-set": "^0.11.8", - "@antv/g2": "^4.2.10", + "@antv/g2": "^5.3.5", "@antv/g2plot": "^2.4.31", "@antv/g6": "^5.0.45", "@antv/g6-extension-3d": "^0.1.19", @@ -65,6 +65,7 @@ "lodash": "^4.17.21", "marked": "^7.0.1", "mavon-editor": "^2.10.4", + "moment": "^2.30.1", "navigator": "^1.0.1", "neatlogic-ui": "^1.0.7", "particles.vue": "^2.42.2", diff --git a/src/resources/assets/css/theme.less b/src/resources/assets/css/theme.less index a4f2decf..7dee3ede 100644 --- a/src/resources/assets/css/theme.less +++ b/src/resources/assets/css/theme.less @@ -1692,6 +1692,7 @@ background-color: @error-color; } + .bg-gray { background-color: @tip-color; } diff --git a/src/resources/assets/languages/term/en.json b/src/resources/assets/languages/term/en.json index 69187154..4674e18f 100644 --- a/src/resources/assets/languages/term/en.json +++ b/src/resources/assets/languages/term/en.json @@ -2884,5 +2884,13 @@ }, "runnergroup": { "ruletips": "The request for login authentication needs to carry a header as a rule expression (note that the header parameter in the expression is all lowercase). If the value of the expression after execution is true, the executor group will take effect, and false and syntax exceptions will not take effect. For example: ${env}==\\ bit \\&&(${test}==\\ 1 \\ | | ${test2}==\\ aaa \\)" + }, + "informant": { + "last5dump": "Last 5 snapshots", + "threaddump": "Thread snapshot", + "pid": "Process ID" + }, + "infromant": { + "report": "analysis report" } } \ No newline at end of file diff --git a/src/resources/assets/languages/term/zh.json b/src/resources/assets/languages/term/zh.json index d04b9b89..3528d6da 100644 --- a/src/resources/assets/languages/term/zh.json +++ b/src/resources/assets/languages/term/zh.json @@ -2881,5 +2881,13 @@ "joinalert": "归并到告警", "uniquekey": "唯一键", "alertsign": "告警特征" + }, + "informant": { + "last5dump": "最近5次快照", + "threaddump": "线程快照", + "pid": "进程id" + }, + "infromant": { + "report": "分析报告" } } \ No newline at end of file -- Gitee From 0f5b9686507d25cae965da7ccca8c7cfcd527a54 Mon Sep 17 00:00:00 2001 From: dengbf Date: Thu, 21 Aug 2025 17:25:55 +0800 Subject: [PATCH 2/9] =?UTF-8?q?-=20[=E4=BF=AE=E5=A4=8D]=20#[14928032033341?= =?UTF-8?q?44]=E7=BB=84=E5=90=88=E5=B7=A5=E5=85=B7-=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E9=A1=B5=E9=9D=A2=EF=BC=8C=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=89=A7=E8=A1=8C=E7=9B=AE=E6=A0=87=E6=97=B6=EF=BC=8C=E9=AB=98?= =?UTF-8?q?=E7=BA=A7=E6=90=9C=E7=B4=A0=E6=A8=A1=E5=BC=8F=E4=B8=8B=E5=85=B3?= =?UTF-8?q?=E9=94=AE=E5=AD=97=E6=90=9C=E7=B4=A2=EF=BC=8C=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E6=A0=87=E7=AD=BE=E6=97=A0=E6=B3=95=E5=86=8D?= =?UTF-8?q?=E6=AC=A1=E6=90=9C=E7=B4=A2=20http://192.168.0.96:8090/demo/rdm?= =?UTF-8?q?.html#/bug-detail/939050947543040/939050947543057/1492803203334?= =?UTF-8?q?144?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/pages/cmdb/asset/advanced-mode-search.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/pages/cmdb/asset/advanced-mode-search.vue b/src/views/pages/cmdb/asset/advanced-mode-search.vue index baac5c18..0507d02d 100644 --- a/src/views/pages/cmdb/asset/advanced-mode-search.vue +++ b/src/views/pages/cmdb/asset/advanced-mode-search.vue @@ -654,6 +654,7 @@ export default { getConditionList() { this.conditionList = []; this.searchConditionList = []; + this.canSearch = true; this.$api.autoexec.action.getValueconverttextList(this.value).then(res => { if (res.Status == 'OK') { let conditionConfig = res.Return; -- Gitee From e3274e605a21d32081fbc524504ddcdae510a233 Mon Sep 17 00:00:00 2001 From: chenqw Date: Thu, 21 Aug 2025 19:53:54 +0800 Subject: [PATCH 3/9] adjust --- package.json | 4 +--- src/resources/assets/languages/term/en.json | 3 ++- src/resources/assets/languages/term/zh.json | 3 ++- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 78765967..4f3947cc 100755 --- a/package.json +++ b/package.json @@ -14,10 +14,8 @@ }, "dependencies": { "@antv/data-set": "^0.11.8", - "@antv/g2": "^5.3.5", "@antv/g2plot": "^2.4.31", - "@antv/g6": "^5.0.45", - "@antv/g6-extension-3d": "^0.1.19", + "@antv/g6": "5.0.45", "@antv/l7": "^2.18.3", "@antv/l7-component": "^2.18.3", "@antv/l7-district": "^2.3.12", diff --git a/src/resources/assets/languages/term/en.json b/src/resources/assets/languages/term/en.json index 826aeb20..aadf2ddb 100644 --- a/src/resources/assets/languages/term/en.json +++ b/src/resources/assets/languages/term/en.json @@ -2889,7 +2889,8 @@ "informant": { "last5dump": "Last 5 snapshots", "threaddump": "Thread snapshot", - "pid": "Process ID" + "pid": "Process ID", + "servicetopo": "Service Relationship Diagram" }, "infromant": { "report": "analysis report" diff --git a/src/resources/assets/languages/term/zh.json b/src/resources/assets/languages/term/zh.json index b077d179..3b718d2f 100644 --- a/src/resources/assets/languages/term/zh.json +++ b/src/resources/assets/languages/term/zh.json @@ -2886,7 +2886,8 @@ "informant": { "last5dump": "最近5次快照", "threaddump": "线程快照", - "pid": "进程id" + "pid": "进程id", + "servicetopo": "服务关系图" }, "infromant": { "report": "分析报告" -- Gitee From 383380c9b58dc8053bb4a88ac31c5aea21ed44d3 Mon Sep 17 00:00:00 2001 From: dengbf Date: Tue, 26 Aug 2025 15:07:58 +0800 Subject: [PATCH 4/9] =?UTF-8?q?-=20[=E5=8A=9F=E8=83=BD]=20#[14962821687869?= =?UTF-8?q?44]=E5=B7=A5=E5=8D=95=E4=BF=AE=E6=94=B9=E4=B8=8A=E6=8A=A5?= =?UTF-8?q?=E5=86=85=E5=AE=B9=E5=8F=AA=E8=83=BD=E4=BF=AE=E6=94=B9=E4=B8=8A?= =?UTF-8?q?=E6=8A=A5=E7=9A=84=E8=A1=A8=E5=8D=95=20http://192.168.0.96:8090?= =?UTF-8?q?/demo/rdm.html#/story-detail/939050947543040/939050947543042/14?= =?UTF-8?q?96282168786944?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/resources/assets/languages/term/en.json | 3 ++- src/resources/assets/languages/term/zh.json | 3 ++- .../nodesetting/authority-setting.vue | 13 +++++---- .../workorder/common/button-bar.vue | 27 ++++++++++++++----- .../workorder/common/form-edit-dialog.vue | 20 ++++++++++---- 5 files changed, 47 insertions(+), 19 deletions(-) diff --git a/src/resources/assets/languages/term/en.json b/src/resources/assets/languages/term/en.json index aadf2ddb..ff03d4d7 100644 --- a/src/resources/assets/languages/term/en.json +++ b/src/resources/assets/languages/term/en.json @@ -631,7 +631,8 @@ "seeprocessconfig": "View the current work order process configuration", "editprocessconfig": "Edit the current work order process configuration", "stepishandledby": "Step Handling Human", - "sercalendar": "Service Calendar" + "sercalendar": "Service Calendar", + "flowauthuserupdatetip": "The processor includes all step handlers" }, "autoexec": { "addrootdirectory": "Add root directory", diff --git a/src/resources/assets/languages/term/zh.json b/src/resources/assets/languages/term/zh.json index 89f6a010..989a686b 100644 --- a/src/resources/assets/languages/term/zh.json +++ b/src/resources/assets/languages/term/zh.json @@ -631,7 +631,8 @@ "seeprocessconfig": "查看当前工单流程配置", "editprocessconfig": "编辑当前工单流程配置", "stepishandledby": "步骤处理人为", - "sercalendar": "服务日历" + "sercalendar": "服务日历", + "flowauthuserupdatetip": "处理人包含所有步骤处理人" }, "autoexec": { "addrootdirectory": "添加根目录", diff --git a/src/views/pages/process/flow/flowedit/components/nodesetting/authority-setting.vue b/src/views/pages/process/flow/flowedit/components/nodesetting/authority-setting.vue index b632e9db..fa018dba 100644 --- a/src/views/pages/process/flow/flowedit/components/nodesetting/authority-setting.vue +++ b/src/views/pages/process/flow/flowedit/components/nodesetting/authority-setting.vue @@ -23,15 +23,14 @@
-
{{ item.text }}
-
+ -
+
@@ -42,7 +41,8 @@ export default { name: 'AuthoritySetting', components: { TsFormSwitch: () => import('@/resources/plugins/TsForm/TsFormSwitch'), - UserSelect: () => import('@/resources/components/UserSelect/UserSelect') + UserSelect: () => import('@/resources/components/UserSelect/UserSelect'), + TsFormItem: () => import('@/resources/plugins/TsForm/TsFormItem') }, mixins: [itemmixin], props: { @@ -67,7 +67,10 @@ export default { data() { return { isActive: this.defaultIsActive, - authorityList: this.list + authorityList: this.list, + authorityTipMap: { + update: '处理人包含所有步骤处理人' + } }; }, beforeCreate() {}, diff --git a/src/views/pages/process/task/processdetail/workorder/common/button-bar.vue b/src/views/pages/process/task/processdetail/workorder/common/button-bar.vue index 4b28b7ec..edbd3bfb 100644 --- a/src/views/pages/process/task/processdetail/workorder/common/button-bar.vue +++ b/src/views/pages/process/task/processdetail/workorder/common/button-bar.vue @@ -103,10 +103,16 @@ {{ actionConfig.copyprocesstask }} - - - {{ $t('dialog.title.edittarget',{'target':$t('page.form')}) }} - + + {{ $t('term.process.converttoknowdoc') }} @@ -171,7 +177,12 @@ @click="doBtnBarAction('redoTask')" >{{ getRedoText }} - + @@ -201,7 +212,8 @@ export default { isShowFormModal: false, isShowProcessTaskTopo: false, isShowTransfereoastep: false, - isShowReactivateStep: false + isShowReactivateStep: false, + isNeedFormSceneUuid: false //是否需要表单场景uuid }; }, beforeCreate() {}, @@ -218,7 +230,8 @@ export default { doBtnBarAction(actionName, ...args) { this.$emit('doAction', actionName, ...args); }, - editForm() { + editForm(isNeedFormSceneUuid) { + this.isNeedFormSceneUuid = isNeedFormSceneUuid; this.isShowFormModal = true; }, closeFormDialog() { diff --git a/src/views/pages/process/task/processdetail/workorder/common/form-edit-dialog.vue b/src/views/pages/process/task/processdetail/workorder/common/form-edit-dialog.vue index d6a10499..0fe63214 100644 --- a/src/views/pages/process/task/processdetail/workorder/common/form-edit-dialog.vue +++ b/src/views/pages/process/task/processdetail/workorder/common/form-edit-dialog.vue @@ -9,14 +9,15 @@ @on-close="closeDialog" > -
- -
@@ -73,6 +73,7 @@
  • {{ $t('page.edit') }}
  • {{ $t('page.auth') }}
  • {{ $t('page.delete') }}
    • +
  • {{ $t('term.framework.deletesession') }}
    • @@ -122,8 +123,8 @@ export default { name: 'UserManage', components: { + CombineSearcher: () => import('@/resources/components/CombineSearcher/CombineSearcher.vue'), TsTable: () => import('@/resources/components/TsTable/TsTable'), - InputSearcher: () => import('@/resources/components/InputSearcher/InputSearcher.vue'), UserCard: () => import('@/resources/components/UserCard/UserCard.vue'), CommonAuth: () => import('./common/common-auth.vue') }, @@ -176,6 +177,7 @@ export default { tabledata: null, //table的正文数据 select: null, //选中哪些 vipLevel: null, //VIP等级 + isOnline: null, //是否在线 formSetting: [], //弹窗表单对应的数组 isImmediately: true, //立即授权 isBatch: false, //是否批量授权 @@ -193,7 +195,46 @@ export default { authGroup: '', auth: '', roleName: '' - } + }, + searchConfig: { + search: true, + placeholder: this.$t('form.placeholder.pleaseinput', { target: this.$t('page.keyword') }), + searchList: [ + { + type: 'radio', + dataList: [ + { + text: '是', + value: '1' + } + ], + name: 'vipLevel', + label: 'Vip', + transfer: true, + filterable: true, + allowToggle: true + }, + { + type: 'radio', + dataList: [ + { + text: '是', + value: '1' + }, + { + text: '否', + value: '0' + } + ], + name: 'isOnline', + label: '在线', + transfer: true, + filterable: true, + allowToggle: true + } + ] + }, + searchValue: {} }; }, created() {}, @@ -215,20 +256,18 @@ export default { this.vipLevel = this.vipLevel ? null : 1; this.getTable(); }, + changeIsOnline() { + this.isOnline = this.isOnline ? null : 1; + this.getTable(); + }, getTable() { this.loadingShow = true; - let data = { - keyword: this.keyword, - vipLevel: this.$AuthUtils.hasRole('VIP_VIEW') ? this.vipLevel : 0, - currentPage: this.searchParams.currentPage, - pageSize: this.searchParams.pageSize - }; - this.$addHistoryData('keyword', data.keyword); - this.$addHistoryData('vipLevel', data.vipLevel); - this.$addHistoryData('currentPage', data.currentPage); - this.$addHistoryData('pageSize', data.pageSize); + const param = { ...this.searchParams, ...this.searchValue }; + this.$addHistoryData('searchValue', this.searchValue); + this.$addHistoryData('searchParam', this.searchParam); + this.$api.framework.user - .searchUser(data) + .searchUser(param) .then(res => { if (res.Status == 'OK') { this.tabledata = res.Return; @@ -238,10 +277,12 @@ export default { }); }, restoreHistory(historyData) { - this.keyword = historyData['keyword']; - this.vipLevel = historyData['vipLevel']; - this.searchParams.currentPage = historyData['currentPage']; - this.searchParams.pageSize = historyData['pageSize']; + if (historyData['searchParam']) { + this.searchParam = historyData['searchParam']; + } + if (historyData['searchValue']) { + this.searchValue = historyData['searchValue']; + } }, getSelect(li, selection) { this.select = selection; @@ -325,6 +366,39 @@ export default { }); } }); + }, //删除 + deleteSession(row) { + let key = row instanceof Array; + let userUuidList = []; + if (key && row.length > 0) { + row.forEach(item => { + userUuidList.push(item.uuid); + }); + } else { + userUuidList = [row.uuid]; + } + let param = { + userUuidList: userUuidList + }; + let content = userUuidList.length > 1 ? this.$t('term.framework.suredeletesession', {target: this.$t('page.user') + '：' + row.map(r => { return r.userName; }).join('、')}) : key ? this.$t('term.framework.suredeletesession', {target: this.$t('page.user') + '：' + row[0].userName}) : this.$t('term.framework.suredeletesession', {target: this.$t('page.user') + '：' + row.userName}); + this.$createDialog({ + title: this.$t('term.framework.usersessiondeletetitle'), + content: content + '
    ' + this.$t('term.framework.usersessiondeletetip') + '', + btnType: 'error', + 'on-ok': vnode => { + this.$api.framework.user + .deleteUserSession(param) + .then(res => { + if (res && res.Status == 'OK') { + this.$Message.success(this.$t('message.executesuccess')); + vnode.isShow = false; + this.tabledata.currentPage = 1; + this.select = []; + this.getTable(); + } + }); + } + }); }, //获取用户组下拉列表 getUserList: function() { -- Gitee From a502a4f7890ed2683a6521a3787f88caaaf90bf5 Mon Sep 17 00:00:00 2001 From: chenqw Date: Fri, 29 Aug 2025 10:44:33 +0800 Subject: [PATCH 8/9] =?UTF-8?q?-[=E4=BF=AE=E6=94=B9]=E9=87=8D=E6=9E=84?= =?UTF-8?q?=E8=8F=9C=E5=8D=95=E7=AE=A1=E7=90=86=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/framework/extramenu/extramenu.js | 11 +- src/resources/assets/languages/page/en.json | 4 +- src/resources/assets/languages/page/zh.json | 4 +- .../components/topnav/topnav-extramenu.vue | 4 +- src/views/components/topnav/topnav-menu.vue | 188 ++++-- src/views/pages/extramenu/config.js | 6 + src/views/pages/extramenu/detail.vue | 40 ++ src/views/pages/extramenu/extramenu.js | 39 ++ src/views/pages/extramenu/extramenu.vue | 56 ++ src/views/pages/extramenu/router.js | 56 ++ .../framework/extramenu/extramenu-detail.vue | 58 ++ .../extramenu/extramenu-manage-bak.vue | 595 +++++++++++++++++ .../framework/extramenu/extramenu-manage.vue | 610 ++---------------- .../framework/extramenu/menu-edit-bak.vue | 138 ++++ .../pages/framework/extramenu/menu-edit.vue | 184 +++--- .../framework/extramenu/menu-treeview.vue | 285 ++++++++ src/views/pages/framework/router.js | 11 + 17 files changed, 1609 insertions(+), 680 deletions(-) create mode 100644 src/views/pages/extramenu/config.js create mode 100644 src/views/pages/extramenu/detail.vue create mode 100644 src/views/pages/extramenu/extramenu.js create mode 100644 src/views/pages/extramenu/extramenu.vue create mode 100644 src/views/pages/extramenu/router.js create mode 100644 src/views/pages/framework/extramenu/extramenu-detail.vue create mode 100644 src/views/pages/framework/extramenu/extramenu-manage-bak.vue create mode 100644 src/views/pages/framework/extramenu/menu-edit-bak.vue create mode 100644 src/views/pages/framework/extramenu/menu-treeview.vue diff --git a/src/resources/api/framework/extramenu/extramenu.js b/src/resources/api/framework/extramenu/extramenu.js index 33b2da91..1adf72bc 100644 --- a/src/resources/api/framework/extramenu/extramenu.js +++ b/src/resources/api/framework/extramenu/extramenu.js @@ -4,17 +4,20 @@ const extramenu = { getMenuTreeList(params) { return axios.post('/api/rest/extramenu/tree', params); }, + getMenuById(id) { + return axios.post('/api/rest/extramenu/get', {id: id}); + }, getMenuTreeNode(params) { return axios.post('/api/rest/extramenu/get', params); }, - deleteMenuTreeNode(params) { - return axios.post('/api/rest/extramenu/delete', params); + deleteMenuTreeNode(id) { + return axios.post('/api/rest/extramenu/delete', {id: id}); }, saveMenuTreeNode(params) { return axios.post('/api/rest/extramenu/save', params); }, - getMenuList(params) { //获取拥有权限的附加菜单列表 - return axios.post('/api/rest/extramenu/list', params); + getMenuList() { //获取拥有权限的附加菜单列表 + return axios.post('/api/rest/extramenu/list', {}); }, moveExtramenu(params) { //拖拽排序 return axios.post('/api/rest/extramenu/move', params); diff --git a/src/resources/assets/languages/page/en.json b/src/resources/assets/languages/page/en.json index d380abd1..67a16552 100644 --- a/src/resources/assets/languages/page/en.json +++ b/src/resources/assets/languages/page/en.json @@ -1082,5 +1082,7 @@ "mailserver": "mail serve", "beforeconfig": "Pre conversion configuration", "dataconfig": "data configuration", - "datachange": "data conversion" + "datachange": "data conversion", + "childmenucount": "Number of submenus", + "systemmenuauth": "System menu permissions" } \ No newline at end of file diff --git a/src/resources/assets/languages/page/zh.json b/src/resources/assets/languages/page/zh.json index 096c9a05..3faa7632 100644 --- a/src/resources/assets/languages/page/zh.json +++ b/src/resources/assets/languages/page/zh.json @@ -1084,5 +1084,7 @@ "mailserver": "邮件服务", "beforeconfig": "转换前配置", "dataconfig": "数据配置", - "datachange": "数据转换" + "datachange": "数据转换", + "childmenucount": "子菜单数量", + "systemmenuauth": "系统菜单权限" } \ No newline at end of file diff --git a/src/views/components/topnav/topnav-extramenu.vue b/src/views/components/topnav/topnav-extramenu.vue index 1a95f497..1ac21c48 100644 --- a/src/views/components/topnav/topnav-extramenu.vue +++ b/src/views/components/topnav/topnav-extramenu.vue @@ -11,7 +11,7 @@ >
    {{ extramenu.name }}
    -
    + diff --git a/src/views/pages/extramenu/config.js b/src/views/pages/extramenu/config.js new file mode 100644 index 00000000..842e3c17 --- /dev/null +++ b/src/views/pages/extramenu/config.js @@ -0,0 +1,6 @@ +import {$t} from '@/resources/init.js'; +export const config = { + module: 'extramenu', + menuType: { + } +}; diff --git a/src/views/pages/extramenu/detail.vue b/src/views/pages/extramenu/detail.vue new file mode 100644 index 00000000..fed4e33e --- /dev/null +++ b/src/views/pages/extramenu/detail.vue @@ -0,0 +1,40 @@ + + + diff --git a/src/views/pages/extramenu/extramenu.js b/src/views/pages/extramenu/extramenu.js new file mode 100644 index 00000000..3ffe652b --- /dev/null +++ b/src/views/pages/extramenu/extramenu.js @@ -0,0 +1,39 @@ +import Vue from 'vue'; +import VueRouter from 'vue-router'; +import extramenu from './extramenu.vue'; +import routers from './router.js'; +import store from '@/resources/store'; +import VueI18n from 'vue-i18n'; +import CompareUtil from '@/resources/assets/js/compareUtil.js'; +import api from '@/resources/api/api.js'; +import LocalStore from '@/resources/assets/js/localStore.js'; +import State from '@/resources/assets/js/state.js'; + +//公共的全局组件、样式等 +import '@/resources/base.js'; +import {initRouter, initI18n} from '@/resources/init.js'; + +Vue.use(VueRouter); +Vue.use(VueI18n); +Vue.use(CompareUtil);//必须要在use router之后执行 + +import {config} from './config.js'; +MODULEID = config.module; +MENULIST = routers; +MENUTYPE = config.menuType; + +let router = initRouter(VueRouter, store);//路由拦截处理 +let i18n = initI18n(VueI18n, {});//语言包配置 + +Vue.prototype.$tsrouter = router; +Vue.config.productionTip = false; +Vue.prototype.$api = api; +Vue.prototype.$localStore = new LocalStore('extramenu', router); +Vue.prototype.$state = new State('extramenu'); + +new Vue({ + router, + store, + i18n, + render: h => h(extramenu) +}).$mount('#index'); diff --git a/src/views/pages/extramenu/extramenu.vue b/src/views/pages/extramenu/extramenu.vue new file mode 100644 index 00000000..c09a7216 --- /dev/null +++ b/src/views/pages/extramenu/extramenu.vue @@ -0,0 +1,56 @@ + + diff --git a/src/views/pages/extramenu/router.js b/src/views/pages/extramenu/router.js new file mode 100644 index 00000000..51e4d3e0 --- /dev/null +++ b/src/views/pages/extramenu/router.js @@ -0,0 +1,56 @@ +const refresh = () => import('@/views/pages/common/refresh.vue'); +const noAuthority = () => import('@/views/pages/common/no-authority.vue'); +const welcome = () => import('@/views/pages/common/welcome.vue'); +const detail = () => import('@/views/pages/extramenu/detail.vue'); +import { $t } from '@/resources/init.js'; + +export default [ + { + path: '/', + beforeEnter: (to, from, next) => { + let defaultPage = ''; + try { + const moduleList = JSON.parse(localStorage.getItem('moduleList')); + defaultPage = + moduleList.find(module => { + return module.moduleId === MODULEID; + }).defaultPage || '/welcome'; + } catch { + defaultPage = '/welcome'; + } + if (from.path === defaultPage) { + //通过跳转到中间路由,并立刻返回原路由,实现刷新路由页面的效果 + next({ name: 'refresh', replace: true, query: { path: defaultPage } }); + } else { + next({ path: defaultPage, replace: true }); + } + } + }, + { + path: '/refresh', + name: 'refresh', + component: refresh + }, + { + path: '/no-authority', + name: 'no-authority', + component: noAuthority, + meta: { + title: $t('router.common.pagenoexist') + } + }, + { + path: '/welcome', + name: 'welcome', + component: welcome + }, + { + path: '/detail', + name: 'detail', + component: detail, + meta: { + title: 'detail' + } + } + +]; diff --git a/src/views/pages/framework/extramenu/extramenu-detail.vue b/src/views/pages/framework/extramenu/extramenu-detail.vue new file mode 100644 index 00000000..9b098209 --- /dev/null +++ b/src/views/pages/framework/extramenu/extramenu-detail.vue @@ -0,0 +1,58 @@ + + + diff --git a/src/views/pages/framework/extramenu/extramenu-manage-bak.vue b/src/views/pages/framework/extramenu/extramenu-manage-bak.vue new file mode 100644 index 00000000..7192b6ce --- /dev/null +++ b/src/views/pages/framework/extramenu/extramenu-manage-bak.vue @@ -0,0 +1,595 @@ + + + diff --git a/src/views/pages/framework/extramenu/extramenu-manage.vue b/src/views/pages/framework/extramenu/extramenu-manage.vue index 7192b6ce..7dca73ed 100644 --- a/src/views/pages/framework/extramenu/extramenu-manage.vue +++ b/src/views/pages/framework/extramenu/extramenu-manage.vue @@ -1,595 +1,115 @@