@hw-component/form 1.9.30 → 1.9.32

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. package/es/Form/hooks/index.js +30 -10
  2. package/es/Form/modal.d.ts +5 -1
  3. package/lib/Form/hooks/index.js +30 -10
  4. package/lib/Form/modal.d.ts +5 -1
  5. package/package.json +1 -1
  6. package/src/components/Form/hooks/index.ts +17 -3
  7. package/src/components/Form/modal.ts +5 -1
package/es/Form/hooks/index.js CHANGED
@@ -1,6 +1,8 @@
1
1
  // welcome to hoo hoo hoo
2
2
  import _defineProperty from '@babel/runtime-corejs3/helpers/defineProperty';
3
3
  import _asyncToGenerator from '@babel/runtime-corejs3/helpers/asyncToGenerator';
4
+ import _objectWithoutProperties from '@babel/runtime-corejs3/helpers/objectWithoutProperties';
5
+ import _typeof from '@babel/runtime-corejs3/helpers/typeof';
4
6
  import _regeneratorRuntime from '@babel/runtime-corejs3/regenerator';
5
7
  import { useRequest } from 'ahooks';
6
8
  import useHForm from './useHForm.js';
@@ -8,6 +10,7 @@ import { useMemo, useEffect } from 'react';
8
10
  import componentConfig from '../config.js';
9
11
  import { useFormConfigContext } from '../Context/FormConfigProvider.js';
10
12
 
13
+ var _excluded = ["request"];
11
14
  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; }
12
15
  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; }
13
16
  var useCurrentForm = function useCurrentForm(form) {
@@ -28,6 +31,22 @@ var useInfoReq = function useInfoReq(_ref) {
28
31
  params: saveParams
29
32
  };
30
33
  }, [params]);
34
+ var _useMemo = useMemo(function () {
35
+ if (_typeof(infoRequest) === "object") {
36
+ var infoReq = infoRequest.request,
37
+ op = _objectWithoutProperties(infoRequest, _excluded);
38
+ return {
39
+ infoReq: infoReq,
40
+ options: op
41
+ };
42
+ }
43
+ return {
44
+ infoReq: infoRequest,
45
+ options: {}
46
+ };
47
+ }, [infoRequest]),
48
+ initReq = _useMemo.infoReq,
49
+ options = _useMemo.options;
31
50
  var subControl = useRequest(/*#__PURE__*/function () {
32
51
  var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(value) {
33
52
  var subVal;
@@ -64,31 +83,32 @@ var useInfoReq = function useInfoReq(_ref) {
64
83
  case 0:
65
84
  reqParams = _args2.length > 0 && _args2[0] !== undefined ? _args2[0] : reqData.params;
66
85
  reqData.params = reqParams;
67
- if (!infoRequest) {
68
- _context2.next = 8;
86
+ form === null || form === void 0 || form.resetFields();
87
+ if (!initReq) {
88
+ _context2.next = 9;
69
89
  break;
70
90
  }
71
- _context2.next = 5;
72
- return infoRequest(reqParams);
73
- case 5:
91
+ _context2.next = 6;
92
+ return initReq(reqParams);
93
+ case 6:
74
94
  result = _context2.sent;
75
95
  form === null || form === void 0 || form.setFieldsValue(result);
76
96
  return _context2.abrupt("return", result || {});
77
- case 8:
97
+ case 9:
78
98
  if (!(typeof initialValues === "undefined")) {
79
- _context2.next = 10;
99
+ _context2.next = 11;
80
100
  break;
81
101
  }
82
102
  return _context2.abrupt("return", {});
83
- case 10:
103
+ case 11:
84
104
  form === null || form === void 0 || form.setFieldsValue(initialValues);
85
105
  return _context2.abrupt("return", initialValues);
86
- case 12:
106
+ case 13:
87
107
  case "end":
88
108
  return _context2.stop();
89
109
  }
90
110
  }, _callee2);
91
- })));
111
+ })), options);
92
112
  var run = infoControl.run,
93
113
  mutate = infoControl.mutate;
94
114
  useEffect(function () {
package/es/Form/modal.d.ts CHANGED
@@ -17,6 +17,7 @@ import type { DataFnProvider } from "../modal";
17
17
  import type { ColProps } from "antd/lib/grid/col";
18
18
  import type { Gutter } from "antd/lib/grid/row";
19
19
  import type { IUrlUploadProps } from "../Upload/modal";
20
+ import { BaseOptions } from "@ahooksjs/use-request/lib/types";
20
21
  type RenderFun = (props: HItemProps, node: React.ReactNode, form: FormInstance) => React.ReactNode;
21
22
  export type ItemPropsType = HCheckboxProps | HInputProps | HSelectInputProps | HButtonProps | HRadioGroupProps | HSelectProps | ButtonProps | HSwitchProps | HDatePickerProps | HRangePickerProps | HTimePickerProps | TextAreaProps | IUpLoadProps | CascaderProps<any> | IUrlUploadProps;
22
23
  export interface HoverModal {
@@ -53,11 +54,14 @@ export interface HItemProps extends Omit<FormItemProps, "name" | "labelAlign" |
53
54
  hidden?: boolean | HideModal;
54
55
  rowWrapper?: boolean;
55
56
  }
57
+ interface InfoRequestOp extends BaseOptions<any, any> {
58
+ request: PromiseFnResult;
59
+ }
56
60
  export interface HFormProps<T = any, R = any> extends Omit<FormProps, "form" | "onFinish" | "labelAlign"> {
57
61
  configData: HItemProps[];
58
62
  labelWidth?: number;
59
63
  request?: (values: T, params?: any) => Promise<R>;
60
- infoRequest?: PromiseFnResult;
64
+ infoRequest?: PromiseFnResult | InfoRequestOp;
61
65
  valueType?: string;
62
66
  form?: HFormInstance;
63
67
  params?: any;
package/lib/Form/hooks/index.js CHANGED
@@ -2,6 +2,8 @@
2
2
 
3
3
  var _defineProperty = require('@babel/runtime-corejs3/helpers/defineProperty');
4
4
  var _asyncToGenerator = require('@babel/runtime-corejs3/helpers/asyncToGenerator');
5
+ var _objectWithoutProperties = require('@babel/runtime-corejs3/helpers/objectWithoutProperties');
6
+ var _typeof = require('@babel/runtime-corejs3/helpers/typeof');
5
7
  var _regeneratorRuntime = require('@babel/runtime-corejs3/regenerator');
6
8
  var ahooks = require('ahooks');
7
9
  var useHForm = require('./useHForm.js');
@@ -9,6 +11,7 @@ var React = require('react');
9
11
  var config = require('../config.js');
10
12
  var FormConfigProvider = require('../Context/FormConfigProvider.js');
11
13
 
14
+ var _excluded = ["request"];
12
15
  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; }
13
16
  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; }
14
17
  var useCurrentForm = function useCurrentForm(form) {
@@ -29,6 +32,22 @@ var useInfoReq = function useInfoReq(_ref) {
29
32
  params: saveParams
30
33
  };
31
34
  }, [params]);
35
+ var _useMemo = React.useMemo(function () {
36
+ if (_typeof(infoRequest) === "object") {
37
+ var infoReq = infoRequest.request,
38
+ op = _objectWithoutProperties(infoRequest, _excluded);
39
+ return {
40
+ infoReq: infoReq,
41
+ options: op
42
+ };
43
+ }
44
+ return {
45
+ infoReq: infoRequest,
46
+ options: {}
47
+ };
48
+ }, [infoRequest]),
49
+ initReq = _useMemo.infoReq,
50
+ options = _useMemo.options;
32
51
  var subControl = ahooks.useRequest(/*#__PURE__*/function () {
33
52
  var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(value) {
34
53
  var subVal;
@@ -65,31 +84,32 @@ var useInfoReq = function useInfoReq(_ref) {
65
84
  case 0:
66
85
  reqParams = _args2.length > 0 && _args2[0] !== undefined ? _args2[0] : reqData.params;
67
86
  reqData.params = reqParams;
68
- if (!infoRequest) {
69
- _context2.next = 8;
87
+ form === null || form === void 0 || form.resetFields();
88
+ if (!initReq) {
89
+ _context2.next = 9;
70
90
  break;
71
91
  }
72
- _context2.next = 5;
73
- return infoRequest(reqParams);
74
- case 5:
92
+ _context2.next = 6;
93
+ return initReq(reqParams);
94
+ case 6:
75
95
  result = _context2.sent;
76
96
  form === null || form === void 0 || form.setFieldsValue(result);
77
97
  return _context2.abrupt("return", result || {});
78
- case 8:
98
+ case 9:
79
99
  if (!(typeof initialValues === "undefined")) {
80
- _context2.next = 10;
100
+ _context2.next = 11;
81
101
  break;
82
102
  }
83
103
  return _context2.abrupt("return", {});
84
- case 10:
104
+ case 11:
85
105
  form === null || form === void 0 || form.setFieldsValue(initialValues);
86
106
  return _context2.abrupt("return", initialValues);
87
- case 12:
107
+ case 13:
88
108
  case "end":
89
109
  return _context2.stop();
90
110
  }
91
111
  }, _callee2);
92
- })));
112
+ })), options);
93
113
  var run = infoControl.run,
94
114
  mutate = infoControl.mutate;
95
115
  React.useEffect(function () {
package/lib/Form/modal.d.ts CHANGED
@@ -17,6 +17,7 @@ import type { DataFnProvider } from "../modal";
17
17
  import type { ColProps } from "antd/lib/grid/col";
18
18
  import type { Gutter } from "antd/lib/grid/row";
19
19
  import type { IUrlUploadProps } from "../Upload/modal";
20
+ import { BaseOptions } from "@ahooksjs/use-request/lib/types";
20
21
  type RenderFun = (props: HItemProps, node: React.ReactNode, form: FormInstance) => React.ReactNode;
21
22
  export type ItemPropsType = HCheckboxProps | HInputProps | HSelectInputProps | HButtonProps | HRadioGroupProps | HSelectProps | ButtonProps | HSwitchProps | HDatePickerProps | HRangePickerProps | HTimePickerProps | TextAreaProps | IUpLoadProps | CascaderProps<any> | IUrlUploadProps;
22
23
  export interface HoverModal {
@@ -53,11 +54,14 @@ export interface HItemProps extends Omit<FormItemProps, "name" | "labelAlign" |
53
54
  hidden?: boolean | HideModal;
54
55
  rowWrapper?: boolean;
55
56
  }
57
+ interface InfoRequestOp extends BaseOptions<any, any> {
58
+ request: PromiseFnResult;
59
+ }
56
60
  export interface HFormProps<T = any, R = any> extends Omit<FormProps, "form" | "onFinish" | "labelAlign"> {
57
61
  configData: HItemProps[];
58
62
  labelWidth?: number;
59
63
  request?: (values: T, params?: any) => Promise<R>;
60
- infoRequest?: PromiseFnResult;
64
+ infoRequest?: PromiseFnResult | InfoRequestOp;
61
65
  valueType?: string;
62
66
  form?: HFormInstance;
63
67
  params?: any;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@hw-component/form",
3
- "version": "1.9.30",
3
+ "version": "1.9.32",
4
4
  "description": "基于antd二次开发",
5
5
  "repository": {
6
6
  "type": "git",
package/src/components/Form/hooks/index.ts CHANGED
@@ -33,6 +33,19 @@ export const useInfoReq = ({
33
33
  params: saveParams,
34
34
  };
35
35
  }, [params]);
36
+ const {infoReq:initReq,options}=useMemo(()=>{
37
+ if (typeof infoRequest==="object"){
38
+ const {request:infoReq,...op}=infoRequest;
39
+ return {
40
+ infoReq,
41
+ options:op
42
+ }
43
+ }
44
+ return {
45
+ infoReq:infoRequest,
46
+ options:{}
47
+ };
48
+ },[infoRequest]);
36
49
 
37
50
  const subControl = useRequest(
38
51
  async (value) => {
@@ -46,8 +59,9 @@ export const useInfoReq = ({
46
59
  );
47
60
  const infoControl = useRequest(async (reqParams = reqData.params) => {
48
61
  reqData.params = reqParams;
49
- if (infoRequest) {
50
- const result = await infoRequest(reqParams);
62
+ form?.resetFields();
63
+ if (initReq) {
64
+ const result = await initReq(reqParams);
51
65
  form?.setFieldsValue(result);
52
66
  return result || {};
53
67
  }
@@ -56,7 +70,7 @@ export const useInfoReq = ({
56
70
  }
57
71
  form?.setFieldsValue(initialValues);
58
72
  return initialValues;
59
- });
73
+ },options);
60
74
  const { run, mutate } = infoControl;
61
75
  useEffect(() => {
62
76
  if (form) {
package/src/components/Form/modal.ts CHANGED
@@ -36,6 +36,7 @@ import type { ColProps } from "antd/lib/grid/col";
36
36
  import type { Gutter } from "antd/lib/grid/row";
37
37
  import type { IUrlUploadProps } from "../Upload/modal";
38
38
  import { NamePath } from "rc-field-form/es/interface";
39
+ import {BaseOptions} from "@ahooksjs/use-request/lib/types";
39
40
 
40
41
  type RenderFun = (
41
42
  props: HItemProps,
@@ -100,12 +101,15 @@ export interface HItemProps
100
101
  hidden?: boolean | HideModal;
101
102
  rowWrapper?: boolean;
102
103
  }
104
+ interface InfoRequestOp extends BaseOptions<any,any> {
105
+ request:PromiseFnResult;
106
+ }
103
107
  export interface HFormProps<T = any, R = any>
104
108
  extends Omit<FormProps, "form" | "onFinish" | "labelAlign"> {
105
109
  configData: HItemProps[];
106
110
  labelWidth?: number;
107
111
  request?: (values: T, params?: any) => Promise<R>;
108
- infoRequest?: PromiseFnResult;
112
+ infoRequest?: PromiseFnResult|InfoRequestOp;
109
113
  valueType?: string;
110
114
  form?: HFormInstance;
111
115
  params?: any;