From f8b559545a55a273f68053c69d5cd5ee8dbb9caf Mon Sep 17 00:00:00 2001
From: RubyLiu <liulubingjava@163.com>
Date: Wed, 1 Nov 2023 17:22:05 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E9=87=8D=E6=9E=84=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=E7=BB=84=E4=BB=B6&=E7=B3=BB=E7=BB=9F=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E6=A0=87=E7=AD=BE=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/pure/ms-table/base-table.vue   |  6 ++--
 .../components/pure/ms-tag/ms-tag-group.vue   | 28 +++++++++++++------
 .../src/components/pure/ms-tag/ms-tag.vue     | 10 +++++--
 frontend/src/layout/page-layout.vue           |  1 +
 .../src/views/setting/system/user/index.vue   |  5 ++--
 5 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/frontend/src/components/pure/ms-table/base-table.vue b/frontend/src/components/pure/ms-table/base-table.vue
index 072757e904..5e10fa2474 100644
--- a/frontend/src/components/pure/ms-table/base-table.vue
+++ b/frontend/src/components/pure/ms-table/base-table.vue
@@ -68,7 +68,7 @@
             </div>
           </template>
           <template #cell="{ column, record, rowIndex }">
-            <div class="flex flex-row flex-nowrap items-center">
+            <div :class="{ 'flex flex-row items-center': !item.isTag }">
               <template v-if="item.dataIndex === SpecialColumnEnum.ENABLE">
                 <slot name="enable" v-bind="{ record }">
                   <div v-if="record.enable" class="flex flex-row flex-nowrap items-center gap-[2px]">
@@ -84,11 +84,11 @@
                 </slot>
               </template>
               <template v-else-if="item.isTag">
-                <span
+                <template
                   v-if="!record[item.dataIndex as string] || (Array.isArray(record[item.dataIndex as string]) && record[item.dataIndex as string].length === 0)"
                 >
                   <slot :name="item.slotName" v-bind="{ record, rowIndex, column }"> - </slot>
-                </span>
+                </template>
                 <MsTagGroup v-else :tag-list="record[item.dataIndex as string]" type="primary" theme="outline" />
               </template>
               <template v-else-if="item.slotName === SpecialColumnEnum.OPERATION">
diff --git a/frontend/src/components/pure/ms-tag/ms-tag-group.vue b/frontend/src/components/pure/ms-tag/ms-tag-group.vue
index 5c9ae632ba..96529a1fb4 100644
--- a/frontend/src/components/pure/ms-tag/ms-tag-group.vue
+++ b/frontend/src/components/pure/ms-tag/ms-tag-group.vue
@@ -1,14 +1,14 @@
 <template>
-  <div class="flex min-h-[22px] flex-row">
-    <MsTag v-for="tag of showTagList" :key="tag.id" v-bind="attrs">
-      {{ props.isStringTag ? tag : tag[props.nameKey] }}
-    </MsTag>
-    <a-tooltip :content="tagsTooltip">
-      <MsTag v-if="props.tagList.length > props.showNum" v-bind="attrs">
+  <a-tooltip :content="tagsTooltip">
+    <div class="flex max-w-[440px] flex-row">
+      <MsTag v-for="tag of showTagList" :key="tag.id" :width="getTagWidth(tag)" v-bind="attrs">
+        {{ props.isStringTag ? tag : tag[props.nameKey] }}
+      </MsTag>
+      <MsTag v-if="props.tagList.length > props.showNum" :width="numberTagWidth" v-bind="attrs">
         +{{ props.tagList.length - props.showNum }}</MsTag
       >
-    </a-tooltip>
-  </div>
+    </div>
+  </a-tooltip>
 </template>
 
 <script setup lang="ts">
@@ -42,6 +42,18 @@
   const tagsTooltip = computed(() => {
     return filterTagList.value.map((e: any) => (props.isStringTag ? e : e[props.nameKey])).join('，');
   });
+
+  const getTagWidth = (tag: { [x: string]: any }) => {
+    const tagStr = props.isStringTag ? tag : tag[props.nameKey];
+    const tagWidth = tagStr.length;
+    // 16个中文字符
+    return tagWidth < 16 ? tagWidth : 16;
+  };
+
+  const numberTagWidth = computed(() => {
+    const numberStr = `${props.tagList.length - props.showNum}`;
+    return numberStr.length + 4;
+  });
 </script>
 
 <style scoped lang="less"></style>
diff --git a/frontend/src/components/pure/ms-tag/ms-tag.vue b/frontend/src/components/pure/ms-tag/ms-tag.vue
index bcaca7866a..c45439edd9 100644
--- a/frontend/src/components/pure/ms-tag/ms-tag.vue
+++ b/frontend/src/components/pure/ms-tag/ms-tag.vue
@@ -3,9 +3,14 @@
     v-bind="attrs"
     :type="props.type"
     defer
-    :style="{ ...typeStyle, 'margin-right': tagMargin, 'max-width': '144px' }"
+    :style="{
+      ...typeStyle,
+      'margin-right': tagMargin,
+      'min-width': props.width && `${props.width}ch`,
+      'max-width: 144px': !props.width,
+    }"
     :size="props.size"
-    class="one-line-text inline-block"
+    class="inline-block"
   >
     <slot name="icon"></slot>
     <slot></slot>
@@ -26,6 +31,7 @@
       size?: Size; // tag尺寸
       theme?: Theme; // tag主题
       selfStyle?: any; // 自定义样式
+      width?: number; // tag宽度,不传入时绑定max-width
     }>(),
     {
       type: 'default',
diff --git a/frontend/src/layout/page-layout.vue b/frontend/src/layout/page-layout.vue
index 3fd8d1e628..9da40365e4 100644
--- a/frontend/src/layout/page-layout.vue
+++ b/frontend/src/layout/page-layout.vue
@@ -3,6 +3,7 @@
     <transition name="fade" mode="out-in" appear>
       <!-- transition内必须有且只有一个根元素，不然会导致二级路由的组件无法渲染 -->
       <div v-show="true" class="page-content">
+        <!-- TODO 实验性组件，以后优化 -->
         <Suspense v-if="!route.meta.isCache">
           <component :is="Component" :key="route.fullPath" />
         </Suspense>
diff --git a/frontend/src/views/setting/system/user/index.vue b/frontend/src/views/setting/system/user/index.vue
index 1372835bb3..e99993d56c 100644
--- a/frontend/src/views/setting/system/user/index.vue
+++ b/frontend/src/views/setting/system/user/index.vue
@@ -193,7 +193,6 @@
   import useTable from '@/components/pure/ms-table/useTable';
   import MsTableMoreAction from '@/components/pure/ms-table-more-action/index.vue';
   import type { ActionsItem } from '@/components/pure/ms-table-more-action/types';
-  import MsTagGroup from '@/components/pure/ms-tag/ms-tag-group.vue';
   import MsUpload from '@/components/pure/ms-upload/index.vue';
   import MsBatchForm from '@/components/business/ms-batch-form/index.vue';
   import type { FormItemModel, MsBatchFormInstance } from '@/components/business/ms-batch-form/types';
@@ -245,11 +244,13 @@
       title: 'system.user.tableColumnOrg',
       dataIndex: 'organizationList',
       isTag: true,
+      width: 300,
     },
     {
       title: 'system.user.tableColumnUserGroup',
       isTag: true,
       dataIndex: 'userRoleList',
+      width: 300,
     },
     {
       title: 'system.user.tableColumnStatus',
@@ -265,7 +266,6 @@
     },
   ];
   const tableStore = useTableStore();
-  tableStore.initColumn(TableKeyEnum.SYSTEM_USER, columns, 'drawer');
   const { propsRes, propsEvent, loadList, setKeyword, resetSelector } = useTable(
     getUserList,
     {
@@ -878,6 +878,7 @@
   function downLoadUserTemplate() {
     window.open('/templates/user_import.xlsx', '_blank');
   }
+  await tableStore.initColumn(TableKeyEnum.SYSTEM_USER, columns, 'drawer');
 </script>
 
 <style lang="less" scoped>