Merge pull request #2558 from lhzzforever/dev/develop_ci

fix: 测试手动输入选项无法展示
TencentBlueKing · Mar 8, 2024 · c650809 · c650809
2 parents dbc5e72 + 431f8e7
commit c650809
Show file tree

Hide file tree

Showing 11 changed files with 12 additions and 11 deletions.
diff --git a/frontend/src/components/render-resource/compare-detail.vue b/frontend/src/components/render-resource/compare-detail.vue
@@ -11,7 +11,7 @@
         <render-order-number v-if="curCondition.length > 1" :number="`${conIndex + 1 }`" />
         <div class="resource-instance-wrapper">
           <render-resource-instance
-            v-if="condition.hasOwnProperty('instance')"
+            v-if="condition.hasOwnProperty('instance') || ['instance:paste'].includes(condition.selectionMode)"
             :expanded.sync="condition.instanceExpanded"
             :is-group="computedIsGroup(condition)"
             :need-order="curCondition.length > 1"

diff --git a/frontend/src/components/render-resource/detail.vue b/frontend/src/components/render-resource/detail.vue
@@ -6,7 +6,7 @@
         <render-order-number v-if="conditionData.length > 1" :number="`${conIndex + 1 }`" />
         <div class="resource-instance-wrapper">
           <render-resource-instance
-            v-if="condition.hasOwnProperty('instance')"
+            v-if="condition.hasOwnProperty('instance') || ['instance:paste'].includes(condition.selectionMode)"
             :expanded.sync="condition.instanceExpanded"
             :is-group="computedIsGroup(condition)"
             :need-order="conditionData.length > 1"

diff --git a/frontend/src/components/render-resource/edit.vue b/frontend/src/components/render-resource/edit.vue
@@ -17,7 +17,7 @@
         <div class="resource-instance-wrapper">
           <render-resource-instance
             key="instance"
-            v-if="condition.hasOwnProperty('instance')"
+            v-if="condition.hasOwnProperty('instance') || ['instance:paste'].includes(condition.selectionMode)"
             :expanded.sync="condition.instanceExpanded"
             :is-group="computedIsGroup(condition)"
             :need-order="conditionData.length > 1"

diff --git a/frontend/src/views/grading-admin/components/render-resource.vue b/frontend/src/views/grading-admin/components/render-resource.vue
@@ -23,7 +23,7 @@
         <render-order-number v-if="conditionData.length > 1" :number="`${index + 1 }`" />
         <div class="resource-instance-wrapper" :class="conditionData.length > 1 ? 'set-padding' : ''">
           <render-resource-instance
-            v-if="condition.hasOwnProperty('instance')"
+            v-if="condition.hasOwnProperty('instance') || ['instance:paste'].includes(condition.selectionMode)"
             :expanded.sync="condition.instanceExpanded"
             :is-group="handleComputedIsGroup(condition)"
             :sub-title="condition.instanceTitle"

diff --git a/frontend/src/views/group/components/render-resource.vue b/frontend/src/views/group/components/render-resource.vue
@@ -23,7 +23,7 @@
         <render-order-number v-if="conditionData.length > 1" :number="`${index + 1 }`" />
         <div class="resource-instance-wrapper" :class="conditionData.length > 1 ? 'set-padding' : ''">
           <render-resource-instance
-            v-if="condition.hasOwnProperty('instance')"
+            v-if="condition.hasOwnProperty('instance') || ['instance:paste'].includes(condition.selectionMode)"
             :expanded.sync="condition.instanceExpanded"
             :is-group="handleComputedIsGroup(condition)"
             :sub-title="condition.instanceTitle"

diff --git a/frontend/src/views/manage-spaces/components/render-resource.vue b/frontend/src/views/manage-spaces/components/render-resource.vue
@@ -23,7 +23,7 @@
         <render-order-number v-if="conditionData.length > 1" :number="`${index + 1 }`" />
         <div class="resource-instance-wrapper" :class="conditionData.length > 1 ? 'set-padding' : ''">
           <render-resource-instance
-            v-if="condition.hasOwnProperty('instance')"
+            v-if="condition.hasOwnProperty('instance') || ['instance:paste'].includes(condition.selectionMode)"
             :expanded.sync="condition.instanceExpanded"
             :is-group="handleComputedIsGroup(condition)"
             :sub-title="condition.instanceTitle"

diff --git a/frontend/src/views/manage-spaces/secondary-manage-space/components/render-resource.vue b/frontend/src/views/manage-spaces/secondary-manage-space/components/render-resource.vue
@@ -23,7 +23,7 @@
         <render-order-number v-if="conditionData.length > 1" :number="`${index + 1 }`" />
         <div class="resource-instance-wrapper" :class="conditionData.length > 1 ? 'set-padding' : ''">
           <render-resource-instance
-            v-if="condition.hasOwnProperty('instance')"
+            v-if="condition.hasOwnProperty('instance') || ['instance:paste'].includes(condition.selectionMode)"
             :expanded.sync="condition.instanceExpanded"
             :is-group="handleComputedIsGroup(condition)"
             :sub-title="condition.instanceTitle"

diff --git a/frontend/src/views/perm-apply/components/render-resource.vue b/frontend/src/views/perm-apply/components/render-resource.vue
@@ -24,7 +24,7 @@
         <div class="resource-instance-wrapper" :class="conditionData.length > 1 ? 'set-padding' : ''">
           <!-- 实例 -->
           <render-resource-instance
-            v-if="condition.hasOwnProperty('instance')"
+            v-if="condition.hasOwnProperty('instance') || ['instance:paste'].includes(condition.selectionMode)"
             :expanded.sync="condition.instanceExpanded"
             :is-group="handleComputedIsGroup(condition)"
             :sub-title="condition.instanceTitle"
@@ -366,6 +366,7 @@
             // 备份已选数据，与最新数据做对比判断要不要展示离开确认框
             this.hasSelectedCondition = _.cloneDeep(this.conditionData);
           }
+          console.log(this.conditionData, '当前实例数据');
         },
         deep: true,
         immediate: true

diff --git a/frontend/src/views/perm-template/components/render-resource.vue b/frontend/src/views/perm-template/components/render-resource.vue
@@ -23,7 +23,7 @@
         <render-order-number v-if="conditionData.length > 1" :number="`${index + 1 }`" />
         <div class="resource-instance-wrapper" :class="conditionData.length > 1 ? 'set-padding' : ''">
           <render-resource-instance
-            v-if="condition.hasOwnProperty('instance')"
+            v-if="condition.hasOwnProperty('instance') || ['instance:paste'].includes(condition.selectionMode)"
             :expanded.sync="condition.instanceExpanded"
             :is-group="handleComputedIsGroup(condition)"
             :sub-title="condition.instanceTitle"

diff --git a/frontend/src/views/resource-permiss/components/render-resource.vue b/frontend/src/views/resource-permiss/components/render-resource.vue
@@ -24,7 +24,7 @@
         <div class="resource-instance-wrapper" :class="conditionData.length > 1 ? 'set-padding' : ''">
           <!-- 实例 -->
           <render-resource-instance
-            v-if="condition.hasOwnProperty('instance')"
+            v-if="condition.hasOwnProperty('instance') || ['instance:paste'].includes(condition.selectionMode)"
             :expanded.sync="condition.instanceExpanded"
             :is-group="handleComputedIsGroup(condition)"
             :sub-title="condition.instanceTitle"

diff --git a/frontend/src/views/tempora-perm-apply/components/render-resource.vue b/frontend/src/views/tempora-perm-apply/components/render-resource.vue
@@ -24,7 +24,7 @@
         <div class="resource-instance-wrapper" :class="conditionData.length > 1 ? 'set-padding' : ''">
           <!-- 实例 -->
           <render-resource-instance
-            v-if="condition.hasOwnProperty('instance')"
+            v-if="condition.hasOwnProperty('instance') || ['instance:paste'].includes(condition.selectionMode)"
             :expanded.sync="condition.instanceExpanded"
             :is-group="handleComputedIsGroup(condition)"
             :sub-title="condition.instanceTitle"