From 1c243e4925c6a90bcac6d87d557b98add59078b8 Mon Sep 17 00:00:00 2001 From: v_xugzhou <941071842@qq.com> Date: Fri, 3 Jan 2025 11:34:58 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E5=85=AC=E5=85=B1=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E5=88=9B=E5=BB=BA=E5=91=A8=E6=9C=9F=E4=BB=BB=E5=8A=A1=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E6=B2=A1=E6=9C=89=E6=9D=83=E9=99=90=20=20--story=3D13?= =?UTF-8?q?6521403?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PeriodicList/ModifyPeriodicDialog.vue | 24 +++++++++---------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/frontend/desktop/src/pages/task/PeriodicList/ModifyPeriodicDialog.vue b/frontend/desktop/src/pages/task/PeriodicList/ModifyPeriodicDialog.vue index fbdbe7efd..726d401a9 100644 --- a/frontend/desktop/src/pages/task/PeriodicList/ModifyPeriodicDialog.vue +++ b/frontend/desktop/src/pages/task/PeriodicList/ModifyPeriodicDialog.vue @@ -96,12 +96,12 @@

{{ option.name }}

@@ -219,8 +219,8 @@ :loading="saveLoading" :disabled="isLoading || previewDataLoading" data-test-id="periodicEdit_form_saveBtn" - :class="{ 'btn-permission-disable': hasNoPermission.create }" - v-cursor="{ active: hasNoPermission.create }" + :class="{ 'btn-permission-disable': hasNoCreatePerm }" + v-cursor="{ active: hasNoCreatePerm }" @click="onPeriodicConfirm"> {{ isEdit ? $t('保存') : $t('提交') }} @@ -411,17 +411,13 @@ const nodes = Object.values(activities).map(item => item.name) return nodes.join(',') }, - hasNoPermission () { + hasNoCreatePerm () { const { id, auth_actions } = this.templateData if (this.isEdit || !id) { - return { view: false, create: false } - } - - return { - view: !auth_actions.includes(this.flowPermission.view), - create: !auth_actions.includes(this.flowPermission.create) + return false } + return !auth_actions.includes(this.flowPermission.create) }, schemeSelectPlaceholder () { return this.formData.template_id && !this.schemeList.length ? i18n.t('此流程无执行方案，无需选择') : i18n.t('请选择') @@ -500,7 +496,7 @@ } }, onTempSelect (applyPerm = [], selectInfo) { - if (this.hasNoPermission.view) { + if (!this.hasPermission(applyPerm, selectInfo.auth_actions)) { const permissionData = { project: [{ id: this.project_id, @@ -528,12 +524,14 @@ onClearTemplate () { this.formData.schemeId = [] this.schemeList = [] + this.templateData = {} this.periodicConstants = {} }, onFlowTypeChange () { this.templateLoading = true this.formData.template_id = '' this.formData.name = '' + this.formData.task_template_name = '' this.onClearTemplate() this.handleTplSearch() }, @@ -793,7 +791,7 @@ }, // 周期任务保存 onPeriodicConfirm () { - if (this.hasNoPermission.create) { + if (this.hasNoCreatePerm) { const { id, name, auth_actions } = this.templateData const resourceData = { [this.isCommon ? 'common_flow' : 'flow']: [{ id, name }], From 9b7fa474f30511c30c17f15fcaff1f4fdd0fc19b Mon Sep 17 00:00:00 2001 From: v_xugzhou <941071842@qq.com> Date: Fri, 3 Jan 2025 11:37:45 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E5=85=B1=E4=BA=AB=E5=88=B0=E5=95=86?= =?UTF-8?q?=E5=BA=97=E4=BE=A7=E6=A0=8F=E6=A0=87=E7=AD=BE=E6=96=87=E6=A1=88?= =?UTF-8?q?=E4=BC=98=E5=8C=96=20--story=3D136520635?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/desktop/src/config/i18n/cn.js | 1 + frontend/desktop/src/config/i18n/en.js | 1 + .../template/TemplateList/SharedTemplate/SharedTplSlider.vue | 5 ++--- .../src/pages/template/TemplateList/projectTplList.vue | 1 + 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/frontend/desktop/src/config/i18n/cn.js b/frontend/desktop/src/config/i18n/cn.js index b5b6f76c7..4e7b97fe6 100644 --- a/frontend/desktop/src/config/i18n/cn.js +++ b/frontend/desktop/src/config/i18n/cn.js @@ -1812,6 +1812,7 @@ const cn = { '场景名称': '场景名称', '场景标识': '场景标识', '场景分类': '场景分类', + '场景标签': '场景标签', '风险级别': '风险级别', '使用说明': '使用说明', '高': '高', diff --git a/frontend/desktop/src/config/i18n/en.js b/frontend/desktop/src/config/i18n/en.js index bd9d1e239..c2543aadb 100644 --- a/frontend/desktop/src/config/i18n/en.js +++ b/frontend/desktop/src/config/i18n/en.js @@ -1846,6 +1846,7 @@ const en = { '场景名称': 'Scene Name', '场景标识': 'Scene Identifier', '场景分类': 'Scene Category', + '场景标签': 'Scene Labels', '风险级别': 'Risk Level', '使用说明': 'Instructions', '高': 'High', diff --git a/frontend/desktop/src/pages/template/TemplateList/SharedTemplate/SharedTplSlider.vue b/frontend/desktop/src/pages/template/TemplateList/SharedTemplate/SharedTplSlider.vue index 4b6ecd058..97c5221b7 100644 --- a/frontend/desktop/src/pages/template/TemplateList/SharedTemplate/SharedTplSlider.vue +++ b/frontend/desktop/src/pages/template/TemplateList/SharedTemplate/SharedTplSlider.vue @@ -75,7 +75,7 @@ :form-data="formData"> - + item.id === val) || {} - const { risk_level: riskLevel, usage_content: content } = selectInfo + const { usage_content: content } = selectInfo Object.assign(this.formData, selectInfo, { - risk_level: String(riskLevel), usage_content: { content } }) }, diff --git a/frontend/desktop/src/pages/template/TemplateList/projectTplList.vue b/frontend/desktop/src/pages/template/TemplateList/projectTplList.vue index 2a29e76db..46fa9eba4 100644 --- a/frontend/desktop/src/pages/template/TemplateList/projectTplList.vue +++ b/frontend/desktop/src/pages/template/TemplateList/projectTplList.vue @@ -1723,6 +1723,7 @@ min-width: 88px; text-align: center; font-size: 14px; + color: #63656e; background: #ffffff; border: 1px solid #c4c6cc; border-radius: 3px; From fe2644383b51e79f6fc6098b28e2ebd5647f904b Mon Sep 17 00:00:00 2001 From: v_xugzhou <941071842@qq.com> Date: Fri, 3 Jan 2025 14:23:17 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E8=BD=BB=E5=BA=94=E7=94=A8=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E9=80=89=E6=8B=A9=E6=89=A7=E8=A1=8C=E6=96=B9=E6=A1=88?= =?UTF-8?q?=E5=90=8E=E4=B8=8D=E7=94=9F=E6=95=88=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=20--story=3D136521791=20#=20Reviewed,=20transaction?= =?UTF-8?q?=20id:=2028351?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/desktop/src/pages/appmaker/AppEditDialog.vue | 1 + frontend/desktop/src/pages/task/TaskCreate/TaskSelectNode.vue | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/desktop/src/pages/appmaker/AppEditDialog.vue b/frontend/desktop/src/pages/appmaker/AppEditDialog.vue index d42e7e1e0..42096f55d 100644 --- a/frontend/desktop/src/pages/appmaker/AppEditDialog.vue +++ b/frontend/desktop/src/pages/appmaker/AppEditDialog.vue @@ -100,6 +100,7 @@ :placeholder="$t('请选择')" :clearable="true" :is-loading="schemeLoading" + :key="schemeLoading" @selected="onSelectScheme">