@hw-component/form 1.9.33 → 1.9.35

package/es/Form/hooks/index.js

@@ -91,7 +91,7 @@ var useInfoReq = function useInfoReq(_ref) {
           return initReq(reqParams);
         case 5:
           result = _context2.sent;
-          form === null || form === void 0 || form.setFieldsValue(result);
+          form === null || form === void 0 || form.setFieldsValueFull(result);
           return _context2.abrupt("return", result || {});
         case 8:
           if (!(typeof initialValues === "undefined")) {
@@ -100,7 +100,7 @@ var useInfoReq = function useInfoReq(_ref) {
           }
           return _context2.abrupt("return", {});
         case 10:
-          form === null || form === void 0 || form.setFieldsValue(initialValues);
+          form === null || form === void 0 || form.setFieldsValueFull(initialValues);
           return _context2.abrupt("return", initialValues);
         case 12:
         case "end":

package/es/Form/hooks/useHForm.js

@@ -33,6 +33,14 @@ var useHForm = (function () {
         defaultFn: []
       };
     };
+    var clearObj = function clearObj(val) {
+      var newVal = _objectSpread({}, val);
+      var keys = Object.keys(val);
+      keys.forEach(function (key) {
+        newVal[key] = undefined;
+      });
+      return newVal;
+    };
     var formatValuesFn = function formatValuesFn() {
       var value = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
       var formatKey = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "inputValue";
@@ -177,6 +185,17 @@ var useHForm = (function () {
         var newValue = formatValuesFn(values);
         form.setFieldsValue(newValue);
       },
+      setFieldsValueFull: function setFieldsValueFull(values) {
+        if (!isLoading) {
+          cacheValues = values;
+          return;
+        }
+        var oldFormVal = form.getFieldsValue(true);
+        var formatVal = formatValuesFn(oldFormVal, "outputValue");
+        var newValue = formatValuesFn(values);
+        var clearData = clearObj(_objectSpread(_objectSpread({}, formatVal), oldFormVal));
+        form.setFieldsValue(_objectSpread(_objectSpread({}, clearData), newValue));
+      },
       validateFields: function validateFields(nameList) {
         return new Promise(function (resolve, reject) {
           form.validateFields(nameList).then(function (value) {

package/es/Form/modal.d.ts

@@ -141,6 +141,7 @@ export interface HFormInstance extends FormInstance {
     clear: VoidFunction;
     resetFieldsInitValue: VoidFunction;
     clearFormat: (name: string) => void;
+    setFieldsValueFull: (values: Record<string, any>) => void;
 }
 export interface ConnectConfigModal {
     format?: Record<string, addFormatItemModal>;

package/lib/Form/hooks/index.js

@@ -92,7 +92,7 @@ var useInfoReq = function useInfoReq(_ref) {
           return initReq(reqParams);
         case 5:
           result = _context2.sent;
-          form === null || form === void 0 || form.setFieldsValue(result);
+          form === null || form === void 0 || form.setFieldsValueFull(result);
           return _context2.abrupt("return", result || {});
         case 8:
           if (!(typeof initialValues === "undefined")) {
@@ -101,7 +101,7 @@ var useInfoReq = function useInfoReq(_ref) {
           }
           return _context2.abrupt("return", {});
         case 10:
-          form === null || form === void 0 || form.setFieldsValue(initialValues);
+          form === null || form === void 0 || form.setFieldsValueFull(initialValues);
           return _context2.abrupt("return", initialValues);
         case 12:
         case "end":

package/lib/Form/hooks/useHForm.js

@@ -36,6 +36,14 @@ var useHForm = (function () {
         defaultFn: []
       };
     };
+    var clearObj = function clearObj(val) {
+      var newVal = _objectSpread({}, val);
+      var keys = Object.keys(val);
+      keys.forEach(function (key) {
+        newVal[key] = undefined;
+      });
+      return newVal;
+    };
     var formatValuesFn = function formatValuesFn() {
       var value = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
       var formatKey = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "inputValue";
@@ -180,6 +188,17 @@ var useHForm = (function () {
         var newValue = formatValuesFn(values);
         form.setFieldsValue(newValue);
       },
+      setFieldsValueFull: function setFieldsValueFull(values) {
+        if (!isLoading) {
+          cacheValues = values;
+          return;
+        }
+        var oldFormVal = form.getFieldsValue(true);
+        var formatVal = formatValuesFn(oldFormVal, "outputValue");
+        var newValue = formatValuesFn(values);
+        var clearData = clearObj(_objectSpread(_objectSpread({}, formatVal), oldFormVal));
+        form.setFieldsValue(_objectSpread(_objectSpread({}, clearData), newValue));
+      },
       validateFields: function validateFields(nameList) {
         return new Promise(function (resolve, reject) {
           form.validateFields(nameList).then(function (value) {

package/lib/Form/modal.d.ts

@@ -141,6 +141,7 @@ export interface HFormInstance extends FormInstance {
     clear: VoidFunction;
     resetFieldsInitValue: VoidFunction;
     clearFormat: (name: string) => void;
+    setFieldsValueFull: (values: Record<string, any>) => void;
 }
 export interface ConnectConfigModal {
     format?: Record<string, addFormatItemModal>;

package/package.json

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

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

@@ -61,13 +61,13 @@ export const useInfoReq = ({
     reqData.params = reqParams;
     if (initReq) {
       const result = await initReq(reqParams);
-      form?.setFieldsValue(result);
+      form?.setFieldsValueFull(result);
       return result || {};
     }
     if (typeof initialValues === "undefined") {
       return {};
     }
-    form?.setFieldsValue(initialValues);
+    form?.setFieldsValueFull(initialValues);
     return initialValues;
   },options);
   const { run, mutate } = infoControl;

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

@@ -34,6 +34,14 @@ export default () => {
         defaultFn: [],
       };
     };
+    const clearObj=(val)=>{
+       const newVal={...val};
+       const keys=Object.keys(val);
+       keys.forEach((key)=>{
+            newVal[key]=undefined;
+       });
+       return newVal;
+    }
     const formatValuesFn = (value = {}, formatKey = "inputValue") => {
       const valKeys = Object.keys(value).length;
       if (!valKeys) {
@@ -160,6 +168,23 @@ export default () => {
         const newValue = formatValuesFn(values);
         form.setFieldsValue(newValue);
       },
+      setFieldsValueFull(values){
+      if (!isLoading) {
+        cacheValues = values;
+        return;
+      }
+        const oldFormVal=form.getFieldsValue(true);
+        const formatVal=formatValuesFn(oldFormVal, "outputValue")
+        const newValue = formatValuesFn(values);
+        const clearData=clearObj({
+          ...formatVal,
+          ...oldFormVal
+        });
+        form.setFieldsValue({
+          ...clearData,
+          ...newValue
+        });
+      },
       validateFields(nameList) {
         return new Promise((resolve, reject) => {
           form

package/src/components/Form/modal.ts

@@ -199,6 +199,7 @@ export interface HFormInstance extends FormInstance {
   clear: VoidFunction;
   resetFieldsInitValue: VoidFunction;
   clearFormat: (name: string) => void;
+  setFieldsValueFull:(values: Record<string, any>)=>void;
 }
 
 export interface ConnectConfigModal {

package/src/pages/Form/index.tsx

@@ -69,7 +69,7 @@ const formData = (options) => {
   return [
     {
       name: "name",
-      label: "输入框",
+      label: "name",
       rules: [
         {
           validator: () => {
@@ -82,103 +82,7 @@ const formData = (options) => {
         addonAfter: "后面",
       },
     },
-    {
-      name: "inputNumberGroup",
-      label: "输入框",
-      rules: [
-        {
-          validator: () => {
-            return Promise.reject(new Error("错误"));
-          },
-        },
-      ],
-      type: "inputNumberGroup",
-      itemProps: {
-        addonBefore: "前面",
-        addonAfter: "后面",
-      },
-    },
-    {
-      name: "url",
-      type: "urlUpload",
-      label: "文本",
-      hideLabel: true,
-      rules: [
-        {
-          validator: () => {
-            return Promise.reject(new Error("错误"));
-          },
-        },
-      ],
-      itemProps: {
-        initValueProvider: (props, val) => {
-          console.log(props, val, "fff");
-          return {
-            ...val,
-            name: "ffffsfsadasda",
-          };
-        },
-      },
-    },
-    {
-      nameKey: "name1",
-      label: "输入框",
-      render: () => {
-        return (
-          <Basic
-            configData={[
-              {
-                label: "1",
-              },
-              {
-                label: "2",
-              },
-            ]}
-          />
-        );
-      },
-    },
-    {
-      name: "treeSelect",
-      label: "treeSelect",
-      type: "treeSelect",
-      itemProps: {
-        multiple:true,
-        request: async () => {
-          return [
-            {
-              name: "父亲",
-              key: "1",
-              child: [
-                {
-                  name: "儿子",
-                  key: "1-1",
-                },
-              ],
-            },
-          ];
-        },
-        fieldNames: {
-          label: "name",
-          value: "key",
-          children: "child",
-        },
-      },
-    },
-    {
-      label: "输入框",
-      type: "checkboxGroup",
-      name: "check",
-      hover: "你好",
-      itemProps: {
-        options: [
-          {
-            key: "vv",
-            value: "测试",
-          },
-        ],
-      },
-    },
+
   ];
 };
 function Ttta({ form }) {
@@ -198,6 +102,7 @@ const Test = (props) => {
 };
 export default () => {
   const form = useHForm();
+  const [id,setId]=useState(1);
   const [options, setOptions] = useState([{ label: "1", value: 1 }]);
   const [aForm] = Form.useForm();
   return (
@@ -218,11 +123,29 @@ export default () => {
           value: "key",
         }}
       >
+        <div onClick={()=>{
+          setId(2);
+        }}>
+          点我
+        </div>
         <HForm
           configData={formData(options)}
           dismissOnPressEnter={false}
           labelWidth={88}
           form={form}
+          infoRequest={{
+            request:async ()=>{
+              if (id===1){
+                return {
+                    name:"你好"
+                };
+              }
+              return  {
+
+              }
+            },
+            refreshDeps:[id]
+          }}
           labelAlign={"left"}
           onFinish={(value) => {
             console.log(value, "onFinish");
@@ -230,9 +153,6 @@ export default () => {
           onValuesChange={(val) => {
             console.log(val, "onValuesChange");
           }}
-          initialValues={{
-            name1: {},
-          }}
           request={(params) => {
             return new Promise<any>((resolve) => {
               setTimeout(() => {