fix: 公共流程创建周期任务提示没有权限 && 轻应用编辑选择执行方案后不生效问题修复

frontend/desktop/src/config/i18n/cn.js

@@ -1812,6 +1812,7 @@ const cn = {
     '场景名称': '场景名称',
     '场景标识': '场景标识',
     '场景分类': '场景分类',
+    '场景标签': '场景标签',
     '风险级别': '风险级别',
     '使用说明': '使用说明',
     '高': '高',

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',

frontend/desktop/src/pages/appmaker/AppEditDialog.vue

@@ -100,6 +100,7 @@
                         :placeholder="$t('请选择')"
                         :clearable="true"
                         :is-loading="schemeLoading"
+                        :key="schemeLoading"
                         @selected="onSelectScheme">
                         <bk-option
                             v-for="(option, index) in schemeList"

frontend/desktop/src/pages/task/PeriodicList/ModifyPeriodicDialog.vue

@@ -96,12 +96,12 @@
                                 <bk-option
                                     v-for="option in templateList"
                                     :key="option.id"
-                                    :disabled="hasNoPermission.view"
+                                    :disabled="!hasPermission([flowPermission.view], option.auth_actions)"
                                     :id="option.id"
                                     :name="option.name">
                                     <p
                                         :title="option.name"
-                                        v-cursor="{ active: hasNoPermission.view }"
+                                        v-cursor="{ active: !hasPermission([flowPermission.view], option.auth_actions) }"
                                         @click="onTempSelect([flowPermission.view], option)">
                                         {{ option.name }}
                                     </p>
@@ -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('提交') }}
                     </bk-button>
@@ -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 }],

frontend/desktop/src/pages/task/TaskCreate/TaskSelectNode.vue

@@ -40,7 +40,6 @@
                 @onSelectSubflow="onSelectSubflow">
             </NodePreview>
             <component
-                v-if="!templateLoading"
                 :is="schemeTemplate"
                 ref="taskScheme"
                 :project_id="project_id"

frontend/desktop/src/pages/template/TemplateList/SharedTemplate/SharedTplSlider.vue

@@ -75,7 +75,7 @@
                         :form-data="formData">
                     </SharedCategorySelect>
                 </bk-form-item>
-                <bk-form-item :label="$t('标签')" :desc="$t('场景使用者通过标签可以快速找到同一类场景')">
+                <bk-form-item :label="$t('场景标签')" :desc="$t('场景使用者通过标签可以快速找到同一类场景')">
                     <SharedTagSelect
                         v-model="formData.labels"
                         :loading="marketLoading"
@@ -271,9 +271,8 @@
             },
             onSceneNameSelect (val) {
                 const selectInfo = this.recordList.find(item => 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 }
                 })
             },

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;