产品分类后台管理完成

.gitignore

@@ -0,0 +1,4 @@
+logs
+.idea
+*.log
+ZJ-javaimage

ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/controller/goods/GoodsCateController.java

@@ -1,16 +1,14 @@
-package com.wyh.admin.controller;
+package com.wyh.admin.controller.goods;
 
+import com.alibaba.fastjson2.JSONArray;
 import com.wyh.admin.aop.Log;
 import com.wyh.admin.service.IGoodsCateService;
 import com.wyh.admin.validate.commons.IdValidate;
 import com.wyh.admin.validate.GoodsCateCreateValidate;
 import com.wyh.admin.validate.GoodsCateUpdateValidate;
 import com.wyh.admin.validate.GoodsCateSearchValidate;
-import com.wyh.admin.validate.commons.PageValidate;
-import com.wyh.admin.vo.GoodsCateListedVo;
 import com.wyh.admin.vo.GoodsCateDetailVo;
 import com.wyh.common.core.AjaxResult;
-import com.wyh.common.core.PageResult;
 import com.wyh.common.validator.annotation.IDMust;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -29,9 +27,8 @@ public class GoodsCateController {
 
     @GetMapping("/list")
     @ApiOperation(value="产品分类列表")
-    public AjaxResult<PageResult<GoodsCateListedVo>> list(@Validated PageValidate pageValidate,
+    public AjaxResult<JSONArray> list(@Validated GoodsCateSearchValidate searchValidate) {
-                                                     @Validated GoodsCateSearchValidate searchValidate) {
+        JSONArray list = iGoodsCateService.list(searchValidate);
-        PageResult<GoodsCateListedVo> list = iGoodsCateService.list(pageValidate, searchValidate);
         return AjaxResult.success(list);
     }
 

ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/service/IGoodsCateService.java

@@ -1,12 +1,10 @@
 package com.wyh.admin.service;
 
-import com.wyh.admin.validate.commons.PageValidate;
+import com.alibaba.fastjson2.JSONArray;
 import com.wyh.admin.validate.GoodsCateCreateValidate;
 import com.wyh.admin.validate.GoodsCateUpdateValidate;
 import com.wyh.admin.validate.GoodsCateSearchValidate;
-import com.wyh.admin.vo.GoodsCateListedVo;
 import com.wyh.admin.vo.GoodsCateDetailVo;
-import com.wyh.common.core.PageResult;
 
 /**
  * 产品分类服务接口类
@@ -18,11 +16,10 @@ public interface IGoodsCateService {
      * 产品分类列表
      *
      * @author LikeAdmin
-     * @param pageValidate 分页参数
      * @param searchValidate 搜索参数
-     * @return PageResult<GoodsCateListedVo>
+     * @return JSONArray
      */
-    PageResult<GoodsCateListedVo> list(PageValidate pageValidate, GoodsCateSearchValidate searchValidate);
+    JSONArray list(GoodsCateSearchValidate searchValidate);
 
     /**
      * 产品分类详情

ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/service/impl/GoodsCateServiceImpl.java

@@ -1,10 +1,8 @@
 package com.wyh.admin.service.impl;
 
+import com.alibaba.fastjson2.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.yulichang.query.MPJQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.wyh.admin.validate.commons.PageValidate;
 import com.wyh.admin.service.IGoodsCateService;
 import com.wyh.admin.validate.GoodsCateCreateValidate;
 import com.wyh.admin.validate.GoodsCateUpdateValidate;
@@ -12,7 +10,6 @@ import com.wyh.admin.validate.GoodsCateSearchValidate;
 import com.wyh.admin.vo.GoodsCateListedVo;
 import com.wyh.admin.vo.GoodsCateDetailVo;
 import com.wyh.common.config.GlobalConfig;
-import com.wyh.common.core.PageResult;
 import com.wyh.common.entity.GoodsCate;
 import com.wyh.common.mapper.GoodsCateMapper;
 import com.wyh.common.util.ListUtils;
@@ -39,37 +36,35 @@ public class GoodsCateServiceImpl implements IGoodsCateService {
      * 产品分类列表
      *
      * @author LikeAdmin
-     * @param pageValidate 分页参数
      * @param searchValidate 搜索参数
-     * @return PageResult<GoodsCateListedVo>
+     * @return JSONArray
      */
     @Override
-    public PageResult<GoodsCateListedVo> list(PageValidate pageValidate, GoodsCateSearchValidate searchValidate) {
+    public JSONArray list(GoodsCateSearchValidate searchValidate) {
-        Integer page  = pageValidate.getPageNo();
-        Integer limit = pageValidate.getPageSize();
 
-        QueryWrapper<GoodsCate> queryWrapper = new QueryWrapper<>();
+        MPJQueryWrapper<GoodsCate> mpjQueryWrapper = new MPJQueryWrapper<>();
-        queryWrapper.eq("is_delete", 0);
+        mpjQueryWrapper.selectAll(GoodsCate.class);
-        queryWrapper.orderByDesc(Arrays.asList("sort", "id"));
+        mpjQueryWrapper.eq("is_delete", 0);
+        mpjQueryWrapper.orderByDesc(Arrays.asList("sort", "id"));
 
-        goodsCateMapper.setSearch(queryWrapper, searchValidate, new String[]{
+        goodsCateMapper.setSearch(mpjQueryWrapper, searchValidate, new String[]{
-            "like:name:str",
+                "like:name:str",
-            "=:sort:str",
+                "=:pid:str",
-            "=:status:long",
+                "=:sort:str",
+                "=:isShow@is_show:int",
         });
 
-        IPage<GoodsCate> iPage = goodsCateMapper.selectPage(new Page<>(page, limit), queryWrapper);
+        List<GoodsCateListedVo> array = goodsCateMapper.selectJoinList(
+                GoodsCateListedVo.class,
+                mpjQueryWrapper);
 
-        List<GoodsCateListedVo> list = new LinkedList<>();
+        for(GoodsCateListedVo item : array) {
-        for(GoodsCate item : iPage.getRecords()) {
+            item.setCreateTime(TimeUtils.timestampToDate(item.getCreateTime()));
-            GoodsCateListedVo vo = new GoodsCateListedVo();
+            item.setUpdateTime(TimeUtils.timestampToDate(item.getUpdateTime()));
-            BeanUtils.copyProperties(item, vo);
-            vo.setCreateTime(TimeUtils.timestampToDate(item.getCreateTime()));
-            vo.setUpdateTime(TimeUtils.timestampToDate(item.getUpdateTime()));
-            list.add(vo);
         }
 
-        return PageResult.iPageHandle(iPage.getTotal(), iPage.getCurrent(), iPage.getSize(), list);
+        JSONArray jsonArray = JSONArray.parseArray(JSONArray.toJSONString(array));
+        return ListUtils.listToTree(jsonArray, "id", "pid", "children");
     }
 
     /**
@@ -83,9 +78,9 @@ public class GoodsCateServiceImpl implements IGoodsCateService {
     public GoodsCateDetailVo detail(Integer id) {
         GoodsCate model = goodsCateMapper.selectOne(
                 new QueryWrapper<GoodsCate>()
-                    .eq("id", id)
+                        .eq("id", id)
-                    .eq("is_delete", 0)
+                        .eq("is_delete", 0)
-                    .last("limit 1"));
+                        .last("limit 1"));
 
         Assert.notNull(model, "数据不存在");
 
@@ -104,10 +99,11 @@ public class GoodsCateServiceImpl implements IGoodsCateService {
     public void add(GoodsCateCreateValidate createValidate) {
         GoodsCate model = new GoodsCate();
         model.setName(createValidate.getName());
+        model.setPid(createValidate.getPid());
         model.setCreateTime(System.currentTimeMillis() / 1000);
         model.setUpdateTime(System.currentTimeMillis() / 1000);
         model.setSort(createValidate.getSort());
-        model.setStatus(createValidate.getStatus());
+        model.setIsShow(createValidate.getIsShow());
         goodsCateMapper.insert(model);
     }
 
@@ -121,17 +117,18 @@ public class GoodsCateServiceImpl implements IGoodsCateService {
     public void edit(GoodsCateUpdateValidate updateValidate) {
         GoodsCate model = goodsCateMapper.selectOne(
                 new QueryWrapper<GoodsCate>()
-                    .eq("id",  updateValidate.getId())
+                        .eq("id",  updateValidate.getId())
-                    .eq("is_delete", 0)
+                        .eq("is_delete", 0)
-                    .last("limit 1"));
+                        .last("limit 1"));
 
         Assert.notNull(model, "数据不存在!");
 
         model.setId(updateValidate.getId());
         model.setName(updateValidate.getName());
+        model.setPid(updateValidate.getPid());
         model.setUpdateTime(System.currentTimeMillis() / 1000);
         model.setSort(updateValidate.getSort());
-        model.setStatus(updateValidate.getStatus());
+        model.setIsShow(updateValidate.getIsShow());
         goodsCateMapper.updateById(model);
     }
 
@@ -145,9 +142,9 @@ public class GoodsCateServiceImpl implements IGoodsCateService {
     public void del(Integer id) {
         GoodsCate model = goodsCateMapper.selectOne(
                 new QueryWrapper<GoodsCate>()
-                    .eq("id", id)
+                        .eq("id", id)
-                    .eq("is_delete", 0)
+                        .eq("is_delete", 0)
-                    .last("limit 1"));
+                        .last("limit 1"));
 
         Assert.notNull(model, "数据不存在!");
 

ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/service/impl/SettingDictDataServiceImpl.java

@@ -54,7 +54,7 @@ public class SettingDictDataServiceImpl implements ISettingDictDataService {
         queryWrapper.select("id,type_id,name,value,remark,sort,status,create_time,update_time");
         queryWrapper.eq("is_delete", 0);
         queryWrapper.eq("type_id", dictType.getId());
-        queryWrapper.orderByDesc("id");
+        queryWrapper.orderByDesc("sort").orderByDesc("id");
 
         dictDataMapper.setSearch(queryWrapper, params, new String[]{
                 "like:name:str",
@@ -101,7 +101,8 @@ public class SettingDictDataServiceImpl implements ISettingDictDataService {
         queryWrapper.select("id,type_id,name,value,remark,sort,status,create_time,update_time");
         queryWrapper.eq("type_id", dictType.getId());
         queryWrapper.eq("is_delete", 0);
-        queryWrapper.orderByDesc("id");
+        queryWrapper.orderByDesc("sort").orderByDesc("id");
+
 
         dictDataMapper.setSearch(queryWrapper, params, new String[]{
                 "like:name:str",

ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/validate/goods/GoodsCateCreateValidate.java

@@ -16,12 +16,16 @@ public class GoodsCateCreateValidate implements Serializable {
     @ApiModelProperty(value = "产品分类名称")
     private String name;
 
+    @NotNull(message = "pid参数缺失")
+    @ApiModelProperty(value = "上级菜单")
+    private String pid;
+
     @NotNull(message = "sort参数缺失")
     @ApiModelProperty(value = "排序编号")
     private String sort;
 
-    @NotNull(message = "status参数缺失")
+    @NotNull(message = "isShow参数缺失")
-    @ApiModelProperty(value = "是否禁用: 0=否, 1=是")
+    @ApiModelProperty(value = "是否显示: 0=否, 1=是")
-    private Long status;
+    private String isShow;
 
 }

ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/validate/goods/GoodsCateSearchValidate.java

@@ -14,10 +14,13 @@ public class GoodsCateSearchValidate implements Serializable {
     @ApiModelProperty(value = "产品分类名称")
     private String name;
 
+    @ApiModelProperty(value = "上级菜单")
+    private String pid;
+
     @ApiModelProperty(value = "排序编号")
     private String sort;
 
-    @ApiModelProperty(value = "是否禁用: 0=否, 1=是")
+    @ApiModelProperty(value = "是否显示: 0=否, 1=是")
-    private Long status;
+    private String isShow;
 
 }

ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/validate/goods/GoodsCateUpdateValidate.java

@@ -25,12 +25,16 @@ public class GoodsCateUpdateValidate implements Serializable {
     @ApiModelProperty(value = "产品分类名称")
     private String name;
 
+    @NotNull(message = "pid参数缺失")
+    @ApiModelProperty(value = "上级菜单")
+    private String pid;
+
     @NotNull(message = "sort参数缺失")
     @ApiModelProperty(value = "排序编号")
     private String sort;
 
-    @NotNull(message = "status参数缺失")
+    @NotNull(message = "isShow参数缺失")
-    @ApiModelProperty(value = "是否禁用: 0=否, 1=是")
+    @ApiModelProperty(value = "是否显示: 0=否, 1=是")
-    private Long status;
+    private String isShow;
 
 }

ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/vo/goods/GoodsCateDetailVo.java

@@ -18,11 +18,14 @@ public class GoodsCateDetailVo implements Serializable {
     @ApiModelProperty(value = "产品分类名称")
     private String name;
 
+    @ApiModelProperty(value = "上级菜单")
+    private String pid;
+
     @ApiModelProperty(value = "排序编号")
     private String sort;
 
-    @ApiModelProperty(value = "是否禁用: 0=否, 1=是")
+    @ApiModelProperty(value = "是否显示: 0=否, 1=是")
-    private Long status;
+    private String isShow;
 
 
 }

ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/vo/goods/GoodsCateListedVo.java

@@ -18,6 +18,9 @@ public class GoodsCateListedVo implements Serializable {
     @ApiModelProperty(value = "产品分类名称")
     private String name;
 
+    @ApiModelProperty(value = "上级菜单")
+    private String pid;
+
     @ApiModelProperty(value = "创建时间")
     private String createTime;
 
@@ -27,8 +30,8 @@ public class GoodsCateListedVo implements Serializable {
     @ApiModelProperty(value = "排序编号")
     private String sort;
 
-    @ApiModelProperty(value = "是否禁用: 0=否, 1=是")
+    @ApiModelProperty(value = "是否显示: 0=否, 1=是")
-    private Long status;
+    private String isShow;
 
 
 }

ZJ-java/ZJ-common/src/main/java/com/wyh/common/entity/goods/GoodsCate.java

@@ -21,6 +21,9 @@ public class GoodsCate implements Serializable {
     @ApiModelProperty(value = "产品分类名称")
     private String name;
 
+    @ApiModelProperty(value = "上级菜单")
+    private String pid;
+
     @ApiModelProperty(value = "是否删除: 0=否, 1=是")
     private Integer isDelete;
 
@@ -36,7 +39,7 @@ public class GoodsCate implements Serializable {
     @ApiModelProperty(value = "排序编号")
     private String sort;
 
-    @ApiModelProperty(value = "是否禁用: 0=否, 1=是")
+    @ApiModelProperty(value = "是否显示: 0=否, 1=是")
-    private Long status;
+    private String isShow;
 
 }

ZJ-java/ZJ-front/src/main/java/com/wyh/front/config/SwaggerConfig.java

@@ -18,8 +18,8 @@ public class SwaggerConfig {
     @Value("${ZJ-java.knife4j.swagger-ui.enabled}")
     private boolean enabled;
 
-    @Value("${ZJ-java.knife4j.swagger-ui.path}")
+//    @Value("${ZJ-java.knife4j.swagger-ui.path}")
-    private String pathMapping;
+//    private String pathMapping;
 
     @Bean
     public Docket createRestApi(){
@@ -29,8 +29,7 @@ public class SwaggerConfig {
                 .select()
                 .apis(RequestHandlerSelectors.basePackage("com.wyh.front"))
                 .build()
-                .groupName("中将业务接口【前台】")
+                .groupName("中将业务接口【前台】");
-                .pathMapping(pathMapping);
     }
 
     private ApiInfo apiInfo(){
@@ -45,5 +44,4 @@ public class SwaggerConfig {
                 .contact(new Contact(author, url, email))
                 .build();
     }
-
 }

ZJ-java/ZJ-front/src/main/java/com/wyh/front/controller/WechatController.java

@@ -5,11 +5,13 @@ import com.wyh.common.core.AjaxResult;
 import com.wyh.front.service.IWechatService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.checkerframework.checker.units.qual.A;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
 
 import javax.annotation.Resource;
 import javax.validation.constraints.NotEmpty;
@@ -18,6 +20,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("api/wechat")
 @Api(tags = "微信管理")
+@ApiIgnore
 public class WechatController {
 
     @Resource

ZJ-java/ZJ-front/src/main/resources/application.yml

@@ -12,7 +12,7 @@ ZJ-java:
   knife4j:
     swagger-ui:
       enabled: true
-      path: /doc.html
+#      path: /doc.html
 
 # 服务配置
 server:

admin/.vscode/extensions.json

@@ -0,0 +1,3 @@
+{
+	"recommendations": ["Vue.volar", "Vue.vscode-typescript-vue-plugin"]
+}

admin/.vscode/settings.json

@@ -0,0 +1,11 @@
+{
+  "editor.detectIndentation": false,
+  "editor.tabSize": 4,
+  "editor.formatOnSave": true,
+  "editor.codeActionsOnSave": {
+    "source.fixAll.eslint": "explicit"
+},
+  "css.validate": false,
+  "less.validate": false,
+  "scss.validate": false
+}

admin/src/views/goods/cate/edit.vue

@@ -10,17 +10,31 @@
         @close="handleClose"
     >
       <el-form ref="formRef" :model="formData" label-width="110px" :rules="formRules">
+
+        <el-form-item label="上级菜单" prop="pid">
+          <el-tree-select
+              class="flex-1"
+              v-model="formData.pid"
+              :data="treeList"
+              clearable
+              node-key="id"
+              :props="{ label: 'name', value: 'id', children: 'children' }"
+              :default-expand-all="true"
+              placeholder="请选择上级菜单"
+              check-strictly
+          />
+        </el-form-item>
         <el-form-item label="产品分类名称" prop="name">
           <el-input v-model="formData.name" placeholder="请输入产品分类名称" />
         </el-form-item>
-        <el-form-item label="产品分类排序" prop="menuSort">
+        <el-form-item label="菜单排序" prop="menuSort">
           <div>
             <el-input-number v-model="formData.sort" :max="9999" />
             <div class="form-tips">数值越大越排前</div>
           </div>
         </el-form-item>
-        <el-form-item label="是否禁用" prop="status">
+        <el-form-item label="是否显示" prop="status">
-          <el-radio-group v-model="formData.status" placeholder="请选择是否禁用">
+          <el-radio-group v-model="formData.isShow" placeholder="请选择是否显示">
             <el-radio
                 v-for="(item, index) in dictData.Boolean"
                 :key="index"
@@ -30,14 +44,14 @@
               {{ item.name }}
             </el-radio>
           </el-radio-group>
-        </el-form-item>
+          </el-form-item>
       </el-form>
     </popup>
   </div>
 </template>
 <script lang="ts" setup>
 import type { FormInstance } from 'element-plus'
-import {  cateEdit, cateAdd, cateDetail } from '@/api/cate'
+import { cateLists, cateEdit, cateAdd, cateDetail } from '@/api/cate'
 import Popup from '@/components/popup/index.vue'
 import feedback from '@/utils/feedback'
 import type { PropType } from 'vue'
@@ -50,6 +64,7 @@ defineProps({
 const emit = defineEmits(['success', 'close'])
 const formRef = shallowRef<FormInstance>()
 const popupRef = shallowRef<InstanceType<typeof Popup>>()
+const treeList = ref<any[]>([])
 const mode = ref('add')
 const popupTitle = computed(() => {
   return mode.value == 'edit' ? '编辑产品分类' : '新增产品分类'
@@ -58,8 +73,9 @@ const popupTitle = computed(() => {
 const formData = reactive({
   id: '',
   name: '',
+  pid: '',
   sort: '',
-  status: '',
+  isShow: '',
 })
 
 const formRules = {
@@ -77,6 +93,13 @@ const formRules = {
       trigger: ['blur']
     }
   ],
+  pid: [
+    {
+      required: true,
+      message: '请输入上级菜单',
+      trigger: ['blur']
+    }
+  ],
   sort: [
     {
       required: true,
@@ -84,10 +107,10 @@ const formRules = {
       trigger: ['blur']
     }
   ],
-  status: [
+  isShow: [
     {
       required: true,
-      message: '请选择是否禁用: 0=否, 1=是',
+      message: '请输入是否显示: 0=否, 1=是',
       trigger: ['blur']
     }
   ],
@@ -127,6 +150,15 @@ const handleClose = () => {
   emit('close')
 }
 
+const getLists = async () => {
+  const data: any = await cateLists()
+  const item = { id: 0, name: '顶级', children: [] }
+  item.children = data
+  treeList.value.push(item)
+}
+
+getLists()
+
 defineExpose({
   open,
   setFormData,

admin/src/views/goods/cate/index.vue

@@ -1,13 +1,13 @@
 <template>
-  <div class="index-lists">
+  <div class="index-tree">
-    <el-card class="!border-none" shadow="never">
+    <el-card class="!border-none mb-4" shadow="never">
       <el-form ref="formRef" class="mb-[-16px]" :model="queryParams" :inline="true">
         <el-form-item label="产品分类名称" prop="name">
           <el-input class="w-[280px]" v-model="queryParams.name" />
         </el-form-item>
-        <el-form-item label="是否禁用" prop="status">
+        <el-form-item label="是否显示" prop="status">
           <el-select
-              v-model="queryParams.status"
+              v-model="queryParams.isShow"
               class="w-[280px]"
               clearable
           >
@@ -21,12 +21,12 @@
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="resetPage">查询</el-button>
+          <el-button type="primary" @click="getLists">查询</el-button>
           <el-button @click="resetParams">重置</el-button>
         </el-form-item>
       </el-form>
     </el-card>
-    <el-card class="!border-none mt-4" shadow="never">
+    <el-card class="!border-none" shadow="never">
       <div>
         <el-button v-perms="['cate:add']" type="primary" @click="handleAdd()">
           <template #icon>
@@ -34,27 +34,38 @@
           </template>
           新增
         </el-button>
+        <el-button @click="handleExpand"> 展开/折叠 </el-button>
       </div>
       <el-table
+          v-loading="loading"
+          ref="tableRef"
           class="mt-4"
           size="large"
-          v-loading="pager.loading"
+          :data="lists"
-          :data="pager.lists"
+          row-key="id"
+          :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
       >
         <el-table-column label="产品分类名称" prop="name" min-width="100" />
-        <el-table-column label="排序编号" prop="sort" min-width="100" />
+        <el-table-column label="上级菜单" prop="pid" min-width="100" />
-
-        <el-table-column label="是否禁用" prop="status" min-width="100">
-
-          <template #default="{ row }">
-            <dict-value :options="dictData.Boolean" :value="row.status" />
-          </template>
-        </el-table-column>
         <el-table-column label="创建时间" prop="createTime" min-width="100" />
         <el-table-column label="更新时间" prop="updateTime" min-width="100" />
+        <el-table-column label="排序编号" prop="sort" min-width="100" />
+        <el-table-column label="是否显示" prop="isShow" min-width="100">
 
-        <el-table-column label="操作" width="120" fixed="right">
           <template #default="{ row }">
+            <dict-value :options="dictData.Boolean" :value="row.isShow" />
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" width="160" fixed="right">
+          <template #default="{ row }">
+            <el-button
+                v-perms="['cate:add']"
+                type="primary"
+                link
+                @click="handleAdd(row.id)"
+            >
+              新增
+            </el-button>
             <el-button
                 v-perms="['cate:edit']"
                 type="primary"
@@ -74,9 +85,6 @@
           </template>
         </el-table-column>
       </el-table>
-      <div class="flex justify-end mt-4">
-        <pagination v-model="pager" @change="getLists" />
-      </div>
     </el-card>
     <edit-popup
         v-if="showEdit"
@@ -90,30 +98,54 @@
 <script lang="ts" setup name="cate">
 import { cateDelete, cateLists } from '@/api/cate'
 import { useDictData } from '@/hooks/useDictOptions'
-import { usePaging } from '@/hooks/usePaging'
-import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
+import feedback from '@/utils/feedback'
+import type { ElTable, FormInstance } from 'element-plus'
+
+const tableRef = shallowRef<InstanceType<typeof ElTable>>()
 const editRef = shallowRef<InstanceType<typeof EditPopup>>()
+const formRef = shallowRef<FormInstance>()
+let isExpand = false
 const showEdit = ref(false)
+const loading = ref(false)
+const lists = ref<any[]>([])
+
 const queryParams = reactive({
   name: '',
+  pid: '',
   sort: '',
-  status: '',
+  isShow: '',
 })
 
-const { pager, getLists, resetPage, resetParams } = usePaging({
-  fetchFun: cateLists,
-  params: queryParams
-})
 
 const { dictData } = useDictData<{
   Boolean: any[]
 }>(['Boolean'])
 
+const getLists = async () => {
+  loading.value = true
+  try {
+    const data = await cateLists(queryParams)
+    lists.value = data
+    loading.value = false
+  } catch (error) {
+    loading.value = false
+  }
+}
+const resetParams = () => {
+  formRef.value?.resetFields()
+  getLists()
+}
 
-const handleAdd = async () => {
+
+const handleAdd = async (id?: number) => {
   showEdit.value = true
   await nextTick()
+  if (id) {
+    editRef.value?.setFormData({
+      pid: id
+    })
+  }
   editRef.value?.open('add')
 }
 
@@ -131,5 +163,19 @@ const handleDelete = async (id: number) => {
   getLists()
 }
 
+const handleExpand = () => {
+  isExpand = !isExpand
+  toggleExpand(lists.value, isExpand)
+}
+
+const toggleExpand = (children: any[], unfold = true) => {
+  for (const key in children) {
+    tableRef.value?.toggleRowExpansion(children[key], unfold)
+    if (children[key].children) {
+      toggleExpand(children[key].children!, unfold)
+    }
+  }
+}
+
 getLists()
 </script>