ls-pro-common 3.0.90 → 3.0.91

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 (5) hide show
  1. package/dist/common.js +1 -1
  2. package/dist/common.min.js +1 -1
  3. package/es/components/InputTable.js +21 -10
  4. package/lib/components/InputTable.js +21 -10
  5. package/package.json +1 -1
package/es/components/InputTable.js CHANGED
@@ -167,7 +167,9 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
167
167
  case 14:
168
168
  result = _context.sent;
169
169
  case 15:
170
- rows = result.rows || [];
170
+ rows = (result.rows || []).filter(function (o) {
171
+ return o;
172
+ });
171
173
  if (afterLoad) {
172
174
  afterLoad(rows);
173
175
  }
@@ -234,12 +236,12 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
234
236
  if (val && !txt) {
235
237
  formValue[textNameProp] = val;
236
238
  setFormValue(formValue);
237
- // if (textField !== valueField) {
238
- // initName(val);
239
- //}
239
+ // 多值选择或选择的初始值不在第一页时显示有问题
240
+ if (textField !== valueField) {
241
+ initName(val);
242
+ }
240
243
  }
241
244
  }, [rowKey]);
242
- // 跨页显示有问题
243
245
  var initName = function initName(val) {
244
246
  var _columns$find;
245
247
  if (!val) return;
@@ -256,11 +258,13 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
256
258
  }
257
259
  param[fieldName] = val;
258
260
  loadData(param).then(function (result) {
259
- var rows = result.data || [];
261
+ var rows = (result.data || []).filter(function (o) {
262
+ return o;
263
+ });
260
264
  var txt = rows.map(function (o) {
261
265
  return o[textField];
262
266
  }).join(',') || val;
263
- var formValue = getFormValue(); //重新取一次
267
+ var formValue = getFormValue();
264
268
  formValue[textNameProp] = txt;
265
269
  setText(txt);
266
270
  setFormValue(formValue);
@@ -270,10 +274,13 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
270
274
  var handleValue = function handleValue(row) {
271
275
  var close = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
272
276
  var formValue = getFormValue();
273
- if (!formValue) return;
277
+ if (!formValue || !row) return;
274
278
  var txt;
275
279
  //支持多选
276
280
  if (Array.isArray(row)) {
281
+ row = row.filter(function (o) {
282
+ return o;
283
+ });
277
284
  //返回值
278
285
  formValue[name] = row.map(function (o) {
279
286
  return o[valueField];
@@ -428,8 +435,12 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
428
435
  selectedRowKeys: selectedKeys,
429
436
  preserveSelectedRowKeys: keepSelect,
430
437
  onChange: function onChange(keys, rows) {
431
- selectRowRef.current = rows || [];
432
- setSelectedKeys(keys);
438
+ selectRowRef.current = (rows || []).filter(function (o) {
439
+ return o;
440
+ });
441
+ setSelectedKeys(selectRowRef.current.map(function (o) {
442
+ return o[tableKey];
443
+ }));
433
444
  if (changeOnSelect) {
434
445
  handleValue(selectRowRef.current, false);
435
446
  }
package/lib/components/InputTable.js CHANGED
@@ -167,7 +167,9 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
167
167
  case 14:
168
168
  result = _context.sent;
169
169
  case 15:
170
- rows = result.rows || [];
170
+ rows = (result.rows || []).filter(function (o) {
171
+ return o;
172
+ });
171
173
  if (afterLoad) {
172
174
  afterLoad(rows);
173
175
  }
@@ -234,12 +236,12 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
234
236
  if (val && !txt) {
235
237
  formValue[textNameProp] = val;
236
238
  setFormValue(formValue);
237
- // if (textField !== valueField) {
238
- // initName(val);
239
- //}
239
+ // 多值选择或选择的初始值不在第一页时显示有问题
240
+ if (textField !== valueField) {
241
+ initName(val);
242
+ }
240
243
  }
241
244
  }, [rowKey]);
242
- // 跨页显示有问题
243
245
  var initName = function initName(val) {
244
246
  var _columns$find;
245
247
  if (!val) return;
@@ -256,11 +258,13 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
256
258
  }
257
259
  param[fieldName] = val;
258
260
  loadData(param).then(function (result) {
259
- var rows = result.data || [];
261
+ var rows = (result.data || []).filter(function (o) {
262
+ return o;
263
+ });
260
264
  var txt = rows.map(function (o) {
261
265
  return o[textField];
262
266
  }).join(',') || val;
263
- var formValue = getFormValue(); //重新取一次
267
+ var formValue = getFormValue();
264
268
  formValue[textNameProp] = txt;
265
269
  setText(txt);
266
270
  setFormValue(formValue);
@@ -270,10 +274,13 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
270
274
  var handleValue = function handleValue(row) {
271
275
  var close = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
272
276
  var formValue = getFormValue();
273
- if (!formValue) return;
277
+ if (!formValue || !row) return;
274
278
  var txt;
275
279
  //支持多选
276
280
  if (Array.isArray(row)) {
281
+ row = row.filter(function (o) {
282
+ return o;
283
+ });
277
284
  //返回值
278
285
  formValue[name] = row.map(function (o) {
279
286
  return o[valueField];
@@ -428,8 +435,12 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
428
435
  selectedRowKeys: selectedKeys,
429
436
  preserveSelectedRowKeys: keepSelect,
430
437
  onChange: function onChange(keys, rows) {
431
- selectRowRef.current = rows || [];
432
- setSelectedKeys(keys);
438
+ selectRowRef.current = (rows || []).filter(function (o) {
439
+ return o;
440
+ });
441
+ setSelectedKeys(selectRowRef.current.map(function (o) {
442
+ return o[tableKey];
443
+ }));
433
444
  if (changeOnSelect) {
434
445
  handleValue(selectRowRef.current, false);
435
446
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "ls-pro-common",
3
- "version": "3.0.90",
3
+ "version": "3.0.91",
4
4
  "description": "ls-pro-common",
5
5
  "license": "MIT",
6
6
  "sideEffects": [