fix: 上传压缩文件后进度达到100%后没有解压提示--bug=131494557 (#3543)

* fix: 上传压缩文件后进度达到100%后没有解压提示 * fix: 表格内容过长添加hover补全
TencentBlueKing · Sep 29, 2024 · 30a5c9b · 30a5c9b
1 parent b29081a
commit 30a5c9b
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 14 deletions.
diff --git a/bcs-services/bcs-bscp/ui/src/views/space/groups/index.vue b/bcs-services/bcs-bscp/ui/src/views/space/groups/index.vue
@@ -38,7 +38,7 @@
     </div>
     <div class="group-table-wrapper">
       <bk-loading style="min-height: 300px" :loading="listLoading">
-        <bk-table class="group-table" :border="['outer']" :data="tableData">
+        <bk-table class="group-table" show-overflow-tooltip :border="['outer']" :data="tableData">
           <template #prepend>
             <render-table-tip />
           </template>

diff --git a/bcs-services/bcs-bscp/ui/src/views/space/groups/services-to-published.vue b/bcs-services/bcs-bscp/ui/src/views/space/groups/services-to-published.vue
@@ -10,6 +10,7 @@
           :border="['outer']"
           :remote-pagination="true"
           :pagination="pagination"
+          show-overflow-tooltip
           @page-limit-change="handlePageLimitChange"
           @page-value-change="loadServicesList">
           <bk-table-column :label="t('服务名称')" prop="app_name"></bk-table-column>

diff --git a/bcs-services/bcs-bscp/ui/src/views/space/scripts/version-manage/version-list-full-table.vue b/bcs-services/bcs-bscp/ui/src/views/space/scripts/version-manage/version-list-full-table.vue
@@ -4,6 +4,7 @@
     :data="props.list"
     :remote-pagination="true"
     :pagination="pagination"
+    show-overflow-tooltip
     @page-limit-change="emits('pageLimitChange', $event)"
     @page-value-change="emits('pageChange', $event)">
     <bk-table-column :label="t('版本号')" prop="spec.name" show-overflow-tooltip>

diff --git a/...services/bcs-bscp/ui/src/views/space/scripts/version-manage/version-list-simple-table.vue b/...services/bcs-bscp/ui/src/views/space/scripts/version-manage/version-list-simple-table.vue
@@ -1,5 +1,10 @@
 <template>
-  <bk-table :border="['row']" :data="props.list" :row-class="getRowCls" @row-click="handleSelectVersion">
+  <bk-table
+    :border="['row']"
+    :data="props.list"
+    show-overflow-tooltip
+    :row-class="getRowCls"
+    @row-click="handleSelectVersion">
     <bk-table-column :label="t('版本号')" show-overflow-tooltip>
       <template #default="{ row }">
         <div v-if="row.hook_revision" class="version-name-wrapper">

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
@@ -37,17 +37,17 @@
             </div>
             <TextFill class="file-icon" />
             <div class="file-content">
-              <div v-overflow-title type="tips" class="name">
-                <div>{{ item.file.name }}</div>
+              <div class="name">
+                <div v-overflow-title>{{ item.file.name }}</div>
               </div>
               <div v-if="item.status !== 'success' && item.status !== 'fail'" class="progress">
                 <bk-progress
                   :percent="item.progress"
                   :theme="item.status === 'fail' ? 'danger' : 'primary'"
                   size="small" />
               </div>
-              <div v-else-if="item.status === 'fail'" v-overflow-title type="tips" class="error-message">
-                <div>{{ item.errorMessage }}</div>
+              <div v-else-if="item.status === 'fail'" class="error-message">
+                <div v-overflow-title>{{ item.errorMessage }}</div>
               </div>
             </div>
             <Del class="del-icon" @click="handleDeleteFile(item.file.name)" />
@@ -356,6 +356,7 @@
           text-overflow: ellipsis;
           white-space: nowrap;
           overflow: hidden;
+          cursor: pointer;
         }
         :deep(.bk-progress) {
           position: absolute;

diff --git a/...e/service/detail/config/config-list/config-table-list/create-config/import-file/index.vue b/...e/service/detail/config/config-list/config-table-list/create-config/import-file/index.vue
@@ -62,15 +62,15 @@
       </div>
     </div>
     <bk-loading
-      v-if="importType !== 'configTemplate' && allConfigList.length + allTemplateConfigList.length > 0"
+      v-if="importType !== 'configTemplate'"
       :loading="decompressing || fileProcessing || tableLoading"
       :title="loadingText"
       class="config-table-loading"
       mode="spin"
       theme="primary"
       size="small"
       :opacity="0.7">
-      <div class="content">
+      <div v-if="allConfigList.length + allTemplateConfigList.length > 0" class="content">
         <bk-alert
           v-if="isExceedMaxFileCount"
           style="margin-top: 4px"
@@ -467,6 +467,7 @@
   const handleDeleteFile = (fileName: string) => {
     existConfigList.value = existConfigList.value.filter((item) => item.file_name !== fileName);
     nonExistConfigList.value = nonExistConfigList.value.filter((item) => item.file_name !== fileName);
+    allConfigList.value = [...existConfigList.value, ...nonExistConfigList.value];
   };
 
   const handleClearTable = () => {

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
@@ -10,6 +10,7 @@
       selection-key="id"
       row-key="id"
       :row-class="getRowCls"
+      show-overflow-tooltip
       @page-limit-change="handlePageLimitChange"
       @page-value-change="refresh($event, true)"
       @column-sort="handleSort"
@@ -27,14 +28,14 @@
       </bk-table-column>
       <bk-table-column :label="t('配置项名称')" prop="spec.key" :min-width="240">
         <template #default="{ row }">
-          <bk-button
+          <bk-overflow-title
             v-if="row.spec"
-            text
-            theme="primary"
             :disabled="row.kv_state === 'DELETE'"
+            type="tips"
+            class="key-name"
             @click="handleView(row)">
             {{ row.spec.key }}
-          </bk-button>
+          </bk-overflow-title>
         </template>
       </bk-table-column>
       <bk-table-column :label="t('配置项值预览')" prop="spec.value">
@@ -566,6 +567,9 @@
     }
   }
   .config-table {
+    .key-name {
+      color: #3a84ff;
+    }
     :deep(.bk-table-body) {
       max-height: calc(100vh - 280px);
       overflow: auto;

diff --git a/...s-bscp/ui/src/views/space/service/detail/config/version-list-aside/version-table-list.vue b/...s-bscp/ui/src/views/space/service/detail/config/version-list-aside/version-table-list.vue
@@ -28,6 +28,7 @@
           :row-class="getRowCls"
           :remote-pagination="true"
           :pagination="pagination"
+          show-overflow-tooltip
           @row-click="handleSelectVersion"
           @page-limit-change="handlePageLimitChange"
           @page-value-change="refreshVersionList($event)">

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,6 +25,7 @@
         :row-class="getRowCls"
         :remote-pagination="true"
         :pagination="pagination"
+        show-overflow-tooltip
         @page-limit-change="handlePageLimitChange"
         @page-value-change="handlePageChange($event)">
         <template #prepend>
@@ -37,9 +38,13 @@
         </bk-table-column>
         <bk-table-column :label="t('配置文件名')">
           <template #default="{ row }">
-            <div v-if="row.spec" v-overflow-title class="config-name" @click="handleViewConfig(row)">
+            <bk-overflow-title
+              v-if="row.spec"
+              type="tips"
+              class="config-name"
+              @click="handleViewConfig(row)">
               {{ fileAP(row) }}
-            </div>
+            </bk-overflow-title>
           </template>
         </bk-table-column>
         <bk-table-column :label="t('配置文件描述')" prop="spec.memo">