lu-lowcode-package-form 0.11.86 → 0.11.88

package/package.json

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

package/src/App.jsx

@@ -109,7 +109,7 @@ function App() {
     }
   }
   const setFormFields = () => {
-    formRef?.current?.setFieldsValue({ "__id": 1, "routeType":1, "userselect": "1213131", "remark11": { "label": "选项1", "value": "1", "name": "1111", "table": "[{\"price\":1,\"num\":2},{\"price\":2,\"num\":2},{\"price\":3,\"num\":3},{\"price\":3,\"num\":3}]" }, "table2": [{}], "table": [{ "product_num1": "123", "product_sum1": "", "node_oclxmzswzti": "", "select2": "", "switch_table": false, "remark11": { "label": "选项2", "value": "2" }, "product_price12": "", "tianchong1": { "label": "选项1", "value": "1", "tianchong2": { "label": "选项2", "value": "2" }, "tcinput1": "1111" }, "tianchong2": { "label": "选项2", "value": "2", "tcinput1": "8989", "tcinput2": "2222" }, "tcinput1": "8989", "tcinput2": "2222", "tcinput3": "2222" }, { "product_num1": "213", "product_sum1": "", "node_oclxmzswzti": "", "select2": "", "switch_table": false, "datetime2": "2024-08-22 11:09:07", "product_price13": 1, "product_price14": 2, "product_price12": "", "remark11": { "label": "选项3", "value": "3" }, "product_price11": 3 }], "product_total_price": "0.00", "DeptSelect": ["leaf11"], "PostSelect": ["parent 1-1", "leaf11"], "searchuser": [{ "id": 2, "name": "2222", "label": "2222", "value": 2 }, { "id": 4, "name": "4444", "label": "4444", "value": 4 }], "product_price": "213", "product_num": "21", "product_num_range": [1, 22], "product_sum": "4473", "switch": false, "datetime": "2024-08-25", "datetime2": "2024-08-25", "datetime3": "", "datetime4": "2024-08-22 11:09:04", "remark12": JSON.stringify([{ "label": "选项1", "value": "1" }, { "label": "选项2", "value": "2" }]) })
+    formRef?.current?.setFieldsValue({ "__id": 1, "userselect": "1213131", "remark11": { "label": "选项1", "value": "1", "name": "1111", "table": "[{\"price\":1,\"num\":2},{\"price\":2,\"num\":2},{\"price\":3,\"num\":3},{\"price\":3,\"num\":3}]" }, "table2": [{}], "table": [{ "product_num1": "123", "product_sum1": "", "node_oclxmzswzti": "", "select2": "", "switch_table": false, "remark11": { "label": "选项2", "value": "2" }, "product_price12": "", "tianchong1": { "label": "选项1", "value": "1", "tianchong2": { "label": "选项2", "value": "2" }, "tcinput1": "1111" }, "tianchong2": { "label": "选项2", "value": "2", "tcinput1": "8989", "tcinput2": "2222" }, "tcinput1": "8989", "tcinput2": "2222", "tcinput3": "2222" }, { "product_num1": "213", "product_sum1": "", "node_oclxmzswzti": "", "select2": "", "switch_table": false, "datetime2": "2024-08-22 11:09:07", "product_price13": 1, "product_price14": 2, "product_price12": "", "remark11": { "label": "选项3", "value": "3" }, "product_price11": 3 }], "product_total_price": "0.00", "DeptSelect": ["leaf11"], "PostSelect": ["parent 1-1", "leaf11"], "searchuser": [{ "id": 2, "name": "2222", "label": "2222", "value": 2 }, { "id": 4, "name": "4444", "label": "4444", "value": 4 }], "product_price": "213", "product_num": "21", "product_num_range": [1, 22], "product_sum": "4473", "switch": false, "datetime": "2024-08-25", "datetime2": "2024-08-25", "datetime3": "", "datetime4": "2024-08-22 11:09:04", "remark12": JSON.stringify([{ "label": "选项1", "value": "1" }, { "label": "选项2", "value": "2" }]) })
     // formRef?.current?.setFieldsValue({"tianchong1":{"label":"选项1","value":"1"}, })
   }
   const handleCols = () => {

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

@@ -50,7 +50,7 @@ function batchElements(elements, groupSize, dmap) {
 }
 
 
-const FormContainer = forwardRef(({ cols = 1, children, mode = "view", denyEdit = false }, ref) => {
+const FormContainer = forwardRef(({ cols = 1, children, mode = "view" }, ref) => {
     const [form] = Form.useForm();
     const formContentRef = React.useRef(null);
     const [formContent, setFormContent] = React.useState(null);
@@ -114,8 +114,6 @@ const FormContainer = forwardRef(({ cols = 1, children, mode = "view", denyEdit
         setFieldsValue: (values) => {
             lockStatus.current = 1;
             let formData = { ...values, __id: values?.id }
-            
-            // denyEdit 模式下仍需要记录字段变化用于显示/隐藏逻辑
             for (let key in values) {
                 changedFieldsState.current[key] = { name: key, value: values[key] }
                 if (dependencyMap.current.has(key) && dependencyMap.current.get(key).componentName == "Field.Table" && Array.isArray(values[key])) {
@@ -128,19 +126,12 @@ const FormContainer = forwardRef(({ cols = 1, children, mode = "view", denyEdit
                 }
             }
             form.setFieldsValue(formData)
-            
-            // denyEdit 模式下跳过复杂的级联处理，但保留简单的显示/隐藏处理
-            if (denyEdit) {
-                // 只处理显示/隐藏逻辑，不处理填充和数据获取
-                debounceHandleFieldsChange_ReadOnly()
-            } else {
-                debounceHandleFieldsChange()
-            }
+            debounceHandleFieldsChange()
         },
         initializeFieldVisibility: (reloadFields) => {
             initializeFieldVisibility(reloadFields);
         },
-    }), [denyEdit]);
+    }), []);
 
     // 添加节流后的 initializeFormRender
     const throttledInitializeFormRender = React.useCallback(
@@ -257,7 +248,7 @@ const FormContainer = forwardRef(({ cols = 1, children, mode = "view", denyEdit
 
 
     // 计算字段级联关系
-    const handleFieldsWith = async (identifier, fieldValues, init = false, fieldId = null) => {
+    const handleFieldsWith = async (identifier, fieldValues, init = false, fieldId = null, targetRowIndex = -1) => {
         if (mode == "desgin") {
             console.log("设计模式下不进行字段级联计算")
             return false
@@ -291,24 +282,25 @@ const FormContainer = forwardRef(({ cols = 1, children, mode = "view", denyEdit
                 const dependentChildren = dependent.children;
 
 
-                if (!init && dependent?.fillRules && Array.isArray(dependent?.fillRules) && dependent?.fillRules.length > 0) {
+                if (!init && dependent?.fillRules && Array.isArray(dependent?.fillRules) && dependent?.fillRules.length > 0 && (!(typeof targetRowIndex === 'number' && targetRowIndex >= 0))) {
                     handleFillRules(identifier, parentIdentifier, fieldValues, dependent?.fillRules)
                 }
                 for (let index = 0; index < dependentChildren.length; index++) {
                     const child = dependentChildren[index];
-                    if (child.component.props.withVisibleFunc && typeof child.component.props.withVisibleFunc === 'function') {
-                        let needRefresh_ = handleFieldsVisibleFunc(fieldValues, child, parentIdentifier)
-                        needRefresh = needRefresh || needRefresh_
-                    }
+                    if (!(typeof targetRowIndex === 'number' && targetRowIndex >= 0)) {
+                        if (child.component.props.withVisibleFunc && typeof child.component.props.withVisibleFunc === 'function') {
+                            let needRefresh_ = handleFieldsVisibleFunc(fieldValues, child, parentIdentifier)
+                            needRefresh = needRefresh || needRefresh_
+                        }
 
-                    if (child.component.props.withVisible) {
-                        let needRefresh_ = await handleFieldsVisible(fieldValues, child, parentIdentifier, dependent?.componentName)
-                        needRefresh = needRefresh || needRefresh_
+                        if (child.component.props.withVisible) {
+                            let needRefresh_ = await handleFieldsVisible(fieldValues, child, parentIdentifier, dependent?.componentName)
+                            needRefresh = needRefresh || needRefresh_
+                        }
                     }
 
-
                     if (!init && child.component.props.withFill)
-                        await handleFieldsWithFill(fieldValues, child, parentIdentifier, dependent?.componentName, currentFieldId)
+                        await handleFieldsWithFill(fieldValues, child, parentIdentifier, dependent?.componentName, currentFieldId, targetRowIndex)
 
                 }
             }
@@ -319,54 +311,6 @@ const FormContainer = forwardRef(({ cols = 1, children, mode = "view", denyEdit
 
         return needRefresh;
     };
-
-    // denyEdit 模式专用函数 - 只处理显示/隐藏逻辑
-    const handleFieldsWithVisibleOnly = async (identifier, fieldValues, init = false, fieldId = null) => {
-        if (mode == "desgin") {
-            console.log("设计模式下不进行字段级联计算")
-            return false
-        }
-        
-        console.log("handleFieldsWithVisibleOnly identifier", identifier)
-        let needRefresh = false;
-        let parentIdentifier = [];
-        if (Array.isArray(identifier)) {
-            parentIdentifier = [...(identifier.slice(0, -1))]
-            identifier = identifier.filter(item => typeof item == "string").join(".")
-        }
-
-        const currentFieldId = fieldId || identifier;
-        
-        try {
-            if (dependencyMap.current.has(identifier)) {
-                const dependent = dependencyMap.current.get(identifier)
-                const dependentChildren = dependent.children;
-
-                // 只处理显示/隐藏逻辑，跳过填充规则
-                for (let index = 0; index < dependentChildren.length; index++) {
-                    const child = dependentChildren[index];
-                    
-                    // 处理 withVisibleFunc
-                    if (child.component.props.withVisibleFunc && typeof child.component.props.withVisibleFunc === 'function') {
-                        let needRefresh_ = handleFieldsVisibleFunc(fieldValues, child, parentIdentifier)
-                        needRefresh = needRefresh || needRefresh_
-                    }
-
-                    // 处理 withVisible（但跳过数据获取部分）
-                    if (child.component.props.withVisible) {
-                        let needRefresh_ = await handleFieldsVisibleReadOnly(fieldValues, child, parentIdentifier, dependent?.componentName)
-                        needRefresh = needRefresh || needRefresh_
-                    }
-
-                    // 跳过 withFill 处理
-                }
-            }
-        } catch (error) {
-            console.log("handleFieldsWithVisibleOnly error", error)
-        }
-
-        return needRefresh;
-    };
     const removeLastFieldsValues = (name, isTable = false) => {
         if (!lastFormValues.current) return
         if (isTable) {
@@ -403,7 +347,6 @@ const FormContainer = forwardRef(({ cols = 1, children, mode = "view", denyEdit
     const handleFillRules = (current_identifier, parentIdentifier, fieldValues, fillRules) => {
         // 获取当前变更的字段数据
         let current_value = getParamValue("fieldsValue", current_identifier, fieldValues, null)
-        console.log("handleFillRules current_value" + current_identifier, current_value)
         let changedFields = {}
 
         // 将标识符标准化为字符串
@@ -491,7 +434,7 @@ const FormContainer = forwardRef(({ cols = 1, children, mode = "view", denyEdit
                 console.log("rule?.type == 1 current_identifier", current_identifier)
                 form.setFieldValue(target, undefined);
             }
-            console.log("form.setFieldValue(target, setValue) " +target, setValue)
+            console.log("form.setFieldValue(target, setValue) " + target, setValue)
             form.setFieldValue(target, setValue)
 
             // 处理完当前字段后从依赖路径中移除
@@ -618,64 +561,9 @@ const FormContainer = forwardRef(({ cols = 1, children, mode = "view", denyEdit
         }
         return needRefresh
     }
-    
-    // denyEdit 模式专用 - 处理级联显示隐藏（跳过数据获取）
-    const handleFieldsVisibleReadOnly = async (fieldValues, child, parentIdentifier, componentName) => {
-        let needRefresh = false;
-        const withFill = child?.component?.props.withVisible;
-        let withFillIndex = 0
-        let withFillGroup = ""
-        let childIdentifier = child.identifier;
-
-        // 跳过数据获取部分，使用空数组作为 withDatas
-        let withDatas = [];
-
-        // 构造计算公式（但不获取远程数据）
-        let formula;
-        if (withFill.value && withFill.value.length > 0) {
-            formula = withFill.value.map(item => {
-                let result = "";
-                const { insert, attributes } = item
-                if (typeof insert !== "string") {
-                    if (insert?.span && attributes && attributes.tagKey && attributes.id) {
-                        result = getParamValue(attributes.tagKey, attributes.id, fieldValues, withDatas)
-                        if (Array.isArray(result)) {
-                            if (Array.isArray(childIdentifier) && result.length > withFillIndex) {
-                                result = result[withFillIndex]
-                            }
-                            if (typeof result === "object" && result !== null)
-                                result = JSON.stringify(result)
-                        }
-                        else if (typeof result === "object" && result !== null) {
-                            result = JSON.stringify(result)
-                        }
-                        else if (result.length > 0) result = `"${result}"`
-                    }
-                }
-                else result = insert
-                return result
-            })
-        }
-        
-        if (dependencyMap.current.has(childIdentifier)) {
-            const childData = dependencyMap.current.get(childIdentifier);
-            if (formula && formula.length > 0) {
-                const formulaResult = (evalFormula(formula) == "true");
-                console.log(`${childIdentifier} 只读模式计算公式:`, formula)
-                console.log(`${childIdentifier} 只读模式计算结果:`, formulaResult)
-                if (childData.show != formulaResult) {
-                    childData.show = formulaResult;
-                    dependencyMap.current.set(childIdentifier, childData);
-                    needRefresh = true;
-                }
-            }
-        }
-        return needRefresh
-    }
-    
     // 处理级联数据源
     // 处理级联填充
-    const handleFieldsWithFill = async (fieldValues, child, parentIdentifier, componentName, sourceFieldId) => {
+    const handleFieldsWithFill = async (fieldValues, child, parentIdentifier, componentName, sourceFieldId, targetRowIndex = -1) => {
         // console.log("handleFieldsWithFill child.identifier", child.identifier)
         // console.log("handleFieldsWithFill parentIdentifier", parentIdentifier)
         console.log("handleFieldsWithFill componentName", componentName)
@@ -696,9 +584,14 @@ const FormContainer = forwardRef(({ cols = 1, children, mode = "view", denyEdit
             childIdentifier = childIdentifier.split(".")
             let table_values = getParamValue("fieldsValue", childIdentifier[0], fieldValues, [])
             if (Array.isArray(table_values) && table_values.length > 0)
-                for (let index = 0; index < table_values.length; index++) {
-                    await handleFieldsWithFill(fieldValues, child, [childIdentifier[0], index], componentName, sourceFieldId)
+                if (targetTableName && typeof targetRowIndex === 'number' && targetRowIndex >= 0) {
+                    if (targetRowIndex < table_values.length) {
+                        await handleFieldsWithFill(fieldValues, child, [childIdentifier[0], targetRowIndex], componentName, sourceFieldId)
+                    }
                 }
+            for (let index = 0; index < table_values.length; index++) {
+                await handleFieldsWithFill(fieldValues, child, [childIdentifier[0], index], componentName, sourceFieldId)
+            }
 
             return
         }
@@ -893,59 +786,7 @@ const FormContainer = forwardRef(({ cols = 1, children, mode = "view", denyEdit
                 updateFormContent();
             }
         }, delay);
-    }, [denyEdit]);
-
-    // denyEdit 模式专用的防抖处理函数 - 只处理显示/隐藏，不处理填充和数据获取
-    const debounceHandleFieldsChange_ReadOnly = React.useCallback(() => {
-        if (timeoutRef.current) {
-            clearTimeout(timeoutRef.current);
-        }
-
-        // 只读模式使用更短的延迟
-        const delay = 50;
-
-        timeoutRef.current = setTimeout(async () => {
-            const currentChanges = { ...changedFieldsState.current };
-            changedFieldsState.current = {};
-
-            const fieldValues = form.getFieldsValue();
-            let needRefresh = false;
-            if (!lastFormValues.current) lastFormValues.current = {}
-
-            // 创建已处理字段集合，用于避免多次处理同一字段
-            const processedFields = new Set();
-            for (let key in currentChanges) {
-                try {
-                    let field = currentChanges[key];
-                    if (!isEqual(field.value || "", getLastFieldValue(field.name) || "")) {
-                        // 获取字段标识符（字符串形式）
-                        const fieldId = Array.isArray(field.name)
-                            ? field.name.map(item => typeof item == "string" ? item : item.toString()).join(".")
-                            : field.name;
-
-                        // 跳过已处理的字段
-                        if (processedFields.has(fieldId)) {
-                            console.log("跳过已处理的字段 processedFields", fieldId)
-                            continue;
-                        }
-                        processedFields.add(fieldId);
-
-                        // 只处理显示/隐藏逻辑，不处理填充和数据获取
-                        let needRefresh_ = await handleFieldsWithVisibleOnly(field.name, fieldValues, false, fieldId);
-                        needRefresh = needRefresh || needRefresh_;
-                        
-                        lastFormValues.current[normalizeFieldPath(field.name)] = field.value;
-                    }
-                } catch (error) {
-                    console.log("debounceHandleFieldsChange_ReadOnly error", error)
-                }
-            }
-            if (needRefresh) {
-                console.log("needRefresh (ReadOnly mode)", needRefresh)
-                updateFormContent();
-            }
-        }, delay);
-    }, [denyEdit]);
+    }, []);
 
     const handleFieldsChange = React.useCallback((changedFields) => {
         // console.log("handleFieldsChange (disabled, using handleValuesChange instead)", JSON.stringify(changedFields))
@@ -1015,15 +856,9 @@ const FormContainer = forwardRef(({ cols = 1, children, mode = "view", denyEdit
             });
 
             console.log("handleValuesChange changedFieldsState", JSON.parse(JSON.stringify(changedFieldsState.current)));
-            
-            // denyEdit 模式下使用专用的处理函数
-            if (denyEdit) {
-                debounceHandleFieldsChange_ReadOnly();
-            } else {
-                debounceHandleFieldsChange();
-            }
+            debounceHandleFieldsChange();
         }
-    }, [denyEdit]);
+    }, []);
 
     const getTableWithIds = (ids) => {
         let withAllIds = []