From e34a6f44427261aa4daa5294a2b799e7bc5c419c Mon Sep 17 00:00:00 2001 From: chenqw Date: Mon, 17 Nov 2025 16:23:36 +0800 Subject: [PATCH 01/12] adjust --- src/resources/assets/languages/term/en.json | 3 ++- src/resources/assets/languages/term/zh.json | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/resources/assets/languages/term/en.json b/src/resources/assets/languages/term/en.json index b4819605c..7c5dfe883 100644 --- a/src/resources/assets/languages/term/en.json +++ b/src/resources/assets/languages/term/en.json @@ -2907,7 +2907,8 @@ "similarrate": "similarity", "comparecount": "Compare data volume", "samplecount": "sample size", - "generatecode": "generate code" + "generatecode": "generate code", + "open": "open" }, "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 \\)" diff --git a/src/resources/assets/languages/term/zh.json b/src/resources/assets/languages/term/zh.json index 8243c725e..15e14227b 100644 --- a/src/resources/assets/languages/term/zh.json +++ b/src/resources/assets/languages/term/zh.json @@ -2907,7 +2907,8 @@ "similarrate": "相似度", "comparecount": "比较数据量", "samplecount": "样本数", - "generatecode": "生成代码" + "generatecode": "生成代码", + "open": "打开" }, "informant": { "last5dump": "最近5次快照", -- Gitee From 9793cb2609d412a125924048cebf44578ddd8628 Mon Sep 17 00:00:00 2001 From: chenqw Date: Thu, 20 Nov 2025 15:12:41 +0800 Subject: [PATCH 02/12] adjust --- .../framework/schedule/job-edit-dialog.vue | 43 ++++++++++--------- 1 file changed, 23 insertions(+), 20 deletions(-) diff --git a/src/views/pages/framework/schedule/job-edit-dialog.vue b/src/views/pages/framework/schedule/job-edit-dialog.vue index 40f2a4847..414a77d19 100644 --- a/src/views/pages/framework/schedule/job-edit-dialog.vue +++ b/src/views/pages/framework/schedule/job-edit-dialog.vue @@ -14,11 +14,6 @@ labelPosition="right" > - @@ -98,7 +89,7 @@ export default { isSaving: false, dialogConfig: { type: 'modal', - title: this.jobUuid && this.isCopy ? this.$t('page.copy') : this.jobUuid && !this.isCopy ? this.$t('page.edit') : this.$t('page.add'), + title: (this.jobUuid && this.isCopy ? this.$t('page.copy') : this.jobUuid && !this.isCopy ? this.$t('page.edit') : this.$t('page.add')) + this.$t('term.autoexec.job'), maskClose: false, isShow: true, width: 'medium' @@ -143,6 +134,7 @@ export default { value: '', defaultValue: '', //默认值 maxlength: 20, + transfer: true, label: this.$t('term.autoexec.jobmodule'), validateList: ['required'], url: '/api/rest/job/class/search', //通过url获取数据 @@ -253,7 +245,18 @@ export default { }, save() { var form = this.$refs.mainForm; - if (form.valid()) { + let isValid = true; + this.propList.forEach((d, index) => { + const propValue = this.$refs['propValue_' + index]; + if (propValue && !propValue.valid()) { + isValid = false; + } + }); + + if (!form.valid()) { + isValid = false; + } + if (isValid) { let data = form.getFormValue(); data.propList = []; this.propList && -- Gitee From d5089a127e85d58358e99f212eeeec5ffed47a2a Mon Sep 17 00:00:00 2001 From: yaojn Date: Fri, 21 Nov 2025 10:22:03 +0800 Subject: [PATCH 03/12] =?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=A5URL=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=E6=93=8D=E4=BD=9C=E5=A4=9A=E6=AC=A1=E6=8F=90=E7=A4=BA?= =?UTF-8?q?bug=20=20=20-=20[=E5=85=B3=E8=81=94]#[1547224079630336]?= =?UTF-8?q?=E8=A1=A8=E5=8D=95=E8=A1=A8=E6=A0=BC=E8=BE=93=E5=85=A5URL?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E6=93=8D=E4=BD=9C=E5=A4=9A=E6=AC=A1=E6=8F=90?= =?UTF-8?q?=E7=A4=BAbug=20http://192.168.0.96:8090/demo/rdm.html#/bug-deta?= =?UTF-8?q?il/939050947543040/939050947543057/1547224079630336?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/resources/plugins/TsForm/TsFormInput.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/resources/plugins/TsForm/TsFormInput.vue b/src/resources/plugins/TsForm/TsFormInput.vue index 570cc170f..2c302bd9f 100755 --- a/src/resources/plugins/TsForm/TsFormInput.vue +++ b/src/resources/plugins/TsForm/TsFormInput.vue @@ -232,7 +232,10 @@ export default { this.$emit('on-clear'); }, onBlurValue: function() { - const value = typeof this.currentValue === 'string' ? this.currentValue.trim() : this.currentValue; + if (typeof this.currentValue === 'string') { + this.currentValue = this.currentValue.trim(); // 去除首尾空格；否则由于前后值一致不会触发 watch，this.currentValue 的空格无法更新，最终导致校验失败。 + } + const value = this.currentValue; typeof this.onBlur == 'function' && this.onBlur(value); this.$emit('on-blur', value); if (this.currentValidList.length > 0 && this.canValid('blur', this.currentValidList)) { -- Gitee From 2ac08bbcc99caac6d03e548dbc0b04dddcac3d28 Mon Sep 17 00:00:00 2001 From: dengbf Date: Fri, 21 Nov 2025 18:42:57 +0800 Subject: [PATCH 04/12] =?UTF-8?q?-=20[=E5=85=B3=E8=81=94]=20#[155935239618?= =?UTF-8?q?5600]=E8=A1=A8=E5=8D=95=E4=B8=8B=E6=8B=89=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E8=B0=83=E6=95=B4=20http://192.168.0.96:8090?= =?UTF-8?q?/demo/rdm.html#/story-detail/939050947543040/939050947543042/15?= =?UTF-8?q?59352396185600?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/resources/assets/languages/page/en.json | 3 +- src/resources/assets/languages/page/zh.json | 3 +- src/resources/plugins/TsForm/TsFormSelect.md | 6 +- src/resources/plugins/TsForm/TsFormSelect.vue | 45 ++++++++++++++- .../TsSheet/form/component/formselect.vue | 2 + .../TsSheet/form/config/formselect-conf.vue | 30 ++++++++++ .../formtableinputer-attr-config-dialog.vue | 55 ++++++++++++++----- 7 files changed, 125 insertions(+), 19 deletions(-) diff --git a/src/resources/assets/languages/page/en.json b/src/resources/assets/languages/page/en.json index 74d6ce9ca..d83908c60 100644 --- a/src/resources/assets/languages/page/en.json +++ b/src/resources/assets/languages/page/en.json @@ -1085,5 +1085,6 @@ "datachange": "data conversion", "childmenucount": "Number of submenus", "systemmenuauth": "System menu permissions", - "defaulthomepage": "default page" + "defaulthomepage": "default page", + "selectalltip": "Support full selection of current data in multiple selection mode" } \ 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 858142719..f655a73a8 100644 --- a/src/resources/assets/languages/page/zh.json +++ b/src/resources/assets/languages/page/zh.json @@ -1087,5 +1087,6 @@ "datachange": "数据转换", "childmenucount": "子菜单数量", "systemmenuauth": "系统菜单权限", - "defaulthomepage": "默认首页" + "defaulthomepage": "默认首页", + "selectalltip": "多选模式下支持当前数据全选" } \ No newline at end of file diff --git a/src/resources/plugins/TsForm/TsFormSelect.md b/src/resources/plugins/TsForm/TsFormSelect.md index ad369fb91..30b009e33 100644 --- a/src/resources/plugins/TsForm/TsFormSelect.md +++ b/src/resources/plugins/TsForm/TsFormSelect.md @@ -88,8 +88,10 @@ needCallback|Boolean|false|否|是否搜索需要回调，主要用于实时搜 forbidContent|String,Array||否|禁止输入的字符串，主要用于通过allowCreate来创建选项时，主要是为了防止xss攻击 一般情况下面值为 ['<', '>', '"', "'", '&'] 或者 '<>&'|生效条件 search 时 firstSelect|Boolean|true|否|必填且下拉列表只有一个时，是否选中下拉列表的唯一项|- nowrapHead|Boolean|false|否|当出现多选的时候，不换行显示，如果数据过多时则显示不全,通过滚动条来查看数据|- -dropdownMenuMaxWidth|String,Boolean|false|下拉列表最大宽度 - +dropdownMenuMaxWidth|String,Boolean|false|否|下拉列表最大宽度 +pageSize|Number|20|否|dynamicUrl模式下，设置返回数据的条数 +isCanAll|Boolean|false|否|多选模式下支持当前数据全选 +allText|String|全选|否|多选时，全选文字 2021-11-09 新加方法 参数名|数据类型|默认值|必传|用途|说明 diff --git a/src/resources/plugins/TsForm/TsFormSelect.vue b/src/resources/plugins/TsForm/TsFormSelect.vue index aeff8e6e7..39c8e7bcd 100755 --- a/src/resources/plugins/TsForm/TsFormSelect.vue +++ b/src/resources/plugins/TsForm/TsFormSelect.vue @@ -114,6 +114,11 @@ {{ addItem[showName ? showName : textName] }} +
  • {{ allText }}
    • +
  • {{ allText }}
    • { @@ -1412,6 +1439,22 @@ export default { this.$utils.equalStr(arr, str) && (index = 0); } return index; + }, + selectAll() { + // 全选 + let value = []; + this.nodeList.forEach(item => { + if (item && item._disabled || !item) { + return; + } else { + value.push(item[this.valueName]); + } + }); + this.selectedList = this.nodeList.filter(item => !item._disabled && item); + this.currentValue = value; + this.searchKeyWord = ''; + this.onChangeValue(); + this.scrollTop(); } }, computed: { diff --git a/src/resources/plugins/TsSheet/form/component/formselect.vue b/src/resources/plugins/TsSheet/form/component/formselect.vue index f75f19f33..235001c1a 100644 --- a/src/resources/plugins/TsSheet/form/component/formselect.vue +++ b/src/resources/plugins/TsSheet/form/component/formselect.vue @@ -232,6 +232,8 @@ export default { setting.placeholder = this.config.placeholder; setting.sperateText = this.config.sperateText || '、'; setting.isAutoSelectdOnlyValue = this.config.isAutoSelectdOnlyValue || false; + setting.isCanAll = this.config.isCanAll || false; + setting.pageSize = this.config.pageSize || 20; if (this.config.dataSource === 'matrix') { setting.dynamicUrl = '/api/rest/matrix/column/data/search/forselect'; setting.rootName = 'dataList'; diff --git a/src/resources/plugins/TsSheet/form/config/formselect-conf.vue b/src/resources/plugins/TsSheet/form/config/formselect-conf.vue index b8a3da7e4..bd0cbbefe 100644 --- a/src/resources/plugins/TsSheet/form/config/formselect-conf.vue +++ b/src/resources/plugins/TsSheet/form/config/formselect-conf.vue @@ -8,6 +8,22 @@ :disabled="disabled" > + + + + + +
    @@ -268,6 +297,7 @@ export default { this.$set(this.config, 'sourceColumnList', []); this.$set(this.config, 'hiddenFieldList', []); this.$set(this.config, 'defaultValue', null); + this.$set(this.config, 'pageSize', 20); if (!this.$utils.isEmpty(this.formItem.reaction)) { Object.keys(this.formItem.reaction).forEach(key => { this.$set(this.formItem.reaction, key, {}); 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 48cdf651a..00b2545b0 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 @@ -93,20 +93,34 @@ - - - + + + +
    @@ -920,6 +946,7 @@ export default { this.$set(this.propertyLocal.config, 'matrixUuid', null); this.$set(this.propertyLocal.config, 'formtableinputerUuid', null); this.$set(this.propertyLocal.config, 'mapping', {}); + this.$set(this.propertyLocal.config, 'pageSize', 20); this.$delete(this.propertyLocal.reaction, 'filter'); this.isReady = false; this.$nextTick(() => { -- Gitee From 4f299921554c02edf23bdc557a43c9b6fbcd9da8 Mon Sep 17 00:00:00 2001 From: linbangquan <1437892690@qq.com> Date: Sat, 22 Nov 2025 01:11:37 +0000 Subject: [PATCH 05/12] =?UTF-8?q?!1249=20[=E4=BF=AE=E5=A4=8D]=20=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=E8=A1=A8=E6=A0=BC=E5=8D=95=E5=85=83=E6=A0=BC=E5=86=85?= =?UTF-8?q?=E5=AE=B9=E5=AD=98=E5=9C=A8html=E6=A0=87=E7=AD=BE=E6=97=B6?= =?UTF-8?q?=E9=9C=80=E8=A6=81=E8=BD=AC=E4=B9=89=20*=20[=E4=BF=AE=E5=A4=8D]?= =?UTF-8?q?=20=E6=8A=A5=E8=A1=A8=E8=A1=A8=E6=A0=BC=E5=8D=95=E5=85=83?= =?UTF-8?q?=E6=A0=BC=E5=86=85=E5=AE=B9=E5=AD=98=E5=9C=A8html=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E6=97=B6=E9=9C=80=E8=A6=81=E8=BD=AC=E4=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/pages/report/report/content-help.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/pages/report/report/content-help.vue b/src/views/pages/report/report/content-help.vue index ac17641c8..bb0d898ee 100644 --- a/src/views/pages/report/report/content-help.vue +++ b/src/views/pages/report/report/content-help.vue @@ -158,7 +158,7 @@ export default { return { isHelpShow: false, table: { - config: `{\n "data":"dataList",\n "title":"${this.$t('page.title')}",\n "header":${this.$t('term.report.describe.headerdescribe')},\n "column":${this.$t('term.report.describe.columndescribe')},\n "pageSize":20,\n "needPage":true\n}` + config: `{\n "data":"dataList",\n "title":"${this.$t('page.title')}",\n "header":${this.$t('term.report.describe.headerdescribe')},\n "column":${this.$t('term.report.describe.columndescribe')},\n "disableXss":0,\n "pageSize":20,\n "needPage":true\n}` }, barHelp: { data: '\n' + ' \n' + ' \n' + ' \n' + '', -- Gitee From 75dfef9e217238f127a6fd8d33be551a5e8c5855 Mon Sep 17 00:00:00 2001 From: dengbf Date: Mon, 24 Nov 2025 12:11:09 +0800 Subject: [PATCH 06/12] =?UTF-8?q?-=20[=E5=85=B3=E8=81=94]=20#[155935239618?= =?UTF-8?q?5600]=E8=A1=A8=E5=8D=95=E4=B8=8B=E6=8B=89=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E8=B0=83=E6=95=B4=20http://192.168.0.96:8090?= =?UTF-8?q?/demo/rdm.html#/story-detail/939050947543040/939050947543042/15?= =?UTF-8?q?59352396185600?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/resources/plugins/TsSheet/form/config/formselect-conf.vue | 2 +- .../formtableinputer-attr-config-dialog.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/resources/plugins/TsSheet/form/config/formselect-conf.vue b/src/resources/plugins/TsSheet/form/config/formselect-conf.vue index bd0cbbefe..0641d3b23 100644 --- a/src/resources/plugins/TsSheet/form/config/formselect-conf.vue +++ b/src/resources/plugins/TsSheet/form/config/formselect-conf.vue @@ -165,7 +165,7 @@ :disabled="disabled" > - + - + Date: Mon, 24 Nov 2025 13:50:22 +0800 Subject: [PATCH 07/12] adjust --- src/views/pages/framework/api/api-manage-test.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/views/pages/framework/api/api-manage-test.vue b/src/views/pages/framework/api/api-manage-test.vue index 2c5054e4e..9c40e2af8 100644 --- a/src/views/pages/framework/api/api-manage-test.vue +++ b/src/views/pages/framework/api/api-manage-test.vue @@ -138,8 +138,9 @@ export default { error: '', inputColumns: Object.freeze([ { title: this.$t('page.name'), key: 'name' }, - { title: this.$t('page.explain'), key: 'description' }, + { title: this.$t('page.description'), key: 'description' }, { title: this.$t('page.type'), key: 'type' }, + { title: this.$t('page.rule'), key: 'rule' }, { title: this.$t('page.isrequired'), key: 'isRequired', width: 100, render: (h, params) => { if (params.row.isRequired) { return h('div', {class: 'text-success'}, this.$t('page.yes')); @@ -147,7 +148,7 @@ export default { return h('div', {class: 'text-grey'}, this.$t('page.no')); } } }, - { title: this.$t('page.help'), key: 'help' }, + { title: this.$t('page.explain'), key: 'help' }, { title: this.$t('page.insert'), key: 'input', slot: 'input' } ]), outputColumns: Object.freeze([ -- Gitee From 3d13f6cd87b3cdcdba6b0f10d37570206bc6cb7b Mon Sep 17 00:00:00 2001 From: dengbf Date: Mon, 24 Nov 2025 15:18:58 +0800 Subject: [PATCH 08/12] =?UTF-8?q?-=20[=E5=85=B3=E8=81=94]=20#[155935239618?= =?UTF-8?q?5600]=E8=A1=A8=E5=8D=95=E4=B8=8B=E6=8B=89=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E8=B0=83=E6=95=B4=20http://192.168.0.96:8090?= =?UTF-8?q?/demo/rdm.html#/story-detail/939050947543040/939050947543042/15?= =?UTF-8?q?59352396185600?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/resources/assets/languages/page/en.json | 3 ++- src/resources/assets/languages/page/zh.json | 3 ++- src/resources/plugins/TsSheet/form/config/formselect-conf.vue | 2 +- .../formtableinputer-attr-config-dialog.vue | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/resources/assets/languages/page/en.json b/src/resources/assets/languages/page/en.json index d83908c60..a2e86bb26 100644 --- a/src/resources/assets/languages/page/en.json +++ b/src/resources/assets/languages/page/en.json @@ -1086,5 +1086,6 @@ "childmenucount": "Number of submenus", "systemmenuauth": "System menu permissions", "defaulthomepage": "default page", - "selectalltip": "Support full selection of current data in multiple selection mode" + "selectalltip": "Support full selection of current data in multiple selection mode", + "pagesizedes": "Quantity limit: 10-500 pieces" } \ 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 f655a73a8..f64605a60 100644 --- a/src/resources/assets/languages/page/zh.json +++ b/src/resources/assets/languages/page/zh.json @@ -1088,5 +1088,6 @@ "childmenucount": "子菜单数量", "systemmenuauth": "系统菜单权限", "defaulthomepage": "默认首页", - "selectalltip": "多选模式下支持当前数据全选" + "selectalltip": "多选模式下支持当前数据全选", + "pagesizedes": "数量限制：10-500条" } \ No newline at end of file diff --git a/src/resources/plugins/TsSheet/form/config/formselect-conf.vue b/src/resources/plugins/TsSheet/form/config/formselect-conf.vue index 0641d3b23..1e6e51704 100644 --- a/src/resources/plugins/TsSheet/form/config/formselect-conf.vue +++ b/src/resources/plugins/TsSheet/form/config/formselect-conf.vue @@ -165,7 +165,7 @@ :disabled="disabled" > - + - + Date: Tue, 25 Nov 2025 10:40:40 +0800 Subject: [PATCH 09/12] =?UTF-8?q?-=20[=E4=BF=AE=E5=A4=8D]=20=E8=8F=9C?= =?UTF-8?q?=E5=8D=95=E7=AE=A1=E7=90=86-=E7=9B=AE=E5=BD=95=E5=92=8C?= =?UTF-8?q?=E8=8F=9C=E5=8D=95=E9=83=BD=E6=8E=88=E6=9D=83=E7=BB=99=E6=89=80?= =?UTF-8?q?=E6=9C=89=E4=BA=BA=EF=BC=8C=E4=BD=86=E6=98=AF=E6=99=AE=E9=80=9A?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=AE=BF=E9=97=AE=E6=97=B6=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E7=8E=B0=E5=AE=9E=E8=8F=9C=E5=8D=95=E5=85=A5=E5=8F=A3=20=20=20?= =?UTF-8?q?-=20[=E5=85=B3=E8=81=94]=20#[1562202039877635]=E8=8F=9C?= =?UTF-8?q?=E5=8D=95=E7=AE=A1=E7=90=86-=E7=9B=AE=E5=BD=95=E5=92=8C?= =?UTF-8?q?=E8=8F=9C=E5=8D=95=E9=83=BD=E6=8E=88=E6=9D=83=E7=BB=99=E6=89=80?= =?UTF-8?q?=E6=9C=89=E4=BA=BA=EF=BC=8C=E4=BD=86=E6=98=AF=E6=99=AE=E9=80=9A?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=AE=BF=E9=97=AE=E6=97=B6=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E7=8E=B0=E5=AE=9E=E8=8F=9C=E5=8D=95=E5=85=A5=E5=8F=A3=20http:/?= =?UTF-8?q?/192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/93?= =?UTF-8?q?9050947543057/1562202039877635?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/components/topnav/topnav-menu.vue | 36 ++++++++------------- 1 file changed, 14 insertions(+), 22 deletions(-) diff --git a/src/views/components/topnav/topnav-menu.vue b/src/views/components/topnav/topnav-menu.vue index 0a9ce5d24..64307e6e2 100644 --- a/src/views/components/topnav/topnav-menu.vue +++ b/src/views/components/topnav/topnav-menu.vue @@ -75,7 +75,8 @@ export default { selectedExtraMenuList: [] // 已选的额外菜单列表。用于在点击跳转后重置选中状态，防止第二次点击无效。 }; }, - created() { + async created() { + await this.initExtramenu(); //检测hash变化，用于framework.html切换hash window.addEventListener('hashchange', this.onHashChange); //如果从别的页面进来，使用此方法检测 @@ -254,17 +255,19 @@ export default { }; }, initExtramenu() { - this.$api.framework && - this.$api.framework.extramenu - .getMenuList() - .then(res => { - this.extramenuList = res.Return; - }) - .finally(() => { - this.$nextTick(() => { - this.$store.commit('setExtramenu', false); - }); + if (!this.$api.framework) { + return; + } + return this.$api.framework.extramenu + .getMenuList() + .then(res => { + this.extramenuList = res.Return; + }) + .finally(() => { + this.$nextTick(() => { + this.$store.commit('setExtramenu', false); }); + }); } }, computed: { @@ -283,9 +286,6 @@ export default { return groupList; }; }, - isHasExtramenu() { - return this.$AuthUtils.hasRole('EXTRA_MENU_MODIFY'); - }, isUpdateExtramenu() { return this.$store.state.isUpdateExtramenu; }, @@ -296,14 +296,6 @@ export default { } }, watch: { - isHasExtramenu: { - handler(val) { - if (val) { - this.initExtramenu(); - } - }, - immediate: true - }, isUpdateExtramenu: { handler(val) { if (val) { -- Gitee From 92407ecc3b14df948f63ab446c9c1995d3891c5c Mon Sep 17 00:00:00 2001 From: dengbf Date: Wed, 26 Nov 2025 16:38:48 +0800 Subject: [PATCH 10/12] =?UTF-8?q?-=20[=E5=85=B3=E8=81=94]=20#[156309386634?= =?UTF-8?q?8550]=E6=B2=A1=E6=9C=89=E7=9F=A5=E8=AF=86=E5=BA=93=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=EF=BC=8CITSM=E5=B1=8F=E8=94=BD=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E5=86=85=E5=AE=B9=20http://192.168.0.96:8090/demo/rdm.html#/st?= =?UTF-8?q?ory-detail/939050947543040/939050947543042/1563093866348550?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../process/task/processdispatch/dispatch-common.vue | 2 +- .../task/processdispatch/workorder/base-setting.vue | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/views/pages/process/task/processdispatch/dispatch-common.vue b/src/views/pages/process/task/processdispatch/dispatch-common.vue index 988d67112..92a626043 100644 --- a/src/views/pages/process/task/processdispatch/dispatch-common.vue +++ b/src/views/pages/process/task/processdispatch/dispatch-common.vue @@ -236,7 +236,7 @@ export default { return validList; }, knowledgeSearch() { - this.$refs.baseSetting.knowledgeSearch(this.dispatchTitle); + this.$refs.baseSetting && this.$refs.baseSetting.knowledgeSearch(this.dispatchTitle); }, updateFormWidth() { if (this.$refs.formSetting && this.$refs.formSetting.$el && this.$refs.formSetting.$el.__vue__.$refs.formSheet) { diff --git a/src/views/pages/process/task/processdispatch/workorder/base-setting.vue b/src/views/pages/process/task/processdispatch/workorder/base-setting.vue index deb3c612c..16aa76d4f 100644 --- a/src/views/pages/process/task/processdispatch/workorder/base-setting.vue +++ b/src/views/pages/process/task/processdispatch/workorder/base-setting.vue @@ -1,6 +1,6 @@