@sheinx/base 3.6.0-beta.2 → 3.6.0-beta.3

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 (75) hide show
  1. package/cjs/cascader/cascader.d.ts.map +1 -1
  2. package/cjs/cascader/cascader.js +6 -5
  3. package/cjs/cascader/filter-node.js +4 -4
  4. package/cjs/cascader/filter-node.type.d.ts +1 -1
  5. package/cjs/cascader/filter-node.type.d.ts.map +1 -1
  6. package/cjs/checkbox/checkbox.d.ts.map +1 -1
  7. package/cjs/checkbox/checkbox.js +7 -1
  8. package/cjs/checkbox/checkbox.type.d.ts +5 -0
  9. package/cjs/checkbox/checkbox.type.d.ts.map +1 -1
  10. package/cjs/date-picker/date-picker.d.ts.map +1 -1
  11. package/cjs/date-picker/date-picker.js +12 -0
  12. package/cjs/form/form-fieldset.js +18 -18
  13. package/cjs/form/form-fieldset.type.d.ts +5 -1
  14. package/cjs/form/form-fieldset.type.d.ts.map +1 -1
  15. package/cjs/form/form-footer-context.d.ts +2 -1
  16. package/cjs/form/form-footer-context.d.ts.map +1 -1
  17. package/cjs/form/form-footer-context.js +7 -0
  18. package/cjs/form/form.d.ts.map +1 -1
  19. package/cjs/form/form.js +11 -1
  20. package/cjs/radio/radio-group.d.ts.map +1 -1
  21. package/cjs/radio/radio-group.js +1 -0
  22. package/cjs/select/result.d.ts.map +1 -1
  23. package/cjs/select/result.js +7 -0
  24. package/cjs/select/select.d.ts.map +1 -1
  25. package/cjs/select/select.js +3 -2
  26. package/cjs/table/table.d.ts.map +1 -1
  27. package/cjs/table/table.js +3 -1
  28. package/cjs/table/table.type.d.ts +6 -0
  29. package/cjs/table/table.type.d.ts.map +1 -1
  30. package/cjs/tabs/tabs-header.d.ts.map +1 -1
  31. package/cjs/tabs/tabs-header.js +1 -2
  32. package/cjs/tabs/tabs-panel.d.ts.map +1 -1
  33. package/cjs/tabs/tabs-panel.js +11 -4
  34. package/cjs/tabs/tabs-panel.type.d.ts +6 -0
  35. package/cjs/tabs/tabs-panel.type.d.ts.map +1 -1
  36. package/cjs/tabs/tabs.d.ts.map +1 -1
  37. package/cjs/tabs/tabs.js +2 -1
  38. package/esm/cascader/cascader.d.ts.map +1 -1
  39. package/esm/cascader/cascader.js +6 -5
  40. package/esm/cascader/filter-node.js +4 -4
  41. package/esm/cascader/filter-node.type.d.ts +1 -1
  42. package/esm/cascader/filter-node.type.d.ts.map +1 -1
  43. package/esm/checkbox/checkbox.d.ts.map +1 -1
  44. package/esm/checkbox/checkbox.js +7 -1
  45. package/esm/checkbox/checkbox.type.d.ts +5 -0
  46. package/esm/checkbox/checkbox.type.d.ts.map +1 -1
  47. package/esm/date-picker/date-picker.d.ts.map +1 -1
  48. package/esm/date-picker/date-picker.js +12 -0
  49. package/esm/form/form-fieldset.js +18 -18
  50. package/esm/form/form-fieldset.type.d.ts +5 -1
  51. package/esm/form/form-fieldset.type.d.ts.map +1 -1
  52. package/esm/form/form-footer-context.d.ts +2 -1
  53. package/esm/form/form-footer-context.d.ts.map +1 -1
  54. package/esm/form/form-footer-context.js +7 -0
  55. package/esm/form/form.d.ts.map +1 -1
  56. package/esm/form/form.js +11 -1
  57. package/esm/radio/radio-group.d.ts.map +1 -1
  58. package/esm/radio/radio-group.js +3 -2
  59. package/esm/select/result.d.ts.map +1 -1
  60. package/esm/select/result.js +7 -0
  61. package/esm/select/select.d.ts.map +1 -1
  62. package/esm/select/select.js +3 -2
  63. package/esm/table/table.d.ts.map +1 -1
  64. package/esm/table/table.js +3 -1
  65. package/esm/table/table.type.d.ts +6 -0
  66. package/esm/table/table.type.d.ts.map +1 -1
  67. package/esm/tabs/tabs-header.d.ts.map +1 -1
  68. package/esm/tabs/tabs-header.js +1 -2
  69. package/esm/tabs/tabs-panel.d.ts.map +1 -1
  70. package/esm/tabs/tabs-panel.js +11 -4
  71. package/esm/tabs/tabs-panel.type.d.ts +6 -0
  72. package/esm/tabs/tabs-panel.type.d.ts.map +1 -1
  73. package/esm/tabs/tabs.d.ts.map +1 -1
  74. package/esm/tabs/tabs.js +2 -1
  75. package/package.json +2 -2
@@ -1 +1 @@
1
- {"version":3,"file":"cascader.d.ts","sourceRoot":"","sources":["cascader.tsx"],"names":[],"mappings":";AAEA,OAAO,EAML,YAAY,EAIb,MAAM,eAAe,CAAC;AAMvB,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAahD,QAAA,MAAM,QAAQ,iGAmtBb,CAAC;AACF,eAAe,QAAQ,CAAC"}
1
+ {"version":3,"file":"cascader.d.ts","sourceRoot":"","sources":["cascader.tsx"],"names":[],"mappings":";AAEA,OAAO,EAML,YAAY,EAIb,MAAM,eAAe,CAAC;AAMvB,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAahD,QAAA,MAAM,QAAQ,iGAytBb,CAAC;AACF,eAAe,QAAQ,CAAC"}
@@ -379,12 +379,13 @@ var Cascader = function Cascader(props0) {
379
379
  onClick: handleResultClick,
380
380
  children: defaultIcon
381
381
  });
382
+ var close = /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
383
+ className: styles.clearIcon,
384
+ onClick: handleClear,
385
+ children: _icons.default.cascader.Close
386
+ });
382
387
  return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
383
- children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
384
- className: styles.clearIcon,
385
- onClick: handleClear,
386
- children: _icons.default.cascader.Close
387
- }), !open && !isEmpty && arrow]
388
+ children: [close, !open && !isEmpty && !focused && arrow]
388
389
  });
389
390
  };
390
391
  var renderIcon = function renderIcon() {
@@ -19,7 +19,7 @@ var FilterNode = function FilterNode(props) {
19
19
  onChange = props.onChange,
20
20
  onPathChange = props.onPathChange;
21
21
  var styles = jssStyle === null || jssStyle === void 0 || (_jssStyle$cascader = jssStyle.cascader) === null || _jssStyle$cascader === void 0 ? void 0 : _jssStyle$cascader.call(jssStyle);
22
- var handleSelectItem = function handleSelectItem(index, e) {
22
+ var handleSelectItem = function handleSelectItem(index, d, e) {
23
23
  var isFinal = data && index === data.length - 1;
24
24
  if (shouldFinal && !isFinal) return;
25
25
  if (e) e.stopPropagation();
@@ -29,13 +29,13 @@ var FilterNode = function FilterNode(props) {
29
29
  var keys = data.slice(0, index + 1).map(function (i) {
30
30
  return datum.getKey(i);
31
31
  });
32
- if (onChange) onChange(keys);
32
+ if (onChange) onChange(keys, d);
33
33
  onPathChange(datum.getKey(item), item, keys.slice(0, keys.length - 1), true);
34
34
  setInputText('');
35
35
  setFilterText('');
36
36
  };
37
37
  var handleSelect = function handleSelect() {
38
- handleSelectItem(data.length - 1);
38
+ handleSelectItem(data.length - 1, data === null || data === void 0 ? void 0 : data[data.length - 1]);
39
39
  };
40
40
  return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
41
41
  className: (0, _classnames.default)(styles.option, styles.filterOption),
@@ -44,7 +44,7 @@ var FilterNode = function FilterNode(props) {
44
44
  className: (0, _classnames.default)(styles.optionInner),
45
45
  children: data.map(function (item, index) {
46
46
  var handleClick = function handleClick(e) {
47
- handleSelectItem(index, e);
47
+ handleSelectItem(index, item, e);
48
48
  };
49
49
  var isDisabled = datum.isDisabled(datum.getKey(item));
50
50
  var content = /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
@@ -10,7 +10,7 @@ export interface FilterNodeProps<DataItem, Value extends KeygenResult[]> {
10
10
  renderItem: (data: DataItem, active?: boolean, id?: Value[0] | undefined) => React.ReactNode;
11
11
  setInputText: (text: string) => void;
12
12
  setFilterText: (text: string) => void;
13
- onChange: (item: Value) => void;
13
+ onChange: (item: Value, selected?: DataItem) => void;
14
14
  onPathChange: (id: KeygenResult, item: DataItem | null, nextPath: Value, fromClick?: boolean) => void;
15
15
  }
16
16
  //# sourceMappingURL=filter-node.type.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"filter-node.type.d.ts","sourceRoot":"","sources":["filter-node.type.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C,MAAM,WAAW,eAAe,CAAC,QAAQ,EAAE,KAAK,SAAS,YAAY,EAAE;IACrE,QAAQ,CAAC,EAAE,YAAY,CAAC;IACxB,IAAI,EAAE,QAAQ,EAAE,CAAC;IACjB,KAAK,EAAE,SAAS,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,CAAC;IACpC,WAAW,EAAE,OAAO,CAAC;IACrB,UAAU,EAAE,CAAC,IAAI,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,OAAO,EAAE,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,GAAG,SAAS,KAAK,KAAK,CAAC,SAAS,CAAC;IAC7F,YAAY,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IACrC,aAAa,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IACtC,QAAQ,EAAE,CAAC,IAAI,EAAE,KAAK,KAAK,IAAI,CAAC;IAChC,YAAY,EAAE,CACZ,EAAE,EAAE,YAAY,EAChB,IAAI,EAAE,QAAQ,GAAG,IAAI,EACrB,QAAQ,EAAE,KAAK,EACf,SAAS,CAAC,EAAE,OAAO,KAChB,IAAI,CAAC;CACX"}
1
+ {"version":3,"file":"filter-node.type.d.ts","sourceRoot":"","sources":["filter-node.type.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C,MAAM,WAAW,eAAe,CAAC,QAAQ,EAAE,KAAK,SAAS,YAAY,EAAE;IACrE,QAAQ,CAAC,EAAE,YAAY,CAAC;IACxB,IAAI,EAAE,QAAQ,EAAE,CAAC;IACjB,KAAK,EAAE,SAAS,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,CAAC;IACpC,WAAW,EAAE,OAAO,CAAC;IACrB,UAAU,EAAE,CAAC,IAAI,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,OAAO,EAAE,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,GAAG,SAAS,KAAK,KAAK,CAAC,SAAS,CAAC;IAC7F,YAAY,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IACrC,aAAa,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IACtC,QAAQ,EAAE,CAAC,IAAI,EAAE,KAAK,EAAE,QAAQ,CAAC,EAAE,QAAQ,KAAK,IAAI,CAAC;IACrD,YAAY,EAAE,CACZ,EAAE,EAAE,YAAY,EAChB,IAAI,EAAE,QAAQ,GAAG,IAAI,EACrB,QAAQ,EAAE,KAAK,EACf,SAAS,CAAC,EAAE,OAAO,KAChB,IAAI,CAAC;CACX"}
@@ -1 +1 @@
1
- {"version":3,"file":"checkbox.d.ts","sourceRoot":"","sources":["checkbox.tsx"],"names":[],"mappings":";AAIA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAsGhD,QAAA,MAAM,mBAAmB,6CAIxB,CAAC;AAEF,eAAe,mBAAmB,CAAC"}
1
+ {"version":3,"file":"checkbox.d.ts","sourceRoot":"","sources":["checkbox.tsx"],"names":[],"mappings":";AAIA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AA0GhD,QAAA,MAAM,mBAAmB,6CAaxB,CAAC;AAEF,eAAe,mBAAmB,CAAC"}
@@ -72,6 +72,9 @@ var Checkbox = function Checkbox(props) {
72
72
  if ('value' in props && props.checked === undefined) {
73
73
  onInputableCheckboxChange(checked);
74
74
  }
75
+ if (props.onRawChange) {
76
+ props.onRawChange(checked ? htmlValue : undefined, checked, htmlValue);
77
+ }
75
78
  onChange === null || onChange === void 0 || onChange(checked ? htmlValue : undefined, checked, htmlValue);
76
79
  });
77
80
  var getChecked = function getChecked() {
@@ -112,7 +115,10 @@ var Checkbox = function Checkbox(props) {
112
115
  var CheckboxWithContext = function CheckboxWithContext(props) {
113
116
  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_groupContext.default.Consumer, {
114
117
  children: function children(value) {
115
- return /*#__PURE__*/(0, _jsxRuntime.jsx)(Checkbox, _objectSpread(_objectSpread({}, props), value));
118
+ return /*#__PURE__*/(0, _jsxRuntime.jsx)(Checkbox, _objectSpread(_objectSpread(_objectSpread({}, props), value), {}, {
119
+ onRawChange: props.onChange,
120
+ checked: 'checked' in props ? props.checked : value.checked
121
+ }));
116
122
  }
117
123
  });
118
124
  };
@@ -63,6 +63,11 @@ export interface CheckboxProps<T> extends CommonChangeType<T>, Omit<SimpleCheckb
63
63
  * @cn 值改变回调函数
64
64
  */
65
65
  onChange?: (value: T | undefined, checked: boolean, raw: T) => void;
66
+ /**
67
+ * @en Value chane callback
68
+ * @cn 值改变回调函数
69
+ */
70
+ onRawChange?: (value: T | undefined, checked: boolean, raw: T) => void;
66
71
  /**
67
72
  * @en If not set, use (value === htmlValue)
68
73
  * @cn checked 传入时为受控组件
@@ -1 +1 @@
1
- {"version":3,"file":"checkbox.type.d.ts","sourceRoot":"","sources":["checkbox.type.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAC9D,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,MAAM,WAAW,eAAe;IAC9B,SAAS,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB;;OAEG;IACH,eAAe,EAAE,MAAM,CAAC;IACxB;;OAEG;IACH,cAAc,EAAE,MAAM,CAAC;IACvB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,gBAAgB,EAAE,MAAM,CAAC;IACzB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,EAAE,MAAM,eAAe,CAAC;IACjC,KAAK,CAAC,EAAE,MAAM,YAAY,CAAC;CAC5B;AAED,MAAM,WAAW,mBACf,SAAQ,IAAI,CAAC,cAAc,EAAE,SAAS,GAAG,gBAAgB,CAAC,EACxD,IAAI,CAAC,UAAU,EAAE,OAAO,GAAG,WAAW,GAAG,MAAM,CAAC;IAClD,QAAQ,CAAC,EAAE,aAAa,CAAC;IACzB;;;OAGG;IACH,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAC3B,OAAO,CAAC,EAAE,OAAO,GAAG,eAAe,CAAC;IACpC;;;OAGG;IACH,cAAc,CAAC,EAAE,OAAO,GAAG,eAAe,CAAC;IAC3C,YAAY,CAAC,EAAE,CAAC,OAAO,CAAC,EAAE,OAAO,KAAK,KAAK,CAAC,SAAS,CAAC;IACtD;;OAEG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,aAAa,CAAC,CAAC,CAC9B,SAAQ,gBAAgB,CAAC,CAAC,CAAC,EACzB,IAAI,CAAC,mBAAmB,EAAE,UAAU,GAAG,SAAS,GAAG,cAAc,GAAG,OAAO,CAAC;IAC9E;;;;;OAKG;IACH,SAAS,CAAC,EAAE,CAAC,CAAC;IACd;;;OAGG;IACH,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC,GAAG,SAAS,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,KAAK,IAAI,CAAC;IACpE;;;OAGG;IACH,OAAO,CAAC,EAAE,OAAO,GAAG,eAAe,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,OAAO,GAAG,eAAe,CAAC,CAAC;IAC5E;;;OAGG;IACH,OAAO,CAAC,EAAE,CAAC,CAAC,EAAE,KAAK,CAAC,UAAU,CAAC,gBAAgB,CAAC,KAAK,IAAI,CAAC;IAC1D;;;;OAIG;IACH,KAAK,CAAC,EAAE,CAAC,CAAC;IACV;;;;OAIG;IACH,YAAY,CAAC,EAAE,CAAC,CAAC;IACjB;;OAEG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB"}
1
+ {"version":3,"file":"checkbox.type.d.ts","sourceRoot":"","sources":["checkbox.type.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAC9D,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,MAAM,WAAW,eAAe;IAC9B,SAAS,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB;;OAEG;IACH,eAAe,EAAE,MAAM,CAAC;IACxB;;OAEG;IACH,cAAc,EAAE,MAAM,CAAC;IACvB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,gBAAgB,EAAE,MAAM,CAAC;IACzB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,EAAE,MAAM,eAAe,CAAC;IACjC,KAAK,CAAC,EAAE,MAAM,YAAY,CAAC;CAC5B;AAED,MAAM,WAAW,mBACf,SAAQ,IAAI,CAAC,cAAc,EAAE,SAAS,GAAG,gBAAgB,CAAC,EACxD,IAAI,CAAC,UAAU,EAAE,OAAO,GAAG,WAAW,GAAG,MAAM,CAAC;IAClD,QAAQ,CAAC,EAAE,aAAa,CAAC;IACzB;;;OAGG;IACH,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAC3B,OAAO,CAAC,EAAE,OAAO,GAAG,eAAe,CAAC;IACpC;;;OAGG;IACH,cAAc,CAAC,EAAE,OAAO,GAAG,eAAe,CAAC;IAC3C,YAAY,CAAC,EAAE,CAAC,OAAO,CAAC,EAAE,OAAO,KAAK,KAAK,CAAC,SAAS,CAAC;IACtD;;OAEG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,aAAa,CAAC,CAAC,CAC9B,SAAQ,gBAAgB,CAAC,CAAC,CAAC,EACzB,IAAI,CAAC,mBAAmB,EAAE,UAAU,GAAG,SAAS,GAAG,cAAc,GAAG,OAAO,CAAC;IAC9E;;;;;OAKG;IACH,SAAS,CAAC,EAAE,CAAC,CAAC;IACd;;;OAGG;IACH,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC,GAAG,SAAS,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,KAAK,IAAI,CAAC;IACpE;;;OAGG;IACH,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC,GAAG,SAAS,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,KAAK,IAAI,CAAC;IACvE;;;OAGG;IACH,OAAO,CAAC,EAAE,OAAO,GAAG,eAAe,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,OAAO,GAAG,eAAe,CAAC,CAAC;IAC5E;;;OAGG;IACH,OAAO,CAAC,EAAE,CAAC,CAAC,EAAE,KAAK,CAAC,UAAU,CAAC,gBAAgB,CAAC,KAAK,IAAI,CAAC;IAC1D;;;;OAIG;IACH,KAAK,CAAC,EAAE,CAAC,CAAC;IACV;;;;OAIG;IACH,YAAY,CAAC,EAAE,CAAC,CAAC;IACjB;;OAEG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB"}
@@ -1 +1 @@
1
- {"version":3,"file":"date-picker.d.ts","sourceRoot":"","sources":["date-picker.tsx"],"names":[],"mappings":";AAIA,OAAO,EAAE,eAAe,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAmB1E,QAAA,MAAM,UAAU,oFAmUf,CAAC;AAEF,eAAe,UAAU,CAAC"}
1
+ {"version":3,"file":"date-picker.d.ts","sourceRoot":"","sources":["date-picker.tsx"],"names":[],"mappings":";AAIA,OAAO,EAAE,eAAe,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAmB1E,QAAA,MAAM,UAAU,oFA8Uf,CAAC;AAEF,eAAe,UAAU,CAAC"}
@@ -146,11 +146,23 @@ var DatePicker = function DatePicker(props0) {
146
146
  }
147
147
  } else {
148
148
  func.finishEdit();
149
+
150
+ // 如果是通过 props.open 控制的,那么需要在关闭时,将组件再次进入编辑状态
151
+ if (props.open === true) {
152
+ func.startEdit();
153
+ }
149
154
  }
150
155
  setIsCloseFromConfirm(false);
151
156
  }
152
157
  (_props$onCollapse = props.onCollapse) === null || _props$onCollapse === void 0 || _props$onCollapse.call(props, isOpen);
153
158
  });
159
+
160
+ // 如果一开始就打开了板子,那么需要初始化让组件进入编辑状态
161
+ (0, _react.useEffect)(function () {
162
+ if (props.open) {
163
+ func.startEdit();
164
+ }
165
+ }, []);
154
166
  var _usePopup = (0, _hooks.usePopup)({
155
167
  open: props.open,
156
168
  onCollapse: onCollapse,
@@ -18,13 +18,13 @@ var produce = _hooks.util.produce;
18
18
  var FormFieldSet = function FormFieldSet(props) {
19
19
  var children = props.children,
20
20
  empty = props.empty;
21
- var _React$useRef = _react.default.useRef({
22
- ids: []
23
- }),
24
- context = _React$useRef.current;
21
+ // const { current: context } = React.useRef<{ ids: string[] }>({ ids: [] });
22
+
25
23
  var formFunc = (0, _hooks.useFormFunc)();
26
24
  var validateFieldSet = function validateFieldSet() {
27
- formFunc === null || formFunc === void 0 || formFunc.validateFields(props.name).catch(function (e) {
25
+ formFunc === null || formFunc === void 0 || formFunc.validateFields(props.name, {
26
+ ignoreChildren: true
27
+ }).catch(function (e) {
28
28
  return e;
29
29
  });
30
30
  };
@@ -61,19 +61,17 @@ var FormFieldSet = function FormFieldSet(props) {
61
61
  draft.push(val);
62
62
  });
63
63
  _onChange(newValue);
64
- context.ids.push(_hooks.util.generateUUID());
64
+ // context.ids.push(util.generateUUID());
65
65
  formFunc === null || formFunc === void 0 || formFunc.insertError(name, 0);
66
66
  })
67
67
  }, 'empty');
68
68
  }
69
69
  var errorList = (Array.isArray(error) ? error : [error]).filter(Boolean);
70
- if (context.ids.length !== valueArr.length) {
71
- context.ids = valueArr.map(function () {
72
- return _hooks.util.generateUUID();
73
- });
74
- }
70
+ // if (context.ids.length !== valueArr.length) {
71
+ // context.ids = valueArr.map(() => util.generateUUID());
72
+ // }
73
+
75
74
  return valueArr.map(function (v, i) {
76
- var _context$ids$i;
77
75
  return /*#__PURE__*/(0, _jsxRuntime.jsx)(Provider, {
78
76
  value: {
79
77
  path: "".concat(ProviderValue.path, "[").concat(i, "]"),
@@ -84,13 +82,15 @@ var FormFieldSet = function FormFieldSet(props) {
84
82
  value: v,
85
83
  index: i,
86
84
  error: errorList,
87
- onChange: function onChange(val) {
85
+ onChange: function onChange(val, options) {
88
86
  var oldValue = formFunc === null || formFunc === void 0 ? void 0 : formFunc.getValue(name);
89
87
  var newValue = produce(oldValue, function (draft) {
90
88
  draft[i] = val;
91
89
  });
92
90
  _onChange(newValue);
93
- formFunc === null || formFunc === void 0 || formFunc.validateFieldset("".concat(name, "[").concat(i, "]"));
91
+ formFunc === null || formFunc === void 0 || formFunc.validateFieldset("".concat(name, "[").concat(i, "]"), {
92
+ ignoreChildren: (options === null || options === void 0 ? void 0 : options.validate) === false
93
+ });
94
94
  },
95
95
  onInsert: function onInsert(val) {
96
96
  var oldValue = formFunc === null || formFunc === void 0 ? void 0 : formFunc.getValue(name);
@@ -98,7 +98,7 @@ var FormFieldSet = function FormFieldSet(props) {
98
98
  draft.splice(i, 0, val);
99
99
  });
100
100
  _onChange(newValue);
101
- context.ids.splice(i, 0, _hooks.util.generateUUID());
101
+ // context.ids.splice(i, 0, util.generateUUID());
102
102
  formFunc === null || formFunc === void 0 || formFunc.insertError(name, i);
103
103
  },
104
104
  onAppend: function onAppend(val) {
@@ -107,7 +107,7 @@ var FormFieldSet = function FormFieldSet(props) {
107
107
  draft.splice(i + 1, 0, val);
108
108
  });
109
109
  _onChange(newValue);
110
- context.ids.splice(i + 1, 0, _hooks.util.generateUUID());
110
+ // context.ids.splice(i + 1, 0, util.generateUUID());
111
111
  formFunc === null || formFunc === void 0 || formFunc.insertError(name, i + 1);
112
112
  },
113
113
  onRemove: function onRemove() {
@@ -116,11 +116,11 @@ var FormFieldSet = function FormFieldSet(props) {
116
116
  draft.splice(i, 1);
117
117
  });
118
118
  _onChange(newValue);
119
- context.ids.splice(i, 1);
119
+ // context.ids.splice(i, 1);
120
120
  formFunc === null || formFunc === void 0 || formFunc.spliceError(name, i);
121
121
  }
122
122
  })
123
- }, (_context$ids$i = context.ids[i]) !== null && _context$ids$i !== void 0 ? _context$ids$i : i);
123
+ }, i);
124
124
  });
125
125
  };
126
126
  var _default = exports.default = FormFieldSet;
@@ -1,10 +1,13 @@
1
1
  import { BaseFormFieldSetProps } from '@sheinx/hooks';
2
2
  import React from 'react';
3
+ interface FormFieldSetChildrenOnChangeOptions {
4
+ validate?: boolean;
5
+ }
3
6
  export interface FormFieldSetChildrenFunc<ValueItem = any> {
4
7
  (params: {
5
8
  list: ValueItem[];
6
9
  value: ValueItem;
7
- onChange: (value: ValueItem) => void;
10
+ onChange: (value: ValueItem, options?: FormFieldSetChildrenOnChangeOptions) => void;
8
11
  onRemove: () => void;
9
12
  index: number;
10
13
  onInsert: (value: ValueItem) => void;
@@ -48,4 +51,5 @@ export interface FormFieldSetProps<T> extends Partial<BaseFormFieldSetProps<T>>
48
51
  */
49
52
  empty?: (insert: (val: any) => void) => React.ReactNode;
50
53
  }
54
+ export {};
51
55
  //# sourceMappingURL=form-fieldset.type.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"form-fieldset.type.d.ts","sourceRoot":"","sources":["form-fieldset.type.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,MAAM,WAAW,wBAAwB,CAAC,SAAS,GAAG,GAAG;IACvD,CAAC,MAAM,EAAE;QACP,IAAI,EAAE,SAAS,EAAE,CAAC;QAClB,KAAK,EAAE,SAAS,CAAC;QACjB,QAAQ,EAAE,CAAC,KAAK,EAAE,SAAS,KAAK,IAAI,CAAC;QACrC,QAAQ,EAAE,MAAM,IAAI,CAAC;QACrB,KAAK,EAAE,MAAM,CAAC;QACd,QAAQ,EAAE,CAAC,KAAK,EAAE,SAAS,KAAK,IAAI,CAAC;QACrC,QAAQ,EAAE,CAAC,KAAK,EAAE,SAAS,KAAK,IAAI,CAAC;QACrC,KAAK,EAAE,KAAK,EAAE,CAAC;KAChB,GAAG,KAAK,CAAC,SAAS,CAAC;CACrB;AAED,MAAM,WAAW,iBAAiB,CAAC,CAAC,CAAE,SAAQ,OAAO,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;IAC7E;;;OAGG;IACH,IAAI,EAAE,MAAM,CAAC;IACb;;;;;;;;;;;;;;;;;;;;;;OAsBG;IACH,QAAQ,EACJ,KAAK,CAAC,SAAS,GACf,wBAAwB,CAAC,CAAC,SAAS,CAAC,MAAM,SAAS,CAAC,EAAE,GAAG,SAAS,GAAG,KAAK,CAAC,CAAC;IAChF;;;OAGG;IACH,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,IAAI,KAAK,KAAK,CAAC,SAAS,CAAC;CACzD"}
1
+ {"version":3,"file":"form-fieldset.type.d.ts","sourceRoot":"","sources":["form-fieldset.type.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,UAAU,mCAAmC;IAE3C,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AACD,MAAM,WAAW,wBAAwB,CAAC,SAAS,GAAG,GAAG;IACvD,CAAC,MAAM,EAAE;QACP,IAAI,EAAE,SAAS,EAAE,CAAC;QAClB,KAAK,EAAE,SAAS,CAAC;QACjB,QAAQ,EAAE,CAAC,KAAK,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,mCAAmC,KAAK,IAAI,CAAC;QACpF,QAAQ,EAAE,MAAM,IAAI,CAAC;QACrB,KAAK,EAAE,MAAM,CAAC;QACd,QAAQ,EAAE,CAAC,KAAK,EAAE,SAAS,KAAK,IAAI,CAAC;QACrC,QAAQ,EAAE,CAAC,KAAK,EAAE,SAAS,KAAK,IAAI,CAAC;QACrC,KAAK,EAAE,KAAK,EAAE,CAAC;KAChB,GAAG,KAAK,CAAC,SAAS,CAAC;CACrB;AAED,MAAM,WAAW,iBAAiB,CAAC,CAAC,CAAE,SAAQ,OAAO,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;IAC7E;;;OAGG;IACH,IAAI,EAAE,MAAM,CAAC;IACb;;;;;;;;;;;;;;;;;;;;;;OAsBG;IACH,QAAQ,EACJ,KAAK,CAAC,SAAS,GACf,wBAAwB,CAAC,CAAC,SAAS,CAAC,MAAM,SAAS,CAAC,EAAE,GAAG,SAAS,GAAG,KAAK,CAAC,CAAC;IAChF;;;OAGG;IACH,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,IAAI,KAAK,KAAK,CAAC,SAAS,CAAC;CACzD"}
@@ -3,7 +3,8 @@ export interface FormFooterContextValue {
3
3
  setFormStats: (disabled?: 'disabled' | 'pending') => void;
4
4
  setFormInfo: (info: {
5
5
  submit: () => void;
6
- }) => void;
6
+ }) => boolean;
7
+ deleteFormInfo: () => void;
7
8
  formStats: 'disabled' | 'pending' | undefined;
8
9
  func: {
9
10
  submit: () => void;
@@ -1 +1 @@
1
- {"version":3,"file":"form-footer-context.d.ts","sourceRoot":"","sources":["form-footer-context.tsx"],"names":[],"mappings":"AAEA,OAAO,KAA+D,MAAM,OAAO,CAAC;AAEpF,MAAM,WAAW,sBAAsB;IACrC,YAAY,EAAE,CAAC,QAAQ,CAAC,EAAE,UAAU,GAAG,SAAS,KAAK,IAAI,CAAC;IAC1D,WAAW,EAAE,CAAC,IAAI,EAAE;QAAE,MAAM,EAAE,MAAM,IAAI,CAAA;KAAE,KAAK,IAAI,CAAC;IACpD,SAAS,EAAE,UAAU,GAAG,SAAS,GAAG,SAAS,CAAC;IAC9C,IAAI,EAAE;QACJ,MAAM,EAAE,MAAM,IAAI,CAAC;KACpB,CAAC;CACH;AAED,eAAO,MAAM,iBAAiB,8CAAqD,CAAC;AAEpF,eAAO,MAAM,kBAAkB,UAAW;IAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;CAAE,gBAqBtE,CAAC;AAEF,eAAO,MAAM,aAAa,qCAGzB,CAAC"}
1
+ {"version":3,"file":"form-footer-context.d.ts","sourceRoot":"","sources":["form-footer-context.tsx"],"names":[],"mappings":"AAEA,OAAO,KAA+D,MAAM,OAAO,CAAC;AAEpF,MAAM,WAAW,sBAAsB;IACrC,YAAY,EAAE,CAAC,QAAQ,CAAC,EAAE,UAAU,GAAG,SAAS,KAAK,IAAI,CAAC;IAC1D,WAAW,EAAE,CAAC,IAAI,EAAE;QAAE,MAAM,EAAE,MAAM,IAAI,CAAA;KAAE,KAAK,OAAO,CAAC;IACvD,cAAc,EAAE,MAAM,IAAI,CAAC;IAC3B,SAAS,EAAE,UAAU,GAAG,SAAS,GAAG,SAAS,CAAC;IAC9C,IAAI,EAAE;QACJ,MAAM,EAAE,MAAM,IAAI,CAAC;KACpB,CAAC;CACH;AAED,eAAO,MAAM,iBAAiB,8CAAqD,CAAC;AAEpF,eAAO,MAAM,kBAAkB,UAAW;IAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;CAAE,gBA6BtE,CAAC;AAEF,eAAO,MAAM,aAAa,qCAGzB,CAAC"}
@@ -32,7 +32,13 @@ var FormFooterProvider = exports.FormFooterProvider = function FormFooterProvide
32
32
  if (!context.hasSubmit) {
33
33
  context.submit = info.submit;
34
34
  context.hasSubmit = true;
35
+ return true;
35
36
  }
37
+ return false;
38
+ });
39
+ var deleteFormInfo = (0, _hooks.usePersistFn)(function () {
40
+ context.hasSubmit = false;
41
+ context.submit = function () {};
36
42
  });
37
43
  var setFormStats = (0, _hooks.usePersistFn)(function (disabled) {
38
44
  if (disabled !== formStats) {
@@ -43,6 +49,7 @@ var FormFooterProvider = exports.FormFooterProvider = function FormFooterProvide
43
49
  return {
44
50
  setFormStats: setFormStats,
45
51
  setFormInfo: setFormInfo,
52
+ deleteFormInfo: deleteFormInfo,
46
53
  formStats: formStats,
47
54
  func: context
48
55
  };
@@ -1 +1 @@
1
- {"version":3,"file":"form.d.ts","sourceRoot":"","sources":["form.tsx"],"names":[],"mappings":";AAKA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAGhD,QAAA,MAAM,IAAI,4DAgHT,CAAC;AAEF,eAAe,IAAI,CAAC"}
1
+ {"version":3,"file":"form.d.ts","sourceRoot":"","sources":["form.tsx"],"names":[],"mappings":";AAKA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAGhD,QAAA,MAAM,IAAI,4DA0HT,CAAC;AAEF,eAAe,IAAI,CAAC"}
package/cjs/form/form.js CHANGED
@@ -85,6 +85,10 @@ var Form = function Form(props) {
85
85
  props.setForm(formRefObj);
86
86
  }
87
87
  }, [formRefObj]);
88
+ var _React$useRef = _react.default.useRef({
89
+ bindindModalFormContextSuccess: false
90
+ }),
91
+ context = _React$useRef.current;
88
92
  var handleFormModalInfo = function handleFormModalInfo() {
89
93
  var status = undefined;
90
94
  if (props.disabled) {
@@ -97,11 +101,17 @@ var Form = function Form(props) {
97
101
  modalFormContext === null || modalFormContext === void 0 || modalFormContext.setFormStats(status);
98
102
  }
99
103
  if (props.onSubmit) {
100
- modalFormContext === null || modalFormContext === void 0 || modalFormContext.setFormInfo(formRefObj);
104
+ var ok = modalFormContext === null || modalFormContext === void 0 ? void 0 : modalFormContext.setFormInfo(formRefObj);
105
+ context.bindindModalFormContextSuccess = !!ok;
101
106
  }
102
107
  };
103
108
  (0, _react.useEffect)(function () {
104
109
  handleFormModalInfo();
110
+ return function () {
111
+ if (context.bindindModalFormContextSuccess) {
112
+ modalFormContext === null || modalFormContext === void 0 || modalFormContext.deleteFormInfo();
113
+ }
114
+ };
105
115
  }, [props.disabled, props.pending]);
106
116
  var rootClass = (0, _classnames.default)([formClasses === null || formClasses === void 0 ? void 0 : formClasses.rootClass, formClasses === null || formClasses === void 0 ? void 0 : formClasses.wrapper, className, props.inline && (formClasses === null || formClasses === void 0 ? void 0 : formClasses.wrapperInline)]);
107
117
  var formProps = getFormProps({
@@ -1 +1 @@
1
- {"version":3,"file":"radio-group.d.ts","sourceRoot":"","sources":["radio-group.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAarD,QAAA,MAAM,KAAK,4EA8HV,CAAC;AAEF,eAAe,KAAK,CAAC"}
1
+ {"version":3,"file":"radio-group.d.ts","sourceRoot":"","sources":["radio-group.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAarD,QAAA,MAAM,KAAK,4EA+HV,CAAC;AAEF,eAAe,KAAK,CAAC"}
@@ -130,6 +130,7 @@ var Group = function Group(props0) {
130
130
  checked: datum.check(d),
131
131
  disabled: datum.disabledCheck(d),
132
132
  htmlValue: i,
133
+ size: size,
133
134
  onChange: handleIndexChange,
134
135
  renderRadio: renderRadio,
135
136
  children: getContent(d, i)
@@ -1 +1 @@
1
- {"version":3,"file":"result.d.ts","sourceRoot":"","sources":["result.tsx"],"names":[],"mappings":";AAGA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAY5C,QAAA,MAAM,MAAM,uEAqaX,CAAC;AAEF,eAAe,MAAM,CAAC"}
1
+ {"version":3,"file":"result.d.ts","sourceRoot":"","sources":["result.tsx"],"names":[],"mappings":";AAGA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAY5C,QAAA,MAAM,MAAM,uEA4aX,CAAC;AAEF,eAAe,MAAM,CAAC"}
@@ -360,6 +360,13 @@ var Result = function Result(props) {
360
360
  }
361
361
  mounted.current = true;
362
362
  }, [focus, placeholder, multiple]);
363
+
364
+ // Select多选模式下,且开启了onFilter,自动聚焦
365
+ (0, _react.useLayoutEffect)(function () {
366
+ if (multiple && focus && inputRef !== null && inputRef !== void 0 && inputRef.current) {
367
+ inputRef.current.focus();
368
+ }
369
+ }, [focus, multiple]);
363
370
  (0, _react.useLayoutEffect)(function () {
364
371
  handleResetMore();
365
372
  }, [valueProp, data]);
@@ -1 +1 @@
1
- {"version":3,"file":"select.d.ts","sourceRoot":"","sources":["select.tsx"],"names":[],"mappings":";AAeA,OAAO,EAAE,eAAe,EAAqB,MAAM,eAAe,CAAC;AAenE,iBAAS,MAAM,CAAC,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,eAAe,CAAC,QAAQ,EAAE,KAAK,CAAC,eA2vBxE;AAED,eAAe,MAAM,CAAC"}
1
+ {"version":3,"file":"select.d.ts","sourceRoot":"","sources":["select.tsx"],"names":[],"mappings":";AAeA,OAAO,EAAE,eAAe,EAAqB,MAAM,eAAe,CAAC;AAenE,iBAAS,MAAM,CAAC,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,eAAe,CAAC,QAAQ,EAAE,KAAK,CAAC,eA4vBxE;AAED,eAAe,MAAM,CAAC"}
@@ -316,7 +316,7 @@ function Select(props0) {
316
316
  });
317
317
  var rootClass = (0, _classnames.default)(className, styles === null || styles === void 0 ? void 0 : styles.rootClass, styles === null || styles === void 0 ? void 0 : styles.wrapper, isEmpty && styles.wrapperEmpty, open && (styles === null || styles === void 0 ? void 0 : styles.wrapperOpen), open && trigger === 'hover' && (styles === null || styles === void 0 ? void 0 : styles.triggerHover), disabled === true && (styles === null || styles === void 0 ? void 0 : styles.wrapperDisabled), disabled !== true && focused && (styles === null || styles === void 0 ? void 0 : styles.wrapperFocus), innerTitle && (styles === null || styles === void 0 ? void 0 : styles.wrapperInnerTitle), size === 'small' && (styles === null || styles === void 0 ? void 0 : styles.wrapperSmall), size === 'large' && (styles === null || styles === void 0 ? void 0 : styles.wrapperLarge), (!!props.error || props.status === 'error') && (styles === null || styles === void 0 ? void 0 : styles.wrapperError), clearable && (styles === null || styles === void 0 ? void 0 : styles.clearable), !border && (styles === null || styles === void 0 ? void 0 : styles.wrapperNoBorder), !!underline && (styles === null || styles === void 0 ? void 0 : styles.wrapperUnderline), _defineProperty({}, styles === null || styles === void 0 ? void 0 : styles.multiple, multiple));
318
318
  var getRenderItem = function getRenderItem(data, index) {
319
- return typeof renderItemProp === 'function' ? renderItemProp(data, index) : data[renderItemProp];
319
+ return typeof renderItemProp === 'function' ? renderItemProp(data, index) : (data === null || data === void 0 ? void 0 : data[renderItemProp]) || '';
320
320
  };
321
321
  var renderItem = getRenderItem;
322
322
  var handleFocus = (0, _hooks.usePersistFn)(function (e) {
@@ -457,7 +457,8 @@ function Select(props0) {
457
457
  };
458
458
  var getRenderResult = function getRenderResult(data, index) {
459
459
  if (!renderResultProp) return renderItem(data, index);
460
- return typeof renderResultProp === 'function' ? renderResultProp(data, index) : data[renderResultProp];
460
+ var result = typeof renderResultProp === 'function' ? renderResultProp(data, index) : data[renderResultProp];
461
+ return result !== null && result !== void 0 ? result : null;
461
462
  };
462
463
  var getDataByValues = function getDataByValues(values) {
463
464
  return datum.getDataByValues(values, {
@@ -1 +1 @@
1
- {"version":3,"file":"table.d.ts","sourceRoot":"","sources":["table.tsx"],"names":[],"mappings":";AAwBA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;;AAuB1C,wBAyjBE"}
1
+ {"version":3,"file":"table.d.ts","sourceRoot":"","sources":["table.tsx"],"names":[],"mappings":";AAwBA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;;AAuB1C,wBA0jBE"}
@@ -158,7 +158,8 @@ var _default = exports.default = function _default(props) {
158
158
  }),
159
159
  sortedData = _useTableSort.sortedData,
160
160
  sortInfo = _useTableSort.sortInfo,
161
- onSorterChange = _useTableSort.onSorterChange;
161
+ onSorterChange = _useTableSort.onSorterChange,
162
+ sortByColumn = _useTableSort.sortByColumn;
162
163
  var _usePaginationList = (0, _hooks.usePaginationList)({
163
164
  data: sortedData,
164
165
  shouldPage: !!props.pagination,
@@ -519,6 +520,7 @@ var _default = exports.default = function _default(props) {
519
520
  return index;
520
521
  };
521
522
  var tableFunc = (0, _hooks.useLatestObj)({
523
+ sortByColumn: sortByColumn,
522
524
  scrollToIndex: virtualInfo.scrollToIndex,
523
525
  getRenderIndexByData: getRenderIndexByData,
524
526
  scrollColumnIntoView: virtualInfo.scrollColumnIntoView,
@@ -15,6 +15,7 @@ import { DatePickerClasses } from '../date-picker/date-picker.type';
15
15
  import { SwitchClasses } from '../switch/switch.type';
16
16
  import { CheckboxClasses } from '../checkbox/checkbox.type';
17
17
  import { RadioClasses } from '../radio/radio.type';
18
+ import { KeygenResult } from '@sheinx/hooks';
18
19
  export type ListDatum = ReturnType<typeof useListSelect<any, any>>;
19
20
  export type UseTreeResult = ReturnType<typeof useTableTree>;
20
21
  export interface TableClasses {
@@ -71,6 +72,11 @@ export interface TableRef {
71
72
  getRenderIndexByData: (data: any) => number;
72
73
  scrollColumnIntoView: (colKey: string | number) => void;
73
74
  scrollColumnByLeft: (left: number) => void;
75
+ sortByColumn: (params: {
76
+ columnKey: KeygenResult;
77
+ direction: 'desc' | 'asc' | null;
78
+ columnSorter: TableColumnItem<any>['sorter'];
79
+ }) => void;
74
80
  [key: string]: any;
75
81
  }
76
82
  export interface TableSelectProps<DataItem, Value> {
@@ -1 +1 @@
1
- {"version":3,"file":"table.type.d.ts","sourceRoot":"","sources":["table.type.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"table.type.d.ts","sourceRoot":"","sources":["table.type.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,KAAK,EAAE,UAAU,EAAE,eAAe,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC5F,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC5D,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAC5D,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAE7C,MAAM,MAAM,SAAS,GAAG,UAAU,CAAC,OAAO,aAAa,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;AACnE,MAAM,MAAM,aAAa,GAAG,UAAU,CAAC,OAAO,YAAY,CAAC,CAAC;AAE5D,MAAM,WAAW,YAAY;IAC3B,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,gBAAgB,EAAE,MAAM,CAAC;IACzB,mBAAmB,EAAE,MAAM,CAAC;IAE5B,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAEhB,OAAO,EAAE,MAAM,CAAC;IAEhB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IAErB,aAAa,EAAE,MAAM,CAAC;IACtB,cAAc,EAAE,MAAM,CAAC;IACvB,eAAe,EAAE,MAAM,CAAC;IACxB,aAAa,EAAE,MAAM,CAAC;IACtB,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IAErB,QAAQ,EAAE,MAAM,CAAC;IAEjB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAElB,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe,EAAE,MAAM,CAAC;IACxB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IAEnB,aAAa,EAAE,MAAM,CAAC;IACtB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,qBAAqB,EAAE,MAAM,CAAC;IAE9B,gBAAgB,EAAE,MAAM,CAAC;IAEzB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IAEpB,aAAa,EAAE,MAAM,CAAC;IACtB,iBAAiB,EAAE,MAAM,CAAC;IAE1B,UAAU,EAAE,MAAM,CAAC;CACpB;AACD,MAAM,WAAW,QAAQ;IACvB,aAAa,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,CAAC,EAAE,MAAM,IAAI,KAAK,IAAI,CAAC;IACxD,oBAAoB,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,MAAM,CAAC;IAC5C,oBAAoB,EAAE,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,KAAK,IAAI,CAAC;IACxD,kBAAkB,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAC3C,YAAY,EAAE,CAAC,MAAM,EAAE;QAAC,SAAS,EAAE,YAAY,CAAC;QAAC,SAAS,EAAE,MAAM,GAAG,KAAK,GAAG,IAAI,CAAC;QAAC,YAAY,EAAE,eAAe,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAA;KAAC,KAAK,IAAI,CAAC;IAC1I,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB;AAED,MAAM,WAAW,gBAAgB,CAAC,QAAQ,EAAE,KAAK;IAC/C;;;;OAIG;IACH,KAAK,CAAC,EAAE,KAAK,CAAC;IACd;;;OAGG;IACH,WAAW,CAAC,EAAE,CAAC,IAAI,EAAE,KAAK,KAAK,IAAI,CAAC;IACpC;;;;OAIG;IACH,MAAM,CAAC,EAAE,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,QAAQ,KAAK,KAAK,SAAS,CAAC,MAAM,CAAC,CAAC,EAAE,GAAG,CAAC,GAAG,KAAK,CAAC,CAAC;IAC3F;;;;OAIG;IACH,UAAU,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,SAAS,CAAC,MAAM,CAAC,CAAC,EAAE,GAAG,CAAC,GAAG,KAAK,EAAE,IAAI,EAAE,QAAQ,KAAK,OAAO,CAAC;IACvF,QAAQ,CAAC,EAAE,OAAO,GAAG,CAAC,CAAC,CAAC,EAAE,QAAQ,KAAK,OAAO,CAAC,CAAC;CACjD;AAED,MAAM,WAAW,UAAU,CAAC,QAAQ,EAAE,KAAK,CACzC,SAAQ,IAAI,CAAC,UAAU,EAAE,WAAW,GAAG,OAAO,CAAC,EAC7C,cAAc,CAAC,QAAQ,CAAC,EACxB,gBAAgB,CAAC,QAAQ,EAAE,KAAK,CAAC;IACnC,QAAQ,CAAC,EAAE;QACT,KAAK,CAAC,EAAE,MAAM,YAAY,CAAC;QAC3B,QAAQ,CAAC,EAAE,MAAM,eAAe,CAAC;QACjC,KAAK,CAAC,EAAE,MAAM,YAAY,CAAC;QAC3B,IAAI,CAAC,EAAE,MAAM,WAAW,CAAC;QACzB,UAAU,CAAC,EAAE,MAAM,iBAAiB,CAAC;QACrC,MAAM,CAAC,EAAE,MAAM,aAAa,CAAC;QAC7B,KAAK,CAAC,EAAE,MAAM,YAAY,CAAC;QAC3B,KAAK,CAAC,EAAE,MAAM,YAAY,CAAC;QAC3B,MAAM,CAAC,EAAE,MAAM,aAAa,CAAC;QAC7B,QAAQ,CAAC,EAAE,MAAM,eAAe,CAAC;QACjC,UAAU,CAAC,EAAE,MAAM,iBAAiB,CAAC;QACrC,UAAU,CAAC,EAAE,MAAM,iBAAiB,CAAC;QACrC,MAAM,CAAC,EAAE,MAAM,aAAa,CAAC;KAC9B,CAAC;IACF;;;;OAIG;IACH,WAAW,CAAC,EAAE,CACZ,IAAI,EAAE,QAAQ,EACd,IAAI,EAAE;QACJ,QAAQ,EAAE,MAAM,CAAC;QACjB,WAAW,EAAE,MAAM,CAAC;QACpB,SAAS,EAAE,MAAM,GAAG,MAAM,CAAC;KAC5B,KACE,IAAI,CAAC;IACV;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB;;;;OAIG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;;;;OAIG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB;;;;OAIG;IACH,KAAK,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IACxB;;;;OAIG;IACH,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACzB;;;OAGG;IACH,QAAQ,CAAC,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IACrE;;;OAGG;IACH,UAAU,CAAC,EAAE,eAAe,CAAC;IAC7B;;;;OAIG;IACH,OAAO,CAAC,EAAE,OAAO,GAAG,KAAK,CAAC,SAAS,CAAC;IACpC;;OAEG;IACH,KAAK,CAAC,EAAE,QAAQ,GAAG,MAAM,CAAC;IAC1B;;;OAGG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB;;;;OAIG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB;;;;OAIG;IACH,IAAI,CAAC,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC;IAC1B;;;;OAIG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB;;;;OAIG;IACH,aAAa,CAAC,EAAE,KAAK,GAAG,QAAQ,CAAC;IACjC;;;OAGG;IACH,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAC3B;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACxB;;;;;OAKG;IACH,OAAO,CAAC,EAAE,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;IACjC;;;OAGG;IACH,QAAQ,CAAC,EAAE,OAAO,GAAG,CAAC,CAAC,CAAC,EAAE,QAAQ,KAAK,OAAO,CAAC,CAAC;IAChD;;;;OAIG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B;;;;OAIG;IACH,YAAY,CAAC,EAAE,MAAM,EAAE,GAAG,MAAM,GAAG,OAAO,CAAC;IAC3C;;;OAGG;IACH,UAAU,CAAC,EAAE,CAAC,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,KAAK,IAAI,CAAC;IACrF;;;OAGG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB;;;;OAIG;IACH,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,KAAK,MAAM,GAAG,SAAS,CAAC;IACxE;;;;OAIG;IACH,SAAS,CAAC,EAAE,UAAU,CAAC;IACvB;;;;OAIG;IACH,IAAI,CAAC,EAAE,QAAQ,EAAE,CAAC;IAClB;;;;OAIG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB;;;;OAIG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB;;;;OAIG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB;;;OAGG;IACH,YAAY,CAAC,EAAE,CAAC,MAAM,EAAE,iBAAiB,KAAK,KAAK,CAAC,SAAS,CAAC;IAC9D;;;;OAIG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB;;;OAGG;IACH,OAAO,CAAC,EAAE,WAAW,EAAE,EAAE,GAAG,WAAW,EAAE,CAAC;IAC1C;;;;OAIG;IACH,MAAM,CAAC,EAAE,OAAO,GAAG;QAAE,GAAG,CAAC,EAAE,MAAM,CAAC;QAAC,GAAG,CAAC,EAAE,OAAO,CAAA;KAAE,CAAC;IAEnD;;;;;OAKG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B;;;OAGG;IACH,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,QAAQ,KAAK,IAAI,CAAC;IACrC;;;OAGG;IACH,WAAW,CAAC,EAAE,CAAC,IAAI,EAAE,KAAK,KAAK,IAAI,CAAC;CACrC;AAED,MAAM,WAAW,UAAU;IACzB,KAAK,CAAC,EAAE,WAAW,CAAC;IACpB;;OAEG;IACH,MAAM,EAAE,OAAO,CAAC;IAChB;;OAEG;IACH,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;IACrB;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,MAAM;IACrB,IAAI,EAAE,MAAM,GAAG,CAAC,CAAC,MAAM,EAAE,UAAU,EAAE,KAAK,IAAI,CAAC,CAAC;IAChD,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,MAAM,WAAW,GAAG,KAAK,GAAG,MAAM,CAAC;AAEzC,MAAM,MAAM,SAAS,GAAG,MAAM,GAAG,OAAO,CAAC;AAEzC,MAAM,MAAM,QAAQ,GAAG,GAAG,GAAG,GAAG,GAAG,MAAM,CAAC;AAE1C,MAAM,MAAM,UAAU,GAAG,QAAQ,GAAG,YAAY,GAAG,UAAU,CAAC;AAE9D,MAAM,WAAW,iBAAiB;IAChC,MAAM,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,IAAI,CAAC;IAC/B,UAAU,EAAE,MAAM,IAAI,CAAC;IACvB,WAAW,EAAE,MAAM,IAAI,CAAC;CACzB;AAED,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,MAAM,KAAK,CAAC,SAAS,CAAC;IAC9B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED;;GAEG;AACH,MAAM,MAAM,UAAU,CAAC,QAAQ,IAAI,eAAe,CAAC,QAAQ,CAAC,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"tabs-header.d.ts","sourceRoot":"","sources":["tabs-header.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAwBrD,QAAA,MAAM,UAAU,UAAW,eAAe,gBA6QzC,CAAC;AAEF,eAAe,UAAU,CAAC"}
1
+ {"version":3,"file":"tabs-header.d.ts","sourceRoot":"","sources":["tabs-header.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAwBrD,QAAA,MAAM,UAAU,UAAW,eAAe,gBA4QzC,CAAC;AAEF,eAAe,UAAU,CAAC"}
@@ -48,8 +48,7 @@ var TabsHeader = function TabsHeader(props) {
48
48
  extra = props.extra,
49
49
  splitColor = props.splitColor,
50
50
  tabBarStyle = props.tabBarStyle,
51
- getPosition = props.getPosition,
52
- sticky = props.sticky;
51
+ getPosition = props.getPosition;
53
52
  var headerRef = (0, _react.useRef)(null);
54
53
  var scrollRef = (0, _react.useRef)(null);
55
54
  var tabRef = (0, _react.useRef)({});
@@ -1 +1 @@
1
- {"version":3,"file":"tabs-panel.d.ts","sourceRoot":"","sources":["tabs-panel.tsx"],"names":[],"mappings":";AAIA,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAGnD,QAAA,MAAM,SAAS,UAAW,cAAc,uBA0DvC,CAAC;AAEF,eAAe,SAAS,CAAC"}
1
+ {"version":3,"file":"tabs-panel.d.ts","sourceRoot":"","sources":["tabs-panel.tsx"],"names":[],"mappings":";AAIA,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAGnD,QAAA,MAAM,SAAS,UAAW,cAAc,uBAqEvC,CAAC;AAEF,eAAe,SAAS,CAAC"}
@@ -25,6 +25,7 @@ var TabsPanel = function TabsPanel(props) {
25
25
  var _jssStyle$tabs;
26
26
  var children = props.children,
27
27
  id = props.id,
28
+ indexInTabs = props.index,
28
29
  tab = props.tab,
29
30
  className = props.className,
30
31
  style = props.style,
@@ -46,16 +47,22 @@ var TabsPanel = function TabsPanel(props) {
46
47
  color: props.color || (active === id ? color : undefined)
47
48
  };
48
49
  setTabs(function (prev) {
49
- var prevTab = prev.find(function (item) {
50
+ var oldTab = prev.find(function (item) {
50
51
  return item.id === id;
51
52
  });
52
- if (prevTab) {
53
+ if (oldTab) {
53
54
  return prev.map(function (item) {
54
55
  if (item.id !== id) return item;
55
56
  return _objectSpread(_objectSpread({}, item), tabData);
56
57
  });
57
58
  }
58
- return [].concat(_toConsumableArray(prev), [tabData]);
59
+ if (indexInTabs === undefined) {
60
+ return [].concat(_toConsumableArray(prev), [tabData]);
61
+ }
62
+
63
+ // 向indexInTabs位置插入tabData
64
+ var newTabs = [].concat(_toConsumableArray(prev.slice(0, indexInTabs)), [tabData], _toConsumableArray(prev.slice(indexInTabs)));
65
+ return newTabs;
59
66
  });
60
67
  return function () {
61
68
  // Panel卸载了通知父组件,去销毁相应的TabsHeader
@@ -65,7 +72,7 @@ var TabsPanel = function TabsPanel(props) {
65
72
  });
66
73
  });
67
74
  };
68
- }, [id, tab, color].concat(_toConsumableArray(color ? [active] : []), [props.disabled, props.jssStyle]));
75
+ }, [id, tab, color, active, props.disabled, props.jssStyle]);
69
76
  if (!isActive && lazy && !keekAlive.current) {
70
77
  return null;
71
78
  }
@@ -44,5 +44,11 @@ export interface TabsPanelProps extends Omit<TabsContextProps, 'tabs' | 'setTabs
44
44
  * @cn 标签页文字颜色,仅当 shape 为 "card" 时生效
45
45
  */
46
46
  color?: string;
47
+ /**
48
+ * @en The index of the panel
49
+ * @cn 面板的索引
50
+ * @private
51
+ */
52
+ index?: number;
47
53
  }
48
54
  //# sourceMappingURL=tabs-panel.type.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"tabs-panel.type.d.ts","sourceRoot":"","sources":["tabs-panel.type.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE1C,MAAM,WAAW,cACf,SAAQ,IAAI,CAAC,gBAAgB,EAAE,MAAM,GAAG,SAAS,CAAC,EAChD,IAAI,CAAC,UAAU,EAAE,WAAW,GAAG,OAAO,CAAC;IACzC,QAAQ,CAAC,EAAE;QACT,IAAI,EAAE,MAAM,WAAW,CAAC;QACxB,MAAM,EAAE,MAAM,aAAa,CAAC;KAC7B,CAAC;IACF;;;OAGG;IACH,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACrB;;;;OAIG;IACH,GAAG,EAAE,KAAK,CAAC,SAAS,CAAC;IACrB;;;;OAIG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB;;;OAGG;IACH,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAC3B;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB"}
1
+ {"version":3,"file":"tabs-panel.type.d.ts","sourceRoot":"","sources":["tabs-panel.type.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE1C,MAAM,WAAW,cACf,SAAQ,IAAI,CAAC,gBAAgB,EAAE,MAAM,GAAG,SAAS,CAAC,EAChD,IAAI,CAAC,UAAU,EAAE,WAAW,GAAG,OAAO,CAAC;IACzC,QAAQ,CAAC,EAAE;QACT,IAAI,EAAE,MAAM,WAAW,CAAC;QACxB,MAAM,EAAE,MAAM,aAAa,CAAC;KAC7B,CAAC;IACF;;;OAGG;IACH,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACrB;;;;OAIG;IACH,GAAG,EAAE,KAAK,CAAC,SAAS,CAAC;IACrB;;;;OAIG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB;;;OAGG;IACH,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAC3B;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf;;;;OAIG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB"}
@@ -1 +1 @@
1
- {"version":3,"file":"tabs.d.ts","sourceRoot":"","sources":["tabs.tsx"],"names":[],"mappings":";AAGA,OAAO,EAAe,SAAS,EAAE,MAAM,aAAa,CAAC;AAErD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAOnD,QAAA,MAAM,IAAI;YAAW,SAAS;;CA2Q7B,CAAC;AAIF,eAAe,IAAI,CAAC"}
1
+ {"version":3,"file":"tabs.d.ts","sourceRoot":"","sources":["tabs.tsx"],"names":[],"mappings":";AAGA,OAAO,EAAe,SAAS,EAAE,MAAM,aAAa,CAAC;AAErD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAOnD,QAAA,MAAM,IAAI;YAAW,SAAS;;CA4Q7B,CAAC;AAIF,eAAe,IAAI,CAAC"}
package/cjs/tabs/tabs.js CHANGED
@@ -185,7 +185,8 @@ var Tabs = function Tabs(props) {
185
185
  var Child = child;
186
186
  if (isNamedComponent(Child.type) && Child.type.displayName === 'ShineoutTabsPanel') {
187
187
  return /*#__PURE__*/(0, _react.cloneElement)(Child, {
188
- id: Child.props.id !== undefined ? Child.props.id : index
188
+ id: Child.props.id !== undefined ? Child.props.id : index,
189
+ index: index
189
190
  });
190
191
  }
191
192
  if (allowNonPanel) {
@@ -1 +1 @@
1
- {"version":3,"file":"cascader.d.ts","sourceRoot":"","sources":["cascader.tsx"],"names":[],"mappings":";AAEA,OAAO,EAML,YAAY,EAIb,MAAM,eAAe,CAAC;AAMvB,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAahD,QAAA,MAAM,QAAQ,iGAmtBb,CAAC;AACF,eAAe,QAAQ,CAAC"}
1
+ {"version":3,"file":"cascader.d.ts","sourceRoot":"","sources":["cascader.tsx"],"names":[],"mappings":";AAEA,OAAO,EAML,YAAY,EAIb,MAAM,eAAe,CAAC;AAMvB,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAahD,QAAA,MAAM,QAAQ,iGAytBb,CAAC;AACF,eAAe,QAAQ,CAAC"}
@@ -372,12 +372,13 @@ var Cascader = function Cascader(props0) {
372
372
  onClick: handleResultClick,
373
373
  children: defaultIcon
374
374
  });
375
+ var close = /*#__PURE__*/_jsx("span", {
376
+ className: styles.clearIcon,
377
+ onClick: handleClear,
378
+ children: Icons.cascader.Close
379
+ });
375
380
  return /*#__PURE__*/_jsxs(_Fragment, {
376
- children: [/*#__PURE__*/_jsx("span", {
377
- className: styles.clearIcon,
378
- onClick: handleClear,
379
- children: Icons.cascader.Close
380
- }), !open && !isEmpty && arrow]
381
+ children: [close, !open && !isEmpty && !focused && arrow]
381
382
  });
382
383
  };
383
384
  var renderIcon = function renderIcon() {