From fae5820319c45cfdca9f665deb0cd9f7297cd498 Mon Sep 17 00:00:00 2001 From: dengbf Date: Thu, 24 Apr 2025 18:40:13 +0800 Subject: [PATCH 001/174] =?UTF-8?q?[=E5=85=B3=E8=81=94]#[1405917927538701]?= =?UTF-8?q?=E8=B6=85=E7=BA=A7=E6=B5=81=E6=B0=B4=E7=BA=BF-=E4=BD=9C?= =?UTF-8?q?=E4=B8=9A=E5=88=97=E8=A1=A8=E8=B0=83=E6=95=B4=20http://192.168.?= =?UTF-8?q?0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947?= =?UTF-8?q?543042/1405917927538701?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../deploy/pipeline/list-deployjob-dialog.vue | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/views/pages/deploy/pipeline/list-deployjob-dialog.vue b/src/views/pages/deploy/pipeline/list-deployjob-dialog.vue index e63f116d..0d028046 100644 --- a/src/views/pages/deploy/pipeline/list-deployjob-dialog.vue +++ b/src/views/pages/deploy/pipeline/list-deployjob-dialog.vue @@ -19,7 +19,7 @@ @changePageSize="changePageSize" > @@ -95,10 +27,8 @@ export default { name: '', components: { - TsTable: () => import('@/resources/components/TsTable/TsTable.vue'), - Liquid: () => import('@/resources/components/SimpleGraph/Liquid.vue'), - Status: () => import('@/resources/components/Status/CommonStatus.vue'), - CombineSearcher: () => import('@/resources/components/CombineSearcher/CombineSearcher.vue') + CombineSearcher: () => import('@/resources/components/CombineSearcher/CombineSearcher.vue'), + DeployPipelineTable: () => import('@/views/pages/deploy/job/publishing/deploy-pipeline-table.vue') }, props: { id: { type: Number }, @@ -107,7 +37,6 @@ export default { data() { return { isLoading: false, - jobData: {}, searchValue: {}, searchConfig: { search: true, labelPosition: 'top', @@ -158,60 +87,11 @@ export default { isShow: true, width: 'large', hasFooter: false - }, - theadList: [ - { key: 'showChildren' }, - { - title: this.$t('page.name'), - key: 'name' - }, - { - title: this.$t('page.scene'), - key: 'scenarioName' - }, - { - title: this.$t('page.status'), - key: 'status' - }, - { - title: this.$t('page.timecost'), - key: 'costTime' - }, - { - title: this.$t('page.executeuser'), - key: 'execUserVo', - type: 'user', - uuid: 'uuid' - }, - { - title: this.$t('page.source'), - key: 'sourceName' - }, - { - title: this.$t('page.plantime'), - key: 'planStartTime', - type: 'time' - }, - { - title: this.$t('page.startstoptime'), - key: 'startTime', - keyend: 'endTime' - }, - { - title: this.$t('term.autoexec.triggertype'), - key: 'triggerTypeName' - }, - { - title: this.$t('term.autoexec.executionsituation'), - key: 'completionRate' - } - ] + } }; }, beforeCreate() {}, - created() { - this.searchJob(1); - }, + created() {}, beforeMount() {}, mounted() {}, beforeUpdate() {}, @@ -221,89 +101,17 @@ export default { beforeDestroy() {}, destroyed() {}, methods: { - changePageSize(pageSize) { - this.searchParam.pageSize = pageSize; - this.searchJob(1); - }, - toggleChildJob(row, isShow) { - if (row['showChildren']) { - this.$set(row, 'showChildren', false); - for (let i = this.jobData.tbodyList.length - 1; i >= 0; i--) { - const element = this.jobData.tbodyList[i]; - if (element.parentId === row.id) { - this.jobData.tbodyList.splice(i, 1); - } - } - } else { - this.getChildrenJob(row); - } - }, - getChildrenJob(parentRow) { - this.$set(parentRow, 'loading', true); - this.$api.deploy.job.searchJobList({ parentId: parentRow.id }).then(res => { - const jobList = res.Return.tbodyList; - if (jobList && jobList.length > 0) { - const pIndex = this.jobData.tbodyList.findIndex(d => d === parentRow); - if (pIndex >= 0) { - this.$set(parentRow, 'showChildren', true); - this.$set(parentRow, 'loading', false); - this.jobData.tbodyList.splice(pIndex + 1, 0, ...jobList); - } - } - }); - }, - searchJob(currentPage) { - this.isLoading = true; - if (currentPage) { - this.searchParam.currentPage = currentPage; + searchDeployPipeline(currentPage) { + if (this.$refs.tableData) { + this.$refs.tableData.searchJob(currentPage, this.searchValue); } - const param = { ...this.searchParam, ...this.searchValue }; - this.$api.deploy.job - .searchJobList(param) - .then(res => { - this.jobData = res.Return; - if (this.jobData.tbodyList && this.jobData.tbodyList.length > 0) { - this.jobData.tbodyList.forEach(element => { - if (element.source === 'batchdeploy' || element.source === 'deployschedulepipeline') { - this.$set(element, '#expander', true); - } else { - this.$set(element, '#expander', false); - } - }); - } - }) - .finally(() => { - this.isLoading = false; - }); }, close() { this.$emit('close'); - }, - toJobDetail(row) { - this.$router.push({ - path: '/job-detail', - query: { id: row.id } - }); - }, - toBatchJobDetail(row) { - const {parentId = '', id = ''} = row || {}; - if (parentId != -1) { - this.toJobDetail(row); - } else { - window.open(HOME + '/deploy.html#/batch-job-detail?id=' + id, '_blank'); - } } }, filter: {}, computed: { - getConfig() { - return row => { - let config = {}; - config.status = row.status; - row.status == 'running' ? (config.status = 'active') : row.status == 'error' ? (config.status = 'wrong') : ''; - return config; - }; - } }, watch: {} }; -- Gitee From 12730d1e1a650dc7af3fa84d95b62d95a7a2a2bf Mon Sep 17 00:00:00 2001 From: dengbf Date: Tue, 29 Apr 2025 16:55:36 +0800 Subject: [PATCH 003/174] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20#[14059179275387?= =?UTF-8?q?01]=E8=B6=85=E7=BA=A7=E6=B5=81=E6=B0=B4=E7=BA=BF-=E4=BD=9C?= =?UTF-8?q?=E4=B8=9A=E5=88=97=E8=A1=A8=E8=B0=83=E6=95=B4=20http://192.168.?= =?UTF-8?q?0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947?= =?UTF-8?q?543042/1405917927538701?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/pages/deploy/job/job-manage.vue | 6 ++---- .../pages/deploy/job/publishing/deploy-pipeline-table.vue | 3 ++- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/views/pages/deploy/job/job-manage.vue b/src/views/pages/deploy/job/job-manage.vue index 28443dcd..0a54f526 100644 --- a/src/views/pages/deploy/job/job-manage.vue +++ b/src/views/pages/deploy/job/job-manage.vue @@ -89,6 +89,7 @@ @@ -161,7 +162,6 @@ export default { sortOrder: [{planStartTime: 'DESC'}], noConfigInfo: false, // 无配置信息，模块和环境 moduleList: [], - isLoading: false, isShowResourceLockDialog: false, appModuleData: {}, searchValue: {}, @@ -238,9 +238,7 @@ export default { } }, beforeMount() {}, - mounted() { - this.searchJob(); - }, + mounted() {}, beforeUpdate() {}, updated() {}, activated() {}, diff --git a/src/views/pages/deploy/job/publishing/deploy-pipeline-table.vue b/src/views/pages/deploy/job/publishing/deploy-pipeline-table.vue index 0a65514c..03b88c66 100644 --- a/src/views/pages/deploy/job/publishing/deploy-pipeline-table.vue +++ b/src/views/pages/deploy/job/publishing/deploy-pipeline-table.vue @@ -104,6 +104,7 @@ export default { default: true }, defaultSearchParam: { type: Object }, + defaultSearchValue: { type: Object }, sortList: { type: Array }, sortOrder: { type: Array }, fixedHeader: { type: Boolean, default: true } @@ -170,7 +171,7 @@ export default { }, beforeCreate() {}, created() { - this.searchJob(1); + this.searchJob(1, this.defaultSearchValue); }, beforeMount() {}, mounted() {}, -- Gitee From 70e7d11a73f1c064582e062f6163ed555192dfd1 Mon Sep 17 00:00:00 2001 From: yaojn Date: Wed, 30 Apr 2025 15:49:43 +0800 Subject: [PATCH 004/174] =?UTF-8?q?-=20[=E5=8A=9F=E8=83=BD]=E5=B7=A5?= =?UTF-8?q?=E5=8D=95=E8=AF=A6=E6=83=85-=E8=A1=A8=E5=8D=95=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E4=B8=8B=E6=8B=89=E6=A1=86=EF=BC=9A=E5=A4=B1=E5=8E=BB?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=BA=90=E6=97=B6=EF=BC=8C=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E5=9B=9E=E6=98=BE=E6=97=A7=E6=95=B0=E6=8D=AE=20=20=20=20-=20[?= =?UTF-8?q?=E5=85=B3=E8=81=94]#[1364339037011968]=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E8=AF=A6=E6=83=85-=E8=A1=A8=E5=8D=95=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=A1=86=EF=BC=9A=E5=A4=B1=E5=8E=BB=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=BA=90=E6=97=B6=EF=BC=8C=E9=9C=80=E8=A6=81=E5=9B=9E?= =?UTF-8?q?=E6=98=BE=E6=97=A7=E6=95=B0=E6=8D=AE=20http://192.168.0.96:8090?= =?UTF-8?q?/demo/rdm.html#/story-detail/939050947543040/939050947543042/13?= =?UTF-8?q?64339037011968?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/resources/mixins/formMixins.js | 39 +++++++++++++ .../plugins/TsForm/TsFormCheckbox.vue | 56 +++++++++++-------- src/resources/plugins/TsForm/TsFormRadio.vue | 55 +++++++++++------- src/resources/plugins/TsForm/TsFormSelect.vue | 19 +------ src/resources/plugins/TsSheet/form-item.vue | 2 + .../TsSheet/form/component/formcheckbox.vue | 1 + .../TsSheet/form/component/formradio.vue | 1 + .../TsSheet/form/component/formselect.vue | 1 + 8 files changed, 113 insertions(+), 61 deletions(-) diff --git a/src/resources/mixins/formMixins.js b/src/resources/mixins/formMixins.js index 5dd33766..f2433ffa 100644 --- a/src/resources/mixins/formMixins.js +++ b/src/resources/mixins/formMixins.js @@ -50,6 +50,11 @@ export default { // 是否自定义值，单个字符串(value:1)可以自定义返回{text:1,value:1}，数组[1]可以自定义返回[{text:1,value:1}] type: Boolean, default: false + }, + historyValue: { + // 历史值(Object包含text,value)存在时，用历史值回显数据（在dynamicUrl初始化时，不调用接口） + type: [String, Array, Object], + default: null } }, methods: { @@ -280,6 +285,40 @@ export default { } return value; }; + }, + handleHistoryValue() { + let selectedList = []; + return historyData => { + let historyValueList = Array.isArray(historyData) ? historyData : [historyData]; + historyValueList.forEach(item => { + if (!this.$utils.isEmpty(item)) { + let obj = {}; + if (typeof item === 'object') { + obj[this.valueName] = item.value; + obj[this.textName] = item.text; + } else { + obj[this.valueName] = obj[this.textName] = item; + } + selectedList.push(obj); + } + }); + return selectedList; + }; + }, + getSelectedText() { + return (val) => { + const getNodeText = (node) => node && node[this.textName] ? node[this.textName] : '-'; + let node = this.nodeList.find(item => item[this.valueName] == val); + if (node) { + return getNodeText(node); + } else if (!this.$utils.isEmpty(this.historyValue)) { + const nodeList = this.handleHistoryValue(this.historyValue); + const nodeItem = nodeList.find(item => item[this.valueName] == val); + return getNodeText(nodeItem); + } else { + return '-'; + } + }; } }, diff --git a/src/resources/plugins/TsForm/TsFormCheckbox.vue b/src/resources/plugins/TsForm/TsFormCheckbox.vue index 12b0d146..442d4e9f 100755 --- a/src/resources/plugins/TsForm/TsFormCheckbox.vue +++ b/src/resources/plugins/TsForm/TsFormCheckbox.vue @@ -1,13 +1,13 @@ + + -- Gitee From 7468c99d79dfc3444d8aaa5056213bd884195184 Mon Sep 17 00:00:00 2001 From: dengbf Date: Tue, 20 May 2025 18:11:26 +0800 Subject: [PATCH 047/174] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20#[14253472187351?= =?UTF-8?q?04]=E7=BB=84=E5=90=88=E5=B7=A5=E5=85=B7=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=EF=BC=9A=E5=B7=A5=E5=85=B7if/else=20?= =?UTF-8?q?=E8=87=B3=E5=B0=91=E9=80=89=E6=8B=A9=E4=B8=80=E4=B8=AA=E5=B7=A5?= =?UTF-8?q?=E5=85=B7=20http://192.168.0.96:8090/demo/rdm.html#/story-detai?= =?UTF-8?q?l/939050947543040/939050947543042/1425347218735104?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/script/script-list.vue | 14 ++++++++++++-- .../pages/autoexec/detail/action-detail.vue | 19 +++++++++++++++---- .../application-config-pipeline.vue | 10 ++++++++++ .../application-config/pipeline-detail.vue | 9 +++++++++ 4 files changed, 46 insertions(+), 6 deletions(-) diff --git a/src/views/pages/autoexec/components/script/script-list.vue b/src/views/pages/autoexec/components/script/script-list.vue index d46b7c85..cfc58332 100644 --- a/src/views/pages/autoexec/components/script/script-list.vue +++ b/src/views/pages/autoexec/components/script/script-list.vue @@ -284,7 +284,6 @@ export default { let _this = this; _this.list.forEach(l => { if (l.uuid == id) { - console.log(config); Object.assign(l, config); } }); @@ -314,7 +313,7 @@ export default { childrendom.forEach(children => { if (children.__vue__ && children.__vue__.valid) { if (!children.__vue__.valid()) { - children.__vue__.$options.parent.step.isShow = true; + this.setShowStep(children.__vue__.$options.parent); isValid = false; } } @@ -323,6 +322,17 @@ export default { return isValid; } }, + setShowStep(parent) { //设置父级的显示 + if (parent) { + if (parent.step) { + parent.step.isShow = true; + } else { + if (parent.$options.parent) { + this.setShowStep(parent.$options.parent); + } + } + } + }, refreshProfile() { if (this.phaseOperationList && this.phaseOperationList.length) { this.phaseOperationList.forEach(item => { diff --git a/src/views/pages/autoexec/detail/action-detail.vue b/src/views/pages/autoexec/detail/action-detail.vue index f9c64166..9fee20c3 100644 --- a/src/views/pages/autoexec/detail/action-detail.vue +++ b/src/views/pages/autoexec/detail/action-detail.vue @@ -1256,7 +1256,7 @@ export default { if (p.operationName == 'native/IF-Block') { if (p.config) { !p.config.condition && validList.push({ - text: this.$t('page.phase') + step.name + this.$t('term.autoexec.setinputcondition'), + text: this.$t('page.phase') + step.name + '【' + p.operationName + '】' + this.$t('term.autoexec.setinputcondition'), type: 'error', config: { stepName: step.name, @@ -1264,6 +1264,17 @@ export default { stepUuid: step.uuid } }); + if (this.$utils.isEmpty(p.config.ifList) && this.$utils.isEmpty(p.config.elseList)) { + validList.push({ + text: this.$t('page.phase') + step.name + '【' + p.operationName + '】：' + this.$t('term.deploy.chooseatleastonetool'), + type: 'error', + config: { + stepName: step.name, + validComponent: 'operation', + stepUuid: step.uuid + } + }); + } if (p.config.ifList && p.config.ifList.length) { let validIfList = this.validPhaseOperationList(step, p.config.ifList); validIfList.length && validList.push(...validIfList); @@ -1276,7 +1287,7 @@ export default { } else if (p.operationName == 'native/LOOP-Block') { if (p.config) { !p.config.loopItems && validList.push({ - text: this.$t('page.phase') + step.name + this.$t('term.autoexec.setinputloopitems'), + text: this.$t('page.phase') + step.name + '【' + p.operationName + '】' + this.$t('term.autoexec.setinputloopitems'), type: 'error', config: { stepName: step.name, @@ -1285,7 +1296,7 @@ export default { } }); !p.config.loopItemVar && validList.push({ - text: this.$t('page.phase') + step.name + this.$t('term.autoexec.setinputloopitemvar'), + text: this.$t('page.phase') + step.name + '【' + p.operationName + '】' + this.$t('term.autoexec.setinputloopitemvar'), type: 'error', config: { stepName: step.name, @@ -1294,7 +1305,7 @@ export default { } }); (!p.config.operations || p.config.operations.length == 0) && validList.push({ - text: this.$t('page.phase') + step.name + this.$t('term.autoexec.setinputloopoperations'), + text: this.$t('page.phase') + step.name + '【' + p.operationName + '】' + this.$t('term.autoexec.setinputloopoperations'), type: 'error', config: { stepName: step.name, diff --git a/src/views/pages/deploy/application-config/application-config-pipeline.vue b/src/views/pages/deploy/application-config/application-config-pipeline.vue index d9f0080f..4735cdd5 100644 --- a/src/views/pages/deploy/application-config/application-config-pipeline.vue +++ b/src/views/pages/deploy/application-config/application-config-pipeline.vue @@ -608,6 +608,16 @@ export default { id: '#id_' + step.uuid + '_' + p.uuid, current: 1 }); + if (this.$utils.isEmpty(p.config.ifList) && this.$utils.isEmpty(p.config.elseList)) { + validList.push({ + text: this.$t('page.phase') + step.name + '【' + p.operationName + '】：' + this.$t('term.deploy.chooseatleastonetool'), + type: 'error', + stepUuid: step.uuid, + operationUuid: p.uuid, + id: '#id_' + step.uuid + '_' + p.uuid, + current: 1 + }); + } if (p.config.ifList && p.config.ifList.length) { let validIfList = this.validPhaseOperationList(step, p.config.ifList); validIfList.length && validList.push(...validIfList); diff --git a/src/views/pages/deploy/application-config/pipeline-detail.vue b/src/views/pages/deploy/application-config/pipeline-detail.vue index 87faa094..bb2b6453 100644 --- a/src/views/pages/deploy/application-config/pipeline-detail.vue +++ b/src/views/pages/deploy/application-config/pipeline-detail.vue @@ -934,6 +934,15 @@ export default { operationUuid: p.uuid, id: '#id_' + step.uuid + '_' + p.uuid }); + if (this.$utils.isEmpty(p.config.ifList) && this.$utils.isEmpty(p.config.elseList)) { + validList.push({ + text: this.$t('page.phase') + step.name + '【' + p.operationName + '】：' + this.$t('term.deploy.chooseatleastonetool'), + type: 'error', + stepUuid: step.uuid, + operationUuid: p.uuid, + id: '#id_' + step.uuid + '_' + p.uuid + }); + } if (p.config.ifList && p.config.ifList.length) { let validIfList = this.validPhaseOperationList(step, p.config.ifList); validIfList.length && validList.push(...validIfList); -- Gitee From 3cba036284869d0f8fa3cc61639dde83ad011332 Mon Sep 17 00:00:00 2001 From: dengbf Date: Tue, 20 May 2025 18:12:57 +0800 Subject: [PATCH 048/174] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E7=BB=84?= =?UTF-8?q?=E5=90=88=E5=B7=A5=E5=85=B7=E9=98=B6=E6=AE=B5=EF=BC=9Brunner?= =?UTF-8?q?=E7=BB=84=E5=8E=BB=E6=8E=89=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/autoexec/detail/actionDetail/runnergroup-setting.vue | 2 +- .../pages/deploy/application-config/pipeline/step/step-edit.vue | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/views/pages/autoexec/detail/actionDetail/runnergroup-setting.vue b/src/views/pages/autoexec/detail/actionDetail/runnergroup-setting.vue index 6b51ec03..b7330f18 100644 --- a/src/views/pages/autoexec/detail/actionDetail/runnergroup-setting.vue +++ b/src/views/pages/autoexec/detail/actionDetail/runnergroup-setting.vue @@ -119,7 +119,7 @@ export default { transfer: true, needCallback: false, border: 'border', - validateList: ['required'], + validateList: this.isRequired ? ['required'] : [], dealDataByUrl: this.$utils.getRunnerGroupList, dynamicUrl: '/api/rest/runnergroup/search', params: { diff --git a/src/views/pages/deploy/application-config/pipeline/step/step-edit.vue b/src/views/pages/deploy/application-config/pipeline/step/step-edit.vue index fbcdf1a0..6172778d 100644 --- a/src/views/pages/deploy/application-config/pipeline/step/step-edit.vue +++ b/src/views/pages/deploy/application-config/pipeline/step/step-edit.vue @@ -102,6 +102,7 @@ :config="executeConfig.runnerGroupTag" :disabled="!canEdit" :runtimeParamList="runtimeParamList" + :isRequired="false" > -- Gitee From 87807bd43363d55ed2cd3985f3e82b955b049a76 Mon Sep 17 00:00:00 2001 From: dengbf Date: Tue, 20 May 2025 18:30:50 +0800 Subject: [PATCH 049/174] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20#[14254654226104?= =?UTF-8?q?32]=E7=BB=84=E5=90=88=E5=B7=A5=E5=85=B7-runner=E9=98=B6?= =?UTF-8?q?=E6=AE=B5=E7=9A=84=E6=89=A7=E8=A1=8C=E5=99=A8=E7=BB=84=E5=8E=BB?= =?UTF-8?q?=E6=8E=89=E4=B8=BA=E7=A9=BA=E6=97=B6=E9=BB=98=E8=AE=A4=E2=80=9C?= =?UTF-8?q?=E9=9A=8F=E6=9C=BA=E5=88=86=E9=85=8D=E2=80=9D=20http://192.168.?= =?UTF-8?q?0.96:8090/demo/rdm.html#/bug-detail/939050947543040/93905094754?= =?UTF-8?q?3057/1425465422610432?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../autoexec/detail/actionDetail/step/edit/step-edit.vue | 9 +++++++-- .../application-config/pipeline/step/step-edit.vue | 9 +++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/views/pages/autoexec/detail/actionDetail/step/edit/step-edit.vue b/src/views/pages/autoexec/detail/actionDetail/step/edit/step-edit.vue index ddc12d27..68f339b7 100644 --- a/src/views/pages/autoexec/detail/actionDetail/step/edit/step-edit.vue +++ b/src/views/pages/autoexec/detail/actionDetail/step/edit/step-edit.vue @@ -126,7 +126,7 @@ > @@ -251,7 +251,12 @@ export default { isValid: true, //校验结果通过 isShowTargetValid: false, executeTooltip: this.$t('term.autoexec.executeTooltip'), - runnerGroupTooltip: this.$t('term.autoexec.runnerGroupTooltip') + runnerGroupTooltip: this.$t('term.autoexec.runnerGroupTooltip'), + runnerGroup: { + mappingMode: 'constant', + value: '', + text: '' + } }; }, beforeCreate() {}, -- Gitee From 6c61a8b2108fb4ee0fc1a3d2fa6a81841187bfd8 Mon Sep 17 00:00:00 2001 From: yaojn Date: Wed, 21 May 2025 16:02:20 +0800 Subject: [PATCH 050/174] =?UTF-8?q?-=20[=E4=BF=AE=E5=A4=8D]=E8=A1=A8?= =?UTF-8?q?=E5=8D=95=E9=85=8D=E7=BD=AE=E9=A1=B9=E4=BF=AE=E6=94=B9=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E9=87=8C=E8=BF=BD=E5=8A=A0=E6=95=B0=E6=8D=AE=EF=BC=8C?= =?UTF-8?q?=E8=A1=A8=E5=8D=95=E6=8F=90=E4=BA=A4=E6=97=B6=E4=BC=9A=E9=A2=9D?= =?UTF-8?q?=E5=A4=96=E6=96=B0=E5=A2=9E=E4=B8=80=E6=9D=A1=E7=A9=BA=E7=9A=84?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=20=20=20-=20[=E5=85=B3=E8=81=94]#[1425239844?= =?UTF-8?q?552704]=E8=A1=A8=E5=8D=95=E9=85=8D=E7=BD=AE=E9=A1=B9=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E7=BB=84=E4=BB=B6=E9=87=8C=E8=BF=BD=E5=8A=A0=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=EF=BC=8C=E8=A1=A8=E5=8D=95=E6=8F=90=E4=BA=A4=E6=97=B6?= =?UTF-8?q?=E4=BC=9A=E9=A2=9D=E5=A4=96=E6=96=B0=E5=A2=9E=E4=B8=80=E6=9D=A1?= =?UTF-8?q?=E7=A9=BA=E7=9A=84=E6=95=B0=E6=8D=AE=20http://192.168.0.96:8090?= =?UTF-8?q?/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1425?= =?UTF-8?q?239844552704?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/pages/cmdb/cientity/cientity-edit.vue | 1 + .../pages/cmdb/form/component/formcientitymodify/index.vue | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/views/pages/cmdb/cientity/cientity-edit.vue b/src/views/pages/cmdb/cientity/cientity-edit.vue index 59140e78..7d639113 100644 --- a/src/views/pages/cmdb/cientity/cientity-edit.vue +++ b/src/views/pages/cmdb/cientity/cientity-edit.vue @@ -153,6 +153,7 @@ export default { uuid: this.$utils.setUuid(), _relId: relId, //记录来自哪个关系，自动填上配置项 _direction: rel.direction, //记录关系方向 + flagRelId: relId, // 标识关系id，用于ITSM判断是否是关系，关系不需要直接显示在列表中。 ciId: ciId, rootCiId: this.propRootCiId, ciName: ci.name, diff --git a/src/views/pages/cmdb/form/component/formcientitymodify/index.vue b/src/views/pages/cmdb/form/component/formcientitymodify/index.vue index 0caf6fbe..1df3a84f 100644 --- a/src/views/pages/cmdb/form/component/formcientitymodify/index.vue +++ b/src/views/pages/cmdb/form/component/formcientitymodify/index.vue @@ -301,7 +301,7 @@ export default { if (index > -1) { this.$set(this.entityList, index, cientity); } else { - // this.entityList.push(cientity); // 编辑配置项时，追加自动采集里的数据，提交时，会额外新增一条数据 + this.entityList.push(cientity); } }); } @@ -482,7 +482,7 @@ export default { if (this.entityList && this.entityList.length > 0) { const returnList = []; this.entityList.forEach(cientity => { - if (cientity.rootCiId === ciId && !cientity._isnew) { + if (cientity.rootCiId === ciId && !cientity._isnew && !cientity.flagRelId) { returnList.push(cientity); } }); -- Gitee From 7b36cab204bdcb48a024590c404e4389be400562 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Wed, 21 May 2025 16:10:58 +0800 Subject: [PATCH 051/174] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20IT=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1-=E5=B0=86=E6=AD=A5=E9=AA=A4=E6=B5=81=E8=BD=AC?= =?UTF-8?q?=E6=97=B6=E6=8C=87=E6=B4=BE=E6=AD=A5=E9=AA=A4=E5=A4=84=E7=90=86?= =?UTF-8?q?=E4=BA=BA=E4=BF=A1=E6=81=AF=E6=B7=BB=E5=8A=A0=E5=88=B0=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E7=BA=BF=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1425218084503552]IT服务-将步骤流转时指派步骤处理人信息添加到时间线中 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1425218084503552 --- src/resources/assets/languages/term/en.json | 3 +- src/resources/assets/languages/term/zh.json | 3 +- .../item/assignworkerlist-handler.vue | 60 +++++++++++++++++++ .../workorder/activity/item/index.js | 2 + 4 files changed, 66 insertions(+), 2 deletions(-) create mode 100644 src/views/pages/process/task/processdetail/workorder/activity/item/assignworkerlist-handler.vue diff --git a/src/resources/assets/languages/term/en.json b/src/resources/assets/languages/term/en.json index c2804744..c2284f13 100644 --- a/src/resources/assets/languages/term/en.json +++ b/src/resources/assets/languages/term/en.json @@ -628,7 +628,8 @@ "thirdpartyapi": "Third party callback interface", "reactivatestep": "Reactivation steps", "seeprocessconfig": "View the current work order process configuration", - "editprocessconfig": "Edit the current work order process configuration" + "editprocessconfig": "Edit the current work order process configuration", + "stepishandledby": "Step Handling Human" }, "autoexec": { "addrootdirectory": "Add root directory", diff --git a/src/resources/assets/languages/term/zh.json b/src/resources/assets/languages/term/zh.json index 0bc48656..5d77e813 100644 --- a/src/resources/assets/languages/term/zh.json +++ b/src/resources/assets/languages/term/zh.json @@ -628,7 +628,8 @@ "thirdpartyapi": "第三方回调接口", "reactivatestep": "重新激活步骤", "seeprocessconfig": "查看当前工单流程配置", - "editprocessconfig": "编辑当前工单流程配置" + "editprocessconfig": "编辑当前工单流程配置", + "stepishandledby": "步骤处理人为" }, "autoexec": { "addrootdirectory": "添加根目录", diff --git a/src/views/pages/process/task/processdetail/workorder/activity/item/assignworkerlist-handler.vue b/src/views/pages/process/task/processdetail/workorder/activity/item/assignworkerlist-handler.vue new file mode 100644 index 00000000..d55e041d --- /dev/null +++ b/src/views/pages/process/task/processdetail/workorder/activity/item/assignworkerlist-handler.vue @@ -0,0 +1,60 @@ + + + + + diff --git a/src/views/pages/process/task/processdetail/workorder/activity/item/index.js b/src/views/pages/process/task/processdetail/workorder/activity/item/index.js index c8190789..7e227eeb 100644 --- a/src/views/pages/process/task/processdetail/workorder/activity/item/index.js +++ b/src/views/pages/process/task/processdetail/workorder/activity/item/index.js @@ -7,6 +7,7 @@ import formHandler from './form-handler'; import fileHandler from './file-handler'; import restfulactionHandler from './restfulaction-handler'; import workerlistHandler from './workerlist-handler'; +import assignworkerlistHandler from './assignworkerlist-handler'; import workerHandler from './worker-handler'; import causeHandler from './cause-handler'; import ruleHandler from './rule-handler'; @@ -33,6 +34,7 @@ export default { restfulactionHandler, //动作激活 workerHandler, workerlistHandler, + assignworkerlistHandler, causeHandler, //条件异常原因 ruleHandler, //条件规则 fromprocesstaskHandler, //原工单 -- Gitee From e2cff73a4e51f4de35302100b12297008fa8915f Mon Sep 17 00:00:00 2001 From: lvzk <897706680@qq.com> Date: Wed, 21 May 2025 17:55:53 +0800 Subject: [PATCH 052/174] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=8C=96-=E9=98=B6=E6=AE=B5=E7=9A=84=E9=A2=84=E8=AE=BE?= =?UTF-8?q?=E8=A6=81=E6=94=AF=E6=8C=81=EF=BC=8Crunner=E7=BB=84=E7=9A=84?= =?UTF-8?q?=E6=8C=87=E5=AE=9A=E5=92=8C=E6=A0=87=E7=AD=BE=E7=9A=84=E6=8C=87?= =?UTF-8?q?=E5=AE=9A=20#[1417233421533184]=E8=87=AA=E5=8A=A8=E5=8C=96-?= =?UTF-8?q?=E9=98=B6=E6=AE=B5=E7=9A=84=E9=A2=84=E8=AE=BE=E8=A6=81=E6=94=AF?= =?UTF-8?q?=E6=8C=81=EF=BC=8Crunner=E7=BB=84=E7=9A=84=E6=8C=87=E5=AE=9A?= =?UTF-8?q?=E5=92=8C=E6=A0=87=E7=AD=BE=E7=9A=84=E6=8C=87=E5=AE=9A=20http:/?= =?UTF-8?q?/192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/?= =?UTF-8?q?939050947543042/1417233421533184?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/autoexec/detail/jobDetail/phase/runner-content.vue | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/views/pages/autoexec/detail/jobDetail/phase/runner-content.vue b/src/views/pages/autoexec/detail/jobDetail/phase/runner-content.vue index 72bbd62f..0df3353d 100644 --- a/src/views/pages/autoexec/detail/jobDetail/phase/runner-content.vue +++ b/src/views/pages/autoexec/detail/jobDetail/phase/runner-content.vue @@ -35,6 +35,10 @@ {{ $t('page.config') }}

{{ runnerData.port }}

+
+ {{ $t('page.config') }}{{ $t('page.source') }} +

{{ runnerData.phaseRunnerGroupFrom }}

+
@@ -151,6 +155,7 @@ export default { this.runnerData = {}; this.runnerData.name = res.Return.runnerVo.name; this.runnerData.port = res.Return.runnerVo.host + ':' + res.Return.runnerVo.port; + this.runnerData.phaseRunnerGroupFrom = res.Return.phaseRunnerGroupFrom; this.nodeData.status = res.Return.status; this.nodeData.warnCount = res.Return.warnCount; if (res.Return.status == 'pending' || res.Return.status == 'running') { -- Gitee From 889f3b8719529a59c891cf9fffd5f18c9b309059 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Wed, 21 May 2025 18:16:22 +0800 Subject: [PATCH 053/174] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20IT=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1-=E5=B0=86=E6=AD=A5=E9=AA=A4=E6=B5=81=E8=BD=AC?= =?UTF-8?q?=E6=97=B6=E6=8C=87=E6=B4=BE=E6=AD=A5=E9=AA=A4=E5=A4=84=E7=90=86?= =?UTF-8?q?=E4=BA=BA=E4=BF=A1=E6=81=AF=E6=B7=BB=E5=8A=A0=E5=88=B0=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E7=BA=BF=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1425218084503552]IT服务-将步骤流转时指派步骤处理人信息添加到时间线中 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1425218084503552 --- .../workorder/activity/item/assignworkerlist-handler.vue | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/views/pages/process/task/processdetail/workorder/activity/item/assignworkerlist-handler.vue b/src/views/pages/process/task/processdetail/workorder/activity/item/assignworkerlist-handler.vue index d55e041d..5bf2a5a5 100644 --- a/src/views/pages/process/task/processdetail/workorder/activity/item/assignworkerlist-handler.vue +++ b/src/views/pages/process/task/processdetail/workorder/activity/item/assignworkerlist-handler.vue @@ -55,6 +55,5 @@ export default { watch: {} }; - - - + -- Gitee From 29af715038aef1e13ec32a848ba0bff584cef261 Mon Sep 17 00:00:00 2001 From: dengbf Date: Wed, 21 May 2025 18:51:27 +0800 Subject: [PATCH 054/174] =?UTF-8?q?=E5=B1=8F=E8=94=BD=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E9=98=B6=E6=AE=B5=E8=AE=BE=E7=BD=AErunner=E7=BB=84=20=20-=20[?= =?UTF-8?q?=E5=85=B3=E8=81=94]=20#[1417233421533184]=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=8C=96-=E9=98=B6=E6=AE=B5=E7=9A=84=E9=A2=84=E8=AE=BE?= =?UTF-8?q?=E8=A6=81=E6=94=AF=E6=8C=81=EF=BC=8Crunner=E7=BB=84=E7=9A=84?= =?UTF-8?q?=E6=8C=87=E5=AE=9A=E5=92=8C=E6=A0=87=E7=AD=BE=E7=9A=84=E6=8C=87?= =?UTF-8?q?=E5=AE=9A=20http://192.168.0.96:8090/demo/rdm.html#/story-detai?= =?UTF-8?q?l/939050947543040/939050947543042/1417233421533184?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../application-config/pipeline/step/step-edit.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/views/pages/deploy/application-config/pipeline/step/step-edit.vue b/src/views/pages/deploy/application-config/pipeline/step/step-edit.vue index 8d63a638..3626be32 100644 --- a/src/views/pages/deploy/application-config/pipeline/step/step-edit.vue +++ b/src/views/pages/deploy/application-config/pipeline/step/step-edit.vue @@ -82,7 +82,7 @@ -
+
@@ -154,9 +154,9 @@ export default { TsFormSwitch: () => import('@/resources/plugins/TsForm/TsFormSwitch'), TargetDetail: () => import('@/views/pages/autoexec/components/common/addTarget/target-detail'), TargetValid: () => import('@/views/pages/autoexec/components/common/targetView/target-valid.vue'), - ExecuteuserSetting: () => import('@/views/pages/autoexec/detail/actionDetail/executeuser-setting.vue'), - RunnerGroupSetting: () => import('@/views/pages/autoexec/detail/actionDetail/runnergroup-setting.vue'), - RunnerGroupTagSetting: () => import('@/views/pages/autoexec/detail/actionDetail/runnergrouptag-setting.vue') + ExecuteuserSetting: () => import('@/views/pages/autoexec/detail/actionDetail/executeuser-setting.vue') + // RunnerGroupSetting: () => import('@/views/pages/autoexec/detail/actionDetail/runnergroup-setting.vue'), + // RunnerGroupTagSetting: () => import('@/views/pages/autoexec/detail/actionDetail/runnergrouptag-setting.vue') }, props: { canEdit: { -- Gitee From c1eefb0fdbbe97c5367d060e844ca81922f49849 Mon Sep 17 00:00:00 2001 From: yaojn Date: Thu, 22 May 2025 10:08:16 +0800 Subject: [PATCH 055/174] =?UTF-8?q?-=20[=E4=BF=AE=E5=A4=8D]=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E9=85=8D=E7=BD=AE=E5=AE=9A=E6=97=B6=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=EF=BC=8C=E5=B7=B2=E5=8A=A0=E8=BD=BD=E4=BD=9C=E4=B8=9A=E4=B8=8B?= =?UTF-8?q?=E6=8B=89=E6=A1=86=E6=B7=BB=E5=8A=A0border=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/pages/framework/schedule/job-memory.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/views/pages/framework/schedule/job-memory.vue b/src/views/pages/framework/schedule/job-memory.vue index 98fedd48..60c3784c 100644 --- a/src/views/pages/framework/schedule/job-memory.vue +++ b/src/views/pages/framework/schedule/job-memory.vue @@ -58,6 +58,7 @@ export default { valueName: 'value', search: true, transfer: true, + border: 'border', onChange: val => { this.changeJobGroupName(val); } @@ -74,6 +75,7 @@ export default { search: true, transfer: true, disabled: true, + border: 'border', onChange: val => { this.changeJobName(val); } -- Gitee From 0b24c635bc9d3a37a00e497cb8734e5ec91b4cbf Mon Sep 17 00:00:00 2001 From: dengbf Date: Thu, 22 May 2025 16:37:48 +0800 Subject: [PATCH 056/174] =?UTF-8?q?[=E5=85=B3=E8=81=94]=20#[14159593345843?= =?UTF-8?q?20]IT=E6=9C=8D=E5=8A=A1=E5=AE=9A=E5=88=B6=E8=A1=A8=E5=8D=95?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E6=A0=87=E7=AD=BE=E6=95=B0=E6=8D=AE=E8=83=BD?= =?UTF-8?q?=E8=A2=AB=E5=B8=B8=E8=A7=84=E9=85=8D=E7=BD=AE=E7=9A=84=E8=A1=A8?= =?UTF-8?q?=E5=8D=95=E7=BB=84=E4=BB=B6=E6=B6=88=E8=B4=B9=20http://192.168.?= =?UTF-8?q?0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947?= =?UTF-8?q?543042/1415959334584320?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/resources/plugins/TsSheet/form/component/formselect.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/resources/plugins/TsSheet/form/component/formselect.vue b/src/resources/plugins/TsSheet/form/component/formselect.vue index bf667509..e65a1c6c 100644 --- a/src/resources/plugins/TsSheet/form/component/formselect.vue +++ b/src/resources/plugins/TsSheet/form/component/formselect.vue @@ -118,7 +118,7 @@ export default { } return formItemList; }, - getFormCustomexend(formData) { + getFormCustomexend(formData) { // 自定义扩展 let list = []; let currentData = this.getFormData(formData); if (!this.$utils.isEmpty(this.extendConfigList)) { @@ -145,7 +145,7 @@ export default { } return list; }, - getTagDataList(formData) { + getTagDataList(formData) { //自定义标签扩展数据值 let list = this.getFormCustomexend(formData); let dataList = []; if (!this.$utils.isEmpty(list)) { -- Gitee From 738150194190bef57953cf247aebb9ee137b1466 Mon Sep 17 00:00:00 2001 From: dengbf Date: Thu, 22 May 2025 17:38:57 +0800 Subject: [PATCH 057/174] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E5=8C=96=E4=BD=9C=E4=B8=9A=E9=98=B6=E6=AE=B5-?= =?UTF-8?q?=E5=B7=A5=E5=85=B7native/IF-Block=E6=98=BE=E7=A4=BA=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/autoexec/detail/jobDetail/phase/node/node-detail.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/pages/autoexec/detail/jobDetail/phase/node/node-detail.vue b/src/views/pages/autoexec/detail/jobDetail/phase/node/node-detail.vue index 47948281..50c6e5ae 100644 --- a/src/views/pages/autoexec/detail/jobDetail/phase/node/node-detail.vue +++ b/src/views/pages/autoexec/detail/jobDetail/phase/node/node-detail.vue @@ -56,7 +56,7 @@
-
+
{{ $t('page.condition') }}
{{ step.condition }}
-- Gitee From 39f35b9bd6811d7de4bf948c893425d40b8bb171 Mon Sep 17 00:00:00 2001 From: yaojn Date: Mon, 26 May 2025 12:32:24 +0800 Subject: [PATCH 058/174] =?UTF-8?q?-=20[=E4=BF=AE=E5=A4=8D]=E5=9C=A8?= =?UTF-8?q?=E8=A1=A8=E5=8D=95=E4=B8=8B=E6=8B=89=E6=A1=86=E7=9A=84=E5=8F=AA?= =?UTF-8?q?=E8=AF=BB=E6=A8=A1=E5=BC=8F=E4=B8=AD=EF=BC=8C=E5=80=BC=E5=9B=9E?= =?UTF-8?q?=E6=98=BE=E5=AD=98=E5=9C=A8=E5=BC=82=E5=B8=B8=E6=83=85=E5=86=B5?= =?UTF-8?q?=E3=80=82=E5=88=A0=E9=99=A4=E5=80=BC=E5=90=8E=EF=BC=8C=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E4=BC=9A=E5=BE=AA=E7=8E=AF=E5=9B=9E=E6=98=BE=E5=B7=B2?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=9A=84=E5=80=BC=E3=80=82=20=20=20=20-=20[?= =?UTF-8?q?=E5=85=B3=E8=81=94]#[1429633537376256]=E5=9C=A8=E8=A1=A8?= =?UTF-8?q?=E5=8D=95=E4=B8=8B=E6=8B=89=E6=A1=86=E7=9A=84=E5=8F=AA=E8=AF=BB?= =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E4=B8=AD=EF=BC=8C=E5=80=BC=E5=9B=9E=E6=98=BE?= =?UTF-8?q?=E5=AD=98=E5=9C=A8=E5=BC=82=E5=B8=B8=E6=83=85=E5=86=B5=E3=80=82?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=80=BC=E5=90=8E=EF=BC=8C=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E4=BC=9A=E5=BE=AA=E7=8E=AF=E5=9B=9E=E6=98=BE=E5=B7=B2=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E7=9A=84=E5=80=BC=E3=80=82=20http://192.168.0.96:8090?= =?UTF-8?q?/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1429?= =?UTF-8?q?633537376256?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/resources/mixins/formMixins.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/resources/mixins/formMixins.js b/src/resources/mixins/formMixins.js index f2433ffa..c00deb1a 100644 --- a/src/resources/mixins/formMixins.js +++ b/src/resources/mixins/formMixins.js @@ -287,8 +287,8 @@ export default { }; }, handleHistoryValue() { - let selectedList = []; return historyData => { + let selectedList = []; let historyValueList = Array.isArray(historyData) ? historyData : [historyData]; historyValueList.forEach(item => { if (!this.$utils.isEmpty(item)) { -- Gitee From 48429076d614a7d80038e42f9839bfebc3e215ad Mon Sep 17 00:00:00 2001 From: dengbf Date: Mon, 26 May 2025 18:53:40 +0800 Subject: [PATCH 059/174] =?UTF-8?q?-=20[=E5=85=B3=E8=81=94]=20#[1429797576?= =?UTF-8?q?605696]=E8=A1=A8=E6=A0=BC=E8=BE=93=E5=85=A5=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=94=A8=E6=88=B7=E9=80=89=E6=8B=A9=E5=B1=9E?= =?UTF-8?q?=E6=80=A7=20http://192.168.0.96:8090/demo/rdm.html#/story-detai?= =?UTF-8?q?l/939050947543040/939050947543042/1429797576605696?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../formtableinputer-attr-config-dialog.vue | 40 ++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/src/resources/plugins/TsSheet/form/config/formtableinputer-conf/formtableinputer-attr-config-dialog.vue b/src/resources/plugins/TsSheet/form/config/formtableinputer-conf/formtableinputer-attr-config-dialog.vue index 67859758..5bd6efdb 100644 --- a/src/resources/plugins/TsSheet/form/config/formtableinputer-conf/formtableinputer-attr-config-dialog.vue +++ b/src/resources/plugins/TsSheet/form/config/formtableinputer-conf/formtableinputer-attr-config-dialog.vue @@ -338,6 +338,28 @@ > +