From fb7eddb137e5eff9a10b24d046746dcce854c4ca Mon Sep 17 00:00:00 2001
From: tanzhisong <minjingtzs@163.com>
Date: Fri, 28 Feb 2025 18:10:00 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E8=BD=A6=E8=BE=86=E5=93=81=E7=89=8C?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/miniapp/car/AppCarTree.data.ts |  79 ++++----
 src/views/miniapp/car/AppCarTreeList.vue | 312 ++++++++++++++++---------------
 2 files changed, 203 insertions(+), 188 deletions(-)

diff --git a/src/views/miniapp/car/AppCarTree.data.ts b/src/views/miniapp/car/AppCarTree.data.ts
index e11114f..5df5717 100644
--- a/src/views/miniapp/car/AppCarTree.data.ts
+++ b/src/views/miniapp/car/AppCarTree.data.ts
@@ -1,31 +1,36 @@
-import {BasicColumn} from '/@/components/Table';
-import {FormSchema} from '/@/components/Table';
-import { rules} from '/@/utils/helper/validator';
+import { BasicColumn } from '/@/components/Table';
+import { FormSchema } from '/@/components/Table';
+import { rules } from '/@/utils/helper/validator';
 import { render } from '/@/utils/common/renderUtils';
 import { getWeekMonthQuarterYear } from '/@/utils';
 //列表数据
 export const columns: BasicColumn[] = [
-   {
+  {
+    title: '英文首字母',
+    align: 'left',
+    dataIndex: 'bfirstletter',
+  },
+  {
     title: '名称',
     align: 'left',
-    dataIndex: 'name'
-   },
-   {
+    dataIndex: 'name',
+  },
+  {
     title: '描述',
     align: 'center',
-    dataIndex: 'description'
-   },
+    dataIndex: 'description',
+  },
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
   {
-    label: "名称",
-    field: "name",
+    label: '名称',
+    field: 'name',
     component: 'JInput',
   },
   {
-    label: "描述",
-    field: "description",
+    label: '英文首字母',
+    field: 'bfirstletter',
     component: 'JInput',
   },
 ];
@@ -36,48 +41,50 @@ export const formSchema: FormSchema[] = [
     field: 'pid',
     component: 'JTreeSelect',
     componentProps: {
-      dict: "app_car_tree,name,id",
-      pidField: "pid",
-      pidValue: "0",
-      hasChildField: "has_child",
+      dict: 'app_car_tree,name,id',
+      pidField: 'pid',
+      pidValue: '0',
+      hasChildField: 'has_child',
     },
   },
+  {
+    label: '英文首字母',
+    field: 'bfirstletter',
+    component: 'Input',
+  },
   {
     label: '名称',
     field: 'name',
     component: 'Input',
-    dynamicRules: ({model,schema}) => {
-          return [
-                 { required: true, message: '请输入名称!'},
-          ];
-     },
+    dynamicRules: ({ model, schema }) => {
+      return [{ required: true, message: '请输入名称!' }];
+    },
   },
   {
     label: '描述',
     field: 'description',
     component: 'Input',
   },
-	// TODO 主键隐藏字段，目前写死为ID
-	{
-	  label: '',
-	  field: 'id',
-	  component: 'Input',
-	  show: false
-	},
+  // TODO 主键隐藏字段，目前写死为ID
+  {
+    label: '',
+    field: 'id',
+    component: 'Input',
+    show: false,
+  },
 ];
 
 // 高级查询数据
 export const superQuerySchema = {
-  name: {title: '名称',order: 1,view: 'text', type: 'string',},
-  description: {title: '描述',order: 2,view: 'text', type: 'string',},
+  name: { title: '名称', order: 1, view: 'text', type: 'string' },
+  description: { title: '描述', order: 2, view: 'text', type: 'string' },
 };
 
-
 /**
-* 流程表单调用这个方法获取formSchema
-* @param param
-*/
-export function getBpmFormSchema(_formData): FormSchema[]{
+ * 流程表单调用这个方法获取formSchema
+ * @param param
+ */
+export function getBpmFormSchema(_formData): FormSchema[] {
   // 默认和原始表单保持一致 如果流程中配置了权限数据，这里需要单独处理formSchema
   return formSchema;
 }
diff --git a/src/views/miniapp/car/AppCarTreeList.vue b/src/views/miniapp/car/AppCarTreeList.vue
index 4704805..869bab1 100644
--- a/src/views/miniapp/car/AppCarTreeList.vue
+++ b/src/views/miniapp/car/AppCarTreeList.vue
@@ -1,24 +1,33 @@
 <template>
   <div>
     <!--引用表格-->
-    <BasicTable @register="registerTable" :rowSelection="rowSelection" :expandedRowKeys="expandedRowKeys" @expand="handleExpand" @fetch-success="onFetchSuccess">
+    <BasicTable
+      @register="registerTable"
+      :rowSelection="rowSelection"
+      :expandedRowKeys="expandedRowKeys"
+      @expand="handleExpand"
+      @fetch-success="onFetchSuccess"
+    >
       <!--插槽:table标题-->
       <template #tableTitle>
-          <a-button type="primary" v-auth="'car:app_car_tree:add'" @click="handleCreate" preIcon="ant-design:plus-outlined"> 新增</a-button>
-          <a-button  type="primary" v-auth="'car:app_car_tree:exportXls'"  preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
-          <j-upload-button  type="primary" v-auth="'car:app_car_tree:importExcel'"  preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+        <a-button type="primary" v-auth="'car:app_car_tree:add'" @click="handleCreate" preIcon="ant-design:plus-outlined"> 新增</a-button>
+        <a-button type="primary" v-auth="'car:app_car_tree:exportXls'" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+        <j-upload-button type="primary" v-auth="'car:app_car_tree:importExcel'" preIcon="ant-design:import-outlined" @click="onImportXls"
+          >导入</j-upload-button
+        >
 
-          <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-dropdown v-if="selectedRowKeys.length > 0">
           <template #overlay>
             <a-menu>
               <a-menu-item key="1" @click="batchHandleDelete">
-                <Icon icon="ant-design:delete-outlined"></Icon>
+                <Icon icon="ant-design:delete-outlined" />
                 删除
               </a-menu-item>
             </a-menu>
           </template>
-          <a-button  v-auth="'car:app_car_tree:deleteBatch'">批量操作
-            <Icon icon="ant-design:down-outlined"></Icon>
+          <a-button v-auth="'car:app_car_tree:deleteBatch'"
+            >批量操作
+            <Icon icon="ant-design:down-outlined" />
           </a-button>
         </a-dropdown>
         <!-- 高级查询 -->
@@ -26,70 +35,69 @@
       </template>
       <!--操作栏-->
       <template #action="{ record }">
-        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)" />
       </template>
       <!--字段回显插槽-->
-      <template v-slot:bodyCell="{ column, record, index, text }">
-      </template>
+      <template #bodyCell="{ column, record, index, text }"> </template>
     </BasicTable>
     <!--字典弹窗-->
-    <AppCarTreeModal @register="registerModal" @success="handleSuccess"/>
+    <AppCarTreeModal @register="registerModal" @success="handleSuccess" />
   </div>
 </template>
 
 <script lang="ts" name="car-appCarTree" setup>
   //ts语法
-  import {ref, reactive, computed, unref, toRaw, nextTick} from 'vue';
-  import {BasicTable, TableAction} from '/@/components/Table';
-  import {useModal} from '/@/components/Modal';
-  import { useListPage } from '/@/hooks/system/useListPage'
+  import { ref, reactive, computed, unref, toRaw, nextTick } from 'vue';
+  import { BasicTable, TableAction } from '/@/components/Table';
+  import { useModal } from '/@/components/Modal';
+  import { useListPage } from '/@/hooks/system/useListPage';
   import AppCarTreeModal from './components/AppCarTreeModal.vue';
-  import {columns, searchFormSchema, superQuerySchema} from './AppCarTree.data';
+  import { columns, searchFormSchema, superQuerySchema } from './AppCarTree.data';
   import { downloadFile } from '/@/utils/common/renderUtils';
-  import {list, deleteAppCarTree, batchDeleteAppCarTree, getExportUrl,getImportUrl, getChildList,getChildListBatch} from './AppCarTree.api';
+  import { list, deleteAppCarTree, batchDeleteAppCarTree, getExportUrl, getImportUrl, getChildList, getChildListBatch } from './AppCarTree.api';
   const queryParam = reactive<any>({});
   const expandedRowKeys = ref([]);
   //字典model
-  const [registerModal, {openModal}] = useModal();
-   //注册table数据
-  const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
-    tableProps:{
-         api: list,
-         title: '汽车品牌',
-         columns,
-         canResize:false,
-         isTreeTable: true,
-         formConfig: {
-           //labelWidth: 120,
-           schemas: searchFormSchema,
-           autoSubmitOnEnter:true,
-           showAdvancedButton:true,
-           fieldMapToNumber: [
-           ],
-           fieldMapToTime: [
-           ],
-         },
-         actionColumn: {
-           width: 240,
-           fixed:'right'
-         },
-         beforeFetch: (params) => {
-           params.hasQuery = "true"; 
-           return Object.assign(params, queryParam);
-         },
+  const [registerModal, { openModal }] = useModal();
+  //注册table数据
+  const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
+    tableProps: {
+      api: list,
+      title: '汽车品牌',
+      columns,
+      canResize: false,
+      isTreeTable: true,
+      formConfig: {
+        //labelWidth: 120,
+        schemas: searchFormSchema,
+        autoSubmitOnEnter: true,
+        showAdvancedButton: true,
+        fieldMapToNumber: [],
+        fieldMapToTime: [],
+      },
+      actionColumn: {
+        width: 240,
+        fixed: 'right',
+      },
+      beforeFetch: (params) => {
+        params.hasQuery = 'false';
+        params.order = '';
+        return Object.assign(params, queryParam);
+      },
     },
-     exportConfig: {
-          name:"汽车品牌",
-          url: getExportUrl,
-          params: queryParam,
-        },
-        importConfig: {
-          url: getImportUrl,
-          success: importSuccess
-        },
-    })
+    exportConfig: {
+      name: '汽车品牌',
+      url: getExportUrl,
+      params: queryParam,
+    },
+    importConfig: {
+      url: getImportUrl,
+      success: importSuccess,
+    },
+  });
 
-  const [registerTable, {reload, collapseAll, updateTableDataRecord, findTableDataRecord,getDataSource},{ rowSelection, selectedRowKeys }] = tableContext
+  const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] =
+    tableContext;
 
   // 高级查询配置
   const superQueryConfig = reactive(superQuerySchema);
@@ -138,20 +146,20 @@
    * 删除事件
    */
   async function handleDelete(record) {
-    await deleteAppCarTree({id: record.id}, importSuccess);
+    await deleteAppCarTree({ id: record.id }, importSuccess);
   }
 
   /**
    * 批量删除事件
    */
   async function batchHandleDelete() {
-    const ids = selectedRowKeys.value.filter(item => !item.includes('loadChild'))
-    await batchDeleteAppCarTree({id: ids}, importSuccess);
+    const ids = selectedRowKeys.value.filter((item) => !item.includes('loadChild'));
+    await batchDeleteAppCarTree({ id: ids }, importSuccess);
   }
   /**
    * 导入
    */
-   function importSuccess() {
+  function importSuccess() {
     (selectedRowKeys.value = []) && reload();
   }
   /**
@@ -166,7 +174,7 @@
   /**
    * 成功回调
    */
-  async function handleSuccess({isUpdate, values, expandedArr, changeParent}) {
+  async function handleSuccess({ isUpdate, values, expandedArr, changeParent }) {
     if (isUpdate) {
       if (changeParent) {
         reload();
@@ -175,21 +183,21 @@
         if (data && data.records && data.records.length > 0) {
           // 编辑回调
           updateTableDataRecord(values.id, data.records[0]);
-        }else{
+        } else {
           updateTableDataRecord(values.id, values);
         }
       }
     } else {
-        if(!values['id'] || !values['pid']){
-            //新增根节点
-            reload();
-        }else{
-            //新增子集
-            expandedRowKeys.value = [];
-            for (let key of unref(expandedArr)) {
-                await expandTreeNode(key)
-            }
+      if (!values['id'] || !values['pid']) {
+        //新增根节点
+        reload();
+      } else {
+        //新增子集
+        expandedRowKeys.value = [];
+        for (let key of unref(expandedArr)) {
+          await expandTreeNode(key);
         }
+      }
     }
   }
 
@@ -197,58 +205,58 @@
    * 接口请求成功后回调
    */
   function onFetchSuccess(result) {
-      getDataByResult(result.items)&&loadDataByExpandedRows();
+    getDataByResult(result.items) && loadDataByExpandedRows();
   }
   /**
    * 根据已展开的行查询数据（用于保存后刷新时异步加载子级的数据）
    */
   async function loadDataByExpandedRows() {
-      if (unref(expandedRowKeys).length > 0) {
-          const res = await getChildListBatch({ parentIds: unref(expandedRowKeys).join(',')});
-          if (res.success && res.result.records.length>0) {
-              //已展开的数据批量子节点
-              let records = res.result.records
-              const listMap = new Map();
-              for (let item of records) {
-                  let pid = item['pid'];
-                  if (unref(expandedRowKeys).includes(pid)) {
-                      let mapList = listMap.get(pid);
-                      if (mapList == null) {
-                          mapList = [];
-                      }
-                      mapList.push(item);
-                      listMap.set(pid, mapList);
-                  }
+    if (unref(expandedRowKeys).length > 0) {
+      const res = await getChildListBatch({ parentIds: unref(expandedRowKeys).join(',') });
+      if (res.success && res.result.records.length > 0) {
+        //已展开的数据批量子节点
+        let records = res.result.records;
+        const listMap = new Map();
+        for (let item of records) {
+          let pid = item['pid'];
+          if (unref(expandedRowKeys).includes(pid)) {
+            let mapList = listMap.get(pid);
+            if (mapList == null) {
+              mapList = [];
+            }
+            mapList.push(item);
+            listMap.set(pid, mapList);
+          }
+        }
+        let childrenMap = listMap;
+        let fn = (list) => {
+          if (list) {
+            list.forEach((data) => {
+              if (unref(expandedRowKeys).includes(data.id)) {
+                data.children = getDataByResult(childrenMap.get(data.id));
+                fn(data.children);
               }
-              let childrenMap = listMap;
-              let fn = (list) => {
-                  if(list) {
-                      list.forEach(data => {
-                          if (unref(expandedRowKeys).includes(data.id)) {
-                              data.children = getDataByResult(childrenMap.get(data.id))
-                              fn(data.children)
-                          }
-                      })
-                  }
-              };
-              fn(getDataSource())
+            });
           }
+        };
+        fn(getDataSource());
       }
+    }
   }
   /**
    * 处理数据集
    */
-  function getDataByResult(result){
-      if(result && result.length>0){
-          return result.map(item=>{
-              //判断是否标记了带有子节点
-              if(item["hasChild"]=='1'){
-                  let loadChild = { id: item.id+'_loadChild', name: 'loading...', isLoading: true }
-                  item.children = [loadChild]
-              }
-              return item
-          })
-      }
+  function getDataByResult(result) {
+    if (result && result.length > 0) {
+      return result.map((item) => {
+        //判断是否标记了带有子节点
+        if (item['hasChild'] == '1') {
+          let loadChild = { id: item.id + '_loadChild', name: 'loading...', isLoading: true };
+          item.children = [loadChild];
+        }
+        return item;
+      });
+    }
   }
   /**
    *树节点展开合并
@@ -256,19 +264,19 @@
   async function handleExpand(expanded, record) {
     // 判断是否是展开状态，展开状态(expanded)并且存在子集(children)并且未加载过(isLoading)的就去查询子节点数据
     if (expanded) {
-       expandedRowKeys.value.push(record.id)
+      expandedRowKeys.value.push(record.id);
       if (record.children.length > 0 && !!record.children[0].isLoading) {
-        let result = await getChildList({pid: record.id});
-        result=result.records?result.records:result;
+        let result = await getChildList({ pid: record.id });
+        result = result.records ? result.records : result;
         if (result && result.length > 0) {
           record.children = getDataByResult(result);
         } else {
-          record.children = null
-          record.hasChild = '0'
+          record.children = null;
+          record.hasChild = '0';
         }
       }
     } else {
-      let keyIndex = expandedRowKeys.value.indexOf(record.id)
+      let keyIndex = expandedRowKeys.value.indexOf(record.id);
       if (keyIndex >= 0) {
         expandedRowKeys.value.splice(keyIndex, 1);
       }
@@ -278,16 +286,16 @@
    *操作表格后处理树节点展开合并
    * */
   async function expandTreeNode(key) {
-    let record = findTableDataRecord(key)
+    let record = findTableDataRecord(key);
     expandedRowKeys.value.push(key);
-      let result = await getChildList({pid: key});
-      if (result && result.length > 0) {
-          record.children = getDataByResult(result);
-      } else {
-          record.children = null
-          record.hasChild = '0'
-      }
-      updateTableDataRecord(key, record);
+    let result = await getChildList({ pid: key });
+    if (result && result.length > 0) {
+      record.children = getDataByResult(result);
+    } else {
+      record.children = null;
+      record.hasChild = '0';
+    }
+    updateTableDataRecord(key, record);
   }
   /**
    * 操作栏
@@ -297,39 +305,39 @@
       {
         label: '编辑',
         onClick: handleEdit.bind(null, record),
-        auth: 'car:app_car_tree:edit'
+        auth: 'car:app_car_tree:edit',
       },
       {
         label: '添加下级',
-        onClick: handleAddSub.bind(null, {pid: record.id}),
-      }
-    ]
+        onClick: handleAddSub.bind(null, { pid: record.id }),
+      },
+    ];
+  }
+  /**
+   * 下拉操作栏
+   */
+  function getDropDownAction(record) {
+    return [
+      {
+        label: '详情',
+        onClick: handleDetail.bind(null, record),
+      },
+      {
+        label: '删除',
+        popConfirm: {
+          title: '确定删除吗?',
+          confirm: handleDelete.bind(null, record),
+          placement: 'topLeft',
+        },
+        auth: 'car:app_car_tree:delete',
+      },
+    ];
   }
-   /**
-    * 下拉操作栏
-    */
-   function getDropDownAction(record){
-     return [
-       {
-         label: '详情',
-         onClick: handleDetail.bind(null, record),
-       }, {
-         label: '删除',
-         popConfirm: {
-           title: '确定删除吗?',
-           confirm: handleDelete.bind(null, record),
-           placement: 'topLeft'
-         },
-         auth: 'car:app_car_tree:delete'
-       }
-     ]
-   }
-
-
 </script>
 
 <style lang="less" scoped>
-  :deep(.ant-picker),:deep(.ant-input-number){
+  :deep(.ant-picker),
+  :deep(.ant-input-number) {
     width: 100%;
   }
 </style>