lu-lowcode-package-form 0.9.71 → 0.9.73

package/package.json

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

package/src/App.jsx

@@ -139,6 +139,39 @@ function App() {
           <Field.UserSelect label="选择用户" __id="userselect" defaultValue={[{ id: 1, username: "十天" }]} />
           <Layout.FormGroupTitle title={"基本信息"} />
           <Field.Number label="税率（%）" __id="shuilv" />
+          
+          <Field.WithSingleSelect isRequired={true} ref={testRef} fillRules={[
+            {
+              "id": "636d3924-0298-4e9b-809a-26d4a10d7b89",
+              "type": 0,
+              "source": "name",
+              "target": "name",
+              "subRules": [
+
+              ]
+            },
+            {
+              "id": "93401e38-60a4-4acf-84a6-8958785a4a30",
+              "type": 1,
+              "source": "table",
+              "target": "table",
+              "subRules": [
+                {
+                  "id": "c4a65ae5-58ff-4d7f-8738-a04de1acab61",
+                  "type": 0,
+                  "source": "price",
+                  "target": "product_price1"
+                },
+
+                {
+                  "id": "c4a65ae5-58ff-4d7f-8738-a04de1acab61",
+                  "type": 0,
+                  "source": "num",
+                  "target": "product_num1"
+                },
+              ]
+            }
+          ]} label="测试关联单选" options={[{ label: '选项1', value: '1', name: "1111", table: "[{\"price\":1,\"num\":2},{\"price\":2,\"num\":2},{\"price\":3,\"num\":3},{\"price\":3,\"num\":3}]" }, { label: '选项2', value: '2' }]} __id="remark11" />
           <Layout.FormRow layout={'1'}>
             <Field.Table label="子表格" __id="table"  >
               <Field.DatePicker defaultNow={true} label="日期时间" prompt="" datetype="date" __id="datetime2" />
@@ -171,7 +204,7 @@ function App() {
                   ]
                 },
 
-              ]} label="测试关联单选" options={[{ label: '选项1', value: '1', product_price11: "1111", product_price12: "2222", product_price1: 111 }, { label: '选项2', value: '2' }]} __id="remark11" />
+              ]} label="测试关联单选" options={[{ label: '选项1', value: '1', product_price11: "1111", product_price12: "2222", product_price1: 111 }, { label: '选项2', value: '2' }, { label: '选项2', value: '2' }]} __id="remark11" />
 
               <Field.Switch label="开关" __id="switch_table"></Field.Switch>
               <Field.Input defaultValue={3} isRequired={true} label="含税单价" __id="product_price11" />
@@ -220,8 +253,8 @@ function App() {
                   ]
               }}
               />
-              <Field.Input isRequired={true} label="商品价格" __id="product_price13" />
-              <Field.Input isRequired={true} label="商品价格" __id="product_price14" />
+              <Field.Input isRequired={true} defaultValue={1} label="商品价格" __id="product_price13" />
+              <Field.Input isRequired={true}  defaultValue={2} label="商品价格" __id="product_price14" />
               <Field.Input isRequired={true} label="商品价格" __id="product_price1" />
               <Field.Input isRequired={true} label="商品个数" __id="product_num1" />
               <Field.Input label="商品总价" __id="product_sum1"
@@ -381,38 +414,6 @@ function App() {
           </Layout.FormRow>
           <Field.CheckboxTree label="角色权限" __id="permissions" addRoot={false} treeData={treeData} />
           <Layout.FormGroupTitle title={"关联信息"} />
-          <Field.WithSingleSelect ref={testRef} disabled={true} fillRules={[
-            {
-              "id": "636d3924-0298-4e9b-809a-26d4a10d7b89",
-              "type": 0,
-              "source": "name",
-              "target": "name",
-              "subRules": [
-
-              ]
-            },
-            {
-              "id": "93401e38-60a4-4acf-84a6-8958785a4a30",
-              "type": 1,
-              "source": "table",
-              "target": "table",
-              "subRules": [
-                {
-                  "id": "c4a65ae5-58ff-4d7f-8738-a04de1acab61",
-                  "type": 0,
-                  "source": "price",
-                  "target": "product_price1"
-                },
-
-                {
-                  "id": "c4a65ae5-58ff-4d7f-8738-a04de1acab61",
-                  "type": 0,
-                  "source": "num",
-                  "target": "product_num1"
-                },
-              ]
-            }
-          ]} label="测试关联单选" options={[{ label: '选项1', value: '1', name: "1111", table: "[{\"price\":1,\"num\":2},{\"price\":2,\"num\":2}]" }, { label: '选项2', value: '2' }]} __id="remark11" />
           <Field.WithMultipleSelect disabled={true} label="测试关联多选" options={[{ label: '选项1', value: '1' }, { label: '选项2', value: '2' }]} __id="remark12" />
           <Layout.FormRow > <Field.TextArea label="备注" __id="remark" /></Layout.FormRow>
 

package/src/components/field/base.jsx

@@ -31,7 +31,10 @@ export const BaseWrapper = ({
     ...otherProps
 }) => {
     useEffect(()=>{
-        if (defaultValue && typeof onChange === "function") onChange(defaultValue)
+        if (defaultValue && typeof onChange === "function") {
+            console.log("defaultValue changed", defaultValue)
+            onChange(defaultValue)
+        }
     },[defaultValue])
     if (!addWrapper) return children;
     // 不接管只读属性的组件

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

@@ -1,7 +1,7 @@
 import React, { forwardRef, useEffect } from "react";
 import { Form, Row, Col, message } from "antd";
 
-import { debounce } from 'lodash';
+import { debounce, isEqual } from 'lodash';
 import { evalFormula } from '../../utils/formula'
 
 
@@ -45,6 +45,7 @@ function batchElements(elements, groupSize) {
 const FormContainer = forwardRef(({ cols = 1, children, mode = "view" }, ref) => {
     const [form] = Form.useForm();
     const [formContent, setFormContent] = React.useState(null);
+   
     const dependencyMap = React.useRef(null);
 
     React.useImperativeHandle(ref, () => ({
@@ -57,6 +58,18 @@ const FormContainer = forwardRef(({ cols = 1, children, mode = "view" }, ref) =>
         setFormContent(renderChildren());
     }, [children, cols]);
 
+
+    const lastFormValues = React.useRef(null);
+    const  getLastFieldValue = (path) => {
+        let current = lastFormValues.current;
+        for (let i = 0; i < path.length; i++) {
+            if (current == null) {
+                return undefined;
+            }
+            current = current[path[i]];
+        }
+        return current;
+    }
     const initializeDependencyMap = () => {
         const fields = [];
         function traverse(currentNode, parentNode = null) {
@@ -165,7 +178,7 @@ const FormContainer = forwardRef(({ cols = 1, children, mode = "view" }, ref) =>
                     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];
-                            target_value[subTarget] = item?.[subSource]
+                            target_item_value[subTarget] = item?.[subSource]
                         }
                     return target_item_value
                 })
@@ -274,7 +287,6 @@ const FormContainer = forwardRef(({ cols = 1, children, mode = "view" }, ref) =>
                 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) {
@@ -328,9 +340,8 @@ const FormContainer = forwardRef(({ cols = 1, children, mode = "view" }, ref) =>
     const handleFieldsChange = debounce((changedFields, allFields) => {
         const fieldValues = form.getFieldsValue();
         let needRefresh = false;
-        // console.log("changedFields", changedFields)
         changedFields.forEach(field => {
-            if (field.name && field.name.length > 0) {
+            if (field.name && field.name.length > 0 && !isEqual(field.value, getLastFieldValue(field.name))) {
                 needRefresh = handleFieldsWith(field.name, fieldValues);
             }
         });
@@ -338,6 +349,7 @@ const FormContainer = forwardRef(({ cols = 1, children, mode = "view" }, ref) =>
         if (needRefresh) {
             setFormContent(renderChildren());
         }
+        lastFormValues.current = form.getFieldsValue();
     }, 200);
 
     const renderChildren = () => {