@hw-component/table 1.10.24 → 1.10.26
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.
- package/.eslintcache +1 -1
- package/es/DialogTable/Content.d.ts +1 -1
- package/es/DialogTable/Content.js +3 -1
- package/es/DialogTable/DwEditTable.d.ts +1 -1
- package/es/DialogTable/DwEditTable.js +8 -13
- package/es/DialogTable/ModalEditTable.d.ts +1 -1
- package/es/DialogTable/ModalEditTable.js +8 -11
- package/es/DialogTable/hooks.d.ts +6 -1
- package/es/DialogTable/hooks.js +24 -1
- package/es/EditTable/hooks.d.ts +10 -5
- package/es/EditTable/hooks.js +33 -14
- package/es/EditTable/index.d.ts +1 -1
- package/es/EditTable/index.js +23 -22
- package/es/EditTable/modal.d.ts +8 -2
- package/es/index.d.ts +1 -0
- package/es/index.js +1 -0
- package/es/modal.d.ts +8 -1
- package/es/render/Text.d.ts +0 -1
- package/lib/DialogTable/Content.d.ts +1 -1
- package/lib/DialogTable/Content.js +3 -1
- package/lib/DialogTable/DwEditTable.d.ts +1 -1
- package/lib/DialogTable/DwEditTable.js +7 -12
- package/lib/DialogTable/ModalEditTable.d.ts +1 -1
- package/lib/DialogTable/ModalEditTable.js +7 -10
- package/lib/DialogTable/hooks.d.ts +6 -1
- package/lib/DialogTable/hooks.js +25 -0
- package/lib/EditTable/hooks.d.ts +10 -5
- package/lib/EditTable/hooks.js +34 -13
- package/lib/EditTable/index.d.ts +1 -1
- package/lib/EditTable/index.js +22 -21
- package/lib/EditTable/modal.d.ts +8 -2
- package/lib/index.d.ts +1 -0
- package/lib/index.js +2 -0
- package/lib/modal.d.ts +8 -1
- package/lib/render/Text.d.ts +0 -1
- package/package.json +1 -1
- package/src/components/DialogTable/Content.tsx +2 -0
- package/src/components/DialogTable/DwEditTable.tsx +11 -11
- package/src/components/DialogTable/ModalEditTable.tsx +6 -9
- package/src/components/DialogTable/hooks.ts +33 -1
- package/src/components/EditTable/hooks.ts +38 -10
- package/src/components/EditTable/index.tsx +26 -20
- package/src/components/EditTable/modal.ts +12 -2
- package/src/components/index.tsx +1 -0
- package/src/components/modal.ts +8 -1
- package/src/pages/EditTable/index.tsx +14 -8
- package/src/pages/ModalEditTable/index.tsx +17 -2
|
@@ -11,10 +11,10 @@ import _defineProperty from '@babel/runtime-corejs3/helpers/defineProperty';
|
|
|
11
11
|
import _objectWithoutProperties from '@babel/runtime-corejs3/helpers/objectWithoutProperties';
|
|
12
12
|
import { jsx } from 'react/jsx-runtime';
|
|
13
13
|
import { Modal } from 'antd';
|
|
14
|
-
import { useVisible, useTableProps,
|
|
14
|
+
import { useVisible, useTableProps, useEditCurrentTable } from './hooks.js';
|
|
15
15
|
import { EditTableContent } from './Content.js';
|
|
16
16
|
|
|
17
|
-
var _excluded = ["configData", "request", "editTableProps", "
|
|
17
|
+
var _excluded = ["configData", "request", "editTableProps", "editDialogTable", "visible", "onCancel", "bodyStyle", "afterClose", "contentRender", "width", "footer"];
|
|
18
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; }
|
|
19
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; }
|
|
20
20
|
var ModalEditTable = (function (_ref) {
|
|
@@ -22,13 +22,13 @@ var ModalEditTable = (function (_ref) {
|
|
|
22
22
|
requestProps = _ref.request,
|
|
23
23
|
_ref$editTableProps = _ref.editTableProps,
|
|
24
24
|
editTableProps = _ref$editTableProps === void 0 ? {} : _ref$editTableProps,
|
|
25
|
-
|
|
25
|
+
editDialogTable = _ref.editDialogTable,
|
|
26
26
|
_ref$visible = _ref.visible,
|
|
27
27
|
visible = _ref$visible === void 0 ? false : _ref$visible,
|
|
28
28
|
_onCancel = _ref.onCancel,
|
|
29
29
|
_ref$bodyStyle = _ref.bodyStyle,
|
|
30
30
|
bodyStyle = _ref$bodyStyle === void 0 ? {} : _ref$bodyStyle,
|
|
31
|
-
|
|
31
|
+
afterClose = _ref.afterClose,
|
|
32
32
|
contentRender = _ref.contentRender,
|
|
33
33
|
_ref$width = _ref.width,
|
|
34
34
|
width = _ref$width === void 0 ? 666 : _ref$width,
|
|
@@ -44,7 +44,7 @@ var ModalEditTable = (function (_ref) {
|
|
|
44
44
|
})),
|
|
45
45
|
modalTableParams = _useTableProps.modalTableParams,
|
|
46
46
|
setModalTableParams = _useTableProps.setModalTableParams;
|
|
47
|
-
var currentTable =
|
|
47
|
+
var currentTable = useEditCurrentTable({
|
|
48
48
|
show: function show(showParams) {
|
|
49
49
|
if (showParams) {
|
|
50
50
|
setModalTableParams(function (oldParams) {
|
|
@@ -78,7 +78,7 @@ var ModalEditTable = (function (_ref) {
|
|
|
78
78
|
hide: function hide() {
|
|
79
79
|
setModalVisible(false);
|
|
80
80
|
},
|
|
81
|
-
|
|
81
|
+
editDialogTable: editDialogTable
|
|
82
82
|
});
|
|
83
83
|
var configData = modalTableParams.configData,
|
|
84
84
|
dataSource = modalTableParams.dataSource,
|
|
@@ -101,15 +101,12 @@ var ModalEditTable = (function (_ref) {
|
|
|
101
101
|
bodyStyle: _objectSpread({
|
|
102
102
|
padding: "0px 0px 12px"
|
|
103
103
|
}, bodyStyle),
|
|
104
|
-
afterClose:
|
|
105
|
-
currentTable.form.resetFields();
|
|
106
|
-
_afterClose === null || _afterClose === void 0 || _afterClose();
|
|
107
|
-
},
|
|
104
|
+
afterClose: afterClose,
|
|
108
105
|
children: jsx(EditTableContent, {
|
|
109
106
|
contentRender: contentRender,
|
|
110
107
|
editTableProps: editTableProps,
|
|
111
108
|
configData: configData || [],
|
|
112
|
-
|
|
109
|
+
editDialogTable: currentTable,
|
|
113
110
|
request: req,
|
|
114
111
|
dataSource: dataSource
|
|
115
112
|
})
|
|
@@ -1,15 +1,20 @@
|
|
|
1
1
|
/// <reference types="react" />
|
|
2
|
-
import
|
|
2
|
+
import { HDiaLogTableInstance, HOnDiaLogTableInstance, ModalTableProps, HDiaLogEditTableInstance } from "../modal";
|
|
3
3
|
export declare const useHDialogTable: () => HDiaLogTableInstance;
|
|
4
|
+
export declare const useHDialogEditTable: () => HDiaLogEditTableInstance;
|
|
4
5
|
interface ParamsModal extends HOnDiaLogTableInstance {
|
|
5
6
|
dialogTable?: HDiaLogTableInstance;
|
|
6
7
|
}
|
|
8
|
+
interface EditParamsModal extends HOnDiaLogTableInstance {
|
|
9
|
+
editDialogTable?: HDiaLogEditTableInstance;
|
|
10
|
+
}
|
|
7
11
|
type TablePropsModal<T> = Omit<ModalTableProps<T>, "tableProps">;
|
|
8
12
|
export declare function useTableProps<T>({ configData, params, title, request, dataSource, }: TablePropsModal<T>): {
|
|
9
13
|
modalTableParams: TablePropsModal<T>;
|
|
10
14
|
setModalTableParams: import("react").Dispatch<import("react").SetStateAction<TablePropsModal<T>>>;
|
|
11
15
|
};
|
|
12
16
|
export declare const useCurrentTable: ({ show, hide, dialogTable }: ParamsModal) => HDiaLogTableInstance;
|
|
17
|
+
export declare const useEditCurrentTable: ({ show, hide, editDialogTable, }: EditParamsModal) => HDiaLogEditTableInstance;
|
|
13
18
|
export declare const useVisible: (visible: boolean) => {
|
|
14
19
|
modalVisible: boolean;
|
|
15
20
|
setModalVisible: import("react").Dispatch<import("react").SetStateAction<boolean>>;
|
package/es/DialogTable/hooks.js
CHANGED
|
@@ -11,6 +11,7 @@ import _slicedToArray from '@babel/runtime-corejs3/helpers/slicedToArray';
|
|
|
11
11
|
import _defineProperty from '@babel/runtime-corejs3/helpers/defineProperty';
|
|
12
12
|
import useHTable from '../hooks/useHTable.js';
|
|
13
13
|
import { useMemo, useState, useEffect } from 'react';
|
|
14
|
+
import { useEditTable } from '../EditTable/hooks.js';
|
|
14
15
|
|
|
15
16
|
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; }
|
|
16
17
|
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; }
|
|
@@ -24,6 +25,16 @@ var useHDialogTable = function useHDialogTable() {
|
|
|
24
25
|
});
|
|
25
26
|
}, []);
|
|
26
27
|
};
|
|
28
|
+
var useHDialogEditTable = function useHDialogEditTable() {
|
|
29
|
+
var editTable = useEditTable();
|
|
30
|
+
return useMemo(function () {
|
|
31
|
+
return _objectSpread(_objectSpread({}, editTable), {}, {
|
|
32
|
+
show: function show(params) {},
|
|
33
|
+
hide: function hide() {},
|
|
34
|
+
params: {}
|
|
35
|
+
});
|
|
36
|
+
}, []);
|
|
37
|
+
};
|
|
27
38
|
function useTableProps(_ref) {
|
|
28
39
|
var configData = _ref.configData,
|
|
29
40
|
params = _ref.params,
|
|
@@ -73,6 +84,18 @@ var useCurrentTable = function useCurrentTable(_ref2) {
|
|
|
73
84
|
}, []);
|
|
74
85
|
return dialogTableInstance;
|
|
75
86
|
};
|
|
87
|
+
var useEditCurrentTable = function useEditCurrentTable(_ref3) {
|
|
88
|
+
var show = _ref3.show,
|
|
89
|
+
hide = _ref3.hide,
|
|
90
|
+
editDialogTable = _ref3.editDialogTable;
|
|
91
|
+
var cuDialogTableInstance = useHDialogEditTable();
|
|
92
|
+
var dialogTableInstance = editDialogTable || cuDialogTableInstance;
|
|
93
|
+
useEffect(function () {
|
|
94
|
+
dialogTableInstance.show = show;
|
|
95
|
+
dialogTableInstance.hide = hide;
|
|
96
|
+
}, []);
|
|
97
|
+
return dialogTableInstance;
|
|
98
|
+
};
|
|
76
99
|
var useVisible = function useVisible(visible) {
|
|
77
100
|
var _useState3 = useState(false),
|
|
78
101
|
_useState4 = _slicedToArray(_useState3, 2),
|
|
@@ -87,5 +110,5 @@ var useVisible = function useVisible(visible) {
|
|
|
87
110
|
};
|
|
88
111
|
};
|
|
89
112
|
|
|
90
|
-
export { useCurrentTable, useHDialogTable, useTableProps, useVisible };
|
|
113
|
+
export { useCurrentTable, useEditCurrentTable, useHDialogEditTable, useHDialogTable, useTableProps, useVisible };
|
|
91
114
|
// powered by hdj
|
package/es/EditTable/hooks.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { HEditTableProps } from "./modal";
|
|
1
|
+
import { EditTableInstance, HEditTableProps } from "./modal";
|
|
2
2
|
import { MutableRefObject } from "react";
|
|
3
3
|
import type { ActionType } from "@ant-design/pro-table";
|
|
4
4
|
import { EditableFormInstance } from "@ant-design/pro-table/lib/components/EditableTable";
|
|
@@ -9,10 +9,15 @@ export declare const useListRequest: ({ request, dataSource, manual, }: HEditTab
|
|
|
9
9
|
run: (params?: any) => Promise<void>;
|
|
10
10
|
data: ResultModal;
|
|
11
11
|
};
|
|
12
|
-
export declare const
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
12
|
+
export declare const useEditTable: () => EditTableInstance;
|
|
13
|
+
export declare const useCuEditTable: ({ table }: HEditTableProps) => EditTableInstance;
|
|
14
|
+
interface EditTableInitParams {
|
|
15
|
+
table: EditTableInstance;
|
|
16
|
+
actionRef: MutableRefObject<ActionType | undefined>;
|
|
17
|
+
editableFormRef: MutableRefObject<EditableFormInstance | undefined>;
|
|
18
|
+
request: VoidFunction;
|
|
19
|
+
}
|
|
20
|
+
export declare const useEditTableInit: ({ table, actionRef, editableFormRef, request, }: EditTableInitParams) => void;
|
|
16
21
|
interface ColProps extends HEditTableProps {
|
|
17
22
|
reload: VoidFunction;
|
|
18
23
|
}
|
package/es/EditTable/hooks.js
CHANGED
|
@@ -12,9 +12,10 @@ import _asyncToGenerator from '@babel/runtime-corejs3/helpers/asyncToGenerator';
|
|
|
12
12
|
import _slicedToArray from '@babel/runtime-corejs3/helpers/slicedToArray';
|
|
13
13
|
import _regeneratorRuntime from '@babel/runtime-corejs3/regenerator';
|
|
14
14
|
import _Array$isArray from '@babel/runtime-corejs3/core-js-stable/array/is-array';
|
|
15
|
+
import _Promise from '@babel/runtime-corejs3/core-js-stable/promise';
|
|
15
16
|
import _mapInstanceProperty from '@babel/runtime-corejs3/core-js-stable/instance/map';
|
|
16
17
|
import { useRequest } from 'ahooks';
|
|
17
|
-
import { useState, useMemo, useEffect
|
|
18
|
+
import { useState, useMemo, useEffect } from 'react';
|
|
18
19
|
import config from '../render/config.js';
|
|
19
20
|
|
|
20
21
|
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; }
|
|
@@ -95,21 +96,39 @@ var useListRequest = function useListRequest(_ref) {
|
|
|
95
96
|
data: tableDataSource
|
|
96
97
|
};
|
|
97
98
|
};
|
|
98
|
-
var
|
|
99
|
-
var actionRef = _ref3.actionRef,
|
|
100
|
-
editableFormRef = _ref3.editableFormRef;
|
|
101
|
-
var defaultActionRef = useRef();
|
|
102
|
-
var defaultTableRef = useRef();
|
|
103
|
-
var cuActionRef = actionRef || defaultActionRef;
|
|
104
|
-
var cuEditableFormRef = editableFormRef || defaultTableRef;
|
|
99
|
+
var useEditTable = function useEditTable() {
|
|
105
100
|
return {
|
|
106
|
-
|
|
107
|
-
|
|
101
|
+
reload: function reload() {
|
|
102
|
+
return _Promise.resolve();
|
|
103
|
+
},
|
|
104
|
+
editableForm: {},
|
|
105
|
+
action: {}
|
|
108
106
|
};
|
|
109
107
|
};
|
|
110
|
-
var
|
|
111
|
-
var
|
|
112
|
-
|
|
108
|
+
var useCuEditTable = function useCuEditTable(_ref3) {
|
|
109
|
+
var table = _ref3.table;
|
|
110
|
+
var cuTable = useEditTable();
|
|
111
|
+
return table || cuTable;
|
|
112
|
+
};
|
|
113
|
+
var useEditTableInit = function useEditTableInit(_ref4) {
|
|
114
|
+
var table = _ref4.table,
|
|
115
|
+
actionRef = _ref4.actionRef,
|
|
116
|
+
editableFormRef = _ref4.editableFormRef,
|
|
117
|
+
request = _ref4.request;
|
|
118
|
+
useEffect(function () {
|
|
119
|
+
if (!table) {
|
|
120
|
+
return;
|
|
121
|
+
}
|
|
122
|
+
table.editableForm = (editableFormRef === null || editableFormRef === void 0 ? void 0 : editableFormRef.current) || {};
|
|
123
|
+
table.reload = function () {
|
|
124
|
+
request();
|
|
125
|
+
};
|
|
126
|
+
table.action = (actionRef === null || actionRef === void 0 ? void 0 : actionRef.current) || {};
|
|
127
|
+
}, [actionRef, editableFormRef, table]);
|
|
128
|
+
};
|
|
129
|
+
var useColsMk = function useColsMk(_ref5) {
|
|
130
|
+
var configData = _ref5.configData,
|
|
131
|
+
reload = _ref5.reload;
|
|
113
132
|
return configData === null || configData === void 0 ? void 0 : _mapInstanceProperty(configData).call(configData, function (item) {
|
|
114
133
|
var valueType = item.valueType,
|
|
115
134
|
_render = item.render;
|
|
@@ -140,5 +159,5 @@ var useColsMk = function useColsMk(_ref4) {
|
|
|
140
159
|
});
|
|
141
160
|
};
|
|
142
161
|
|
|
143
|
-
export { useColsMk,
|
|
162
|
+
export { useColsMk, useCuEditTable, useEditTable, useEditTableInit, useListRequest };
|
|
144
163
|
// powered by hdj
|
package/es/EditTable/index.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
/// <reference types="react" />
|
|
2
2
|
import { HEditTableProps } from "./modal";
|
|
3
|
-
declare const _default: ({ configData, rowKey, creatorButtonText, recordCreatorProps, defaultRecordValue, pagination, editable, dataSource, request, manual, emptyRender, errorRender, onAdd, onEdit,
|
|
3
|
+
declare const _default: ({ configData, rowKey, creatorButtonText, recordCreatorProps, defaultRecordValue, pagination, editable, dataSource, request, manual, emptyRender, errorRender, onAdd, onEdit, style, table, ...props }: HEditTableProps) => JSX.Element;
|
|
4
4
|
export default _default;
|
package/es/EditTable/index.js
CHANGED
|
@@ -18,9 +18,10 @@ import HTablePagination from '../HTablePagination/index.js';
|
|
|
18
18
|
import { ConfigProvider } from 'antd';
|
|
19
19
|
import { emptyDefaultRender, errorDefaultRender } from '../HTableBody/defaultRender.js';
|
|
20
20
|
import { useHTableConfigContext } from '../TableConfig.js';
|
|
21
|
-
import { useListRequest,
|
|
21
|
+
import { useCuEditTable, useListRequest, useEditTableInit, useColsMk } from './hooks.js';
|
|
22
|
+
import { useRef } from 'react';
|
|
22
23
|
|
|
23
|
-
var _excluded = ["configData", "rowKey", "creatorButtonText", "recordCreatorProps", "defaultRecordValue", "pagination", "editable", "dataSource", "request", "manual", "emptyRender", "errorRender", "onAdd", "onEdit", "
|
|
24
|
+
var _excluded = ["configData", "rowKey", "creatorButtonText", "recordCreatorProps", "defaultRecordValue", "pagination", "editable", "dataSource", "request", "manual", "emptyRender", "errorRender", "onAdd", "onEdit", "style", "table"],
|
|
24
25
|
_excluded2 = ["index", "id"];
|
|
25
26
|
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
27
|
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var _context3, _context4; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context3 = ownKeys(Object(t), !0)).call(_context3, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context4 = ownKeys(Object(t))).call(_context4, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
@@ -44,10 +45,12 @@ var EditTable = (function (_ref) {
|
|
|
44
45
|
errorRender = _ref.errorRender,
|
|
45
46
|
onAdd = _ref.onAdd,
|
|
46
47
|
onEdit = _ref.onEdit,
|
|
47
|
-
actionRef = _ref.actionRef,
|
|
48
|
-
editableFormRef = _ref.editableFormRef,
|
|
49
48
|
style = _ref.style,
|
|
49
|
+
table = _ref.table,
|
|
50
50
|
props = _objectWithoutProperties(_ref, _excluded);
|
|
51
|
+
var cuTable = useCuEditTable({
|
|
52
|
+
table: table
|
|
53
|
+
});
|
|
51
54
|
var tableBody = useClassName("hw-table-body");
|
|
52
55
|
var _useListRequest = useListRequest({
|
|
53
56
|
request: request,
|
|
@@ -66,12 +69,14 @@ var EditTable = (function (_ref) {
|
|
|
66
69
|
tableEmptyRender = _useHTableConfigConte2 === void 0 ? emptyDefaultRender : _useHTableConfigConte2,
|
|
67
70
|
_useHTableConfigConte3 = _useHTableConfigConte.errorRender,
|
|
68
71
|
tableErrorRender = _useHTableConfigConte3 === void 0 ? errorDefaultRender : _useHTableConfigConte3;
|
|
69
|
-
var
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
72
|
+
var defaultActionRef = useRef();
|
|
73
|
+
var defaultEditableFormRef = useRef();
|
|
74
|
+
useEditTableInit({
|
|
75
|
+
actionRef: defaultActionRef,
|
|
76
|
+
editableFormRef: defaultEditableFormRef,
|
|
77
|
+
table: cuTable,
|
|
78
|
+
request: run
|
|
79
|
+
});
|
|
75
80
|
var columns = useColsMk({
|
|
76
81
|
configData: configData,
|
|
77
82
|
reload: run
|
|
@@ -93,13 +98,9 @@ var EditTable = (function (_ref) {
|
|
|
93
98
|
columns: columns,
|
|
94
99
|
loading: loading,
|
|
95
100
|
rowKey: rowKey,
|
|
96
|
-
editableFormRef:
|
|
97
|
-
actionRef:
|
|
101
|
+
editableFormRef: defaultEditableFormRef,
|
|
102
|
+
actionRef: defaultActionRef,
|
|
98
103
|
value: data === null || data === void 0 ? void 0 : data.records,
|
|
99
|
-
request: function request() {
|
|
100
|
-
return run();
|
|
101
|
-
},
|
|
102
|
-
manualRequest: true,
|
|
103
104
|
recordCreatorProps: recordCreatorProps === false ? recordCreatorProps : _objectSpread({
|
|
104
105
|
position: "bottom",
|
|
105
106
|
record: function record() {
|
|
@@ -113,11 +114,11 @@ var EditTable = (function (_ref) {
|
|
|
113
114
|
type: "single",
|
|
114
115
|
onCancel: function () {
|
|
115
116
|
var _onCancel = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(keys) {
|
|
116
|
-
var
|
|
117
|
+
var _defaultEditableFormR;
|
|
117
118
|
return _regeneratorRuntime.wrap(function _callee$(_context) {
|
|
118
119
|
while (1) switch (_context.prev = _context.next) {
|
|
119
120
|
case 0:
|
|
120
|
-
(
|
|
121
|
+
(_defaultEditableFormR = defaultEditableFormRef.current) === null || _defaultEditableFormR === void 0 || _defaultEditableFormR.resetFields([keys]);
|
|
121
122
|
case 1:
|
|
122
123
|
case "end":
|
|
123
124
|
return _context.stop();
|
|
@@ -134,8 +135,8 @@ var EditTable = (function (_ref) {
|
|
|
134
135
|
},
|
|
135
136
|
onSave: function () {
|
|
136
137
|
var _onSave = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(key, row) {
|
|
137
|
-
var
|
|
138
|
-
var id, oRow,
|
|
138
|
+
var _defaultEditableFormR3;
|
|
139
|
+
var id, oRow, _defaultEditableFormR2;
|
|
139
140
|
return _regeneratorRuntime.wrap(function _callee2$(_context2) {
|
|
140
141
|
while (1) switch (_context2.prev = _context2.next) {
|
|
141
142
|
case 0:
|
|
@@ -147,7 +148,7 @@ var EditTable = (function (_ref) {
|
|
|
147
148
|
_context2.next = 4;
|
|
148
149
|
return onAdd === null || onAdd === void 0 ? void 0 : onAdd(oRow);
|
|
149
150
|
case 4:
|
|
150
|
-
(
|
|
151
|
+
(_defaultEditableFormR2 = defaultEditableFormRef.current) === null || _defaultEditableFormR2 === void 0 || _defaultEditableFormR2.resetFields(["add"]);
|
|
151
152
|
run();
|
|
152
153
|
return _context2.abrupt("return");
|
|
153
154
|
case 7:
|
|
@@ -156,7 +157,7 @@ var EditTable = (function (_ref) {
|
|
|
156
157
|
id: id
|
|
157
158
|
}, oRow));
|
|
158
159
|
case 9:
|
|
159
|
-
(
|
|
160
|
+
(_defaultEditableFormR3 = defaultEditableFormRef.current) === null || _defaultEditableFormR3 === void 0 || _defaultEditableFormR3.resetFields([key]);
|
|
160
161
|
run();
|
|
161
162
|
case 11:
|
|
162
163
|
case "end":
|
package/es/EditTable/modal.d.ts
CHANGED
|
@@ -1,8 +1,13 @@
|
|
|
1
|
-
import { EditableProTableProps } from "@ant-design/pro-table/lib/components/EditableTable";
|
|
1
|
+
import { EditableFormInstance, EditableProTableProps } from "@ant-design/pro-table/lib/components/EditableTable";
|
|
2
2
|
import { ParamsType } from "@ant-design/pro-provider";
|
|
3
3
|
import { IPaginationProps } from "../HTablePagination";
|
|
4
4
|
import { EmptyPageRender, ErrorPageRender } from "../modal";
|
|
5
|
-
import { ProColumns } from "@ant-design/pro-table/lib/typing";
|
|
5
|
+
import { ActionType, ProColumns } from "@ant-design/pro-table/lib/typing";
|
|
6
|
+
export interface EditTableInstance {
|
|
7
|
+
editableForm: EditableFormInstance | {};
|
|
8
|
+
action: ActionType | {};
|
|
9
|
+
reload: () => void;
|
|
10
|
+
}
|
|
6
11
|
export interface HEditTableProps<T = any> extends Omit<EditableProTableProps<T, ParamsType>, "recordCreatorProps" | "request" | "pagination"> {
|
|
7
12
|
creatorButtonText?: string;
|
|
8
13
|
defaultRecordValue?: T;
|
|
@@ -16,4 +21,5 @@ export interface HEditTableProps<T = any> extends Omit<EditableProTableProps<T,
|
|
|
16
21
|
onAdd?: (data: T) => Promise<void>;
|
|
17
22
|
onEdit?: (data: T) => Promise<void>;
|
|
18
23
|
configData?: ProColumns<T>[];
|
|
24
|
+
table?: EditTableInstance;
|
|
19
25
|
}
|
package/es/index.d.ts
CHANGED
|
@@ -15,3 +15,4 @@ export { DefaultSubComponent as HTableHeaderSubBtn } from "./HTableHeader/defaul
|
|
|
15
15
|
export { default as HEditTable } from "./EditTable";
|
|
16
16
|
export { default as HModalEditTable } from "./DialogTable/ModalEditTable";
|
|
17
17
|
export { default as HDwEditTable } from "./DialogTable/DwEditTable";
|
|
18
|
+
export { useEditTable } from "./EditTable/hooks";
|
package/es/index.js
CHANGED
|
@@ -14,4 +14,5 @@ export { DefaultSubComponent as HTableHeaderSubBtn } from './HTableHeader/defaul
|
|
|
14
14
|
export { default as HEditTable } from './EditTable/index.js';
|
|
15
15
|
export { default as HModalEditTable } from './DialogTable/ModalEditTable.js';
|
|
16
16
|
export { default as HDwEditTable } from './DialogTable/DwEditTable.js';
|
|
17
|
+
export { useEditTable } from './EditTable/hooks.js';
|
|
17
18
|
// powered by hdj
|
package/es/modal.d.ts
CHANGED
|
@@ -10,7 +10,7 @@ import type { AffixProps } from "antd/lib/affix";
|
|
|
10
10
|
import type { OptionModal } from "./HTableBody/modal";
|
|
11
11
|
import type { DrawerProps } from "antd";
|
|
12
12
|
import type { IPaginationProps } from "./HTablePagination";
|
|
13
|
-
import { HEditTableProps } from "./EditTable/modal";
|
|
13
|
+
import { EditTableInstance, HEditTableProps } from "./EditTable/modal";
|
|
14
14
|
export interface RowObj {
|
|
15
15
|
keys?: React.Key[];
|
|
16
16
|
rowData?: any[];
|
|
@@ -124,9 +124,15 @@ export interface HDiaLogTableInstance {
|
|
|
124
124
|
hide: () => void;
|
|
125
125
|
params: any;
|
|
126
126
|
}
|
|
127
|
+
export interface HDiaLogEditTableInstance extends EditTableInstance {
|
|
128
|
+
show: (params?: DialogParamsModal) => void;
|
|
129
|
+
hide: () => void;
|
|
130
|
+
params: any;
|
|
131
|
+
}
|
|
127
132
|
export interface DwTableProps<T = HTableProps["configData"]> extends DrawerProps {
|
|
128
133
|
tableProps?: Omit<HTableProps, "configData" | "request">;
|
|
129
134
|
dialogTable?: HDiaLogTableInstance;
|
|
135
|
+
editDialogTable?: HDiaLogEditTableInstance;
|
|
130
136
|
params?: Record<string, any>;
|
|
131
137
|
configData?: T;
|
|
132
138
|
request?: HTableProps["request"];
|
|
@@ -137,6 +143,7 @@ export interface DwTableProps<T = HTableProps["configData"]> extends DrawerProps
|
|
|
137
143
|
export interface ModalTableProps<T = HTableProps["configData"]> extends Omit<ModalProps, "onOk"> {
|
|
138
144
|
tableProps?: Omit<HTableProps, "configData" | "request">;
|
|
139
145
|
dialogTable?: HDiaLogTableInstance;
|
|
146
|
+
editDialogTable?: HDiaLogEditTableInstance;
|
|
140
147
|
params?: Record<string, any>;
|
|
141
148
|
configData?: T;
|
|
142
149
|
request?: HTableProps["request"];
|
package/es/render/Text.d.ts
CHANGED
|
@@ -2,4 +2,4 @@
|
|
|
2
2
|
import type { ModalTableProps } from "../modal";
|
|
3
3
|
import { ProColumns } from "@ant-design/pro-table/lib/typing";
|
|
4
4
|
export declare const TableContent: ({ tableProps, configData, dialogTable, request, contentRender, dataSource, }: ModalTableProps) => JSX.Element;
|
|
5
|
-
export declare const EditTableContent: ({ editTableProps, configData, request, contentRender, dataSource, }: ModalTableProps<ProColumns[]>) => JSX.Element;
|
|
5
|
+
export declare const EditTableContent: ({ editTableProps, configData, request, contentRender, dataSource, editDialogTable, }: ModalTableProps<ProColumns[]>) => JSX.Element;
|
|
@@ -38,8 +38,10 @@ var EditTableContent = function EditTableContent(_ref2) {
|
|
|
38
38
|
configData = _ref2.configData,
|
|
39
39
|
request = _ref2.request,
|
|
40
40
|
contentRender = _ref2.contentRender,
|
|
41
|
-
dataSource = _ref2.dataSource
|
|
41
|
+
dataSource = _ref2.dataSource,
|
|
42
|
+
editDialogTable = _ref2.editDialogTable;
|
|
42
43
|
var node = jsxRuntime.jsx(index.default, _objectSpread(_objectSpread({}, editTableProps), {}, {
|
|
44
|
+
table: editDialogTable,
|
|
43
45
|
configData: configData || [],
|
|
44
46
|
request: request,
|
|
45
47
|
pagination: {
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/// <reference types="react" />
|
|
2
2
|
import type { DwTableProps } from "../modal";
|
|
3
3
|
import { ProColumns } from "@ant-design/pro-table/lib/typing";
|
|
4
|
-
declare const _default: ({ configData: configDataProps, request: requestProps, editTableProps,
|
|
4
|
+
declare const _default: ({ configData: configDataProps, request: requestProps, editTableProps, editDialogTable, visible, bodyStyle, onClose, afterVisibleChange, contentRender, width, footer, ...props }: DwTableProps<ProColumns[]>) => JSX.Element;
|
|
5
5
|
export default _default;
|
|
@@ -19,7 +19,7 @@ var Content = require('./Content.js');
|
|
|
19
19
|
var icons = require('@ant-design/icons');
|
|
20
20
|
var index = require('../hooks/index.js');
|
|
21
21
|
|
|
22
|
-
var _excluded = ["configData", "request", "editTableProps", "
|
|
22
|
+
var _excluded = ["configData", "request", "editTableProps", "editDialogTable", "visible", "bodyStyle", "onClose", "afterVisibleChange", "contentRender", "width", "footer"];
|
|
23
23
|
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; }
|
|
24
24
|
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; }
|
|
25
25
|
var DwEditTable = (function (_ref) {
|
|
@@ -27,13 +27,13 @@ var DwEditTable = (function (_ref) {
|
|
|
27
27
|
requestProps = _ref.request,
|
|
28
28
|
_ref$editTableProps = _ref.editTableProps,
|
|
29
29
|
editTableProps = _ref$editTableProps === void 0 ? {} : _ref$editTableProps,
|
|
30
|
-
|
|
30
|
+
editDialogTable = _ref.editDialogTable,
|
|
31
31
|
_ref$visible = _ref.visible,
|
|
32
32
|
visible = _ref$visible === void 0 ? false : _ref$visible,
|
|
33
33
|
_ref$bodyStyle = _ref.bodyStyle,
|
|
34
34
|
bodyStyle = _ref$bodyStyle === void 0 ? {} : _ref$bodyStyle,
|
|
35
35
|
_onClose = _ref.onClose,
|
|
36
|
-
|
|
36
|
+
afterVisibleChange = _ref.afterVisibleChange,
|
|
37
37
|
contentRender = _ref.contentRender,
|
|
38
38
|
_ref$width = _ref.width,
|
|
39
39
|
width = _ref$width === void 0 ? 888 : _ref$width,
|
|
@@ -50,7 +50,7 @@ var DwEditTable = (function (_ref) {
|
|
|
50
50
|
})),
|
|
51
51
|
modalTableParams = _useTableProps.modalTableParams,
|
|
52
52
|
setModalTableParams = _useTableProps.setModalTableParams;
|
|
53
|
-
var currentTable = hooks.
|
|
53
|
+
var currentTable = hooks.useEditCurrentTable({
|
|
54
54
|
show: function show(showParams) {
|
|
55
55
|
if (showParams) {
|
|
56
56
|
setModalTableParams(function (oldParams) {
|
|
@@ -84,7 +84,7 @@ var DwEditTable = (function (_ref) {
|
|
|
84
84
|
hide: function hide() {
|
|
85
85
|
setModalVisible(false);
|
|
86
86
|
},
|
|
87
|
-
|
|
87
|
+
editDialogTable: editDialogTable
|
|
88
88
|
});
|
|
89
89
|
var configData = modalTableParams.configData,
|
|
90
90
|
request = modalTableParams.request,
|
|
@@ -116,17 +116,12 @@ var DwEditTable = (function (_ref) {
|
|
|
116
116
|
padding: 0,
|
|
117
117
|
paddingBottom: 12
|
|
118
118
|
}, bodyStyle),
|
|
119
|
-
afterVisibleChange:
|
|
120
|
-
if (!changeVisible) {
|
|
121
|
-
currentTable.form.resetFields();
|
|
122
|
-
}
|
|
123
|
-
_afterVisibleChange === null || _afterVisibleChange === void 0 || _afterVisibleChange(changeVisible);
|
|
124
|
-
},
|
|
119
|
+
afterVisibleChange: afterVisibleChange,
|
|
125
120
|
children: jsxRuntime.jsx(Content.EditTableContent, {
|
|
126
121
|
contentRender: contentRender,
|
|
127
122
|
editTableProps: editTableProps,
|
|
128
123
|
configData: configData || [],
|
|
129
|
-
|
|
124
|
+
editDialogTable: currentTable,
|
|
130
125
|
request: req,
|
|
131
126
|
dataSource: dataSource
|
|
132
127
|
})
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/// <reference types="react" />
|
|
2
2
|
import type { ModalTableProps } from "../modal";
|
|
3
3
|
import { ProColumns } from "@ant-design/pro-table/lib/typing";
|
|
4
|
-
declare const _default: ({ configData: configDataProps, request: requestProps, editTableProps,
|
|
4
|
+
declare const _default: ({ configData: configDataProps, request: requestProps, editTableProps, editDialogTable, visible, onCancel, bodyStyle, afterClose, contentRender, width, footer, ...props }: ModalTableProps<ProColumns[]>) => JSX.Element;
|
|
5
5
|
export default _default;
|
|
@@ -17,7 +17,7 @@ var antd = require('antd');
|
|
|
17
17
|
var hooks = require('./hooks.js');
|
|
18
18
|
var Content = require('./Content.js');
|
|
19
19
|
|
|
20
|
-
var _excluded = ["configData", "request", "editTableProps", "
|
|
20
|
+
var _excluded = ["configData", "request", "editTableProps", "editDialogTable", "visible", "onCancel", "bodyStyle", "afterClose", "contentRender", "width", "footer"];
|
|
21
21
|
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
22
|
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; }
|
|
23
23
|
var ModalEditTable = (function (_ref) {
|
|
@@ -25,13 +25,13 @@ var ModalEditTable = (function (_ref) {
|
|
|
25
25
|
requestProps = _ref.request,
|
|
26
26
|
_ref$editTableProps = _ref.editTableProps,
|
|
27
27
|
editTableProps = _ref$editTableProps === void 0 ? {} : _ref$editTableProps,
|
|
28
|
-
|
|
28
|
+
editDialogTable = _ref.editDialogTable,
|
|
29
29
|
_ref$visible = _ref.visible,
|
|
30
30
|
visible = _ref$visible === void 0 ? false : _ref$visible,
|
|
31
31
|
_onCancel = _ref.onCancel,
|
|
32
32
|
_ref$bodyStyle = _ref.bodyStyle,
|
|
33
33
|
bodyStyle = _ref$bodyStyle === void 0 ? {} : _ref$bodyStyle,
|
|
34
|
-
|
|
34
|
+
afterClose = _ref.afterClose,
|
|
35
35
|
contentRender = _ref.contentRender,
|
|
36
36
|
_ref$width = _ref.width,
|
|
37
37
|
width = _ref$width === void 0 ? 666 : _ref$width,
|
|
@@ -47,7 +47,7 @@ var ModalEditTable = (function (_ref) {
|
|
|
47
47
|
})),
|
|
48
48
|
modalTableParams = _useTableProps.modalTableParams,
|
|
49
49
|
setModalTableParams = _useTableProps.setModalTableParams;
|
|
50
|
-
var currentTable = hooks.
|
|
50
|
+
var currentTable = hooks.useEditCurrentTable({
|
|
51
51
|
show: function show(showParams) {
|
|
52
52
|
if (showParams) {
|
|
53
53
|
setModalTableParams(function (oldParams) {
|
|
@@ -81,7 +81,7 @@ var ModalEditTable = (function (_ref) {
|
|
|
81
81
|
hide: function hide() {
|
|
82
82
|
setModalVisible(false);
|
|
83
83
|
},
|
|
84
|
-
|
|
84
|
+
editDialogTable: editDialogTable
|
|
85
85
|
});
|
|
86
86
|
var configData = modalTableParams.configData,
|
|
87
87
|
dataSource = modalTableParams.dataSource,
|
|
@@ -104,15 +104,12 @@ var ModalEditTable = (function (_ref) {
|
|
|
104
104
|
bodyStyle: _objectSpread({
|
|
105
105
|
padding: "0px 0px 12px"
|
|
106
106
|
}, bodyStyle),
|
|
107
|
-
afterClose:
|
|
108
|
-
currentTable.form.resetFields();
|
|
109
|
-
_afterClose === null || _afterClose === void 0 || _afterClose();
|
|
110
|
-
},
|
|
107
|
+
afterClose: afterClose,
|
|
111
108
|
children: jsxRuntime.jsx(Content.EditTableContent, {
|
|
112
109
|
contentRender: contentRender,
|
|
113
110
|
editTableProps: editTableProps,
|
|
114
111
|
configData: configData || [],
|
|
115
|
-
|
|
112
|
+
editDialogTable: currentTable,
|
|
116
113
|
request: req,
|
|
117
114
|
dataSource: dataSource
|
|
118
115
|
})
|
|
@@ -1,15 +1,20 @@
|
|
|
1
1
|
/// <reference types="react" />
|
|
2
|
-
import
|
|
2
|
+
import { HDiaLogTableInstance, HOnDiaLogTableInstance, ModalTableProps, HDiaLogEditTableInstance } from "../modal";
|
|
3
3
|
export declare const useHDialogTable: () => HDiaLogTableInstance;
|
|
4
|
+
export declare const useHDialogEditTable: () => HDiaLogEditTableInstance;
|
|
4
5
|
interface ParamsModal extends HOnDiaLogTableInstance {
|
|
5
6
|
dialogTable?: HDiaLogTableInstance;
|
|
6
7
|
}
|
|
8
|
+
interface EditParamsModal extends HOnDiaLogTableInstance {
|
|
9
|
+
editDialogTable?: HDiaLogEditTableInstance;
|
|
10
|
+
}
|
|
7
11
|
type TablePropsModal<T> = Omit<ModalTableProps<T>, "tableProps">;
|
|
8
12
|
export declare function useTableProps<T>({ configData, params, title, request, dataSource, }: TablePropsModal<T>): {
|
|
9
13
|
modalTableParams: TablePropsModal<T>;
|
|
10
14
|
setModalTableParams: import("react").Dispatch<import("react").SetStateAction<TablePropsModal<T>>>;
|
|
11
15
|
};
|
|
12
16
|
export declare const useCurrentTable: ({ show, hide, dialogTable }: ParamsModal) => HDiaLogTableInstance;
|
|
17
|
+
export declare const useEditCurrentTable: ({ show, hide, editDialogTable, }: EditParamsModal) => HDiaLogEditTableInstance;
|
|
13
18
|
export declare const useVisible: (visible: boolean) => {
|
|
14
19
|
modalVisible: boolean;
|
|
15
20
|
setModalVisible: import("react").Dispatch<import("react").SetStateAction<boolean>>;
|