fix(frontend): sql执行单据详情查看 sql 文件内容时 db 显示问题 TencentBlueKing#8068

hLinx · Nov 20, 2024 · 245b806 · 245b806
1 parent 09ed769
commit 245b806
Show file tree

Hide file tree

Showing 5 changed files with 61 additions and 9 deletions.
diff --git a/dbm-ui/frontend/src/types/auto-imports.d.ts b/dbm-ui/frontend/src/types/auto-imports.d.ts
@@ -71,6 +71,6 @@ declare global {
 // for type re-export
 declare global {
   // @ts-ignore
-  export type { Component, ComponentPublicInstance, ComputedRef, DirectiveBinding, ExtractDefaultPropTypes, ExtractPropTypes, ExtractPublicPropTypes, InjectionKey, PropType, Ref, MaybeRef, MaybeRefOrGetter, VNode, WritableComputedRef } from 'vue'
+  export type { Component, ComponentPublicInstance, ComputedRef, ExtractDefaultPropTypes, ExtractPropTypes, ExtractPublicPropTypes, InjectionKey, PropType, Ref, VNode, WritableComputedRef } from 'vue'
   import('vue')
 }
diff --git a/...n/components/demand-factory/components/import-sqlfile/components/render-sqlfile/Index.vue b/...n/components/demand-factory/components/import-sqlfile/components/render-sqlfile/Index.vue
@@ -17,7 +17,13 @@
             :key="item">
             {{ item }}
           </BkTag>
-          <BkTag v-if="executeObject.dbnames.length > 3">...</BkTag>
+          <BkTag
+            v-if="executeObject.dbnames.length > 3"
+            v-bk-tooltips="{
+              content: executeObject.dbnames.join('\n'),
+            }">
+            ...
+          </BkTag>
           <template v-if="executeObject.dbnames.length < 1">--</template>
         </span>
         <span class="ml-25">{{ t('忽略的 DB:') }}</span>
@@ -27,7 +33,13 @@
             :key="item">
             {{ item }}
           </BkTag>
-          <BkTag v-if="executeObject.ignore_dbnames.length > 3">...</BkTag>
+          <BkTag
+            v-if="executeObject.ignore_dbnames.length > 3"
+            v-bk-tooltips="{
+              content: executeObject.ignore_dbnames.join('\n'),
+            }">
+            ...
+          </BkTag>
           <template v-if="executeObject.ignore_dbnames.length < 1">--</template>
         </span>
       </span>

diff --git a/...ontend/src/views/tickets/common/components/demand-factory/mysql/import-sql-file/Index.vue b/...ontend/src/views/tickets/common/components/demand-factory/mysql/import-sql-file/Index.vue
@@ -95,7 +95,13 @@
             :key="item">
             {{ item }}
           </BkTag>
-          <BkTag v-if="currentExecuteObject.dbnames.length > 3">...</BkTag>
+          <BkTag
+            v-if="currentExecuteObject.dbnames.length > 3"
+            v-bk-tooltips="{
+              content: currentExecuteObject.dbnames.join('\n'),
+            }">
+            ...
+          </BkTag>
           <template v-if="currentExecuteObject.dbnames.length < 1">--</template>
         </span>
         <span class="ml-25">{{ t('忽略的 DB:') }}</span>
@@ -105,7 +111,13 @@
             :key="item">
             {{ item }}
           </BkTag>
-          <BkTag v-if="currentExecuteObject.ignore_dbnames.length > 3">...</BkTag>
+          <BkTag
+            v-if="currentExecuteObject.ignore_dbnames.length > 3"
+            v-bk-tooltips="{
+              content: currentExecuteObject.ignore_dbnames.join('\n'),
+            }">
+            ...
+          </BkTag>
           <template v-if="currentExecuteObject.ignore_dbnames.length < 1">--</template>
         </span>
       </span>

diff --git a/...src/views/tickets/my-tickets/components/details/components/flow/components/MySqlFlows.vue b/...src/views/tickets/my-tickets/components/details/components/flow/components/MySqlFlows.vue
@@ -108,19 +108,33 @@
         <span>{{ t('变更的 DB:') }}</span>
         <span class="ml-4">
           <BkTag
-            v-for="item in currentFileExecuteObject.dbnames"
+            v-for="item in currentFileExecuteObject.dbnames.slice(0, 3)"
             :key="item">
             {{ item }}
           </BkTag>
+          <BkTag
+            v-if="currentFileExecuteObject.dbnames.length > 3"
+            v-bk-tooltips="{
+              content: currentFileExecuteObject.dbnames.join('\n'),
+            }">
+            ...
+          </BkTag>
           <template v-if="currentFileExecuteObject.dbnames.length < 1">--</template>
         </span>
         <span class="ml-25">{{ t('忽略的 DB:') }}</span>
         <span class="ml-4">
           <BkTag
-            v-for="item in currentFileExecuteObject.ignore_dbnames"
+            v-for="item in currentFileExecuteObject.ignore_dbnames.slice(0, 3)"
             :key="item">
             {{ item }}
           </BkTag>
+          <BkTag
+            v-if="currentFileExecuteObject.ignore_dbnames.length > 3"
+            v-bk-tooltips="{
+              content: currentFileExecuteObject.ignore_dbnames.join('\n'),
+            }">
+            ...
+          </BkTag>
           <template v-if="currentFileExecuteObject.ignore_dbnames.length < 1">--</template>
         </span>
       </span>

diff --git a/...d/src/views/tickets/my-todos/components/details/components/flow/components/MySqlFlows.vue b/...d/src/views/tickets/my-todos/components/details/components/flow/components/MySqlFlows.vue
@@ -108,19 +108,33 @@
         <span>{{ t('变更的 DB:') }}</span>
         <span class="ml-4">
           <BkTag
-            v-for="item in currentFileExecuteObject.dbnames"
+            v-for="item in currentFileExecuteObject.dbnames.slice(0, 3)"
             :key="item">
             {{ item }}
           </BkTag>
+          <BkTag
+            v-if="currentFileExecuteObject.dbnames.length > 3"
+            v-bk-tooltips="{
+              content: currentFileExecuteObject.dbnames.join('\n'),
+            }">
+            ...
+          </BkTag>
           <template v-if="currentFileExecuteObject.dbnames.length < 1">--</template>
         </span>
         <span class="ml-25">{{ t('忽略的 DB:') }}</span>
         <span class="ml-4">
           <BkTag
-            v-for="item in currentFileExecuteObject.ignore_dbnames"
+            v-for="item in currentFileExecuteObject.ignore_dbnames.slice(0, 3)"
             :key="item">
             {{ item }}
           </BkTag>
+          <BkTag
+            v-if="currentFileExecuteObject.ignore_dbnames.length > 3"
+            v-bk-tooltips="{
+              content: currentFileExecuteObject.ignore_dbnames.join('\n'),
+            }">
+            ...
+          </BkTag>
           <template v-if="currentFileExecuteObject.ignore_dbnames.length < 1">--</template>
         </span>
       </span>