Merge pull request #10398 from lockiechen/hotfix_pac_github_8125

feat:变量名为PipelineId时变量不生效 issue #8125
TencentBlueKing · May 24, 2024 · 3e5bf97 · 3e5bf97
2 parents c3b5720 + 97999e2
commit 3e5bf97
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 15 deletions.
diff --git a/src/frontend/devops-pipeline/src/components/PipelineDetailTabs/RollbackEntry.vue b/src/frontend/devops-pipeline/src/components/PipelineDetailTabs/RollbackEntry.vue
@@ -58,6 +58,7 @@
     import {
         RESOURCE_ACTION
     } from '@/utils/permission'
+    import { pipelineTabIdMap } from '@/utils/pipelineConst'
     import { mapActions, mapGetters, mapState } from 'vuex'
 
     export default {
@@ -174,6 +175,9 @@
                     params: {
                         ...this.$route.params,
                         version
+                    },
+                    query: {
+                        tab: pipelineTabIdMap[this.$route.params.type] ?? 'pipeline'
                     }
                 })
             }

diff --git a/src/frontend/devops-pipeline/src/components/PipelineHeader/HistoryHeader.vue b/src/frontend/devops-pipeline/src/components/PipelineHeader/HistoryHeader.vue
@@ -35,7 +35,7 @@
                 :pipeline-id="pipelineId"
             />
         </div>
-        <aside class="pipeline-history-right-aside">
+        <aside v-show="!(isSwitchPipeline || switchingVersion)" class="pipeline-history-right-aside">
             <VersionDiffEntry
                 v-if="!isReleaseVersion"
                 :text="false"

diff --git a/src/frontend/devops-pipeline/src/components/PipelineHeader/MoreActions.vue b/src/frontend/devops-pipeline/src/components/PipelineHeader/MoreActions.vue
@@ -64,14 +64,15 @@
 <script>
     import exportDialog from '@/components/ExportDialog'
     import CopyPipelineDialog from '@/components/PipelineActionDialog/CopyPipelineDialog'
-    import { UPDATE_PIPELINE_INFO } from '@/store/modules/atom/constants'
-    import { mapActions, mapState, mapGetters } from 'vuex'
     import DisableDialog from '@/components/PipelineActionDialog/DisableDialog'
+    import { UPDATE_PIPELINE_INFO } from '@/store/modules/atom/constants'
+    import { mapActions, mapGetters, mapState } from 'vuex'
 
     import SaveAsTemplateDialog from '@/components/PipelineActionDialog/SaveAsTemplateDialog'
     import ImportPipelinePopup from '@/components/pipelineList/ImportPipelinePopup'
     import pipelineActionMixin from '@/mixins/pipeline-action-mixin'
-    import { TEMPLATE_RESOURCE_ACTION, RESOURCE_ACTION } from '@/utils/permission'
+    import { RESOURCE_ACTION, TEMPLATE_RESOURCE_ACTION } from '@/utils/permission'
+    import { pipelineTabIdMap } from '@/utils/pipelineConst'
     import RemoveConfirmDialog from '@/views/PipelineList/RemoveConfirmDialog'
     export default {
         components: {
@@ -116,6 +117,17 @@
                         {
                             label: this.pipelineInfo?.hasCollect ? 'uncollect' : 'collect',
                             handler: this.toggleCollect
+                        },
+                        {
+                            label: 'rename',
+                            handler: () => {
+                                this.$router.push({
+                                    name: 'pipelinesEdit',
+                                    query: {
+                                        tab: pipelineTabIdMap.setting
+                                    }
+                                })
+                            }
                         }
                     ],
                     [

diff --git a/src/frontend/devops-pipeline/src/components/pipelineSetting/BaseInfo.vue b/src/frontend/devops-pipeline/src/components/pipelineSetting/BaseInfo.vue
@@ -4,13 +4,15 @@
         <bk-form form-type="vertical" :label-width="300" class="new-ui-form">
             <bk-form-item :label="$t('pipelineName')" :required="true">
                 <vuex-input
+                    v-bk-focus
                     :disabled="!editable"
                     :placeholder="$t('pipelineNameInputTips')"
                     name="pipelineName"
                     :value="pipelineSetting.pipelineName"
                     v-validate.initial="'required|max:128'"
                     :max-length="128"
-                    :handle-change="handleBaseInfoChange" />
+                    :handle-change="handleBaseInfoChange"
+                />
             </bk-form-item>
 
             <bk-form-item :required="false">

diff --git a/src/frontend/devops-pipeline/src/router/router.js b/src/frontend/devops-pipeline/src/router/router.js
@@ -121,7 +121,7 @@ const routes = [
                         component: PipelineListAuth
                     },
                     {
-                        path: ':viewId/:type?',
+                        path: ':viewId?/:type?',
                         name: 'PipelineManageList',
                         component: PipelineManageList,
                         meta: {

diff --git a/src/frontend/devops-pipeline/src/store/modules/pipelines/execute.js b/src/frontend/devops-pipeline/src/store/modules/pipelines/execute.js
@@ -14,7 +14,7 @@ const getters = {
 }
 
 const mutations = {
-    [SET_EXECUTE_PARAMS]: (state, { pipelineId, ...params }) => {
+    [SET_EXECUTE_PARAMS]: (state, { pipelineId, params }) => {
         const oldVal = state.executeParams.get(pipelineId)
         state.executeParams.set(pipelineId, {
             ...oldVal,

diff --git a/src/frontend/devops-pipeline/src/views/subpages/preview.vue b/src/frontend/devops-pipeline/src/views/subpages/preview.vue
@@ -236,11 +236,13 @@
                     this.getParamsValue(values)
                     this.setExecuteParams({
                         pipelineId: this.pipelineId,
-                        ...this.paramsValues,
-                        ...this.versionParamValues,
-                        ...this.buildValues,
-                        ...this.constantValues,
-                        ...this.otherValues
+                        params: {
+                            ...this.paramsValues,
+                            ...this.versionParamValues,
+                            ...this.buildValues,
+                            ...this.constantValues,
+                            ...this.otherValues
+                        }
                     })
                 } else {
                     this.$bkMessage({
@@ -265,7 +267,9 @@
                 this.paramsValues = getParamsValuesMap(this.paramList, valueKey)
                 this.setExecuteParams({
                     pipelineId: this.pipelineId,
-                    ...this.paramsValues
+                    params: {
+                        ...this.paramsValues
+                    }
                 })
             },
             async handleValidate () {
@@ -298,7 +302,9 @@
                 this[`${type}Values`][name] = value
                 this.setExecuteParams({
                     pipelineId: this.pipelineId,
-                    ...this[`${type}Values`]
+                    params: {
+                        ...this[`${type}Values`]
+                    }
                 })
             },
             handleBuildChange (...args) {
@@ -315,7 +321,9 @@
 
                 this.setExecuteParams({
                     pipelineId: this.pipelineId,
-                    buildNo: this.buildNo
+                    params: {
+                        buildNo: this.buildNo
+                    }
                 })
             },
             async init () {