@hw-component/form 1.9.29 → 1.9.31

package/es/Form/hooks/index.js

@@ -1,6 +1,8 @@
 // welcome to hoo hoo hoo
 import _defineProperty from '@babel/runtime-corejs3/helpers/defineProperty';
 import _asyncToGenerator from '@babel/runtime-corejs3/helpers/asyncToGenerator';
+import _objectWithoutProperties from '@babel/runtime-corejs3/helpers/objectWithoutProperties';
+import _typeof from '@babel/runtime-corejs3/helpers/typeof';
 import _regeneratorRuntime from '@babel/runtime-corejs3/regenerator';
 import { useRequest } from 'ahooks';
 import useHForm from './useHForm.js';
@@ -8,6 +10,7 @@ import { useMemo, useEffect } from 'react';
 import componentConfig from '../config.js';
 import { useFormConfigContext } from '../Context/FormConfigProvider.js';
 
+var _excluded = ["request"];
 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 useCurrentForm = function useCurrentForm(form) {
@@ -28,6 +31,22 @@ var useInfoReq = function useInfoReq(_ref) {
       params: saveParams
     };
   }, [params]);
+  var _useMemo = 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;
   var subControl = useRequest(/*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(value) {
       var subVal;
@@ -64,12 +83,12 @@ var useInfoReq = function useInfoReq(_ref) {
         case 0:
           reqParams = _args2.length > 0 && _args2[0] !== undefined ? _args2[0] : reqData.params;
           reqData.params = reqParams;
-          if (!infoRequest) {
+          if (!initReq) {
             _context2.next = 8;
             break;
           }
           _context2.next = 5;
-          return infoRequest(reqParams);
+          return initReq(reqParams);
         case 5:
           result = _context2.sent;
           form === null || form === void 0 || form.setFieldsValue(result);
@@ -88,7 +107,7 @@ var useInfoReq = function useInfoReq(_ref) {
           return _context2.stop();
       }
     }, _callee2);
-  })));
+  })), options);
   var run = infoControl.run,
     mutate = infoControl.mutate;
   useEffect(function () {

package/es/Form/modal.d.ts

@@ -17,6 +17,7 @@ import type { DataFnProvider } from "../modal";
 import type { ColProps } from "antd/lib/grid/col";
 import type { Gutter } from "antd/lib/grid/row";
 import type { IUrlUploadProps } from "../Upload/modal";
+import { BaseOptions } from "@ahooksjs/use-request/lib/types";
 type RenderFun = (props: HItemProps, node: React.ReactNode, form: FormInstance) => React.ReactNode;
 export type ItemPropsType = HCheckboxProps | HInputProps | HSelectInputProps | HButtonProps | HRadioGroupProps | HSelectProps | ButtonProps | HSwitchProps | HDatePickerProps | HRangePickerProps | HTimePickerProps | TextAreaProps | IUpLoadProps | CascaderProps<any> | IUrlUploadProps;
 export interface HoverModal {
@@ -53,11 +54,14 @@ export interface HItemProps extends Omit<FormItemProps, "name" | "labelAlign" |
     hidden?: boolean | HideModal;
     rowWrapper?: boolean;
 }
+interface InfoRequestOp extends BaseOptions<any, any> {
+    request: PromiseFnResult;
+}
 export interface HFormProps<T = any, R = any> extends Omit<FormProps, "form" | "onFinish" | "labelAlign"> {
     configData: HItemProps[];
     labelWidth?: number;
     request?: (values: T, params?: any) => Promise<R>;
-    infoRequest?: PromiseFnResult;
+    infoRequest?: PromiseFnResult | InfoRequestOp;
     valueType?: string;
     form?: HFormInstance;
     params?: any;

package/es/Select/TreeSelect.js

@@ -34,31 +34,14 @@ var _opMk = function opMk(_ref) {
     }, children, newChild));
   });
 };
-var useGetOnlyCheckChild = function useGetOnlyCheckChild(_ref3) {
-  var onlyCheckChild = _ref3.onlyCheckChild,
+var HTreeSelect = (function (_ref3) {
+  var request = _ref3.request,
+    onlyCheckChild = _ref3.onlyCheckChild,
+    multiple = _ref3.multiple,
     treeCheckable = _ref3.treeCheckable,
-    multiple = _ref3.multiple;
-  if (typeof onlyCheckChild !== "undefined") {
-    return onlyCheckChild;
-  }
-  if (!treeCheckable && !multiple) {
-    return true;
-  }
-  return false;
-};
-var HTreeSelect = (function (_ref4) {
-  var request = _ref4.request,
-    onlyCheckChild = _ref4.onlyCheckChild,
-    multiple = _ref4.multiple,
-    treeCheckable = _ref4.treeCheckable,
-    treeData = _ref4.treeData,
-    fieldNames = _ref4.fieldNames,
-    props = _objectWithoutProperties(_ref4, _excluded);
-  var cuOnlyCheckChild = useGetOnlyCheckChild({
-    onlyCheckChild: onlyCheckChild,
-    treeCheckable: treeCheckable,
-    multiple: multiple
-  });
+    treeData = _ref3.treeData,
+    fieldNames = _ref3.fieldNames,
+    props = _objectWithoutProperties(_ref3, _excluded);
   var _useRequest = useRequest(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
       var options;
       return _regeneratorRuntime.wrap(function _callee$(_context) {
@@ -76,7 +59,7 @@ var HTreeSelect = (function (_ref4) {
           case 5:
             return _context.abrupt("return", _opMk({
               options: options,
-              onlyCheckChild: cuOnlyCheckChild,
+              onlyCheckChild: onlyCheckChild,
               fieldNames: fieldNames
             }));
           case 6:

package/lib/Form/hooks/index.js

@@ -2,6 +2,8 @@
 
 var _defineProperty = require('@babel/runtime-corejs3/helpers/defineProperty');
 var _asyncToGenerator = require('@babel/runtime-corejs3/helpers/asyncToGenerator');
+var _objectWithoutProperties = require('@babel/runtime-corejs3/helpers/objectWithoutProperties');
+var _typeof = require('@babel/runtime-corejs3/helpers/typeof');
 var _regeneratorRuntime = require('@babel/runtime-corejs3/regenerator');
 var ahooks = require('ahooks');
 var useHForm = require('./useHForm.js');
@@ -9,6 +11,7 @@ var React = require('react');
 var config = require('../config.js');
 var FormConfigProvider = require('../Context/FormConfigProvider.js');
 
+var _excluded = ["request"];
 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 useCurrentForm = function useCurrentForm(form) {
@@ -29,6 +32,22 @@ var useInfoReq = function useInfoReq(_ref) {
       params: saveParams
     };
   }, [params]);
+  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;
   var subControl = ahooks.useRequest(/*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(value) {
       var subVal;
@@ -65,12 +84,12 @@ var useInfoReq = function useInfoReq(_ref) {
         case 0:
           reqParams = _args2.length > 0 && _args2[0] !== undefined ? _args2[0] : reqData.params;
           reqData.params = reqParams;
-          if (!infoRequest) {
+          if (!initReq) {
             _context2.next = 8;
             break;
           }
           _context2.next = 5;
-          return infoRequest(reqParams);
+          return initReq(reqParams);
         case 5:
           result = _context2.sent;
           form === null || form === void 0 || form.setFieldsValue(result);
@@ -89,7 +108,7 @@ var useInfoReq = function useInfoReq(_ref) {
           return _context2.stop();
       }
     }, _callee2);
-  })));
+  })), options);
   var run = infoControl.run,
     mutate = infoControl.mutate;
   React.useEffect(function () {

package/lib/Form/modal.d.ts

@@ -17,6 +17,7 @@ import type { DataFnProvider } from "../modal";
 import type { ColProps } from "antd/lib/grid/col";
 import type { Gutter } from "antd/lib/grid/row";
 import type { IUrlUploadProps } from "../Upload/modal";
+import { BaseOptions } from "@ahooksjs/use-request/lib/types";
 type RenderFun = (props: HItemProps, node: React.ReactNode, form: FormInstance) => React.ReactNode;
 export type ItemPropsType = HCheckboxProps | HInputProps | HSelectInputProps | HButtonProps | HRadioGroupProps | HSelectProps | ButtonProps | HSwitchProps | HDatePickerProps | HRangePickerProps | HTimePickerProps | TextAreaProps | IUpLoadProps | CascaderProps<any> | IUrlUploadProps;
 export interface HoverModal {
@@ -53,11 +54,14 @@ export interface HItemProps extends Omit<FormItemProps, "name" | "labelAlign" |
     hidden?: boolean | HideModal;
     rowWrapper?: boolean;
 }
+interface InfoRequestOp extends BaseOptions<any, any> {
+    request: PromiseFnResult;
+}
 export interface HFormProps<T = any, R = any> extends Omit<FormProps, "form" | "onFinish" | "labelAlign"> {
     configData: HItemProps[];
     labelWidth?: number;
     request?: (values: T, params?: any) => Promise<R>;
-    infoRequest?: PromiseFnResult;
+    infoRequest?: PromiseFnResult | InfoRequestOp;
     valueType?: string;
     form?: HFormInstance;
     params?: any;

package/lib/Select/TreeSelect.js

@@ -37,31 +37,14 @@ var _opMk = function opMk(_ref) {
     }, children, newChild));
   });
 };
-var useGetOnlyCheckChild = function useGetOnlyCheckChild(_ref3) {
-  var onlyCheckChild = _ref3.onlyCheckChild,
+var HTreeSelect = (function (_ref3) {
+  var request = _ref3.request,
+    onlyCheckChild = _ref3.onlyCheckChild,
+    multiple = _ref3.multiple,
     treeCheckable = _ref3.treeCheckable,
-    multiple = _ref3.multiple;
-  if (typeof onlyCheckChild !== "undefined") {
-    return onlyCheckChild;
-  }
-  if (!treeCheckable && !multiple) {
-    return true;
-  }
-  return false;
-};
-var HTreeSelect = (function (_ref4) {
-  var request = _ref4.request,
-    onlyCheckChild = _ref4.onlyCheckChild,
-    multiple = _ref4.multiple,
-    treeCheckable = _ref4.treeCheckable,
-    treeData = _ref4.treeData,
-    fieldNames = _ref4.fieldNames,
-    props = _objectWithoutProperties(_ref4, _excluded);
-  var cuOnlyCheckChild = useGetOnlyCheckChild({
-    onlyCheckChild: onlyCheckChild,
-    treeCheckable: treeCheckable,
-    multiple: multiple
-  });
+    treeData = _ref3.treeData,
+    fieldNames = _ref3.fieldNames,
+    props = _objectWithoutProperties(_ref3, _excluded);
   var _useRequest = ahooks.useRequest(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
       var options;
       return _regeneratorRuntime.wrap(function _callee$(_context) {
@@ -79,7 +62,7 @@ var HTreeSelect = (function (_ref4) {
           case 5:
             return _context.abrupt("return", _opMk({
               options: options,
-              onlyCheckChild: cuOnlyCheckChild,
+              onlyCheckChild: onlyCheckChild,
               fieldNames: fieldNames
             }));
           case 6:

package/package.json

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

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

@@ -33,6 +33,19 @@ export const useInfoReq = ({
       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) => {
@@ -46,8 +59,8 @@ export const useInfoReq = ({
   );
   const infoControl = useRequest(async (reqParams = reqData.params) => {
     reqData.params = reqParams;
-    if (infoRequest) {
-      const result = await infoRequest(reqParams);
+    if (initReq) {
+      const result = await initReq(reqParams);
       form?.setFieldsValue(result);
       return result || {};
     }
@@ -56,7 +69,7 @@ export const useInfoReq = ({
     }
     form?.setFieldsValue(initialValues);
     return initialValues;
-  });
+  },options);
   const { run, mutate } = infoControl;
   useEffect(() => {
     if (form) {

package/src/components/Form/modal.ts

@@ -36,6 +36,7 @@ import type { ColProps } from "antd/lib/grid/col";
 import type { Gutter } from "antd/lib/grid/row";
 import type { IUrlUploadProps } from "../Upload/modal";
 import { NamePath } from "rc-field-form/es/interface";
+import {BaseOptions} from "@ahooksjs/use-request/lib/types";
 
 type RenderFun = (
   props: HItemProps,
@@ -100,12 +101,15 @@ export interface HItemProps
   hidden?: boolean | HideModal;
   rowWrapper?: boolean;
 }
+interface InfoRequestOp extends BaseOptions<any,any> {
+  request:PromiseFnResult;
+}
 export interface HFormProps<T = any, R = any>
   extends Omit<FormProps, "form" | "onFinish" | "labelAlign"> {
   configData: HItemProps[];
   labelWidth?: number;
   request?: (values: T, params?: any) => Promise<R>;
-  infoRequest?: PromiseFnResult;
+  infoRequest?: PromiseFnResult|InfoRequestOp;
   valueType?: string;
   form?: HFormInstance;
   params?: any;

package/src/components/Select/TreeSelect.tsx

@@ -29,21 +29,7 @@ const opMk=({options,onlyCheckChild=false,fieldNames}:OpMkParamsModal)=>{
         }
    })
 }
-const useGetOnlyCheckChild=({onlyCheckChild,treeCheckable,multiple}:IProps)=>{
-    if (typeof onlyCheckChild!=="undefined"){
-      return onlyCheckChild;
-    }
-    if (!treeCheckable&&!multiple){
-      return  true
-    }
-    return  false;
-}
 export default ({ request,onlyCheckChild,multiple,treeCheckable,treeData,fieldNames, ...props }: IProps) => {
-  const cuOnlyCheckChild=useGetOnlyCheckChild({
-    onlyCheckChild,
-    treeCheckable,
-    multiple
-  })
   const { loading, data } = useRequest(async () => {
     let options=treeData;
     if (request) {
@@ -51,7 +37,7 @@ export default ({ request,onlyCheckChild,multiple,treeCheckable,treeData,fieldNa
     }
     return opMk({
       options,
-      onlyCheckChild:cuOnlyCheckChild,
+      onlyCheckChild:onlyCheckChild,
       fieldNames
     });
   });