@hw-component/form 0.0.2-beta-v1 → 0.0.2-beta-v3

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/Upload/index.js

@@ -86,7 +86,8 @@ var Index = function Index(_ref, ref) {
         var _item$name = item.name,
           name = _item$name === void 0 ? "" : _item$name;
         var initFileList = initValue[name] || [];
-        var fileList = _mapInstanceProperty(initFileList).call(initFileList, function (url, index) {
+        var relInitFileList = typeof initFileList === "string" ? [initFileList] : initFileList;
+        var fileList = _mapInstanceProperty(relInitFileList).call(relInitFileList, function (url, index) {
           return {
             name: url,
             response: {
@@ -107,7 +108,7 @@ var Index = function Index(_ref, ref) {
         var urls = _mapInstanceProperty(itemVal).call(itemVal, function (fileItem) {
           return fileItem.response.url;
         });
-        return _defineProperty({}, valueName, urls);
+        return _defineProperty({}, valueName, maxCount === 1 ? urls[0] : urls);
       }
     }
   });

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/Upload/index.js

@@ -89,7 +89,8 @@ var Index = function Index(_ref, ref) {
         var _item$name = item.name,
           name = _item$name === void 0 ? "" : _item$name;
         var initFileList = initValue[name] || [];
-        var fileList = _mapInstanceProperty(initFileList).call(initFileList, function (url, index) {
+        var relInitFileList = typeof initFileList === "string" ? [initFileList] : initFileList;
+        var fileList = _mapInstanceProperty(relInitFileList).call(relInitFileList, function (url, index) {
           return {
             name: url,
             response: {
@@ -110,7 +111,7 @@ var Index = function Index(_ref, ref) {
         var urls = _mapInstanceProperty(itemVal).call(itemVal, function (fileItem) {
           return fileItem.response.url;
         });
-        return _defineProperty({}, valueName, urls);
+        return _defineProperty({}, valueName, maxCount === 1 ? urls[0] : urls);
       }
     }
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hw-component/form",
-  "version": "0.0.2-beta-v1",
+  "version": "0.0.2-beta-v3",
   "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/Upload/index.tsx

@@ -61,7 +61,8 @@ const Index: React.ForwardRefRenderFunction<IUploadRefModal, IUpLoadProps> = (
       inputValue: (item, initValue) => {
         const { name = "" } = item;
         const initFileList = initValue[name] || [];
-        const fileList = initFileList.map((url, index) => {
+        const relInitFileList=typeof initFileList==="string"?[initFileList]:initFileList;
+        const fileList = relInitFileList.map((url, index) => {
           return {
             name: url,
             response: {
@@ -83,7 +84,7 @@ const Index: React.ForwardRefRenderFunction<IUploadRefModal, IUpLoadProps> = (
           return fileItem.response.url;
         });
         return {
-          [valueName]: urls,
+          [valueName]: maxCount===1?urls[0]:urls,
         };
       },
     },

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