ls-pro-common 1.0.0 → 1.0.4

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 (9) hide show
  1. package/dist/common.js +1 -1
  2. package/dist/common.min.js +1 -1
  3. package/es/components/EditModalForm.d.ts +1 -3
  4. package/es/hooks/useSingle/index.d.ts +5 -5
  5. package/es/hooks/useSingle/index.js +23 -19
  6. package/lib/components/EditModalForm.d.ts +1 -3
  7. package/lib/hooks/useSingle/index.d.ts +5 -5
  8. package/lib/hooks/useSingle/index.js +23 -19
  9. package/package.json +3 -3
package/es/components/EditModalForm.d.ts CHANGED
@@ -1,7 +1,5 @@
1
1
  /// <reference types="react" />
2
2
  import type { ModalFormProps } from 'ls-pro-form';
3
- export declare type EditModalFormProps<T = Record<string, any>> = ModalFormProps & {
4
- labelWidth: number | undefined;
5
- };
3
+ export declare type EditModalFormProps<T = Record<string, any>> = ModalFormProps;
6
4
  declare function EditModalForm<T = Record<string, any>>({ labelWidth, ...rest }: EditModalFormProps<T>): JSX.Element;
7
5
  export default EditModalForm;
package/es/hooks/useSingle/index.d.ts CHANGED
@@ -1,7 +1,6 @@
1
+ import type { ActionType } from 'ls-pro-table';
2
+ import type { ProFormInstance } from 'ls-pro-form';
1
3
  import type { TableToolbar } from '../../typing';
2
- interface ActionType {
3
- reload: (resetPageIndex?: boolean) => void;
4
- }
5
4
  /**
6
5
  * 单表基本增删改查 hooks
7
6
  * @param service 单表服务
@@ -11,9 +10,10 @@ interface ActionType {
11
10
  * @param onBeforeRemove 删除之前方法，开放给每个模块重写
12
11
  * @returns
13
12
  */
14
- declare function useSingle(service: any, toolbar?: TableToolbar, initItem?: any, beforeSave?: Function, beforeRemove?: Function): {
13
+ declare function useSingle(service: any, toolConfig?: TableToolbar, initItem?: any, beforeSave?: Function, beforeRemove?: Function): {
14
+ formRef: import("react").MutableRefObject<ProFormInstance<any> | undefined>;
15
15
  tableRef: import("react").MutableRefObject<ActionType | undefined>;
16
- selectRows: any;
16
+ selectedRows: any;
17
17
  showEdit: boolean;
18
18
  editItem: any;
19
19
  baseToolBar: JSX.Element[];
package/es/hooks/useSingle/index.js CHANGED
@@ -20,30 +20,33 @@ import { showConfirm, showWarn, showSuccess } from '../../utils';
20
20
  * @returns
21
21
  */
22
22
 
23
- function useSingle(service, toolbar, initItem, beforeSave, beforeRemove) {
24
- /** 选中行数据 */
23
+ function useSingle(service, toolConfig, initItem, beforeSave, beforeRemove) {
24
+ /** @name 选中行数据 */
25
25
  var _useState = useState([]),
26
26
  _useState2 = _slicedToArray(_useState, 2),
27
- selectRows = _useState2[0],
27
+ selectedRows = _useState2[0],
28
28
  setSelectedRows = _useState2[1];
29
- /** 显示新增编辑框 */
29
+ /** @name 显示新增编辑框 */
30
30
 
31
31
 
32
32
  var _useState3 = useState(false),
33
33
  _useState4 = _slicedToArray(_useState3, 2),
34
34
  showEdit = _useState4[0],
35
35
  setShowEdit = _useState4[1];
36
- /** 新增或编辑对象初始值 */
36
+ /** @name 新增或编辑对象初始值 */
37
37
 
38
38
 
39
39
  var _useState5 = useState(initItem),
40
40
  _useState6 = _slicedToArray(_useState5, 2),
41
41
  editItem = _useState6[0],
42
42
  setEditItem = _useState6[1];
43
- /** 表格ref */
43
+ /** @name 表格ref */
44
44
 
45
45
 
46
46
  var tableRef = useRef();
47
+ /** @name 查询表单ref */
48
+
49
+ var formRef = useRef();
47
50
  /** 新增按钮事件 */
48
51
 
49
52
  var onAdd = function onAdd() {
@@ -54,25 +57,25 @@ function useSingle(service, toolbar, initItem, beforeSave, beforeRemove) {
54
57
 
55
58
 
56
59
  var onEdit = function onEdit() {
57
- if (!selectRows.length) {
60
+ if (!selectedRows.length) {
58
61
  showWarn('请先选择需要更改的数据');
59
62
  return;
60
63
  }
61
64
 
62
- setEditItem(selectRows[0]);
65
+ setEditItem(selectedRows[0]);
63
66
  setShowEdit(true);
64
67
  };
65
68
  /** 删除按钮事件 */
66
69
 
67
70
 
68
71
  var onRemove = function onRemove() {
69
- if (!selectRows.length) {
72
+ if (!selectedRows.length) {
70
73
  showWarn('请选择需要删除的数据');
71
74
  return;
72
75
  }
73
76
 
74
77
  showConfirm('确认要删除选择的数据?').then(function () {
75
- var ids = selectRows.map(function (o) {
78
+ var ids = selectedRows.map(function (o) {
76
79
  return o.id;
77
80
  });
78
81
  service.remove(ids).then(function (result) {
@@ -100,7 +103,7 @@ function useSingle(service, toolbar, initItem, beforeSave, beforeRemove) {
100
103
  while (1) {
101
104
  switch (_context.prev = _context.next) {
102
105
  case 0:
103
- data = _objectSpread(_objectSpread({}, initItem), formData);
106
+ data = _objectSpread(_objectSpread({}, editItem), formData);
104
107
  _context.t0 = beforeSave;
105
108
 
106
109
  if (!_context.t0) {
@@ -205,7 +208,7 @@ function useSingle(service, toolbar, initItem, beforeSave, beforeRemove) {
205
208
 
206
209
  var baseToolBar = [];
207
210
 
208
- if (toolbar === null || toolbar === void 0 ? void 0 : toolbar.add) {
211
+ if (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.add) {
209
212
  baseToolBar.push( /*#__PURE__*/React.createElement(_Button, {
210
213
  key: "add",
211
214
  onClick: onAdd,
@@ -213,33 +216,33 @@ function useSingle(service, toolbar, initItem, beforeSave, beforeRemove) {
213
216
  }, "\u65B0\u589E"));
214
217
  }
215
218
 
216
- if (toolbar === null || toolbar === void 0 ? void 0 : toolbar.edit) {
219
+ if (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.edit) {
217
220
  baseToolBar.push( /*#__PURE__*/React.createElement(_Button, {
218
221
  key: "edit",
219
- disabled: selectRows.length === 0,
222
+ disabled: selectedRows.length === 0,
220
223
  onClick: onEdit,
221
224
  icon: /*#__PURE__*/React.createElement(EditOutlined, null)
222
225
  }, "\u7F16\u8F91"));
223
226
  }
224
227
 
225
- if (toolbar === null || toolbar === void 0 ? void 0 : toolbar.remove) {
228
+ if (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.remove) {
226
229
  baseToolBar.push( /*#__PURE__*/React.createElement(_Button, {
227
230
  key: "remove",
228
231
  onClick: onRemove,
229
232
  danger: true,
230
- disabled: selectRows.length === 0,
233
+ disabled: selectedRows.length === 0,
231
234
  icon: /*#__PURE__*/React.createElement(DeleteOutlined, null)
232
235
  }, "\u5220\u9664"));
233
236
  }
234
237
 
235
- if (toolbar === null || toolbar === void 0 ? void 0 : toolbar.import) {
238
+ if (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.import) {
236
239
  baseToolBar.push( /*#__PURE__*/React.createElement(_Button, {
237
240
  key: "import",
238
241
  icon: /*#__PURE__*/React.createElement(ImportOutlined, null)
239
242
  }, "\u5BFC\u5165"));
240
243
  }
241
244
 
242
- if (toolbar === null || toolbar === void 0 ? void 0 : toolbar.export) {
245
+ if (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.export) {
243
246
  baseToolBar.push( /*#__PURE__*/React.createElement(_Button, {
244
247
  key: "export",
245
248
  icon: /*#__PURE__*/React.createElement(ExportOutlined, null)
@@ -247,8 +250,9 @@ function useSingle(service, toolbar, initItem, beforeSave, beforeRemove) {
247
250
  }
248
251
 
249
252
  return {
253
+ formRef: formRef,
250
254
  tableRef: tableRef,
251
- selectRows: selectRows,
255
+ selectedRows: selectedRows,
252
256
  showEdit: showEdit,
253
257
  editItem: editItem,
254
258
  baseToolBar: baseToolBar,
package/lib/components/EditModalForm.d.ts CHANGED
@@ -1,7 +1,5 @@
1
1
  /// <reference types="react" />
2
2
  import type { ModalFormProps } from 'ls-pro-form';
3
- export declare type EditModalFormProps<T = Record<string, any>> = ModalFormProps & {
4
- labelWidth: number | undefined;
5
- };
3
+ export declare type EditModalFormProps<T = Record<string, any>> = ModalFormProps;
6
4
  declare function EditModalForm<T = Record<string, any>>({ labelWidth, ...rest }: EditModalFormProps<T>): JSX.Element;
7
5
  export default EditModalForm;
package/lib/hooks/useSingle/index.d.ts CHANGED
@@ -1,7 +1,6 @@
1
+ import type { ActionType } from 'ls-pro-table';
2
+ import type { ProFormInstance } from 'ls-pro-form';
1
3
  import type { TableToolbar } from '../../typing';
2
- interface ActionType {
3
- reload: (resetPageIndex?: boolean) => void;
4
- }
5
4
  /**
6
5
  * 单表基本增删改查 hooks
7
6
  * @param service 单表服务
@@ -11,9 +10,10 @@ interface ActionType {
11
10
  * @param onBeforeRemove 删除之前方法，开放给每个模块重写
12
11
  * @returns
13
12
  */
14
- declare function useSingle(service: any, toolbar?: TableToolbar, initItem?: any, beforeSave?: Function, beforeRemove?: Function): {
13
+ declare function useSingle(service: any, toolConfig?: TableToolbar, initItem?: any, beforeSave?: Function, beforeRemove?: Function): {
14
+ formRef: import("react").MutableRefObject<ProFormInstance<any> | undefined>;
15
15
  tableRef: import("react").MutableRefObject<ActionType | undefined>;
16
- selectRows: any;
16
+ selectedRows: any;
17
17
  showEdit: boolean;
18
18
  editItem: any;
19
19
  baseToolBar: JSX.Element[];
package/lib/hooks/useSingle/index.js CHANGED
@@ -40,30 +40,33 @@ var _excluded = ["current", "pageSize"];
40
40
  * @param onBeforeRemove 删除之前方法，开放给每个模块重写
41
41
  * @returns
42
42
  */
43
- function useSingle(service, toolbar, initItem, beforeSave, beforeRemove) {
44
- /** 选中行数据 */
43
+ function useSingle(service, toolConfig, initItem, beforeSave, beforeRemove) {
44
+ /** @name 选中行数据 */
45
45
  var _useState = (0, _react.useState)([]),
46
46
  _useState2 = (0, _slicedToArray2.default)(_useState, 2),
47
- selectRows = _useState2[0],
47
+ selectedRows = _useState2[0],
48
48
  setSelectedRows = _useState2[1];
49
- /** 显示新增编辑框 */
49
+ /** @name 显示新增编辑框 */
50
50
 
51
51
 
52
52
  var _useState3 = (0, _react.useState)(false),
53
53
  _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
54
54
  showEdit = _useState4[0],
55
55
  setShowEdit = _useState4[1];
56
- /** 新增或编辑对象初始值 */
56
+ /** @name 新增或编辑对象初始值 */
57
57
 
58
58
 
59
59
  var _useState5 = (0, _react.useState)(initItem),
60
60
  _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
61
61
  editItem = _useState6[0],
62
62
  setEditItem = _useState6[1];
63
- /** 表格ref */
63
+ /** @name 表格ref */
64
64
 
65
65
 
66
66
  var tableRef = (0, _react.useRef)();
67
+ /** @name 查询表单ref */
68
+
69
+ var formRef = (0, _react.useRef)();
67
70
  /** 新增按钮事件 */
68
71
 
69
72
  var onAdd = function onAdd() {
@@ -74,25 +77,25 @@ function useSingle(service, toolbar, initItem, beforeSave, beforeRemove) {
74
77
 
75
78
 
76
79
  var onEdit = function onEdit() {
77
- if (!selectRows.length) {
80
+ if (!selectedRows.length) {
78
81
  (0, _utils.showWarn)('请先选择需要更改的数据');
79
82
  return;
80
83
  }
81
84
 
82
- setEditItem(selectRows[0]);
85
+ setEditItem(selectedRows[0]);
83
86
  setShowEdit(true);
84
87
  };
85
88
  /** 删除按钮事件 */
86
89
 
87
90
 
88
91
  var onRemove = function onRemove() {
89
- if (!selectRows.length) {
92
+ if (!selectedRows.length) {
90
93
  (0, _utils.showWarn)('请选择需要删除的数据');
91
94
  return;
92
95
  }
93
96
 
94
97
  (0, _utils.showConfirm)('确认要删除选择的数据?').then(function () {
95
- var ids = selectRows.map(function (o) {
98
+ var ids = selectedRows.map(function (o) {
96
99
  return o.id;
97
100
  });
98
101
  service.remove(ids).then(function (result) {
@@ -120,7 +123,7 @@ function useSingle(service, toolbar, initItem, beforeSave, beforeRemove) {
120
123
  while (1) {
121
124
  switch (_context.prev = _context.next) {
122
125
  case 0:
123
- data = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, initItem), formData);
126
+ data = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, editItem), formData);
124
127
  _context.t0 = beforeSave;
125
128
 
126
129
  if (!_context.t0) {
@@ -225,7 +228,7 @@ function useSingle(service, toolbar, initItem, beforeSave, beforeRemove) {
225
228
 
226
229
  var baseToolBar = [];
227
230
 
228
- if (toolbar === null || toolbar === void 0 ? void 0 : toolbar.add) {
231
+ if (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.add) {
229
232
  baseToolBar.push( /*#__PURE__*/_react.default.createElement(_button.default, {
230
233
  key: "add",
231
234
  onClick: onAdd,
@@ -233,33 +236,33 @@ function useSingle(service, toolbar, initItem, beforeSave, beforeRemove) {
233
236
  }, "\u65B0\u589E"));
234
237
  }
235
238
 
236
- if (toolbar === null || toolbar === void 0 ? void 0 : toolbar.edit) {
239
+ if (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.edit) {
237
240
  baseToolBar.push( /*#__PURE__*/_react.default.createElement(_button.default, {
238
241
  key: "edit",
239
- disabled: selectRows.length === 0,
242
+ disabled: selectedRows.length === 0,
240
243
  onClick: onEdit,
241
244
  icon: /*#__PURE__*/_react.default.createElement(_icons.EditOutlined, null)
242
245
  }, "\u7F16\u8F91"));
243
246
  }
244
247
 
245
- if (toolbar === null || toolbar === void 0 ? void 0 : toolbar.remove) {
248
+ if (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.remove) {
246
249
  baseToolBar.push( /*#__PURE__*/_react.default.createElement(_button.default, {
247
250
  key: "remove",
248
251
  onClick: onRemove,
249
252
  danger: true,
250
- disabled: selectRows.length === 0,
253
+ disabled: selectedRows.length === 0,
251
254
  icon: /*#__PURE__*/_react.default.createElement(_icons.DeleteOutlined, null)
252
255
  }, "\u5220\u9664"));
253
256
  }
254
257
 
255
- if (toolbar === null || toolbar === void 0 ? void 0 : toolbar.import) {
258
+ if (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.import) {
256
259
  baseToolBar.push( /*#__PURE__*/_react.default.createElement(_button.default, {
257
260
  key: "import",
258
261
  icon: /*#__PURE__*/_react.default.createElement(_icons.ImportOutlined, null)
259
262
  }, "\u5BFC\u5165"));
260
263
  }
261
264
 
262
- if (toolbar === null || toolbar === void 0 ? void 0 : toolbar.export) {
265
+ if (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.export) {
263
266
  baseToolBar.push( /*#__PURE__*/_react.default.createElement(_button.default, {
264
267
  key: "export",
265
268
  icon: /*#__PURE__*/_react.default.createElement(_icons.ExportOutlined, null)
@@ -267,8 +270,9 @@ function useSingle(service, toolbar, initItem, beforeSave, beforeRemove) {
267
270
  }
268
271
 
269
272
  return {
273
+ formRef: formRef,
270
274
  tableRef: tableRef,
271
- selectRows: selectRows,
275
+ selectedRows: selectedRows,
272
276
  showEdit: showEdit,
273
277
  editItem: editItem,
274
278
  baseToolBar: baseToolBar,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "ls-pro-common",
3
- "version": "1.0.0",
3
+ "version": "1.0.4",
4
4
  "description": "ls-pro-common",
5
5
  "keywords": [
6
6
  "antd",
@@ -28,8 +28,8 @@
28
28
  ],
29
29
  "dependencies": {
30
30
  "@ant-design/icons": "^4.3.0",
31
- "ls-pro-table": "2.62.8",
32
- "ls-pro-form": "1.52.12",
31
+ "ls-pro-table": "2.62.11",
32
+ "ls-pro-form": "1.52.15",
33
33
  "@babel/runtime": "^7.16.3",
34
34
  "classnames": "^2.2.6",
35
35
  "moment": "^2.27.0",