Merge pull request TencentBlueKing#11028 from lockiechen/issue_10933

fix: 非编辑页面切换Code方式时提示保存 TencentBlueKing#10933
yongyiduan · Sep 29, 2024 · 5d97a3a · 5d97a3a
2 parents e1b68e6 + d6cf541
commit 5d97a3a
Show file tree

Hide file tree

Showing 14 changed files with 427 additions and 112 deletions.
diff --git a/src/frontend/devops-pipeline/src/components/BuildHistoryTable/index.vue b/src/frontend/devops-pipeline/src/components/BuildHistoryTable/index.vue
@@ -808,7 +808,7 @@
                 'resetHistoryFilterCondition'
             ]),
             updateTableHeight () {
-                this.tableHeight = this.$refs.tableBox.offsetHeight
+                this.tableHeight = this.$refs.tableBox?.offsetHeight
             },
             handleColumnChange (columns) {
                 this.tableColumnKeys = columns

diff --git a/src/frontend/devops-pipeline/src/components/ModeSwitch.vue b/src/frontend/devops-pipeline/src/components/ModeSwitch.vue
@@ -94,9 +94,6 @@
                     id: mode,
                     cls: this.pipelineMode === mode ? 'is-selected' : ''
                 }))
-            },
-            canSwitch () {
-                return !(!this.readOnly && this.isEditing)
             }
         },
 
@@ -205,7 +202,7 @@
                     }
                     this.isSwitching = false
                 }
-                if (!this.draft && this.isEditing) {
+                if (!this.draft && this.isEditing && !this.readOnly) {
                     this.leaveConfirmVisisble = true
                     this.newMode = mode
                     return

diff --git a/src/frontend/devops-pipeline/src/components/PipelineDetailTabs/VersionDiffEntry.vue b/src/frontend/devops-pipeline/src/components/PipelineDetailTabs/VersionDiffEntry.vue
@@ -1,9 +1,11 @@
 <template>
-    <span>
+    <span class="version-diff-entry-wrapper">
         <bk-button
             :text="text"
             :outline="outline"
             :theme="theme"
+            :disabled="disabled"
+            :size="size"
             @click="initDiff"
         >
             <slot>
@@ -23,7 +25,10 @@
                 class="diff-version-dialog-content"
                 v-bkloading="{ isLoading: isLoadYaml, color: '#1d1d1d' }"
             >
-                <header class="diff-version-header">
+                <header
+                    class="diff-version-header"
+                    v-if="showButton"
+                >
                     <VersionSelector
                         ext-cls="dark-theme-select-trigger"
                         ext-popover-cls="dark-theme-select-menu"
@@ -82,6 +87,10 @@
                 type: String,
                 default: 'primary'
             },
+            size: {
+                type: String,
+                default: 'normal'
+            },
             version: {
                 type: Number,
                 required: true
@@ -93,6 +102,14 @@
             canSwitchVersion: {
                 type: Boolean,
                 default: true
+            },
+            showButton: {
+                type: Boolean,
+                default: true
+            },
+            disabled: {
+                type: Boolean,
+                default: false
             }
         },
         data () {
@@ -167,6 +184,11 @@
 
 <style lang="scss">
     @import "@/scss/select-dark-theme.scss";
+    .version-diff-entry-wrapper {
+        .bk-button-text.bk-button-small {
+            padding: 0;
+        }
+    }
     .diff-version-dialog.bk-dialog-wrapper {
         transition: none;
         .bk-dialog {