@hw-component/form 1.10.77 → 1.10.79

package/es/DialogForm/DrawerForm/index.js

@@ -72,7 +72,8 @@ var Index = function Index(_ref) {
       onFinish: onFinish
     }),
     loading = _useSub.loading,
-    run = _useSub.run;
+    run = _useSub.run,
+    setLoading = _useSub.setLoading;
   var finish = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(values, subParams) {
       var result, close;
@@ -149,6 +150,7 @@ var Index = function Index(_ref) {
       }
       selfAfterClose();
       afterClose === null || afterClose === void 0 || afterClose();
+      setLoading(false);
     },
     closable: false,
     destroyOnClose: destroyOnClose,

package/es/DialogForm/ModalForm.js

@@ -66,7 +66,8 @@ var Index = function Index(_ref) {
       onFinish: onFinish
     }),
     loading = _useSub.loading,
-    run = _useSub.run;
+    run = _useSub.run,
+    setLoading = _useSub.setLoading;
   var finish = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(values, outParams) {
       var result, close;
@@ -134,6 +135,7 @@ var Index = function Index(_ref) {
     afterClose: function afterClose() {
       selfAfterClose();
       _afterClose === null || _afterClose === void 0 || _afterClose();
+      setLoading(false);
     }
   }, props), {}, {
     onOk: currentForm.submit,

package/es/DialogForm/hooks.d.ts

@@ -13,7 +13,13 @@ export declare const useModifyProps: ({ visible, configData, initialValues, dial
 };
 export declare const useHDialogForm: () => HDialogFormInstance<any, any>;
 export declare const useCurrentForm: (hDialogForm?: HDialogFormInstance) => HDialogFormInstance<any, any>;
-export declare const useSub: ({ request, onFinish }: Partial<DialogFormProps>) => import("@ahooksjs/use-request/lib/types").BaseResult<any, [values: any, params: any]>;
+export declare const useSub: ({ request, onFinish }: Partial<DialogFormProps>) => {
+    data: any;
+    error: Error | undefined;
+    run: (values: any, params: any) => Promise<any>;
+    loading: boolean;
+    setLoading: React.Dispatch<React.SetStateAction<boolean>>;
+};
 interface FooterRenderParamsModal extends Omit<DialogFormProps, "configData"> {
     onOk: VoidFunction;
 }

package/es/DialogForm/hooks.js

@@ -143,34 +143,52 @@ var useCurrentForm = function useCurrentForm(hDialogForm) {
 var useSub = function useSub(_ref2) {
   var request = _ref2.request,
     onFinish = _ref2.onFinish;
-  return useRequest(/*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(values, params) {
-      return _regeneratorRuntime.wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
-          case 0:
-            if (!onFinish) {
-              _context.next = 2;
-              break;
-            }
-            return _context.abrupt("return", onFinish(values, params));
-          case 2:
-            if (!request) {
-              _context.next = 4;
-              break;
-            }
-            return _context.abrupt("return", request(values, params));
-          case 4:
-          case "end":
-            return _context.stop();
-        }
-      }, _callee);
-    }));
-    return function (_x, _x2) {
-      return _ref3.apply(this, arguments);
-    };
-  }(), {
-    manual: true
-  });
+  var _useState11 = useState(false),
+    _useState12 = _slicedToArray(_useState11, 2),
+    loading = _useState12[0],
+    setLoading = _useState12[1];
+  var _useRequest = useRequest(/*#__PURE__*/function () {
+      var _ref3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(values, params) {
+        return _regeneratorRuntime.wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              setLoading(true);
+              if (!onFinish) {
+                _context.next = 3;
+                break;
+              }
+              return _context.abrupt("return", onFinish(values, params));
+            case 3:
+              if (!request) {
+                _context.next = 5;
+                break;
+              }
+              return _context.abrupt("return", request(values, params));
+            case 5:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee);
+      }));
+      return function (_x, _x2) {
+        return _ref3.apply(this, arguments);
+      };
+    }(), {
+      manual: true,
+      onError: function onError() {
+        setLoading(false);
+      }
+    }),
+    data = _useRequest.data,
+    error = _useRequest.error,
+    run = _useRequest.run;
+  return {
+    data: data,
+    error: error,
+    run: run,
+    loading: loading,
+    setLoading: setLoading
+  };
 };
 var useFooterRender = function useFooterRender(_ref4) {
   var footer = _ref4.footer,

package/es/Input/ButtonInput.js

@@ -82,7 +82,8 @@ var Index = function Index(_ref) {
   }
   return jsxs("div", {
     style: {
-      display: "flex"
+      display: "flex",
+      width: "100%"
     },
     children: [jsx(Input, _objectSpread(_objectSpread({}, props), {}, {
       style: {

package/lib/DialogForm/DrawerForm/index.js

@@ -75,7 +75,8 @@ var Index = function Index(_ref) {
       onFinish: onFinish
     }),
     loading = _useSub.loading,
-    run = _useSub.run;
+    run = _useSub.run,
+    setLoading = _useSub.setLoading;
   var finish = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(values, subParams) {
       var result, close;
@@ -152,6 +153,7 @@ var Index = function Index(_ref) {
       }
       selfAfterClose();
       afterClose === null || afterClose === void 0 || afterClose();
+      setLoading(false);
     },
     closable: false,
     destroyOnClose: destroyOnClose,

package/lib/DialogForm/ModalForm.js

@@ -69,7 +69,8 @@ var Index = function Index(_ref) {
       onFinish: onFinish
     }),
     loading = _useSub.loading,
-    run = _useSub.run;
+    run = _useSub.run,
+    setLoading = _useSub.setLoading;
   var finish = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(values, outParams) {
       var result, close;
@@ -137,6 +138,7 @@ var Index = function Index(_ref) {
     afterClose: function afterClose() {
       selfAfterClose();
       _afterClose === null || _afterClose === void 0 || _afterClose();
+      setLoading(false);
     }
   }, props), {}, {
     onOk: currentForm.submit,

package/lib/DialogForm/hooks.d.ts

@@ -13,7 +13,13 @@ export declare const useModifyProps: ({ visible, configData, initialValues, dial
 };
 export declare const useHDialogForm: () => HDialogFormInstance<any, any>;
 export declare const useCurrentForm: (hDialogForm?: HDialogFormInstance) => HDialogFormInstance<any, any>;
-export declare const useSub: ({ request, onFinish }: Partial<DialogFormProps>) => import("@ahooksjs/use-request/lib/types").BaseResult<any, [values: any, params: any]>;
+export declare const useSub: ({ request, onFinish }: Partial<DialogFormProps>) => {
+    data: any;
+    error: Error | undefined;
+    run: (values: any, params: any) => Promise<any>;
+    loading: boolean;
+    setLoading: React.Dispatch<React.SetStateAction<boolean>>;
+};
 interface FooterRenderParamsModal extends Omit<DialogFormProps, "configData"> {
     onOk: VoidFunction;
 }

package/lib/DialogForm/hooks.js

@@ -144,34 +144,52 @@ var useCurrentForm = function useCurrentForm(hDialogForm) {
 var useSub = function useSub(_ref2) {
   var request = _ref2.request,
     onFinish = _ref2.onFinish;
-  return ahooks.useRequest(/*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(values, params) {
-      return _regeneratorRuntime.wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
-          case 0:
-            if (!onFinish) {
-              _context.next = 2;
-              break;
-            }
-            return _context.abrupt("return", onFinish(values, params));
-          case 2:
-            if (!request) {
-              _context.next = 4;
-              break;
-            }
-            return _context.abrupt("return", request(values, params));
-          case 4:
-          case "end":
-            return _context.stop();
-        }
-      }, _callee);
-    }));
-    return function (_x, _x2) {
-      return _ref3.apply(this, arguments);
-    };
-  }(), {
-    manual: true
-  });
+  var _useState11 = React.useState(false),
+    _useState12 = _slicedToArray(_useState11, 2),
+    loading = _useState12[0],
+    setLoading = _useState12[1];
+  var _useRequest = ahooks.useRequest(/*#__PURE__*/function () {
+      var _ref3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(values, params) {
+        return _regeneratorRuntime.wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              setLoading(true);
+              if (!onFinish) {
+                _context.next = 3;
+                break;
+              }
+              return _context.abrupt("return", onFinish(values, params));
+            case 3:
+              if (!request) {
+                _context.next = 5;
+                break;
+              }
+              return _context.abrupt("return", request(values, params));
+            case 5:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee);
+      }));
+      return function (_x, _x2) {
+        return _ref3.apply(this, arguments);
+      };
+    }(), {
+      manual: true,
+      onError: function onError() {
+        setLoading(false);
+      }
+    }),
+    data = _useRequest.data,
+    error = _useRequest.error,
+    run = _useRequest.run;
+  return {
+    data: data,
+    error: error,
+    run: run,
+    loading: loading,
+    setLoading: setLoading
+  };
 };
 var useFooterRender = function useFooterRender(_ref4) {
   var footer = _ref4.footer,

package/lib/Input/ButtonInput.js

@@ -85,7 +85,8 @@ var Index = function Index(_ref) {
   }
   return jsxRuntime.jsxs("div", {
     style: {
-      display: "flex"
+      display: "flex",
+      width: "100%"
     },
     children: [jsxRuntime.jsx(antd.Input, _objectSpread(_objectSpread({}, props), {}, {
       style: {

package/package.json

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

package/src/components/DialogForm/DrawerForm/index.tsx

@@ -65,7 +65,7 @@ const Index: React.FC<DialogFormProps> = ({
     }
     setModalVisible(false);
   };
-  const { loading, run } = useSub({ request, onFinish });
+  const { loading, run,setLoading } = useSub({ request, onFinish });
   const finish = async (values, subParams) => {
     const result = await run(values, subParams);
     const close = onOk?.(result, subParams);
@@ -121,6 +121,7 @@ const Index: React.FC<DialogFormProps> = ({
         }
         selfAfterClose();
         afterClose?.();
+        setLoading(false);
       }}
       closable={false}
       destroyOnClose={destroyOnClose}

package/src/components/DialogForm/ModalForm.tsx

@@ -61,7 +61,7 @@ const Index: React.FC<DialogFormProps> = ({
     }
     setModalVisible(false);
   };
-  const { loading, run } = useSub({ request, onFinish });
+  const { loading, run ,setLoading} = useSub({ request, onFinish });
   const finish = async (values, outParams) => {
     const result = await run(values, outParams);
     const close = onOk?.(result, outParams);
@@ -112,6 +112,7 @@ const Index: React.FC<DialogFormProps> = ({
       afterClose={() => {
         selfAfterClose();
         afterClose?.();
+        setLoading(false);
       }}
       {...props}
       onOk={currentForm.submit}

package/src/components/DialogForm/hooks.tsx

@@ -136,8 +136,10 @@ export const useCurrentForm = (hDialogForm?: HDialogFormInstance) => {
 };
 
 export const useSub = ({ request, onFinish }: Partial<DialogFormProps>) => {
-  return useRequest(
+  const [loading,setLoading]=useState(false);
+  const {data,error,run}=useRequest(
     async (values, params) => {
+      setLoading(true);
       if (onFinish) {
         return onFinish(values, params);
       }
@@ -145,8 +147,17 @@ export const useSub = ({ request, onFinish }: Partial<DialogFormProps>) => {
         return request(values, params);
       }
     },
-    { manual: true }
+    { manual: true ,onError:()=>{
+      setLoading(false);
+    }}
   );
+  return {
+    data,
+    error,
+    run,
+    loading,
+    setLoading
+  }
 };
 interface FooterRenderParamsModal extends Omit<DialogFormProps, "configData"> {
   onOk: VoidFunction;

package/src/components/Input/ButtonInput.tsx

@@ -58,7 +58,7 @@ const Index: React.FC<HButtonInputProps> = ({
     );
   }
   return (
-    <div style={{ display: "flex" }}>
+    <div style={{ display: "flex",width: "100%" }}>
       <Input {...props} style={{ flex: 1 }} value={value} onChange={change} />
       <Btn
         type={btnType}

package/src/pages/ModalForm/index.tsx

@@ -22,6 +22,14 @@ const data = [
     },
   },
 ];
+
+const time=async ()=>{
+    return new Promise((resolve,reject)=>{
+        return setTimeout(()=>{
+            reject()
+        },3000)
+    })
+}
 export default () => {
   const modalForm = useHDialogForm();
   return (
@@ -62,6 +70,10 @@ export default () => {
           }}
           labelAlign={"left"}
           dialogForm={modalForm}
+          request={async ()=>{
+              console.log("fff");
+              await time();
+          }}
           title="你好"
         />
       </HFormConfigProvider>