From 46deecbfde3a1828fcc61b5cb841f212da388b87 Mon Sep 17 00:00:00 2001
From: Zhufu <1176354795@qq.com>
Date: Tue, 30 Apr 2024 15:43:15 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=AD=97=E5=85=B8=E5=88=86=E7=B1=BB?=
 =?UTF-8?q?=E3=80=91=E5=88=86=E7=B1=BB=E6=8C=89=E9=92=AE=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=9C=A8=E5=8F=B3=E4=BE=A7=EF=BC=9B=E5=8F=96=E6=B6=88=E5=85=A8?=
 =?UTF-8?q?=E9=83=A8=E8=8F=9C=E5=8D=95=E6=8C=89=E9=92=AE=EF=BC=9B=E5=88=9D?=
 =?UTF-8?q?=E5=A7=8B=E5=8C=96=E9=BB=98=E8=AE=A4=E8=8E=B7=E5=8F=96=E7=AC=AC?=
 =?UTF-8?q?=E4=B8=80=E6=9D=A1=E8=8F=9C=E5=8D=95=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/demo/Categories/index.vue | 62 +++++++++++++++++------------
 1 file changed, 36 insertions(+), 26 deletions(-)

diff --git a/src/views/demo/Categories/index.vue b/src/views/demo/Categories/index.vue
index 45d5528..261c770 100644
--- a/src/views/demo/Categories/index.vue
+++ b/src/views/demo/Categories/index.vue
@@ -1,20 +1,14 @@
 <template>
   <div class="page-div categories-page">
     <div class="left-div w-1/4 xl:w-1/5 m-4 mr-0">
-      <div class="header">
-        <div class="buttons-div">
-          <a-button type="primary" color='error' @click="buttonClick('left-del')">删除分类</a-button>
-          <a-button type="primary" color='info' @click="buttonClick('left-add')">添加分类</a-button>
-        </div>
+      <div class="header mb-1">
+        <div class='header-title'>分类列表</div>
         <div class="search-div">
-          <a-input-search size="small" v-model:value="LValue" placeholder="请输入内容" enter-button @search="searchData('left')"/>
+          <a-input-search size="small" v-model:value="LValue" placeholder="搜索" enter-button @search="searchData('left')"/>
         </div>
         
       </div>
       <div class="content">
-        <div class="show-all-button">
-          <a-button type="link" @click="changeTypeId('')">全部字典>></a-button>
-        </div>
         <div class="showTree">
           <BasicTree :treeData="showLTree" :loading="lLoading" @select="(selectedKeys,{node}) => {getLeftSelectId(node.id);changeTypeId(node.key)}"/>
         </div>
@@ -64,9 +58,17 @@ const modalData = reactive({
   data:{},
   type:'',
 })
+const firstRequestCode = ref('')
+
 const [registerTable,{reload,getSelectRows}] = useTable({
   beforeFetch: (params) => {
-    return {...params, code:typeId.value,}
+    console.log(firstRequestCode.value,'before')
+    if(firstRequestCode.value !== ''){
+      params = {...params, code: firstRequestCode.value}
+    }else{
+      params = {...params, code:typeId.value}
+    }
+    return params
   },
   api:getRightTable,
   columns,
@@ -84,22 +86,32 @@ const [registerTable,{reload,getSelectRows}] = useTable({
   handleSearchInfoFn(info) {
       return info;
   },
+  immediate:false,
+  afterFetch(res){
+    firstRequestCode.value = ''
+    return res
+  },
 
 })
-const getLeftTreeData = () => {
+const getLeftTreeData = (isMounted) => {
   lLoading.value = true
   getLeftTree().then(res => {
     let data = dataProcess(res)
     lTree.value = data
     showLTree.value = data
     lLoading.value = false
+    if(isMounted && data.length > 0){
+      firstRequestCode.value = data[0].key
+      typeId.value = data[0].key
+    }
+    reload()
   }).catch(err => {
     console.log(err)
     lLoading.value = false
   })
 }
 onMounted(() => {
-  getLeftTreeData()
+  getLeftTreeData(true)
 })
 const changeTypeId = (value) => {
   typeId.value = value
@@ -121,7 +133,7 @@ const submit = () => {
   switch(modalData.type){
     case 'leftadd':
       addLeftItem(modalData.data).then(res => {
-        getLeftTreeData()
+        getLeftTreeData(false)
         openModal.value = false
       }).catch(err => {
         console.log(err)
@@ -179,7 +191,7 @@ const buttonClick = (diffType) => {
           onOk() {
             if(isLeft){
               return delLeftItem({id:selectLeftId.value}).then(res => {
-                getLeftTreeData()
+                getLeftTreeData(false)
                 typeId.value = ''
                 reload()
               }).catch(err => {
@@ -233,14 +245,18 @@ const clearModal = () => {
     flex-direction: column;
     .header{
       display: flex;
-      flex-direction: column;
+      align-items: center;
       padding:10px;
-      .buttons-div{
-        display: flex;
-        justify-content: space-between;
+      border-bottom: 1px solid #eee;
+      .header-title{
+        width: 132px;
+        font-size: 16px;
+        font-weight: 500;
+        line-height: 24px;
+        cursor: pointer;
+        user-select: none;
       }
       .search-div{
-        margin-top:10px;
         display: flex;
       } 
     }
@@ -248,14 +264,8 @@ const clearModal = () => {
       border-radius: 5px;
       height:100%;
       overflow: auto;
-      .show-all-button{
-        height:34px;
-        line-height: 34px;
-        padding-left: 20px;
-        border-bottom: 1px solid #ccc;
-      }
       .showTree {
-        height: calc(100% - 34px);
+        height: 100%;
         overflow: auto;
       }
     }