@zat-design/sisyphus-react 3.9.3-beta.6 → 3.9.4-beta.1

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.
@@ -3110,6 +3110,9 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
3110
3110
  .pro-form .pro-form-item-changed .ant-select.ant-select-disabled .ant-select-selector {
3111
3111
  background: var(--zaui-contract-bg, #fffaa1) !important;
3112
3112
  }
3113
+ .pro-form .pro-form-item-changed .ant-picker-clear {
3114
+ background: var(--zaui-contract-bg, #fffaa1);
3115
+ }
3113
3116
  .pro-form .pro-form-item-changed span.ant-input-affix-wrapper,
3114
3117
  .pro-form .pro-form-item-changed .ant-select .ant-select-selector,
3115
3118
  .pro-form .pro-form-item-changed .ant-picker,
@@ -3165,6 +3168,9 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
3165
3168
  .pro-form .pro-form-item-add .ant-select.ant-select-disabled .ant-select-selector {
3166
3169
  background: var(--zaui-contract-bg-add, #d2fff4) !important;
3167
3170
  }
3171
+ .pro-form .pro-form-item-add .ant-picker-clear {
3172
+ background: var(--zaui-contract-bg-add, #d2fff4);
3173
+ }
3168
3174
  .pro-form .pro-form-item-add span.ant-input-affix-wrapper,
3169
3175
  .pro-form .pro-form-item-add .ant-select .ant-select-selector,
3170
3176
  .pro-form .pro-form-item-add .ant-picker,
@@ -4672,6 +4678,38 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
4672
4678
  .pro-edit-table .ant-table.ant-table-scroll-horizontal table .ant-table-tbody .is-new-row.ant-table-row:hover .ant-table-cell-row-hover {
4673
4679
  background-color: var(--zaui-contract-bg-add, #d2fff4) !important;
4674
4680
  }
4681
+ .pro-edit-table * {
4682
+ scrollbar-face-color: #d2d3d7;
4683
+ scrollbar-highlight-color: #979797;
4684
+ scrollbar-3dlight-color: #979797;
4685
+ }
4686
+ .pro-edit-table * ::-webkit-scrollbar-thumb {
4687
+ background-color: #979797;
4688
+ background-clip: padding-box;
4689
+ border-color: transparent;
4690
+ border-style: dashed;
4691
+ border-width: 4px;
4692
+ border-radius: 10px;
4693
+ -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0);
4694
+ }
4695
+ .pro-edit-table * ::-webkit-scrollbar-track {
4696
+ background: transparent;
4697
+ }
4698
+ .pro-edit-table * ::-webkit-scrollbar-thumb {
4699
+ background-color: #d2d3d7;
4700
+ background-clip: padding-box;
4701
+ border-color: transparent;
4702
+ border-style: dashed;
4703
+ border-width: 4px;
4704
+ border-radius: 10px;
4705
+ -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0);
4706
+ }
4707
+ .pro-edit-table * ::-webkit-scrollbar-thumb {
4708
+ background-color: #979797;
4709
+ }
4710
+ .pro-edit-table * ::-webkit-scrollbar-track {
4711
+ background: transparent;
4712
+ }
4675
4713
  .pro-edit-table-footer {
4676
4714
  margin-top: 12px;
4677
4715
  }
@@ -6043,5 +6081,8 @@ input[type='button'] {
6043
6081
  --antd-arrow-background-color: linear-gradient(to right bottom, rgba(255, 255, 255, 0.95), #ffffff);
6044
6082
  }
6045
6083
  .ant-picker.ant-picker-disabled {
6046
- background: var(--zaui-disabled-bg);
6084
+ background: var(--zaui-disabled-bg) !important;
6085
+ }
6086
+ .ant-input-affix-wrapper-disabled {
6087
+ background: var(--zaui-disabled-bg) !important;
6047
6088
  }
package/dist/less.esm.css CHANGED
@@ -3110,6 +3110,9 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
3110
3110
  .pro-form .pro-form-item-changed .ant-select.ant-select-disabled .ant-select-selector {
3111
3111
  background: var(--zaui-contract-bg, #fffaa1) !important;
3112
3112
  }
3113
+ .pro-form .pro-form-item-changed .ant-picker-clear {
3114
+ background: var(--zaui-contract-bg, #fffaa1);
3115
+ }
3113
3116
  .pro-form .pro-form-item-changed span.ant-input-affix-wrapper,
3114
3117
  .pro-form .pro-form-item-changed .ant-select .ant-select-selector,
3115
3118
  .pro-form .pro-form-item-changed .ant-picker,
@@ -3165,6 +3168,9 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
3165
3168
  .pro-form .pro-form-item-add .ant-select.ant-select-disabled .ant-select-selector {
3166
3169
  background: var(--zaui-contract-bg-add, #d2fff4) !important;
3167
3170
  }
3171
+ .pro-form .pro-form-item-add .ant-picker-clear {
3172
+ background: var(--zaui-contract-bg-add, #d2fff4);
3173
+ }
3168
3174
  .pro-form .pro-form-item-add span.ant-input-affix-wrapper,
3169
3175
  .pro-form .pro-form-item-add .ant-select .ant-select-selector,
3170
3176
  .pro-form .pro-form-item-add .ant-picker,
@@ -4672,6 +4678,38 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
4672
4678
  .pro-edit-table .ant-table.ant-table-scroll-horizontal table .ant-table-tbody .is-new-row.ant-table-row:hover .ant-table-cell-row-hover {
4673
4679
  background-color: var(--zaui-contract-bg-add, #d2fff4) !important;
4674
4680
  }
4681
+ .pro-edit-table * {
4682
+ scrollbar-face-color: #d2d3d7;
4683
+ scrollbar-highlight-color: #979797;
4684
+ scrollbar-3dlight-color: #979797;
4685
+ }
4686
+ .pro-edit-table * ::-webkit-scrollbar-thumb {
4687
+ background-color: #979797;
4688
+ background-clip: padding-box;
4689
+ border-color: transparent;
4690
+ border-style: dashed;
4691
+ border-width: 4px;
4692
+ border-radius: 10px;
4693
+ -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0);
4694
+ }
4695
+ .pro-edit-table * ::-webkit-scrollbar-track {
4696
+ background: transparent;
4697
+ }
4698
+ .pro-edit-table * ::-webkit-scrollbar-thumb {
4699
+ background-color: #d2d3d7;
4700
+ background-clip: padding-box;
4701
+ border-color: transparent;
4702
+ border-style: dashed;
4703
+ border-width: 4px;
4704
+ border-radius: 10px;
4705
+ -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0);
4706
+ }
4707
+ .pro-edit-table * ::-webkit-scrollbar-thumb {
4708
+ background-color: #979797;
4709
+ }
4710
+ .pro-edit-table * ::-webkit-scrollbar-track {
4711
+ background: transparent;
4712
+ }
4675
4713
  .pro-edit-table-footer {
4676
4714
  margin-top: 12px;
4677
4715
  }
@@ -6,7 +6,7 @@ import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
6
6
  import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
7
7
  import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
8
8
  import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
9
- var _excluded = ["type", "valueType", "names", "fieldProps", "labelRequired", "editRender", "component", "viewRender", "title", "originTitle", "label", "dataIndex", "formItemProps", "isEditable", "required", "rules", "equalWith", "onDiff", "className", "trim", "confirm"];
9
+ var _excluded = ["type", "valueType", "names", "fieldProps", "labelRequired", "editRender", "component", "viewRender", "title", "originTitle", "label", "dataIndex", "formItemProps", "isEditable", "required", "rules", "equalWith", "onDiff", "className", "trim", "confirm", "dependencies"];
10
10
  import { Fragment as _Fragment, jsx as _jsx } from "react/jsx-runtime";
11
11
  /* eslint-disable prefer-destructuring */
12
12
  /* eslint-disable prefer-const */
@@ -57,6 +57,7 @@ var RenderField = function RenderField(_ref) {
57
57
  className = column.className,
58
58
  trim = column.trim,
59
59
  confirm = column.confirm,
60
+ dependencies = column.dependencies,
60
61
  resetProps = _objectWithoutProperties(column, _excluded);
61
62
  // editRender弃用使用component同ProForm
62
63
  var _editRender = component || editRender;
@@ -312,6 +313,8 @@ var RenderField = function RenderField(_ref) {
312
313
  _key2,
313
314
  _args,
314
315
  rowPath,
316
+ _dependencies$map,
317
+ validateFieldKeys,
315
318
  row,
316
319
  orgRow,
317
320
  _TargetComponent,
@@ -323,77 +326,85 @@ var RenderField = function RenderField(_ref) {
323
326
  _Object$keys,
324
327
  _Object$keys$map,
325
328
  diff,
326
- validateFieldKeys,
329
+ _validateFieldKeys,
327
330
  _args2 = arguments;
328
331
  return _regeneratorRuntime().wrap(function _callee$(_context) {
329
332
  while (1) switch (_context.prev = _context.next) {
330
333
  case 0:
331
- if (!(!onFieldChange && !onChange)) {
332
- _context.next = 2;
333
- break;
334
- }
335
- return _context.abrupt("return", null);
336
- case 2:
337
334
  for (_len2 = _args2.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
338
335
  args[_key2] = _args2[_key2];
339
336
  }
340
337
  _args = [].concat(args);
341
338
  rowPath = [].concat(_toConsumableArray(namePath), [index]);
342
- row = form.getFieldValue(rowPath, true); // if (type === 'InputNumber' && column.name) row[column.name] = args[0];
339
+ if (!(!onFieldChange && !onChange)) {
340
+ _context.next = 6;
341
+ break;
342
+ }
343
+ if (dependencies === null || dependencies === void 0 ? void 0 : dependencies.length) {
344
+ validateFieldKeys = dependencies === null || dependencies === void 0 ? void 0 : (_dependencies$map = dependencies.map) === null || _dependencies$map === void 0 ? void 0 : _dependencies$map.call(dependencies, function (key) {
345
+ return [].concat(_toConsumableArray(rowPath), [key]);
346
+ });
347
+ setTimeout(function () {
348
+ form.validateFields(validateFieldKeys);
349
+ }, 100);
350
+ }
351
+ return _context.abrupt("return", null);
352
+ case 6:
353
+ row = form.getFieldValue(rowPath, true);
343
354
  orgRow = cloneDeep(row);
344
355
  if (!onFieldChange) {
345
- _context.next = 20;
356
+ _context.next = 21;
346
357
  break;
347
358
  }
348
359
  _args = formatArgs(args);
349
360
  _args[1] = row;
350
361
  _context.t0 = (_TargetComponent = TargetComponent) === null || _TargetComponent === void 0 ? void 0 : (_TargetComponent$prop = _TargetComponent.props) === null || _TargetComponent$prop === void 0 ? void 0 : _TargetComponent$prop.onFieldChange;
351
362
  if (!_context.t0) {
352
- _context.next = 14;
363
+ _context.next = 15;
353
364
  break;
354
365
  }
355
- _context.next = 14;
366
+ _context.next = 15;
356
367
  return (_TargetComponent$prop2 = TargetComponent.props).onFieldChange.apply(_TargetComponent$prop2, _toConsumableArray(_args));
357
- case 14:
368
+ case 15:
358
369
  _context.t1 = onFieldChange;
359
370
  if (!_context.t1) {
360
- _context.next = 18;
371
+ _context.next = 19;
361
372
  break;
362
373
  }
363
- _context.next = 18;
374
+ _context.next = 19;
364
375
  return onFieldChange.apply(void 0, _toConsumableArray(_args));
365
- case 18:
366
- _context.next = 29;
376
+ case 19:
377
+ _context.next = 30;
367
378
  break;
368
- case 20:
379
+ case 21:
369
380
  _args = _args.concat([row, index, form]);
370
381
  _context.t2 = (_TargetComponent2 = TargetComponent) === null || _TargetComponent2 === void 0 ? void 0 : (_TargetComponent2$pro = _TargetComponent2.props) === null || _TargetComponent2$pro === void 0 ? void 0 : _TargetComponent2$pro.onChange;
371
382
  if (!_context.t2) {
372
- _context.next = 25;
383
+ _context.next = 26;
373
384
  break;
374
385
  }
375
- _context.next = 25;
386
+ _context.next = 26;
376
387
  return (_TargetComponent$prop3 = TargetComponent.props).onChange.apply(_TargetComponent$prop3, _toConsumableArray(_args));
377
- case 25:
388
+ case 26:
378
389
  _context.t3 = onChange;
379
390
  if (!_context.t3) {
380
- _context.next = 29;
391
+ _context.next = 30;
381
392
  break;
382
393
  }
383
- _context.next = 29;
394
+ _context.next = 30;
384
395
  return onChange.apply(void 0, _toConsumableArray(_args));
385
- case 29:
396
+ case 30:
386
397
  // 判断属性是否变动
387
398
  form.setFieldValue(rowPath, row);
388
399
  if (validateTrigger && validateTrigger.includes('onChange')) {
389
400
  if (!isEqual(orgRow, row)) {
390
401
  diff = difference(row, orgRow) || {};
391
- validateFieldKeys = (_Object$keys = Object.keys(diff)) === null || _Object$keys === void 0 ? void 0 : (_Object$keys$map = _Object$keys.map) === null || _Object$keys$map === void 0 ? void 0 : _Object$keys$map.call(_Object$keys, function (key) {
402
+ _validateFieldKeys = (_Object$keys = Object.keys(diff)) === null || _Object$keys === void 0 ? void 0 : (_Object$keys$map = _Object$keys.map) === null || _Object$keys$map === void 0 ? void 0 : _Object$keys$map.call(_Object$keys, function (key) {
392
403
  return [].concat(_toConsumableArray(rowPath), [key]);
393
- });
394
- if (validateFieldKeys === null || validateFieldKeys === void 0 ? void 0 : validateFieldKeys.length) {
404
+ }).concat(dependencies || []);
405
+ if (_validateFieldKeys === null || _validateFieldKeys === void 0 ? void 0 : _validateFieldKeys.length) {
395
406
  setTimeout(function () {
396
- form.validateFields(validateFieldKeys);
407
+ form.validateFields(_validateFieldKeys);
397
408
  }, 100);
398
409
  }
399
410
  }
@@ -403,7 +414,7 @@ var RenderField = function RenderField(_ref) {
403
414
  d: Date.now()
404
415
  }
405
416
  });
406
- case 32:
417
+ case 33:
407
418
  case "end":
408
419
  return _context.stop();
409
420
  }
@@ -464,7 +475,7 @@ var RenderField = function RenderField(_ref) {
464
475
  diff = difference(row, orgRow) || {};
465
476
  validateFieldKeys = (_Object$keys2 = Object.keys(diff)) === null || _Object$keys2 === void 0 ? void 0 : (_Object$keys2$map = _Object$keys2.map) === null || _Object$keys2$map === void 0 ? void 0 : _Object$keys2$map.call(_Object$keys2, function (key) {
466
477
  return [].concat(_toConsumableArray(rowPath), [key]);
467
- });
478
+ }).concat(dependencies || []);
468
479
  if (validateFieldKeys === null || validateFieldKeys === void 0 ? void 0 : validateFieldKeys.length) {
469
480
  debounceValidate(validateFieldKeys);
470
481
  }
@@ -106,6 +106,7 @@ export interface ProColumnsProps<Values = any, T = any> extends Omit<FormItemPro
106
106
  hiddenNames?: NamePath[] | NamePath[][];
107
107
  rules?: ProRule[] | RulesFn<T>;
108
108
  confirm?: boolean | ModalFuncProps | FunctionArgs<Values, boolean | ModalFuncProps | void>;
109
+ dependencies?: NamePath[];
109
110
  onDiff?: DiffOriginalParams['equalWith'];
110
111
  [key: string]: any;
111
112
  }
@@ -305,6 +305,47 @@
305
305
  background-color: var(--zaui-contract-bg-add, #d2fff4) !important;
306
306
  }
307
307
  }
308
+
309
+ * {
310
+ // ie浏览器
311
+ scrollbar-face-color: #d2d3d7;
312
+ scrollbar-highlight-color: #979797;
313
+ scrollbar-3dlight-color: #979797;
314
+
315
+ // 悬浮轨道
316
+ ::-webkit-scrollbar-thumb {
317
+ background-color: #979797;
318
+ background-clip: padding-box;
319
+ border-color: transparent;
320
+ border-style: dashed;
321
+ border-width: 4px;
322
+ border-radius: 10px;
323
+ -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0);
324
+ }
325
+
326
+ ::-webkit-scrollbar-track {
327
+ background: transparent;
328
+ }
329
+
330
+ ::-webkit-scrollbar-thumb {
331
+ background-color: #d2d3d7;
332
+ background-clip: padding-box;
333
+ border-color: transparent;
334
+ border-style: dashed;
335
+ border-width: 4px;
336
+ border-radius: 10px;
337
+ -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0);
338
+ }
339
+
340
+ ::-webkit-scrollbar-thumb {
341
+ background-color: #979797;
342
+ }
343
+
344
+ ::-webkit-scrollbar-track {
345
+ background: transparent;
346
+ }
347
+ }
348
+
308
349
  }
309
350
 
310
351
  .pro-edit-table-footer{
@@ -341,6 +341,10 @@
341
341
  background: @zaui-contract-bg !important;
342
342
  }
343
343
 
344
+ .ant-picker-clear {
345
+ background: @zaui-contract-bg;
346
+ }
347
+
344
348
  span.@{ant-prefix}-input-affix-wrapper,
345
349
  .@{ant-prefix}-select .@{ant-prefix}-select-selector,
346
350
  .@{ant-prefix}-picker,
@@ -419,6 +423,10 @@
419
423
  background: @zaui-contract-bg-add !important;
420
424
  }
421
425
 
426
+ .ant-picker-clear {
427
+ background: @zaui-contract-bg-add;
428
+ }
429
+
422
430
  span.@{ant-prefix}-input-affix-wrapper,
423
431
  .@{ant-prefix}-select .@{ant-prefix}-select-selector,
424
432
  .@{ant-prefix}-picker,
@@ -753,6 +753,9 @@
753
753
  }
754
754
 
755
755
  .@{ant-prefix}-picker.@{ant-prefix}-picker-disabled {
756
- background: var(--zaui-disabled-bg);
756
+ background: var(--zaui-disabled-bg) !important;
757
757
  }
758
758
 
759
+ .@{ant-prefix}-input-affix-wrapper-disabled {
760
+ background: var(--zaui-disabled-bg) !important;
761
+ }
@@ -30,7 +30,7 @@ var _utils = require("../../../ProForm/utils");
30
30
  var _ConfirmWrapper = _interopRequireDefault(require("../../../ProForm/components/render/ConfirmWrapper"));
31
31
  var _getDefaultProps = require("../../utils/getDefaultProps");
32
32
  var _ListChangedWrapper = _interopRequireDefault(require("./ListChangedWrapper"));
33
- var _excluded = ["type", "valueType", "names", "fieldProps", "labelRequired", "editRender", "component", "viewRender", "title", "originTitle", "label", "dataIndex", "formItemProps", "isEditable", "required", "rules", "equalWith", "onDiff", "className", "trim", "confirm"];
33
+ var _excluded = ["type", "valueType", "names", "fieldProps", "labelRequired", "editRender", "component", "viewRender", "title", "originTitle", "label", "dataIndex", "formItemProps", "isEditable", "required", "rules", "equalWith", "onDiff", "className", "trim", "confirm", "dependencies"];
34
34
  /* eslint-disable prefer-destructuring */
35
35
  /* eslint-disable prefer-const */
36
36
  var RenderField = function RenderField(_ref) {
@@ -64,6 +64,7 @@ var RenderField = function RenderField(_ref) {
64
64
  className = column.className,
65
65
  trim = column.trim,
66
66
  confirm = column.confirm,
67
+ dependencies = column.dependencies,
67
68
  resetProps = (0, _objectWithoutProperties2.default)(column, _excluded);
68
69
  // editRender弃用使用component同ProForm
69
70
  var _editRender = component || editRender;
@@ -319,6 +320,8 @@ var RenderField = function RenderField(_ref) {
319
320
  _key2,
320
321
  _args,
321
322
  rowPath,
323
+ _dependencies$map,
324
+ validateFieldKeys,
322
325
  row,
323
326
  orgRow,
324
327
  _TargetComponent,
@@ -330,77 +333,85 @@ var RenderField = function RenderField(_ref) {
330
333
  _Object$keys,
331
334
  _Object$keys$map,
332
335
  diff,
333
- validateFieldKeys,
336
+ _validateFieldKeys,
334
337
  _args2 = arguments;
335
338
  return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
336
339
  while (1) switch (_context.prev = _context.next) {
337
340
  case 0:
338
- if (!(!onFieldChange && !onChange)) {
339
- _context.next = 2;
340
- break;
341
- }
342
- return _context.abrupt("return", null);
343
- case 2:
344
341
  for (_len2 = _args2.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
345
342
  args[_key2] = _args2[_key2];
346
343
  }
347
344
  _args = [].concat(args);
348
345
  rowPath = [].concat((0, _toConsumableArray2.default)(namePath), [index]);
349
- row = form.getFieldValue(rowPath, true); // if (type === 'InputNumber' && column.name) row[column.name] = args[0];
346
+ if (!(!onFieldChange && !onChange)) {
347
+ _context.next = 6;
348
+ break;
349
+ }
350
+ if (dependencies === null || dependencies === void 0 ? void 0 : dependencies.length) {
351
+ validateFieldKeys = dependencies === null || dependencies === void 0 ? void 0 : (_dependencies$map = dependencies.map) === null || _dependencies$map === void 0 ? void 0 : _dependencies$map.call(dependencies, function (key) {
352
+ return [].concat((0, _toConsumableArray2.default)(rowPath), [key]);
353
+ });
354
+ setTimeout(function () {
355
+ form.validateFields(validateFieldKeys);
356
+ }, 100);
357
+ }
358
+ return _context.abrupt("return", null);
359
+ case 6:
360
+ row = form.getFieldValue(rowPath, true);
350
361
  orgRow = (0, _lodash.cloneDeep)(row);
351
362
  if (!onFieldChange) {
352
- _context.next = 20;
363
+ _context.next = 21;
353
364
  break;
354
365
  }
355
366
  _args = formatArgs(args);
356
367
  _args[1] = row;
357
368
  _context.t0 = (_TargetComponent = TargetComponent) === null || _TargetComponent === void 0 ? void 0 : (_TargetComponent$prop = _TargetComponent.props) === null || _TargetComponent$prop === void 0 ? void 0 : _TargetComponent$prop.onFieldChange;
358
369
  if (!_context.t0) {
359
- _context.next = 14;
370
+ _context.next = 15;
360
371
  break;
361
372
  }
362
- _context.next = 14;
373
+ _context.next = 15;
363
374
  return (_TargetComponent$prop2 = TargetComponent.props).onFieldChange.apply(_TargetComponent$prop2, (0, _toConsumableArray2.default)(_args));
364
- case 14:
375
+ case 15:
365
376
  _context.t1 = onFieldChange;
366
377
  if (!_context.t1) {
367
- _context.next = 18;
378
+ _context.next = 19;
368
379
  break;
369
380
  }
370
- _context.next = 18;
381
+ _context.next = 19;
371
382
  return onFieldChange.apply(void 0, (0, _toConsumableArray2.default)(_args));
372
- case 18:
373
- _context.next = 29;
383
+ case 19:
384
+ _context.next = 30;
374
385
  break;
375
- case 20:
386
+ case 21:
376
387
  _args = _args.concat([row, index, form]);
377
388
  _context.t2 = (_TargetComponent2 = TargetComponent) === null || _TargetComponent2 === void 0 ? void 0 : (_TargetComponent2$pro = _TargetComponent2.props) === null || _TargetComponent2$pro === void 0 ? void 0 : _TargetComponent2$pro.onChange;
378
389
  if (!_context.t2) {
379
- _context.next = 25;
390
+ _context.next = 26;
380
391
  break;
381
392
  }
382
- _context.next = 25;
393
+ _context.next = 26;
383
394
  return (_TargetComponent$prop3 = TargetComponent.props).onChange.apply(_TargetComponent$prop3, (0, _toConsumableArray2.default)(_args));
384
- case 25:
395
+ case 26:
385
396
  _context.t3 = onChange;
386
397
  if (!_context.t3) {
387
- _context.next = 29;
398
+ _context.next = 30;
388
399
  break;
389
400
  }
390
- _context.next = 29;
401
+ _context.next = 30;
391
402
  return onChange.apply(void 0, (0, _toConsumableArray2.default)(_args));
392
- case 29:
403
+ case 30:
393
404
  // 判断属性是否变动
394
405
  form.setFieldValue(rowPath, row);
395
406
  if (validateTrigger && validateTrigger.includes('onChange')) {
396
407
  if (!(0, _lodash.isEqual)(orgRow, row)) {
397
408
  diff = (0, _tools.difference)(row, orgRow) || {};
398
- validateFieldKeys = (_Object$keys = Object.keys(diff)) === null || _Object$keys === void 0 ? void 0 : (_Object$keys$map = _Object$keys.map) === null || _Object$keys$map === void 0 ? void 0 : _Object$keys$map.call(_Object$keys, function (key) {
409
+ _validateFieldKeys = (_Object$keys = Object.keys(diff)) === null || _Object$keys === void 0 ? void 0 : (_Object$keys$map = _Object$keys.map) === null || _Object$keys$map === void 0 ? void 0 : _Object$keys$map.call(_Object$keys, function (key) {
399
410
  return [].concat((0, _toConsumableArray2.default)(rowPath), [key]);
400
- });
401
- if (validateFieldKeys === null || validateFieldKeys === void 0 ? void 0 : validateFieldKeys.length) {
411
+ }).concat(dependencies || []);
412
+ if (_validateFieldKeys === null || _validateFieldKeys === void 0 ? void 0 : _validateFieldKeys.length) {
402
413
  setTimeout(function () {
403
- form.validateFields(validateFieldKeys);
414
+ form.validateFields(_validateFieldKeys);
404
415
  }, 100);
405
416
  }
406
417
  }
@@ -410,7 +421,7 @@ var RenderField = function RenderField(_ref) {
410
421
  d: Date.now()
411
422
  }
412
423
  });
413
- case 32:
424
+ case 33:
414
425
  case "end":
415
426
  return _context.stop();
416
427
  }
@@ -471,7 +482,7 @@ var RenderField = function RenderField(_ref) {
471
482
  diff = (0, _tools.difference)(row, orgRow) || {};
472
483
  validateFieldKeys = (_Object$keys2 = Object.keys(diff)) === null || _Object$keys2 === void 0 ? void 0 : (_Object$keys2$map = _Object$keys2.map) === null || _Object$keys2$map === void 0 ? void 0 : _Object$keys2$map.call(_Object$keys2, function (key) {
473
484
  return [].concat((0, _toConsumableArray2.default)(rowPath), [key]);
474
- });
485
+ }).concat(dependencies || []);
475
486
  if (validateFieldKeys === null || validateFieldKeys === void 0 ? void 0 : validateFieldKeys.length) {
476
487
  debounceValidate(validateFieldKeys);
477
488
  }
@@ -106,6 +106,7 @@ export interface ProColumnsProps<Values = any, T = any> extends Omit<FormItemPro
106
106
  hiddenNames?: NamePath[] | NamePath[][];
107
107
  rules?: ProRule[] | RulesFn<T>;
108
108
  confirm?: boolean | ModalFuncProps | FunctionArgs<Values, boolean | ModalFuncProps | void>;
109
+ dependencies?: NamePath[];
109
110
  onDiff?: DiffOriginalParams['equalWith'];
110
111
  [key: string]: any;
111
112
  }
@@ -305,6 +305,47 @@
305
305
  background-color: var(--zaui-contract-bg-add, #d2fff4) !important;
306
306
  }
307
307
  }
308
+
309
+ * {
310
+ // ie浏览器
311
+ scrollbar-face-color: #d2d3d7;
312
+ scrollbar-highlight-color: #979797;
313
+ scrollbar-3dlight-color: #979797;
314
+
315
+ // 悬浮轨道
316
+ ::-webkit-scrollbar-thumb {
317
+ background-color: #979797;
318
+ background-clip: padding-box;
319
+ border-color: transparent;
320
+ border-style: dashed;
321
+ border-width: 4px;
322
+ border-radius: 10px;
323
+ -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0);
324
+ }
325
+
326
+ ::-webkit-scrollbar-track {
327
+ background: transparent;
328
+ }
329
+
330
+ ::-webkit-scrollbar-thumb {
331
+ background-color: #d2d3d7;
332
+ background-clip: padding-box;
333
+ border-color: transparent;
334
+ border-style: dashed;
335
+ border-width: 4px;
336
+ border-radius: 10px;
337
+ -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0);
338
+ }
339
+
340
+ ::-webkit-scrollbar-thumb {
341
+ background-color: #979797;
342
+ }
343
+
344
+ ::-webkit-scrollbar-track {
345
+ background: transparent;
346
+ }
347
+ }
348
+
308
349
  }
309
350
 
310
351
  .pro-edit-table-footer{
@@ -341,6 +341,10 @@
341
341
  background: @zaui-contract-bg !important;
342
342
  }
343
343
 
344
+ .ant-picker-clear {
345
+ background: @zaui-contract-bg;
346
+ }
347
+
344
348
  span.@{ant-prefix}-input-affix-wrapper,
345
349
  .@{ant-prefix}-select .@{ant-prefix}-select-selector,
346
350
  .@{ant-prefix}-picker,
@@ -419,6 +423,10 @@
419
423
  background: @zaui-contract-bg-add !important;
420
424
  }
421
425
 
426
+ .ant-picker-clear {
427
+ background: @zaui-contract-bg-add;
428
+ }
429
+
422
430
  span.@{ant-prefix}-input-affix-wrapper,
423
431
  .@{ant-prefix}-select .@{ant-prefix}-select-selector,
424
432
  .@{ant-prefix}-picker,
@@ -753,6 +753,9 @@
753
753
  }
754
754
 
755
755
  .@{ant-prefix}-picker.@{ant-prefix}-picker-disabled {
756
- background: var(--zaui-disabled-bg);
756
+ background: var(--zaui-disabled-bg) !important;
757
757
  }
758
758
 
759
+ .@{ant-prefix}-input-affix-wrapper-disabled {
760
+ background: var(--zaui-disabled-bg) !important;
761
+ }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zat-design/sisyphus-react",
3
- "version": "3.9.3-beta.6",
3
+ "version": "3.9.4-beta.1",
4
4
  "license": "Apache-2.0",
5
5
  "main": "lib/index.js",
6
6
  "module": "es/index.js",