From 75c30da01793f1a6ae5f6cfab79cf76a7af6733d Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Thu, 12 Feb 2026 15:06:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9B=BE=E7=89=87,=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E7=94=A8=E6=88=B7=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DesignForm/formControlPropertiNew.vue     | 29 ++++----
 .../DesignForm/public/expand/lowcodeImage.vue | 23 +------
 .../public/expand/rangedUserTree.vue          | 67 +++++++++++++++----
 3 files changed, 72 insertions(+), 47 deletions(-)

diff --git a/src/components/DesignForm/formControlPropertiNew.vue b/src/components/DesignForm/formControlPropertiNew.vue
index 9ebf2aa..3055ead 100644
--- a/src/components/DesignForm/formControlPropertiNew.vue
+++ b/src/components/DesignForm/formControlPropertiNew.vue
@@ -4,7 +4,7 @@
 @ 备注: 表单控件（app）专用
 -->
 <script lang="ts" setup>
-import { reactive, computed, toRefs, ref, watch, inject } from "vue";
+import { reactive, computed, toRefs, ref, watch, inject, onBeforeMount, onMounted } from "vue";
 import { getRequest } from "@/api/DesignForm";
 import { useDesignFormStore } from "@/store/DesignForm/designForm";
 import validate from "./validate";
@@ -4512,17 +4512,7 @@ getCustomerFormList().then(({ data }) => {
 });
 
 const orgAndManTree = ref<Tree[]>();
-// getAssociatedFormsOrgAndManTree().then(({ data }) => {
-//   let resData = ref(data.children);
-//   orgAndManTree.value = [
-//     {
-//       id: data.id,
-//       //label: data.label,
-//       label: "组织机构",
-//       children: [...resData.value],
-//     },
-//   ];
-// });
+
 
 const roleTree = ref<Tree[]>();
 getAssociatedFormsRoleTree().then(({ data }) => {
@@ -5465,6 +5455,21 @@ onMounted(() => {
   gainAiagentList()
 });
 
+
+onBeforeMount(() => {
+  getAssociatedFormsOrgAndManTree().then(({ data }) => {
+    let resData = ref(data.children);
+    orgAndManTree.value = [
+      {
+        id: data.id,
+        //label: data.label,
+        label: "组织机构",
+        children: [...resData.value],
+      },
+    ];
+  });
+});
+
 watch(
   () => state.tabsName,
   (val: string) => {
diff --git a/src/components/DesignForm/public/expand/lowcodeImage.vue b/src/components/DesignForm/public/expand/lowcodeImage.vue
index 7fdda3c..4470330 100644
--- a/src/components/DesignForm/public/expand/lowcodeImage.vue
+++ b/src/components/DesignForm/public/expand/lowcodeImage.vue
@@ -7,7 +7,7 @@
 import {
   AnalysisCss,
   AnalysisInputCss,
-} from "@/components/DesignForm/public/form/calculate/cssInfo";
+} from "@/components/DesignForm/public/form/calculate/cssInfo.ts";
 import errimg from "@/assets/404_images/imgNotFound.png";
 import { uploadUrl, getRequest } from "@/api/DesignForm";
 import { ref,useAttrs } from 'vue'
@@ -16,8 +16,6 @@ import { Plus } from '@element-plus/icons-vue'
 import type { UploadProps, UploadUserFile } from 'element-plus'
 import { useRoute } from 'vue-router';
 
-import NoImgPage from '@/assets/images/1.png'
-
 import { getCurrentInstance } from 'vue';
 
 const getAncestorComponentNames = () => {
@@ -312,7 +310,7 @@ const fit = computed(()=>{
 </script>
 <template>
   <el-image
-        v-if="(!hasELCard(ancestors))&&props.data.control&&props.type==5"
+        v-if="(!hasELCard(ancestors))&&props.data.control.useDefaultImg&&props.type==5"
         :src="value"
         class="avatar"
         :style="getFormItemInputStyle(configStyle, 2)"
@@ -353,23 +351,6 @@ const fit = computed(()=>{
         :style="getFormItemInputStyle(configStyle, 2)"
         :fit="fit"
       />
-  </el-upload>
-  <el-upload
-    v-if="props.type==1"
-    v-bind="$props"
-    class="upload-demo"
-    :action="uploadUrl"
-    :show-file-list="false"
-    :on-success="handleAvatarSuccess"
-    :before-upload="beforeAvatarUpload"
-    v-loading="imgLoading"
-  >
-    <el-image
-        :src="props.modelValue?props.modelValue:NoImgPage"
-        class="avatar"
-        :style="getFormItemInputStyle(configStyle, 2)"
-        :fit="fit"
-      />
   </el-upload>
     <!-- <img referrerpolicy="no-referrer" :src="url" :style="styleObject" :fit="fit" :class="[boderAndShadowClassIsActive ? boderAndShadowClass : '', radiusClassIsActive ? radiusClass : '',mp, floatFlag ? floatStyle : '']"  /> -->
     <!-- <div></div> -->
diff --git a/src/components/DesignForm/public/expand/rangedUserTree.vue b/src/components/DesignForm/public/expand/rangedUserTree.vue
index c753e72..8517304 100644
--- a/src/components/DesignForm/public/expand/rangedUserTree.vue
+++ b/src/components/DesignForm/public/expand/rangedUserTree.vue
@@ -1,5 +1,5 @@
 <script lang='ts' setup>
-import { computed, onMounted, onBeforeMount,nextTick,inject  } from 'vue'
+import { computed, onMounted, onBeforeMount, onUnmounted, nextTick, inject, ref, watch } from 'vue'
 import { criteriaForPeopleList } from '@/api/hr/org/type'
 import request from '@/utils/request';
 import { useAttrs } from 'vue'
@@ -15,7 +15,6 @@ const props = withDefaults(
     {}
 )
 
-
 const emits = defineEmits<{
     (e: 'update:modelValue', value: string): void
 }>()
@@ -30,6 +29,9 @@ const { location, updateLocation } = inject('location')
 // 上一次选择的值，用于比较
 const lastSelectedValue = ref(null)
 
+// 修复：组件挂载状态，用于防止卸载后异步操作更新状态
+const isMounted = ref(false)
+
 // 处理值变化
 const handleValueChange = (newValue) => {
     if (!multiSelect.value) {
@@ -60,8 +62,9 @@ const handleValueChange = (newValue) => {
         //实现选择用户选择时,自动填充选择组织  liwenxuan 2025-11-11 start 
         
         //监听选择用户的当前值,告知父组件form
-        updateLocation(value.value,props.data.name)
-
+        if (isMounted.value) {
+            updateLocation(value.value, props.data.name)
+        }
 
         //实现选择用户选择时,自动填充选择组织  liwenxuan 2025-11-11 end
     } else {
@@ -114,10 +117,28 @@ function parseStringToArray(str: string) {
     }
 }
 
-
+// 修复：递归清洗树数据，移除所有非数组的children字段
+const sanitizeTreeData = (data: any[]): any[] => {
+    if (!Array.isArray(data)) return [];
+    return data.map(node => {
+        const newNode = { ...node };
+        if (newNode.children != null) {
+            if (Array.isArray(newNode.children)) {
+                // 递归清洗子节点
+                newNode.children = sanitizeTreeData(newNode.children);
+            } else {
+                // 非数组的children会引发el-tree报错，直接删除
+                delete newNode.children;
+            }
+        }
+        return newNode;
+    });
+}
 
 onBeforeMount(() => {
     setTimeout(()=>{
+        // 修复：组件卸载后不再执行
+        if (!isMounted.value) return;
         if(props.modelValue){
             const initialValue = parseStringToArray(props.modelValue)
             value.value = initialValue;
@@ -126,14 +147,21 @@ onBeforeMount(() => {
             }
         }
     },1500)
-    
-    
+})
+
+onMounted(() => {
+    isMounted.value = true;
 })
 
 onUnmounted(()=>{
-    //console.log("onUnmounted")
+    isMounted.value = false;
+    // 清理轮询定时器
+    if (pollingTimer) clearTimeout(pollingTimer);
 })
 
+// 修复：增加轮询定时器清理
+let pollingTimer: ReturnType<typeof setTimeout> | null = null;
+
 // 递归处理树节点，将部门节点设置为禁用
 const processTreeData = (data: any[]) => {
     return data.map(node => {
@@ -165,17 +193,23 @@ const loadFullData = async () => {
         
         const result = await checkorgAndManTree1();
         
-        // 根据multiSelect的值处理数据
-        const processedData = !multiSelect.value ? processTreeData(result) : result;
+        // 修复：先清洗非法children，再处理禁用状态
+        const cleanedData = sanitizeTreeData(result);
+        const processedData = !multiSelect.value ? processTreeData(cleanedData) : cleanedData;
         
-        treeData.value = processedData;
-        isDataLoaded.value = true;
+        // 修复：仅在组件挂载时更新数据
+        if (isMounted.value) {
+            treeData.value = processedData;
+            isDataLoaded.value = true;
+        }
         return processedData;
     } catch (error) {
         console.error('加载组织数据失败:', error);
         return [];
     } finally {
-        loading.value = false;
+        if (isMounted.value) {
+            loading.value = false;
+        }
     }
 }
 
@@ -200,6 +234,11 @@ const resData = computed(() => {
 function checkorgAndManTree1() {
     return new Promise((resolve) => {
         const check = () => {
+            // 修复：组件已卸载，不再继续轮询
+            if (!isMounted.value) {
+                resolve([]);
+                return;
+            }
             let result = []
             let i = 0
             props.orgAndManTree.forEach((element: any) => {
@@ -216,7 +255,7 @@ function checkorgAndManTree1() {
                 });
                 resolve(result)
             } else {
-                setTimeout(check, 100)
+                pollingTimer = setTimeout(check, 100)
             }
         }
         check()