-
+
{{ $t(module.moduleName) }}
@@ -81,8 +84,7 @@ export default {
components: {
TsForm: () => import('@/resources/plugins/TsForm/TsForm')
},
- filters: {
- },
+ filters: {},
props: {
id: Number
},
@@ -102,10 +104,10 @@ export default {
maxlength: 50,
validateList: ['required', 'name-special', { name: 'searchUrl', url: '/api/rest/homepage/save', params: () => ({ id: this.formData.id }) }]
},
- authorityList: {
+ authorityList: {
type: 'userselect',
label: '用户',
- validateList: ['required'],
+ validateList: ['required'],
groupList: ['common', 'user', 'role', 'team'],
isMultiple: true,
transfer: true
@@ -117,12 +119,14 @@ export default {
isActive: 1
},
moduleList: [],
- homepageConfig: {}
+ homepageConfig: {},
+ extraMenuList: []
};
},
beforeCreate() {},
created() {
this.init();
+ this.getExtraMenuItemList();
},
beforeMount() {},
mounted() {},
@@ -133,9 +137,15 @@ export default {
beforeDestroy() {},
destroyed() {},
methods: {
+ getExtraMenuItemList() {
+ this.$api.framework.extramenu.listExtarmenuItem({openType: 'iframe', type: 1}).then(res => {
+ this.extraMenuList = res.Return;
+ });
+ },
async init() {
this.homepageConfig = {};
const moduleList = this.$utils.deepClone(this.$store.state.topMenu.moduleList);
+ //添加扩展菜单
await this.getHomePageConfig();
if (!this.$utils.isEmpty(this.homepageConfig)) {
this.formData = Object.assign({}, this.homepageConfig);
@@ -163,7 +173,7 @@ export default {
if (!this.id) {
return;
}
- return this.$api.framework.homepage.getHomepageConfig({id: this.id}).then(res => {
+ return this.$api.framework.homepage.getHomepageConfig({ id: this.id }).then(res => {
if (res.Status == 'OK') {
this.homepageConfig = res.Return;
}
diff --git a/src/views/pages/framework/router.js b/src/views/pages/framework/router.js
index 9a0fd496..4e62b561 100644
--- a/src/views/pages/framework/router.js
+++ b/src/views/pages/framework/router.js
@@ -1,6 +1,7 @@
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 userManage = () => import('./users/user-manage.vue');
const roleManage = () => import('./users/role-manage.vue');
const teamManage = () => import('./users/team-manage.vue');
@@ -63,8 +64,6 @@ const homepageManage = () => import('./homepage/homepage-manage.vue'); //首页
const changelogAuditManage = () => import('./changelogaudit/changelogaudit-manage.vue'); //数据库变更记录
const logManage = () => import('./log/log-manage.vue'); //查看日志
-const extramenuDetail = () => import('@/views/pages/framework/extramenu/extramenu-detail.vue');
-
import { $t } from '@/resources/init.js';
import { config } from './config.js';
@@ -771,15 +770,7 @@ let routerList = [
authority: 'ADMIN',
type: 'healthcheck'
}
- },
- {
- path: '/extramenu-detail',
- name: 'extramenu-detail',
- component: extramenuDetail,
- meta: {
- ismenu: false,
- title: '扩展菜单'
- }
}
+
];
export default routerList;
diff --git a/src/views/pages/framework/users/user-setting-defaultpage-manage.vue b/src/views/pages/framework/users/user-setting-defaultpage-manage.vue
index 01e6a68d..b7b25dfc 100644
--- a/src/views/pages/framework/users/user-setting-defaultpage-manage.vue
+++ b/src/views/pages/framework/users/user-setting-defaultpage-manage.vue
@@ -60,6 +60,17 @@
+
+
+
@@ -76,15 +87,22 @@ export default {
data() {
return {
isCustome: false,
- currentModuleList: []
+ currentModuleList: [],
+ extraMenuList: []
};
},
async created() {
await this.getUserSetting();
this.$store.dispatch('updateMenu');
+ this.getExtraMenuItemList();
},
methods: {
+ getExtraMenuItemList() {
+ this.$api.framework.extramenu.listExtarmenuItem({openType: 'iframe', type: 1}).then(res => {
+ this.extraMenuList = res.Return;
+ });
+ },
getUserSetting() {
this.currentModuleList = [];
return this.$api.framework.user.getUserSetting({type: 'defaultModulePage'}).then(res => {
@@ -119,7 +137,7 @@ export default {
});
} else {
this.currentModuleList.forEach(module => {
- module.isDefault = 0;
+ module.isDefault = 0;
module.defaultPage = '';
});
this.saveDefaultPageOnline();
diff --git a/src/views/pages/inspect/inspect.js b/src/views/pages/inspect/inspect.js
index aed3ca42..f9a92fc9 100644
--- a/src/views/pages/inspect/inspect.js
+++ b/src/views/pages/inspect/inspect.js
@@ -8,6 +8,7 @@ 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 commonRouters from '@/views/pages/common/router.js';
//公共的全局组件、样式等
import '@/resources/base.js';
@@ -20,7 +21,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/knowledge/knowledge.js b/src/views/pages/knowledge/knowledge.js
index d4047e0a..9e9400bf 100644
--- a/src/views/pages/knowledge/knowledge.js
+++ b/src/views/pages/knowledge/knowledge.js
@@ -10,6 +10,7 @@ import LocalStore from '@/resources/assets/js/localStore.js';
import State from '@/resources/assets/js/state.js';
import '@/resources/base.js';
import { initRouter, initI18n, $t } from '@/resources/init.js';
+import commonRouters from '@/views/pages/common/router.js';
Vue.use(VueRouter);
Vue.use(VueI18n);
@@ -17,7 +18,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/pbc/pbc.js b/src/views/pages/pbc/pbc.js
index bcba3900..f6fd8b56 100644
--- a/src/views/pages/pbc/pbc.js
+++ b/src/views/pages/pbc/pbc.js
@@ -8,6 +8,7 @@ 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 commonRouters from '@/views/pages/common/router.js';
//公共的全局组件、样式等
import '@/resources/base.js';
@@ -19,7 +20,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/rdm/rdm.js b/src/views/pages/rdm/rdm.js
index 280c81b4..e05e6642 100644
--- a/src/views/pages/rdm/rdm.js
+++ b/src/views/pages/rdm/rdm.js
@@ -8,6 +8,7 @@ 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 commonRouters from '@/views/pages/common/router.js';
//公共的全局组件、样式等
import '@/resources/base.js';
@@ -19,7 +20,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/report/report.js b/src/views/pages/report/report.js
index c66681f5..be32d48f 100644
--- a/src/views/pages/report/report.js
+++ b/src/views/pages/report/report.js
@@ -8,35 +8,25 @@ 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 commonRouters from '@/views/pages/common/router.js';
+import { config } from './config.js';
import md5 from 'js-md5';
//公共的全局组件、样式等
import '@/resources/base.js';
-import {initRouter, initI18n} from '@/resources/init.js';
+import { initRouter, initI18n } from '@/resources/init.js';
Vue.use(VueRouter);
Vue.use(VueI18n);
-Vue.use(CompareUtil);//必须要在use router之后执行
+Vue.use(CompareUtil); //必须要在use router之后执行
-let newRouters = routers;
-if (location.hostname != 'localhost') {
- // demo 只在本地环境显示，线上环境不显示
- newRouters = [];
- routers.forEach((v, i) => {
- if (v.name != 'demo') {
- newRouters.push(v);
- }
- });
-}
-import {config} from './config.js';
MODULEID = config.module;
-MENULIST = newRouters;
+MENULIST = [...commonRouters, ...routers];
// MENULIST = routers;
MENUTYPE = config.menuType;
-let router = initRouter(VueRouter, store);//路由拦截处理
-let i18n = initI18n(VueI18n, {});//语言包配置
+let router = initRouter(VueRouter, store); //路由拦截处理
+let i18n = initI18n(VueI18n, {}); //语言包配置
Vue.config.productionTip = false;
Vue.prototype.$api = api;
diff --git a/vue.config.js b/vue.config.js
index 8cc2a586..0a1b8c0b 100755
--- a/vue.config.js
+++ b/vue.config.js
@@ -106,7 +106,7 @@ function getPages(pageList) {
Object.assign(pages, newpage);
});
}
- console.log('pages', JSON.stringify(pages));
+ //console.log('pages', JSON.stringify(pages));
return pages;
}
function getModuleName(moduleName) {
--
Gitee
From c554986d1e41158034ae0d67a5d5e2eae745fe42 Mon Sep 17 00:00:00 2001
From: dengbf
Date: Tue, 2 Sep 2025 18:15:23 +0800
Subject: [PATCH 05/14] =?UTF-8?q?-=20[=E4=BF=AE=E5=A4=8D]=20#[150133799960?=
=?UTF-8?q?5760]=E8=B5=84=E4=BA=A7=E6=B8=85=E5=8D=95=E9=AB=98=E7=BA=A7?=
=?UTF-8?q?=E6=90=9C=E7=B4=A2=E7=94=9F=E6=88=90=E6=95=B0=E6=8D=AE=E4=B8=AD?=
=?UTF-8?q?=E5=AD=98=E5=9C=A8=E7=9B=B8=E5=90=8C=E7=9A=84uuid=20http://192.?=
=?UTF-8?q?168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/9390509?=
=?UTF-8?q?47543057/1501337999605760?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../pages/cmdb/asset/advanced-mode-search.vue | 40 +++++++++----------
1 file changed, 20 insertions(+), 20 deletions(-)
diff --git a/src/views/pages/cmdb/asset/advanced-mode-search.vue b/src/views/pages/cmdb/asset/advanced-mode-search.vue
index baac5c18..1fc06cdc 100644
--- a/src/views/pages/cmdb/asset/advanced-mode-search.vue
+++ b/src/views/pages/cmdb/asset/advanced-mode-search.vue
@@ -555,26 +555,26 @@ export default {
});
}
});
- conditionList && !this.$utils.isEmpty(conditionList) && conditionList.forEach((item) => {
- if (uuidList && this.$utils.isEmpty(uuidList) && item.name && item.expression) {
- this.searchConditionList.push({conditionList: [item], uuid: item.uuid, childUuid: item.childUuid, joinType: item.joinType, childJoinType: item.childJoinType}); // 根据id相同，合并分组
- uuidList.push(item.uuid);
- } else if (uuidList.includes(item.uuid)) {
- this.searchConditionList.forEach((v) => {
- if (v && v.conditionList && !this.$utils.isEmpty(v.conditionList) && v.uuid == item.uuid) {
- v.conditionList.push(item);
- } else if (v && !v.hasOwnProperty('conditionList')) {
- this.$set(v, 'conditionList', [item]);
- }
- });
- } else if (!uuidList.includes(item.uuid) && item && item.name && item.expression) {
- this.searchConditionList.push({
- conditionList: [item],
- uuid: item.uuid,
- joinType: item.joinType,
- childUuid: item.childUuid,
- childJoinType: item.childJoinType
- });
+ !this.$utils.isEmpty(conditionList) && conditionList.forEach((item) => {
+ if (item.name && item.expression) {
+ if (uuidList.includes(item.uuid)) {
+ this.searchConditionList.forEach((v) => {
+ if (v && !this.$utils.isEmpty(v.conditionList) && v.uuid == item.uuid) {
+ v.conditionList.push(item);
+ } else if (v && !v.hasOwnProperty('conditionList')) {
+ this.$set(v, 'conditionList', [item]);
+ }
+ });
+ } else if (!uuidList.includes(item.uuid)) {
+ this.searchConditionList.push({
+ conditionList: [item],
+ uuid: item.uuid,
+ joinType: item.joinType,
+ childUuid: item.childUuid,
+ childJoinType: item.childJoinType
+ });
+ uuidList.push(item.uuid);
+ }
}
});
this.searchConditionList && this.searchConditionList.forEach((v, tIndex) => {
--
Gitee
From b3c86621e0f6969c8eea227b4cb9ead7a4e1e3fd Mon Sep 17 00:00:00 2001
From: yaojn
Date: Tue, 2 Sep 2025 18:49:18 +0800
Subject: [PATCH 06/14] =?UTF-8?q?-=20[=E4=BF=AE=E5=A4=8D]=E6=A8=A1?=
=?UTF-8?q?=E5=9D=97=E7=BC=BA=E5=B0=91=E5=85=A5=E5=8F=A3=E6=96=87=E4=BB=B6?=
=?UTF-8?q?=EF=BC=8C=E5=AF=BC=E8=87=B4=E9=A1=B9=E7=9B=AE=E5=90=AF=E5=8A=A8?=
=?UTF-8?q?=E5=A4=B1=E8=B4=A5=E3=80=82=20=20=20-=20[=E5=85=B3=E8=81=94]#[1?=
=?UTF-8?q?501564391358464]=E6=A8=A1=E5=9D=97=E7=BC=BA=E5=B0=91=E5=85=A5?=
=?UTF-8?q?=E5=8F=A3=E6=96=87=E4=BB=B6=EF=BC=8C=E5=AF=BC=E8=87=B4=E9=A1=B9?=
=?UTF-8?q?=E7=9B=AE=E5=90=AF=E5=8A=A8=E5=A4=B1=E8=B4=A5=E3=80=82=20http:/?=
=?UTF-8?q?/192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/93?=
=?UTF-8?q?9050947543057/1501564391358464?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
rsbuild.config.ts | 20 ++++++++++++--------
vue.config.js | 20 ++++++++++++--------
2 files changed, 24 insertions(+), 16 deletions(-)
diff --git a/rsbuild.config.ts b/rsbuild.config.ts
index e39e5675..6c90c9b3 100644
--- a/rsbuild.config.ts
+++ b/rsbuild.config.ts
@@ -107,14 +107,18 @@ function getPages(pageList) {
entry = `${communityModule}/${moduleName}/${filename}.js`;
} else if (commercialModuleList.includes(filename)) {
entry = `${commercialModule}/${moduleName}/${filename}.js`;
- }
- pages[filename] = {
- entry,
- template: `public/index.html`,
- filename: `${filename}.html`,
- title: pageLogin,
- chunks: [`chunk-vendors`, `chunk-common`, filename]
- };
+ }
+ const entryPath = path.resolve(__dirname, entry);
+ const needEntry = glob.sync(entryPath);
+ if (needEntry.length > 0) {
+ pages[filename] = {
+ entry,
+ template: `public/index.html`,
+ filename: `${filename}.html`,
+ title: pageLogin,
+ chunks: [`chunk-vendors`, `chunk-common`, filename]
+ };
+ }
});
return pages;
diff --git a/vue.config.js b/vue.config.js
index 0a1b8c0b..705fcd99 100755
--- a/vue.config.js
+++ b/vue.config.js
@@ -82,14 +82,18 @@ function getPages(pageList) {
} else if (commercialModuleList.includes(filename)) {
entry = `${commercialModule}/${moduleName}/${filename}.js`;
}
- newpage[filename] = {
- entry: entry,
- template: `public/index.html`,
- filename: `${filename}.html`,
- title: pageLogin, // 标题名称+参数
- chunks: [`chunk-vendors`, `chunk-common`, filename]
- };
- Object.assign(pages, newpage);
+ const entryPath = path.resolve(__dirname, entry);
+ const needEntry = glob.sync(entryPath);
+ if (needEntry.length > 0) {
+ newpage[filename] = {
+ entry: entry,
+ template: `public/index.html`,
+ filename: `${filename}.html`,
+ title: pageLogin, // 标题名称+参数
+ chunks: [`chunk-vendors`, `chunk-common`, filename]
+ };
+ Object.assign(pages, newpage);
+ }
});
} else {
//eg:['process','dashboard']
--
Gitee
From fafd81da4e812dd3f09659f3aa5a7bbb4f6a1330 Mon Sep 17 00:00:00 2001
From: dengbf
Date: Wed, 3 Sep 2025 15:36:03 +0800
Subject: [PATCH 07/14] =?UTF-8?q?-=20[=E4=BF=AE=E5=A4=8D]=20=E6=A0=BC?=
=?UTF-8?q?=E5=BC=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/pages/autoexec/components/script/script-list.vue | 4 ++--
src/views/pages/autoexec/detail/action-detail.vue | 7 +++----
.../autoexec/detail/actionDetail/step/step-config.vue | 2 +-
3 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/src/views/pages/autoexec/components/script/script-list.vue b/src/views/pages/autoexec/components/script/script-list.vue
index 3abb269c..05ad1c42 100644
--- a/src/views/pages/autoexec/components/script/script-list.vue
+++ b/src/views/pages/autoexec/components/script/script-list.vue
@@ -464,10 +464,10 @@ export default {
},
validPhaseOperationUuidList: {
handler(val) {
- if(!this.$utils.isEmpty(val)) {
+ if (!this.$utils.isEmpty(val)) {
val.forEach(item => {
mutationsScript.setCombopPhaseShowMap(item, true);
- })
+ });
}
},
deep: true
diff --git a/src/views/pages/autoexec/detail/action-detail.vue b/src/views/pages/autoexec/detail/action-detail.vue
index bb6c6821..f4ab4d1a 100644
--- a/src/views/pages/autoexec/detail/action-detail.vue
+++ b/src/views/pages/autoexec/detail/action-detail.vue
@@ -733,7 +733,7 @@ export default {
this.currentStep = null;
let data = this.getData();
this.$set(data, 'status', 'draft');
- this.loading =true;
+ this.loading = true;
await this.$api.autoexec.action
.saveActionVersion(data)
.then(res => {
@@ -1058,12 +1058,12 @@ export default {
let stepItem = this.stepList.find(c => c.uuid == this.currentStep);
stepItem && (groupUuid = stepItem.groupUuid);
groupUuid && (this.currentGroupConfig = this.combopGroupList.find(g => g.uuid == groupUuid));
- if(!this.$utils.isEmpty(config.config.operationUuid)) {
+ if (!this.$utils.isEmpty(config.config.operationUuid)) {
this.validPhaseOperationUuidList = config.config.operationUuid;
}
this.$nextTick(() => {
this.$refs.stepConfig && this.$refs.stepConfig.valid(config.config);
- if(!this.$utils.isEmpty(config.config.id)) {
+ if (!this.$utils.isEmpty(config.config.id)) {
this.$nextTick(() => {
this.$utils.jumpTo(config.config.id);
});
@@ -1409,7 +1409,6 @@ export default {
stepName: step.name,
validComponent: 'operation',
stepUuid: step.uuid,
- operationUuid: p.uuid,
operationUuid: validUuidList,
id: '#id_' + step.uuid + '_' + p.uuid
}
diff --git a/src/views/pages/autoexec/detail/actionDetail/step/step-config.vue b/src/views/pages/autoexec/detail/actionDetail/step/step-config.vue
index 00779a74..87878ca5 100644
--- a/src/views/pages/autoexec/detail/actionDetail/step/step-config.vue
+++ b/src/views/pages/autoexec/detail/actionDetail/step/step-config.vue
@@ -225,7 +225,7 @@ export default {
this.$el && (this.height = this.$el.getBoundingClientRect().top);
},
valid(config) {
- if (this.$refs.list) {
+ if (this.$refs.list) {
this.$refs.list.valid(config);
}
},
--
Gitee
From e3ecc4e40dc6ba724194f37a4045b98da5551c0e Mon Sep 17 00:00:00 2001
From: yaojn
Date: Thu, 4 Sep 2025 11:41:20 +0800
Subject: [PATCH 08/14] =?UTF-8?q?-=20[=E4=BF=AE=E5=A4=8D]=E8=A1=A8?=
=?UTF-8?q?=E6=A0=BC=E8=BE=93=E5=85=A5=E7=BB=84=E4=BB=B6=E5=AF=BC=E5=85=A5?=
=?UTF-8?q?=E8=A1=A8=E6=A0=BC=E6=95=B0=E6=8D=AE=EF=BC=8C=E5=AF=BC=E5=85=A5?=
=?UTF-8?q?=E6=88=90=E5=8A=9F=E5=90=8E=E5=8D=95=E9=80=89=E7=9A=84=E5=80=BC?=
=?UTF-8?q?=E5=8F=98=E6=88=90=E6=95=B0=E7=BB=84=E5=AF=B9=E8=B1=A1=E6=A0=BC?=
=?UTF-8?q?=E5=BC=8F=20=20=20=20-=20[=E5=85=B3=E8=81=94]#[1502811609595904?=
=?UTF-8?q?]=E8=A1=A8=E6=A0=BC=E8=BE=93=E5=85=A5=E7=BB=84=E4=BB=B6?=
=?UTF-8?q?=E5=AF=BC=E5=85=A5=E8=A1=A8=E6=A0=BC=E6=95=B0=E6=8D=AE=EF=BC=8C?=
=?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=88=90=E5=8A=9F=E5=90=8E=E5=8D=95=E9=80=89?=
=?UTF-8?q?=E7=9A=84=E5=80=BC=E5=8F=98=E6=88=90=E6=95=B0=E7=BB=84=E5=AF=B9?=
=?UTF-8?q?=E8=B1=A1=E6=A0=BC=E5=BC=8F=20http://192.168.0.96:8090/demo/rdm?=
=?UTF-8?q?.html#/bug-detail/939050947543040/939050947543057/1502811609595?=
=?UTF-8?q?904?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../component/formtableinputer/table-import-export-mixin.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/resources/plugins/TsSheet/form/component/formtableinputer/table-import-export-mixin.js b/src/resources/plugins/TsSheet/form/component/formtableinputer/table-import-export-mixin.js
index 8130438e..c40b14a4 100644
--- a/src/resources/plugins/TsSheet/form/component/formtableinputer/table-import-export-mixin.js
+++ b/src/resources/plugins/TsSheet/form/component/formtableinputer/table-import-export-mixin.js
@@ -520,7 +520,7 @@ export default {
return [handleSingleValue(value)];
}
} else {
- return [handleSingleValue(value)];
+ return handleSingleValue(value);
}
}
return typeof value == 'number' ? String(value) : value;
--
Gitee
From c7c67c89d08e7c40b75fcb6414c46856f7fc6cee Mon Sep 17 00:00:00 2001
From: yaojn
Date: Thu, 4 Sep 2025 18:29:40 +0800
Subject: [PATCH 09/14] =?UTF-8?q?-=20[=E4=BF=AE=E5=A4=8D]=E7=94=A8?=
=?UTF-8?q?=E6=88=B7=E7=AE=A1=E7=90=86=E7=95=8C=E9=9D=A2=EF=BC=9A=E6=97=A0?=
=?UTF-8?q?VIP=E6=9F=A5=E7=9C=8B=E6=9D=83=E9=99=90=E4=BB=8D=E7=84=B6?=
=?UTF-8?q?=E5=8F=AF=E4=BB=A5=E7=9C=8B=E8=A7=81VIP=E6=93=8D=E4=BD=9C?=
=?UTF-8?q?=E6=8C=89=E9=92=AE=20=20=20=20-=20[=E5=85=B3=E8=81=94]#[1503014?=
=?UTF-8?q?681018368]=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86=E7=95=8C?=
=?UTF-8?q?=E9=9D=A2=EF=BC=9A=E6=97=A0VIP=E6=9F=A5=E7=9C=8B=E6=9D=83?=
=?UTF-8?q?=E9=99=90=E4=BB=8D=E7=84=B6=E5=8F=AF=E4=BB=A5=E7=9C=8B=E8=A7=81?=
=?UTF-8?q?VIP=E6=93=8D=E4=BD=9C=E6=8C=89=E9=92=AE=20http://192.168.0.96:8?=
=?UTF-8?q?090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1?=
=?UTF-8?q?503014681018368?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/pages/framework/users/user-manage.vue | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/views/pages/framework/users/user-manage.vue b/src/views/pages/framework/users/user-manage.vue
index 870d9ad9..4e253caa 100644
--- a/src/views/pages/framework/users/user-manage.vue
+++ b/src/views/pages/framework/users/user-manage.vue
@@ -212,7 +212,8 @@ export default {
label: 'Vip',
transfer: true,
filterable: true,
- allowToggle: true
+ allowToggle: true,
+ isHidden: !this.$AuthUtils.hasRole('VIP_VIEW')
},
{
type: 'radio',
--
Gitee
From 6a39891b278a9a8f4fec714a43a64d80a5ce2704 Mon Sep 17 00:00:00 2001
From: chenqw
Date: Mon, 8 Sep 2025 12:10:43 +0800
Subject: [PATCH 10/14] adjust
---
src/resources/assets/languages/term/en.json | 4 +++-
src/resources/assets/languages/term/zh.json | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/resources/assets/languages/term/en.json b/src/resources/assets/languages/term/en.json
index f0d56b61..3d4b45e6 100644
--- a/src/resources/assets/languages/term/en.json
+++ b/src/resources/assets/languages/term/en.json
@@ -2896,7 +2896,9 @@
"last5dump": "Last 5 snapshots",
"threaddump": "Thread snapshot",
"pid": "Process ID",
- "servicetopo": "Service Relationship Diagram"
+ "servicetopo": "Service Relationship Diagram",
+ "healthstate": "health status",
+ "comm": "command"
},
"infromant": {
"report": "analysis report"
diff --git a/src/resources/assets/languages/term/zh.json b/src/resources/assets/languages/term/zh.json
index de31e51c..5789eefa 100644
--- a/src/resources/assets/languages/term/zh.json
+++ b/src/resources/assets/languages/term/zh.json
@@ -2893,7 +2893,9 @@
"last5dump": "最近5次快照",
"threaddump": "线程快照",
"pid": "进程id",
- "servicetopo": "服务关系图"
+ "servicetopo": "服务关系图",
+ "healthstate": "健康状态",
+ "comm": "命令"
},
"infromant": {
"report": "分析报告"
--
Gitee
From 8b695387557acccae4c5e186a679205fad1480c2 Mon Sep 17 00:00:00 2001
From: yaojn
Date: Tue, 9 Sep 2025 09:50:35 +0800
Subject: [PATCH 11/14] =?UTF-8?q?-=20[=E4=BF=AE=E5=A4=8D]=E8=A1=A8?=
=?UTF-8?q?=E5=8D=95=E8=A1=A8=E6=A0=BC=E8=BE=93=E5=85=A5=E7=BB=84=E4=BB=B6?=
=?UTF-8?q?=E8=81=94=E5=8A=A8=E8=B5=8B=E5=80=BC=E6=8A=A5=E9=94=99=20=20=20?=
=?UTF-8?q?=20-=20[=E5=85=B3=E8=81=94]#[1506378236002304]=E8=A1=A8?=
=?UTF-8?q?=E5=8D=95=E8=A1=A8=E6=A0=BC=E8=BE=93=E5=85=A5=E7=BB=84=E4=BB=B6?=
=?UTF-8?q?=E8=81=94=E5=8A=A8=E8=B5=8B=E5=80=BC=E6=8A=A5=E9=94=99=20http:/?=
=?UTF-8?q?/192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/93?=
=?UTF-8?q?9050947543057/1506378236002304?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../form/component/formtableinputer/index.vue | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/src/resources/plugins/TsSheet/form/component/formtableinputer/index.vue b/src/resources/plugins/TsSheet/form/component/formtableinputer/index.vue
index 3a61e3fa..2ee218b4 100644
--- a/src/resources/plugins/TsSheet/form/component/formtableinputer/index.vue
+++ b/src/resources/plugins/TsSheet/form/component/formtableinputer/index.vue
@@ -104,7 +104,7 @@
{
--
Gitee
From a6716edde43a23069d3afc56dfc60e9eafc2e699 Mon Sep 17 00:00:00 2001
From: dengbf
Date: Tue, 9 Sep 2025 11:48:38 +0800
Subject: [PATCH 12/14] =?UTF-8?q?-=20[=E5=85=B3=E8=81=94]=20#[150644009359?=
=?UTF-8?q?7696]=E7=BB=84=E5=90=88=E5=B7=A5=E5=85=B7=EF=BC=9A=E8=BE=93?=
=?UTF-8?q?=E5=85=A5=E5=8F=82=E6=95=B0=E5=8F=AF=E9=80=89=E7=9A=84=E4=BD=9C?=
=?UTF-8?q?=E4=B8=9A=E5=8F=82=E6=95=B0=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=85=A8?=
=?UTF-8?q?=20http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947?=
=?UTF-8?q?543040/939050947543057/1506440093597696?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../autoexec/components/script/item/param/inputparam.vue | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/views/pages/autoexec/components/script/item/param/inputparam.vue b/src/views/pages/autoexec/components/script/item/param/inputparam.vue
index 9d4ab782..39f2c88a 100644
--- a/src/views/pages/autoexec/components/script/item/param/inputparam.vue
+++ b/src/views/pages/autoexec/components/script/item/param/inputparam.vue
@@ -234,6 +234,7 @@ export default {
// textarea: ['text', 'textarea'],
json: ['json', 'node']
},
+ extendParamTypeList: ['text', 'textarea'], //排除不需要校验的参数类型
overrideProfileList: [] //覆盖参数集列表
};
},
@@ -447,7 +448,7 @@ export default {
return function(list, type, mappingMode) {
if (list && list.length) {
let li = [];
- if (mappingMode == 'prenodeoutputparamkey' || type === 'text' || type === 'textarea') { //引用上游参数名-选项不受限制, 文本框和文本域不设限制
+ if (mappingMode == 'prenodeoutputparamkey' || this.extendParamTypeList.includes(type)) { //引用上游参数名-选项不受限制, 文本框和文本域不设限制
li = list;
} else {
li = list.filter(l => {
@@ -482,7 +483,9 @@ export default {
return function(list, type) {
//需要过滤掉类型不同类的
if (list && list.length) {
- if (this.paramTypeConfig.hasOwnProperty(type)) {
+ if (this.extendParamTypeList.includes(type)) {
+ return list;
+ } else if (this.paramTypeConfig.hasOwnProperty(type)) {
let typelist = this.paramTypeConfig[type];
return list.filter(l => {
return typelist.includes(l.type);
--
Gitee
From 3989741f96dfd929db976adf949933c3af0a4f10 Mon Sep 17 00:00:00 2001
From: dengbf
Date: Tue, 9 Sep 2025 11:58:41 +0800
Subject: [PATCH 13/14] =?UTF-8?q?-=20[=E5=85=B3=E8=81=94]#[150589320668774?=
=?UTF-8?q?4]=E8=87=AA=E5=8A=A8=E5=8C=96=E7=BB=84=E5=90=88=E5=B7=A5?=
=?UTF-8?q?=E5=85=B7=E5=A4=8D=E5=88=B6if=E6=88=96loop=E5=B7=A5=E5=85=B7?=
=?UTF-8?q?=EF=BC=8C=E9=87=8C=E9=9D=A2=E5=B5=8C=E5=A5=97=E7=9A=84=E5=B7=A5?=
=?UTF-8?q?=E5=85=B7=E7=9A=84uuid=E6=B2=A1=E6=9C=89=E9=87=8D=E6=96=B0?=
=?UTF-8?q?=E6=9B=B4=E6=96=B0=20http://192.168.0.96:8090/demo/rdm.html#/bu?=
=?UTF-8?q?g-detail/939050947543040/939050947543057/1505893206687744?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../components/script/script-list.vue | 48 +++++++++++++++----
.../detail/actionDetail/step/step-config.vue | 9 ++++
2 files changed, 48 insertions(+), 9 deletions(-)
diff --git a/src/views/pages/autoexec/components/script/script-list.vue b/src/views/pages/autoexec/components/script/script-list.vue
index 05ad1c42..d025428a 100644
--- a/src/views/pages/autoexec/components/script/script-list.vue
+++ b/src/views/pages/autoexec/components/script/script-list.vue
@@ -187,17 +187,9 @@ export default {
updated() {},
activated() {},
deactivated() {},
- beforeDestroy() {
- this.clearObservable();
- },
+ beforeDestroy() {},
destroyed() {},
methods: {
- clearObservable() {
- //清空状态管理的数据
- Object.keys(storeScript).forEach(key => {
- storeScript[key] = null;
- });
- },
changeDragStatus(type) {
this.dragStatus = type;
if (type == 'end') {
@@ -241,10 +233,48 @@ export default {
uuid: this.$utils.setUuid(),
letter: prevlength.length ? this.$utils.translateNumber(parseInt(prevlength.length), 'en') : null
});
+ this.updateCopyUuid(newitem);
this.list.push(newitem);
this.updatedSort();
this.$forceUpdate();
},
+ updateCopyUuid(item) { //更新复制的脚本的uuid
+ if (item.config) {
+ if (!this.$utils.isEmpty(item.config.ifList)) {
+ this.updatePhaseOperationUuidList(item.config.ifList);
+ }
+ if (!this.$utils.isEmpty(item.config.elseList)) {
+ this.updatePhaseOperationUuidList(item.config.elseList);
+ }
+ if (!this.$utils.isEmpty(item.config.operations)) {
+ this.updatePhaseOperationUuidList(item.config.operations);
+ }
+ }
+ },
+ updatePhaseOperationUuidList(phaseOperationList) {
+ phaseOperationList.forEach(p => {
+ this.$delete(p, 'id');
+ this.$set(p, 'uuid', this.$utils.setUuid());
+ if (!this.$utils.isEmpty(p.config.paramMappingList)) {
+ p.config.paramMappingList.forEach(param => {
+ if (param.mappingMode == 'prenodeoutputparam' || param.mappingMode == 'prenodeoutputparamkey') {
+ this.$set(param, 'value', null);
+ }
+ });
+ }
+ if (p.config) {
+ if (!this.$utils.isEmpty(p.config.ifList)) {
+ this.updatePhaseOperationUuidList(p.config.ifList);
+ }
+ if (!this.$utils.isEmpty(p.config.elseList)) {
+ this.updatePhaseOperationUuidList(p.config.elseList);
+ }
+ if (!this.$utils.isEmpty(p.config.operations)) {
+ this.updatePhaseOperationUuidList(p.config.operations);
+ }
+ }
+ });
+ },
updateList(list) {
this.list = list.map((v, vindex) => {
return {
diff --git a/src/views/pages/autoexec/detail/actionDetail/step/step-config.vue b/src/views/pages/autoexec/detail/actionDetail/step/step-config.vue
index 87878ca5..fcfb42f2 100644
--- a/src/views/pages/autoexec/detail/actionDetail/step/step-config.vue
+++ b/src/views/pages/autoexec/detail/actionDetail/step/step-config.vue
@@ -39,6 +39,7 @@