@hw-component/form 1.10.22 → 1.10.24

package/lib/Form/hooks/useReqControl.js

@@ -0,0 +1,172 @@
+'use strict';
+
+var _objectWithoutProperties = require('@babel/runtime-corejs3/helpers/objectWithoutProperties');
+var _typeof = require('@babel/runtime-corejs3/helpers/typeof');
+var _asyncToGenerator = require('@babel/runtime-corejs3/helpers/asyncToGenerator');
+var _regeneratorRuntime = require('@babel/runtime-corejs3/regenerator');
+var React = require('react');
+var ahooks = require('ahooks');
+
+var _excluded = ["request"];
+var useSubRequest = function useSubRequest(_ref) {
+  var form = _ref.form,
+    preserve = _ref.preserve,
+    request = _ref.request,
+    onFinish = _ref.onFinish,
+    getSaveParams = _ref.getSaveParams;
+  return ahooks.useRequest(/*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(value) {
+      var subVal, params;
+      return _regeneratorRuntime.wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            subVal = form === null || form === void 0 ? void 0 : form.outputValues(value, preserve);
+            params = getSaveParams();
+            if (!request) {
+              _context.next = 5;
+              break;
+            }
+            _context.next = 5;
+            return request(subVal, params);
+          case 5:
+            onFinish === null || onFinish === void 0 || onFinish(subVal, params);
+          case 6:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function (_x) {
+      return _ref2.apply(this, arguments);
+    };
+  }(), {
+    manual: true
+  });
+};
+var useInfoRequest = function useInfoRequest(_ref3) {
+  var infoRequest = _ref3.infoRequest,
+    form = _ref3.form,
+    initialValues = _ref3.initialValues,
+    getSaveParams = _ref3.getSaveParams,
+    setSaveParams = _ref3.setSaveParams;
+  var _useMemo = React.useMemo(function () {
+      if (_typeof(infoRequest) === "object") {
+        var infoReq = infoRequest.request,
+          op = _objectWithoutProperties(infoRequest, _excluded);
+        return {
+          infoReq: infoReq,
+          options: op
+        };
+      }
+      return {
+        infoReq: infoRequest,
+        options: {}
+      };
+    }, [infoRequest]),
+    initReq = _useMemo.infoReq,
+    options = _useMemo.options;
+  return ahooks.useRequest(/*#__PURE__*/function () {
+    var _ref4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2(reqParams) {
+      var relParams, result;
+      return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            relParams = typeof reqParams === "undefined" ? getSaveParams() : reqParams;
+            setSaveParams(relParams);
+            if (!initReq) {
+              _context2.next = 8;
+              break;
+            }
+            _context2.next = 5;
+            return initReq(relParams);
+          case 5:
+            result = _context2.sent;
+            form === null || form === void 0 || form.setFieldsValue(result);
+            return _context2.abrupt("return", result || {});
+          case 8:
+            if (!(typeof initialValues === "undefined")) {
+              _context2.next = 10;
+              break;
+            }
+            return _context2.abrupt("return", {});
+          case 10:
+            form === null || form === void 0 || form.setFieldsValue(initialValues);
+            return _context2.abrupt("return", initialValues);
+          case 12:
+          case "end":
+            return _context2.stop();
+        }
+      }, _callee2);
+    }));
+    return function (_x2) {
+      return _ref4.apply(this, arguments);
+    };
+  }(), options);
+};
+var useInfoReq = function useInfoReq(_ref5) {
+  var initialValues = _ref5.initialValues,
+    infoRequest = _ref5.infoRequest,
+    form = _ref5.form,
+    _ref5$params = _ref5.params,
+    params = _ref5$params === void 0 ? {} : _ref5$params,
+    request = _ref5.request,
+    onFinish = _ref5.onFinish,
+    preserve = _ref5.preserve,
+    loading = _ref5.loading,
+    error = _ref5.error,
+    reload = _ref5.reload;
+  var reqData = React.useMemo(function () {
+    var saveParams = params || {};
+    return {
+      params: saveParams
+    };
+  }, [params]);
+  var getSaveParams = function getSaveParams() {
+    return reqData.params;
+  };
+  var setSaveParams = function setSaveParams(newParams) {
+    reqData.params = newParams;
+  };
+  var subControl = useSubRequest({
+    form: form,
+    preserve: preserve,
+    request: request,
+    onFinish: onFinish,
+    getSaveParams: getSaveParams
+  });
+  var infoControl = useInfoRequest({
+    infoRequest: infoRequest,
+    form: form,
+    initialValues: initialValues,
+    getSaveParams: getSaveParams,
+    setSaveParams: setSaveParams
+  });
+  var run = infoControl.run,
+    mutate = infoControl.mutate;
+  React.useEffect(function () {
+    if (form) {
+      form.reload = function (reloadParams) {
+        mutate(undefined);
+        return run(reloadParams);
+      };
+    }
+  }, []);
+  var resultInfoControl = function resultInfoControl() {
+    if (!infoRequest) {
+      return {
+        loading: loading,
+        error: error,
+        data: initialValues,
+        run: reload
+      };
+    }
+    return infoControl;
+  };
+  return {
+    subControl: subControl,
+    infoControl: resultInfoControl()
+  };
+};
+
+exports.useInfoReq = useInfoReq;
+// powered by h

package/lib/Form/index.d.ts

@@ -1,3 +1,3 @@
 import type { HFormProps } from "./modal";
-declare const _default: ({ configData, labelWidth, form, request, onFinish, infoRequest, valueType, initialValues, params, onValuesChange, itemSpan, hideLabel: formHideLabel, gutter, submitLoading, labelAlign: formLabelAlign, formItemStyle, itemProps: formItemProps, colon, dismissOnPressEnter, preserve, rowWrapper, requiredMode, style, ...props }: HFormProps) => JSX.Element;
+declare const _default: ({ configData, labelWidth, form, valueType, onValuesChange, itemSpan, hideLabel: formHideLabel, gutter, submitLoading, labelAlign: formLabelAlign, formItemStyle, itemProps: formItemProps, colon, dismissOnPressEnter, preserve, rowWrapper, requiredMode, style, ...props }: HFormProps) => JSX.Element;
 export default _default;

package/lib/Form/index.js

@@ -13,22 +13,17 @@ var index$1 = require('../PageHandler/index.js');
 var React = require('react');
 var InitSet = require('./InitSet.js');
 var Basic = require('./Basic.js');
+var useReqControl = require('./hooks/useReqControl.js');
 
-var _excluded = ["configData", "labelWidth", "form", "request", "onFinish", "infoRequest", "valueType", "initialValues", "params", "onValuesChange", "itemSpan", "hideLabel", "gutter", "submitLoading", "labelAlign", "formItemStyle", "itemProps", "colon", "dismissOnPressEnter", "preserve", "rowWrapper", "requiredMode", "style"];
+var _excluded = ["configData", "labelWidth", "form", "valueType", "onValuesChange", "itemSpan", "hideLabel", "gutter", "submitLoading", "labelAlign", "formItemStyle", "itemProps", "colon", "dismissOnPressEnter", "preserve", "rowWrapper", "requiredMode", "style"];
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var HForm = (function (_ref) {
   var configData = _ref.configData,
     labelWidth = _ref.labelWidth,
     form = _ref.form,
-    request = _ref.request,
-    onFinish = _ref.onFinish,
-    infoRequest = _ref.infoRequest,
     _ref$valueType = _ref.valueType,
     valueType = _ref$valueType === void 0 ? "float" : _ref$valueType,
-    initialValues = _ref.initialValues,
-    _ref$params = _ref.params,
-    params = _ref$params === void 0 ? {} : _ref$params,
     onValuesChange = _ref.onValuesChange,
     itemSpan = _ref.itemSpan,
     _ref$hideLabel = _ref.hideLabel,
@@ -52,16 +47,11 @@ var HForm = (function (_ref) {
     _useState2 = _slicedToArray(_useState, 2),
     dispatchSourceData = _useState2[0],
     setDispatchSourceData = _useState2[1];
-  var _useInfoReq = index.useInfoReq({
-      initialValues: initialValues,
-      request: request,
-      onFinish: onFinish,
+  var _useInfoReq = useReqControl.useInfoReq(_objectSpread({
       valueType: valueType,
       form: hForm,
-      infoRequest: infoRequest,
-      params: params,
       preserve: preserve
-    }),
+    }, props)),
     subControl = _useInfoReq.subControl,
     infoControl = _useInfoReq.infoControl;
   var valuesChange = index.useValuesChange({
@@ -89,7 +79,9 @@ var HForm = (function (_ref) {
     loading: infoLoading,
     error: infoErr,
     data: infoData,
-    reload: infoRun,
+    reload: function reload() {
+      infoRun === null || infoRun === void 0 || infoRun();
+    },
     children: jsxRuntime.jsx(index$2.FormContext.Provider, {
       value: {
         loading: submitLoading || loading,

package/lib/Form/modal.d.ts

@@ -80,6 +80,9 @@ export interface HFormProps<T = any, R = any> extends Omit<FormProps, "form" | "
     rowWrapper?: boolean;
     flexBox?: boolean;
     requiredMode?: boolean;
+    loading?: boolean;
+    error?: Error;
+    reload?: VoidFunction;
 }
 export interface HFormItemProps extends HItemProps {
     required?: boolean;

package/package.json

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

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

@@ -1,7 +1,5 @@
-import { useRequest } from "ahooks";
 import type { HFormProps, HFormInstance } from "../modal";
 import useHForm from "./useHForm";
-import { useEffect, useMemo } from "react";
 import FormConfig from "../config";
 import { useFormConfigContext } from "../Context/FormConfigProvider";
 import type { DispatchModal } from "../modal";
@@ -16,74 +14,6 @@ export const useCurrentForm = (form?: HFormInstance) => {
   const selfForm = useHForm();
   return form || selfForm;
 };
-type ParamsModal = Omit<HFormProps, "configData">;
-
-export const useInfoReq = ({
-  initialValues,
-  infoRequest,
-  form,
-  params,
-  request,
-  onFinish,
-  preserve,
-}: ParamsModal) => {
-  const reqData = useMemo(() => {
-    const saveParams = params || {};
-    return {
-      params: saveParams,
-    };
-  }, [params]);
-  const { infoReq: initReq, options } = useMemo(() => {
-    if (typeof infoRequest === "object") {
-      const { request: infoReq, ...op } = infoRequest;
-      return {
-        infoReq,
-        options: op,
-      };
-    }
-    return {
-      infoReq: infoRequest,
-      options: {},
-    };
-  }, [infoRequest]);
-
-  const subControl = useRequest(
-    async (value) => {
-      const subVal = form?.outputValues(value, preserve);
-      if (request) {
-        await request(subVal, reqData.params);
-      }
-      onFinish?.(subVal, reqData.params);
-    },
-    { manual: true }
-  );
-  const infoControl = useRequest(async (reqParams = reqData.params) => {
-    reqData.params = reqParams;
-    if (initReq) {
-      const result = await initReq(reqParams);
-      form?.setFieldsValue(result);
-      return result || {};
-    }
-    if (typeof initialValues === "undefined") {
-      return {};
-    }
-    form?.setFieldsValue(initialValues);
-    return initialValues;
-  }, options);
-  const { run, mutate } = infoControl;
-  useEffect(() => {
-    if (form) {
-      form.reload = (reloadParams) => {
-        mutate(undefined);
-        return run(reloadParams);
-      };
-    }
-  }, []);
-  return {
-    subControl,
-    infoControl,
-  };
-};
 
 export const useDefaultComponents = () => {
   const defaultComponent = useFormConfigContext("defaultComponent");

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

@@ -0,0 +1,129 @@
+import { useEffect, useMemo } from "react";
+import { useRequest } from "ahooks";
+import { HFormProps } from "@/components/Form/modal";
+
+type ParamsModal = Omit<HFormProps, "configData">;
+interface SunParamsModal extends Omit<HFormProps, "configData"> {
+  getSaveParams: () => Record<string, any>;
+}
+interface InfoParamsModal extends SunParamsModal {
+  setSaveParams: (params: Record<string, any>) => void;
+}
+const useSubRequest = ({
+  form,
+  preserve,
+  request,
+  onFinish,
+  getSaveParams,
+}: SunParamsModal) => {
+  return useRequest(
+    async (value) => {
+      const subVal = form?.outputValues(value, preserve);
+      const params = getSaveParams();
+      if (request) {
+        await request(subVal, params);
+      }
+      onFinish?.(subVal, params);
+    },
+    { manual: true }
+  );
+};
+const useInfoRequest = ({
+  infoRequest,
+  form,
+  initialValues,
+  getSaveParams,
+  setSaveParams,
+}: InfoParamsModal) => {
+  const { infoReq: initReq, options } = useMemo(() => {
+    if (typeof infoRequest === "object") {
+      const { request: infoReq, ...op } = infoRequest;
+      return {
+        infoReq,
+        options: op,
+      };
+    }
+    return {
+      infoReq: infoRequest,
+      options: {},
+    };
+  }, [infoRequest]);
+  return useRequest(async (reqParams?: Record<string, any>) => {
+    const relParams =
+      typeof reqParams === "undefined" ? getSaveParams() : reqParams;
+    setSaveParams(relParams);
+    if (initReq) {
+      const result = await initReq(relParams);
+      form?.setFieldsValue(result);
+      return result || {};
+    }
+    if (typeof initialValues === "undefined") {
+      return {};
+    }
+    form?.setFieldsValue(initialValues);
+    return initialValues;
+  }, options);
+};
+export const useInfoReq = ({
+  initialValues,
+  infoRequest,
+  form,
+  params = {},
+  request,
+  onFinish,
+  preserve,
+  loading,
+  error,
+  reload
+}: ParamsModal) => {
+  const reqData = useMemo(() => {
+    const saveParams = params || {};
+    return {
+      params: saveParams,
+    };
+  }, [params]);
+  const getSaveParams = () => {
+    return reqData.params;
+  };
+  const setSaveParams = (newParams) => {
+    reqData.params = newParams;
+  };
+  const subControl = useSubRequest({
+    form,
+    preserve,
+    request,
+    onFinish,
+    getSaveParams,
+  });
+  const infoControl = useInfoRequest({
+    infoRequest,
+    form,
+    initialValues,
+    getSaveParams,
+    setSaveParams,
+  });
+  const { run, mutate } = infoControl;
+  useEffect(() => {
+    if (form) {
+      form.reload = (reloadParams) => {
+        mutate(undefined);
+        return run(reloadParams);
+      };
+    }
+  }, []);
+  const resultInfoControl=()=>{
+    if (!infoRequest){
+      return {
+        loading,
+        error,
+        data:initialValues,
+        run:reload
+      }
+    }
+    return infoControl;
+  }
+  return {
+    subControl,
+    infoControl:resultInfoControl()
+  };
+};

package/src/components/Form/index.tsx

@@ -1,22 +1,17 @@
 import { Form } from "antd";
 import type { HFormProps } from "./modal";
-import { useCurrentForm, useInfoReq, useValuesChange } from "./hooks";
+import { useCurrentForm, useValuesChange } from "./hooks";
 import { FormContext } from "./Context";
 import PageHandler from "../PageHandler";
 import { useEffect, useState } from "react";
 import InitSet from "./InitSet";
 import Basic from "./Basic";
-
+import { useInfoReq } from "./hooks/useReqControl";
 export default ({
   configData,
   labelWidth,
   form,
-  request,
-  onFinish,
-  infoRequest,
   valueType = "float",
-  initialValues,
-  params = {},
   onValuesChange,
   itemSpan,
   hideLabel: formHideLabel = false,
@@ -36,14 +31,10 @@ export default ({
   const hForm = useCurrentForm(form);
   const [dispatchSourceData, setDispatchSourceData] = useState({});
   const { subControl, infoControl } = useInfoReq({
-    initialValues,
-    request,
-    onFinish,
     valueType,
     form: hForm,
-    infoRequest,
-    params,
     preserve,
+    ...props,
   });
   const valuesChange = useValuesChange({
     onValuesChange,
@@ -77,7 +68,9 @@ export default ({
       loading={infoLoading}
       error={infoErr}
       data={infoData}
-      reload={infoRun}
+      reload={() => {
+        infoRun?.();
+      }}
     >
       <FormContext.Provider
         value={{

package/src/components/Form/modal.ts

@@ -128,6 +128,9 @@ export interface HFormProps<T = any, R = any>
   rowWrapper?: boolean;
   flexBox?: boolean;
   requiredMode?: boolean;
+  loading?: boolean;
+  error?: Error;
+  reload?: VoidFunction;
 }
 export interface HFormItemProps extends HItemProps {
   required?: boolean;

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

@@ -160,12 +160,12 @@ export const useSelectReq = ({
       run({}, "page");
     }
   };
-  const mathShowSearch=useMemo(()=>{
-     if (typeof showSearch=="undefined"){
-       return serviceSearch;
-     }
-     return  showSearch;
-  },[showSearch,serviceSearch])
+  const mathShowSearch = useMemo(() => {
+    if (typeof showSearch == "undefined") {
+      return serviceSearch;
+    }
+    return showSearch;
+  }, [showSearch, serviceSearch]);
   return {
     run,
     loading,

package/src/pages/Select/index.tsx

@@ -40,7 +40,6 @@ export default () => {
       />
       <HSelect
         value={val}
-
         onChange={(v, opts) => {
           console.log(v, opts);
           setVal(v);