From 31c874e1bac6ca1572bf4b846976c36996c13e14 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Wed, 18 Dec 2024 15:08:55 +0800
Subject: [PATCH] =?UTF-8?q?refactor(core):=20=E9=87=8D=E6=9E=84=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=AD=97=E5=85=B8=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将 AppDictionary 组件拆分为 dictList 和 DictDetail 两个子组件
-优化数据字典列表的渲染逻辑
---
 packages/core/AppDictionary/AppDictionary.vue | 136 +----------------
 packages/core/AppDictionary/dictList.vue      | 142 ++++++++++++++++++
 ui/lib/styles/common.scss                     |   2 +-
 ui/packages/layout/AiPage.vue                 |   2 +-
 4 files changed, 150 insertions(+), 132 deletions(-)
 create mode 100644 packages/core/AppDictionary/dictList.vue

diff --git a/packages/core/AppDictionary/AppDictionary.vue b/packages/core/AppDictionary/AppDictionary.vue
index ce0e0b16..aff3d1b7 100644
--- a/packages/core/AppDictionary/AppDictionary.vue
+++ b/packages/core/AppDictionary/AppDictionary.vue
@@ -1,151 +1,27 @@
 <template>
   <section class="AppDictionary">
-    <ai-list v-if="!showDetail">
-      <ai-title slot="title" title="数据字典" isShowBottomBorder/>
-      <template #content>
-        <ai-search-bar>
-          <template #left>
-            <el-button type="primary" size="small" icon="iconfont iconAdd" @click="addDict"
-                       v-if="$permissions('admin_sysdictionary_add')">添加
-            </el-button>
-          </template>
-          <template #right>
-            <el-input size="small" v-model="search.condition" placeholder="数据项" clearable
-                      @change="page.current=1,getDicts()" prefix-icon="iconfont iconSearch"/>
-            <el-button type="primary" size="small" icon="iconfont iconSearch"
-                       @click="page.current=1,getDicts()">查询
-            </el-button>
-            <el-button size="small" icon="el-icon-refresh-right" @click="resetSearch">重置</el-button>
-          </template>
-        </ai-search-bar>
-        <el-table size="mini" :data="dictList" header-cell-class-name="table-header" tooltip-effect="light"
-                  row-class-name="table-row" cell-class-name="table-cell" @expand-change="getDictInfo">
-          <el-table-column type="expand">
-            <el-row slot-scope="{row}" type="flex" align="middle" style="flex-wrap: wrap">
-              <el-tag v-for="(op,i) in row.detail||[]" :key="i" style="margin: 4px">{{ op.dictValue }}｜{{ op.dictName }}
-                {{ op.dictColor ? '| ' + op.dictColor : '' }}
-              </el-tag>
-            </el-row>
-          </el-table-column>
-          <el-table-column align="center" label="数据项" prop="code"/>
-          <el-table-column align="center" label="数据项名称" prop="name"/>
-          <el-table-column align="center" label="操作">
-            <div slot-scope="{row}">
-              <el-button type="text" @click="openDetail(row.id)" v-text="'编辑'"
-                         v-if="$permissions('admin_sysdictionary_edit')"/>
-              <el-button type="text" @click="handleDelete(row.id)" v-text="'删除'"
-                         v-if="$permissions('admin_sysdictionary_del')"/>
-            </div>
-          </el-table-column>
-          <div slot="empty" class="no-data"></div>
-        </el-table>
-        <div class="pagination">
-          <el-pagination background :current-page.sync="page.current" :total="page.total"
-                         layout="total,prev, pager, next,sizes, jumper"
-                         @size-change="handleSizeChange"
-                         :page-size="page.size"
-                         :page-sizes="[10, 20, 50, 100,200]"
-                         @current-change="getDicts"/>
-        </div>
-      </template>
-    </ai-list>
-    <dict-detail v-else :instance="instance" :permissions="permissions"/>
+    <component :is="currentPage" v-bind="$props"/>
   </section>
 </template>
 
 <script>
 import DictDetail from "./dictDetail";
+import DictList from "@project/xumu/AppDictionary/dictList.vue";
 
 export default {
   name: "AppDictionary",
-  components: {DictDetail},
   label: "数据字典",
   props: {
     instance: Function,
+    dict: Object,
     permissions: Function
   },
   computed: {
-    showDetail() {
-      return this.$route.hash == "#add"
+    currentPage() {
+      let {hash} = this.$route
+      return hash == "#add" ? DictDetail : DictList
     }
   },
-  data() {
-    return {
-      page: {
-        current: 1,
-        total: 0,
-        size: 10
-      },
-      search: {
-        condition: ""
-      },
-      dictList: [],
-      id: ''
-    }
-  },
-  methods: {
-    resetSearch() {
-      this.page.current = 1;
-      this.search.condition = '';
-      this.getDicts();
-    },
-    getDicts() {
-      this.instance.post("/admin/dictionary/queryDictList", null, {
-        params: {
-          ...this.page,
-          name: this.search.condition
-        }
-      }).then(res => {
-        this.dictList = res.data.records.map(e => {
-          return {...e, detail: []}
-        })
-        this.page.total = res.data.total
-      })
-    },
-    addDict() {
-      this.$router.push({hash: "#add"})
-    },
-    handleDelete(id) {
-      this.$confirm("确定要删除该数据项吗？", {
-        type: "error"
-      }).then(() => {
-        this.instance.post("/admin/dictionary/deleteDict", null, {
-          params: {id}
-        }).then(res => {
-          if (res?.code == 0) {
-            this.getDicts();
-            this.$message.success("删除成功!")
-          }
-        })
-      }).catch(() => 0)
-    },
-    openDetail(id) {
-      this.$router.push({query: {id}, hash: "#add"})
-    },
-    handleSizeChange(val) {
-      this.page.size = val;
-      this.getDicts();
-    },
-    getDictInfo(row) {
-      if (row.detail.length) {
-        row.detail = []
-      } else {
-        this.getDict(row.id).then(res => {
-          if (res && res.data) {
-            row.detail = res.data.dictionaryDetails || []
-          }
-        })
-      }
-    },
-    getDict(dictionaryId) {
-      return this.instance.post("/admin/dictionary/queryDictDetail", null, {
-        params: {dictionaryId}
-      })
-    },
-  },
-  created() {
-    this.getDicts()
-  },
 }
 </script>
 
diff --git a/packages/core/AppDictionary/dictList.vue b/packages/core/AppDictionary/dictList.vue
new file mode 100644
index 00000000..4d45be04
--- /dev/null
+++ b/packages/core/AppDictionary/dictList.vue
@@ -0,0 +1,142 @@
+<script>
+const columns = [
+  {slot: "expand"},
+  {label: "数据项", prop: "code"},
+  {label: "数据项名称", prop: "name"},
+]
+export default {
+  name: "dictList",
+  props: {
+    instance: Function,
+    dict: Object,
+    permissions: Function
+  },
+  data() {
+    return {
+      columns,
+      page: {
+        current: 1,
+        total: 0,
+        size: 10
+      },
+      search: {
+        condition: ""
+      },
+      dictList: [],
+      id: ''
+    }
+  },
+  methods: {
+    resetSearch() {
+      this.page.current = 1;
+      this.search.condition = '';
+      this.getDicts();
+    },
+    getDicts() {
+      this.instance.post("/admin/dictionary/queryDictList", null, {
+        params: {
+          ...this.page,
+          name: this.search.condition
+        }
+      }).then(res => {
+        this.dictList = res.data.records.map(e => {
+          return {...e, detail: []}
+        })
+        this.page.total = res.data.total
+      })
+    },
+    addDict() {
+      this.$router.push({hash: "#add"})
+    },
+    handleDelete(id) {
+      this.$confirm("确定要删除该数据项吗？", {
+        type: "error"
+      }).then(() => {
+        this.instance.post("/admin/dictionary/deleteDict", null, {
+          params: {id}
+        }).then(res => {
+          if (res?.code == 0) {
+            this.getDicts();
+            this.$message.success("删除成功!")
+          }
+        })
+      }).catch(() => 0)
+    },
+    openDetail(id) {
+      this.$router.push({query: {id}, hash: "#add"})
+    },
+    handleSizeChange(val) {
+      this.page.size = val;
+      this.getDicts();
+    },
+    getDictInfo(row) {
+      if (row.detail.length) {
+        row.detail = []
+      } else {
+        this.getDict(row.id).then(res => {
+          if (res && res.data) {
+            row.detail = res.data.dictionaryDetails || []
+          }
+        })
+      }
+    },
+    getDict(dictionaryId) {
+      return this.instance.post("/admin/dictionary/queryDictDetail", null, {
+        params: {dictionaryId}
+      })
+    },
+  },
+  created() {
+    this.getDicts()
+  },
+}
+</script>
+<template>
+  <section class="dictList">
+    <ai-list>
+      <ai-title slot="title" title="数据字典" isShowBottomBorder/>
+      <template #content>
+        <ai-search-bar>
+          <template #left>
+            <el-button type="primary" size="small" icon="iconfont iconAdd" @click="addDict"
+                       v-if="$permissions('admin_sysdictionary_add')">添加
+            </el-button>
+          </template>
+          <template #right>
+            <el-input size="small" v-model="search.condition" placeholder="数据项" clearable
+                      @change="page.current=1,getDicts()" prefix-icon="iconfont iconSearch"/>
+            <el-button type="primary" size="small" icon="iconfont iconSearch"
+                       @click="page.current=1,getDicts()">查询
+            </el-button>
+            <el-button size="small" icon="el-icon-refresh-right" @click="resetSearch">重置</el-button>
+          </template>
+        </ai-search-bar>
+        <ai-table :tableData="dictList" :colConfigs="columns" :dict="dict" @getList="getDicts"
+                  :total="page.total" :current.sync="page.current" :size.sync="page.size" :page-sizes="[10, 20, 50, 100,200]"
+                  @expand-change="getDictInfo">
+          <el-table-column slot="expand" type="expand">
+            <template slot-scope="{row}">
+              <div class="flex" style="gap:4px">
+                <el-tag v-for="(op,i) in row.detail||[]" :key="i">{{ [op.dictValue, op.dictName, op.dictColor].filter(Boolean).join("｜") }}</el-tag>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column slot="options" label="操作" fixed="right" align="center">
+            <template slot-scope="{row}">
+              <div class="table-options">
+                <el-button type="text" @click="openDetail(row.id)" v-if="$permissions('admin_sysdictionary_edit')">编辑</el-button>
+                <el-button type="text" @click="handleDelete(row.id)" v-if="$permissions('admin_sysdictionary_del')">删除</el-button>
+              </div>
+            </template>
+          </el-table-column>
+        </ai-table>
+      </template>
+    </ai-list>
+  </section>
+</template>
+
+<style scoped lang="scss">
+.dictList {
+  height: 100%;
+}
+</style>
diff --git a/ui/lib/styles/common.scss b/ui/lib/styles/common.scss
index 34f65c74..763b418c 100644
--- a/ui/lib/styles/common.scss
+++ b/ui/lib/styles/common.scss
@@ -357,7 +357,7 @@ div[flex], .flex {
   display: grid;
   gap: 8px;
   grid-template-columns: repeat(2, 1fr);
-  @for $i from 2 through 5 {
+  @for $i from 2 through 10 {
     &.c-#{$i} {
       grid-template-columns: repeat($i, 1fr);
     }
diff --git a/ui/packages/layout/AiPage.vue b/ui/packages/layout/AiPage.vue
index 68e7ba1e..2c5d7e04 100644
--- a/ui/packages/layout/AiPage.vue
+++ b/ui/packages/layout/AiPage.vue
@@ -15,7 +15,7 @@ export default {
     <slot v-if="$slots.title" name="title"/>
     <ai-title v-else-if="$attrs.title" :title="$attrs.title" isShowBottomBorder/>
     <div class="fill main">
-      <div class="left">
+      <div v-if="$slots.left" class="left">
         <slot name="left"/>
       </div>
       <div class="fill" :class="[contentString]">