@sheinx/base 3.5.4-beta.1 → 3.5.4-beta.11

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 (51) hide show
  1. package/cjs/date-picker/date-picker.d.ts.map +1 -1
  2. package/cjs/date-picker/date-picker.js +8 -3
  3. package/cjs/date-picker/day.d.ts.map +1 -1
  4. package/cjs/date-picker/day.js +3 -0
  5. package/cjs/date-picker/picker.d.ts.map +1 -1
  6. package/cjs/date-picker/picker.js +3 -0
  7. package/cjs/date-picker/picker.type.d.ts +3 -0
  8. package/cjs/date-picker/picker.type.d.ts.map +1 -1
  9. package/cjs/date-picker/quick.d.ts.map +1 -1
  10. package/cjs/date-picker/quick.js +2 -0
  11. package/cjs/date-picker/quick.type.d.ts +1 -0
  12. package/cjs/date-picker/quick.type.d.ts.map +1 -1
  13. package/cjs/date-picker/result.d.ts +1 -0
  14. package/cjs/date-picker/result.d.ts.map +1 -1
  15. package/cjs/date-picker/result.js +1 -0
  16. package/cjs/form/form-button.d.ts.map +1 -1
  17. package/cjs/form/form-button.js +5 -0
  18. package/cjs/form/form-fieldset.js +2 -3
  19. package/cjs/form/form.d.ts.map +1 -1
  20. package/cjs/form/form.js +40 -9
  21. package/cjs/steps/step.d.ts.map +1 -1
  22. package/cjs/steps/step.js +1 -0
  23. package/cjs/sticky/sticky.js +3 -3
  24. package/cjs/table/tr.d.ts.map +1 -1
  25. package/cjs/table/tr.js +11 -4
  26. package/esm/date-picker/date-picker.d.ts.map +1 -1
  27. package/esm/date-picker/date-picker.js +8 -3
  28. package/esm/date-picker/day.d.ts.map +1 -1
  29. package/esm/date-picker/day.js +3 -0
  30. package/esm/date-picker/picker.d.ts.map +1 -1
  31. package/esm/date-picker/picker.js +3 -0
  32. package/esm/date-picker/picker.type.d.ts +3 -0
  33. package/esm/date-picker/picker.type.d.ts.map +1 -1
  34. package/esm/date-picker/quick.d.ts.map +1 -1
  35. package/esm/date-picker/quick.js +2 -0
  36. package/esm/date-picker/quick.type.d.ts +1 -0
  37. package/esm/date-picker/quick.type.d.ts.map +1 -1
  38. package/esm/date-picker/result.d.ts +1 -0
  39. package/esm/date-picker/result.d.ts.map +1 -1
  40. package/esm/date-picker/result.js +1 -0
  41. package/esm/form/form-button.d.ts.map +1 -1
  42. package/esm/form/form-button.js +5 -0
  43. package/esm/form/form-fieldset.js +2 -3
  44. package/esm/form/form.d.ts.map +1 -1
  45. package/esm/form/form.js +43 -11
  46. package/esm/steps/step.d.ts.map +1 -1
  47. package/esm/steps/step.js +1 -0
  48. package/esm/sticky/sticky.js +3 -3
  49. package/esm/table/tr.d.ts.map +1 -1
  50. package/esm/table/tr.js +11 -4
  51. package/package.json +2 -2
@@ -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,oFA4Tf,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,oFAmUf,CAAC;AAEF,eAAe,UAAU,CAAC"}
@@ -76,7 +76,8 @@ var DatePicker = function DatePicker(props0) {
76
76
  oldDateArr = _React$useState8[0],
77
77
  setOldDateArr = _React$useState8[1];
78
78
  var inputRef = (0, _react.useRef)({
79
- inputRef: null
79
+ inputRef: null,
80
+ inputRefs: []
80
81
  });
81
82
  var styles = jssStyle === null || jssStyle === void 0 || (_jssStyle$datePicker = jssStyle.datePicker) === null || _jssStyle$datePicker === void 0 ? void 0 : _jssStyle$datePicker.call(jssStyle);
82
83
  var isRTL = direction === 'rtl';
@@ -120,6 +121,7 @@ var DatePicker = function DatePicker(props0) {
120
121
  formatResult: props.formatResult,
121
122
  onPickerChange: props.onPickerChange
122
123
  }),
124
+ inputArr = _useDatePickerFormat.inputArr,
123
125
  resultArr = _useDatePickerFormat.resultArr,
124
126
  targetResultArr = _useDatePickerFormat.targetResultArr,
125
127
  dateArr = _useDatePickerFormat.dateArr,
@@ -190,13 +192,14 @@ var DatePicker = function DatePicker(props0) {
190
192
  (_props$onBlur = props.onBlur) === null || _props$onBlur === void 0 || _props$onBlur.call(props, e);
191
193
  });
192
194
  var handleClose = function handleClose(isFromConfirm) {
193
- var _inputRef$current$inp;
194
195
  setIsCloseFromConfirm(isFromConfirm || false);
195
196
  closePop();
196
197
  if (isFromConfirm) {
197
198
  func.finishEdit();
198
199
  }
199
- (_inputRef$current$inp = inputRef.current.inputRef) === null || _inputRef$current$inp === void 0 || _inputRef$current$inp.blur();
200
+ inputRef.current.inputRefs.forEach(function (el) {
201
+ el === null || el === void 0 || el.blur();
202
+ });
200
203
  };
201
204
  var handleResultClick = (0, _hooks.usePersistFn)(function () {
202
205
  if (disabledStatus === 'all') return;
@@ -286,7 +289,9 @@ var DatePicker = function DatePicker(props0) {
286
289
  children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_picker.default, {
287
290
  setTargetArr: func.setTargetArr,
288
291
  dateArr: dateArr,
292
+ inputArr: inputArr,
289
293
  setDateArr: func.setDateArr,
294
+ onClearInputArr: func.handleClearInputArr,
290
295
  currentArr: currentArr,
291
296
  range: range,
292
297
  setCurrentArr: func.setCurrentArrWithParams,
@@ -1 +1 @@
1
- {"version":3,"file":"day.d.ts","sourceRoot":"","sources":["day.tsx"],"names":[],"mappings":";AAQA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAI3C,QAAA,MAAM,GAAG,UAAW,QAAQ,gBA+R3B,CAAC;AAEF,eAAe,GAAG,CAAC"}
1
+ {"version":3,"file":"day.d.ts","sourceRoot":"","sources":["day.tsx"],"names":[],"mappings":";AAQA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAI3C,QAAA,MAAM,GAAG,UAAW,QAAQ,gBAgS3B,CAAC;AAEF,eAAe,GAAG,CAAC"}
@@ -40,7 +40,10 @@ var Day = function Day(props) {
40
40
  current: props.current,
41
41
  onCurrentChange: setCurrent,
42
42
  value: props.value,
43
+ range: props.range,
43
44
  onChange: onChange,
45
+ onClearInputArr: props.onClearInputArr,
46
+ position: props.position,
44
47
  min: props.min,
45
48
  max: props.max,
46
49
  type: props.type,
@@ -1 +1 @@
1
- {"version":3,"file":"picker.d.ts","sourceRoot":"","sources":["picker.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAU5C,QAAA,MAAM,MAAM,UAAW,WAAW,gBAoKjC,CAAC;AAEF,eAAe,MAAM,CAAC"}
1
+ {"version":3,"file":"picker.d.ts","sourceRoot":"","sources":["picker.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAU5C,QAAA,MAAM,MAAM,UAAW,WAAW,gBAuKjC,CAAC;AAEF,eAAe,MAAM,CAAC"}
@@ -35,6 +35,7 @@ var Picker = function Picker(props) {
35
35
  type: props.type,
36
36
  defaultTime: props.defaultTime,
37
37
  range: props.range,
38
+ inputArr: props.inputArr,
38
39
  dateArr: props.dateArr,
39
40
  setDateArr: props.setDateArr,
40
41
  currentArr: props.currentArr,
@@ -78,6 +79,7 @@ var Picker = function Picker(props) {
78
79
  setMode: position === 'end' ? func.setModeEnd : func.setModeStart,
79
80
  onChange: position === 'end' ? func.setDateEnd : func.setDateStart,
80
81
  setCurrent: position === 'end' ? func.setCurrentEnd : func.setCurrentStart,
82
+ onClearInputArr: props.onClearInputArr,
81
83
  type: props.type,
82
84
  format: props.format,
83
85
  disabled: position === 'end' ? func.endDisabled : func.startDisabled,
@@ -155,6 +157,7 @@ var Picker = function Picker(props) {
155
157
  jssStyle: jssStyle,
156
158
  dateArr: dateArr,
157
159
  type: type,
160
+ onClearInputArr: props.onClearInputArr,
158
161
  setDateArr: props.setDateArr,
159
162
  setCurrentArr: props.setCurrentArr,
160
163
  format: props.format,
@@ -12,9 +12,11 @@ export interface PickerProps {
12
12
  minuteStep?: DatePickerProps<any>['minuteStep'];
13
13
  secondStep?: DatePickerProps<any>['secondStep'];
14
14
  children?: DatePickerProps<any>['children'];
15
+ onClearInputArr: (index?: number | undefined) => void;
15
16
  format: string;
16
17
  type: string;
17
18
  dateArr: Array<Date | undefined>;
19
+ inputArr: (Date | undefined)[];
18
20
  setTargetArr: Dispatch<SetStateAction<Array<Date | undefined>>>;
19
21
  setDateArr: Dispatch<SetStateAction<Array<Date | undefined>>>;
20
22
  currentArr: Date[];
@@ -55,6 +57,7 @@ export interface CommonPickerProps extends Pick<PickerProps, 'jssStyle' | 'optio
55
57
  onMouseEnter?: () => void;
56
58
  onMouseLeave?: () => void;
57
59
  closeByConfirm?: () => void;
60
+ onClearInputArr: (index?: number | undefined) => void;
58
61
  }
59
62
  export interface CommonTimeProps extends Pick<PickerProps, 'disabledTime' | 'hourStep' | 'minuteStep' | 'secondStep'> {
60
63
  defaultTime: DateTimeType;
@@ -1 +1 @@
1
- {"version":3,"file":"picker.type.d.ts","sourceRoot":"","sources":["picker.type.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"picker.type.d.ts","sourceRoot":"","sources":["picker.type.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"quick.d.ts","sourceRoot":"","sources":["quick.tsx"],"names":[],"mappings":";AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAK/C,QAAA,MAAM,KAAK,UAAW,UAAU,gBAqE/B,CAAC;AAEF,eAAe,KAAK,CAAC"}
1
+ {"version":3,"file":"quick.d.ts","sourceRoot":"","sources":["quick.tsx"],"names":[],"mappings":";AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAK/C,QAAA,MAAM,KAAK,UAAW,UAAU,gBAsE/B,CAAC;AAEF,eAAe,KAAK,CAAC"}
@@ -17,6 +17,7 @@ var Quick = function Quick(props) {
17
17
  var jssStyle = props.jssStyle,
18
18
  quickSelect = props.quickSelect,
19
19
  format = props.format,
20
+ onClearInputArr = props.onClearInputArr,
20
21
  options = props.options,
21
22
  children = props.children,
22
23
  type = props.type,
@@ -40,6 +41,7 @@ var Quick = function Quick(props) {
40
41
  });
41
42
  props.setDateArr(dateArr);
42
43
  props.setCurrentArr(dateArr, 'quick', item);
44
+ onClearInputArr();
43
45
  if (immediate && closePop) {
44
46
  closePop();
45
47
  }
@@ -10,6 +10,7 @@ export interface QuickProps {
10
10
  range: PickerProps['range'];
11
11
  options: PickerProps['options'];
12
12
  children?: PickerProps['children'];
13
+ onClearInputArr: (index?: number | undefined) => void;
13
14
  closePop?: (isFromConfirm?: boolean | undefined) => void;
14
15
  }
15
16
  //# sourceMappingURL=quick.type.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"quick.type.d.ts","sourceRoot":"","sources":["quick.type.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,MAAM,WAAW,UAAU;IACzB,QAAQ,CAAC,EAAE,WAAW,CAAC,UAAU,CAAC,CAAC;IACnC,WAAW,CAAC,EAAE,WAAW,CAAC,aAAa,CAAC,CAAC;IACzC,IAAI,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IAC1B,OAAO,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;IAChC,UAAU,EAAE,WAAW,CAAC,YAAY,CAAC,CAAC;IACtC,MAAM,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC;IAC9B,aAAa,EAAE,WAAW,CAAC,eAAe,CAAC,CAAC;IAC5C,KAAK,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;IAC5B,OAAO,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;IAChC,QAAQ,CAAC,EAAE,WAAW,CAAC,UAAU,CAAC,CAAC;IACnC,QAAQ,CAAC,EAAE,CAAC,aAAa,CAAC,EAAE,OAAO,GAAG,SAAS,KAAK,IAAI,CAAC;CAC1D"}
1
+ {"version":3,"file":"quick.type.d.ts","sourceRoot":"","sources":["quick.type.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,MAAM,WAAW,UAAU;IACzB,QAAQ,CAAC,EAAE,WAAW,CAAC,UAAU,CAAC,CAAC;IACnC,WAAW,CAAC,EAAE,WAAW,CAAC,aAAa,CAAC,CAAC;IACzC,IAAI,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IAC1B,OAAO,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;IAChC,UAAU,EAAE,WAAW,CAAC,YAAY,CAAC,CAAC;IACtC,MAAM,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC;IAC9B,aAAa,EAAE,WAAW,CAAC,eAAe,CAAC,CAAC;IAC5C,KAAK,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;IAC5B,OAAO,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;IAChC,QAAQ,CAAC,EAAE,WAAW,CAAC,UAAU,CAAC,CAAC;IACnC,eAAe,EAAE,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,KAAK,IAAI,CAAC;IACtD,QAAQ,CAAC,EAAE,CAAC,aAAa,CAAC,EAAE,OAAO,GAAG,SAAS,KAAK,IAAI,CAAC;CAC1D"}
@@ -31,6 +31,7 @@ interface ResultProps extends Pick<DatePickerProps<string>, 'jssStyle' | 'type'
31
31
  activeIndex?: number;
32
32
  onRef: React.MutableRefObject<{
33
33
  inputRef: HTMLInputElement | null;
34
+ inputRefs: (HTMLInputElement | null)[];
34
35
  }>;
35
36
  onFocus?: (e: React.FocusEvent) => void;
36
37
  onBlur?: (e: React.FocusEvent) => void;
@@ -1 +1 @@
1
- {"version":3,"file":"result.d.ts","sourceRoot":"","sources":["result.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,KAAkD,MAAM,OAAO,CAAC;AAIvE,eAAO,MAAM,KAAK;;WAET,MAAM;;;;kBAIC,MAAM,KAAK,IAAI;mBACf,gBAAgB,KAAK,IAAI;uBACrB,gBAAgB,KAAK,IAAI;;;;;;mBAS7B,oBAAoB,KAAK,IAAI;mBAC7B,gBAAgB,KAAK,IAAI;kBAC1B,gBAAgB,KAAK,IAAI;oBACvB,gBAAgB,KAAK,IAAI;;iBA2CzC,CAAC;AACF,UAAU,WACR,SAAQ,IAAI,CACV,eAAe,CAAC,MAAM,CAAC,EACvB,UAAU,GAAG,MAAM,GAAG,WAAW,GAAG,OAAO,GAAG,aAAa,CAC5D;IACD,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,EAAE,OAAO,CAAC;IACd,eAAe,EAAE,KAAK,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IAC3C,SAAS,EAAE,KAAK,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IACrC,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACjD,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,KAAK,CAAC,gBAAgB,CAAC;QAC5B,QAAQ,EAAE,gBAAgB,GAAG,IAAI,CAAC;KACnC,CAAC,CAAC;IACH,OAAO,CAAC,EAAE,CAAC,CAAC,EAAE,KAAK,CAAC,UAAU,KAAK,IAAI,CAAC;IACxC,MAAM,CAAC,EAAE,CAAC,CAAC,EAAE,KAAK,CAAC,UAAU,KAAK,IAAI,CAAC;IACvC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,UAAU,KAAK,IAAI,CAAC;CAC1C;AACD,QAAA,MAAM,MAAM,UAAW,WAAW,gBA0JjC,CAAC;AAEF,eAAe,MAAM,CAAC"}
1
+ {"version":3,"file":"result.d.ts","sourceRoot":"","sources":["result.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,KAAkD,MAAM,OAAO,CAAC;AAIvE,eAAO,MAAM,KAAK;;WAET,MAAM;;;;kBAIC,MAAM,KAAK,IAAI;mBACf,gBAAgB,KAAK,IAAI;uBACrB,gBAAgB,KAAK,IAAI;;;;;;mBAS7B,oBAAoB,KAAK,IAAI;mBAC7B,gBAAgB,KAAK,IAAI;kBAC1B,gBAAgB,KAAK,IAAI;oBACvB,gBAAgB,KAAK,IAAI;;iBA2CzC,CAAC;AACF,UAAU,WACR,SAAQ,IAAI,CACV,eAAe,CAAC,MAAM,CAAC,EACvB,UAAU,GAAG,MAAM,GAAG,WAAW,GAAG,OAAO,GAAG,aAAa,CAC5D;IACD,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,EAAE,OAAO,CAAC;IACd,eAAe,EAAE,KAAK,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IAC3C,SAAS,EAAE,KAAK,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IACrC,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACjD,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,KAAK,CAAC,gBAAgB,CAAC;QAC5B,QAAQ,EAAE,gBAAgB,GAAG,IAAI,CAAC;QAClC,SAAS,EAAE,CAAC,gBAAgB,GAAG,IAAI,CAAC,EAAE,CAAC;KACxC,CAAC,CAAC;IACH,OAAO,CAAC,EAAE,CAAC,CAAC,EAAE,KAAK,CAAC,UAAU,KAAK,IAAI,CAAC;IACxC,MAAM,CAAC,EAAE,CAAC,CAAC,EAAE,KAAK,CAAC,UAAU,KAAK,IAAI,CAAC;IACvC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,UAAU,KAAK,IAAI,CAAC;CAC1C;AACD,QAAA,MAAM,MAAM,UAAW,WAAW,gBA2JjC,CAAC;AAEF,eAAe,MAAM,CAAC"}
@@ -144,6 +144,7 @@ var Result = function Result(props) {
144
144
  children: /*#__PURE__*/(0, _jsxRuntime.jsx)(Input, {
145
145
  onRef: function onRef(el) {
146
146
  _onRef.current.inputRef = el;
147
+ _onRef.current.inputRefs[info.index] = el;
147
148
  context.inputRefs[info.index] = el;
148
149
  },
149
150
  disabled: dis && info.inputable,
@@ -1 +1 @@
1
- {"version":3,"file":"form-button.d.ts","sourceRoot":"","sources":["form-button.tsx"],"names":[],"mappings":";AAKA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEzD,QAAA,MAAM,UAAU,UAAW,WAAW,gBAarC,CAAC;AAEF,eAAe,UAAU,CAAC"}
1
+ {"version":3,"file":"form-button.d.ts","sourceRoot":"","sources":["form-button.tsx"],"names":[],"mappings":";AAKA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEzD,QAAA,MAAM,UAAU,UAAW,WAAW,gBAmBrC,CAAC;AAEF,eAAe,UAAU,CAAC"}
@@ -25,6 +25,11 @@ var FormButton = function FormButton(props) {
25
25
  if (formFunc && props.htmlType === 'button') {
26
26
  formFunc.submit();
27
27
  }
28
+ if (formFunc && props.htmlType === 'reset') {
29
+ // 阻止默认的form reset,改用formFunc.reset。处理嵌套form的reset问题。
30
+ e.preventDefault();
31
+ formFunc.reset();
32
+ }
28
33
  if (props.onClick) {
29
34
  props.onClick(e);
30
35
  }
@@ -75,8 +75,7 @@ var FormFieldSet = function FormFieldSet(props) {
75
75
  });
76
76
  }
77
77
  valueArr.forEach(function (v, i) {
78
- var _context$ids$i;
79
- if (context.lastValues[i] !== v) {
78
+ if (context.lastValues.length !== valueArr.length) {
80
79
  context.ids[i] = _hooks.util.generateUUID();
81
80
  }
82
81
  result.push( /*#__PURE__*/(0, _jsxRuntime.jsx)(Provider, {
@@ -125,7 +124,7 @@ var FormFieldSet = function FormFieldSet(props) {
125
124
  formFunc === null || formFunc === void 0 || formFunc.spliceError(name, i);
126
125
  }
127
126
  })
128
- }, (_context$ids$i = context.ids[i]) !== null && _context$ids$i !== void 0 ? _context$ids$i : i));
127
+ }, context.ids[i]));
129
128
  });
130
129
 
131
130
  // 更新 lastValues
@@ -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,4DA4FT,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,4DAsHT,CAAC;AAEF,eAAe,IAAI,CAAC"}
package/cjs/form/form.js CHANGED
@@ -14,6 +14,12 @@ var _excluded = ["jssStyle", "className", "style", "children", "formRef"];
14
14
  function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
15
15
  function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
16
16
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
17
+ function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
18
+ function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
19
+ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
20
+ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
21
+ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
22
+ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
17
23
  function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
18
24
  function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
19
25
  function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -61,6 +67,16 @@ var Form = function Form(props) {
61
67
  type: 'withValue'
62
68
  });
63
69
  });
70
+ var _useState = (0, _react.useState)(0),
71
+ _useState2 = _slicedToArray(_useState, 2),
72
+ renderKey = _useState2[0],
73
+ setRenderKey = _useState2[1];
74
+ var handleOuterSet = (0, _react.useCallback)(function (vals) {
75
+ formFunc.setValue(vals);
76
+ setRenderKey(function (prev) {
77
+ return prev + 1;
78
+ });
79
+ }, [formFunc]);
64
80
  var formRefObj = (0, _hooks.useLatestObj)({
65
81
  clearValidate: formFunc.clearValidate,
66
82
  getValue: formFunc.getValue,
@@ -70,7 +86,7 @@ var Form = function Form(props) {
70
86
  validateFields: validateFields,
71
87
  validateFieldsWithValue: validateFieldsWithValue,
72
88
  validateFieldsWithError: formFunc.validateFields,
73
- set: formFunc.setValue,
89
+ set: handleOuterSet,
74
90
  scrollToField: formFunc.scrollToField
75
91
  });
76
92
  _react.default.useEffect(function () {
@@ -104,16 +120,31 @@ var Form = function Form(props) {
104
120
  handleFormModalInfo();
105
121
  }, [props.disabled, props.pending]);
106
122
  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
- return /*#__PURE__*/(0, _jsxRuntime.jsx)("form", _objectSpread(_objectSpread({}, getFormProps({
123
+ var formProps = getFormProps({
108
124
  className: rootClass,
109
125
  style: style
126
+ });
127
+ var formElRef = (0, _react.useRef)(null);
128
+ (0, _react.useEffect)(function () {
129
+ if (formElRef.current instanceof HTMLFormElement) {
130
+ formElRef.current.addEventListener('submit', formProps.onSubmit);
131
+ }
132
+ return function () {
133
+ if (formElRef.current instanceof HTMLFormElement) {
134
+ formElRef.current.removeEventListener('submit', formProps.onSubmit);
135
+ }
136
+ };
137
+ }, [formProps.onSubmit]);
138
+ return /*#__PURE__*/(0, _react.createElement)("form", _objectSpread(_objectSpread({}, _hooks.util.removeProps(formProps, {
139
+ onSubmit: true
110
140
  })), {}, {
111
- children: /*#__PURE__*/(0, _jsxRuntime.jsx)(Provider, _objectSpread(_objectSpread({}, ProviderProps), {}, {
112
- children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_hooks.FormContext.Provider, {
113
- value: formRefObj,
114
- children: children
115
- })
116
- }))
117
- }));
141
+ ref: formElRef,
142
+ key: renderKey
143
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(Provider, _objectSpread(_objectSpread({}, ProviderProps), {}, {
144
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_hooks.FormContext.Provider, {
145
+ value: formRefObj,
146
+ children: children
147
+ })
148
+ })));
118
149
  };
119
150
  var _default = exports.default = Form;
@@ -1 +1 @@
1
- {"version":3,"file":"step.d.ts","sourceRoot":"","sources":["step.tsx"],"names":[],"mappings":";AAGA,OAAO,EAAa,aAAa,EAAE,MAAM,aAAa,CAAC;AAuGvD,QAAA,MAAM,gBAAgB,UAAW,aAAa,gBAE7C,CAAC;AAEF,eAAe,gBAAgB,CAAC"}
1
+ {"version":3,"file":"step.d.ts","sourceRoot":"","sources":["step.tsx"],"names":[],"mappings":";AAGA,OAAO,EAAa,aAAa,EAAE,MAAM,aAAa,CAAC;AA6GvD,QAAA,MAAM,gBAAgB,UAAW,aAAa,gBAE7C,CAAC;AAEF,eAAe,gBAAgB,CAAC"}
package/cjs/steps/step.js CHANGED
@@ -63,6 +63,7 @@ var Step = function Step(props) {
63
63
  var labelPlacement = getLabelPlacement();
64
64
  var rootClass = (0, _classnames.default)(styles.step, className, styles[status], _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, styles.disabled, disabled), styles.finish, current > index), styles.horizontalLabel, labelPlacement === 'horizontal'), styles.verticalLabel, labelPlacement === 'vertical'), styles.widthDescription, !!description));
65
65
  var handleChange = function handleChange(e) {
66
+ if (disabled) return;
66
67
  onClick === null || onClick === void 0 || onClick(e, index, id);
67
68
  onChange === null || onChange === void 0 || onChange(index);
68
69
  };
@@ -245,7 +245,7 @@ var Sticky = function Sticky(props) {
245
245
  cancelFixedObserver();
246
246
  context.fixedObserver = new IntersectionObserver(handleFixedInter, {
247
247
  root: null,
248
- rootMargin: "-".concat(top || 0, "px 0px -").concat(bottom || 0, "px 0px"),
248
+ rootMargin: "".concat(-(top || 0), "px 0px ").concat(-(bottom || 0), "px 0px"),
249
249
  threshold: 1.0
250
250
  });
251
251
  };
@@ -281,7 +281,7 @@ var Sticky = function Sticky(props) {
281
281
  if (window.IntersectionObserver) {
282
282
  var observer = new IntersectionObserver(handleTargetPosition, {
283
283
  root: context.target,
284
- rootMargin: "-".concat(top || 0, "px 0px -").concat(bottom || 0, "px 0px"),
284
+ rootMargin: "".concat(-(top || 0), "px 0px ").concat(-(bottom || 0), "px 0px"),
285
285
  threshold: 1.0
286
286
  });
287
287
  context.targetObserver = observer;
@@ -299,7 +299,7 @@ var Sticky = function Sticky(props) {
299
299
  cancelParentObserver();
300
300
  context.parentObserver = new IntersectionObserver(handleParentVisible, {
301
301
  root: context.target,
302
- rootMargin: "-".concat(top || 0, "px 0px -").concat(bottom || 0, "px 0px"),
302
+ rootMargin: "".concat(-(top || 0), "px 0px ").concat(-(bottom || 0), "px 0px"),
303
303
  threshold: 0
304
304
  });
305
305
  context.parentObserver.observe(props.parent);
@@ -1 +1 @@
1
- {"version":3,"file":"tr.d.ts","sourceRoot":"","sources":["tr.tsx"],"names":[],"mappings":";AAEA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAOvD,OAAO,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAI7D,UAAU,OACR,SAAQ,IAAI,CACV,UAAU,EACR,UAAU,GACV,cAAc,GACd,OAAO,GACP,UAAU,GACV,iBAAiB,GACjB,iBAAiB,GACjB,gBAAgB,GAChB,QAAQ,GACR,aAAa,GACb,cAAc,GACd,YAAY,GACZ,aAAa,GACb,SAAS,GACT,OAAO,GACP,YAAY,GACZ,cAAc,GACd,WAAW,GACX,iBAAiB,GACjB,YAAY,GACZ,cAAc,GACd,aAAa,CAChB;IACD,GAAG,EAAE;QACH,IAAI,EAAE,GAAG,EAAE,CAAC;QACZ,OAAO,EAAE,MAAM,CAAC;QAChB,OAAO,EAAE,MAAM,CAAC;KACjB,EAAE,CAAC;IACJ,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,iBAAiB,CAAC,GAAG,CAAC,EAAE,CAAC;IAClC,SAAS,EAAE,OAAO,CAAC;IACnB,QAAQ,EAAE,CAAC,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC,EAAE,CAAC;IAC1C,OAAO,EAAE,GAAG,CAAC;IACb,QAAQ,EAAE,OAAO,CAAC;IAClB,SAAS,EAAE,UAAU,CAAC,eAAe,CAAC,GAAG,SAAS,CAAC;IACnD,cAAc,EAAE,OAAO,CAAC;IACxB,iBAAiB,EAAE,CAAC,GAAG,EAAE,iBAAiB,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACnF,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,SAAS,EAAE,MAAM,GAAG,MAAM,CAAC;IAC3B,WAAW,EAAE,iBAAiB,CAAC,aAAa,CAAC,CAAC;IAC9C,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,eAAe,EAAE,iBAAiB,CAAC,iBAAiB,CAAC,CAAC;IACtD,UAAU,EAAE,iBAAiB,CAAC,YAAY,CAAC,CAAC;IAC5C,QAAQ,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,QAAA,MAAM,EAAE,UAAW,OAAO,gBAwYzB,CAAC;AAEF,eAAe,EAAE,CAAC"}
1
+ {"version":3,"file":"tr.d.ts","sourceRoot":"","sources":["tr.tsx"],"names":[],"mappings":";AAEA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAOvD,OAAO,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAI7D,UAAU,OACR,SAAQ,IAAI,CACV,UAAU,EACR,UAAU,GACV,cAAc,GACd,OAAO,GACP,UAAU,GACV,iBAAiB,GACjB,iBAAiB,GACjB,gBAAgB,GAChB,QAAQ,GACR,aAAa,GACb,cAAc,GACd,YAAY,GACZ,aAAa,GACb,SAAS,GACT,OAAO,GACP,YAAY,GACZ,cAAc,GACd,WAAW,GACX,iBAAiB,GACjB,YAAY,GACZ,cAAc,GACd,aAAa,CAChB;IACD,GAAG,EAAE;QACH,IAAI,EAAE,GAAG,EAAE,CAAC;QACZ,OAAO,EAAE,MAAM,CAAC;QAChB,OAAO,EAAE,MAAM,CAAC;KACjB,EAAE,CAAC;IACJ,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,iBAAiB,CAAC,GAAG,CAAC,EAAE,CAAC;IAClC,SAAS,EAAE,OAAO,CAAC;IACnB,QAAQ,EAAE,CAAC,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC,EAAE,CAAC;IAC1C,OAAO,EAAE,GAAG,CAAC;IACb,QAAQ,EAAE,OAAO,CAAC;IAClB,SAAS,EAAE,UAAU,CAAC,eAAe,CAAC,GAAG,SAAS,CAAC;IACnD,cAAc,EAAE,OAAO,CAAC;IACxB,iBAAiB,EAAE,CAAC,GAAG,EAAE,iBAAiB,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACnF,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,SAAS,EAAE,MAAM,GAAG,MAAM,CAAC;IAC3B,WAAW,EAAE,iBAAiB,CAAC,aAAa,CAAC,CAAC;IAC9C,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,eAAe,EAAE,iBAAiB,CAAC,iBAAiB,CAAC,CAAC;IACtD,UAAU,EAAE,iBAAiB,CAAC,YAAY,CAAC,CAAC;IAC5C,QAAQ,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,QAAA,MAAM,EAAE,UAAW,OAAO,gBA4YzB,CAAC;AAEF,eAAe,EAAE,CAAC"}
package/cjs/table/tr.js CHANGED
@@ -271,23 +271,30 @@ var Tr = function Tr(props) {
271
271
  var col = cols[i];
272
272
  if (data[i]) {
273
273
  var last = cols[i + (data[i].colSpan || 1) - 1] || {};
274
+ var isRowSpanTd = data[i].rowSpan > 1;
275
+ var $tdContent = renderContent(col, data[i].data);
274
276
  var td = /*#__PURE__*/(0, _jsxRuntime.jsx)("td", {
275
277
  colSpan: data[i].colSpan,
276
278
  rowSpan: data[i].rowSpan,
277
- onMouseEnter: props.hover && hasSiblingRowSpan || data[i].rowSpan > 1 ? function () {
279
+ onMouseEnter: props.hover && hasSiblingRowSpan || isRowSpanTd ? function () {
278
280
  props.handleCellHover(props.rowIndex, data[i].rowSpan);
279
281
  } : undefined,
280
- onMouseLeave: props.hover && hasSiblingRowSpan || data[i].rowSpan > 1 ? function () {
282
+ onMouseLeave: props.hover && hasSiblingRowSpan || isRowSpanTd ? function () {
281
283
  props.handleCellHover(-1, 0);
282
284
  } : undefined,
283
- className: (0, _classnames.default)(col.className, col.type === 'checkbox' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellCheckbox), col.fixed === 'left' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellFixedLeft), col.fixed === 'right' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellFixedRight), col.align === 'center' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellAlignCenter), col.align === 'right' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellAlignRight), (col.lastFixed || col.firstFixed || last.lastFixed) && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellFixedLast), lastRowIndex === i && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellIgnoreBorder), props.hoverIndex.has(props.rowIndex) && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellHover), data[i].rowSpan > 1 && props.isCellHover(props.rowIndex, data[i].rowSpan) && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellHover)),
285
+ className: (0, _classnames.default)(col.className, col.type === 'checkbox' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellCheckbox), col.fixed === 'left' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellFixedLeft), col.fixed === 'right' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellFixedRight), col.align === 'center' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellAlignCenter), col.align === 'right' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellAlignRight), (col.lastFixed || col.firstFixed || last.lastFixed) && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellFixedLast), lastRowIndex === i && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellIgnoreBorder), props.hoverIndex.has(props.rowIndex) && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellHover), isRowSpanTd && props.isCellHover(props.rowIndex, data[i].rowSpan) && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellHover)),
284
286
  style: getTdStyle(col, data[i].colSpan),
285
287
  dir: config.direction,
286
288
  "data-role": col.type === 'checkbox' ? 'checkbox' : undefined,
287
289
  onClick: props.onCellClick ? function () {
288
290
  return handleCellClick(data[i].data, i);
289
291
  } : undefined,
290
- children: renderContent(col, data[i].data)
292
+ children: isRowSpanTd ? /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
293
+ style: {
294
+ height: 0
295
+ },
296
+ children: $tdContent
297
+ }) : $tdContent
291
298
  }, col.key);
292
299
  tds.push(td);
293
300
  if (data[i].colSpan) skip = data[i].colSpan - 1;
@@ -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,oFA4Tf,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,oFAmUf,CAAC;AAEF,eAAe,UAAU,CAAC"}
@@ -69,7 +69,8 @@ var DatePicker = function DatePicker(props0) {
69
69
  oldDateArr = _React$useState8[0],
70
70
  setOldDateArr = _React$useState8[1];
71
71
  var inputRef = useRef({
72
- inputRef: null
72
+ inputRef: null,
73
+ inputRefs: []
73
74
  });
74
75
  var styles = jssStyle === null || jssStyle === void 0 || (_jssStyle$datePicker = jssStyle.datePicker) === null || _jssStyle$datePicker === void 0 ? void 0 : _jssStyle$datePicker.call(jssStyle);
75
76
  var isRTL = direction === 'rtl';
@@ -113,6 +114,7 @@ var DatePicker = function DatePicker(props0) {
113
114
  formatResult: props.formatResult,
114
115
  onPickerChange: props.onPickerChange
115
116
  }),
117
+ inputArr = _useDatePickerFormat.inputArr,
116
118
  resultArr = _useDatePickerFormat.resultArr,
117
119
  targetResultArr = _useDatePickerFormat.targetResultArr,
118
120
  dateArr = _useDatePickerFormat.dateArr,
@@ -183,13 +185,14 @@ var DatePicker = function DatePicker(props0) {
183
185
  (_props$onBlur = props.onBlur) === null || _props$onBlur === void 0 || _props$onBlur.call(props, e);
184
186
  });
185
187
  var handleClose = function handleClose(isFromConfirm) {
186
- var _inputRef$current$inp;
187
188
  setIsCloseFromConfirm(isFromConfirm || false);
188
189
  closePop();
189
190
  if (isFromConfirm) {
190
191
  func.finishEdit();
191
192
  }
192
- (_inputRef$current$inp = inputRef.current.inputRef) === null || _inputRef$current$inp === void 0 || _inputRef$current$inp.blur();
193
+ inputRef.current.inputRefs.forEach(function (el) {
194
+ el === null || el === void 0 || el.blur();
195
+ });
193
196
  };
194
197
  var handleResultClick = usePersistFn(function () {
195
198
  if (disabledStatus === 'all') return;
@@ -279,7 +282,9 @@ var DatePicker = function DatePicker(props0) {
279
282
  children: /*#__PURE__*/_jsx(Picker, {
280
283
  setTargetArr: func.setTargetArr,
281
284
  dateArr: dateArr,
285
+ inputArr: inputArr,
282
286
  setDateArr: func.setDateArr,
287
+ onClearInputArr: func.handleClearInputArr,
283
288
  currentArr: currentArr,
284
289
  range: range,
285
290
  setCurrentArr: func.setCurrentArrWithParams,
@@ -1 +1 @@
1
- {"version":3,"file":"day.d.ts","sourceRoot":"","sources":["day.tsx"],"names":[],"mappings":";AAQA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAI3C,QAAA,MAAM,GAAG,UAAW,QAAQ,gBA+R3B,CAAC;AAEF,eAAe,GAAG,CAAC"}
1
+ {"version":3,"file":"day.d.ts","sourceRoot":"","sources":["day.tsx"],"names":[],"mappings":";AAQA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAI3C,QAAA,MAAM,GAAG,UAAW,QAAQ,gBAgS3B,CAAC;AAEF,eAAe,GAAG,CAAC"}
@@ -35,7 +35,10 @@ var Day = function Day(props) {
35
35
  current: props.current,
36
36
  onCurrentChange: setCurrent,
37
37
  value: props.value,
38
+ range: props.range,
38
39
  onChange: onChange,
40
+ onClearInputArr: props.onClearInputArr,
41
+ position: props.position,
39
42
  min: props.min,
40
43
  max: props.max,
41
44
  type: props.type,
@@ -1 +1 @@
1
- {"version":3,"file":"picker.d.ts","sourceRoot":"","sources":["picker.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAU5C,QAAA,MAAM,MAAM,UAAW,WAAW,gBAoKjC,CAAC;AAEF,eAAe,MAAM,CAAC"}
1
+ {"version":3,"file":"picker.d.ts","sourceRoot":"","sources":["picker.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAU5C,QAAA,MAAM,MAAM,UAAW,WAAW,gBAuKjC,CAAC;AAEF,eAAe,MAAM,CAAC"}
@@ -29,6 +29,7 @@ var Picker = function Picker(props) {
29
29
  type: props.type,
30
30
  defaultTime: props.defaultTime,
31
31
  range: props.range,
32
+ inputArr: props.inputArr,
32
33
  dateArr: props.dateArr,
33
34
  setDateArr: props.setDateArr,
34
35
  currentArr: props.currentArr,
@@ -72,6 +73,7 @@ var Picker = function Picker(props) {
72
73
  setMode: position === 'end' ? func.setModeEnd : func.setModeStart,
73
74
  onChange: position === 'end' ? func.setDateEnd : func.setDateStart,
74
75
  setCurrent: position === 'end' ? func.setCurrentEnd : func.setCurrentStart,
76
+ onClearInputArr: props.onClearInputArr,
75
77
  type: props.type,
76
78
  format: props.format,
77
79
  disabled: position === 'end' ? func.endDisabled : func.startDisabled,
@@ -149,6 +151,7 @@ var Picker = function Picker(props) {
149
151
  jssStyle: jssStyle,
150
152
  dateArr: dateArr,
151
153
  type: type,
154
+ onClearInputArr: props.onClearInputArr,
152
155
  setDateArr: props.setDateArr,
153
156
  setCurrentArr: props.setCurrentArr,
154
157
  format: props.format,
@@ -12,9 +12,11 @@ export interface PickerProps {
12
12
  minuteStep?: DatePickerProps<any>['minuteStep'];
13
13
  secondStep?: DatePickerProps<any>['secondStep'];
14
14
  children?: DatePickerProps<any>['children'];
15
+ onClearInputArr: (index?: number | undefined) => void;
15
16
  format: string;
16
17
  type: string;
17
18
  dateArr: Array<Date | undefined>;
19
+ inputArr: (Date | undefined)[];
18
20
  setTargetArr: Dispatch<SetStateAction<Array<Date | undefined>>>;
19
21
  setDateArr: Dispatch<SetStateAction<Array<Date | undefined>>>;
20
22
  currentArr: Date[];
@@ -55,6 +57,7 @@ export interface CommonPickerProps extends Pick<PickerProps, 'jssStyle' | 'optio
55
57
  onMouseEnter?: () => void;
56
58
  onMouseLeave?: () => void;
57
59
  closeByConfirm?: () => void;
60
+ onClearInputArr: (index?: number | undefined) => void;
58
61
  }
59
62
  export interface CommonTimeProps extends Pick<PickerProps, 'disabledTime' | 'hourStep' | 'minuteStep' | 'secondStep'> {
60
63
  defaultTime: DateTimeType;
@@ -1 +1 @@
1
- {"version":3,"file":"picker.type.d.ts","sourceRoot":"","sources":["picker.type.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"picker.type.d.ts","sourceRoot":"","sources":["picker.type.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"quick.d.ts","sourceRoot":"","sources":["quick.tsx"],"names":[],"mappings":";AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAK/C,QAAA,MAAM,KAAK,UAAW,UAAU,gBAqE/B,CAAC;AAEF,eAAe,KAAK,CAAC"}
1
+ {"version":3,"file":"quick.d.ts","sourceRoot":"","sources":["quick.tsx"],"names":[],"mappings":";AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAK/C,QAAA,MAAM,KAAK,UAAW,UAAU,gBAsE/B,CAAC;AAEF,eAAe,KAAK,CAAC"}
@@ -7,6 +7,7 @@ var Quick = function Quick(props) {
7
7
  var jssStyle = props.jssStyle,
8
8
  quickSelect = props.quickSelect,
9
9
  format = props.format,
10
+ onClearInputArr = props.onClearInputArr,
10
11
  options = props.options,
11
12
  children = props.children,
12
13
  type = props.type,
@@ -30,6 +31,7 @@ var Quick = function Quick(props) {
30
31
  });
31
32
  props.setDateArr(dateArr);
32
33
  props.setCurrentArr(dateArr, 'quick', item);
34
+ onClearInputArr();
33
35
  if (immediate && closePop) {
34
36
  closePop();
35
37
  }
@@ -10,6 +10,7 @@ export interface QuickProps {
10
10
  range: PickerProps['range'];
11
11
  options: PickerProps['options'];
12
12
  children?: PickerProps['children'];
13
+ onClearInputArr: (index?: number | undefined) => void;
13
14
  closePop?: (isFromConfirm?: boolean | undefined) => void;
14
15
  }
15
16
  //# sourceMappingURL=quick.type.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"quick.type.d.ts","sourceRoot":"","sources":["quick.type.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,MAAM,WAAW,UAAU;IACzB,QAAQ,CAAC,EAAE,WAAW,CAAC,UAAU,CAAC,CAAC;IACnC,WAAW,CAAC,EAAE,WAAW,CAAC,aAAa,CAAC,CAAC;IACzC,IAAI,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IAC1B,OAAO,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;IAChC,UAAU,EAAE,WAAW,CAAC,YAAY,CAAC,CAAC;IACtC,MAAM,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC;IAC9B,aAAa,EAAE,WAAW,CAAC,eAAe,CAAC,CAAC;IAC5C,KAAK,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;IAC5B,OAAO,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;IAChC,QAAQ,CAAC,EAAE,WAAW,CAAC,UAAU,CAAC,CAAC;IACnC,QAAQ,CAAC,EAAE,CAAC,aAAa,CAAC,EAAE,OAAO,GAAG,SAAS,KAAK,IAAI,CAAC;CAC1D"}
1
+ {"version":3,"file":"quick.type.d.ts","sourceRoot":"","sources":["quick.type.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,MAAM,WAAW,UAAU;IACzB,QAAQ,CAAC,EAAE,WAAW,CAAC,UAAU,CAAC,CAAC;IACnC,WAAW,CAAC,EAAE,WAAW,CAAC,aAAa,CAAC,CAAC;IACzC,IAAI,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IAC1B,OAAO,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;IAChC,UAAU,EAAE,WAAW,CAAC,YAAY,CAAC,CAAC;IACtC,MAAM,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC;IAC9B,aAAa,EAAE,WAAW,CAAC,eAAe,CAAC,CAAC;IAC5C,KAAK,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;IAC5B,OAAO,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;IAChC,QAAQ,CAAC,EAAE,WAAW,CAAC,UAAU,CAAC,CAAC;IACnC,eAAe,EAAE,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,KAAK,IAAI,CAAC;IACtD,QAAQ,CAAC,EAAE,CAAC,aAAa,CAAC,EAAE,OAAO,GAAG,SAAS,KAAK,IAAI,CAAC;CAC1D"}
@@ -31,6 +31,7 @@ interface ResultProps extends Pick<DatePickerProps<string>, 'jssStyle' | 'type'
31
31
  activeIndex?: number;
32
32
  onRef: React.MutableRefObject<{
33
33
  inputRef: HTMLInputElement | null;
34
+ inputRefs: (HTMLInputElement | null)[];
34
35
  }>;
35
36
  onFocus?: (e: React.FocusEvent) => void;
36
37
  onBlur?: (e: React.FocusEvent) => void;
@@ -1 +1 @@
1
- {"version":3,"file":"result.d.ts","sourceRoot":"","sources":["result.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,KAAkD,MAAM,OAAO,CAAC;AAIvE,eAAO,MAAM,KAAK;;WAET,MAAM;;;;kBAIC,MAAM,KAAK,IAAI;mBACf,gBAAgB,KAAK,IAAI;uBACrB,gBAAgB,KAAK,IAAI;;;;;;mBAS7B,oBAAoB,KAAK,IAAI;mBAC7B,gBAAgB,KAAK,IAAI;kBAC1B,gBAAgB,KAAK,IAAI;oBACvB,gBAAgB,KAAK,IAAI;;iBA2CzC,CAAC;AACF,UAAU,WACR,SAAQ,IAAI,CACV,eAAe,CAAC,MAAM,CAAC,EACvB,UAAU,GAAG,MAAM,GAAG,WAAW,GAAG,OAAO,GAAG,aAAa,CAC5D;IACD,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,EAAE,OAAO,CAAC;IACd,eAAe,EAAE,KAAK,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IAC3C,SAAS,EAAE,KAAK,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IACrC,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACjD,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,KAAK,CAAC,gBAAgB,CAAC;QAC5B,QAAQ,EAAE,gBAAgB,GAAG,IAAI,CAAC;KACnC,CAAC,CAAC;IACH,OAAO,CAAC,EAAE,CAAC,CAAC,EAAE,KAAK,CAAC,UAAU,KAAK,IAAI,CAAC;IACxC,MAAM,CAAC,EAAE,CAAC,CAAC,EAAE,KAAK,CAAC,UAAU,KAAK,IAAI,CAAC;IACvC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,UAAU,KAAK,IAAI,CAAC;CAC1C;AACD,QAAA,MAAM,MAAM,UAAW,WAAW,gBA0JjC,CAAC;AAEF,eAAe,MAAM,CAAC"}
1
+ {"version":3,"file":"result.d.ts","sourceRoot":"","sources":["result.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,KAAkD,MAAM,OAAO,CAAC;AAIvE,eAAO,MAAM,KAAK;;WAET,MAAM;;;;kBAIC,MAAM,KAAK,IAAI;mBACf,gBAAgB,KAAK,IAAI;uBACrB,gBAAgB,KAAK,IAAI;;;;;;mBAS7B,oBAAoB,KAAK,IAAI;mBAC7B,gBAAgB,KAAK,IAAI;kBAC1B,gBAAgB,KAAK,IAAI;oBACvB,gBAAgB,KAAK,IAAI;;iBA2CzC,CAAC;AACF,UAAU,WACR,SAAQ,IAAI,CACV,eAAe,CAAC,MAAM,CAAC,EACvB,UAAU,GAAG,MAAM,GAAG,WAAW,GAAG,OAAO,GAAG,aAAa,CAC5D;IACD,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,EAAE,OAAO,CAAC;IACd,eAAe,EAAE,KAAK,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IAC3C,SAAS,EAAE,KAAK,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IACrC,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACjD,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,KAAK,CAAC,gBAAgB,CAAC;QAC5B,QAAQ,EAAE,gBAAgB,GAAG,IAAI,CAAC;QAClC,SAAS,EAAE,CAAC,gBAAgB,GAAG,IAAI,CAAC,EAAE,CAAC;KACxC,CAAC,CAAC;IACH,OAAO,CAAC,EAAE,CAAC,CAAC,EAAE,KAAK,CAAC,UAAU,KAAK,IAAI,CAAC;IACxC,MAAM,CAAC,EAAE,CAAC,CAAC,EAAE,KAAK,CAAC,UAAU,KAAK,IAAI,CAAC;IACvC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,UAAU,KAAK,IAAI,CAAC;CAC1C;AACD,QAAA,MAAM,MAAM,UAAW,WAAW,gBA2JjC,CAAC;AAEF,eAAe,MAAM,CAAC"}
@@ -135,6 +135,7 @@ var Result = function Result(props) {
135
135
  children: /*#__PURE__*/_jsx(Input, {
136
136
  onRef: function onRef(el) {
137
137
  _onRef.current.inputRef = el;
138
+ _onRef.current.inputRefs[info.index] = el;
138
139
  context.inputRefs[info.index] = el;
139
140
  },
140
141
  disabled: dis && info.inputable,
@@ -1 +1 @@
1
- {"version":3,"file":"form-button.d.ts","sourceRoot":"","sources":["form-button.tsx"],"names":[],"mappings":";AAKA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEzD,QAAA,MAAM,UAAU,UAAW,WAAW,gBAarC,CAAC;AAEF,eAAe,UAAU,CAAC"}
1
+ {"version":3,"file":"form-button.d.ts","sourceRoot":"","sources":["form-button.tsx"],"names":[],"mappings":";AAKA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEzD,QAAA,MAAM,UAAU,UAAW,WAAW,gBAmBrC,CAAC;AAEF,eAAe,UAAU,CAAC"}
@@ -18,6 +18,11 @@ var FormButton = function FormButton(props) {
18
18
  if (formFunc && props.htmlType === 'button') {
19
19
  formFunc.submit();
20
20
  }
21
+ if (formFunc && props.htmlType === 'reset') {
22
+ // 阻止默认的form reset,改用formFunc.reset。处理嵌套form的reset问题。
23
+ e.preventDefault();
24
+ formFunc.reset();
25
+ }
21
26
  if (props.onClick) {
22
27
  props.onClick(e);
23
28
  }
@@ -69,8 +69,7 @@ var FormFieldSet = function FormFieldSet(props) {
69
69
  });
70
70
  }
71
71
  valueArr.forEach(function (v, i) {
72
- var _context$ids$i;
73
- if (context.lastValues[i] !== v) {
72
+ if (context.lastValues.length !== valueArr.length) {
74
73
  context.ids[i] = util.generateUUID();
75
74
  }
76
75
  result.push( /*#__PURE__*/_jsx(Provider, {
@@ -119,7 +118,7 @@ var FormFieldSet = function FormFieldSet(props) {
119
118
  formFunc === null || formFunc === void 0 || formFunc.spliceError(name, i);
120
119
  }
121
120
  })
122
- }, (_context$ids$i = context.ids[i]) !== null && _context$ids$i !== void 0 ? _context$ids$i : i));
121
+ }, context.ids[i]));
123
122
  });
124
123
 
125
124
  // 更新 lastValues
@@ -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,4DA4FT,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,4DAsHT,CAAC;AAEF,eAAe,IAAI,CAAC"}
package/esm/form/form.js CHANGED
@@ -1,5 +1,11 @@
1
1
  function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
2
2
  var _excluded = ["jssStyle", "className", "style", "children", "formRef"];
3
+ function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
4
+ function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
5
+ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
6
+ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
7
+ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
8
+ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
3
9
  function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
4
10
  function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
5
11
  function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -7,11 +13,12 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
7
13
  function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
8
14
  function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
9
15
  function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
10
- import { FormContext, useForm, useInputAble, useLatestObj, usePersistFn } from '@sheinx/hooks';
16
+ import { FormContext, useForm, useInputAble, useLatestObj, usePersistFn, util } from '@sheinx/hooks';
11
17
  import classNames from 'classnames';
12
18
  import { useFormFooter } from "./form-footer-context";
13
- import React, { useEffect } from 'react';
19
+ import React, { useCallback, useEffect, useRef, useState } from 'react';
14
20
  import { jsx as _jsx } from "react/jsx-runtime";
21
+ import { createElement as _createElement } from "react";
15
22
  var Form = function Form(props) {
16
23
  var _jssStyle$form;
17
24
  var jssStyle = props.jssStyle,
@@ -52,6 +59,16 @@ var Form = function Form(props) {
52
59
  type: 'withValue'
53
60
  });
54
61
  });
62
+ var _useState = useState(0),
63
+ _useState2 = _slicedToArray(_useState, 2),
64
+ renderKey = _useState2[0],
65
+ setRenderKey = _useState2[1];
66
+ var handleOuterSet = useCallback(function (vals) {
67
+ formFunc.setValue(vals);
68
+ setRenderKey(function (prev) {
69
+ return prev + 1;
70
+ });
71
+ }, [formFunc]);
55
72
  var formRefObj = useLatestObj({
56
73
  clearValidate: formFunc.clearValidate,
57
74
  getValue: formFunc.getValue,
@@ -61,7 +78,7 @@ var Form = function Form(props) {
61
78
  validateFields: validateFields,
62
79
  validateFieldsWithValue: validateFieldsWithValue,
63
80
  validateFieldsWithError: formFunc.validateFields,
64
- set: formFunc.setValue,
81
+ set: handleOuterSet,
65
82
  scrollToField: formFunc.scrollToField
66
83
  });
67
84
  React.useEffect(function () {
@@ -95,16 +112,31 @@ var Form = function Form(props) {
95
112
  handleFormModalInfo();
96
113
  }, [props.disabled, props.pending]);
97
114
  var rootClass = classNames([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)]);
98
- return /*#__PURE__*/_jsx("form", _objectSpread(_objectSpread({}, getFormProps({
115
+ var formProps = getFormProps({
99
116
  className: rootClass,
100
117
  style: style
118
+ });
119
+ var formElRef = useRef(null);
120
+ useEffect(function () {
121
+ if (formElRef.current instanceof HTMLFormElement) {
122
+ formElRef.current.addEventListener('submit', formProps.onSubmit);
123
+ }
124
+ return function () {
125
+ if (formElRef.current instanceof HTMLFormElement) {
126
+ formElRef.current.removeEventListener('submit', formProps.onSubmit);
127
+ }
128
+ };
129
+ }, [formProps.onSubmit]);
130
+ return /*#__PURE__*/_createElement("form", _objectSpread(_objectSpread({}, util.removeProps(formProps, {
131
+ onSubmit: true
101
132
  })), {}, {
102
- children: /*#__PURE__*/_jsx(Provider, _objectSpread(_objectSpread({}, ProviderProps), {}, {
103
- children: /*#__PURE__*/_jsx(FormContext.Provider, {
104
- value: formRefObj,
105
- children: children
106
- })
107
- }))
108
- }));
133
+ ref: formElRef,
134
+ key: renderKey
135
+ }), /*#__PURE__*/_jsx(Provider, _objectSpread(_objectSpread({}, ProviderProps), {}, {
136
+ children: /*#__PURE__*/_jsx(FormContext.Provider, {
137
+ value: formRefObj,
138
+ children: children
139
+ })
140
+ })));
109
141
  };
110
142
  export default Form;
@@ -1 +1 @@
1
- {"version":3,"file":"step.d.ts","sourceRoot":"","sources":["step.tsx"],"names":[],"mappings":";AAGA,OAAO,EAAa,aAAa,EAAE,MAAM,aAAa,CAAC;AAuGvD,QAAA,MAAM,gBAAgB,UAAW,aAAa,gBAE7C,CAAC;AAEF,eAAe,gBAAgB,CAAC"}
1
+ {"version":3,"file":"step.d.ts","sourceRoot":"","sources":["step.tsx"],"names":[],"mappings":";AAGA,OAAO,EAAa,aAAa,EAAE,MAAM,aAAa,CAAC;AA6GvD,QAAA,MAAM,gBAAgB,UAAW,aAAa,gBAE7C,CAAC;AAEF,eAAe,gBAAgB,CAAC"}
package/esm/steps/step.js CHANGED
@@ -56,6 +56,7 @@ var Step = function Step(props) {
56
56
  var labelPlacement = getLabelPlacement();
57
57
  var rootClass = classNames(styles.step, className, styles[status], _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, styles.disabled, disabled), styles.finish, current > index), styles.horizontalLabel, labelPlacement === 'horizontal'), styles.verticalLabel, labelPlacement === 'vertical'), styles.widthDescription, !!description));
58
58
  var handleChange = function handleChange(e) {
59
+ if (disabled) return;
59
60
  onClick === null || onClick === void 0 || onClick(e, index, id);
60
61
  onChange === null || onChange === void 0 || onChange(index);
61
62
  };
@@ -239,7 +239,7 @@ var Sticky = function Sticky(props) {
239
239
  cancelFixedObserver();
240
240
  context.fixedObserver = new IntersectionObserver(handleFixedInter, {
241
241
  root: null,
242
- rootMargin: "-".concat(top || 0, "px 0px -").concat(bottom || 0, "px 0px"),
242
+ rootMargin: "".concat(-(top || 0), "px 0px ").concat(-(bottom || 0), "px 0px"),
243
243
  threshold: 1.0
244
244
  });
245
245
  };
@@ -275,7 +275,7 @@ var Sticky = function Sticky(props) {
275
275
  if (window.IntersectionObserver) {
276
276
  var observer = new IntersectionObserver(handleTargetPosition, {
277
277
  root: context.target,
278
- rootMargin: "-".concat(top || 0, "px 0px -").concat(bottom || 0, "px 0px"),
278
+ rootMargin: "".concat(-(top || 0), "px 0px ").concat(-(bottom || 0), "px 0px"),
279
279
  threshold: 1.0
280
280
  });
281
281
  context.targetObserver = observer;
@@ -293,7 +293,7 @@ var Sticky = function Sticky(props) {
293
293
  cancelParentObserver();
294
294
  context.parentObserver = new IntersectionObserver(handleParentVisible, {
295
295
  root: context.target,
296
- rootMargin: "-".concat(top || 0, "px 0px -").concat(bottom || 0, "px 0px"),
296
+ rootMargin: "".concat(-(top || 0), "px 0px ").concat(-(bottom || 0), "px 0px"),
297
297
  threshold: 0
298
298
  });
299
299
  context.parentObserver.observe(props.parent);
@@ -1 +1 @@
1
- {"version":3,"file":"tr.d.ts","sourceRoot":"","sources":["tr.tsx"],"names":[],"mappings":";AAEA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAOvD,OAAO,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAI7D,UAAU,OACR,SAAQ,IAAI,CACV,UAAU,EACR,UAAU,GACV,cAAc,GACd,OAAO,GACP,UAAU,GACV,iBAAiB,GACjB,iBAAiB,GACjB,gBAAgB,GAChB,QAAQ,GACR,aAAa,GACb,cAAc,GACd,YAAY,GACZ,aAAa,GACb,SAAS,GACT,OAAO,GACP,YAAY,GACZ,cAAc,GACd,WAAW,GACX,iBAAiB,GACjB,YAAY,GACZ,cAAc,GACd,aAAa,CAChB;IACD,GAAG,EAAE;QACH,IAAI,EAAE,GAAG,EAAE,CAAC;QACZ,OAAO,EAAE,MAAM,CAAC;QAChB,OAAO,EAAE,MAAM,CAAC;KACjB,EAAE,CAAC;IACJ,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,iBAAiB,CAAC,GAAG,CAAC,EAAE,CAAC;IAClC,SAAS,EAAE,OAAO,CAAC;IACnB,QAAQ,EAAE,CAAC,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC,EAAE,CAAC;IAC1C,OAAO,EAAE,GAAG,CAAC;IACb,QAAQ,EAAE,OAAO,CAAC;IAClB,SAAS,EAAE,UAAU,CAAC,eAAe,CAAC,GAAG,SAAS,CAAC;IACnD,cAAc,EAAE,OAAO,CAAC;IACxB,iBAAiB,EAAE,CAAC,GAAG,EAAE,iBAAiB,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACnF,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,SAAS,EAAE,MAAM,GAAG,MAAM,CAAC;IAC3B,WAAW,EAAE,iBAAiB,CAAC,aAAa,CAAC,CAAC;IAC9C,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,eAAe,EAAE,iBAAiB,CAAC,iBAAiB,CAAC,CAAC;IACtD,UAAU,EAAE,iBAAiB,CAAC,YAAY,CAAC,CAAC;IAC5C,QAAQ,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,QAAA,MAAM,EAAE,UAAW,OAAO,gBAwYzB,CAAC;AAEF,eAAe,EAAE,CAAC"}
1
+ {"version":3,"file":"tr.d.ts","sourceRoot":"","sources":["tr.tsx"],"names":[],"mappings":";AAEA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAOvD,OAAO,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAI7D,UAAU,OACR,SAAQ,IAAI,CACV,UAAU,EACR,UAAU,GACV,cAAc,GACd,OAAO,GACP,UAAU,GACV,iBAAiB,GACjB,iBAAiB,GACjB,gBAAgB,GAChB,QAAQ,GACR,aAAa,GACb,cAAc,GACd,YAAY,GACZ,aAAa,GACb,SAAS,GACT,OAAO,GACP,YAAY,GACZ,cAAc,GACd,WAAW,GACX,iBAAiB,GACjB,YAAY,GACZ,cAAc,GACd,aAAa,CAChB;IACD,GAAG,EAAE;QACH,IAAI,EAAE,GAAG,EAAE,CAAC;QACZ,OAAO,EAAE,MAAM,CAAC;QAChB,OAAO,EAAE,MAAM,CAAC;KACjB,EAAE,CAAC;IACJ,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,iBAAiB,CAAC,GAAG,CAAC,EAAE,CAAC;IAClC,SAAS,EAAE,OAAO,CAAC;IACnB,QAAQ,EAAE,CAAC,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC,EAAE,CAAC;IAC1C,OAAO,EAAE,GAAG,CAAC;IACb,QAAQ,EAAE,OAAO,CAAC;IAClB,SAAS,EAAE,UAAU,CAAC,eAAe,CAAC,GAAG,SAAS,CAAC;IACnD,cAAc,EAAE,OAAO,CAAC;IACxB,iBAAiB,EAAE,CAAC,GAAG,EAAE,iBAAiB,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACnF,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,SAAS,EAAE,MAAM,GAAG,MAAM,CAAC;IAC3B,WAAW,EAAE,iBAAiB,CAAC,aAAa,CAAC,CAAC;IAC9C,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,eAAe,EAAE,iBAAiB,CAAC,iBAAiB,CAAC,CAAC;IACtD,UAAU,EAAE,iBAAiB,CAAC,YAAY,CAAC,CAAC;IAC5C,QAAQ,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,QAAA,MAAM,EAAE,UAAW,OAAO,gBA4YzB,CAAC;AAEF,eAAe,EAAE,CAAC"}
package/esm/table/tr.js CHANGED
@@ -265,23 +265,30 @@ var Tr = function Tr(props) {
265
265
  var col = cols[i];
266
266
  if (data[i]) {
267
267
  var last = cols[i + (data[i].colSpan || 1) - 1] || {};
268
+ var isRowSpanTd = data[i].rowSpan > 1;
269
+ var $tdContent = renderContent(col, data[i].data);
268
270
  var td = /*#__PURE__*/_jsx("td", {
269
271
  colSpan: data[i].colSpan,
270
272
  rowSpan: data[i].rowSpan,
271
- onMouseEnter: props.hover && hasSiblingRowSpan || data[i].rowSpan > 1 ? function () {
273
+ onMouseEnter: props.hover && hasSiblingRowSpan || isRowSpanTd ? function () {
272
274
  props.handleCellHover(props.rowIndex, data[i].rowSpan);
273
275
  } : undefined,
274
- onMouseLeave: props.hover && hasSiblingRowSpan || data[i].rowSpan > 1 ? function () {
276
+ onMouseLeave: props.hover && hasSiblingRowSpan || isRowSpanTd ? function () {
275
277
  props.handleCellHover(-1, 0);
276
278
  } : undefined,
277
- className: classNames(col.className, col.type === 'checkbox' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellCheckbox), col.fixed === 'left' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellFixedLeft), col.fixed === 'right' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellFixedRight), col.align === 'center' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellAlignCenter), col.align === 'right' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellAlignRight), (col.lastFixed || col.firstFixed || last.lastFixed) && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellFixedLast), lastRowIndex === i && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellIgnoreBorder), props.hoverIndex.has(props.rowIndex) && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellHover), data[i].rowSpan > 1 && props.isCellHover(props.rowIndex, data[i].rowSpan) && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellHover)),
279
+ className: classNames(col.className, col.type === 'checkbox' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellCheckbox), col.fixed === 'left' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellFixedLeft), col.fixed === 'right' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellFixedRight), col.align === 'center' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellAlignCenter), col.align === 'right' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellAlignRight), (col.lastFixed || col.firstFixed || last.lastFixed) && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellFixedLast), lastRowIndex === i && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellIgnoreBorder), props.hoverIndex.has(props.rowIndex) && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellHover), isRowSpanTd && props.isCellHover(props.rowIndex, data[i].rowSpan) && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellHover)),
278
280
  style: getTdStyle(col, data[i].colSpan),
279
281
  dir: config.direction,
280
282
  "data-role": col.type === 'checkbox' ? 'checkbox' : undefined,
281
283
  onClick: props.onCellClick ? function () {
282
284
  return handleCellClick(data[i].data, i);
283
285
  } : undefined,
284
- children: renderContent(col, data[i].data)
286
+ children: isRowSpanTd ? /*#__PURE__*/_jsx("div", {
287
+ style: {
288
+ height: 0
289
+ },
290
+ children: $tdContent
291
+ }) : $tdContent
285
292
  }, col.key);
286
293
  tds.push(td);
287
294
  if (data[i].colSpan) skip = data[i].colSpan - 1;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@sheinx/base",
3
- "version": "3.5.4-beta.1",
3
+ "version": "3.5.4-beta.11",
4
4
  "description": "",
5
5
  "keywords": [],
6
6
  "license": "MIT",
@@ -10,7 +10,7 @@
10
10
  "module": "./esm/index.js",
11
11
  "typings": "./cjs/index.d.ts",
12
12
  "dependencies": {
13
- "@sheinx/hooks": "3.5.4-beta.1",
13
+ "@sheinx/hooks": "3.5.4-beta.11",
14
14
  "immer": "^10.0.0",
15
15
  "classnames": "^2.0.0",
16
16
  "@shined/reactive": "^0.1.3-alpha.0"