新增待办信息

2025-12-19 00:06:23 +08:00
parent ab3e176be9
commit 065469cc90
10 changed files with 559 additions and 348 deletions
--- a/web-api/src/main/java/com/jeesite/modules/app/dao/file/FolderItem.java
+++ b/web-api/src/main/java/com/jeesite/modules/app/dao/file/FolderItem.java
@@ -0,0 +1,35 @@
+package com.jeesite.modules.app.dao.file;
+
+
+import com.jeesite.modules.biz.entity.BizFolders;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+public class FolderItem implements Serializable {
+
+
+    private String id;
+    private String name;
+    private Boolean expanded;
+
+    private String type;
+
+    List<BizFolders> children = new ArrayList<>();
+
+    public FolderItem() {
+    }
+
+    public FolderItem(String id, String name, Boolean expanded, String type, List<BizFolders> children) {
+        this.id = id;
+        this.name = name;
+        this.expanded = expanded;
+        this.type = type;
+        this.children = children;
+    }
+
+
+}
--- a/web-api/src/main/java/com/jeesite/modules/biz/entity/BizMyfiles.java
+++ b/web-api/src/main/java/com/jeesite/modules/biz/entity/BizMyfiles.java
@@ -58,7 +58,7 @@ public class BizMyfiles extends DataEntity<BizMyfiles> implements Serializable {
 	private String fileName;		// 原始名称
 	private String filePath;		// 存储路径
 	private String fileHash;		// 文件MD5
-	private Long fileSize;		// 文件大小
+	private String fileSize;		// 文件大小
 	private String fileExt;		// 文件扩展名
 	private String mimeType;		// 文件类型
 	private String folderId;		// 文件夹标识
--- a/web-api/src/main/java/com/jeesite/modules/biz/web/BizFoldersController.java
+++ b/web-api/src/main/java/com/jeesite/modules/biz/web/BizFoldersController.java
@@ -1,6 +1,9 @@
 package com.jeesite.modules.biz.web;

+import java.util.ArrayList;
 import java.util.List;
+
+import com.jeesite.modules.app.dao.file.FolderItem;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;

@@ -26,6 +29,7 @@ import com.jeesite.modules.biz.service.BizFoldersService;

 /**
 * 文件夹信息Controller
+ *
 * @author gaoxq
 * @version 2025-12-18
 */
@@ -33,106 +37,122 @@ import com.jeesite.modules.biz.service.BizFoldersService;
@RequestMapping(value = "${adminPath}/biz/folders")
 public class BizFoldersController extends BaseController {

-	private final BizFoldersService bizFoldersService;
+    private final BizFoldersService bizFoldersService;

-	public BizFoldersController(BizFoldersService bizFoldersService) {
-		this.bizFoldersService = bizFoldersService;
-	}
-	
-	/**
-	 * 获取数据
-	 */
-	@ModelAttribute
-	public BizFolders get(String folderId, boolean isNewRecord) {
-		return bizFoldersService.get(folderId, isNewRecord);
-	}
-	
-	/**
-	 * 查询列表
-	 */
-	@RequestMapping(value = {"list", ""})
-	public String list(BizFolders bizFolders, Model model) {
-		model.addAttribute("bizFolders", bizFolders);
-		return "modules/biz/bizFoldersList";
-	}
-	
-	/**
-	 * 查询列表数据
-	 */
-	@RequestMapping(value = "listData")
-	@ResponseBody
-	public Page<BizFolders> listData(BizFolders bizFolders, HttpServletRequest request, HttpServletResponse response) {
-		bizFolders.setPage(new Page<>(request, response));
-		Page<BizFolders> page = bizFoldersService.findPage(bizFolders);
-		return page;
-	}
+    public BizFoldersController(BizFoldersService bizFoldersService) {
+        this.bizFoldersService = bizFoldersService;
+    }

-	/**
-	 * 查看编辑表单
-	 */
-	@RequestMapping(value = "form")
-	public String form(BizFolders bizFolders, Model model) {
-		model.addAttribute("bizFolders", bizFolders);
-		return "modules/biz/bizFoldersForm";
-	}
+    /**
+     * 获取数据
+     */
+    @ModelAttribute
+    public BizFolders get(String folderId, boolean isNewRecord) {
+        return bizFoldersService.get(folderId, isNewRecord);
+    }

-	/**
-	 * 保存数据
-	 */
-	@PostMapping(value = "save")
-	@ResponseBody
-	public String save(@Validated BizFolders bizFolders) {
-		bizFoldersService.save(bizFolders);
-		return renderResult(Global.TRUE, text("保存文件夹信息成功！"));
-	}
+    /**
+     * 查询列表
+     */
+    @RequestMapping(value = {"list", ""})
+    public String list(BizFolders bizFolders, Model model) {
+        model.addAttribute("bizFolders", bizFolders);
+        return "modules/biz/bizFoldersList";
+    }

-	/**
-	 * 导出数据
-	 */
-	@RequestMapping(value = "exportData")
-	public void exportData(BizFolders bizFolders, HttpServletResponse response) {
-		List<BizFolders> list = bizFoldersService.findList(bizFolders);
-		String fileName = "文件夹信息" + DateUtils.getDate("yyyyMMddHHmmss") + ".xlsx";
-		try(ExcelExport ee = new ExcelExport("文件夹信息", BizFolders.class)){
-			ee.setDataList(list).write(response, fileName);
-		}
-	}
+    /**
+     * 查询列表数据
+     */
+    @RequestMapping(value = "listData")
+    @ResponseBody
+    public Page<BizFolders> listData(BizFolders bizFolders, HttpServletRequest request, HttpServletResponse response) {
+        bizFolders.setPage(new Page<>(request, response));
+        Page<BizFolders> page = bizFoldersService.findPage(bizFolders);
+        return page;
+    }

-	/**
-	 * 下载模板
-	 */
-	@RequestMapping(value = "importTemplate")
-	public void importTemplate(HttpServletResponse response) {
-		BizFolders bizFolders = new BizFolders();
-		List<BizFolders> list = ListUtils.newArrayList(bizFolders);
-		String fileName = "文件夹信息模板.xlsx";
-		try(ExcelExport ee = new ExcelExport("文件夹信息", BizFolders.class, Type.IMPORT)){
-			ee.setDataList(list).write(response, fileName);
-		}
-	}
+    /**
+     * 查看编辑表单
+     */
+    @RequestMapping(value = "form")
+    public String form(BizFolders bizFolders, Model model) {
+        model.addAttribute("bizFolders", bizFolders);
+        return "modules/biz/bizFoldersForm";
+    }
+
+    /**
+     * 保存数据
+     */
+    @PostMapping(value = "save")
+    @ResponseBody
+    public String save(@Validated BizFolders bizFolders) {
+        bizFoldersService.save(bizFolders);
+        return renderResult(Global.TRUE, text("保存文件夹信息成功！"));
+    }
+
+    /**
+     * 导出数据
+     */
+    @RequestMapping(value = "exportData")
+    public void exportData(BizFolders bizFolders, HttpServletResponse response) {
+        List<BizFolders> list = bizFoldersService.findList(bizFolders);
+        String fileName = "文件夹信息" + DateUtils.getDate("yyyyMMddHHmmss") + ".xlsx";
+        try (ExcelExport ee = new ExcelExport("文件夹信息", BizFolders.class)) {
+            ee.setDataList(list).write(response, fileName);
+        }
+    }
+
+    /**
+     * 下载模板
+     */
+    @RequestMapping(value = "importTemplate")
+    public void importTemplate(HttpServletResponse response) {
+        BizFolders bizFolders = new BizFolders();
+        List<BizFolders> list = ListUtils.newArrayList(bizFolders);
+        String fileName = "文件夹信息模板.xlsx";
+        try (ExcelExport ee = new ExcelExport("文件夹信息", BizFolders.class, Type.IMPORT)) {
+            ee.setDataList(list).write(response, fileName);
+        }
+    }
+
+    /**
+     * 导入数据
+     */
+    @ResponseBody
+    @PostMapping(value = "importData")
+    public String importData(MultipartFile file) {
+        try {
+            String message = bizFoldersService.importData(file);
+            return renderResult(Global.TRUE, "posfull:" + message);
+        } catch (Exception ex) {
+            return renderResult(Global.FALSE, "posfull:" + ex.getMessage());
+        }
+    }
+
+    /**
+     * 删除数据
+     */
+    @RequestMapping(value = "delete")
+    @ResponseBody
+    public String delete(BizFolders bizFolders) {
+        bizFoldersService.delete(bizFolders);
+        return renderResult(Global.TRUE, text("删除文件夹信息成功！"));
+    }
+
+    @RequestMapping(value = "foldersAll")
+    @ResponseBody
+    public List<FolderItem> foldersAll(BizFolders bizFolders) {
+        List<FolderItem> folderItems = new ArrayList<>();
+        List<BizFolders> foldersList = bizFoldersService.findList(bizFolders);
+        for (BizFolders folder : foldersList) {
+            if (folder.getParentId().equals("0")) {
+                BizFolders childFolder = new BizFolders();
+                childFolder.setParentId(folder.getFolderId());
+                List<BizFolders> childFolders = bizFoldersService.findList(childFolder);
+                folderItems.add(new FolderItem(folder.getFolderId(), folder.getFolderName(), false, "folder", childFolders));
+            }
+        }
+        return folderItems;
+    }

-	/**
-	 * 导入数据
-	 */
-	@ResponseBody
-	@PostMapping(value = "importData")
-	public String importData(MultipartFile file) {
-		try {
-			String message = bizFoldersService.importData(file);
-			return renderResult(Global.TRUE, "posfull:"+message);
-		} catch (Exception ex) {
-			return renderResult(Global.FALSE, "posfull:"+ex.getMessage());
-		}
-	}
-	
-	/**
-	 * 删除数据
-	 */
-	@RequestMapping(value = "delete")
-	@ResponseBody
-	public String delete(BizFolders bizFolders) {
-		bizFoldersService.delete(bizFolders);
-		return renderResult(Global.TRUE, text("删除文件夹信息成功！"));
-	}
-	
 }
--- a/web-api/src/main/java/com/jeesite/modules/biz/web/BizMyfilesController.java
+++ b/web-api/src/main/java/com/jeesite/modules/biz/web/BizMyfilesController.java
@@ -1,6 +1,8 @@
 package com.jeesite.modules.biz.web;

 import java.util.List;
+
+import com.jeesite.modules.file.utils.FileUploadUtils;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;

@@ -26,6 +28,7 @@ import com.jeesite.modules.biz.service.BizMyfilesService;

 /**
 * 文件信息Controller
+ *
 * @author gaoxq
 * @version 2025-12-18
 */
@@ -33,106 +36,113 @@ import com.jeesite.modules.biz.service.BizMyfilesService;
@RequestMapping(value = "${adminPath}/biz/myfiles")
 public class BizMyfilesController extends BaseController {

-	private final BizMyfilesService bizMyfilesService;
+    private final BizMyfilesService bizMyfilesService;

-	public BizMyfilesController(BizMyfilesService bizMyfilesService) {
-		this.bizMyfilesService = bizMyfilesService;
-	}
-	
-	/**
-	 * 获取数据
-	 */
-	@ModelAttribute
-	public BizMyfiles get(Long tid, boolean isNewRecord) {
-		return bizMyfilesService.get(tid, isNewRecord);
-	}
-	
-	/**
-	 * 查询列表
-	 */
-	@RequestMapping(value = {"list", ""})
-	public String list(BizMyfiles bizMyfiles, Model model) {
-		model.addAttribute("bizMyfiles", bizMyfiles);
-		return "modules/biz/bizMyfilesList";
-	}
-	
-	/**
-	 * 查询列表数据
-	 */
-	@RequestMapping(value = "listData")
-	@ResponseBody
-	public Page<BizMyfiles> listData(BizMyfiles bizMyfiles, HttpServletRequest request, HttpServletResponse response) {
-		bizMyfiles.setPage(new Page<>(request, response));
-		Page<BizMyfiles> page = bizMyfilesService.findPage(bizMyfiles);
-		return page;
-	}
+    public BizMyfilesController(BizMyfilesService bizMyfilesService) {
+        this.bizMyfilesService = bizMyfilesService;
+    }

-	/**
-	 * 查看编辑表单
-	 */
-	@RequestMapping(value = "form")
-	public String form(BizMyfiles bizMyfiles, Model model) {
-		model.addAttribute("bizMyfiles", bizMyfiles);
-		return "modules/biz/bizMyfilesForm";
-	}
+    /**
+     * 获取数据
+     */
+    @ModelAttribute
+    public BizMyfiles get(Long tid, boolean isNewRecord) {
+        return bizMyfilesService.get(tid, isNewRecord);
+    }

-	/**
-	 * 保存数据
-	 */
-	@PostMapping(value = "save")
-	@ResponseBody
-	public String save(@Validated BizMyfiles bizMyfiles) {
-		bizMyfilesService.save(bizMyfiles);
-		return renderResult(Global.TRUE, text("保存文件信息成功！"));
-	}
+    /**
+     * 查询列表
+     */
+    @RequestMapping(value = {"list", ""})
+    public String list(BizMyfiles bizMyfiles, Model model) {
+        model.addAttribute("bizMyfiles", bizMyfiles);
+        return "modules/biz/bizMyfilesList";
+    }

-	/**
-	 * 导出数据
-	 */
-	@RequestMapping(value = "exportData")
-	public void exportData(BizMyfiles bizMyfiles, HttpServletResponse response) {
-		List<BizMyfiles> list = bizMyfilesService.findList(bizMyfiles);
-		String fileName = "文件信息" + DateUtils.getDate("yyyyMMddHHmmss") + ".xlsx";
-		try(ExcelExport ee = new ExcelExport("文件信息", BizMyfiles.class)){
-			ee.setDataList(list).write(response, fileName);
-		}
-	}
+    /**
+     * 查询列表数据
+     */
+    @RequestMapping(value = "listData")
+    @ResponseBody
+    public Page<BizMyfiles> listData(BizMyfiles bizMyfiles, HttpServletRequest request, HttpServletResponse response) {
+        bizMyfiles.setPage(new Page<>(request, response));
+        Page<BizMyfiles> page = bizMyfilesService.findPage(bizMyfiles);
+        return page;
+    }

-	/**
-	 * 下载模板
-	 */
-	@RequestMapping(value = "importTemplate")
-	public void importTemplate(HttpServletResponse response) {
-		BizMyfiles bizMyfiles = new BizMyfiles();
-		List<BizMyfiles> list = ListUtils.newArrayList(bizMyfiles);
-		String fileName = "文件信息模板.xlsx";
-		try(ExcelExport ee = new ExcelExport("文件信息", BizMyfiles.class, Type.IMPORT)){
-			ee.setDataList(list).write(response, fileName);
-		}
-	}
+    /**
+     * 查看编辑表单
+     */
+    @RequestMapping(value = "form")
+    public String form(BizMyfiles bizMyfiles, Model model) {
+        model.addAttribute("bizMyfiles", bizMyfiles);
+        return "modules/biz/bizMyfilesForm";
+    }
+
+    /**
+     * 保存数据
+     */
+    @PostMapping(value = "save")
+    @ResponseBody
+    public String save(@Validated BizMyfiles bizMyfiles) {
+//        bizMyfilesService.save(bizMyfiles);
+        FileUploadUtils.saveFileUpload(bizMyfiles, bizMyfiles.getId(), "bizMyfiles_file");
+        return renderResult(Global.TRUE, text("保存文件信息成功！"));
+    }
+
+    /**
+     * 导出数据
+     */
+    @RequestMapping(value = "exportData")
+    public void exportData(BizMyfiles bizMyfiles, HttpServletResponse response) {
+        List<BizMyfiles> list = bizMyfilesService.findList(bizMyfiles);
+        String fileName = "文件信息" + DateUtils.getDate("yyyyMMddHHmmss") + ".xlsx";
+        try (ExcelExport ee = new ExcelExport("文件信息", BizMyfiles.class)) {
+            ee.setDataList(list).write(response, fileName);
+        }
+    }
+
+    /**
+     * 下载模板
+     */
+    @RequestMapping(value = "importTemplate")
+    public void importTemplate(HttpServletResponse response) {
+        BizMyfiles bizMyfiles = new BizMyfiles();
+        List<BizMyfiles> list = ListUtils.newArrayList(bizMyfiles);
+        String fileName = "文件信息模板.xlsx";
+        try (ExcelExport ee = new ExcelExport("文件信息", BizMyfiles.class, Type.IMPORT)) {
+            ee.setDataList(list).write(response, fileName);
+        }
+    }
+
+    /**
+     * 导入数据
+     */
+    @ResponseBody
+    @PostMapping(value = "importData")
+    public String importData(MultipartFile file) {
+        try {
+            String message = bizMyfilesService.importData(file);
+            return renderResult(Global.TRUE, "posfull:" + message);
+        } catch (Exception ex) {
+            return renderResult(Global.FALSE, "posfull:" + ex.getMessage());
+        }
+    }
+
+    /**
+     * 删除数据
+     */
+    @RequestMapping(value = "delete")
+    @ResponseBody
+    public String delete(BizMyfiles bizMyfiles) {
+        bizMyfilesService.delete(bizMyfiles);
+        return renderResult(Global.TRUE, text("删除文件信息成功！"));
+    }
+
+    @RequestMapping(value = "listAll")
+    @ResponseBody
+    public List<BizMyfiles> listAll(BizMyfiles bizMyfiles) {
+        return bizMyfilesService.findList(bizMyfiles);
+    }

-	/**
-	 * 导入数据
-	 */
-	@ResponseBody
-	@PostMapping(value = "importData")
-	public String importData(MultipartFile file) {
-		try {
-			String message = bizMyfilesService.importData(file);
-			return renderResult(Global.TRUE, "posfull:"+message);
-		} catch (Exception ex) {
-			return renderResult(Global.FALSE, "posfull:"+ex.getMessage());
-		}
-	}
-	
-	/**
-	 * 删除数据
-	 */
-	@RequestMapping(value = "delete")
-	@ResponseBody
-	public String delete(BizMyfiles bizMyfiles) {
-		bizMyfilesService.delete(bizMyfiles);
-		return renderResult(Global.TRUE, text("删除文件信息成功！"));
-	}
-	
 }
--- a/web-api/src/main/resources/config/application.yml
+++ b/web-api/src/main/resources/config/application.yml
@@ -57,7 +57,7 @@ jdbc:
  # Mysql 数据库配置
  type: mysql
  driver: com.mysql.cj.jdbc.Driver
-  url: jdbc:mysql://crontab.club:33069/worker?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
+  url: jdbc:mysql://192.168.31.189:33069/worker?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
  username: dream
  password: info_dream
  testSql: SELECT 1
--- a/web-vue/packages/biz/api/biz/folders.ts
+++ b/web-vue/packages/biz/api/biz/folders.ts
@@ -24,8 +24,22 @@ export interface BizFolders extends BasicModel<BizFolders> {
  description?: string; // 文件夹描述
 }

+export interface FolderItem {
+  id: string;
+  name: string;
+  expanded: boolean;
+  children: Array<{
+	folderId: string;
+    folderName: string;
+    type: 'folder' | 'file';
+  }>;
+}
+
 export const bizFoldersList = (params?: BizFolders | any) =>
  defHttp.get<BizFolders>({ url: adminPath + '/biz/folders/list', params });
+  
+export const bizFolderItemAll = (params?: BizFolders | any) =>
+  defHttp.get<FolderItem[]>({ url: adminPath + '/biz/folders/foldersAll', params });

 export const bizFoldersListData = (params?: BizFolders | any) =>
  defHttp.post<Page<BizFolders>>({ url: adminPath + '/biz/folders/listData', params });
--- a/web-vue/packages/biz/api/biz/myfiles.ts
+++ b/web-vue/packages/biz/api/biz/myfiles.ts
@@ -33,6 +33,9 @@ export interface BizMyfiles extends BasicModel<BizMyfiles> {
 export const bizMyfilesList = (params?: BizMyfiles | any) =>
  defHttp.get<BizMyfiles>({ url: adminPath + '/biz/myfiles/list', params });

+export const bizMyfilesListAll = (params?: BizMyfiles | any) =>
+  defHttp.get<BizMyfiles[]>({ url: adminPath + '/biz/myfiles/listAll', params });
+  
 export const bizMyfilesListData = (params?: BizMyfiles | any) =>
  defHttp.post<Page<BizMyfiles>>({ url: adminPath + '/biz/myfiles/listData', params });

--- a/web-vue/packages/biz/views/biz/calendarSchedule/form.vue
+++ b/web-vue/packages/biz/views/biz/calendarSchedule/form.vue
@@ -64,7 +64,7 @@
 	    maxlength: 64,
 	  },
 	  required: true,
-    dynamicDisabled: true,
+	  dynamicDisabled: true,
 	},
 	{
 	  label: t('通知人员'),
--- a/web-vue/packages/core/layouts/views/desktop/myfiles/components/upload.vue
+++ b/web-vue/packages/core/layouts/views/desktop/myfiles/components/upload.vue
@@ -3,36 +3,114 @@
 	  v-bind="$attrs"
 	  @register="register"
 	  title="上传文件"
-	  width="40%"
+	  width="60%"
 	  @cancel="handleCancel"
+	  @ok="handleSubmit"
 	>
-	
+	<BasicForm @register="registerForm" />
 	</BasicModal>
 </template>

 <script lang="ts">
-	import { defineComponent, ref, onMounted, onUnmounted } from 'vue';
+	import { defineComponent, ref, computed, onMounted, onUnmounted } from 'vue';
+	import { useI18n } from '@jeesite/core/hooks/web/useI18n';
+	import { BasicForm, FormSchema, useForm } from '@jeesite/core/components/Form';
 	import { useMessage } from '@jeesite/core/hooks/web/useMessage';
 	import { BasicModal, useModalInner } from '@jeesite/core/components/Modal';
+	import { BizMyfiles, bizMyfilesSave, bizMyfilesForm } from '@jeesite/biz/api/biz/myfiles';
 	
 	export default defineComponent({
-	  components: { BasicModal },
+	  components: { BasicModal, BasicForm },
 	  emits: ['modalClose'], 
 	  setup(props, { emit }) {
-	    const { createMessage } = useMessage();
-	    // 模态框注册
-	    const [register, { closeModal }] = useModalInner(async (data: any) => {
-	      
-	    });
+		const { showMessage } = useMessage();
+		const { t } = useI18n('biz.myfiles');
 		
-		const handleCancel = () => {
-		  emit('modalClose'); 
+		const record = ref<BizMyfiles>({} as BizMyfiles);
+		
+		const inputFormSchemas: FormSchema<BizMyfiles>[] = [
+		  {
+		    label: t('文件夹标识'),
+		    field: 'folderId',
+		    component: 'Input',
+		    componentProps: {
+		      maxlength: 52,
+		    },
+			required: true,
+			dynamicDisabled: true,
+		  },
+		  {
+		    label: t('文件夹名称'),
+		    field: 'folderName',
+		    component: 'Input',
+		    componentProps: {
+		      maxlength: 52,
+		    },
+			required: true,
+			dynamicDisabled: true,
+		  },
+		  {
+		    label: t('附件上传'),
+		    field: 'dataMap',
+		    component: 'Upload',
+		    componentProps: {
+		      loadTime: computed(() => record.value.__t),
+		      bizKey: computed(() => record.value.id),
+		      bizType: 'bizMyfiles_file',
+		      uploadType: 'all',
+		    },
+		    colProps: { md: 24, lg: 24 },
+		  },
+		];  
+		  
+		// 表单注册核心逻辑
+		const [registerForm, { resetFields, setFieldsValue, validate }] = useForm<BizMyfiles>({
+		  labelWidth: 120,
+		  schemas: inputFormSchemas,
+		  baseColProps: { md: 24, lg: 12 },
+		});
+		  
+		const { createMessage } = useMessage();
+		
+		const [register, { closeModal }] = useModalInner(async (data: any) => {
+		  const dddd = {
+			  ... data
+		  }
+		  console.log(dddd)
+		  resetFields();
+		  if (data) {
+		    setFieldsValue({ ...data });
+		  }
+		});
+		
+		async function handleSubmit() {
+			try {
+			  const data = await validate();
+			  const params: any = {
+			    isNewRecord: true,
+			  };
+			  const res = await bizMyfilesSave(params, data);
+			  showMessage(res.message);
+			  handleCancel(data);
+			} catch (error: any) {
+			  console.error('上传文件保存失败:', error);
+			} 
+		}
+		
+		// 取消按钮逻辑
+		const handleCancel = (data: any) => {
+		  resetFields(); // 取消时重置表单
+		  emit('modalClose',data); 
+		  closeModal(); // 关闭模态框
 		};
 	
 	    return {
 	      register,
 	      closeModal,
-		  handleCancel,
+	      handleCancel,
+	      registerForm,
+	      inputFormSchemas,
+		  handleSubmit
 	    };
 	  },
 	});
--- a/web-vue/packages/core/layouts/views/desktop/myfiles/index.vue
+++ b/web-vue/packages/core/layouts/views/desktop/myfiles/index.vue
@@ -6,15 +6,15 @@
          v-model:value="folderSearchText"
          placeholder="文件夹搜索框"
          class="folder-search-input"
+          allow-clear
        />
      </div>
      <div class="tree-scroll-container">
        <div class="tree-container">
-          <!-- 顶级文件夹节点 -->
          <div 
            class="tree-node folder-node" 
-            v-for="(folder, index) in folderList" 
-            :key="index"
+            v-for="(folder, index) in filteredFolderList" 
+            :key="folder.id || index"
            @click="toggleFolder(folder)"
            @dblclick="doubleClickFolder(folder)"
            :class="{ active: folder.expanded }"
@@ -36,41 +36,44 @@
                style="margin-right: 4px;" 
              />
            </span>
-            <!-- 子节点容器：移除多余的 tree-toggle 元素 -->
+            <!-- 子节点容器：自动展开匹配子项的父级 -->
            <div class="tree-children" v-if="folder.expanded">
              <div 
                class="tree-node file-node" 
-                v-for="(child, idx) in folder.children" 
-                :key="idx"
+                v-for="(child, idx) in filterChildren(folder.children, folderSearchText)"
+                :key="child.id || idx"
                @click.stop="handleChildClick(child)"
              >
                <span class="file-icon">
                  <Icon 
-                    :icon="child.type === 'folder' 
-                      ? 'simple-line-icons:folder' 
-                      : 'ant-design:file-outlined'" 
+                    icon="simple-line-icons:folder" 
                    class="icon-size"
                  />
                </span>
-                <span class="file-name">{{ child.name }}</span>
-                <!-- 移除：<span class="tree-toggle empty"></span> -->
+                <span class="file-name">{{ child.folderName }}</span>
              </div>
            </div>
          </div>
+          <!-- 无匹配结果提示 -->
+          <div v-if="folderSearchText && filteredFolderList.length === 0" class="no-result">
+            <span>未找到匹配的文件夹</span>
+          </div>
        </div>
      </div>
    </div>

    <div class="main-content">
      <div class="header-bar">
-        <a-input
+        <a-input-search
          v-model:value="fileSearchText"
          placeholder="文件搜索框"
          class="file-search-input"
+		  enter-button
+		  @search="onSearch"
        />
        <div class="header-btn-group">
-          <a-button type="default" class="header-btn" @click="openfolderModal(true, item)"><Icon icon="ant-design:folder-add-outlined" />新建文件夹</a-button>
-		  <a-button type="primary" class="header-btn" @click="openUploadModal(true, item)"><Icon icon="ant-design:cloud-upload-outlined" />上传文件</a-button>
+          <a-button type="default" class="header-btn" @click="openfolderModal(true, ParamsFolders)"><Icon icon="ant-design:folder-add-outlined" />新建文件夹</a-button>
+          <a-button type="primary" class="header-btn" @click="openUploadModal(true, ParamsFolders)" :disabled="UploadFile"><Icon icon="ant-design:cloud-upload-outlined" />上传文件</a-button>
        </div>
      </div>

@@ -86,9 +89,9 @@
              <div class="file-card-header">
                <div class="file-name-wrap">
                  <span class="file-card-icon">📄</span>
-                  <span class="file-card-name" :title="file.name">{{ file.name }}</span>
+                  <span class="file-card-name" :title="file.fileName">{{ file.fileName }}</span>
                </div>
-                <span class="file-card-size">{{ file.size }}</span>
+                <span class="file-card-size">{{ file.fileSize }}</span>
              </div>
              <div class="card-divider"></div>
              <div class="file-card-actions">
@@ -107,7 +110,7 @@
 </template>

 <script setup lang="ts">
-import { ref } from 'vue';
+import { ref, onMounted, computed, watch } from 'vue';
 import { message } from 'ant-design-vue';
 import { Input, Card } from 'ant-design-vue';
 import { Icon } from '@jeesite/core/components/Icon';
@@ -115,118 +118,179 @@ import { useModal } from '@jeesite/core/components/Modal';
 import UploadModal from './components/upload.vue';
 import FolderModal from './components/folder.vue';

-const item = ref();
+import { FolderItem, bizFolderItemAll } from '@jeesite/biz/api/biz/folders';
+import { BizMyfiles, bizMyfilesListAll } from '@jeesite/biz/api/biz/myfiles';
+
 const [uploadregister, { openModal: openUploadModal }] = useModal();
 const [folderregister, { openModal: openfolderModal }] = useModal();

-// 定义类型接口
-interface FolderItem {
-  name: string;
-  expanded: boolean;
-  children: Array<{
-    name: string;
-    type: 'folder' | 'file';
-  }>;
-}
-
-interface FileItem {
-  name: string;
-  size: string;
-  time: string;
-  path: string;
-  creator: string;
+interface ChildFolder {
+  id?: number | string;
+  folderName: string;
+  type: 'folder' | 'file';
+  children?: ChildFolder[];  // 支持多级子文件夹
 }

+let UploadFile = true;
+const ParamsFolders = ref();
 const folderSearchText = ref<string>('');
 const fileSearchText = ref<string>('');
+const folderList = ref<FolderItem[]>([]);
+const fileList = ref<BizMyfiles[]>([]);

-const folderList = ref<FolderItem[]>([
-  {
-    name: '项目文档',
-    expanded: false,
-    children: [
-      { name: '需求文档', type: 'folder' },
-      { name: '设计稿', type: 'folder' },
-      { name: '开发规范.docx', type: 'file' },
-      { name: '接口文档.pdf', type: 'file' }
-    ]
-  },
-  {
-    name: '日常办公',
-    expanded: false,
-    children: [
-      { name: '周报汇总', type: 'folder' },
-      { name: '会议纪要.docx', type: 'file' },
-      { name: '考勤表.xlsx', type: 'file' }
-    ]
-  },
-  {
-    name: '第三季度',
-    expanded: false,
-    children: [
-      { name: '业绩分析.pptx', type: 'file' },
-      { name: '预算规划.xlsx', type: 'file' },
-      { name: '工作总结.docx', type: 'file' }
-    ]
-  },
-  {
-    name: '临时文件',
-    expanded: false,
-    children: [
-      { name: '草稿.txt', type: 'file' },
-      { name: '截图.png', type: 'file' }
-    ]
-  }
-]);
-
-const fileList = ref<FileItem[]>([]);
-const paths = ['项目文档/需求文档', '日常办公/周报汇总', '第三季度', '临时文件', '项目文档/设计稿'];
-const creators = ['张三', '李四', '王五', '赵六', '钱七'];
-
-// 初始化文件列表数据
-for (let i = 0; i < 50; i++) {
-  const randomPath = paths[Math.floor(Math.random() * paths.length)];
-  const randomCreator = creators[Math.floor(Math.random() * creators.length)];
-  
-  fileList.value.push({
-    name: `第三季度开始就大家思考爱睡觉的${i + 1}.docx`,
-    size: `${Math.floor(Math.random() * 100) + 50}kb`,
-    time: '2025-12-17 20:53',
-    path: randomPath,
-    creator: randomCreator
+const bindParentReferences = (folders: FolderItem[], _parent: FolderItem | null = null) => {
+  folders.forEach(folder => {
+    if (folder.children && folder.children.length) {
+      bindParentReferences(folder.children as unknown as FolderItem[], folder);
+    }
  });
-}
+};

-// 顶级文件夹切换逻辑：仅处理顶级文件夹的展开/关闭
-const toggleFolder = (targetFolder: FolderItem) => {
-  if (targetFolder.expanded) {
-    // 关闭当前顶级文件夹
-    targetFolder.expanded = false;
-  } else {
-    // 先关闭所有顶级文件夹，再展开当前
-    folderList.value.forEach(folder => {
+// 递归展开所有父级文件夹
+const expandAllParents = (node: FolderItem | ChildFolder) => {
+  let currentNode: any = node;
+  while (currentNode.parent) {
+    currentNode.parent.expanded = true;
+    currentNode = currentNode.parent;
+  }
+};
+
+// 搜索匹配并展开父级
+const searchAndExpandParents = (keyword: string) => {
+  if (!keyword.trim()) return;
+  
+  const traverseFolders = (folders: FolderItem[]) => {
+    folders.forEach(folder => {
+      // 检查当前文件夹是否匹配
+      const currentMatch = folder.name.toLowerCase().includes(keyword.toLowerCase());
+      if (currentMatch) expandAllParents(folder);
+      // 递归检查子文件夹
+      if (folder.children && folder.children.length) {
+        folder.children.forEach(child => {
+          const childMatch = child.folderName.toLowerCase().includes(keyword.toLowerCase());
+          if (childMatch) {
+            folder.expanded = true;  // 展开当前父级
+            expandAllParents(folder);  // 展开所有祖先
+          }
+        });
+      }
+    });
+  };
+  
+  traverseFolders(folderList.value);
+};
+
+const filteredFolderList = computed(() => {
+  const keyword = folderSearchText.value.toLowerCase().trim();
+  if (!keyword) return folderList.value;
+  const filterFolders = (folders: FolderItem[]): FolderItem[] => {
+    return folders.filter(folder => {
+      const currentMatch = folder.name.toLowerCase().includes(keyword);
+      let childrenMatch = false;
+      if (folder.children && folder.children.length) {
+        childrenMatch = folder.children.some(child => 
+          child.folderName.toLowerCase().includes(keyword)
+        );
+      }
+      return currentMatch || childrenMatch;
+    });
+  };
+  
+  return filterFolders(folderList.value);
+});
+
+// 过滤子文件夹
+const filterChildren = (children: ChildFolder[] = [], keyword: string) => {
+  if (!keyword.trim()) return children;
+  return children.filter(child => 
+    child.folderName.toLowerCase().includes(keyword.toLowerCase().trim())
+  );
+};
+
+// 监听搜索框变化，触发搜索和展开
+watch(folderSearchText, (newVal) => {
+  // 清空搜索时重置展开状态
+  if (!newVal.trim()) {
+    folderList.value.forEach(folder => folder.expanded = false);
+    return;
+  }
+  searchAndExpandParents(newVal);
+});
+
+const getDataList = async () => {
+  try {
+    const result = await bizFolderItemAll();
+    const folders = (result || []) as FolderItem[];
+    folders.forEach(folder => {
      folder.expanded = false;
    });
+    bindParentReferences(folders);  // 绑定父级引用
+    folderList.value = folders;
+	getFileList({});
+  } catch (error) {
+    console.error('获取文件夹信息失败:', error);
+    folderList.value = [];
+  }
+};
+
+const getFileList = async (params: {}) => {
+  try {
+	const result = await bizMyfilesListAll(params);
+	fileList.value = result || [];
+  } catch (error) {
+	console.error('获取文件信息失败:', error);
+	fileList.value = [];
+  }
+};
+
+
+const onSearch = (searchValue: string) => {
+	const params = {
+		  fileName: searchValue,
+	}
+	getFileList(params);
+};
+
+const toggleFolder = async (targetFolder: FolderItem) => {
+  if (targetFolder.expanded) {
+    targetFolder.expanded = false;
+    return;
+  }
+  try {
+    if ('loading' in targetFolder) targetFolder.loading = true;
+    folderList.value.forEach(folder => {
+      if (folder !== targetFolder) folder.expanded = false;
+    });
    targetFolder.expanded = true;
+  } catch (error) {
+    console.error('加载文件夹数据失败:', error);
+    targetFolder.expanded = false;
+  } finally {
+    if ('loading' in targetFolder) targetFolder.loading = false;
  }
 };

-// 子节点点击处理函数
-const handleChildClick = (child: { name: string; type: 'folder' | 'file' }) => {
-  // 可以根据子节点类型添加自定义逻辑
-  if (child.type === 'folder') {
-    message.info(`点击了子文件夹：${child.name}`);
-    // 如需展开子文件夹，可在这里扩展逻辑
-  } else {
-    message.info(`点击了文件：${child.name}`);
-    // 比如打开文件预览、加载文件详情等
+const handleChildClick = (child: ChildFolder) => {
+  UploadFile = false;
+  ParamsFolders.value = child;
+  const params = {
+	  folderId: child.id,
  }
+  getFileList(params);
 };

-// 双击顶级文件夹逻辑
 const doubleClickFolder = (targetFolder: FolderItem) => {
  message.info(`正在打开「${targetFolder.name}」文件夹`);
 };
+
+// 监听搜索文本变化，触发展开
+watch(folderSearchText, () => {
+  if (folderSearchText.value.trim()) searchAndExpandParents(folderSearchText.value);
+});
+
+onMounted(() => {
+  getDataList();
+});
 </script>

 <style scoped>
@@ -265,6 +329,14 @@ const doubleClickFolder = (targetFolder: FolderItem) => {
  border-radius: 4px;
 }

+/* 无匹配结果样式 */
+.no-result {
+  padding: 16px;
+  text-align: center;
+  color: #668799;
+  font-size: 13px;
+}
+
 /* 优化 tree-scroll-container 样式 */
 .tree-scroll-container {
  flex: 1;
@@ -289,7 +361,6 @@ const doubleClickFolder = (targetFolder: FolderItem) => {
  border: 2px solid #f0f8ff;
 }

-/* 优化滚动容器的交互体验 */
 .tree-scroll-container:hover::-webkit-scrollbar-thumb {
  background-color: #91c8ee;
 }
@@ -312,13 +383,11 @@ const doubleClickFolder = (targetFolder: FolderItem) => {
  transition: background-color 0.2s ease;
 }

-/* 优化文件夹节点激活状态 */
 .folder-node.active,
 .folder-node:hover {
  background: #e8f4f8;
 }

-/* 展开状态的文件夹额外样式 */
 .folder-node.active {
  background-color: #f5fafe;
  border-left: 3px solid #1890ff;
@@ -328,8 +397,8 @@ const doubleClickFolder = (targetFolder: FolderItem) => {
 .folder-info {
  display: flex;
  align-items: center;
-  flex: 1; 
-  overflow: hidden; 
+  flex: 1;
+  overflow: hidden;
 }

 .folder-node:last-child {
@@ -345,7 +414,6 @@ const doubleClickFolder = (targetFolder: FolderItem) => {
  margin: 2px 0;
  border-bottom: 1px dashed #e8f4f8;
  transition: background-color 0.2s ease;
-  /* 移除 justify-content: space-between，避免内容分散 */
 }

 .file-node:last-child {
@@ -369,13 +437,6 @@ const doubleClickFolder = (targetFolder: FolderItem) => {
  transition: transform 0.2s ease;
 }

-/* 优化箭头图标旋转效果 */
-.tree-toggle .icon {
-  transition: transform 0.2s ease;
-}
-
-/* 移除无用的 empty 类样式 */
-
 .folder-icon, .file-icon {
  margin: 0 6px;
  font-size: 14px;
@@ -384,7 +445,6 @@ const doubleClickFolder = (targetFolder: FolderItem) => {
  transition: color 0.2s ease;
 }

-/* 展开文件夹图标颜色加深 */
 .folder-node.active .folder-icon,
 .folder-node:hover .folder-icon {
  color: #096dd9;
@@ -400,7 +460,6 @@ const doubleClickFolder = (targetFolder: FolderItem) => {
  white-space: nowrap;
  overflow: hidden;
  text-overflow: ellipsis;
-  /* 子文件名占满剩余空间 */
  flex: 1;
 }

@@ -412,7 +471,6 @@ const doubleClickFolder = (targetFolder: FolderItem) => {
  animation: fadeIn 0.2s ease;
 }

-/* 子项展开动画 */
@keyframes fadeIn {
  from {
    opacity: 0;
@@ -447,7 +505,6 @@ const doubleClickFolder = (targetFolder: FolderItem) => {
 .file-search-input {
  flex: 1;
  min-width: 0;
-  border: 1px solid #b3d9f2;
 }

 .header-btn-group {
@@ -493,25 +550,23 @@ const doubleClickFolder = (targetFolder: FolderItem) => {
  box-sizing: border-box;
 }

-/* 核心修复：文件卡片样式 */
 .file-card {
  background: #e8f4f8;
  border: 1px solid #b3d9f2;
  border-radius: 8px;
  transition: all 0.2s ease;
  box-sizing: border-box;
-  height: 100px; /* 卡片总高度 */
-  padding: 0; /* 重置卡片默认padding */
-  overflow: hidden; /* 防止内容溢出 */
+  height: 100px;
+  padding: 0;
+  overflow: hidden;
 }

-/* 卡片内部容器 - 控制所有内容的间距和布局 */
 .card-inner-content {
  display: flex;
  flex-direction: column;
  height: 100%;
  width: 100%;
-  padding: 0 4px; /* 左右内边距，上下通过内部元素控制 */
+  padding: 0 4px;
 }

 .file-card:hover {
@@ -519,13 +574,12 @@ const doubleClickFolder = (targetFolder: FolderItem) => {
  transform: translateY(-2px);
 }

-/* 文件名区域 - 精准距顶部2px */
 .file-card-header {
  display: flex;
  align-items: center;
  justify-content: space-between;
  width: 100%;
-  padding-top: 2px; /* 顶部2px间距 */
+  padding-top: 2px;
  padding-bottom: 4px;
  flex-shrink: 0;
 }
@@ -563,23 +617,21 @@ const doubleClickFolder = (targetFolder: FolderItem) => {
  white-space: nowrap;
 }

-/* 分割线样式 */
 .card-divider {
  width: 100%;
  height: 1px;
  background-color: #b3d9f2;
  opacity: 0.5;
-  margin: 0 0 4px 0; /* 仅底部留间距 */
+  margin: 0 0 4px 0;
  flex-shrink: 0;
 }

-/* 按钮区域 - 在分割线下，距底部2px，完全在卡片内 */
 .file-card-actions {
  display: flex;
  gap: 4px;
-  margin-top: auto; /* 自动填充剩余空间，靠底 */
-  margin-bottom: 2px; /* 距底部2px */
-  justify-content: flex-end; /* 靠右对齐 */
+  margin-top: auto;
+  margin-bottom: 2px;
+  justify-content: flex-end;
  flex-shrink: 0;
 }

@@ -591,7 +643,7 @@ const doubleClickFolder = (targetFolder: FolderItem) => {
  display: flex;
  align-items: center;
  gap: 4px;
-  line-height: 1; /* 重置按钮行高，避免超出 */
+  line-height: 1;
 }

 :deep(.file-card-actions .ant-btn-dangerous) {
@@ -606,7 +658,6 @@ const doubleClickFolder = (targetFolder: FolderItem) => {
  max-width: 200px;
 }

-/* 响应式调整 */
@media (max-width: 1400px) {
  .file-list {
    grid-template-columns: repeat(3, 1fr);
@@ -636,4 +687,4 @@ const doubleClickFolder = (targetFolder: FolderItem) => {
 * {
  box-sizing: border-box;
 }
-</style>
+</style>