lu-lowcode-package-form 0.10.45 → 0.10.47

package/package.json

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

package/src/App.jsx

@@ -79,6 +79,8 @@ function App() {
   const formRef = React.createRef();
   const testRef = React.useRef()
   const [testCalcHidden, setTestCalcHidden] = useState(false);
+  const [readonly, setReadonly] = useState(true);
+
   useEffect(() => {
     // console.log("testRef //////", testRef.current)
   }, [testRef.current])
@@ -107,11 +109,15 @@ function App() {
     // formRef?.current?.setFieldsValue({"tianchong1":{"label":"选项1","value":"1"}, })
   }
   const handleCols = () => {
-    setCols(cols - 1)
+
+    setCols(cols == 1 ? 3 : cols - 1)
   }
 
   const [items, setItems] = useState(['Item 1', 'Item 2', 'Item 3', 'Item 4']);
 
+  const handleUpdateReadonly = () => {
+    setReadonly(!readonly)
+  }
 
   const [sortItems, setSortItems] = useState([{ id: 1, content: "sdfsfd" }, { id: 2, content: "sdfsfd2" }, { id: 3, content: "sdfsfd3" }]);
   return (
@@ -127,7 +133,9 @@ function App() {
           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>
+        <Button type="primary" onClick={handleCols}>UpdateCol</Button>
+        <Button type="primary" onClick={handleUpdateReadonly}>UpdateReadonly</Button>
+        </div>
 
       <div className=" fflex fflex-col fitems-center fflex-1 foverflow-y-auto">
         <DraggableBtn />
@@ -178,7 +186,11 @@ function App() {
 
 
           <FormContainerWrapper cols={cols} className="" ref={formRef} >
+          <Field.MultipleSelect mode="multiple" option_label={"label"} option_value={"value"} label="测试过滤条件" __id="selecta1" request={async (params) => {
+              return { code: 0, data: { list: [{ label: '选项1', value: '1' }, { label: '选项2', value: '2' }] } }
+            }}></Field.MultipleSelect>
             <Layout.FormRow layout={'1'}>
+              
               <Show.WithTable label="测试关联子表" __id="withtable1"
                 filterRules={[
                   {
@@ -198,11 +210,11 @@ function App() {
                   }
                 ]} />
             </Layout.FormRow>
-            <Field.Number label="测试" __id="aa2" />
-            <Field.Number label="测试" __id="aa3" />
-            <Field.Number label="测试" __id="aa1" isRequired={true} calcHidden={true} />
-            <Field.Number label="测试" __id="aa4" />
-            <Field.UserSelect label="选择用户" __id="userselect" defaultValue={[{ id: 1, username: "十天" }]} />
+            <Field.Number label="测试" __id="aa2" readonly={readonly} />
+            <Field.Number label="测试" __id="aa3" readonly={readonly} />
+            <Field.Number label="测试" __id="aa1" isRequired={true} calcHidden={true} readonly={readonly} />
+            <Field.Number label="测试" __id="aa4" readonly={readonly} />
+            <Field.UserSelect label="选择用户" __id="userselect" defaultValue={[{ id: 1, username: "十天" }]} readonly={readonly} />
             <Layout.FormGroupTitle title={"基本信息"} />
             <Field.WithSingleSelect
               rightIconRender={({ form, fieldName }) => {

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

@@ -68,8 +68,9 @@ const FormContainer = forwardRef(({ cols = 1, children, mode = "view" }, ref) =>
             initializeDependencyMap();
             setFormContent(renderChildren());
         }, 300),
-        []
+        [children, cols] 
     );
+ 
 
     useEffect(() => {
         throttledInitializeFormRender();
@@ -491,6 +492,7 @@ const FormContainer = forwardRef(({ cols = 1, children, mode = "view" }, ref) =>
             }),
             cols
         );
+        
 
         return groupedChildren.map((group, index) => (
             <Row key={`row-${index}`} gutter={[24, 24]}>
@@ -543,7 +545,11 @@ const FormContainer = forwardRef(({ cols = 1, children, mode = "view" }, ref) =>
                                         }
                                     }
                                 }
-
+                                console.log(" ")
+                                console.log("prevValues",prevValues)
+                                console.log("curValues",curValues)
+                                console.log("result",result)
+                                console.log(" ")
                                 return result;
                             }}
                         >