@hw-component/form 0.0.2-beta-v2 → 0.0.2-beta-v4

package/es/Form/hooks/useHForm.js

@@ -27,6 +27,7 @@ var useHForm = (function () {
     var formatSourceData = {};
     var dispatchSourceData = {};
     var cacheValues = {};
+    var isLoading = false;
     var norAddItemDispatch = function norAddItemDispatch(name, fn) {
       if (!name) {
         return {
@@ -45,6 +46,7 @@ var useHForm = (function () {
           var newValue = this.formatValues(cacheValues);
           form.setFieldsValue(newValue);
         }
+        isLoading = true;
       },
       addFormat: function addFormat(name, format) {
         if (!format) {
@@ -147,8 +149,11 @@ var useHForm = (function () {
       }
     }, form), {}, {
       setFieldsValue: function setFieldsValue(values) {
+        if (!isLoading) {
+          cacheValues = values;
+          return;
+        }
         var newValue = this.formatValues(values);
-        cacheValues = values;
         form.setFieldsValue(newValue);
       },
       validateFields: function validateFields(nameList) {

package/es/Input/ButtonInput.js

@@ -72,7 +72,10 @@ var Index = function Index(_ref) {
   })), /*#__PURE__*/React.createElement(Button, _extends({}, oProps, {
     type: type,
     onClick: click,
-    loading: loading
+    loading: loading,
+    style: {
+      marginLeft: 4
+    }
   }), children));
 };
 

package/lib/Form/hooks/useHForm.js

@@ -30,6 +30,7 @@ var useHForm = (function () {
     var formatSourceData = {};
     var dispatchSourceData = {};
     var cacheValues = {};
+    var isLoading = false;
     var norAddItemDispatch = function norAddItemDispatch(name, fn) {
       if (!name) {
         return {
@@ -48,6 +49,7 @@ var useHForm = (function () {
           var newValue = this.formatValues(cacheValues);
           form.setFieldsValue(newValue);
         }
+        isLoading = true;
       },
       addFormat: function addFormat(name, format) {
         if (!format) {
@@ -150,8 +152,11 @@ var useHForm = (function () {
       }
     }, form), {}, {
       setFieldsValue: function setFieldsValue(values) {
+        if (!isLoading) {
+          cacheValues = values;
+          return;
+        }
         var newValue = this.formatValues(values);
-        cacheValues = values;
         form.setFieldsValue(newValue);
       },
       validateFields: function validateFields(nameList) {

package/lib/Input/ButtonInput.js

@@ -75,7 +75,10 @@ var Index = function Index(_ref) {
   })), /*#__PURE__*/React.createElement(antd.Button, _extends({}, oProps, {
     type: type,
     onClick: click,
-    loading: loading
+    loading: loading,
+    style: {
+      marginLeft: 4
+    }
   }), children));
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hw-component/form",
-  "version": "0.0.2-beta-v2",
+  "version": "0.0.2-beta-v4",
   "description": "基于antd二次开发",
   "repository": {
     "type": "git",

package/src/components/Form/hooks/useHForm.ts

@@ -14,6 +14,7 @@ export default () => {
     const formatSourceData: Record<string, FormatItemModal> = {};
     let dispatchSourceData: Record<string, DispatchItemData> = {};
     let cacheValues: Record<string, any> = {};
+    let isLoading=false;
     const norAddItemDispatch = (name, fn) => {
       if (!name) {
         return {
@@ -34,6 +35,7 @@ export default () => {
           const newValue = this.formatValues(cacheValues);
           form.setFieldsValue(newValue);
         }
+        isLoading=true;
       },
       addFormat(name: string, format?: FormatItemModal) {
         if (!format) {
@@ -125,8 +127,11 @@ export default () => {
       },
       ...form,
       setFieldsValue(values) {
+        if (!isLoading){
+          cacheValues = values;
+          return;
+        }
         const newValue = this.formatValues(values);
-        cacheValues = values;
         form.setFieldsValue(newValue);
       },
       validateFields(nameList) {

package/src/components/Input/ButtonInput.tsx

@@ -32,7 +32,7 @@ const Index: React.FC<HButtonInputProps> = ({
   return (
     <Input.Group compact style={{ display: "flex" }}>
       <Input {...props} style={{ flex: 1 }} value={value} onChange={change} />
-      <Button {...oProps} type={type} onClick={click} loading={loading}>
+      <Button {...oProps} type={type} onClick={click} loading={loading} style={{marginLeft:4}}>
         {children}
       </Button>
     </Input.Group>

package/src/pages/DrawerForm/index.tsx

@@ -1,5 +1,5 @@
 import { Button } from "antd";
-import { HDrawerForm, useHDiaLogForm } from "../../components";
+import { HDrawerForm, useHDialogForm } from "../../components";
 const data = [
   {
     label: "输入框",
@@ -98,7 +98,7 @@ const data = [
   },
 ];
 export default () => {
-  const modalForm = useHDiaLogForm();
+  const modalForm = useHDialogForm();
   return (
     <>
       <Button

package/src/pages/Form/index.tsx

@@ -128,9 +128,7 @@ export default () => {
                   testEnd: "1693538359",
                   op: 1,
                   opInput: "12121",
-                  upload: [
-                    "https://img2.baidu.com/it/u=2048195462,703560066&fm=253&fmt=auto&app=138&f=JPEG?w=500&h=333",
-                  ],
+                  upload:  "https://img2.baidu.com/it/u=2048195462,703560066&fm=253&fmt=auto&app=138&f=JPEG?w=500&h=333",
                 });
               }, 3000);
             });

package/src/pages/ModalForm/index.tsx

@@ -1,5 +1,5 @@
 import { Button } from "antd";
-import { HModalForm, useHDiaLogForm } from "../../components";
+import { HModalForm, useHDialogForm } from "../../components";
 const data = [
   {
     label: "输入框",
@@ -98,7 +98,7 @@ const data = [
   },
 ];
 export default () => {
-  const modalForm = useHDiaLogForm();
+  const modalForm = useHDialogForm();
   return (
     <>
       <Button