@zat-design/sisyphus-react 3.4.6-beta.9 → 3.4.7

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/index.esm.css +1 -1
  2. package/dist/less.esm.css +1 -1
  3. package/es/ProEditTable/style/index.less +1 -1
  4. package/es/ProForm/components/combination/ProModalSelect/index.js +29 -35
  5. package/es/global.less +9 -22
  6. package/lib/ProEditTable/style/index.less +1 -1
  7. package/lib/ProForm/components/combination/ProModalSelect/index.js +29 -35
  8. package/lib/global.less +9 -22
  9. package/package.json +1 -1
package/dist/index.esm.css CHANGED
@@ -4215,7 +4215,7 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
4215
4215
  display: -ms-flexbox;
4216
4216
  display: flex;
4217
4217
  }
4218
- .pro-edit-table .drag-wrapper .anticon {
4218
+ .pro-edit-table .drag-wrapper .drag-icon {
4219
4219
  margin-right: var(--zaui-space-size-md, 16px);
4220
4220
  margin-left: var(--zaui-space-size-xs, 4px);
4221
4221
  cursor: pointer;
package/dist/less.esm.css CHANGED
@@ -4215,7 +4215,7 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
4215
4215
  display: -ms-flexbox;
4216
4216
  display: flex;
4217
4217
  }
4218
- .pro-edit-table .drag-wrapper .anticon {
4218
+ .pro-edit-table .drag-wrapper .drag-icon {
4219
4219
  margin-right: var(--zaui-space-size-md, 16px);
4220
4220
  margin-left: var(--zaui-space-size-xs, 4px);
4221
4221
  cursor: pointer;
package/es/ProEditTable/style/index.less CHANGED
@@ -65,7 +65,7 @@
65
65
 
66
66
  .drag-wrapper {
67
67
  display: flex;
68
- .anticon {
68
+ .drag-icon {
69
69
  margin-right: var(--zaui-space-size-md, 16px);
70
70
  margin-left: var(--zaui-space-size-xs, 4px);
71
71
  cursor: pointer;
package/es/ProForm/components/combination/ProModalSelect/index.js CHANGED
@@ -295,64 +295,58 @@ var ProModalSelect = function ProModalSelect(props, ref) {
295
295
  };
296
296
  var handleFinish = /*#__PURE__*/function () {
297
297
  var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
298
- var _nextSelectedRows, _nextSelectedRows2, nextSelectedRows, record, flag, res;
298
+ var _data, flag, res;
299
299
  return _regeneratorRuntime().wrap(function _callee2$(_context2) {
300
300
  while (1) switch (_context2.prev = _context2.next) {
301
301
  case 0:
302
302
  _context2.prev = 0;
303
- if (selectedRowKeys === null || selectedRowKeys === void 0 ? void 0 : selectedRowKeys.length) {
303
+ if (selectedRows === null || selectedRows === void 0 ? void 0 : selectedRows.length) {
304
304
  _context2.next = 4;
305
305
  break;
306
306
  }
307
307
  _message.error(locale.ProModalSelect.checkMsg);
308
308
  return _context2.abrupt("return", false);
309
309
  case 4:
310
- nextSelectedRows = selectedRows;
311
- if (!((_nextSelectedRows = nextSelectedRows) === null || _nextSelectedRows === void 0 ? void 0 : _nextSelectedRows[0])) {
312
- nextSelectedRows = data.filter(function (item) {
313
- return selectedRowKeys.includes(item[valueKey]);
314
- });
315
- }
316
- record = isMultiple ? nextSelectedRows : (_nextSelectedRows2 = nextSelectedRows) === null || _nextSelectedRows2 === void 0 ? void 0 : _nextSelectedRows2[0];
310
+ _data = isMultiple ? selectedRows : selectedRows === null || selectedRows === void 0 ? void 0 : selectedRows[0];
317
311
  if (!isMultiple) {
318
312
  // @ts-ignore
319
- record.value = record[valueKey];
313
+ _data.value = _data[valueKey];
320
314
  // @ts-ignore
321
- record.label = record[labelKey];
315
+ _data.label = _data[labelKey];
322
316
  }
323
317
  flag = true;
324
318
  if (!onOk) {
325
- _context2.next = 14;
319
+ _context2.next = 12;
326
320
  break;
327
321
  }
328
- _context2.next = 12;
329
- return onOk(record);
330
- case 12:
322
+ _context2.next = 10;
323
+ return onOk(_data);
324
+ case 10:
331
325
  res = _context2.sent;
332
326
  if (res !== null && res !== undefined) {
333
327
  // @ts-ignore
334
328
  flag = res;
335
329
  }
336
- case 14:
330
+ case 12:
337
331
  if (flag) {
338
- onChange === null || onChange === void 0 ? void 0 : onChange(labelInValue ? record : getNextValues(record), record);
332
+ onChange === null || onChange === void 0 ? void 0 : onChange(labelInValue ? _data : getNextValues(_data), _data);
339
333
  // 更新内部展示值
340
334
  setState({
341
- _value: record,
342
- options: isArray(record) ? record : [record]
335
+ _value: _data,
336
+ options: isArray(_data) ? _data : [_data]
343
337
  });
344
338
  handleClose();
345
339
  }
346
340
  return _context2.abrupt("return", flag);
347
- case 18:
348
- _context2.prev = 18;
341
+ case 16:
342
+ _context2.prev = 16;
349
343
  _context2.t0 = _context2["catch"](0);
350
344
  console.warn('error', _context2.t0);
351
- case 21:
345
+ case 19:
352
346
  case "end":
353
347
  return _context2.stop();
354
348
  }
355
- }, _callee2, null, [[0, 18]]);
349
+ }, _callee2, null, [[0, 16]]);
356
350
  }));
357
351
  return function handleFinish() {
358
352
  return _ref7.apply(this, arguments);
@@ -433,7 +427,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
433
427
  // 初始化回显，当传入initParams时，前端用来回险
434
428
  var getInitValues = /*#__PURE__*/function () {
435
429
  var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
436
- var _contentForm$getField, _useRequest$options2, _useRequest$options3, queryBean, page, params, res, _list, list, _res$data2, _data, nextSelectRowKeys;
430
+ var _contentForm$getField, _useRequest$options2, _useRequest$options3, queryBean, page, params, res, _list, list, _res$data2, _data2, nextSelectRowKeys;
437
431
  return _regeneratorRuntime().wrap(function _callee4$(_context4) {
438
432
  while (1) switch (_context4.prev = _context4.next) {
439
433
  case 0:
@@ -464,15 +458,15 @@ var ProModalSelect = function ProModalSelect(props, ref) {
464
458
  } else {
465
459
  list = withPagination ? res === null || res === void 0 ? void 0 : (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.list : res === null || res === void 0 ? void 0 : res.data;
466
460
  }
467
- _data = isMultiple ? list : (_list = list) === null || _list === void 0 ? void 0 : _list[0];
468
- if (_data) {
461
+ _data2 = isMultiple ? list : (_list = list) === null || _list === void 0 ? void 0 : _list[0];
462
+ if (_data2) {
469
463
  nextSelectRowKeys = isMultiple ? value : [value];
470
464
  if (labelInValue) {
471
- onChange(_data);
465
+ onChange(_data2);
472
466
  }
473
467
  // 更新内部展示值
474
468
  setState({
475
- _value: _data,
469
+ _value: _data2,
476
470
  isInit: false,
477
471
  selectedRows: list,
478
472
  selectedRowKeys: nextSelectRowKeys
@@ -499,7 +493,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
499
493
  var getDefaultOneValues = /*#__PURE__*/function () {
500
494
  var _ref10 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
501
495
  var _useRequest$options4, _useRequest$options5;
502
- var queryBean, page, params, res, _list2, list, _res$data3, _data2, nextSelectRowKeys;
496
+ var queryBean, page, params, res, _list2, list, _res$data3, _data3, nextSelectRowKeys;
503
497
  return _regeneratorRuntime().wrap(function _callee5$(_context5) {
504
498
  while (1) switch (_context5.prev = _context5.next) {
505
499
  case 0:
@@ -523,18 +517,18 @@ var ProModalSelect = function ProModalSelect(props, ref) {
523
517
  } else {
524
518
  list = withPagination ? res === null || res === void 0 ? void 0 : (_res$data3 = res.data) === null || _res$data3 === void 0 ? void 0 : _res$data3.list : res === null || res === void 0 ? void 0 : res.data;
525
519
  }
526
- _data2 = isMultiple ? list : (_list2 = list) === null || _list2 === void 0 ? void 0 : _list2[0];
520
+ _data3 = isMultiple ? list : (_list2 = list) === null || _list2 === void 0 ? void 0 : _list2[0];
527
521
  nextSelectRowKeys = isMultiple ? value : [value];
528
522
  if (labelInValue) {
529
- onChange(_data2);
523
+ onChange(_data3);
530
524
  } else {
531
- onChange(isMultiple ? _data2.map(function (item) {
525
+ onChange(isMultiple ? _data3.map(function (item) {
532
526
  return item[valueKey];
533
- }) : _data2[valueKey]);
527
+ }) : _data3[valueKey]);
534
528
  }
535
529
  // 更新内部展示值
536
530
  setState({
537
- _value: _data2,
531
+ _value: _data3,
538
532
  isInit: false,
539
533
  selectedRows: list,
540
534
  selectedRowKeys: nextSelectRowKeys
@@ -603,8 +597,8 @@ var ProModalSelect = function ProModalSelect(props, ref) {
603
597
  nextState.selectedRows = value;
604
598
  }
605
599
  } else if (value) {
606
- console.log('value', value);
607
600
  nextState.selectedRowKeys = [value];
601
+ nextState.selectedRows = [_defineProperty({}, valueKey, value[valueKey])];
608
602
  }
609
603
  setState(nextState);
610
604
  }
package/es/global.less CHANGED
@@ -9,28 +9,12 @@ pre {
9
9
  scrollbar-face-color: #d2d3d7;
10
10
  scrollbar-highlight-color: #979797;
11
11
  scrollbar-3dlight-color: #979797;
12
-
13
12
  ::-webkit-scrollbar  {
14
13
  width: 16px;
15
- background: transparent;
16
- }
17
-
18
- // 轨道
19
- ::-webkit-scrollbar-track {
20
- background-color: #fff;
21
- border-radius: 10px;
22
- }
23
-
24
- // 悬浮轨道
25
- ::-webkit-scrollbar-thumb:hover {
26
- background-color: #979797;
27
- }
28
-
29
- :hover::-webkit-scrollbar-track {
30
- background: transparent;
31
14
  }
32
15
 
33
- :hover::-webkit-scrollbar-thumb {
16
+ // // 滑块
17
+ ::-webkit-scrollbar-thumb {
34
18
  background-color: #d2d3d7;
35
19
  background-clip: padding-box;
36
20
  border-color: transparent;
@@ -40,11 +24,14 @@ pre {
40
24
  -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0);
41
25
  }
42
26
 
43
- :hover::-webkit-scrollbar-thumb:hover {
44
- background-color: #979797;
27
+ // 轨道
28
+ ::-webkit-scrollbar-track {
29
+ background-color: transparent;
30
+ border-radius: 10px;
45
31
  }
46
32
 
47
- :hover::-webkit-scrollbar-track {
48
- background-color: #fff;
33
+ // 悬浮轨道
34
+ ::-webkit-scrollbar-thumb:hover {
35
+ background-color: #979797;
49
36
  }
50
37
  }
package/lib/ProEditTable/style/index.less CHANGED
@@ -65,7 +65,7 @@
65
65
 
66
66
  .drag-wrapper {
67
67
  display: flex;
68
- .anticon {
68
+ .drag-icon {
69
69
  margin-right: var(--zaui-space-size-md, 16px);
70
70
  margin-left: var(--zaui-space-size-xs, 4px);
71
71
  cursor: pointer;
package/lib/ProForm/components/combination/ProModalSelect/index.js CHANGED
@@ -292,64 +292,58 @@ var ProModalSelect = function ProModalSelect(props, ref) {
292
292
  };
293
293
  var handleFinish = /*#__PURE__*/function () {
294
294
  var _ref7 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2() {
295
- var _nextSelectedRows, _nextSelectedRows2, nextSelectedRows, record, flag, res;
295
+ var _data, flag, res;
296
296
  return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {
297
297
  while (1) switch (_context2.prev = _context2.next) {
298
298
  case 0:
299
299
  _context2.prev = 0;
300
- if (selectedRowKeys === null || selectedRowKeys === void 0 ? void 0 : selectedRowKeys.length) {
300
+ if (selectedRows === null || selectedRows === void 0 ? void 0 : selectedRows.length) {
301
301
  _context2.next = 4;
302
302
  break;
303
303
  }
304
304
  _antd.message.error(_locale.default.ProModalSelect.checkMsg);
305
305
  return _context2.abrupt("return", false);
306
306
  case 4:
307
- nextSelectedRows = selectedRows;
308
- if (!((_nextSelectedRows = nextSelectedRows) === null || _nextSelectedRows === void 0 ? void 0 : _nextSelectedRows[0])) {
309
- nextSelectedRows = data.filter(function (item) {
310
- return selectedRowKeys.includes(item[valueKey]);
311
- });
312
- }
313
- record = isMultiple ? nextSelectedRows : (_nextSelectedRows2 = nextSelectedRows) === null || _nextSelectedRows2 === void 0 ? void 0 : _nextSelectedRows2[0];
307
+ _data = isMultiple ? selectedRows : selectedRows === null || selectedRows === void 0 ? void 0 : selectedRows[0];
314
308
  if (!isMultiple) {
315
309
  // @ts-ignore
316
- record.value = record[valueKey];
310
+ _data.value = _data[valueKey];
317
311
  // @ts-ignore
318
- record.label = record[labelKey];
312
+ _data.label = _data[labelKey];
319
313
  }
320
314
  flag = true;
321
315
  if (!onOk) {
322
- _context2.next = 14;
316
+ _context2.next = 12;
323
317
  break;
324
318
  }
325
- _context2.next = 12;
326
- return onOk(record);
327
- case 12:
319
+ _context2.next = 10;
320
+ return onOk(_data);
321
+ case 10:
328
322
  res = _context2.sent;
329
323
  if (res !== null && res !== undefined) {
330
324
  // @ts-ignore
331
325
  flag = res;
332
326
  }
333
- case 14:
327
+ case 12:
334
328
  if (flag) {
335
- onChange === null || onChange === void 0 ? void 0 : onChange(labelInValue ? record : getNextValues(record), record);
329
+ onChange === null || onChange === void 0 ? void 0 : onChange(labelInValue ? _data : getNextValues(_data), _data);
336
330
  // 更新内部展示值
337
331
  setState({
338
- _value: record,
339
- options: (0, _lodash.isArray)(record) ? record : [record]
332
+ _value: _data,
333
+ options: (0, _lodash.isArray)(_data) ? _data : [_data]
340
334
  });
341
335
  handleClose();
342
336
  }
343
337
  return _context2.abrupt("return", flag);
344
- case 18:
345
- _context2.prev = 18;
338
+ case 16:
339
+ _context2.prev = 16;
346
340
  _context2.t0 = _context2["catch"](0);
347
341
  console.warn('error', _context2.t0);
348
- case 21:
342
+ case 19:
349
343
  case "end":
350
344
  return _context2.stop();
351
345
  }
352
- }, _callee2, null, [[0, 18]]);
346
+ }, _callee2, null, [[0, 16]]);
353
347
  }));
354
348
  return function handleFinish() {
355
349
  return _ref7.apply(this, arguments);
@@ -430,7 +424,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
430
424
  // 初始化回显，当传入initParams时，前端用来回险
431
425
  var getInitValues = /*#__PURE__*/function () {
432
426
  var _ref9 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee4() {
433
- var _contentForm$getField, _useRequest$options2, _useRequest$options3, queryBean, page, params, res, _list, list, _res$data2, _data, nextSelectRowKeys;
427
+ var _contentForm$getField, _useRequest$options2, _useRequest$options3, queryBean, page, params, res, _list, list, _res$data2, _data2, nextSelectRowKeys;
434
428
  return (0, _regeneratorRuntime2.default)().wrap(function _callee4$(_context4) {
435
429
  while (1) switch (_context4.prev = _context4.next) {
436
430
  case 0:
@@ -461,15 +455,15 @@ var ProModalSelect = function ProModalSelect(props, ref) {
461
455
  } else {
462
456
  list = withPagination ? res === null || res === void 0 ? void 0 : (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.list : res === null || res === void 0 ? void 0 : res.data;
463
457
  }
464
- _data = isMultiple ? list : (_list = list) === null || _list === void 0 ? void 0 : _list[0];
465
- if (_data) {
458
+ _data2 = isMultiple ? list : (_list = list) === null || _list === void 0 ? void 0 : _list[0];
459
+ if (_data2) {
466
460
  nextSelectRowKeys = isMultiple ? value : [value];
467
461
  if (labelInValue) {
468
- onChange(_data);
462
+ onChange(_data2);
469
463
  }
470
464
  // 更新内部展示值
471
465
  setState({
472
- _value: _data,
466
+ _value: _data2,
473
467
  isInit: false,
474
468
  selectedRows: list,
475
469
  selectedRowKeys: nextSelectRowKeys
@@ -496,7 +490,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
496
490
  var getDefaultOneValues = /*#__PURE__*/function () {
497
491
  var _ref10 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee5() {
498
492
  var _useRequest$options4, _useRequest$options5;
499
- var queryBean, page, params, res, _list2, list, _res$data3, _data2, nextSelectRowKeys;
493
+ var queryBean, page, params, res, _list2, list, _res$data3, _data3, nextSelectRowKeys;
500
494
  return (0, _regeneratorRuntime2.default)().wrap(function _callee5$(_context5) {
501
495
  while (1) switch (_context5.prev = _context5.next) {
502
496
  case 0:
@@ -520,18 +514,18 @@ var ProModalSelect = function ProModalSelect(props, ref) {
520
514
  } else {
521
515
  list = withPagination ? res === null || res === void 0 ? void 0 : (_res$data3 = res.data) === null || _res$data3 === void 0 ? void 0 : _res$data3.list : res === null || res === void 0 ? void 0 : res.data;
522
516
  }
523
- _data2 = isMultiple ? list : (_list2 = list) === null || _list2 === void 0 ? void 0 : _list2[0];
517
+ _data3 = isMultiple ? list : (_list2 = list) === null || _list2 === void 0 ? void 0 : _list2[0];
524
518
  nextSelectRowKeys = isMultiple ? value : [value];
525
519
  if (labelInValue) {
526
- onChange(_data2);
520
+ onChange(_data3);
527
521
  } else {
528
- onChange(isMultiple ? _data2.map(function (item) {
522
+ onChange(isMultiple ? _data3.map(function (item) {
529
523
  return item[valueKey];
530
- }) : _data2[valueKey]);
524
+ }) : _data3[valueKey]);
531
525
  }
532
526
  // 更新内部展示值
533
527
  setState({
534
- _value: _data2,
528
+ _value: _data3,
535
529
  isInit: false,
536
530
  selectedRows: list,
537
531
  selectedRowKeys: nextSelectRowKeys
@@ -600,8 +594,8 @@ var ProModalSelect = function ProModalSelect(props, ref) {
600
594
  nextState.selectedRows = value;
601
595
  }
602
596
  } else if (value) {
603
- console.log('value', value);
604
597
  nextState.selectedRowKeys = [value];
598
+ nextState.selectedRows = [(0, _defineProperty2.default)({}, valueKey, value[valueKey])];
605
599
  }
606
600
  setState(nextState);
607
601
  }
package/lib/global.less CHANGED
@@ -9,28 +9,12 @@ pre {
9
9
  scrollbar-face-color: #d2d3d7;
10
10
  scrollbar-highlight-color: #979797;
11
11
  scrollbar-3dlight-color: #979797;
12
-
13
12
  ::-webkit-scrollbar  {
14
13
  width: 16px;
15
- background: transparent;
16
- }
17
-
18
- // 轨道
19
- ::-webkit-scrollbar-track {
20
- background-color: #fff;
21
- border-radius: 10px;
22
- }
23
-
24
- // 悬浮轨道
25
- ::-webkit-scrollbar-thumb:hover {
26
- background-color: #979797;
27
- }
28
-
29
- :hover::-webkit-scrollbar-track {
30
- background: transparent;
31
14
  }
32
15
 
33
- :hover::-webkit-scrollbar-thumb {
16
+ // // 滑块
17
+ ::-webkit-scrollbar-thumb {
34
18
  background-color: #d2d3d7;
35
19
  background-clip: padding-box;
36
20
  border-color: transparent;
@@ -40,11 +24,14 @@ pre {
40
24
  -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0);
41
25
  }
42
26
 
43
- :hover::-webkit-scrollbar-thumb:hover {
44
- background-color: #979797;
27
+ // 轨道
28
+ ::-webkit-scrollbar-track {
29
+ background-color: transparent;
30
+ border-radius: 10px;
45
31
  }
46
32
 
47
- :hover::-webkit-scrollbar-track {
48
- background-color: #fff;
33
+ // 悬浮轨道
34
+ ::-webkit-scrollbar-thumb:hover {
35
+ background-color: #979797;
49
36
  }
50
37
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zat-design/sisyphus-react",
3
- "version": "3.4.6-beta.9",
3
+ "version": "3.4.7",
4
4
  "license": "Apache-2.0",
5
5
  "main": "lib/index.js",
6
6
  "module": "es/index.js",