From 50719aca622c993fce2b99192c64a45cda3113df Mon Sep 17 00:00:00 2001 From: linbangquan <1437892690@qq.com> Date: Fri, 29 Aug 2025 12:31:56 +0000 Subject: [PATCH 01/14] =?UTF-8?q?!1160=20[=E4=BF=AE=E5=A4=8D]=20=E8=A7=86?= =?UTF-8?q?=E5=9B=BE=E8=AE=BE=E7=BD=AE-=E4=BF=9D=E5=AD=98=E8=A7=86?= =?UTF-8?q?=E5=9B=BE=E6=97=B6=EF=BC=8C=E5=90=8E=E7=AB=AF=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E8=A7=86=E5=9B=BE=E5=90=8D=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=EF=BC=8C=E5=AF=BC=E8=87=B4=E6=96=B0=E5=A2=9E=E7=9A=84=E9=87=8D?= =?UTF-8?q?=E5=90=8D=E8=A7=86=E5=9B=BE=E4=BC=9A=E8=A6=86=E7=9B=96=E6=97=A7?= =?UTF-8?q?=E8=A7=86=E5=9B=BE=20*=20[=E4=BF=AE=E5=A4=8D]=20=E8=A7=86?= =?UTF-8?q?=E5=9B=BE=E8=AE=BE=E7=BD=AE-=E4=BF=9D=E5=AD=98=E8=A7=86?= =?UTF-8?q?=E5=9B=BE=E6=97=B6=EF=BC=8C=E5=90=8E=E7=AB=AF=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E8=A7=86=E5=9B=BE=E5=90=8D=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=EF=BC=8C=E5=AF=BC=E8=87=B4=E6=96=B0=E5=A2=9E=E7=9A=84=E9=87=8D?= =?UTF-8?q?=E5=90=8D=E8=A7=86=E5=9B=BE=E4=BC=9A=E8=A6=86=E7=9B=96=E6=97=A7?= =?UTF-8?q?=E8=A7=86=E5=9B=BE=20*=20Merge=20remote-tracking=20branch=20'or?= =?UTF-8?q?igin/develop3.0.0'=20into=20develop3.0.0=20*=20Merge=20branch?= =?UTF-8?q?=20'develop3.0.0'=20of=20https://gitee.com/neat-logic/neatlogic?= =?UTF-8?q?-=E2=80=A6=20*=20Merge=20remote-tracking=20branch=20'origin/dev?= =?UTF-8?q?elop3.0.0'=20into=20develop3.0.0=20*=20Merge=20remote-tracking?= =?UTF-8?q?=20branch=20'origin/develop3.0.0'=20into=20develop3.0.0=20*=20M?= =?UTF-8?q?erge=20remote-tracking=20branch=20'origin/develop3.0.0'=20into?= =?UTF-8?q?=20develop3.0.0=20*=20Merge=20remote-tracking=20branch=20'origi?= =?UTF-8?q?n/develop3.0.0'=20into=20develop3.0.0=20*=20Merge=20remote-trac?= =?UTF-8?q?king=20branch=20'origin/develop3.0.0'=20into=20develop3.0.0=20*?= =?UTF-8?q?=20Merge=20remote-tracking=20branch=20'origin/develop3.0.0'=20i?= =?UTF-8?q?nto=20develop3.0.0=20*=20Merge=20remote-tracking=20branch=20'or?= =?UTF-8?q?igin/develop3.0.0'=20into=20develop3.0.0=20*=20Merge=20remote-t?= =?UTF-8?q?racking=20branch=20'origin/develop3.0.0'=20into=20develop3.0.0?= =?UTF-8?q?=20*=20Merge=20remote-tracking=20branch=20'origin/develop3.0.0'?= =?UTF-8?q?=20into=20develop3.0.0=20*=20Merge=20remote-tracking=20branch?= =?UTF-8?q?=20'origin/develop3.0.0'=20into=20develop3.0.0=20*=20Merge=20re?= =?UTF-8?q?mote-tracking=20branch=20'origin/develop3.0.0'=20into=20develop?= =?UTF-8?q?3.0.0=20*=20Merge=20remote-tracking=20branch=20'origin/develop3?= =?UTF-8?q?.0.0'=20into=20develop3.0.0=20*=20Merge=20remote-tracking=20bra?= =?UTF-8?q?nch=20'origin/develop3.0.0'=20into=20develop3.0.0=20*=20Merge?= =?UTF-8?q?=20remote-tracking=20branch=20'origin/develop3.0.0'=20into=20de?= =?UTF-8?q?velop3.0.0=20*=20Merge=20remote-tracking=20branch=20'origin/dev?= =?UTF-8?q?elop3.0.0'=20into=20develop3.0.0=20*=20Merge=20remote-tracking?= =?UTF-8?q?=20branch=20'origin/develop3.0.0'=20into=20develop3.0.0=20*=20M?= =?UTF-8?q?erge=20remote-tracking=20branch=20'origin/develop3.0.0'=20into?= =?UTF-8?q?=20develop3.0.0=20*=20Merge=20remote-tracking=20branch=20'origi?= =?UTF-8?q?n/develop3.0.0'=20into=20develop3.0.0=20*=20Merge=20remote-trac?= =?UTF-8?q?king=20branch=20'origin/develop3.0.0'=20into=20develop3.0.0=20*?= =?UTF-8?q?=20Merge=20remote-tracking=20branch=20'origin/develop3.0.0'=20i?= =?UTF-8?q?nto=20develop3.0.0=20*=20Merge=20remote-tracking=20branch=20'or?= =?UTF-8?q?igin/develop3.0.0'=20into=20develop3.0.0=20*=20Merge=20remote-t?= =?UTF-8?q?racking=20branch=20'origin/develop3.0.0'=20into=20develop3.0.0?= =?UTF-8?q?=20*=20Merge=20remote-tracking=20branch=20'origin/develop3.0.0'?= =?UTF-8?q?=20into=20develop3.0.0=20*=20Merge=20remote-tracking=20branch?= =?UTF-8?q?=20'origin/develop3.0.0'=20into=20develop3.0.0=20*=20Merge=20re?= =?UTF-8?q?mote-tracking=20branch=20'origin/develop3.0.0'=20into=20develop?= =?UTF-8?q?3.0.0=20*=20Merge=20remote-tracking=20branch=20'origin/develop3?= =?UTF-8?q?.0.0'=20into=20develop3.0.0=20*=20Merge=20remote-tracking=20bra?= =?UTF-8?q?nch=20'origin/develop3.0.0'=20into=20develop3.0.0=20*=20Merge?= =?UTF-8?q?=20remote-tracking=20branch=20'origin/develop3.0.0'=20into=20de?= =?UTF-8?q?velop3.0.0=20*=20Merge=20remote-tracking=20branch=20'origin/dev?= =?UTF-8?q?elop3.0.0'=20into=20develop3.0.0=20*=20[=E5=8A=9F=E8=83=BD]=20?= =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BD=9C=E4=B8=9A=E7=AE=A1=E7=90=86=E9=A1=B5?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=80=E5=88=97=E6=98=BE=E7=A4=BA=E4=BD=9C?= =?UTF-8?q?=E4=B8=9A=E6=98=AF=E5=90=A6=E5=B7=B2=E5=8A=A0=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/pages/cmdb/resourceentity/mapping-setting.vue | 2 +- src/views/pages/cmdb/resourceentity/resourceentity-edit.vue | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/views/pages/cmdb/resourceentity/mapping-setting.vue b/src/views/pages/cmdb/resourceentity/mapping-setting.vue index 4099182c..ce07249f 100644 --- a/src/views/pages/cmdb/resourceentity/mapping-setting.vue +++ b/src/views/pages/cmdb/resourceentity/mapping-setting.vue @@ -151,7 +151,7 @@ export default { this.fieldList.forEach(item => { this.list.push({ field: item.value, - type: '' + type: 'empty' }); }); }, diff --git a/src/views/pages/cmdb/resourceentity/resourceentity-edit.vue b/src/views/pages/cmdb/resourceentity/resourceentity-edit.vue index 02592a0f..f2652164 100644 --- a/src/views/pages/cmdb/resourceentity/resourceentity-edit.vue +++ b/src/views/pages/cmdb/resourceentity/resourceentity-edit.vue @@ -6,6 +6,7 @@ diff --git a/src/views/pages/autoexec/components/param/edit/text.vue b/src/views/pages/autoexec/components/param/edit/text.vue index 80cefacf..de5a01e0 100644 --- a/src/views/pages/autoexec/components/param/edit/text.vue +++ b/src/views/pages/autoexec/components/param/edit/text.vue @@ -24,7 +24,7 @@ :class="type==='textarea'?'pre':''" border="border" :maxlength="config && config.maxlength ?config.maxlength : type==='textarea'? 6114:2048" - @on-change="updateval" + @on-blur="updateval" > diff --git a/src/views/pages/autoexec/components/param/edit/textarea.vue b/src/views/pages/autoexec/components/param/edit/textarea.vue index 5fe19f13..a73a926e 100644 --- a/src/views/pages/autoexec/components/param/edit/textarea.vue +++ b/src/views/pages/autoexec/components/param/edit/textarea.vue @@ -8,7 +8,7 @@ border="border" type="textarea" :maxlength="maxlength" - @on-change="updateval" + @on-blur="updateval" > - diff --git a/src/views/pages/autoexec/components/script/item/condition/tool.vue b/src/views/pages/autoexec/components/script/item/condition/tool.vue index 135fefba..eca01399 100644 --- a/src/views/pages/autoexec/components/script/item/condition/tool.vue +++ b/src/views/pages/autoexec/components/script/item/condition/tool.vue @@ -6,7 +6,7 @@
- + >
- diff --git a/src/views/pages/extramenu/extramenu.js b/src/views/pages/extramenu/extramenu.js deleted file mode 100644 index 3ffe652b..00000000 --- a/src/views/pages/extramenu/extramenu.js +++ /dev/null @@ -1,39 +0,0 @@ -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 deleted file mode 100644 index c09a7216..00000000 --- a/src/views/pages/extramenu/extramenu.vue +++ /dev/null @@ -1,56 +0,0 @@ - - diff --git a/src/views/pages/extramenu/router.js b/src/views/pages/extramenu/router.js deleted file mode 100644 index 51e4d3e0..00000000 --- a/src/views/pages/extramenu/router.js +++ /dev/null @@ -1,56 +0,0 @@ -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-manage-bak.vue b/src/views/pages/framework/extramenu/extramenu-manage-bak.vue deleted file mode 100644 index 7192b6ce..00000000 --- a/src/views/pages/framework/extramenu/extramenu-manage-bak.vue +++ /dev/null @@ -1,595 +0,0 @@ - - - diff --git a/src/views/pages/framework/extramenu/menu-edit-bak.vue b/src/views/pages/framework/extramenu/menu-edit-bak.vue deleted file mode 100644 index 246e7363..00000000 --- a/src/views/pages/framework/extramenu/menu-edit-bak.vue +++ /dev/null @@ -1,138 +0,0 @@ - - - diff --git a/src/views/pages/framework/framework.js b/src/views/pages/framework/framework.js index 0c56b6b9..6357d3a8 100644 --- a/src/views/pages/framework/framework.js +++ b/src/views/pages/framework/framework.js @@ -10,6 +10,7 @@ import md5 from 'js-md5'; import frameworkUtils from '@/views/pages/framework/matrix/utils/utils'; import LocalStore from '@/resources/assets/js/localStore.js'; import State from '@/resources/assets/js/state.js'; +import commonRouters from '@/views/pages/common/router.js'; //公共的全局组件、样式等 import '@/resources/base.js'; @@ -21,7 +22,7 @@ Vue.use(CompareUtil); //必须要在use router之后执行 import { config } from './config.js'; MODULEID = config.module; -MENULIST = routers; +MENULIST = [...commonRouters, ...routers]; MENUTYPE = config.menuType; let router = initRouter(VueRouter, store); //路由拦截处理 diff --git a/src/views/pages/framework/homepage/edit-homepage-dialog.vue b/src/views/pages/framework/homepage/edit-homepage-dialog.vue index d59b6987..14bc0a84 100644 --- a/src/views/pages/framework/homepage/edit-homepage-dialog.vue +++ b/src/views/pages/framework/homepage/edit-homepage-dialog.vue @@ -1,9 +1,9 @@