Merge remote-tracking branch 'yudao/dev' into dev

apps/web-antd/src/components/upload/file-upload.vue

@@ -58,7 +58,7 @@ const props = withDefaults(
     showDescription: false,
   },
 );
-const emit = defineEmits(['change', 'update:value', 'delete']);
+const emit = defineEmits(['change', 'update:value', 'delete', 'returnText']);
 const { accept, helpText, maxNumber, maxSize } = toRefs(props);
 const isInnerOperate = ref<boolean>(false);
 const { getStringAccept } = useUploadType({
@@ -125,6 +125,10 @@ const handleRemove = async (file: UploadFile) => {
 };
 
 const beforeUpload = async (file: File) => {
+  // 使用现代的Blob.text()方法替代FileReader
+  const fileContent = await file.text();
+  emit('returnText', fileContent);
+
   const { maxSize, accept } = props;
   const isAct = checkFileType(file, accept);
   if (!isAct) {

apps/web-antd/src/components/user-select-modal/user-select-modal.vue

@@ -30,6 +30,7 @@ interface DeptTreeNode {
   key: string;
   title: string;
   children?: DeptTreeNode[];
+  name: string;
 }
 
 defineOptions({ name: 'UserSelectModal' });
@@ -107,22 +108,26 @@ const transferDataSource = computed(() => {
 const filteredDeptTree = computed(() => {
   if (!deptSearchKeys.value) return deptTree.value;
 
-  const filterNode = (node: any): any => {
-    const title = node?.title?.toLowerCase();
+  const filterNode = (node: any, depth = 0): any => {
+    // 添加深度限制，防止过深的递归导致爆栈
+    if (depth > 100) return null;
+
+    // 按部门名称搜索
+    const name = node?.name?.toLowerCase();
     const search = deptSearchKeys.value.toLowerCase();
 
-    // 如果当前节点匹配
-    if (title.includes(search)) {
+    // 如果当前节点匹配，直接返回节点，不处理子节点
+    if (name?.includes(search)) {
       return {
         ...node,
-        children: node.children?.map((child: any) => filterNode(child)),
+        children: node.children,
       };
     }
 
     // 如果当前节点不匹配，检查子节点
     if (node.children) {
       const filteredChildren = node.children
-        .map((child: any) => filterNode(child))
+        .map((child: any) => filterNode(child, depth + 1))
         .filter(Boolean);
 
       if (filteredChildren.length > 0) {
@@ -397,6 +402,7 @@ const processDeptNode = (node: any): DeptTreeNode => {
   return {
     key: String(node.id),
     title: `${node.name} (${node.id})`,
+    name: node.name,
     children: node.children?.map((child: any) => processDeptNode(child)),
   };
 };