Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 2 commits into from
Sep 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bcs-services/bcs-bscp/ui/src/views/space/groups/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
@@ -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">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)" />
Expand Down Expand Up @@ -356,6 +356,7 @@
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
cursor: pointer;
}
:deep(.bk-progress) {
position: absolute;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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 = () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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">
Expand Down Expand Up @@ -566,6 +567,9 @@
}
}
.config-table {
.key-name {
color: #3a84ff;
}
:deep(.bk-table-body) {
max-height: calc(100vh - 280px);
overflow: auto;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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">
Expand Down
Loading