@hw-component/table 1.1.0 → 1.1.2

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 (35) hide show
  1. package/.eslintcache +1 -1
  2. package/es/HTableBody/Options/utils.d.ts +2 -2
  3. package/es/HTableHeader/Context.d.ts +4 -0
  4. package/es/HTableHeader/Context.js +11 -0
  5. package/es/HTableHeader/defaultSubComponent.js +4 -1
  6. package/es/HTableHeader/index.d.ts +1 -1
  7. package/es/HTableHeader/index.js +19 -12
  8. package/es/HTableHeader/modal.d.ts +1 -0
  9. package/es/Table.d.ts +1 -1
  10. package/es/Table.js +4 -2
  11. package/es/hooks/useCurrentTable.d.ts +2 -2
  12. package/es/hooks/useHTable.js +3 -0
  13. package/lib/HTableBody/Options/utils.d.ts +2 -2
  14. package/lib/HTableHeader/Context.d.ts +4 -0
  15. package/lib/HTableHeader/Context.js +13 -0
  16. package/lib/HTableHeader/defaultSubComponent.js +4 -1
  17. package/lib/HTableHeader/index.d.ts +1 -1
  18. package/lib/HTableHeader/index.js +19 -12
  19. package/lib/HTableHeader/modal.d.ts +1 -0
  20. package/lib/Table.d.ts +1 -1
  21. package/lib/Table.js +4 -2
  22. package/lib/hooks/useCurrentTable.d.ts +2 -2
  23. package/lib/hooks/useHTable.js +3 -0
  24. package/package.json +2 -2
  25. package/src/components/HTableBody/index.tsx +4 -2
  26. package/src/components/HTableHeader/Context.tsx +9 -0
  27. package/src/components/HTableHeader/defaultSubComponent.tsx +3 -1
  28. package/src/components/HTableHeader/index.tsx +18 -15
  29. package/src/components/HTableHeader/modal.ts +1 -0
  30. package/src/components/Table.tsx +3 -1
  31. package/src/components/TableCustomize.tsx +1 -1
  32. package/src/components/hooks/useCurrentTable.ts +7 -7
  33. package/src/components/hooks/useHTable.tsx +3 -0
  34. package/src/components/modal.ts +1 -1
  35. package/src/pages/Table/index.tsx +5 -0
@@ -13,6 +13,7 @@ import { Row, Space, Button, Typography } from 'antd';
13
13
  import { useHTableContext } from '../context.js';
14
14
  import { useMemo } from 'react';
15
15
  import { DownOutlined, UpOutlined } from '@ant-design/icons';
16
+ import { useHeaderContext } from './Context.js';
16
17
 
17
18
  function ownKeys(e, r) { var t = _Object$keys(e); if (_Object$getOwnPropertySymbols) { var o = _Object$getOwnPropertySymbols(e); r && (o = _filterInstanceProperty(o).call(o, function (r) { return _Object$getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
18
19
  function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var _context, _context2; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context = ownKeys(Object(t), !0)).call(_context, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context2 = ownKeys(Object(t))).call(_context2, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -39,6 +40,8 @@ var DefaultSubComponent = function DefaultSubComponent(_ref) {
39
40
  var _useHTableContext2 = useHTableContext(),
40
41
  loading = _useHTableContext2.loading,
41
42
  headerOpen = _useHTableContext2.headerOpen;
43
+ var _useHeaderContext = useHeaderContext(),
44
+ onReset = _useHeaderContext.onReset;
42
45
  var hide = typeof headerOpen === "undefined";
43
46
  var _useMemo = useMemo(function () {
44
47
  if (headerOpen === true || hide) {
@@ -78,7 +81,7 @@ var DefaultSubComponent = function DefaultSubComponent(_ref) {
78
81
  borderRadius: 4
79
82
  },
80
83
  onClick: function onClick() {
81
- form.resetFields();
84
+ onReset ? onReset() : form.resetFields();
82
85
  },
83
86
  children: "\u91CD\u7F6E"
84
87
  }), hide ? null : jsx(OpenComponent, {})]
@@ -1,3 +1,3 @@
1
1
  import type { IHeaderProps } from "./modal";
2
- declare const _default: ({ configData, onFinish, searchSpan, headerStyle, initValues, hideLabel, labelWidth, }: IHeaderProps) => JSX.Element;
2
+ declare const _default: ({ configData, onFinish, searchSpan, headerStyle, initValues, hideLabel, labelWidth, onReset }: IHeaderProps) => JSX.Element;
3
3
  export default _default;
@@ -14,6 +14,7 @@ import { useHTableContext } from '../context.js';
14
14
  import { HForm } from '@hw-component/form';
15
15
  import { useClassName } from '../hooks/index.js';
16
16
  import { useHideMoreTitle } from './hooks.js';
17
+ import { HeaderProvider } from './Context.js';
17
18
 
18
19
  function ownKeys(e, r) { var t = _Object$keys(e); if (_Object$getOwnPropertySymbols) { var o = _Object$getOwnPropertySymbols(e); r && (o = _filterInstanceProperty(o).call(o, function (r) { return _Object$getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
19
20
  function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var _context, _context2; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context = ownKeys(Object(t), !0)).call(_context, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context2 = ownKeys(Object(t))).call(_context2, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -32,7 +33,8 @@ var Header = (function (_ref) {
32
33
  headerStyle = _ref.headerStyle,
33
34
  initValues = _ref.initValues,
34
35
  hideLabel = _ref.hideLabel,
35
- labelWidth = _ref.labelWidth;
36
+ labelWidth = _ref.labelWidth,
37
+ onReset = _ref.onReset;
36
38
  var _useHTableContext = useHTableContext(),
37
39
  tableInstance = _useHTableContext.tableInstance,
38
40
  loading = _useHTableContext.loading,
@@ -61,17 +63,22 @@ var Header = (function (_ref) {
61
63
  bodyStyle: {
62
64
  paddingBottom: 0
63
65
  },
64
- children: jsx(HForm, {
65
- itemSpan: searchSpan,
66
- onFinish: subOnFinish,
67
- submitLoading: loading,
68
- gutter: [20, 0],
69
- initialValues: initValues,
70
- hideLabel: typeof tableHideLabel === "undefined" ? true : tableHideLabel,
71
- configData: nConfigData,
72
- form: form,
73
- colon: true,
74
- labelWidth: tableLabelWidth
66
+ children: jsx(HeaderProvider, {
67
+ value: {
68
+ onReset: onReset
69
+ },
70
+ children: jsx(HForm, {
71
+ itemSpan: searchSpan,
72
+ onFinish: subOnFinish,
73
+ submitLoading: loading,
74
+ gutter: [20, 0],
75
+ initialValues: initValues,
76
+ hideLabel: typeof tableHideLabel === "undefined" ? true : tableHideLabel,
77
+ configData: nConfigData,
78
+ form: form,
79
+ colon: true,
80
+ labelWidth: tableLabelWidth
81
+ })
75
82
  })
76
83
  });
77
84
  });
@@ -12,6 +12,7 @@ export interface IHeaderProps {
12
12
  initValues?: Record<string, any>;
13
13
  hideLabel?: boolean;
14
14
  labelWidth?: number;
15
+ onReset?: VoidFunction;
15
16
  }
16
17
  export interface FormConfigDataItemProviderModal extends ConfigItemModal {
17
18
  className?: string;
package/es/Table.d.ts CHANGED
@@ -1,3 +1,3 @@
1
1
  import type { HTableProps } from "./modal";
2
- declare const _default: ({ request, configData, searchSpan, table, hideHeader, headerStyle, tableStyle, action, spaceSize, className, paginationStyle, rowKey, onFinish, manual, formInitValues, hideLabel, labelWidth, ...props }: HTableProps) => JSX.Element;
2
+ declare const _default: ({ request, configData, searchSpan, table, hideHeader, headerStyle, tableStyle, action, spaceSize, className, paginationStyle, rowKey, onFinish, manual, formInitValues, hideLabel, labelWidth, onReset, ...props }: HTableProps) => JSX.Element;
3
3
  export default _default;
package/es/Table.js CHANGED
@@ -21,7 +21,7 @@ import useReq from './hooks/useReq.js';
21
21
  import useDispatch from './hooks/useDispatch.js';
22
22
  import { useState } from 'react';
23
23
 
24
- var _excluded = ["request", "configData", "searchSpan", "table", "hideHeader", "headerStyle", "tableStyle", "action", "spaceSize", "className", "paginationStyle", "rowKey", "onFinish", "manual", "formInitValues", "hideLabel", "labelWidth"];
24
+ var _excluded = ["request", "configData", "searchSpan", "table", "hideHeader", "headerStyle", "tableStyle", "action", "spaceSize", "className", "paginationStyle", "rowKey", "onFinish", "manual", "formInitValues", "hideLabel", "labelWidth", "onReset"];
25
25
  function ownKeys(e, r) { var t = _Object$keys(e); if (_Object$getOwnPropertySymbols) { var o = _Object$getOwnPropertySymbols(e); r && (o = _filterInstanceProperty(o).call(o, function (r) { return _Object$getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
26
26
  function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var _context, _context2; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context = ownKeys(Object(t), !0)).call(_context, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context2 = ownKeys(Object(t))).call(_context2, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
27
27
  var Table = (function (_ref) {
@@ -46,6 +46,7 @@ var Table = (function (_ref) {
46
46
  formInitValues = _ref.formInitValues,
47
47
  hideLabel = _ref.hideLabel,
48
48
  labelWidth = _ref.labelWidth,
49
+ onReset = _ref.onReset,
49
50
  props = _objectWithoutProperties(_ref, _excluded);
50
51
  var _useReq = useReq({
51
52
  request: request,
@@ -121,7 +122,8 @@ var Table = (function (_ref) {
121
122
  searchSpan: searchSpan,
122
123
  headerStyle: headerStyle,
123
124
  onFinish: onFinish,
124
- initValues: formInitValues
125
+ initValues: formInitValues,
126
+ onReset: onReset
125
127
  }), jsx(Body, _objectSpread({
126
128
  tableStyle: hideHeader ? _objectSpread({
127
129
  paddingTop: 24
@@ -1,7 +1,7 @@
1
1
  import type React from "react";
2
2
  import type { ParamsModal, HTableInstance } from "../modal";
3
3
  import type { RowObj } from "../modal";
4
- import { ResultModal } from "../modal";
4
+ import type { ResultModal } from "../modal";
5
5
  interface currentTableParams {
6
6
  table?: HTableInstance;
7
7
  reload: (params?: ParamsModal) => Promise<any>;
@@ -12,5 +12,5 @@ interface currentTableParams {
12
12
  selectedRowData: RowObj;
13
13
  dataSource?: ResultModal;
14
14
  }
15
- declare const _default: ({ table, reload, changeRowData, dispatch, reloadWithParams, getTableParams, selectedRowData, dataSource }: currentTableParams) => HTableInstance;
15
+ declare const _default: ({ table, reload, changeRowData, dispatch, reloadWithParams, getTableParams, selectedRowData, dataSource, }: currentTableParams) => HTableInstance;
16
16
  export default _default;
@@ -21,6 +21,9 @@ var useHTable = (function () {
21
21
  settingKeys: {},
22
22
  getSelectedRowData: function getSelectedRowData() {
23
23
  return {};
24
+ },
25
+ getTableSourceData: function getTableSourceData() {
26
+ return [];
24
27
  }
25
28
  };
26
29
  }, []);
@@ -3,6 +3,7 @@ import React from "react";
3
3
  export declare const getItemValue: (data: ConfigItemModal) => {
4
4
  name?: string | undefined;
5
5
  labelAlign?: import("@hw-component/form/es/Form/modal").LabelAlignModal | undefined;
6
+ label?: React.ReactNode | import("@hw-component/form/es/Form/modal").HelperModal;
6
7
  children?: React.ReactNode | ((form: import("rc-field-form").FormInstance<any>) => React.ReactNode);
7
8
  dependencies?: import("rc-field-form/lib/interface").NamePath[] | undefined;
8
9
  getValueFromEvent?: ((...args: import("rc-field-form/lib/interface").EventArgs) => any) | undefined;
@@ -36,7 +37,6 @@ export declare const getItemValue: (data: ConfigItemModal) => {
36
37
  fieldKey?: React.Key | React.Key[] | undefined;
37
38
  colon?: boolean | undefined;
38
39
  htmlFor?: string | undefined;
39
- label?: React.ReactNode;
40
40
  labelCol?: import("antd").ColProps | undefined;
41
41
  requiredMark?: import("antd/lib/form/Form").RequiredMark | undefined;
42
42
  wrapperCol?: import("antd").ColProps | undefined;
@@ -44,7 +44,7 @@ export declare const getItemValue: (data: ConfigItemModal) => {
44
44
  status?: "" | "success" | "warning" | "error" | "validating" | undefined;
45
45
  help?: React.ReactNode;
46
46
  itemProps?: import("@hw-component/form/es/Form/modal").ItemPropsType | undefined;
47
- helper?: string | ((form: import("@hw-component/form/es/Form/modal").HFormInstance) => React.ReactNode) | undefined;
47
+ helper?: string | import("@hw-component/form/es/Form/modal").HelperModal | undefined;
48
48
  hover?: string | import("@hw-component/form/es/Form/modal").HoverModal | undefined;
49
49
  labelWidth?: number | undefined;
50
50
  hide?: boolean | import("@hw-component/form/es/Form/modal").HideModal | undefined;
@@ -0,0 +1,4 @@
1
+ import React from "react";
2
+ import { IHeaderProps } from "./modal";
3
+ export declare const HeaderProvider: React.Provider<IHeaderProps>;
4
+ export declare const useHeaderContext: () => IHeaderProps;
@@ -0,0 +1,13 @@
1
+ 'use strict';
2
+
3
+ var React = require('react');
4
+
5
+ var Context = /*#__PURE__*/React.createContext({});
6
+ var HeaderProvider = Context.Provider;
7
+ var useHeaderContext = function useHeaderContext() {
8
+ return React.useContext(Context);
9
+ };
10
+
11
+ exports.HeaderProvider = HeaderProvider;
12
+ exports.useHeaderContext = useHeaderContext;
13
+ // powered by h
@@ -14,6 +14,7 @@ var antd = require('antd');
14
14
  var context = require('../context.js');
15
15
  var React = require('react');
16
16
  var icons = require('@ant-design/icons');
17
+ var Context = require('./Context.js');
17
18
 
18
19
  function ownKeys(e, r) { var t = _Object$keys(e); if (_Object$getOwnPropertySymbols) { var o = _Object$getOwnPropertySymbols(e); r && (o = _filterInstanceProperty(o).call(o, function (r) { return _Object$getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
19
20
  function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var _context, _context2; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context = ownKeys(Object(t), !0)).call(_context, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context2 = ownKeys(Object(t))).call(_context2, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -40,6 +41,8 @@ var DefaultSubComponent = function DefaultSubComponent(_ref) {
40
41
  var _useHTableContext2 = context.useHTableContext(),
41
42
  loading = _useHTableContext2.loading,
42
43
  headerOpen = _useHTableContext2.headerOpen;
44
+ var _useHeaderContext = Context.useHeaderContext(),
45
+ onReset = _useHeaderContext.onReset;
43
46
  var hide = typeof headerOpen === "undefined";
44
47
  var _useMemo = React.useMemo(function () {
45
48
  if (headerOpen === true || hide) {
@@ -79,7 +82,7 @@ var DefaultSubComponent = function DefaultSubComponent(_ref) {
79
82
  borderRadius: 4
80
83
  },
81
84
  onClick: function onClick() {
82
- form.resetFields();
85
+ onReset ? onReset() : form.resetFields();
83
86
  },
84
87
  children: "\u91CD\u7F6E"
85
88
  }), hide ? null : jsxRuntime.jsx(OpenComponent, {})]
@@ -1,3 +1,3 @@
1
1
  import type { IHeaderProps } from "./modal";
2
- declare const _default: ({ configData, onFinish, searchSpan, headerStyle, initValues, hideLabel, labelWidth, }: IHeaderProps) => JSX.Element;
2
+ declare const _default: ({ configData, onFinish, searchSpan, headerStyle, initValues, hideLabel, labelWidth, onReset }: IHeaderProps) => JSX.Element;
3
3
  export default _default;
@@ -17,6 +17,7 @@ var context = require('../context.js');
17
17
  var form = require('@hw-component/form');
18
18
  var index = require('../hooks/index.js');
19
19
  var hooks = require('./hooks.js');
20
+ var Context = require('./Context.js');
20
21
 
21
22
  function ownKeys(e, r) { var t = _Object$keys(e); if (_Object$getOwnPropertySymbols) { var o = _Object$getOwnPropertySymbols(e); r && (o = _filterInstanceProperty(o).call(o, function (r) { return _Object$getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
22
23
  function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var _context, _context2; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context = ownKeys(Object(t), !0)).call(_context, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context2 = ownKeys(Object(t))).call(_context2, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -35,7 +36,8 @@ var Header = (function (_ref) {
35
36
  headerStyle = _ref.headerStyle,
36
37
  initValues = _ref.initValues,
37
38
  hideLabel = _ref.hideLabel,
38
- labelWidth = _ref.labelWidth;
39
+ labelWidth = _ref.labelWidth,
40
+ onReset = _ref.onReset;
39
41
  var _useHTableContext = context.useHTableContext(),
40
42
  tableInstance = _useHTableContext.tableInstance,
41
43
  loading = _useHTableContext.loading,
@@ -64,17 +66,22 @@ var Header = (function (_ref) {
64
66
  bodyStyle: {
65
67
  paddingBottom: 0
66
68
  },
67
- children: jsxRuntime.jsx(form.HForm, {
68
- itemSpan: searchSpan,
69
- onFinish: subOnFinish,
70
- submitLoading: loading,
71
- gutter: [20, 0],
72
- initialValues: initValues,
73
- hideLabel: typeof tableHideLabel === "undefined" ? true : tableHideLabel,
74
- configData: nConfigData,
75
- form: form$1,
76
- colon: true,
77
- labelWidth: tableLabelWidth
69
+ children: jsxRuntime.jsx(Context.HeaderProvider, {
70
+ value: {
71
+ onReset: onReset
72
+ },
73
+ children: jsxRuntime.jsx(form.HForm, {
74
+ itemSpan: searchSpan,
75
+ onFinish: subOnFinish,
76
+ submitLoading: loading,
77
+ gutter: [20, 0],
78
+ initialValues: initValues,
79
+ hideLabel: typeof tableHideLabel === "undefined" ? true : tableHideLabel,
80
+ configData: nConfigData,
81
+ form: form$1,
82
+ colon: true,
83
+ labelWidth: tableLabelWidth
84
+ })
78
85
  })
79
86
  });
80
87
  });
@@ -12,6 +12,7 @@ export interface IHeaderProps {
12
12
  initValues?: Record<string, any>;
13
13
  hideLabel?: boolean;
14
14
  labelWidth?: number;
15
+ onReset?: VoidFunction;
15
16
  }
16
17
  export interface FormConfigDataItemProviderModal extends ConfigItemModal {
17
18
  className?: string;
package/lib/Table.d.ts CHANGED
@@ -1,3 +1,3 @@
1
1
  import type { HTableProps } from "./modal";
2
- declare const _default: ({ request, configData, searchSpan, table, hideHeader, headerStyle, tableStyle, action, spaceSize, className, paginationStyle, rowKey, onFinish, manual, formInitValues, hideLabel, labelWidth, ...props }: HTableProps) => JSX.Element;
2
+ declare const _default: ({ request, configData, searchSpan, table, hideHeader, headerStyle, tableStyle, action, spaceSize, className, paginationStyle, rowKey, onFinish, manual, formInitValues, hideLabel, labelWidth, onReset, ...props }: HTableProps) => JSX.Element;
3
3
  export default _default;
package/lib/Table.js CHANGED
@@ -24,7 +24,7 @@ var useReq = require('./hooks/useReq.js');
24
24
  var useDispatch = require('./hooks/useDispatch.js');
25
25
  var React = require('react');
26
26
 
27
- var _excluded = ["request", "configData", "searchSpan", "table", "hideHeader", "headerStyle", "tableStyle", "action", "spaceSize", "className", "paginationStyle", "rowKey", "onFinish", "manual", "formInitValues", "hideLabel", "labelWidth"];
27
+ var _excluded = ["request", "configData", "searchSpan", "table", "hideHeader", "headerStyle", "tableStyle", "action", "spaceSize", "className", "paginationStyle", "rowKey", "onFinish", "manual", "formInitValues", "hideLabel", "labelWidth", "onReset"];
28
28
  function ownKeys(e, r) { var t = _Object$keys(e); if (_Object$getOwnPropertySymbols) { var o = _Object$getOwnPropertySymbols(e); r && (o = _filterInstanceProperty(o).call(o, function (r) { return _Object$getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
29
29
  function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var _context, _context2; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context = ownKeys(Object(t), !0)).call(_context, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context2 = ownKeys(Object(t))).call(_context2, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
30
30
  var Table = (function (_ref) {
@@ -49,6 +49,7 @@ var Table = (function (_ref) {
49
49
  formInitValues = _ref.formInitValues,
50
50
  hideLabel = _ref.hideLabel,
51
51
  labelWidth = _ref.labelWidth,
52
+ onReset = _ref.onReset,
52
53
  props = _objectWithoutProperties(_ref, _excluded);
53
54
  var _useReq = useReq.default({
54
55
  request: request,
@@ -124,7 +125,8 @@ var Table = (function (_ref) {
124
125
  searchSpan: searchSpan,
125
126
  headerStyle: headerStyle,
126
127
  onFinish: onFinish,
127
- initValues: formInitValues
128
+ initValues: formInitValues,
129
+ onReset: onReset
128
130
  }), jsxRuntime.jsx(index$1.default, _objectSpread({
129
131
  tableStyle: hideHeader ? _objectSpread({
130
132
  paddingTop: 24
@@ -1,7 +1,7 @@
1
1
  import type React from "react";
2
2
  import type { ParamsModal, HTableInstance } from "../modal";
3
3
  import type { RowObj } from "../modal";
4
- import { ResultModal } from "../modal";
4
+ import type { ResultModal } from "../modal";
5
5
  interface currentTableParams {
6
6
  table?: HTableInstance;
7
7
  reload: (params?: ParamsModal) => Promise<any>;
@@ -12,5 +12,5 @@ interface currentTableParams {
12
12
  selectedRowData: RowObj;
13
13
  dataSource?: ResultModal;
14
14
  }
15
- declare const _default: ({ table, reload, changeRowData, dispatch, reloadWithParams, getTableParams, selectedRowData, dataSource }: currentTableParams) => HTableInstance;
15
+ declare const _default: ({ table, reload, changeRowData, dispatch, reloadWithParams, getTableParams, selectedRowData, dataSource, }: currentTableParams) => HTableInstance;
16
16
  export default _default;
@@ -24,6 +24,9 @@ var useHTable = (function () {
24
24
  settingKeys: {},
25
25
  getSelectedRowData: function getSelectedRowData() {
26
26
  return {};
27
+ },
28
+ getTableSourceData: function getTableSourceData() {
29
+ return [];
27
30
  }
28
31
  };
29
32
  }, []);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@hw-component/table",
3
- "version": "1.1.0",
3
+ "version": "1.1.2",
4
4
  "description": "基于antd二次开发table组件",
5
5
  "keywords": [
6
6
  "table"
@@ -31,7 +31,7 @@
31
31
  "dependencies": {
32
32
  "@ant-design/icons": "4.6.2",
33
33
  "@ant-design/pro-table": "2.70.0",
34
- "@hw-component/form": "1.3.9",
34
+ "@hw-component/form": "1.4.0",
35
35
  "ahooks": "2.10.9",
36
36
  "antd": "4.20.7",
37
37
  "core-js": "3",
@@ -144,8 +144,10 @@ export default ({
144
144
  return;
145
145
  }
146
146
  const { field, order } = sorter as any;
147
- const orderByField=typeof order==="undefined"?undefined:field;
148
- const asc=typeof order==="undefined"?undefined:order === "ascend";
147
+ const orderByField =
148
+ typeof order === "undefined" ? undefined : field;
149
+ const asc =
150
+ typeof order === "undefined" ? undefined : order === "ascend";
149
151
  tableInstance.table.reloadWithParams({
150
152
  current: 1,
151
153
  orderByField,
@@ -0,0 +1,9 @@
1
+ import React, {useContext} from "react";
2
+ import {IHeaderProps} from "./modal";
3
+ const Context=React.createContext<IHeaderProps>({});
4
+
5
+ export const HeaderProvider=Context.Provider;
6
+
7
+ export const useHeaderContext=()=>{
8
+ return useContext(Context);
9
+ }
@@ -4,6 +4,7 @@ import { useHTableContext } from "../context";
4
4
  import React, { useMemo } from "react";
5
5
  import { DownOutlined, UpOutlined } from "@ant-design/icons";
6
6
  import type { RowProps } from "antd/lib/grid/row";
7
+ import {useHeaderContext} from "./Context";
7
8
  interface IProps {
8
9
  form: HFormInstance;
9
10
  }
@@ -35,6 +36,7 @@ const OpenComponent = () => {
35
36
  };
36
37
  export const DefaultSubComponent = ({ form }: IProps) => {
37
38
  const { loading, headerOpen } = useHTableContext();
39
+ const {onReset}=useHeaderContext();
38
40
  const hide = typeof headerOpen === "undefined";
39
41
  const { justify, style } = useMemo(() => {
40
42
  if (headerOpen === true || hide) {
@@ -69,7 +71,7 @@ export const DefaultSubComponent = ({ form }: IProps) => {
69
71
  <Button
70
72
  style={{ borderRadius: 4 }}
71
73
  onClick={() => {
72
- form.resetFields();
74
+ onReset?onReset():form.resetFields();
73
75
  }}
74
76
  >
75
77
  重置
@@ -5,6 +5,7 @@ import React from "react";
5
5
  import { useClassName } from "../hooks";
6
6
  import type { IHeaderProps } from "./modal";
7
7
  import { useHideMoreTitle } from "./hooks";
8
+ import {HeaderProvider} from "./Context";
8
9
 
9
10
  const defaultSearchSpan = {
10
11
  xxl: 4,
@@ -21,6 +22,7 @@ export default ({
21
22
  initValues,
22
23
  hideLabel,
23
24
  labelWidth,
25
+ onReset
24
26
  }: IHeaderProps) => {
25
27
  const {
26
28
  tableInstance,
@@ -41,7 +43,6 @@ export default ({
41
43
  const tableHideLabel =
42
44
  typeof hideLabel === "undefined" ? contextHideLabel : hideLabel;
43
45
  const tableLabelWidth = labelWidth || contextLabelWidth;
44
-
45
46
  const className = useClassName("hw-table-header");
46
47
  return (
47
48
  <Card
@@ -54,20 +55,22 @@ export default ({
54
55
  className={`hw_table_header ${className}`}
55
56
  bodyStyle={{ paddingBottom: 0 }}
56
57
  >
57
- <HForm
58
- itemSpan={searchSpan}
59
- onFinish={subOnFinish}
60
- submitLoading={loading}
61
- gutter={[20, 0]}
62
- initialValues={initValues}
63
- hideLabel={
64
- typeof tableHideLabel === "undefined" ? true : tableHideLabel
65
- }
66
- configData={nConfigData}
67
- form={form}
68
- colon={true}
69
- labelWidth={tableLabelWidth}
70
- />
58
+ <HeaderProvider value={{onReset}}>
59
+ <HForm
60
+ itemSpan={searchSpan}
61
+ onFinish={subOnFinish}
62
+ submitLoading={loading}
63
+ gutter={[20, 0]}
64
+ initialValues={initValues}
65
+ hideLabel={
66
+ typeof tableHideLabel === "undefined" ? true : tableHideLabel
67
+ }
68
+ configData={nConfigData}
69
+ form={form}
70
+ colon={true}
71
+ labelWidth={tableLabelWidth}
72
+ />
73
+ </HeaderProvider>
71
74
  </Card>
72
75
  );
73
76
  };
@@ -13,6 +13,7 @@ export interface IHeaderProps {
13
13
  initValues?: Record<string, any>;
14
14
  hideLabel?: boolean;
15
15
  labelWidth?: number;
16
+ onReset?:VoidFunction;
16
17
  }
17
18
 
18
19
  export interface FormConfigDataItemProviderModal extends ConfigItemModal {
@@ -26,6 +26,7 @@ export default ({
26
26
  formInitValues,
27
27
  hideLabel,
28
28
  labelWidth,
29
+ onReset,
29
30
  ...props
30
31
  }: HTableProps) => {
31
32
  const { run, loading, data, error, saveParams } = useReq({
@@ -53,7 +54,7 @@ export default ({
53
54
  return saveParams.old;
54
55
  },
55
56
  selectedRowData,
56
- dataSource:data,
57
+ dataSource: data,
57
58
  });
58
59
  return (
59
60
  <HTableContext.Provider
@@ -87,6 +88,7 @@ export default ({
87
88
  headerStyle={headerStyle}
88
89
  onFinish={onFinish}
89
90
  initValues={formInitValues}
91
+ onReset={onReset}
90
92
  />
91
93
  )}
92
94
  <Body
@@ -40,7 +40,7 @@ const Index: React.FC<HTableProps> = ({
40
40
  return saveParams.old;
41
41
  },
42
42
  selectedRowData,
43
- dataSource:data
43
+ dataSource: data,
44
44
  });
45
45
  return (
46
46
  <HTableContext.Provider
@@ -3,7 +3,7 @@ import { useMemo } from "react";
3
3
  import type { ParamsModal, HTableInstance } from "../modal";
4
4
  import useHTable from "../hooks/useHTable";
5
5
  import type { RowObj } from "../modal";
6
- import {ResultModal} from "../modal";
6
+ import type { ResultModal } from "../modal";
7
7
 
8
8
  interface currentTableParams {
9
9
  table?: HTableInstance;
@@ -13,7 +13,7 @@ interface currentTableParams {
13
13
  reloadWithParams: (params?: ParamsModal) => Promise<any>;
14
14
  getTableParams: () => any;
15
15
  selectedRowData: RowObj;
16
- dataSource?:ResultModal;
16
+ dataSource?: ResultModal;
17
17
  }
18
18
  export default ({
19
19
  table,
@@ -23,7 +23,7 @@ export default ({
23
23
  reloadWithParams,
24
24
  getTableParams,
25
25
  selectedRowData,
26
- dataSource
26
+ dataSource,
27
27
  }: currentTableParams) => {
28
28
  const useCurrentTable = useHTable();
29
29
  return useMemo(() => {
@@ -36,9 +36,9 @@ export default ({
36
36
  resultTable.table.getSelectedRowData = () => {
37
37
  return selectedRowData;
38
38
  };
39
- resultTable.table.getTableSourceData=()=>{
40
- return dataSource?.records;
41
- }
39
+ resultTable.table.getTableSourceData = () => {
40
+ return dataSource?.records;
41
+ };
42
42
  return resultTable as HTableInstance;
43
- }, [table, selectedRowData,dataSource]);
43
+ }, [table, selectedRowData, dataSource]);
44
44
  };
@@ -21,6 +21,9 @@ export default (): HTableInstance => {
21
21
  getSelectedRowData: () => {
22
22
  return {};
23
23
  },
24
+ getTableSourceData:()=>{
25
+ return [];
26
+ }
24
27
  };
25
28
  }, []);
26
29
  return {
@@ -125,7 +125,7 @@ export interface TableInstance {
125
125
  checkCols?: ConfigDataModal;
126
126
  };
127
127
  getSelectedRowData: () => RowObj;
128
- getTableSourceData:()=>any;
128
+ getTableSourceData: () => any;
129
129
  }
130
130
  export interface HTableInstance {
131
131
  form: HFormInstance;
@@ -79,6 +79,11 @@ export default () => {
79
79
  configData={configData}
80
80
  rowKey={"id"}
81
81
  table={hTable}
82
+ onReset={()=>{
83
+ hTable.form.setFieldsValue({
84
+ name1:"ffff"
85
+ })
86
+ }}
82
87
  hideLabel={false}
83
88
  labelWidth={88}
84
89
  action={{