From 7735e7c689ce700ff4f7486152be3b28db09cc6f Mon Sep 17 00:00:00 2001
From: "wu.jian2" <distantmtn@gmail.com>
Date: Fri, 1 Sep 2023 17:37:57 +0800
Subject: [PATCH] =?UTF-8?q?style:=20=E4=BC=98=E5=8C=96=E8=AE=BE=E8=AE=A1?=
 =?UTF-8?q?=E5=99=A8=E6=95=B0=E6=8D=AE=E9=9B=86=E9=80=89=E6=8B=A9=E5=BC=B9?=
 =?UTF-8?q?=E7=AA=97=E5=87=BA=E7=8E=B0=E5=8F=8C=E6=BB=9A=E5=8A=A8=E6=9D=A1?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../packages/DataSetManagement/src/index.vue  | 100 +++++++++++++++++-
 .../DataSetSetting/dataSetSetting.vue         |  22 ++--
 2 files changed, 112 insertions(+), 10 deletions(-)

diff --git a/data-room-ui/packages/DataSetManagement/src/index.vue b/data-room-ui/packages/DataSetManagement/src/index.vue
index bd9eafae..887a155e 100644
--- a/data-room-ui/packages/DataSetManagement/src/index.vue
+++ b/data-room-ui/packages/DataSetManagement/src/index.vue
@@ -118,10 +118,104 @@
         </el-form>
         <div class="bs-table-box">
           <el-table
+            v-if="isDialog"
+            ref="userTable"
+            v-loading="dataListLoading"
+            class="bs-el-table bs-scrollbar"
+            :element-loading-text="loadingText"
+            :data="tableData"
+            :header-cell-style="sortStyle"
+            @sort-change="reSort"
+            @current-change="handleCurrentChange"
+            @select="selectDs"
+            @select-all="selectAll"
+          >
+            <el-empty slot="empty" />
+            <el-table-column
+              v-if="isDialog && multiple"
+              type="selection"
+              width="55"
+            />
+            <el-table-column
+              prop="name"
+              label="数据集名称"
+              align="left"
+              show-overflow-tooltip
+            >
+              <template slot-scope="scope">
+                <el-radio
+                  v-if="isDialog && !multiple"
+                  v-model="curRow"
+                  :label="scope.row"
+                >
+                  {{ scope.row.name }}
+                </el-radio>
+                <span v-else>{{ scope.row.name }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="datasetType"
+              label="数据集类型"
+              align="center"
+              show-overflow-tooltip
+            >
+              <template slot-scope="scope">
+                <span>{{ datasetTypeList.find(type=>type.datasetType===scope.row.datasetType) ? datasetTypeList.find(type=>type.datasetType===scope.row.datasetType).name : '其他' }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="labelIds"
+              label="标签"
+              align="center"
+              show-overflow-tooltip
+            >
+              <template slot-scope="scope">
+                <span>{{ getLabels(scope.row.labelIds).join(',') }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="remark"
+              label="备注"
+              align="left"
+              show-overflow-tooltip
+            />
+            <!--操作栏-->
+            <el-table-column
+              v-if="doEdit||isDelete"
+              label="操作"
+              width="200"
+              align="center"
+            >
+              <template
+                v-if="showOperate(scope.row.datasetType)"
+                slot-scope="scope"
+              >
+                <el-button
+                  v-if="doEdit"
+                  class="bs-el-button-default"
+                  :disabled="scope.row.editable === 1 && !appCode"
+                  @click="toEdit(scope.row.id, scope.row.datasetType, scope.row.name, scope.row.typeId)"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  v-if="isDelete"
+                  class="bs-el-button-default"
+                  :loading="scope.row.loading"
+                  :disabled="scope.row.editable === 1 && !appCode"
+                  @click="delDataset(scope.row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+          <el-table
+            v-else
             ref="userTable"
             v-table
             v-loading="dataListLoading"
-            height="100%"
+            height="0"
             class="bs-el-table bs-scrollbar"
             :element-loading-text="loadingText"
             :data="tableData"
@@ -750,10 +844,10 @@ export default {
 
 .el-dialog {
   .bs-container {
-    max-height: calc(90vh - 236px) !important;
+    // max-height: calc(90vh - 236px) !important;
 
     .el-table {
-      height: calc(90vh - 340px);
+      height: calc(100vh - 390px);
     }
 
     ::v-deep .ztree {
diff --git a/data-room-ui/packages/DataSetSetting/dataSetSetting.vue b/data-room-ui/packages/DataSetSetting/dataSetSetting.vue
index d464002a..c321160d 100644
--- a/data-room-ui/packages/DataSetSetting/dataSetSetting.vue
+++ b/data-room-ui/packages/DataSetSetting/dataSetSetting.vue
@@ -199,16 +199,20 @@ export default {
     padding: 0 !important;
     // min-height: 550px;
     overflow: hidden;
+
+    .bs-pagination {
+      position: relative !important;
+      padding-right: 16px !important;
+    }
   }
 
   ::v-deep .bs-container {
     padding: 0;
-    min-height: 500px;
+    // min-height: 500px;
     background-color: var(--bs-background-2) !important;
 
-    .el-table {
-      max-height: calc(90vh - 340px);
-    }
+    // .el-table {
+    // }
 
     .bs-table-box {
       margin-bottom: 0px;
@@ -224,9 +228,9 @@ export default {
       margin-left: 0 !important;
     }
 
-    ::v-deep .layout {
-      position: absolute !important;
-    }
+    // ::v-deep .layout {
+    // position: absolute !important;
+    // }
 
     ::v-deep .ztree {
       height: auto !important;
@@ -255,4 +259,8 @@ export default {
     height: calc(100vh - 405px) !important;
   }
 }
+
+::v-deep .el-table__body {
+  height: 100% !important;
+}
 </style>