lu-lowcode-package-form 0.11.1 → 0.11.3

package/package.json

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

package/src/App.jsx

@@ -230,7 +230,7 @@ function App() {
 
             <Field.Input label="测试 withVisible" __id="withVisible"
             isRequired={true}
-              withIds={["fill_datasource1"]}
+              withIds={["routeType"]}
               withVisible={{
                 "value": [
                   {
@@ -238,7 +238,7 @@ function App() {
                       "span": true
                     },
                     "attributes": {
-                      "id": "fill_datasource1",
+                      "id": "routeType",
                       "color": "blue",
                       "tagKey": "fieldsValue",
                       "content": "当前表单.开关"
@@ -252,7 +252,8 @@ function App() {
                 "withData": [
 
                 ]
-              }} />
+              }} 
+            />
 
             <Field.Select label="绑定表单"
               option_label={"formTitle"}

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

@@ -157,17 +157,17 @@ const FormContainer = forwardRef(({ cols = 1, children, mode = "view" }, ref) =>
     };
 
     // 初始化字段的级联关系
-    const initializeFieldVisibility = (reloadFields = false) => {
+    const initializeFieldVisibility = async (reloadFields = false) => {
         console.log("initializeFieldVisibility")
         const fieldValues = form.getFieldsValue();
         for (let key of dependencyMap.current.keys()) {
-            handleFieldsWith(key, fieldValues, true);
+             handleFieldsWith(key, fieldValues, true);
         }
         if (reloadFields) setFormContent(renderChildren());
     };
 
     // 计算字段级联关系
-    const handleFieldsWith = (identifier, fieldValues, init = false) => {
+    const handleFieldsWith = async (identifier, fieldValues, init = false) => {
         console.log("handleFieldsWith identifier", identifier)
         let needRefresh = false;
         let parentIdentifier = [];
@@ -183,14 +183,15 @@ const FormContainer = forwardRef(({ cols = 1, children, mode = "view" }, ref) =>
             if (!init && dependent?.fillRules && Array.isArray(dependent?.fillRules) && dependent?.fillRules.length > 0) {
                 handleFillRules(identifier, parentIdentifier, fieldValues, dependent?.fillRules)
             }
-            dependentChildren.forEach(child => {
+            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 (child.component.props.withVisible) {
-                    let needRefresh_ = handleFieldsVisible(fieldValues, child, parentIdentifier, dependent?.componentName)
+                    let needRefresh_ = await handleFieldsVisible(fieldValues, child, parentIdentifier, dependent?.componentName)
                     needRefresh = needRefresh || needRefresh_
                 }
 
@@ -198,7 +199,7 @@ const FormContainer = forwardRef(({ cols = 1, children, mode = "view" }, ref) =>
                 if (!init && child.component.props.withFill)
                     handleFieldsWithFill(fieldValues, child, parentIdentifier, dependent?.componentName)
 
-            });
+            }
         }
         return needRefresh;
 
@@ -515,7 +516,7 @@ const FormContainer = forwardRef(({ cols = 1, children, mode = "view" }, ref) =>
             console.log(`${childIdentifier} 计算公式:`, formula)
             console.log(`${childIdentifier} 计算结果:`, formulaResult)
             form.setFieldValue(childIdentifier, formulaResult)
-            handleFieldsWith(childIdentifier, form.getFieldsValue())
+            await handleFieldsWith(childIdentifier, form.getFieldsValue())
         }
     }
 
@@ -557,7 +558,7 @@ const FormContainer = forwardRef(({ cols = 1, children, mode = "view" }, ref) =>
 
         const delay = lockStatus.current === 1 ? 500 : 100;
 
-        timeoutRef.current = setTimeout(() => {
+        timeoutRef.current = setTimeout(async () => {
 
             const fieldValues = form.getFieldsValue();
             const lockStatus_ = lockStatus.current;
@@ -570,7 +571,7 @@ const FormContainer = forwardRef(({ cols = 1, children, mode = "view" }, ref) =>
                 if (!isEqual(field.value || "", getLastFieldValue(field.name) || "")) {
                     if (lockStatus_ != 1) {
                         console.log("handleFieldsWith field.name", field.name)
-                        needRefresh = handleFieldsWith(field.name, fieldValues);
+                        needRefresh = await handleFieldsWith(field.name, fieldValues);
                     }
                     lastFormValues.current[field.name] = field.value;
                 }
@@ -609,21 +610,23 @@ const FormContainer = forwardRef(({ cols = 1, children, mode = "view" }, ref) =>
         })
         return withAllIds
     }
-    const handleTableAddRow = (ids) => {
+    const handleTableAddRow =  (ids) => {
         let withAllIds = getTableWithIds(ids)
         const fieldValues = form.getFieldsValue();
-        setTimeout(() => {
-            withAllIds.forEach(withid => {
-                handleFieldsWith(withid, fieldValues);
-            })
+        setTimeout(async () => {
+            for (let index = 0; index < withAllIds.length; index++) {
+                const withid = withAllIds[index];
+                await handleFieldsWith(withid, fieldValues);
+            }
         }, 0);
     }
-    const handleTableRemoveRow = (ids) => {
+    const handleTableRemoveRow = async (ids) => {
         const fieldValues = form.getFieldsValue();
-        setTimeout(() => {
-            ids.forEach(id => {
-                handleFieldsWith(id, fieldValues);
-            })
+        setTimeout(async () => {
+            for (let index = 0; index < ids.length; index++) {
+                const id = ids[index];
+                await handleFieldsWith(id, fieldValues);
+            }
         }, 0);
     }