@sheinx/hooks 3.7.0-beta.9 → 3.7.0

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 (147) hide show
  1. package/cjs/common/use-component-memo/index.d.ts +1 -1
  2. package/cjs/common/use-component-memo/index.d.ts.map +1 -1
  3. package/cjs/common/use-component-memo/index.js +2 -9
  4. package/cjs/common/use-component-memo/use-memo.d.ts +1 -1
  5. package/cjs/common/use-component-memo/use-memo.d.ts.map +1 -1
  6. package/cjs/common/use-component-memo/use-memo.js +2 -2
  7. package/cjs/common/use-filter/index.d.ts +1 -0
  8. package/cjs/common/use-filter/index.d.ts.map +1 -1
  9. package/cjs/common/use-filter/index.js +7 -0
  10. package/cjs/common/use-filter/use-filter-context.d.ts +7 -0
  11. package/cjs/common/use-filter/use-filter-context.d.ts.map +1 -0
  12. package/cjs/common/use-filter/use-filter-context.js +10 -0
  13. package/cjs/common/use-filter/use-filter.d.ts +1 -0
  14. package/cjs/common/use-filter/use-filter.d.ts.map +1 -1
  15. package/cjs/common/use-filter/use-filter.js +2 -0
  16. package/cjs/common/use-position-style/check-element-size.d.ts +10 -0
  17. package/cjs/common/use-position-style/check-element-size.d.ts.map +1 -0
  18. package/cjs/common/use-position-style/check-element-size.js +65 -0
  19. package/cjs/common/use-position-style/index.d.ts.map +1 -1
  20. package/cjs/common/use-position-style/index.js +5 -1
  21. package/cjs/components/use-datepicker/index.d.ts +1 -1
  22. package/cjs/components/use-datepicker/index.d.ts.map +1 -1
  23. package/cjs/components/use-datepicker/index.js +23 -2
  24. package/cjs/components/use-datepicker/use-datepicker-format.d.ts +17 -0
  25. package/cjs/components/use-datepicker/use-datepicker-format.d.ts.map +1 -1
  26. package/cjs/components/use-datepicker/use-datepicker-format.js +15 -3
  27. package/cjs/components/use-form/use-form-control/use-form-control.d.ts.map +1 -1
  28. package/cjs/components/use-form/use-form-control/use-form-control.js +9 -4
  29. package/cjs/components/use-form/use-form.d.ts +4 -4
  30. package/cjs/components/use-form/use-form.d.ts.map +1 -1
  31. package/cjs/components/use-form/use-form.js +31 -25
  32. package/cjs/components/use-form/use-form.type.d.ts +8 -0
  33. package/cjs/components/use-form/use-form.type.d.ts.map +1 -1
  34. package/cjs/components/use-image/use-image.d.ts +2 -0
  35. package/cjs/components/use-image/use-image.d.ts.map +1 -1
  36. package/cjs/components/use-image/use-image.js +40 -2
  37. package/cjs/components/use-popup/popup-context.d.ts +2 -0
  38. package/cjs/components/use-popup/popup-context.d.ts.map +1 -1
  39. package/cjs/components/use-popup/popup-context.js +2 -0
  40. package/cjs/components/use-popup/use-popup.d.ts +4 -0
  41. package/cjs/components/use-popup/use-popup.d.ts.map +1 -1
  42. package/cjs/components/use-popup/use-popup.js +33 -13
  43. package/cjs/components/use-table/index.d.ts +1 -1
  44. package/cjs/components/use-table/index.d.ts.map +1 -1
  45. package/cjs/components/use-table/use-table-filter.d.ts.map +1 -1
  46. package/cjs/components/use-table/use-table-filter.js +2 -1
  47. package/cjs/components/use-table/use-table-group.d.ts.map +1 -1
  48. package/cjs/components/use-table/use-table-group.js +3 -1
  49. package/cjs/components/use-table/use-table-layout.d.ts.map +1 -1
  50. package/cjs/components/use-table/use-table-layout.js +0 -1
  51. package/cjs/components/use-table/use-table-virtual.js +1 -1
  52. package/cjs/components/use-table/use-table.type.d.ts +13 -21
  53. package/cjs/components/use-table/use-table.type.d.ts.map +1 -1
  54. package/cjs/components/use-tree/use-tree.d.ts.map +1 -1
  55. package/cjs/components/use-tree/use-tree.js +25 -7
  56. package/cjs/components/use-tree/use-tree.type.d.ts +1 -0
  57. package/cjs/components/use-tree/use-tree.type.d.ts.map +1 -1
  58. package/cjs/components/use-upload/use-upload.d.ts.map +1 -1
  59. package/cjs/components/use-upload/use-upload.js +54 -34
  60. package/cjs/components/use-upload/use-upload.type.d.ts +7 -0
  61. package/cjs/components/use-upload/use-upload.type.d.ts.map +1 -1
  62. package/cjs/utils/clean-props.d.ts +11 -0
  63. package/cjs/utils/clean-props.d.ts.map +1 -0
  64. package/cjs/utils/clean-props.js +21 -0
  65. package/cjs/utils/highlight.d.ts +7 -0
  66. package/cjs/utils/highlight.d.ts.map +1 -0
  67. package/cjs/utils/highlight.js +67 -0
  68. package/cjs/utils/index.d.ts +2 -0
  69. package/cjs/utils/index.d.ts.map +1 -1
  70. package/cjs/utils/index.js +24 -0
  71. package/cjs/utils/string.d.ts +1 -0
  72. package/cjs/utils/string.d.ts.map +1 -1
  73. package/cjs/utils/string.js +13 -0
  74. package/esm/common/use-component-memo/index.d.ts +1 -1
  75. package/esm/common/use-component-memo/index.d.ts.map +1 -1
  76. package/esm/common/use-component-memo/index.js +1 -1
  77. package/esm/common/use-component-memo/use-memo.d.ts +1 -1
  78. package/esm/common/use-component-memo/use-memo.d.ts.map +1 -1
  79. package/esm/common/use-component-memo/use-memo.js +1 -1
  80. package/esm/common/use-filter/index.d.ts +1 -0
  81. package/esm/common/use-filter/index.d.ts.map +1 -1
  82. package/esm/common/use-filter/index.js +2 -1
  83. package/esm/common/use-filter/use-filter-context.d.ts +7 -0
  84. package/esm/common/use-filter/use-filter-context.d.ts.map +1 -0
  85. package/esm/common/use-filter/use-filter-context.js +3 -0
  86. package/esm/common/use-filter/use-filter.d.ts +1 -0
  87. package/esm/common/use-filter/use-filter.d.ts.map +1 -1
  88. package/esm/common/use-filter/use-filter.js +2 -0
  89. package/esm/common/use-position-style/check-element-size.d.ts +10 -0
  90. package/esm/common/use-position-style/check-element-size.d.ts.map +1 -0
  91. package/esm/common/use-position-style/check-element-size.js +59 -0
  92. package/esm/common/use-position-style/index.d.ts.map +1 -1
  93. package/esm/common/use-position-style/index.js +5 -1
  94. package/esm/components/use-datepicker/index.d.ts +1 -1
  95. package/esm/components/use-datepicker/index.d.ts.map +1 -1
  96. package/esm/components/use-datepicker/index.js +1 -1
  97. package/esm/components/use-datepicker/use-datepicker-format.d.ts +17 -0
  98. package/esm/components/use-datepicker/use-datepicker-format.d.ts.map +1 -1
  99. package/esm/components/use-datepicker/use-datepicker-format.js +14 -2
  100. package/esm/components/use-form/use-form-control/use-form-control.d.ts.map +1 -1
  101. package/esm/components/use-form/use-form-control/use-form-control.js +9 -4
  102. package/esm/components/use-form/use-form.d.ts +4 -4
  103. package/esm/components/use-form/use-form.d.ts.map +1 -1
  104. package/esm/components/use-form/use-form.js +31 -25
  105. package/esm/components/use-form/use-form.type.d.ts +8 -0
  106. package/esm/components/use-form/use-form.type.d.ts.map +1 -1
  107. package/esm/components/use-image/use-image.d.ts +2 -0
  108. package/esm/components/use-image/use-image.d.ts.map +1 -1
  109. package/esm/components/use-image/use-image.js +40 -2
  110. package/esm/components/use-popup/popup-context.d.ts +2 -0
  111. package/esm/components/use-popup/popup-context.d.ts.map +1 -1
  112. package/esm/components/use-popup/popup-context.js +2 -0
  113. package/esm/components/use-popup/use-popup.d.ts +4 -0
  114. package/esm/components/use-popup/use-popup.d.ts.map +1 -1
  115. package/esm/components/use-popup/use-popup.js +34 -14
  116. package/esm/components/use-table/index.d.ts +1 -1
  117. package/esm/components/use-table/index.d.ts.map +1 -1
  118. package/esm/components/use-table/use-table-filter.d.ts.map +1 -1
  119. package/esm/components/use-table/use-table-filter.js +2 -1
  120. package/esm/components/use-table/use-table-group.d.ts.map +1 -1
  121. package/esm/components/use-table/use-table-group.js +3 -1
  122. package/esm/components/use-table/use-table-layout.d.ts.map +1 -1
  123. package/esm/components/use-table/use-table-layout.js +0 -1
  124. package/esm/components/use-table/use-table-virtual.js +1 -1
  125. package/esm/components/use-table/use-table.type.d.ts +13 -21
  126. package/esm/components/use-table/use-table.type.d.ts.map +1 -1
  127. package/esm/components/use-tree/use-tree.d.ts.map +1 -1
  128. package/esm/components/use-tree/use-tree.js +26 -8
  129. package/esm/components/use-tree/use-tree.type.d.ts +1 -0
  130. package/esm/components/use-tree/use-tree.type.d.ts.map +1 -1
  131. package/esm/components/use-upload/use-upload.d.ts.map +1 -1
  132. package/esm/components/use-upload/use-upload.js +54 -34
  133. package/esm/components/use-upload/use-upload.type.d.ts +7 -0
  134. package/esm/components/use-upload/use-upload.type.d.ts.map +1 -1
  135. package/esm/utils/clean-props.d.ts +11 -0
  136. package/esm/utils/clean-props.d.ts.map +1 -0
  137. package/esm/utils/clean-props.js +15 -0
  138. package/esm/utils/highlight.d.ts +7 -0
  139. package/esm/utils/highlight.d.ts.map +1 -0
  140. package/esm/utils/highlight.js +59 -0
  141. package/esm/utils/index.d.ts +2 -0
  142. package/esm/utils/index.d.ts.map +1 -1
  143. package/esm/utils/index.js +3 -1
  144. package/esm/utils/string.d.ts +1 -0
  145. package/esm/utils/string.d.ts.map +1 -1
  146. package/esm/utils/string.js +12 -0
  147. package/package.json +1 -1
@@ -1,5 +1,22 @@
1
1
  import React from 'react';
2
2
  import type { DatePickerModeType, DatePickerValueType, UseDatePickerFormatProps } from './use-datepicker-format.type';
3
+ export declare const convertValueToDateArr: (value: DatePickerValueType, format: string, options: {
4
+ timeZone?: string;
5
+ weekStartsOn?: number;
6
+ }) => (Date | undefined)[];
7
+ export declare const getFormat: (format: string | undefined, type: string) => string;
8
+ interface FormatValueType {
9
+ dateArr: (Date | undefined)[];
10
+ format: string;
11
+ fmt?: string;
12
+ type: 'date' | 'datetime' | 'month' | 'time' | 'week' | 'year' | 'quarter';
13
+ clearWithUndefined?: boolean;
14
+ options: {
15
+ timeZone?: string;
16
+ weekStartsOn?: number;
17
+ };
18
+ }
19
+ export declare const getFormatValueArr: (opts: FormatValueType) => (string | undefined)[];
3
20
  declare const useDatePickerFormat: <Value extends DatePickerValueType>(props: UseDatePickerFormatProps<Value>) => {
4
21
  inputArr: (Date | undefined)[];
5
22
  resultArr: (string | undefined)[];
@@ -1 +1 @@
1
- {"version":3,"file":"use-datepicker-format.d.ts","sourceRoot":"","sources":["use-datepicker-format.ts"],"names":[],"mappings":"AAAA,OAAO,KAAsC,MAAM,OAAO,CAAC;AAE3D,OAAO,KAAK,EACV,kBAAkB,EAClB,mBAAmB,EACnB,wBAAwB,EACzB,MAAM,8BAA8B,CAAC;AAkEtC,QAAA,MAAM,mBAAmB;;;;;;;;;;;;;;;;;0BA2Me,gBAAgB;sCAiEJ,MAAM;iCA7BX,MAAM,SAAS,MAAM;yCA5LrD,OAAO,GAAG,KAAK,GAAG,SAAS,QAAQ,MAAM,UAAU,IAAI,KAAK,OAAO;uCAWvE,MAAM,cAAc,CAAC,IAAI,EAAE,CAAC,QAC3B,MAAM;kBACG,MAAM,SAAS;mBAAS,GAAG;;+BA4CrC,IAAI,YAAY,OAAO,GAAG,KAAK,GAAG,SAAS,gBAAgB,MAAM;;CA4N3E,CAAC;AAEF,eAAe,mBAAmB,CAAC"}
1
+ {"version":3,"file":"use-datepicker-format.d.ts","sourceRoot":"","sources":["use-datepicker-format.ts"],"names":[],"mappings":"AAAA,OAAO,KAAsC,MAAM,OAAO,CAAC;AAE3D,OAAO,KAAK,EACV,kBAAkB,EAClB,mBAAmB,EACnB,wBAAwB,EACzB,MAAM,8BAA8B,CAAC;AAKtC,eAAO,MAAM,qBAAqB,UACzB,mBAAmB,UAClB,MAAM,WACL;IACP,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,yBAOF,CAAC;AAEF,eAAO,MAAM,SAAS,WAAY,MAAM,GAAG,SAAS,QAAQ,MAAM,WAkBjE,CAAC;AA4BF,UAAU,eAAe;IACvB,OAAO,EAAE,CAAC,IAAI,GAAG,SAAS,CAAC,EAAE,CAAC;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,GAAG,UAAU,GAAG,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;IAC3E,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,OAAO,EAAE;QACP,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,YAAY,CAAC,EAAE,MAAM,CAAC;KACvB,CAAC;CACH;AAED,eAAO,MAAM,iBAAiB,SAAU,eAAe,2BAOtD,CAAC;AAEF,QAAA,MAAM,mBAAmB;;;;;;;;;;;;;;;;;0BA6Me,gBAAgB;sCAiEJ,MAAM;iCA7BX,MAAM,SAAS,MAAM;yCA9LrD,OAAO,GAAG,KAAK,GAAG,SAAS,QAAQ,MAAM,UAAU,IAAI,KAAK,OAAO;uCAWvE,MAAM,cAAc,CAAC,IAAI,EAAE,CAAC,QAC3B,MAAM;kBACG,MAAM,SAAS;mBAAS,GAAG;;+BA4CrC,IAAI,YAAY,OAAO,GAAG,KAAK,GAAG,SAAS,gBAAgB,MAAM;;CA8N3E,CAAC;AAEF,eAAe,mBAAmB,CAAC"}
@@ -13,14 +13,14 @@ import dateUtil from "./util";
13
13
  import shallowEqual from "../../utils/shallow-equal";
14
14
  import { usePersistFn } from "../../common/use-persist-fn";
15
15
  import useLatestObj from "../../common/use-latest-obj";
16
- var convertValueToDateArr = function convertValueToDateArr(value, format, options) {
16
+ export var convertValueToDateArr = function convertValueToDateArr(value, format, options) {
17
17
  var valueArr = Array.isArray(value) ? value : [value];
18
18
  return valueArr.map(function (item) {
19
19
  if (!item) return undefined;
20
20
  return dateUtil.toDateWithFormat(item, format, undefined, options);
21
21
  });
22
22
  };
23
- var getFormat = function getFormat(format, type) {
23
+ export var getFormat = function getFormat(format, type) {
24
24
  if (typeof format === 'string') return format;
25
25
  switch (type) {
26
26
  case 'datetime':
@@ -63,6 +63,18 @@ var getDefaultMode = function getDefaultMode(type) {
63
63
  var mode = getTypeMode(type);
64
64
  return [mode, mode];
65
65
  };
66
+ export var getFormatValueArr = function getFormatValueArr(opts) {
67
+ var dateArr = opts.dateArr,
68
+ format = opts.format,
69
+ clearWithUndefined = opts.clearWithUndefined,
70
+ options = opts.options,
71
+ type = opts.type;
72
+ var fmt = getFormat(format, type);
73
+ return dateArr.map(function (item) {
74
+ if (!item) return clearWithUndefined ? undefined : '';
75
+ return dateUtil.format(item, fmt, options);
76
+ });
77
+ };
66
78
  var useDatePickerFormat = function useDatePickerFormat(props) {
67
79
  var value = props.value,
68
80
  onChange = props.onChange,
@@ -1 +1 @@
1
- {"version":3,"file":"use-form-control.d.ts","sourceRoot":"","sources":["use-form-control.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,oBAAoB,EAAsB,MAAM,yBAAyB,CAAC;AA2BnF,MAAM,CAAC,OAAO,UAAU,cAAc,CAAC,CAAC,EAAE,KAAK,EAAE,oBAAoB,CAAC,CAAC,CAAC;;kBAiJpC,CAAC,YAAY,GAAG,EAAE;;;;;EAwDrD"}
1
+ {"version":3,"file":"use-form-control.d.ts","sourceRoot":"","sources":["use-form-control.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,oBAAoB,EAAsB,MAAM,yBAAyB,CAAC;AA4BnF,MAAM,CAAC,OAAO,UAAU,cAAc,CAAC,CAAC,EAAE,KAAK,EAAE,oBAAoB,CAAC,CAAC,CAAC;;kBAiJpC,CAAC,YAAY,GAAG,EAAE;;;;;EA4DrD"}
@@ -20,6 +20,7 @@ import { shallowEqual } from "../../../utils/shallow-equal";
20
20
  import usePersistFn from "../../../common/use-persist-fn";
21
21
  import useLatestObj from "../../../common/use-latest-obj";
22
22
  import { devUseWarning } from "../../../utils/warning";
23
+ import { cleanProps } from "../../../utils/clean-props";
23
24
  var getValue = function getValue(name, formValue) {
24
25
  if (!name) return undefined;
25
26
  if (isArray(name)) {
@@ -148,7 +149,7 @@ export default function useFormControl(props) {
148
149
  }
149
150
  };
150
151
  var fullRules = (controlFunc === null || controlFunc === void 0 ? void 0 : controlFunc.combineRules(name, rules || [])) || [];
151
- return validate(v, formV, fullRules, validateProps).then(function (res) {
152
+ return validate(v, formV, fullRules, cleanProps(validateProps)).then(function (res) {
152
153
  var err = res === true ? undefined : res;
153
154
  formFunc === null || formFunc === void 0 || formFunc.setError(name, err);
154
155
  onError === null || onError === void 0 || onError(err);
@@ -175,7 +176,7 @@ export default function useFormControl(props) {
175
176
  return e;
176
177
  });
177
178
  } else {
178
- return validate(v, {}, rules || [], {}).then(function (res) {
179
+ return validate(v, {}, rules || [], cleanProps(validateProps)).then(function (res) {
179
180
  var err = res === true ? undefined : res;
180
181
  setErrorState(err);
181
182
  onError === null || onError === void 0 || onError(err);
@@ -217,10 +218,14 @@ export default function useFormControl(props) {
217
218
  if (isArray(name)) {
218
219
  var dv = isArray(defaultValue) ? defaultValue : [];
219
220
  name.forEach(function (n, index) {
220
- controlFunc.bind(n, dv[index], validateField, update);
221
+ var v = formFunc === null || formFunc === void 0 ? void 0 : formFunc.getValue(n);
222
+ var bindedValue = v === undefined ? dv[index] : v;
223
+ controlFunc.bind(n, context.mounted ? bindedValue : dv[index], validateField, update);
221
224
  });
222
225
  } else {
223
- controlFunc.bind(name, defaultValue, validateField, update);
226
+ var v = formFunc === null || formFunc === void 0 ? void 0 : formFunc.getValue(name);
227
+ var bindedValue = v === undefined ? defaultValue : v;
228
+ controlFunc.bind(name, context.mounted ? bindedValue : defaultValue, validateField, update);
224
229
  }
225
230
  if (context.mounted) {
226
231
  devUseWarning.warn('Please avoid modifying the name property after the component has mounted, as this may result in unintended behavior or errors.');
@@ -11,10 +11,10 @@ declare const useForm: <T extends ObjectType>(props: UseFormProps<T>) => {
11
11
  [key: string]: any;
12
12
  }, option?: {
13
13
  validate?: boolean;
14
- names?: string[];
14
+ forceUpdate?: boolean;
15
15
  }) => void;
16
16
  getValue: (name?: string) => unknown;
17
- submit: (withValidate?: boolean) => void;
17
+ submit: (withValidate?: boolean, callback?: () => void) => void;
18
18
  reset: () => void;
19
19
  setError: (name: string, e: Error | undefined) => void;
20
20
  getErrors: () => ObjectType<Error | undefined>;
@@ -31,10 +31,10 @@ declare const useForm: <T extends ObjectType>(props: UseFormProps<T>) => {
31
31
  [key: string]: any;
32
32
  }, option?: {
33
33
  validate?: boolean;
34
- names?: string[];
34
+ forceUpdate?: boolean;
35
35
  }) => void;
36
36
  getValue: (name?: string) => unknown;
37
- submit: (withValidate?: boolean) => void;
37
+ submit: (withValidate?: boolean, callback?: () => void) => void;
38
38
  reset: () => void;
39
39
  setError: (name: string, e: Error | undefined) => void;
40
40
  getErrors: () => ObjectType<Error | undefined>;
@@ -1 +1 @@
1
- {"version":3,"file":"use-form.d.ts","sourceRoot":"","sources":["use-form.ts"],"names":[],"mappings":"AA+BA,OAAO,EAEL,aAAa,EACb,YAAY,EACZ,gBAAgB,EAGhB,gBAAgB,EAEjB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAe,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAI5D,QAAA,MAAM,OAAO;;;;;;;;;wBA+RC;gBAAE,QAAQ,CAAC,EAAE,OAAO,CAAC;gBAAC,KAAK,CAAC,EAAE,MAAM,EAAE,CAAA;aAAE;8BApKd,MAAM;oCAuOD,OAAO;;6BAfb,MAAM,KAAK,KAAK,GAAG,SAAS;;oCAdrB,MAAM,EAAE;sCAlMxC,MAAM,GAAG,MAAM,EAAE,WAAU,gBAAgB;qCAoQvB,MAAM,WAAW,gBAAgB;gCA/CzB,MAAM,SAAS,MAAM,UAAU,KAAK;gCAKpC,MAAM,SAAS,MAAM;kCAzIpD,MAAM,0BAAyB,qBAAqB;;;;;;oBA2EjD;YAAE,QAAQ,CAAC,EAAE,OAAO,CAAC;YAAC,KAAK,CAAC,EAAE,MAAM,EAAE,CAAA;SAAE;0BApKd,MAAM;gCAuOD,OAAO;;yBAfb,MAAM,KAAK,KAAK,GAAG,SAAS;;gCAdrB,MAAM,EAAE;kCAlMxC,MAAM,GAAG,MAAM,EAAE,WAAU,gBAAgB;iCAoQvB,MAAM,WAAW,gBAAgB;4BA/CzB,MAAM,SAAS,MAAM,UAAU,KAAK;4BAKpC,MAAM,SAAS,MAAM;8BAzIpD,MAAM,0BAAyB,qBAAqB;;CA2a9D,CAAC;AAEF,eAAe,OAAO,CAAC"}
1
+ {"version":3,"file":"use-form.d.ts","sourceRoot":"","sources":["use-form.ts"],"names":[],"mappings":"AA+BA,OAAO,EAEL,aAAa,EACb,YAAY,EACZ,gBAAgB,EAGhB,gBAAgB,EAEjB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAe,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAI5D,QAAA,MAAM,OAAO;;;;;;;;;wBAgSC;gBAAE,QAAQ,CAAC,EAAE,OAAO,CAAC;gBAAC,WAAW,CAAC,EAAE,OAAO,CAAA;aAAE;8BApKnB,MAAM;oCA+OD,OAAO,aAAoB,MAAM,IAAI;;6BAf3C,MAAM,KAAK,KAAK,GAAG,SAAS;;oCAdrB,MAAM,EAAE;sCA1MxC,MAAM,GAAG,MAAM,EAAE,WAAU,gBAAgB;qCA6QvB,MAAM,WAAW,gBAAgB;gCAhDzB,MAAM,SAAS,MAAM,UAAU,KAAK;gCAKpC,MAAM,SAAS,MAAM;kCAjJpD,MAAM,0BAAyB,qBAAqB;;;;;;oBA2EjD;YAAE,QAAQ,CAAC,EAAE,OAAO,CAAC;YAAC,WAAW,CAAC,EAAE,OAAO,CAAA;SAAE;0BApKnB,MAAM;gCA+OD,OAAO,aAAoB,MAAM,IAAI;;yBAf3C,MAAM,KAAK,KAAK,GAAG,SAAS;;gCAdrB,MAAM,EAAE;kCA1MxC,MAAM,GAAG,MAAM,EAAE,WAAU,gBAAgB;iCA6QvB,MAAM,WAAW,gBAAgB;4BAhDzB,MAAM,SAAS,MAAM,UAAU,KAAK;4BAKpC,MAAM,SAAS,MAAM;8BAjJpD,MAAM,0BAAyB,qBAAqB;;CAqb9D,CAAC;AAEF,eAAe,OAAO,CAAC"}
@@ -38,7 +38,8 @@ var useForm = function useForm(props) {
38
38
  size = props.size,
39
39
  colon = props.colon,
40
40
  formName = props.name,
41
- scrollParent = props.scrollParent;
41
+ scrollParent = props.scrollParent,
42
+ isControl = props.isControl;
42
43
  var deepSetOptions = {
43
44
  removeUndefined: removeUndefined,
44
45
  forceSet: true
@@ -192,7 +193,7 @@ var useForm = function useForm(props) {
192
193
  if (errors.length > 0) {
193
194
  var errorFields = [];
194
195
  for (var _key in context.errors) {
195
- if (context.errors[_key]) {
196
+ if (context.errors[_key] && context.names.has(_key)) {
196
197
  var _context$errors$_key;
197
198
  errorFields.push({
198
199
  name: _key,
@@ -294,13 +295,16 @@ var useForm = function useForm(props) {
294
295
  var values = Object.keys(vals);
295
296
  // 针对 name 为数组模式,如 datepicker 的 name={['startTime', 'endTime']} 时,前者校验可能需要依赖后者,因此需要提前将后者数据整合至 draft 用于多字段整合校验
296
297
  values.forEach(function (key) {
297
- deepSet(draft, key, vals[key], deepSetOptions);
298
+ // upload组件返回的可能是函数: (prev) => [...prev, file]
299
+ var valueOfKey = typeof vals[key] === 'function' ? vals[key](getValue(key)) : vals[key];
300
+ deepSet(draft, key, valueOfKey, deepSetOptions);
298
301
  });
299
302
  values.forEach(function (key) {
300
303
  if (option.validate) {
301
304
  var _context$validateMap$;
302
305
  (_context$validateMap$ = context.validateMap[key]) === null || _context$validateMap$ === void 0 || _context$validateMap$.forEach(function (validate) {
303
- validate(key, vals[key], current(draft));
306
+ var valueOfKey = typeof vals[key] === 'function' ? vals[key](getValue(key)) : vals[key];
307
+ validate(key, valueOfKey, current(draft));
304
308
  });
305
309
  }
306
310
  });
@@ -311,7 +315,11 @@ var useForm = function useForm(props) {
311
315
  fullKeyPaths.forEach(function (key) {
312
316
  delete context.serverErrors[key];
313
317
  });
314
- update(fullKeyPaths);
318
+ if (option.forceUpdate) {
319
+ update();
320
+ } else {
321
+ update(fullKeyPaths);
322
+ }
315
323
  });
316
324
  var updateDefaultValue = function updateDefaultValue() {
317
325
  if (!context.mounted) return;
@@ -356,6 +364,7 @@ var useForm = function useForm(props) {
356
364
  });
357
365
  var submit = usePersistFn(function () {
358
366
  var withValidate = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
367
+ var callback = arguments.length > 1 ? arguments[1] : undefined;
359
368
  if (disabled) return;
360
369
  if (context.submitLock) {
361
370
  return;
@@ -373,32 +382,29 @@ var useForm = function useForm(props) {
373
382
  while (1) switch (_context.prev = _context.next) {
374
383
  case 0:
375
384
  if (withValidate) {
376
- _context.next = 3;
385
+ _context.next = 4;
377
386
  break;
378
387
  }
379
388
  (_props$onSubmit = props.onSubmit) === null || _props$onSubmit === void 0 || _props$onSubmit.call(props, (_context$value = context.value) !== null && _context$value !== void 0 ? _context$value : {});
389
+ callback === null || callback === void 0 || callback();
380
390
  return _context.abrupt("return");
381
- case 3:
382
- _context.next = 5;
391
+ case 4:
392
+ _context.next = 6;
383
393
  return validateFields(undefined, {
384
394
  ignoreBind: true
385
395
  }).catch(function (e) {
386
396
  return e;
387
397
  });
388
- case 5:
398
+ case 6:
389
399
  result = _context.sent;
390
- if (!(result === true)) {
391
- _context.next = 11;
392
- break;
400
+ if (result === true) {
401
+ (_props$onSubmit2 = props.onSubmit) === null || _props$onSubmit2 === void 0 || _props$onSubmit2.call(props, (_context$value2 = context.value) !== null && _context$value2 !== void 0 ? _context$value2 : {});
402
+ if (activeEl) activeEl.focus();
403
+ } else {
404
+ handleSubmitError(result);
393
405
  }
394
- (_props$onSubmit2 = props.onSubmit) === null || _props$onSubmit2 === void 0 || _props$onSubmit2.call(props, (_context$value2 = context.value) !== null && _context$value2 !== void 0 ? _context$value2 : {});
395
- if (activeEl) activeEl.focus();
396
- _context.next = 13;
397
- break;
398
- case 11:
399
- handleSubmitError(result);
400
- return _context.abrupt("return");
401
- case 13:
406
+ callback === null || callback === void 0 || callback();
407
+ case 9:
402
408
  case "end":
403
409
  return _context.stop();
404
410
  }
@@ -482,10 +488,8 @@ var useForm = function useForm(props) {
482
488
  context.updateMap[n] = new Set();
483
489
  }
484
490
  context.updateMap[n].add(updateFn);
485
- var shouldTriggerResetChange = context.removeArr.has(n);
486
491
  context.removeArr.delete(n);
487
- var shouldTriggerDefaultChange = df !== undefined && deepGet(context.value, n) === undefined;
488
- if (shouldTriggerDefaultChange || shouldTriggerResetChange) {
492
+ if (df !== undefined && deepGet(context.value, n) === undefined) {
489
493
  if (!context.mounted) context.defaultValues[n] = df;
490
494
  onChange(function (v) {
491
495
  deepSet(v, n, df, deepSetOptions);
@@ -505,7 +509,6 @@ var useForm = function useForm(props) {
505
509
  }
506
510
  if (validateFieldSet.size === 0 && updateFieldSet.size === 0) {
507
511
  context.names.delete(n);
508
- delete context.errors[n];
509
512
  delete context.defaultValues[n];
510
513
  }
511
514
  var finalReserveAble = (_props$reserveAble = props.reserveAble) !== null && _props$reserveAble !== void 0 ? _props$reserveAble : reserveAble;
@@ -600,7 +603,10 @@ var useForm = function useForm(props) {
600
603
  React.useEffect(function () {
601
604
  context.removeLock = false;
602
605
  // 内部 onChange 改的 value, 不需要更新
603
- if (props.value === context.value) return;
606
+ if (props.value === context.value) {
607
+ if (!isControl) update();
608
+ return;
609
+ }
604
610
  if (initValidate && !context.resetTime) {
605
611
  var keys = Object.keys(context.validateMap).filter(function (key) {
606
612
  var oldValue = deepGet(preValue || emptyObj, key);
@@ -58,6 +58,13 @@ export interface FormLabelConfig {
58
58
  * @default false
59
59
  */
60
60
  keepErrorHeight?: boolean;
61
+ /**
62
+ * @en Whether to keep the error message below the form item, the default is false
63
+ * @cn 是否保持错误信息在提示信息下方
64
+ * @default false
65
+ * @version 3.7.0
66
+ */
67
+ keepErrorBelow?: boolean;
61
68
  /**
62
69
  * @en When inline is true, the form is horizontal layout
63
70
  * @cn 是否水平布局
@@ -187,6 +194,7 @@ export interface BaseFormProps<T> extends Omit<FormCommonConfig, 'formName'> {
187
194
  }
188
195
  export type UseFormProps<T> = BaseFormProps<T> & {
189
196
  formElRef: React.RefObject<HTMLFormElement>;
197
+ isControl: boolean;
190
198
  };
191
199
  export type FormContext = {
192
200
  defaultValues: ObjectType;
@@ -1 +1 @@
1
- {"version":3,"file":"use-form.type.d.ts","sourceRoot":"","sources":["use-form.type.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"use-form.type.d.ts","sourceRoot":"","sources":["use-form.type.ts"],"names":[],"mappings":"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"}
@@ -14,6 +14,8 @@ declare const useImage: (props?: BaseImageProps) => {
14
14
  onClick: (event: React.MouseEvent<HTMLImageElement | HTMLDivElement>) => void;
15
15
  };
16
16
  getImageProps: <TOther_1 extends ObjectType = ObjectType>(externalProps?: TOther_1) => {
17
+ style: React.CSSProperties;
18
+ } & {
17
19
  [x: string]: (event: any) => void;
18
20
  } & TOther_1 & {
19
21
  alt: string | undefined;
@@ -1 +1 @@
1
- {"version":3,"file":"use-image.d.ts","sourceRoot":"","sources":["use-image.ts"],"names":[],"mappings":"AAAA,OAAO,KAAoB,MAAM,OAAO,CAAC;AACzC,OAAO,EAAe,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAG5D,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAWlD,QAAA,MAAM,QAAQ,WAAW,cAAc;;;;;;;;;;yBA6D3B,gBAAgB,CAAC,gBAAgB,GAAG,cAAc,CAAC;;;;;;;;;;;CAmF9D,CAAC;AAEF,eAAe,QAAQ,CAAC"}
1
+ {"version":3,"file":"use-image.d.ts","sourceRoot":"","sources":["use-image.ts"],"names":[],"mappings":"AAAA,OAAO,KAAoB,MAAM,OAAO,CAAC;AACzC,OAAO,EAAe,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAG5D,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAWlD,QAAA,MAAM,QAAQ,WAAW,cAAc;;;;;;;;;;yBAiG3B,gBAAgB,CAAC,gBAAgB,GAAG,cAAc,CAAC;;;;;;;;;;;;;CAoF9D,CAAC;AAEF,eAAe,QAAQ,CAAC"}
@@ -36,6 +36,10 @@ var useImage = function useImage() {
36
36
  _React$useState2 = _slicedToArray(_React$useState, 2),
37
37
  status = _React$useState2[0],
38
38
  setStatus = _React$useState2[1];
39
+ var _React$useState3 = React.useState({}),
40
+ _React$useState4 = _slicedToArray(_React$useState3, 2),
41
+ imgCoverStyle = _React$useState4[0],
42
+ setImgCoverStyle = _React$useState4[1];
39
43
  var elementRef = React.useRef(null);
40
44
  var getUrl = function getUrl(url) {
41
45
  var auto = 'autoSSL' in props ? autoSSL : config.autoSSL;
@@ -70,6 +74,35 @@ var useImage = function useImage() {
70
74
  };
71
75
  img.src = getUrl(alt);
72
76
  };
77
+ var handleCoverStyle = function handleCoverStyle(img) {
78
+ var container = elementRef === null || elementRef === void 0 ? void 0 : elementRef.current;
79
+ if (!container) return;
80
+
81
+ // 根据容器的宽高获取宽高比
82
+ var containerWidth = container.clientWidth;
83
+ var containerHeight = container.clientHeight;
84
+ var containerRatio = containerWidth / containerHeight;
85
+
86
+ // 根据图片的自然尺寸获取宽高比
87
+ var imageWidth = img.naturalWidth;
88
+ var imageHeight = img.naturalHeight;
89
+ var imageRatio = imageWidth / imageHeight;
90
+
91
+ // 判断宽高比,决定图片填充策略
92
+ if (imageRatio > containerRatio) {
93
+ // 图片更宽,宽度占满容器,高度自适应
94
+ setImgCoverStyle({
95
+ height: '100%',
96
+ width: 'auto'
97
+ });
98
+ } else {
99
+ // 图片更高,填满容器高度
100
+ setImgCoverStyle({
101
+ width: '100%',
102
+ height: 'auto'
103
+ });
104
+ }
105
+ };
73
106
  var markToRender = function markToRender() {
74
107
  if (!src) {
75
108
  handleAlt();
@@ -77,7 +110,10 @@ var useImage = function useImage() {
77
110
  }
78
111
  var img = new window.Image();
79
112
  img.onload = function () {
80
- return setStatus(SRC);
113
+ setStatus(SRC);
114
+ if (props.fit === 'fill') {
115
+ handleCoverStyle(img);
116
+ }
81
117
  };
82
118
  img.onerror = function (e) {
83
119
  return handleError(SRC, e);
@@ -106,7 +142,9 @@ var useImage = function useImage() {
106
142
  alt: alt,
107
143
  draggable: !noImgDrag
108
144
  });
109
- return _objectSpread({}, mergedEventHandlers);
145
+ return _objectSpread({
146
+ style: imgCoverStyle
147
+ }, mergedEventHandlers);
110
148
  };
111
149
  var getImageDivProps = function getImageDivProps() {
112
150
  var externalProps = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
@@ -1,5 +1,7 @@
1
1
  import React from 'react';
2
2
  declare const context: React.Context<{
3
+ addParent: (_ref: React.MutableRefObject<HTMLElement | null>) => void;
4
+ removeParent: (_ref: React.MutableRefObject<HTMLElement | null>) => void;
3
5
  bindChild: (_ref: React.MutableRefObject<HTMLElement | null>) => void;
4
6
  removeChild: (_ref: React.MutableRefObject<HTMLElement | null>) => void;
5
7
  }>;
@@ -1 +1 @@
1
- {"version":3,"file":"popup-context.d.ts","sourceRoot":"","sources":["popup-context.ts"],"names":[],"mappings":"AACA,OAAO,KAAwB,MAAM,OAAO,CAAC;AAO7C,QAAA,MAAM,OAAO;sBAJO,MAAM,gBAAgB,CAAC,WAAW,GAAG,IAAI,CAAC;wBACxC,MAAM,gBAAgB,CAAC,WAAW,GAAG,IAAI,CAAC;EAGnB,CAAC;AAE9C,eAAe,OAAO,CAAC"}
1
+ {"version":3,"file":"popup-context.d.ts","sourceRoot":"","sources":["popup-context.ts"],"names":[],"mappings":"AACA,OAAO,KAAwB,MAAM,OAAO,CAAC;AAS7C,QAAA,MAAM,OAAO;sBANO,MAAM,gBAAgB,CAAC,WAAW,GAAG,IAAI,CAAC;yBACvC,MAAM,gBAAgB,CAAC,WAAW,GAAG,IAAI,CAAC;sBAC7C,MAAM,gBAAgB,CAAC,WAAW,GAAG,IAAI,CAAC;wBACxC,MAAM,gBAAgB,CAAC,WAAW,GAAG,IAAI,CAAC;EAGnB,CAAC;AAE9C,eAAe,OAAO,CAAC"}
@@ -2,6 +2,8 @@
2
2
 
3
3
  import { createContext } from 'react';
4
4
  var defaultContext = {
5
+ addParent: function addParent(_ref) {},
6
+ removeParent: function removeParent(_ref) {},
5
7
  bindChild: function bindChild(_ref) {},
6
8
  removeChild: function removeChild(_ref) {}
7
9
  };
@@ -39,10 +39,14 @@ declare const usePopup: (props: BasePopupProps) => {
39
39
  openPop: () => void;
40
40
  closePop: () => void;
41
41
  Provider: React.Provider<{
42
+ addParent: (_ref: React.MutableRefObject<HTMLElement | null>) => void;
43
+ removeParent: (_ref: React.MutableRefObject<HTMLElement | null>) => void;
42
44
  bindChild: (_ref: React.MutableRefObject<HTMLElement | null>) => void;
43
45
  removeChild: (_ref: React.MutableRefObject<HTMLElement | null>) => void;
44
46
  }>;
45
47
  providerValue: {
48
+ addParent: (elRef: React.MutableRefObject<HTMLElement | null>) => void;
49
+ removeParent: (elRef: React.MutableRefObject<HTMLElement | null>) => void;
46
50
  bindChild: (elRef: React.MutableRefObject<HTMLElement | null>) => void;
47
51
  removeChild: (elRef: React.MutableRefObject<HTMLElement | null>) => void;
48
52
  };
@@ -1 +1 @@
1
- {"version":3,"file":"use-popup.d.ts","sourceRoot":"","sources":["use-popup.ts"],"names":[],"mappings":"AAAA,OAAO,KAA2D,MAAM,OAAO,CAAC;AAChF,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAOhE,QAAA,MAAM,QAAQ,UAAW,cAAc;;;;;;0BA6HK;YAAE,MAAM,EAAE,WAAW,GAAG,IAAI,CAAA;SAAE;0BAM9B;YAAE,MAAM,EAAE,WAAW,GAAG,IAAI,CAAA;SAAE;;;;;qBA5B7B;YAAE,MAAM,EAAE,WAAW,GAAG,IAAI,CAAA;SAAE;;;;;;;;;;;;;;;;;;;;;;;;;2BA6ElD,MAAM,gBAAgB,CAAC,WAAW,GAAG,IAAI,CAAC;6BAGxC,MAAM,gBAAgB,CAAC,WAAW,GAAG,IAAI,CAAC;;CAqBpE,CAAC;AAEF,eAAe,QAAQ,CAAC"}
1
+ {"version":3,"file":"use-popup.d.ts","sourceRoot":"","sources":["use-popup.ts"],"names":[],"mappings":"AAAA,OAAO,KAA4E,MAAM,OAAO,CAAC;AACjG,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAOhE,QAAA,MAAM,QAAQ,UAAW,cAAc;;;;;;0BAkIK;YAAE,MAAM,EAAE,WAAW,GAAG,IAAI,CAAA;SAAE;0BAM9B;YAAE,MAAM,EAAE,WAAW,GAAG,IAAI,CAAA;SAAE;;;;;qBA5B7B;YAAE,MAAM,EAAE,WAAW,GAAG,IAAI,CAAA;SAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;2BApFzC,MAAM,gBAAgB,CAAC,WAAW,GAAG,IAAI,CAAC;8BAOvC,MAAM,gBAAgB,CAAC,WAAW,GAAG,IAAI,CAAC;2BA2JxD,MAAM,gBAAgB,CAAC,WAAW,GAAG,IAAI,CAAC;6BAMxC,MAAM,gBAAgB,CAAC,WAAW,GAAG,IAAI,CAAC;;CA8BlE,CAAC;AAEF,eAAe,QAAQ,CAAC"}
@@ -4,7 +4,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
4
4
  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; }
5
5
  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; } }
6
6
  function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
7
- import { useContext, useEffect, useMemo, useRef, useState } from 'react';
7
+ import { useContext, useLayoutEffect, useEffect, useRef, useState, useMemo } from 'react';
8
8
  import useClickAway from "../../common/use-click-away";
9
9
  import { getPosition } from "../../utils/position";
10
10
  import usePersistFn from "../../common/use-persist-fn";
@@ -27,21 +27,32 @@ var usePopup = function usePopup(props) {
27
27
  setOpenState = _useState2[1];
28
28
  var _useContext = useContext(popupContext),
29
29
  bindChild = _useContext.bindChild,
30
- removeChild = _useContext.removeChild;
30
+ removeChild = _useContext.removeChild,
31
+ addParent = _useContext.addParent,
32
+ removeParent = _useContext.removeParent;
31
33
  var targetRef = useRef(null);
32
34
  var popupRef = useRef(null);
33
- useEffect(function () {
34
- bindChild(popupRef);
35
- return function () {
36
- removeChild(popupRef);
37
- };
38
- }, []);
39
35
  var _useRef = useRef({
40
36
  triggerTimer: null,
41
37
  // 记录所有的子popup 点击子 popup 不关闭弹窗
42
38
  chain: [targetRef, popupRef]
43
39
  }),
44
40
  context = _useRef.current;
41
+ var handleAddParent = function handleAddParent(elRef) {
42
+ context.chain.push(elRef);
43
+
44
+ // 继续向上添加当前的 popupRef 到父级
45
+ addParent(elRef);
46
+ };
47
+ var handleRemoveParent = function handleRemoveParent(elRef) {
48
+ var index = context.chain.findIndex(function (item) {
49
+ return item === elRef;
50
+ });
51
+ if (index > -1) {
52
+ context.chain.splice(index, 1);
53
+ removeParent(elRef);
54
+ }
55
+ };
45
56
  var open = openState;
46
57
  var changeOpen = function changeOpen(openIn, delay) {
47
58
  if (context.triggerTimer) clearTimeout(context.triggerTimer);
@@ -71,11 +82,6 @@ var usePopup = function usePopup(props) {
71
82
  updatePosition();
72
83
  }
73
84
  setOpenState(!!props.open);
74
-
75
- // 外部传了open时,需要正常的触发onCollapse;触发了onCollapse才能让组件内部的edit状态正确,否则可能会出现弹出层打开了但是用户却无法选择的情况
76
- if (props.open !== undefined) {
77
- changeOpen(!!props.open);
78
- }
79
85
  }, [props.open]);
80
86
 
81
87
  // const getPopUpHeight = () => {
@@ -180,8 +186,13 @@ var usePopup = function usePopup(props) {
180
186
  });
181
187
  var providerValue = useMemo(function () {
182
188
  return {
189
+ addParent: handleAddParent,
190
+ removeParent: handleRemoveParent,
183
191
  bindChild: function bindChild(elRef) {
184
- context.chain.push(elRef);
192
+ if (elRef.current) {
193
+ addParent(elRef);
194
+ context.chain.push(elRef);
195
+ }
185
196
  },
186
197
  removeChild: function removeChild(elRef) {
187
198
  var index = context.chain.findIndex(function (item) {
@@ -189,10 +200,19 @@ var usePopup = function usePopup(props) {
189
200
  });
190
201
  if (index > -1) {
191
202
  context.chain.splice(index, 1);
203
+ removeParent(elRef);
192
204
  }
193
205
  }
194
206
  };
195
207
  }, []);
208
+ useLayoutEffect(function () {
209
+ if (open) {
210
+ bindChild(popupRef);
211
+ }
212
+ return function () {
213
+ removeChild(popupRef);
214
+ };
215
+ }, [open]);
196
216
  return {
197
217
  open: open,
198
218
  position: position,
@@ -7,5 +7,5 @@ export { default as useTableRow } from './use-table-row';
7
7
  export { default as useTableExpand } from './use-table-expand';
8
8
  export { default as useTableTree } from './use-table-tree';
9
9
  export { default as useTableVirtual } from './use-table-virtual';
10
- export type { TableFormatColumn, TableColumnItem, TableHeadColumn, TableGroupColumn, TableSorterInfo, BaseTableProps, TableColumnFilter, TableFilterData, shouldCellUpdate, } from './use-table.type';
10
+ export type { TableFormatColumn, TableColumnItem, TableHeadColumn, TableGroupColumn, TableSorterInfo, BaseTableProps, TableColumnFilter, TableFilterData, } from './use-table.type';
11
11
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,OAAO,IAAI,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACxE,OAAO,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACjE,OAAO,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAC7D,OAAO,EAAE,OAAO,IAAI,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAC3D,OAAO,EAAE,OAAO,IAAI,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAC/D,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,iBAAiB,CAAC;AACzD,OAAO,EAAE,OAAO,IAAI,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAC/D,OAAO,EAAE,OAAO,IAAI,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAC3D,OAAO,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEjE,YAAY,EACV,iBAAiB,EACjB,eAAe,EACf,eAAe,EACf,gBAAgB,EAChB,eAAe,EACf,cAAc,EACd,iBAAiB,EACjB,eAAe,EACf,gBAAgB,GACjB,MAAM,kBAAkB,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,OAAO,IAAI,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACxE,OAAO,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACjE,OAAO,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAC7D,OAAO,EAAE,OAAO,IAAI,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAC3D,OAAO,EAAE,OAAO,IAAI,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAC/D,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,iBAAiB,CAAC;AACzD,OAAO,EAAE,OAAO,IAAI,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAC/D,OAAO,EAAE,OAAO,IAAI,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAC3D,OAAO,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEjE,YAAY,EACV,iBAAiB,EACjB,eAAe,EACf,eAAe,EACf,gBAAgB,EAChB,eAAe,EACf,cAAc,EACd,iBAAiB,EACjB,eAAe,GAChB,MAAM,kBAAkB,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"use-table-filter.d.ts","sourceRoot":"","sources":["use-table-filter.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAEnE,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEjD,MAAM,WAAW,mBAAmB,CAAC,IAAI,GAAG,GAAG,CAC7C,SAAQ,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,cAAc,GAAG,QAAQ,GAAG,MAAM,CAAC;IACtE,OAAO,CAAC,EAAE,eAAe,CAAC,IAAI,CAAC,EAAE,CAAC;CACnC;AACD,MAAM,WAAW,UAAU,CAAC,CAAC;IAC3B,KAAK,CAAC,EAAE,GAAG,CAAA;IACX,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,KAAK,OAAO,CAAC;CAC5C;AAED,MAAM,MAAM,SAAS,CAAC,CAAC,IAAI,GAAG,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;AAE5D,QAAA,MAAM,cAAc;;;;gCA6BH,YAAY,SAAS,GAAG;CAyDxC,CAAC;AAEF,eAAe,cAAc,CAAC"}
1
+ {"version":3,"file":"use-table-filter.d.ts","sourceRoot":"","sources":["use-table-filter.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAEnE,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEjD,MAAM,WAAW,mBAAmB,CAAC,IAAI,GAAG,GAAG,CAC7C,SAAQ,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,cAAc,GAAG,QAAQ,GAAG,MAAM,CAAC;IACtE,OAAO,CAAC,EAAE,eAAe,CAAC,IAAI,CAAC,EAAE,CAAC;CACnC;AACD,MAAM,WAAW,UAAU,CAAC,CAAC;IAC3B,KAAK,CAAC,EAAE,GAAG,CAAA;IACX,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,KAAK,OAAO,CAAC;CAC5C;AAED,MAAM,MAAM,SAAS,CAAC,CAAC,IAAI,GAAG,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;AAE5D,QAAA,MAAM,cAAc;;;;gCA8BH,YAAY,SAAS,GAAG;CAyDxC,CAAC;AAEF,eAAe,cAAc,CAAC"}
@@ -26,7 +26,8 @@ var useTableFilter = function useTableFilter(props) {
26
26
  }, [filterInfo]);
27
27
  var filteredData = useMemo(function () {
28
28
  var _props$data;
29
- if (activeFilters.length === 0) return props.data;
29
+ // why use slice: props.data引用不改变会导致后续的useMemo无法重新计算
30
+ if (activeFilters.length === 0) return (props.data || []).slice();
30
31
  return (_props$data = props.data) === null || _props$data === void 0 ? void 0 : _props$data.filter(function (item) {
31
32
  return activeFilters.every(function (key) {
32
33
  var filter = filterInfo.get(key);
@@ -1 +1 @@
1
- {"version":3,"file":"use-table-group.d.ts","sourceRoot":"","sources":["use-table-group.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAoB,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAKxF,MAAM,WAAW,kBAAkB;IACjC,OAAO,EAAE,iBAAiB,CAAC,GAAG,CAAC,EAAE,CAAC;IAClC,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AACD,QAAA,MAAM,aAAa,UAAW,kBAAkB;;;CAsE/C,CAAC;AAEF,eAAe,aAAa,CAAC"}
1
+ {"version":3,"file":"use-table-group.d.ts","sourceRoot":"","sources":["use-table-group.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAoB,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAKxF,MAAM,WAAW,kBAAkB;IACjC,OAAO,EAAE,iBAAiB,CAAC,GAAG,CAAC,EAAE,CAAC;IAClC,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AACD,QAAA,MAAM,aAAa,UAAW,kBAAkB;;;CAwE/C,CAAC;AAEF,eAAe,aAAa,CAAC"}
@@ -27,6 +27,7 @@ var useTableGroup = function useTableGroup(props) {
27
27
  last.colSpan += colSpan;
28
28
  if (col.fixed) last.fixed = col.fixed;
29
29
  if (col.lastFixed) last.lastFixed = true;
30
+ if (col.groupProps) last.groupProps = col.groupProps;
30
31
  } else {
31
32
  var sub = [];
32
33
  colSpan = setColumns(sub, col, level + 1, index);
@@ -39,7 +40,8 @@ var useTableGroup = function useTableGroup(props) {
39
40
  fixed: col.fixed,
40
41
  firstFixed: col.firstFixed,
41
42
  index: index,
42
- columns: sub
43
+ columns: sub,
44
+ groupProps: col.groupProps
43
45
  };
44
46
  columns.push(groupCol);
45
47
  }
@@ -1 +1 @@
1
- {"version":3,"file":"use-table-layout.d.ts","sourceRoot":"","sources":["use-table-layout.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA6C,MAAM,OAAO,CAAC;AAKlE,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AA0CrE,MAAM,WAAW,mBACf,SAAQ,IAAI,CACV,cAAc,CAAC,GAAG,CAAC,EACnB,MAAM,GAAG,kBAAkB,GAAG,iBAAiB,GAAG,gBAAgB,GAAG,OAAO,CAC7E;IACD,OAAO,EAAE,iBAAiB,CAAC,GAAG,CAAC,EAAE,CAAC;IAClC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;IACvC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;IACvC,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;IACxC,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED,QAAA,MAAM,cAAc,UAAW,mBAAmB;;;;;;;;;;;yBA+CX,MAAM,UAAU,MAAM;;;;;;;CA+O5D,CAAC;AAEF,eAAe,cAAc,CAAC"}
1
+ {"version":3,"file":"use-table-layout.d.ts","sourceRoot":"","sources":["use-table-layout.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA6C,MAAM,OAAO,CAAC;AAKlE,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AA0CrE,MAAM,WAAW,mBACf,SAAQ,IAAI,CACV,cAAc,CAAC,GAAG,CAAC,EACnB,MAAM,GAAG,kBAAkB,GAAG,iBAAiB,GAAG,gBAAgB,GAAG,OAAO,CAC7E;IACD,OAAO,EAAE,iBAAiB,CAAC,GAAG,CAAC,EAAE,CAAC;IAClC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;IACvC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;IACvC,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;IACxC,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED,QAAA,MAAM,cAAc,UAAW,mBAAmB;;;;;;;;;;;yBA+CX,MAAM,UAAU,MAAM;;;;;;;CA8O5D,CAAC;AAEF,eAAe,cAAc,CAAC"}
@@ -387,7 +387,6 @@ var useTableLayout = function useTableLayout(props) {
387
387
  width: tableWidth,
388
388
  shouldLastColAuto: props.columnResizable && !adjust,
389
389
  scrollWidth: scrollWidth,
390
- // maxScrollLeft: scrollWidth - context.clientWidth,
391
390
  resizeFlag: resizeFlag
392
391
  };
393
392
  };