lu-lowcode-package-form 0.9.62 → 0.9.65

package/package.json

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

package/src/App.jsx

@@ -139,8 +139,39 @@ 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": [
+
+              ]
+            },
+            {
+              "id": "636d3924-0298-4e9b-809a-26d4a10d7b89",
+              "type": 0,
+              "source": "product_price1",
+              "target": "product_price1",
+              "subRules": [
+
+              ]
+            },
+           
+          ]} label="测试关联单选" options={[{ label: '选项1', value: '1', product_price11:"1111", product_price12:"2222",product_price1:111}, { label: '选项2', value: '2' }]} __id="remark11" />
+
               <Field.Switch label="开关" __id="switch_table"></Field.Switch>
-              <Field.Input isRequired={true} label="商品价格" __id="product_price11" />
+              <Field.Input defaultValue={3} isRequired={true} label="商品价格" __id="product_price11" />
               <Field.Input isRequired={true} label="商品价格" __id="product_price12" />
               <Field.Input isRequired={true} label="商品价格" __id="product_price13" />
               <Field.Input isRequired={true} label="商品价格" __id="product_price14" />
@@ -303,7 +334,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 +406,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/field/select/select.jsx

@@ -124,6 +124,7 @@ const WithMultipleSelect = ({ readItemRender, readonly, onChange, value, ...prop
 
 // 选择用户组件 
 const UserSelect = ({ customComponent: CustomComponent, ...props }) => {
+    console.log("UserSelect ////// props",props)
     if (!CustomComponent) return <BaseWrapper {...props}><Input {...props} /></BaseWrapper>
     else return <BaseWrapper {...props}><CustomComponent {...props} /></BaseWrapper>
 }

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

@@ -140,12 +140,15 @@ const FormContainer = forwardRef(({ cols = 1, children, mode = "view" }, ref) =>
 
     // 处理填充规则
     const handleFillRules = (current_identifier, parentIdentifier, fieldValues, fillRules) => {
+
+
         // 获取当前变更的字段数据
         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, target } = rule
             let source_value = current_value?.[source]
+            let setValue = source_value
             // 子表
             if (rule?.type == 1) {
                 if (source_value && typeof source_value == "string") {
@@ -166,10 +169,23 @@ const FormContainer = forwardRef(({ cols = 1, children, mode = "view" }, ref) =>
                         }
                     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)
+            handleFieldsWith(target, form.getFieldsValue())
         }
         console.log("current value", current_value)
     }