@hw-component/form 1.10.35 → 1.10.36

package/es/Form/hooks/useHForm.js

@@ -193,7 +193,9 @@ var useHForm = (function () {
       resetFieldsInitValue: function resetFieldsInitValue() {
         var values = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
         var oldValue = form.getFieldsValue(true);
-        var keys = Object.keys(oldValue);
+        var outputOldValue = formatValuesFn(oldValue, "outputValue");
+        var changeVal = _objectSpread(_objectSpread({}, oldValue), outputOldValue);
+        var keys = Object.keys(changeVal);
         var newVale = {};
         keys.forEach(function (key) {
           newVale[key] = undefined;

package/es/Form/hooks/useReqControl.js

@@ -20,17 +20,16 @@ var useSubRequest = function useSubRequest(_ref) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             subVal = form === null || form === void 0 ? void 0 : form.outputValues(value, preserve);
-            console.log(subVal, "sss");
             params = getSaveParams();
             if (!request) {
-              _context.next = 6;
+              _context.next = 5;
               break;
             }
-            _context.next = 6;
+            _context.next = 5;
             return request(subVal, params);
-          case 6:
+          case 5:
             onFinish === null || onFinish === void 0 || onFinish(subVal, params);
-          case 7:
+          case 6:
           case "end":
             return _context.stop();
         }

package/es/Form/index.js

@@ -72,7 +72,6 @@ var HForm = (function (_ref) {
       return _objectSpread(_objectSpread({}, oldData), newData);
     });
   };
-  console.log(hForm.inited);
   return jsx(Index, {
     loading: infoLoading,
     error: infoErr,

package/es/Select/hooks/norHooks.js

@@ -72,6 +72,7 @@ var useOptionsRequest = function useOptionsRequest(_ref) {
     }
     return params;
   };
+  console.log(dispatchManual, "dispatchManual");
   var _useRequest = useRequest(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
       var requestParams,
         type,

package/lib/Form/hooks/useHForm.js

@@ -196,7 +196,9 @@ var useHForm = (function () {
       resetFieldsInitValue: function resetFieldsInitValue() {
         var values = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
         var oldValue = form.getFieldsValue(true);
-        var keys = Object.keys(oldValue);
+        var outputOldValue = formatValuesFn(oldValue, "outputValue");
+        var changeVal = _objectSpread(_objectSpread({}, oldValue), outputOldValue);
+        var keys = Object.keys(changeVal);
         var newVale = {};
         keys.forEach(function (key) {
           newVale[key] = undefined;

package/lib/Form/hooks/useReqControl.js

@@ -21,17 +21,16 @@ var useSubRequest = function useSubRequest(_ref) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             subVal = form === null || form === void 0 ? void 0 : form.outputValues(value, preserve);
-            console.log(subVal, "sss");
             params = getSaveParams();
             if (!request) {
-              _context.next = 6;
+              _context.next = 5;
               break;
             }
-            _context.next = 6;
+            _context.next = 5;
             return request(subVal, params);
-          case 6:
+          case 5:
             onFinish === null || onFinish === void 0 || onFinish(subVal, params);
-          case 7:
+          case 6:
           case "end":
             return _context.stop();
         }

package/lib/Form/index.js

@@ -75,7 +75,6 @@ var HForm = (function (_ref) {
       return _objectSpread(_objectSpread({}, oldData), newData);
     });
   };
-  console.log(hForm.inited);
   return jsxRuntime.jsx(index$1.default, {
     loading: infoLoading,
     error: infoErr,

package/lib/Select/hooks/norHooks.js

@@ -73,6 +73,7 @@ var useOptionsRequest = function useOptionsRequest(_ref) {
     }
     return params;
   };
+  console.log(dispatchManual, "dispatchManual");
   var _useRequest = ahooks.useRequest(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
       var requestParams,
         type,

package/package.json

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

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

@@ -178,7 +178,9 @@ export default () => {
       },
       resetFieldsInitValue: (values = {}) => {
         const oldValue = form.getFieldsValue(true);
-        const keys = Object.keys(oldValue);
+        const outputOldValue=formatValuesFn(oldValue,"outputValue");
+        const changeVal={...oldValue,...outputOldValue};
+        const keys = Object.keys(changeVal);
         const newVale = {};
         keys.forEach((key) => {
           newVale[key] = undefined;

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

@@ -19,7 +19,6 @@ const useSubRequest = ({
   return useRequest(
     async (value) => {
       const subVal = form?.outputValues(value, preserve);
-      console.log(subVal, "sss");
       const params = getSaveParams();
       if (request) {
         await request(subVal, params);

package/src/components/Form/index.tsx

@@ -62,7 +62,6 @@ export default ({
       };
     });
   };
-  console.log(hForm.inited)
   return (
     <PageHandler
       loading={infoLoading}

package/src/components/Select/hooks/norHooks.ts

@@ -62,6 +62,7 @@ const useOptionsRequest = ({
     }
     return params;
   };
+  console.log(dispatchManual,"dispatchManual")
   const {
     run: listRun,
     loading,

package/src/components/TDPicker/RangePicker.tsx

@@ -55,6 +55,7 @@ const HRangePicker: React.FC<HRangePickerProps> = ({
       inputValue: (item, initValue) => {
         const { name: valueName = "" } = item;
         const resultObj = {};
+
         Object.values(dateMapKeys).forEach((key) => {
           if (initValue[key]) {
             resultObj[key] = initValue[key];
@@ -62,7 +63,7 @@ const HRangePicker: React.FC<HRangePickerProps> = ({
         });
         const hasKeys = Object.keys(resultObj).length !== 0;
         return {
-          [valueName as string]: hasKeys ? resultObj : null,
+          [valueName as string]: hasKeys ? resultObj :null,
         };
       },
       outputValue: (item, outputValue) => {

package/src/pages/Form/index.tsx

@@ -1,9 +1,9 @@
 import {
-  HForm,
-  HFormConfigProvider,
-  useHForm,
-  HSelect,
-  HBasicForm,
+    HForm,
+    HFormConfigProvider,
+    useHForm,
+    HSelect,
+    HBasicForm, HRangePicker,
 } from "../../components";
 import {useEffect, useState} from "react";
 import { Button, Form, Input, Space } from "antd";
@@ -33,39 +33,52 @@ const Test3 = ({ value = {}, onChange }) => {
     </Space>
   );
 };
-const TestItem = () => {
-  return (
-    <Form.Item name="name1">
-      <Test3 />
-    </Form.Item>
-  );
-};
 const Test = (props) => {
-    useEffect(()=>{
-         console.log("ffff")
-    },[]);
   return <div>ffff</div>;
 };
 const Basic = () => {
   return (
     <HBasicForm
       configData={[
-        {
-          label: "你好",
-          type: "inputNumberGroup",
-          name: "jgTime",
-        },
           {
               label:"test",
               name:"test",
               render:()=>{
                   return <Test/>
               }
-          }
+          },{
+            name:'deviceType',
+              label:"deviceType"
+          },
+          {
+              label:"select",
+              name:"select",
+              type:"select",
+              dispatch: {
+                  fnKey: 'reload',
+                  dependencies: ['deviceType'],
+              },
+              itemProps:{
+                  request:()=>{
+                      console.log("request")
+                      return Promise.resolve([])
+                  }
+              }
+          },
       ]}
     />
   );
 };
+
+const TestItem = ({value,...props}) => {
+    return (
+        <div>
+            1
+            <HRangePicker value={value}  {...props}/>
+        </div>
+    );
+};
+
 export default () => {
   const form = useHForm();
   const [id, setId] = useState(1);
@@ -99,28 +112,28 @@ export default () => {
         <div style={{ width: 1000 }}>
           <HForm
             configData={[
-              {
-                noStyle: true,
-                nameKey: "sendSetting",
-                render: () => {
-                  return <Basic />;
-                },
-              },
+              // {
+              //   noStyle: true,
+              //   nameKey: "sendSetting",
+              //   render: () => {
+              //     return <Basic />;
+              //   },
+              // },
                 {
-                   type:"richEditor",
-                    name:"richEditor",
-                    itemProps:{
-                        valueType:"state"
+                    name:'time',
+                    label:"time",
+                    render:()=>{
+                        return <TestItem/>
                     }
-                },
+                }
             ]}
             dismissOnPressEnter={false}
             labelWidth={88}
             form={form}
             initialValues={{
               richEditor: "1312312",
-              startTime: "07:00:00",
-              endTime: "14:00:00",
+                select:"1",
+                deviceType:"1"
             }}
             labelAlign={"left"}
             onValuesChange={(val) => {
@@ -164,7 +177,7 @@ export default () => {
       </div>
       <div
         onClick={() => {
-          form.resetFields();
+          form.resetFieldsInitValue();
         }}
       >
         重置