lu-lowcode-package-form 0.9.60 → 0.9.63

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lu-lowcode-package-form",
-  "version": "0.9.60",
+  "version": "0.9.63",
   "dependencies": {
     "@ant-design/icons": "^4.8.1",
     "@testing-library/jest-dom": "^5.17.0",

package/src/App.jsx

@@ -139,6 +139,28 @@ function App() {
           <Layout.FormGroupTitle title={"基本信息"} />
           <Layout.FormRow layout={'1'}>
             <Field.Table label="子表格" __id="table"  >
+            <Field.WithSingleSelect ref={testRef} fillRules={[
+            {
+              "id": "636d3924-0298-4e9b-809a-26d4a10d7b89",
+              "type": 0,
+              "source": "product_price11",
+              "target": "product_price11",
+              "subRules": [
+
+              ]
+            },
+            {
+              "id": "636d3924-0298-4e9b-809a-26d4a10d7b89",
+              "type": 0,
+              "source": "product_price12",
+              "target": "product_price12",
+              "subRules": [
+
+              ]
+            },
+           
+          ]} label="测试关联单选" options={[{ label: '选项1', value: '1', product_price11:"1111", product_price12:"2222"}, { label: '选项2', value: '2' }]} __id="remark11" />
+
               <Field.Switch label="开关" __id="switch_table"></Field.Switch>
               <Field.Input isRequired={true} label="商品价格" __id="product_price11" />
               <Field.Input isRequired={true} label="商品价格" __id="product_price12" />
@@ -303,7 +325,7 @@ function App() {
           </Layout.FormRow>
           <Field.CheckboxTree label="角色权限" __id="permissions" addRoot={false} treeData={treeData} />
           <Layout.FormGroupTitle title={"关联信息"} />
-          <Field.WithSingleSelect fillRules={[
+          <Field.WithSingleSelect ref={testRef} fillRules={[
             {
               "id": "636d3924-0298-4e9b-809a-26d4a10d7b89",
               "type": 0,
@@ -375,6 +397,10 @@ function App() {
         <Button type="primary" onClick={validateFields}>validateFields</Button>
         <Button type="primary" onClick={getFormFields}>GetValues</Button>
         <Button type="primary" onClick={setFormFields}>SetValues</Button>
+        <Button type="primary" onClick={()=>{
+          console.log("testRef.current",testRef.current)
+          testRef.current?.handleChange({ label: '选项1', value: '1', name:"1111",table:"[{\"price\":1,\"num\":2},{\"price\":2,\"num\":2}]"})
+        }}>testwithref</Button>
         <Button type="primary" onClick={handleCols}>UpdateCol</Button>
       </div>
 

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

@@ -62,7 +62,6 @@ const FormContainer = forwardRef(({ cols = 1, children, mode = "view" }, ref) =>
         function traverse(currentNode, parentNode = null) {
             var componentName = currentNode.type?.displayName || currentNode.props?._componentName;
             const { props } = currentNode;
-            console.log("props ///////////", props)
             if (componentName && (componentName.startsWith('Field.') || componentName.startsWith('Layout.'))) {
                 let identifier = props?.componentId || props?.__id;
                 let withIds = []
@@ -74,7 +73,7 @@ const FormContainer = forwardRef(({ cols = 1, children, mode = "view" }, ref) =>
                 if (props?.withIds)
                     withIds = [...withIds, ...props?.withIds]
 
-                fields.push({ identifier, withIds, component: currentNode,componentName, fillRules:props?.fillRules });
+                fields.push({ identifier, withIds, component: currentNode, componentName, fillRules: props?.fillRules });
             }
 
             if (props?.children) {
@@ -107,13 +106,13 @@ const FormContainer = forwardRef(({ cols = 1, children, mode = "view" }, ref) =>
     const initializeFieldVisibility = (reloadFields = false) => {
         const fieldValues = form.getFieldsValue();
         for (let key of dependencyMap.current.keys()) {
-            handleFieldsWith(key, fieldValues);
+            handleFieldsWith(key, fieldValues, true);
         }
         if (reloadFields) setFormContent(renderChildren());
     };
 
     // 计算字段级联关系
-    const handleFieldsWith = (identifier, fieldValues) => {
+    const handleFieldsWith = (identifier, fieldValues, init = false) => {
         let needRefresh = false;
         let parentIdentifier = [];
         if (Array.isArray(identifier)) {
@@ -121,12 +120,10 @@ const FormContainer = forwardRef(({ cols = 1, children, mode = "view" }, ref) =>
             identifier = identifier.filter(item => typeof item == "string").join(".")
         }
         if (dependencyMap.current.has(identifier)) {
-            const dependent =  dependencyMap.current.get(identifier)
-            console.log("dependent",dependent)
+            const dependent = dependencyMap.current.get(identifier)
             const dependentChildren = dependent.children;
-            // console.log("dependentChildren", dependentChildren)
-            if (dependent?.fillRules && Array.isArray(dependent?.fillRules) && dependent?.fillRules.length > 0) {
-                handleFillRules(identifier,parentIdentifier, fieldValues, dependent?.fillRules)
+            if (!init && dependent?.fillRules && Array.isArray(dependent?.fillRules) && dependent?.fillRules.length > 0) {
+                handleFillRules(identifier, parentIdentifier, fieldValues, dependent?.fillRules)
             }
             dependentChildren.forEach(child => {
                 if (child.component.props.withFunc && typeof child.component.props.withFunc === 'function') {
@@ -134,7 +131,7 @@ const FormContainer = forwardRef(({ cols = 1, children, mode = "view" }, ref) =>
                 }
 
                 if (child.component.props.withFill)
-                    handleFieldsWithFill(fieldValues, child, parentIdentifier,dependent?.componentName)
+                    handleFieldsWithFill(fieldValues, child, parentIdentifier, dependent?.componentName)
 
             });
         }
@@ -142,40 +139,54 @@ const FormContainer = forwardRef(({ cols = 1, children, mode = "view" }, ref) =>
     };
 
     // 处理填充规则
-    const handleFillRules = (current_identifier,parentIdentifier, fieldValues, fillRules) => {
+    const handleFillRules = (current_identifier, parentIdentifier, fieldValues, fillRules) => {
+
+
         // 获取当前变更的字段数据
-        let current_value = getParamValue("fieldsValue", current_identifier, fieldValues, null) 
+        let current_value = getParamValue("fieldsValue", current_identifier, fieldValues, null)
         for (let index = 0; index < fillRules.length; index++) {
             const rule = fillRules[index];
-            const { source , target } = rule 
-            let source_value =  current_value?.[source]
+            let { source, target } = rule
+            let source_value = current_value?.[source]
+            let setValue = source_value
             // 子表
             if (rule?.type == 1) {
-                console.log("source_value",source_value)
                 if (source_value && typeof source_value == "string") {
-                   try {
-                    source_value = JSON.parse(source_value)
-                   } catch (error) {
-                    console.log("error end",error)}
+                    try {
+                        source_value = JSON.parse(source_value)
+                    } catch (error) {
+                        console.log("error end", error)
+                    }
                 }
-                console.log("source_value end",source_value)
 
-                if (!Array.isArray(source_value)) return 
+                if (!Array.isArray(source_value)) return
                 let target_value = source_value.map(item => {
                     let target_value = {}
                     if (rule?.subRules && Array.isArray(rule?.subRules) && rule?.subRules.length > 0)
                         for (let index = 0; index < rule?.subRules.length; index++) {
-                            const { source:subSource, target:subTarget } = rule?.subRules[index];
+                            const { source: subSource, target: subTarget } = rule?.subRules[index];
                             target_value[subTarget] = item?.[subSource]
                         }
                     return target_value
                 })
-                form.setFieldValue(target,target_value)
+                setValue = target_value
             }
             // 同级字段
-            else form.setFieldValue(target,source_value)
+            else {
+                let withFillIndex = 0
+                let withFillGroup = ""
+                if (parentIdentifier && Array.isArray(parentIdentifier) && parentIdentifier.length > 1) {
+                    withFillGroup = parentIdentifier.filter(item => typeof item == "string").join(".")
+                    withFillIndex = parentIdentifier[parentIdentifier.length - 1]
+                    target = [...parentIdentifier, target]
+                    if (Array.isArray(current_value) && current_value.length > withFillIndex) {
+                        setValue = current_value[withFillIndex]?.[source]
+                    }
+                }
+            }
+            form.setFieldValue(target, setValue)
         }
-        console.log("current value",current_value )
+        console.log("current value", current_value)
     }
     // 处理级联显示隐藏 @return {boolean} 是否需要重新渲染表单的字段
     const handleFieldsVisible = (fieldValues, child, parentIdentifier) => {
@@ -194,7 +205,7 @@ const FormContainer = forwardRef(({ cols = 1, children, mode = "view" }, ref) =>
     }
     // 处理级联数据源
     // 处理级联填充
-    const handleFieldsWithFill = async (fieldValues, child, parentIdentifier,componentName) => {
+    const handleFieldsWithFill = async (fieldValues, child, parentIdentifier, componentName) => {
         const withFill = child?.component?.props.withFill;
         const withDataFetch = child?.component?.props.withDataFetch;
         let withFillIndex = 0
@@ -205,10 +216,10 @@ const FormContainer = forwardRef(({ cols = 1, children, mode = "view" }, ref) =>
             withFillIndex = parentIdentifier[parentIdentifier.length - 1]
             if (childIdentifier.startsWith(`${withFillGroup}.`)) {
                 childIdentifier = [...parentIdentifier, childIdentifier.replace(`${withFillGroup}.`, "")]
-            }   
+            }
         }
         let withDatas = [];
-        console.log("componentName",componentName)
+        console.log("componentName", componentName)
         // 先处理依赖数据
         if (withFill?.withData && withFill?.withData.length > 0 && withDataFetch && typeof withDataFetch === 'function') {
             for (let index = 0; index < withFill?.withData.length; index++) {