ls-pro-common 3.0.68 → 3.0.70

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/InputTable.d.ts +2 -0
  4. package/es/components/InputTable.js +14 -4
  5. package/es/hooks/useGetState.js +6 -1
  6. package/lib/components/InputTable.d.ts +2 -0
  7. package/lib/components/InputTable.js +14 -4
  8. package/lib/hooks/useGetState.js +6 -1
  9. package/package.json +1 -1
package/es/components/InputTable.d.ts CHANGED
@@ -41,6 +41,7 @@ export declare type InputTableProps = ProFormItemProps<InputProps> & {
41
41
  arrowPointAtCenter?: boolean;
42
42
  method?: 'GET' | 'POST';
43
43
  rowKey?: any;
44
+ changeOnSelect?: boolean;
44
45
  /** @name 选择行事件 */
45
46
  onSelectChange?: (item: any, formRef?: any) => void;
46
47
  /** @name 加载之前事件,param为查询条件对象,可以通过此方法调整 */
@@ -97,6 +98,7 @@ declare const InputTable: React.ForwardRefExoticComponent<{
97
98
  arrowPointAtCenter?: boolean | undefined;
98
99
  method?: "POST" | "GET" | undefined;
99
100
  rowKey?: any;
101
+ changeOnSelect?: boolean | undefined;
100
102
  /** @name 选择行事件 */
101
103
  onSelectChange?: ((item: any, formRef?: any) => void) | undefined;
102
104
  /** @name 加载之前事件,param为查询条件对象,可以通过此方法调整 */
package/es/components/InputTable.js CHANGED
@@ -11,7 +11,7 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
11
11
  import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
12
12
  import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
13
13
  import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
14
- var _excluded = ["columns", "url", "textName", "name", "tableConfig", "tableHeight", "tableWidth", "readonly", "multiple", "valueField", "labelWidth", "textField", "onSelectChange", "beforeLoad", "afterLoad", "isV2", "allowClear", "keepSelect", "fieldProps", "searchField", "fillMap", "loadOnShow", "triggerCheck", "getPopupContainer", "placement", "arrowPointAtCenter", "rowKey", "method"],
14
+ var _excluded = ["columns", "url", "textName", "name", "tableConfig", "tableHeight", "tableWidth", "readonly", "multiple", "valueField", "labelWidth", "textField", "onSelectChange", "beforeLoad", "afterLoad", "isV2", "allowClear", "keepSelect", "fieldProps", "searchField", "fillMap", "loadOnShow", "triggerCheck", "getPopupContainer", "placement", "arrowPointAtCenter", "rowKey", "method", "changeOnSelect"],
15
15
  _excluded2 = ["current", "pageSize"];
16
16
  import _regeneratorRuntime from "@babel/runtime/regenerator";
17
17
  import React, { useRef, useState, useEffect, useContext, useMemo, useImperativeHandle } from 'react';
@@ -85,6 +85,8 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
85
85
  rowKey = prop.rowKey,
86
86
  _prop$method = prop.method,
87
87
  method = _prop$method === void 0 ? 'GET' : _prop$method,
88
+ _prop$changeOnSelect = prop.changeOnSelect,
89
+ changeOnSelect = _prop$changeOnSelect === void 0 ? true : _prop$changeOnSelect,
88
90
  rest = _objectWithoutProperties(prop, _excluded);
89
91
  if (!valueField && isDev) {
90
92
  console.error('valueField 属性必须设置');
@@ -236,6 +238,7 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
236
238
  // 处理返回数据
237
239
  var handleValue = function handleValue(row) {
238
240
  var _formRef$current7, _formRef$current7$get;
241
+ var close = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
239
242
  var formValue = (formRef === null || formRef === void 0 ? void 0 : (_formRef$current7 = formRef.current) === null || _formRef$current7 === void 0 ? void 0 : (_formRef$current7$get = _formRef$current7.getFieldsValue) === null || _formRef$current7$get === void 0 ? void 0 : _formRef$current7$get.call(_formRef$current7)) || {};
240
243
  if (rowKey) {
241
244
  formValue = formValue[rowKey] || {};
@@ -274,7 +277,9 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
274
277
  }
275
278
  formValue[textNameProp] = txt;
276
279
  setText(txt);
277
- setVisible(false);
280
+ if (close) {
281
+ setVisible(false);
282
+ }
278
283
  if (rowKey) {
279
284
  var _formRef$current8, _formRef$current8$set;
280
285
  formRef === null || formRef === void 0 ? void 0 : (_formRef$current8 = formRef.current) === null || _formRef$current8 === void 0 ? void 0 : (_formRef$current8$set = _formRef$current8.setFieldsValue) === null || _formRef$current8$set === void 0 ? void 0 : _formRef$current8$set.call(_formRef$current8, _defineProperty({}, rowKey, formValue));
@@ -392,7 +397,9 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
392
397
  options: {
393
398
  density: false,
394
399
  reload: false,
395
- setting: false
400
+ setting: false,
401
+ fullScreen: false,
402
+ cellCopy: false
396
403
  },
397
404
  height: 'full',
398
405
  rowKey: tableKey,
@@ -425,8 +432,11 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
425
432
  selectedRowKeys: selectedKeys,
426
433
  preserveSelectedRowKeys: keepSelect,
427
434
  onChange: function onChange(keys, rows) {
428
- selectRowRef.current = rows;
435
+ selectRowRef.current = rows || [];
429
436
  setSelectedKeys(keys);
437
+ if (changeOnSelect) {
438
+ handleValue(selectRowRef.current, false);
439
+ }
430
440
  }
431
441
  } : false,
432
442
  showClear: true,
package/es/hooks/useGetState.js CHANGED
@@ -8,8 +8,13 @@ export default function (initVal) {
8
8
  setState = _useState2[1];
9
9
  var ref = useRef(initVal);
10
10
  var changeState = function changeState(newVal) {
11
+ if (typeof newVal === 'function') {
12
+ newVal = newVal(ref.current);
13
+ }
11
14
  ref.current = newVal;
12
- setState(newVal);
15
+ setState(function () {
16
+ return newVal;
17
+ });
13
18
  };
14
19
  var getState = function getState() {
15
20
  return ref.current;
package/lib/components/InputTable.d.ts CHANGED
@@ -41,6 +41,7 @@ export declare type InputTableProps = ProFormItemProps<InputProps> & {
41
41
  arrowPointAtCenter?: boolean;
42
42
  method?: 'GET' | 'POST';
43
43
  rowKey?: any;
44
+ changeOnSelect?: boolean;
44
45
  /** @name 选择行事件 */
45
46
  onSelectChange?: (item: any, formRef?: any) => void;
46
47
  /** @name 加载之前事件,param为查询条件对象,可以通过此方法调整 */
@@ -97,6 +98,7 @@ declare const InputTable: React.ForwardRefExoticComponent<{
97
98
  arrowPointAtCenter?: boolean | undefined;
98
99
  method?: "POST" | "GET" | undefined;
99
100
  rowKey?: any;
101
+ changeOnSelect?: boolean | undefined;
100
102
  /** @name 选择行事件 */
101
103
  onSelectChange?: ((item: any, formRef?: any) => void) | undefined;
102
104
  /** @name 加载之前事件,param为查询条件对象,可以通过此方法调整 */
package/lib/components/InputTable.js CHANGED
@@ -11,7 +11,7 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
11
11
  import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
12
12
  import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
13
13
  import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
14
- var _excluded = ["columns", "url", "textName", "name", "tableConfig", "tableHeight", "tableWidth", "readonly", "multiple", "valueField", "labelWidth", "textField", "onSelectChange", "beforeLoad", "afterLoad", "isV2", "allowClear", "keepSelect", "fieldProps", "searchField", "fillMap", "loadOnShow", "triggerCheck", "getPopupContainer", "placement", "arrowPointAtCenter", "rowKey", "method"],
14
+ var _excluded = ["columns", "url", "textName", "name", "tableConfig", "tableHeight", "tableWidth", "readonly", "multiple", "valueField", "labelWidth", "textField", "onSelectChange", "beforeLoad", "afterLoad", "isV2", "allowClear", "keepSelect", "fieldProps", "searchField", "fillMap", "loadOnShow", "triggerCheck", "getPopupContainer", "placement", "arrowPointAtCenter", "rowKey", "method", "changeOnSelect"],
15
15
  _excluded2 = ["current", "pageSize"];
16
16
  import _regeneratorRuntime from "@babel/runtime/regenerator";
17
17
  import React, { useRef, useState, useEffect, useContext, useMemo, useImperativeHandle } from 'react';
@@ -85,6 +85,8 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
85
85
  rowKey = prop.rowKey,
86
86
  _prop$method = prop.method,
87
87
  method = _prop$method === void 0 ? 'GET' : _prop$method,
88
+ _prop$changeOnSelect = prop.changeOnSelect,
89
+ changeOnSelect = _prop$changeOnSelect === void 0 ? true : _prop$changeOnSelect,
88
90
  rest = _objectWithoutProperties(prop, _excluded);
89
91
  if (!valueField && isDev) {
90
92
  console.error('valueField 属性必须设置');
@@ -236,6 +238,7 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
236
238
  // 处理返回数据
237
239
  var handleValue = function handleValue(row) {
238
240
  var _formRef$current7, _formRef$current7$get;
241
+ var close = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
239
242
  var formValue = (formRef === null || formRef === void 0 ? void 0 : (_formRef$current7 = formRef.current) === null || _formRef$current7 === void 0 ? void 0 : (_formRef$current7$get = _formRef$current7.getFieldsValue) === null || _formRef$current7$get === void 0 ? void 0 : _formRef$current7$get.call(_formRef$current7)) || {};
240
243
  if (rowKey) {
241
244
  formValue = formValue[rowKey] || {};
@@ -274,7 +277,9 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
274
277
  }
275
278
  formValue[textNameProp] = txt;
276
279
  setText(txt);
277
- setVisible(false);
280
+ if (close) {
281
+ setVisible(false);
282
+ }
278
283
  if (rowKey) {
279
284
  var _formRef$current8, _formRef$current8$set;
280
285
  formRef === null || formRef === void 0 ? void 0 : (_formRef$current8 = formRef.current) === null || _formRef$current8 === void 0 ? void 0 : (_formRef$current8$set = _formRef$current8.setFieldsValue) === null || _formRef$current8$set === void 0 ? void 0 : _formRef$current8$set.call(_formRef$current8, _defineProperty({}, rowKey, formValue));
@@ -392,7 +397,9 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
392
397
  options: {
393
398
  density: false,
394
399
  reload: false,
395
- setting: false
400
+ setting: false,
401
+ fullScreen: false,
402
+ cellCopy: false
396
403
  },
397
404
  height: 'full',
398
405
  rowKey: tableKey,
@@ -425,8 +432,11 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
425
432
  selectedRowKeys: selectedKeys,
426
433
  preserveSelectedRowKeys: keepSelect,
427
434
  onChange: function onChange(keys, rows) {
428
- selectRowRef.current = rows;
435
+ selectRowRef.current = rows || [];
429
436
  setSelectedKeys(keys);
437
+ if (changeOnSelect) {
438
+ handleValue(selectRowRef.current, false);
439
+ }
430
440
  }
431
441
  } : false,
432
442
  showClear: true,
package/lib/hooks/useGetState.js CHANGED
@@ -8,8 +8,13 @@ export default function (initVal) {
8
8
  setState = _useState2[1];
9
9
  var ref = useRef(initVal);
10
10
  var changeState = function changeState(newVal) {
11
+ if (typeof newVal === 'function') {
12
+ newVal = newVal(ref.current);
13
+ }
11
14
  ref.current = newVal;
12
- setState(newVal);
15
+ setState(function () {
16
+ return newVal;
17
+ });
13
18
  };
14
19
  var getState = function getState() {
15
20
  return ref.current;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "ls-pro-common",
3
- "version": "3.0.68",
3
+ "version": "3.0.70",
4
4
  "description": "ls-pro-common",
5
5
  "license": "MIT",
6
6
  "sideEffects": [