lu-lowcode-package-form 0.11.83 → 0.11.84

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lu-lowcode-package-form",
-  "version": "0.11.83",
+  "version": "0.11.84",
   "dependencies": {
     "@ant-design/icons": "^4.8.1",
     "@dnd-kit/core": "^6.1.0",

package/src/components/form-container/index.jsx

@@ -162,8 +162,15 @@ const FormContainer = forwardRef(({ cols = 1, children, mode = "view" }, ref) =>
     }
 
     const lastFormValues = React.useRef(null);
+    // 统一使用点分隔的字符串格式
+    const normalizeFieldPath = (fieldPath) => {
+        if (Array.isArray(fieldPath)) {
+            return fieldPath.map(item => typeof item === "string" ? item : item.toString()).join(".");
+        }
+        return fieldPath;
+    };
     const getLastFieldValue = (path) => {
-        return lastFormValues.current?.[path]
+        return lastFormValues.current?.[normalizeFieldPath(path)]
         // let current = lastFormValues.current;
         // for (let i = 0; i < path.length; i++) {
         //     if (current == null) {
@@ -310,11 +317,11 @@ const FormContainer = forwardRef(({ cols = 1, children, mode = "view" }, ref) =>
             for (let index = 0; index < lastFormValuesKeys.length; index++) {
                 const key = lastFormValuesKeys[index];
                 if (key.includes(`${name},`)) {
-                    delete lastFormValues.current[key]
+                    delete lastFormValues.current[normalizeFieldPath(key)]
                 }
             }
         }
-        else delete lastFormValues.current[name]
+        else delete lastFormValues.current[normalizeFieldPath(name)]
     }
 
     const recordFieldChange = (fieldName, fieldValue) => {
@@ -421,8 +428,12 @@ const FormContainer = forwardRef(({ cols = 1, children, mode = "view" }, ref) =>
                 changedFields[target] = { name: Array.isArray(target) ? target : [target], value: setValue };
             }
             if (rule?.type == 1) {
+                console.log("rule?.type == 1", target)
+                console.log("rule?.type == 1", setValue)
+                console.log("rule?.type == 1 current_identifier", current_identifier)
                 form.setFieldValue(target, undefined);
             }
+            console.log("form.setFieldValue(target, setValue) " +target, setValue)
             form.setFieldValue(target, setValue)
 
             // 处理完当前字段后从依赖路径中移除
@@ -725,10 +736,10 @@ const FormContainer = forwardRef(({ cols = 1, children, mode = "view" }, ref) =>
             dependencyGraphRef.current.startNewCycle();
 
             // 创建当前变更的快照，避免处理过程中的并发修改
-            const currentChanges = {...changedFieldsState.current};
+            const currentChanges = { ...changedFieldsState.current };
             // 立即重置变更状态，为新的变更做准备
             changedFieldsState.current = {};
-            
+
             const fieldValues = form.getFieldsValue();
             const lockStatus_ = lockStatus.current;
             lockStatus.current = 0
@@ -758,7 +769,7 @@ const FormContainer = forwardRef(({ cols = 1, children, mode = "view" }, ref) =>
                             let needRefresh_ = await handleFieldsWith(field.name, fieldValues, false, fieldId);
                             needRefresh = needRefresh || needRefresh_;
                         }
-                        lastFormValues.current[field.name] = field.value;
+                        lastFormValues.current[normalizeFieldPath(field.name)] = field.value;
                     }
                 } catch (error) {
                     console.log("debounceHandleFieldsChange error", error)
@@ -772,22 +783,22 @@ const FormContainer = forwardRef(({ cols = 1, children, mode = "view" }, ref) =>
     }, []);
 
     const handleFieldsChange = React.useCallback((changedFields) => {
-        console.log("handleFieldsChange (disabled, using handleValuesChange instead)", JSON.stringify(changedFields))
+        // console.log("handleFieldsChange (disabled, using handleValuesChange instead)", JSON.stringify(changedFields))
         // 已禁用，改为使用 handleValuesChange 来处理字段变更
         // 这样可以避免重复处理和多余的触发
     }, []);
     const handleValuesChange = React.useCallback((changedValues, allValues) => {
         console.log("handleValuesChange changedValues", JSON.stringify(changedValues))
-        console.log("handleValuesChange allValues", JSON.stringify(allValues))
-        
+        // console.log("handleValuesChange allValues", JSON.stringify(allValues))
+
         // 将 changedValues 转换为类似 handleFieldsChange 的格式
         const convertToFieldsFormat = (values, parentPath = []) => {
             const fieldsArray = [];
-            
+
             for (let fieldName in values) {
                 const fieldValue = values[fieldName];
                 const currentPath = [...parentPath, fieldName];
-                
+
                 // 处理数组类型（如table字段）
                 if (Array.isArray(fieldValue)) {
                     fieldValue.forEach((item, index) => {
@@ -822,14 +833,14 @@ const FormContainer = forwardRef(({ cols = 1, children, mode = "view" }, ref) =>
                     });
                 }
             }
-            
+
             return fieldsArray;
         };
-        
+
         // 转换为类似 handleFieldsChange 的格式
         const convertedFields = convertToFieldsFormat(changedValues);
         console.log("handleValuesChange converted to fields format", JSON.stringify(convertedFields));
-        
+
         // 使用转换后的数据，复用原有的处理逻辑
         if (convertedFields.length > 0) {
             convertedFields.forEach(field => {
@@ -837,12 +848,12 @@ const FormContainer = forwardRef(({ cols = 1, children, mode = "view" }, ref) =>
                     changedFieldsState.current[field.name] = field;
                 }
             });
-            
-            console.log("handleValuesChange changedFieldsState",JSON.parse(JSON.stringify(changedFieldsState.current)));
+
+            console.log("handleValuesChange changedFieldsState", JSON.parse(JSON.stringify(changedFieldsState.current)));
             debounceHandleFieldsChange();
         }
     }, []);
-  
+
     const getTableWithIds = (ids) => {
         let withAllIds = []
         ids.forEach(id => {