fix: 文字展示内容过长hover补全--bug=131500439 (#3552)

* fix: 批量导入按钮置灰问题 * fix: 展示内容过长hover补全
TencentBlueKing · Oct 9, 2024 · 317f6e0 · 317f6e0
1 parent 2294879
commit 317f6e0
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 20 deletions.
diff --git a/bcs-services/bcs-bscp/ui/src/components/diff/single-line-kv.vue b/bcs-services/bcs-bscp/ui/src/components/diff/single-line-kv.vue
@@ -6,7 +6,9 @@
         :class="['config-diff-item', { selected: props.selectedId === diffItem.id }]"
         :key="diffItem.id">
         <div :class="['diff-header', diffItem.diffType]">
-          <span class="config-name">{{ diffItem.name }}</span>
+          <bk-overflow-title class="config-name" type="tips">
+            {{ diffItem.name }}
+          </bk-overflow-title>
         </div>
         <div class="diff-content">
           <div class="left-version-content">
@@ -154,6 +156,7 @@
       line-height: 20px;
       font-size: 12px;
       color: #63656e;
+      max-width: 48%;
     }
   }
   .diff-content {

diff --git a/bcs-services/bcs-bscp/ui/src/views/space/client/components/search-selector.vue b/bcs-services/bcs-bscp/ui/src/views/space/client/components/search-selector.vue
@@ -12,7 +12,10 @@
       <div
         class="search-wrap"
         :data-placeholder="inputPlacehoder"
-        v-bk-tooltips="{ content: inputPlacehoder, disabled: locale === 'zh-cn' || !inputPlacehoder }"
+        v-bk-tooltips="{
+          content: inputPlacehoder,
+          disabled: (locale === 'zh-cn' && !isClientSearch) || !inputPlacehoder,
+        }"
         @click="handleClickSearch">
         <bk-date-picker
           ref="datePickerRef"

diff --git a/...vices/bcs-bscp/ui/src/views/space/service/detail/config/components/version-diff/index.vue b/...vices/bcs-bscp/ui/src/views/space/service/detail/config/components/version-diff/index.vue
@@ -44,7 +44,9 @@
               <slot name="currentHead">
                 <div class="diff-panel-head">
                   <div class="version-tag">{{ showPublishBtn ? t('待上线版本') : t('当前版本') }}</div>
-                  <div class="version-name">{{ props.currentVersion.spec.name }}</div>
+                  <bk-overflow-title class="version-name" type="tips">
+                    {{ props.currentVersion.spec.name }}
+                  </bk-overflow-title>
                 </div>
               </slot>
             </template>
@@ -270,6 +272,9 @@
         background: #edf4ff;
       }
     }
+    .version-name {
+      max-width: 300px;
+    }
   }
   .actions-btns {
     padding: 0 24px;

diff --git a/...config/config-list/config-table-list/create-config/import-file/import-from-local-file.vue b/...config/config-list/config-table-list/create-config/import-file/import-from-local-file.vue
@@ -94,7 +94,6 @@
   const isDecompression = ref(true);
   const isOpenFileList = ref(true);
   const fileList = ref<IUploadFileList[]>([]);
-  const multipleUploading = ref(false); // 是否是多个文件上传
 
   const uploadTips = computed(() => {
     if (isDecompression.value) {
@@ -108,7 +107,7 @@
   watch(
     () => fileList.value,
     () => {
-      if (fileList.value.some((fileItem) => fileItem.status === 'uploading') || multipleUploading.value) {
+      if (fileList.value.some((fileItem) => fileItem.status === 'uploading')) {
         emits('uploading', true);
       } else {
         emits('uploading', false);
@@ -234,7 +233,6 @@
   };
 
   const handleExceed = async (files: any) => {
-    multipleUploading.value = true;
     let index = 0;
     const uploadNext = async () => {
       if (index < files.length) {
@@ -249,7 +247,6 @@
       uploadPromises.push(uploadNext());
     }
     await Promise.allSettled(uploadPromises);
-    multipleUploading.value = false;
   };
 </script>
 

diff --git a/.../views/space/service/detail/config/config-list/config-table-list/tables/table-with-kv.vue b/.../views/space/service/detail/config/config-list/config-table-list/tables/table-with-kv.vue
@@ -18,7 +18,12 @@
       <template #prepend v-if="versionData.id === 0">
         <render-table-tip />
       </template>
-      <bk-table-column v-if="versionData.id === 0" :width="74" :min-width="74" :label="renderSelection">
+      <bk-table-column
+        v-if="versionData.id === 0"
+        :width="74"
+        :min-width="74"
+        :label="renderSelection"
+        :show-overflow-tooltip="false">
         <template #default="{ row }">
           <across-check-box
             :checked="isChecked(row)"

diff --git a/...-bscp/ui/src/views/space/service/detail/config/version-list-aside/version-simple-list.vue b/...-bscp/ui/src/views/space/service/detail/config/version-list-aside/version-simple-list.vue
@@ -23,7 +23,9 @@
           :class="['version-item', { active: versionData.id === version.id }]"
           @click="handleSelectVersion(version)">
           <div :class="['dot', version.status.publish_status]"></div>
-          <div class="version-name">{{ version.spec.name }}</div>
+          <bk-overflow-title class="version-name" type="tips">
+            {{ version.spec.name }}
+          </bk-overflow-title>
           <div
             v-if="version.status.fully_released"
             :class="['all-tag', { 'full-release': version.status.fully_release }]"

diff --git a/.../bcs-bscp/ui/src/views/space/templates/list/package-detail/tables/common-config-table.vue b/.../bcs-bscp/ui/src/views/space/templates/list/package-detail/tables/common-config-table.vue
@@ -25,7 +25,6 @@
         :row-class="getRowCls"
         :remote-pagination="true"
         :pagination="pagination"
-        show-overflow-tooltip
         @page-limit-change="handlePageLimitChange"
         @page-value-change="handlePageChange($event)">
         <template #prepend>
@@ -36,18 +35,14 @@
             <across-check-box :checked="isChecked(row)" :handle-change="() => handleSelectionChange(row)" />
           </template>
         </bk-table-column>
-        <bk-table-column :label="t('配置文件名')">
+        <bk-table-column :label="t('配置文件名')" :show-overflow-tooltip="true">
           <template #default="{ row }">
-            <bk-overflow-title
-              v-if="row.spec"
-              type="tips"
-              class="config-name"
-              @click="handleViewConfig(row)">
+            <span v-if="row.spec" class="config-name" @click="handleViewConfig(row)">
               {{ fileAP(row) }}
-            </bk-overflow-title>
+            </span>
           </template>
         </bk-table-column>
-        <bk-table-column :label="t('配置文件描述')" prop="spec.memo">
+        <bk-table-column :label="t('配置文件描述')" prop="spec.memo" :show-overflow-tooltip="true">
           <template #default="{ row }">
             <span v-if="row.spec">{{ row.spec.memo || '--' }}</span>
           </template>

diff --git a/bcs-services/bcs-bscp/ui/src/views/space/templates/list/package-menu/item.vue b/bcs-services/bcs-bscp/ui/src/views/space/templates/list/package-menu/item.vue
@@ -7,7 +7,9 @@
         </slot>
       </div>
       <div class="text">
-        <span class="name">{{ props.pkg.name }}</span>
+        <bk-overflow-title class="name" type="tips">
+          {{ props.pkg.name }}
+        </bk-overflow-title>
         <span class="num">{{ props.pkg.count }}</span>
       </div>
       <bk-popover

diff --git a/bcs-services/bcs-bscp/ui/src/views/space/variables/index.vue b/bcs-services/bcs-bscp/ui/src/views/space/variables/index.vue
@@ -44,7 +44,7 @@
           </template>
         </bk-table-column>
         <!-- <bk-table-column type="selection" :width="60"></bk-table-column> -->
-        <bk-table-column :label="t('变量名称')" width="300">
+        <bk-table-column :label="t('变量名称')" width="300" min-width="300">
           <template #default="{ row }">
             <div v-if="row.spec" class="var-name-wrapper">
               <bk-overflow-title class="name-text" type="tips" :key="row.id" @click="handleEditVar(row)">