@ant-design/pro-components 3.1.0-0 → 3.1.1-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 (691) hide show
  1. package/README.es-PR.md +1 -3
  2. package/README.md +8 -10
  3. package/README.zh-CN.md +11 -11
  4. package/dist/pro-components.min.js +1 -1
  5. package/es/card/ProCard.js +8 -10
  6. package/es/card/components/Actions/index.js +25 -25
  7. package/es/card/components/Actions/style.js +79 -71
  8. package/es/card/components/Card/index.js +157 -142
  9. package/es/card/components/Card/style.js +249 -192
  10. package/es/card/components/CheckCard/Group.js +94 -115
  11. package/es/card/components/CheckCard/index.js +85 -79
  12. package/es/card/components/CheckCard/style.js +184 -168
  13. package/es/card/components/Divider/index.js +19 -15
  14. package/es/card/components/Divider/style.js +32 -29
  15. package/es/card/components/Loading/index.js +19 -16
  16. package/es/card/components/Loading/style.js +34 -31
  17. package/es/card/components/Operation/index.js +16 -13
  18. package/es/card/components/Operation/style.js +19 -18
  19. package/es/card/components/Statistic/index.js +46 -41
  20. package/es/card/components/Statistic/style.js +89 -70
  21. package/es/card/components/StatisticCard/index.js +46 -41
  22. package/es/card/components/StatisticCard/style.js +37 -35
  23. package/es/descriptions/index.js +214 -225
  24. package/es/descriptions/useFetchData.js +53 -91
  25. package/es/field/AllProField.js +265 -216
  26. package/es/field/FieldHOC/index.js +9 -14
  27. package/es/field/PureProField.js +82 -80
  28. package/es/field/ValueTypeToComponent.js +517 -618
  29. package/es/field/components/Cascader/index.d.ts +2 -2
  30. package/es/field/components/Cascader/index.js +65 -84
  31. package/es/field/components/Checkbox/index.d.ts +1 -1
  32. package/es/field/components/Checkbox/index.js +75 -72
  33. package/es/field/components/Code/index.js +40 -39
  34. package/es/field/components/ColorPicker/index.d.ts +2 -2
  35. package/es/field/components/ColorPicker/index.js +38 -32
  36. package/es/field/components/DatePicker/index.d.ts +2 -2
  37. package/es/field/components/DatePicker/index.js +49 -53
  38. package/es/field/components/Digit/index.js +41 -42
  39. package/es/field/components/DigitRange/index.js +71 -77
  40. package/es/field/components/FromNow/index.js +27 -25
  41. package/es/field/components/Image/index.js +28 -24
  42. package/es/field/components/IndexColumn/index.js +22 -16
  43. package/es/field/components/Money/index.js +107 -116
  44. package/es/field/components/Options/index.js +34 -33
  45. package/es/field/components/Password/index.js +35 -38
  46. package/es/field/components/Percent/index.js +40 -44
  47. package/es/field/components/Percent/util.d.ts +1 -1
  48. package/es/field/components/Percent/util.js +3 -5
  49. package/es/field/components/Progress/index.js +29 -27
  50. package/es/field/components/Radio/index.d.ts +1 -1
  51. package/es/field/components/Radio/index.js +61 -62
  52. package/es/field/components/RangePicker/index.d.ts +2 -2
  53. package/es/field/components/RangePicker/index.js +52 -63
  54. package/es/field/components/Rate/index.js +24 -21
  55. package/es/field/components/Second/index.js +36 -33
  56. package/es/field/components/Segmented/index.d.ts +1 -1
  57. package/es/field/components/Segmented/index.js +37 -46
  58. package/es/field/components/Select/LightSelect/index.d.ts +1 -1
  59. package/es/field/components/Select/LightSelect/index.js +102 -109
  60. package/es/field/components/Select/SearchSelect/index.js +129 -155
  61. package/es/field/components/Select/index.d.ts +1 -1
  62. package/es/field/components/Select/index.js +193 -219
  63. package/es/field/components/Slider/index.js +25 -22
  64. package/es/field/components/Status/index.js +67 -78
  65. package/es/field/components/Switch/index.d.ts +1 -1
  66. package/es/field/components/Switch/index.js +32 -30
  67. package/es/field/components/Text/index.js +34 -37
  68. package/es/field/components/TextArea/index.js +26 -21
  69. package/es/field/components/TextArea/readonly.js +24 -21
  70. package/es/field/components/TimePicker/index.js +96 -105
  71. package/es/field/components/TreeSelect/index.d.ts +2 -2
  72. package/es/field/components/TreeSelect/index.js +107 -125
  73. package/es/form/BaseForm/BaseForm.js +416 -502
  74. package/es/form/BaseForm/EditOrReadOnlyContext.js +1 -1
  75. package/es/form/BaseForm/LightWrapper/index.js +56 -65
  76. package/es/form/BaseForm/LightWrapper/style.js +17 -13
  77. package/es/form/BaseForm/Submitter/index.js +44 -43
  78. package/es/form/FieldContext.js +1 -1
  79. package/es/form/components/Captcha/index.js +74 -134
  80. package/es/form/components/Cascader/index.js +26 -28
  81. package/es/form/components/Checkbox/index.js +60 -61
  82. package/es/form/components/ColorPicker/index.js +24 -26
  83. package/es/form/components/DatePicker/BaseDatePicker.js +32 -30
  84. package/es/form/components/DatePicker/DatePicker.js +14 -13
  85. package/es/form/components/DatePicker/DateTimePicker.js +11 -12
  86. package/es/form/components/DatePicker/MonthPicker.js +14 -13
  87. package/es/form/components/DatePicker/QuarterPicker.js +14 -13
  88. package/es/form/components/DatePicker/TimePicker.js +26 -27
  89. package/es/form/components/DatePicker/WeekPicker.js +14 -13
  90. package/es/form/components/DatePicker/YearPicker.js +14 -13
  91. package/es/form/components/DatePicker/index.js +1 -1
  92. package/es/form/components/DateRangePicker/BaseDateRanger.js +34 -34
  93. package/es/form/components/DateRangePicker/DateMonthRangePicker.js +15 -16
  94. package/es/form/components/DateRangePicker/DateQuarterRangePicker.js +15 -16
  95. package/es/form/components/DateRangePicker/DateTimeRangePicker.js +15 -16
  96. package/es/form/components/DateRangePicker/DateWeekRangePicker.js +15 -16
  97. package/es/form/components/DateRangePicker/DateYearRangePicker.js +15 -16
  98. package/es/form/components/DateRangePicker/TimeRangePicker.js +26 -29
  99. package/es/form/components/DateRangePicker/index.js +15 -16
  100. package/es/form/components/Dependency/index.js +31 -34
  101. package/es/form/components/Digit/DigitRange.js +23 -24
  102. package/es/form/components/Digit/index.js +27 -29
  103. package/es/form/components/Field/index.js +55 -63
  104. package/es/form/components/FieldSet/index.js +68 -76
  105. package/es/form/components/FormItem/FormItemRender/index.js +58 -48
  106. package/es/form/components/FormItem/Group/index.js +95 -95
  107. package/es/form/components/FormItem/Group/style.js +46 -40
  108. package/es/form/components/FormItem/index.js +135 -141
  109. package/es/form/components/FormItem/warpField.js +165 -149
  110. package/es/form/components/List/ListContainer.js +98 -189
  111. package/es/form/components/List/ListItem.js +151 -198
  112. package/es/form/components/List/index.js +97 -107
  113. package/es/form/components/List/style.js +71 -47
  114. package/es/form/components/Money/index.js +28 -30
  115. package/es/form/components/Radio/index.js +45 -49
  116. package/es/form/components/Rate/index.js +17 -20
  117. package/es/form/components/SchemaForm/index.js +58 -72
  118. package/es/form/components/SchemaForm/layoutType/Embed.js +5 -6
  119. package/es/form/components/SchemaForm/layoutType/StepsForm.js +22 -26
  120. package/es/form/components/SchemaForm/valueType/dependency.js +11 -11
  121. package/es/form/components/SchemaForm/valueType/divider.js +4 -5
  122. package/es/form/components/SchemaForm/valueType/field.js +45 -44
  123. package/es/form/components/SchemaForm/valueType/formList.js +8 -7
  124. package/es/form/components/SchemaForm/valueType/formSet.js +8 -7
  125. package/es/form/components/SchemaForm/valueType/group.js +7 -8
  126. package/es/form/components/SchemaForm/valueType/ignore.js +2 -2
  127. package/es/form/components/SchemaForm/valueType/index.js +5 -5
  128. package/es/form/components/Segmented/index.js +20 -23
  129. package/es/form/components/Select/index.js +69 -73
  130. package/es/form/components/Slider/index.js +33 -35
  131. package/es/form/components/Switch/index.js +24 -26
  132. package/es/form/components/Text/index.js +75 -86
  133. package/es/form/components/TextArea/index.js +17 -20
  134. package/es/form/components/TreeSelect/index.js +20 -23
  135. package/es/form/components/UploadButton/index.js +56 -103
  136. package/es/form/components/UploadDragger/index.js +37 -44
  137. package/es/form/helpers/grid.js +65 -67
  138. package/es/form/layouts/DrawerForm/index.js +150 -241
  139. package/es/form/layouts/DrawerForm/style.js +26 -25
  140. package/es/form/layouts/LightFilter/index.d.ts +12 -1
  141. package/es/form/layouts/LightFilter/index.js +158 -140
  142. package/es/form/layouts/LightFilter/style.js +52 -48
  143. package/es/form/layouts/LoginForm/index.js +44 -47
  144. package/es/form/layouts/LoginForm/style.js +71 -67
  145. package/es/form/layouts/LoginFormPage/index.js +45 -48
  146. package/es/form/layouts/LoginFormPage/style.js +136 -126
  147. package/es/form/layouts/ModalForm/index.js +119 -203
  148. package/es/form/layouts/ProForm/index.d.ts +2 -2
  149. package/es/form/layouts/ProForm/index.js +5 -5
  150. package/es/form/layouts/QueryFilter/Actions.js +23 -22
  151. package/es/form/layouts/QueryFilter/index.js +178 -203
  152. package/es/form/layouts/QueryFilter/style.js +45 -37
  153. package/es/form/layouts/StepsForm/StepForm.d.ts +2 -3
  154. package/es/form/layouts/StepsForm/StepForm.js +50 -71
  155. package/es/form/layouts/StepsForm/index.js +175 -217
  156. package/es/form/layouts/StepsForm/style.js +30 -28
  157. package/es/form/layouts/index.js +1 -1
  158. package/es/layout/ProLayout.js +281 -292
  159. package/es/layout/WrapContent.js +16 -12
  160. package/es/layout/assert/Logo.js +95 -97
  161. package/es/layout/components/AppsLogoComponents/AppsLogo.js +10 -12
  162. package/es/layout/components/AppsLogoComponents/DefaultContent.js +17 -16
  163. package/es/layout/components/AppsLogoComponents/SimpleContent.js +19 -18
  164. package/es/layout/components/AppsLogoComponents/index.js +33 -38
  165. package/es/layout/components/AppsLogoComponents/style/default.js +2 -2
  166. package/es/layout/components/AppsLogoComponents/style/index.js +52 -50
  167. package/es/layout/components/AppsLogoComponents/style/simple.js +1 -1
  168. package/es/layout/components/CollapsedIcon/index.js +18 -15
  169. package/es/layout/components/CollapsedIcon/style.js +40 -40
  170. package/es/layout/components/Footer.js +22 -21
  171. package/es/layout/components/FooterToolbar/index.js +58 -52
  172. package/es/layout/components/FooterToolbar/style/index.js +38 -37
  173. package/es/layout/components/FooterToolbar/style/stylish.js +11 -9
  174. package/es/layout/components/GlobalFooter/index.js +25 -25
  175. package/es/layout/components/GlobalFooter/style.js +31 -30
  176. package/es/layout/components/GlobalHeader/ActionsContent.js +62 -78
  177. package/es/layout/components/GlobalHeader/index.js +59 -47
  178. package/es/layout/components/GlobalHeader/rightContentStyle.js +49 -49
  179. package/es/layout/components/GlobalHeader/style.js +58 -54
  180. package/es/layout/components/GridContent/index.js +24 -19
  181. package/es/layout/components/GridContent/style.js +14 -13
  182. package/es/layout/components/Header/index.js +63 -57
  183. package/es/layout/components/Header/style/header.js +49 -47
  184. package/es/layout/components/Header/style/stylish.js +15 -11
  185. package/es/layout/components/Help/AsyncContentPanel.js +13 -18
  186. package/es/layout/components/Help/HelpProvide.js +1 -1
  187. package/es/layout/components/Help/ProHelpContentPanel.js +64 -83
  188. package/es/layout/components/Help/ProHelpDrawer.js +25 -31
  189. package/es/layout/components/Help/ProHelpModal.d.ts +1 -1
  190. package/es/layout/components/Help/ProHelpModal.js +24 -27
  191. package/es/layout/components/Help/ProHelpPanel.js +86 -94
  192. package/es/layout/components/Help/ProHelpPopover.js +18 -16
  193. package/es/layout/components/Help/RenderContentPanel.js +34 -24
  194. package/es/layout/components/Help/Search.js +52 -78
  195. package/es/layout/components/Help/index.js +9 -11
  196. package/es/layout/components/Help/style.js +82 -75
  197. package/es/layout/components/PageContainer/index.js +168 -149
  198. package/es/layout/components/PageContainer/style/index.js +95 -78
  199. package/es/layout/components/PageContainer/style/stylish.js +11 -9
  200. package/es/layout/components/PageHeader/index.js +96 -97
  201. package/es/layout/components/PageHeader/style/index.js +142 -122
  202. package/es/layout/components/PageLoading/index.js +17 -20
  203. package/es/layout/components/SettingDrawer/BlockCheckbox.js +29 -32
  204. package/es/layout/components/SettingDrawer/LayoutChange.js +22 -22
  205. package/es/layout/components/SettingDrawer/RegionalChange.js +14 -15
  206. package/es/layout/components/SettingDrawer/ThemeColor.js +32 -35
  207. package/es/layout/components/SettingDrawer/index.js +137 -168
  208. package/es/layout/components/SettingDrawer/style/index.js +141 -137
  209. package/es/layout/components/SiderMenu/BaseMenu.js +235 -221
  210. package/es/layout/components/SiderMenu/SiderMenu.js +125 -115
  211. package/es/layout/components/SiderMenu/index.js +47 -42
  212. package/es/layout/components/SiderMenu/style/index.js +179 -161
  213. package/es/layout/components/SiderMenu/style/menu.js +148 -110
  214. package/es/layout/components/SiderMenu/style/stylish.js +15 -11
  215. package/es/layout/components/TopNavHeader/index.js +71 -60
  216. package/es/layout/components/TopNavHeader/style.js +64 -63
  217. package/es/layout/context/RouteContext.js +1 -1
  218. package/es/layout/defaultSettings.js +1 -1
  219. package/es/layout/getPageTitle.js +23 -24
  220. package/es/layout/locales/en-US.js +3 -2
  221. package/es/layout/locales/index.js +5 -5
  222. package/es/layout/locales/it-IT.js +3 -2
  223. package/es/layout/locales/ko-KR.js +3 -2
  224. package/es/layout/locales/zh-CN.js +3 -2
  225. package/es/layout/locales/zh-TW.js +3 -2
  226. package/es/layout/style/index.js +48 -42
  227. package/es/layout/utils/getBreadcrumbProps.js +60 -60
  228. package/es/layout/utils/getMenuData.js +7 -11
  229. package/es/layout/utils/pathTools.js +2 -6
  230. package/es/layout/utils/useCurrentMenuLayoutProps.js +4 -9
  231. package/es/layout/utils/utils.js +15 -17
  232. package/es/list/Item.js +157 -137
  233. package/es/list/ListView.js +106 -115
  234. package/es/list/constants.js +2 -2
  235. package/es/list/index.js +72 -70
  236. package/es/list/style/index.js +281 -213
  237. package/es/provider/index.js +122 -115
  238. package/es/provider/intl.js +53 -55
  239. package/es/provider/typing/layoutToken.js +26 -23
  240. package/es/provider/useStyle/index.js +51 -59
  241. package/es/provider/utils/merge.js +10 -12
  242. package/es/skeleton/components/Descriptions/index.js +211 -229
  243. package/es/skeleton/components/List/index.js +208 -223
  244. package/es/skeleton/components/Result/index.js +45 -47
  245. package/es/skeleton/index.js +13 -10
  246. package/es/table/Store/Provide.d.ts +4 -4
  247. package/es/table/Store/Provide.js +102 -117
  248. package/es/table/Table.d.ts +5 -2
  249. package/es/table/Table.js +526 -691
  250. package/es/table/TableSearch.d.ts +24 -0
  251. package/es/table/TableSearch.js +54 -0
  252. package/es/table/TableToolbar.d.ts +22 -0
  253. package/es/table/TableToolbar.js +47 -0
  254. package/es/table/components/Alert/index.js +41 -40
  255. package/es/table/components/Alert/style.js +28 -27
  256. package/es/table/components/ColumnSetting/index.js +228 -223
  257. package/es/table/components/ColumnSetting/style.js +86 -71
  258. package/es/table/components/DragSortTable/index.js +65 -79
  259. package/es/table/components/DragSortTable/style.js +20 -19
  260. package/es/table/components/Dropdown/index.js +42 -47
  261. package/es/table/components/EditableTable/CellEditorTable.js +24 -32
  262. package/es/table/components/EditableTable/RowEditorTable.js +23 -28
  263. package/es/table/components/EditableTable/index.js +295 -329
  264. package/es/table/components/Form/FormRender.js +99 -103
  265. package/es/table/components/Form/index.d.ts +4 -19
  266. package/es/table/components/Form/index.js +112 -159
  267. package/es/table/components/ListToolBar/HeaderMenu.js +44 -52
  268. package/es/table/components/ListToolBar/index.js +122 -147
  269. package/es/table/components/ListToolBar/style.js +127 -117
  270. package/es/table/components/ToolBar/DensityIcon.js +10 -9
  271. package/es/table/components/ToolBar/FullscreenIcon.js +5 -9
  272. package/es/table/components/ToolBar/index.d.ts +2 -8
  273. package/es/table/components/ToolBar/index.js +155 -195
  274. package/es/table/style/index.js +144 -112
  275. package/es/table/typing.d.ts +4 -0
  276. package/es/table/useFetchData.js +199 -338
  277. package/es/table/utils/cellRenderToFromItem.js +105 -119
  278. package/es/table/utils/columnRender.js +63 -54
  279. package/es/table/utils/columnSort.js +22 -22
  280. package/es/table/utils/genProColumnToColumn.d.ts +13 -9
  281. package/es/table/utils/genProColumnToColumn.js +121 -98
  282. package/es/table/utils/index.d.ts +10 -0
  283. package/es/table/utils/index.js +112 -178
  284. package/es/table/utils/useDragSort.d.ts +1 -1
  285. package/es/table/utils/useDragSort.js +99 -92
  286. package/es/table/utils/usePageInfo.d.ts +6 -0
  287. package/es/table/utils/usePageInfo.js +55 -0
  288. package/es/utils/components/DropdownFooter/index.js +23 -21
  289. package/es/utils/components/DropdownFooter/style.js +16 -15
  290. package/es/utils/components/ErrorBoundary/index.js +27 -50
  291. package/es/utils/components/FieldLabel/index.js +70 -70
  292. package/es/utils/components/FieldLabel/style.js +104 -81
  293. package/es/utils/components/FilterDropdown/index.d.ts +11 -0
  294. package/es/utils/components/FilterDropdown/index.js +43 -32
  295. package/es/utils/components/FilterDropdown/style.js +19 -16
  296. package/es/utils/components/InlineErrorFormItem/index.js +78 -78
  297. package/es/utils/components/InlineErrorFormItem/style.js +56 -49
  298. package/es/utils/components/LabelIconTip/index.js +30 -31
  299. package/es/utils/components/LabelIconTip/style.js +36 -35
  300. package/es/utils/components/ProFormContext/index.js +1 -1
  301. package/es/utils/conversionMomentValue/index.js +19 -22
  302. package/es/utils/dateArrayFormatter/index.js +9 -14
  303. package/es/utils/genCopyable/index.js +74 -32
  304. package/es/utils/getFieldPropsOrFormItemProps/index.js +1 -1
  305. package/es/utils/hooks/useDebounceFn/index.js +18 -51
  306. package/es/utils/hooks/useDebounceValue/index.js +7 -16
  307. package/es/utils/hooks/useDeepCompareEffect/index.js +6 -18
  308. package/es/utils/hooks/useDocumentTitle/index.js +2 -2
  309. package/es/utils/hooks/useFetchData/index.js +36 -65
  310. package/es/utils/hooks/useForceRender/index.js +2 -9
  311. package/es/utils/hooks/useLatest/index.js +2 -2
  312. package/es/utils/hooks/usePrevious/index.js +3 -3
  313. package/es/utils/hooks/useReactiveRef/index.js +2 -2
  314. package/es/utils/hooks/useRefCallback/index.js +3 -3
  315. package/es/utils/hooks/useRefFunction/index.js +4 -9
  316. package/es/utils/index.d.ts +1 -2
  317. package/es/utils/index.js +1 -2
  318. package/es/utils/isBrowser/index.js +2 -2
  319. package/es/utils/isDeepEqualReact/index.js +9 -44
  320. package/es/utils/isDropdownValueType/index.js +2 -2
  321. package/es/utils/isNil/index.js +1 -3
  322. package/es/utils/isUrl/index.js +2 -2
  323. package/es/utils/merge/index.js +10 -12
  324. package/es/utils/nanoid/index.js +5 -6
  325. package/es/utils/omitBoolean/index.js +1 -1
  326. package/es/utils/omitUndefined/index.js +3 -3
  327. package/es/utils/omitUndefinedAndEmptyArr/index.js +4 -5
  328. package/es/utils/parseValueToMoment/index.js +3 -7
  329. package/es/utils/pickProFormItemProps/index.js +3 -3
  330. package/es/utils/pickProProps/index.js +6 -7
  331. package/es/utils/proFieldParsingText/index.js +85 -98
  332. package/es/utils/runFunction/index.js +2 -5
  333. package/es/utils/stringify/index.js +1 -1
  334. package/es/utils/transformKeySubmitValue/index.js +99 -116
  335. package/es/utils/useEditableArray/index.d.ts +6 -1
  336. package/es/utils/useEditableArray/index.js +579 -735
  337. package/es/utils/useEditableMap/index.d.ts +1 -1
  338. package/es/utils/useEditableMap/index.js +89 -135
  339. package/es/utils/useMediaQuery/index.js +16 -18
  340. package/es/utils/useMediaQuery/query.js +7 -17
  341. package/es/version.js +1 -1
  342. package/lib/card/ProCard.js +8 -10
  343. package/lib/card/components/Actions/index.js +25 -25
  344. package/lib/card/components/Actions/style.js +79 -72
  345. package/lib/card/components/Card/index.js +154 -139
  346. package/lib/card/components/Card/style.js +249 -193
  347. package/lib/card/components/CheckCard/Group.js +97 -115
  348. package/lib/card/components/CheckCard/index.js +85 -78
  349. package/lib/card/components/CheckCard/style.js +184 -169
  350. package/lib/card/components/Divider/index.js +20 -16
  351. package/lib/card/components/Divider/style.js +32 -30
  352. package/lib/card/components/Loading/index.js +19 -16
  353. package/lib/card/components/Loading/style.js +34 -32
  354. package/lib/card/components/Operation/index.js +16 -14
  355. package/lib/card/components/Operation/style.js +19 -19
  356. package/lib/card/components/Statistic/index.js +46 -42
  357. package/lib/card/components/Statistic/style.js +89 -71
  358. package/lib/card/components/StatisticCard/index.js +46 -41
  359. package/lib/card/components/StatisticCard/style.js +37 -36
  360. package/lib/card/index.js +4 -4
  361. package/lib/descriptions/index.js +219 -225
  362. package/lib/descriptions/useFetchData.js +51 -90
  363. package/lib/field/AllProField.js +267 -217
  364. package/lib/field/FieldHOC/index.js +9 -15
  365. package/lib/field/PureProField.js +84 -82
  366. package/lib/field/ValueTypeToComponent.js +517 -618
  367. package/lib/field/components/Cascader/index.d.ts +2 -2
  368. package/lib/field/components/Cascader/index.js +65 -85
  369. package/lib/field/components/Checkbox/index.d.ts +1 -1
  370. package/lib/field/components/Checkbox/index.js +75 -73
  371. package/lib/field/components/Code/index.js +40 -39
  372. package/lib/field/components/ColorPicker/index.js +38 -33
  373. package/lib/field/components/DatePicker/index.d.ts +1 -1
  374. package/lib/field/components/DatePicker/index.js +49 -53
  375. package/lib/field/components/Digit/index.js +41 -43
  376. package/lib/field/components/DigitRange/index.js +69 -76
  377. package/lib/field/components/FromNow/index.js +27 -25
  378. package/lib/field/components/Image/index.js +28 -24
  379. package/lib/field/components/IndexColumn/index.js +22 -17
  380. package/lib/field/components/Money/index.js +106 -116
  381. package/lib/field/components/Options/index.js +34 -34
  382. package/lib/field/components/Password/index.js +35 -38
  383. package/lib/field/components/Percent/index.js +40 -45
  384. package/lib/field/components/Percent/util.js +3 -6
  385. package/lib/field/components/Progress/index.js +29 -28
  386. package/lib/field/components/Radio/index.d.ts +1 -1
  387. package/lib/field/components/Radio/index.js +61 -63
  388. package/lib/field/components/RangePicker/index.d.ts +1 -1
  389. package/lib/field/components/RangePicker/index.js +52 -63
  390. package/lib/field/components/Rate/index.js +24 -21
  391. package/lib/field/components/Second/index.js +36 -33
  392. package/lib/field/components/Segmented/index.d.ts +1 -1
  393. package/lib/field/components/Segmented/index.js +37 -48
  394. package/lib/field/components/Select/LightSelect/index.d.ts +1 -1
  395. package/lib/field/components/Select/LightSelect/index.js +103 -110
  396. package/lib/field/components/Select/SearchSelect/index.js +133 -156
  397. package/lib/field/components/Select/index.d.ts +1 -1
  398. package/lib/field/components/Select/index.js +194 -218
  399. package/lib/field/components/Slider/index.js +25 -22
  400. package/lib/field/components/Status/index.js +69 -79
  401. package/lib/field/components/Switch/index.d.ts +1 -1
  402. package/lib/field/components/Switch/index.js +32 -31
  403. package/lib/field/components/Text/index.js +34 -38
  404. package/lib/field/components/TextArea/index.js +26 -21
  405. package/lib/field/components/TextArea/readonly.js +24 -22
  406. package/lib/field/components/TimePicker/index.js +96 -105
  407. package/lib/field/components/TreeSelect/index.d.ts +2 -2
  408. package/lib/field/components/TreeSelect/index.js +105 -124
  409. package/lib/field/index.js +34 -34
  410. package/lib/form/BaseForm/BaseForm.js +413 -499
  411. package/lib/form/BaseForm/EditOrReadOnlyContext.js +1 -1
  412. package/lib/form/BaseForm/LightWrapper/index.js +57 -66
  413. package/lib/form/BaseForm/LightWrapper/style.js +17 -14
  414. package/lib/form/BaseForm/Submitter/index.js +44 -44
  415. package/lib/form/BaseForm/index.js +3 -3
  416. package/lib/form/FieldContext.js +1 -1
  417. package/lib/form/components/Captcha/index.js +74 -135
  418. package/lib/form/components/Cascader/index.js +26 -29
  419. package/lib/form/components/Checkbox/index.js +60 -61
  420. package/lib/form/components/ColorPicker/index.js +24 -26
  421. package/lib/form/components/DatePicker/BaseDatePicker.js +32 -30
  422. package/lib/form/components/DatePicker/DatePicker.js +14 -13
  423. package/lib/form/components/DatePicker/DateTimePicker.js +11 -12
  424. package/lib/form/components/DatePicker/MonthPicker.js +14 -13
  425. package/lib/form/components/DatePicker/QuarterPicker.js +14 -13
  426. package/lib/form/components/DatePicker/TimePicker.js +26 -27
  427. package/lib/form/components/DatePicker/WeekPicker.js +14 -13
  428. package/lib/form/components/DatePicker/YearPicker.js +14 -13
  429. package/lib/form/components/DatePicker/index.js +1 -1
  430. package/lib/form/components/DateRangePicker/BaseDateRanger.js +34 -34
  431. package/lib/form/components/DateRangePicker/DateMonthRangePicker.js +15 -16
  432. package/lib/form/components/DateRangePicker/DateQuarterRangePicker.js +15 -16
  433. package/lib/form/components/DateRangePicker/DateTimeRangePicker.js +15 -16
  434. package/lib/form/components/DateRangePicker/DateWeekRangePicker.js +15 -16
  435. package/lib/form/components/DateRangePicker/DateYearRangePicker.js +15 -16
  436. package/lib/form/components/DateRangePicker/TimeRangePicker.js +26 -29
  437. package/lib/form/components/DateRangePicker/index.js +15 -16
  438. package/lib/form/components/Dependency/index.js +31 -35
  439. package/lib/form/components/Digit/DigitRange.js +23 -24
  440. package/lib/form/components/Digit/index.js +27 -29
  441. package/lib/form/components/Field/index.js +55 -63
  442. package/lib/form/components/FieldSet/index.js +68 -76
  443. package/lib/form/components/FormItem/FormItemRender/index.js +58 -48
  444. package/lib/form/components/FormItem/Group/index.js +95 -95
  445. package/lib/form/components/FormItem/Group/style.js +46 -41
  446. package/lib/form/components/FormItem/index.js +135 -141
  447. package/lib/form/components/FormItem/warpField.js +165 -149
  448. package/lib/form/components/List/ListContainer.js +100 -191
  449. package/lib/form/components/List/ListItem.js +153 -200
  450. package/lib/form/components/List/index.js +97 -107
  451. package/lib/form/components/List/style.js +71 -48
  452. package/lib/form/components/Money/index.js +28 -30
  453. package/lib/form/components/Radio/index.js +45 -49
  454. package/lib/form/components/Rate/index.js +17 -21
  455. package/lib/form/components/SchemaForm/index.js +54 -68
  456. package/lib/form/components/SchemaForm/layoutType/Embed.js +5 -6
  457. package/lib/form/components/SchemaForm/layoutType/StepsForm.js +22 -26
  458. package/lib/form/components/SchemaForm/layoutType/index.js +2 -2
  459. package/lib/form/components/SchemaForm/valueType/dependency.js +13 -12
  460. package/lib/form/components/SchemaForm/valueType/divider.js +6 -7
  461. package/lib/form/components/SchemaForm/valueType/field.js +47 -45
  462. package/lib/form/components/SchemaForm/valueType/formList.js +10 -9
  463. package/lib/form/components/SchemaForm/valueType/formSet.js +10 -8
  464. package/lib/form/components/SchemaForm/valueType/group.js +9 -10
  465. package/lib/form/components/SchemaForm/valueType/ignore.js +4 -3
  466. package/lib/form/components/SchemaForm/valueType/index.js +7 -6
  467. package/lib/form/components/Segmented/index.js +20 -24
  468. package/lib/form/components/Select/index.js +69 -73
  469. package/lib/form/components/Slider/index.js +33 -35
  470. package/lib/form/components/Switch/index.js +24 -26
  471. package/lib/form/components/Text/index.js +73 -84
  472. package/lib/form/components/TextArea/index.js +17 -21
  473. package/lib/form/components/TreeSelect/index.js +20 -23
  474. package/lib/form/components/UploadButton/index.js +56 -103
  475. package/lib/form/components/UploadDragger/index.js +37 -44
  476. package/lib/form/components/index.js +42 -42
  477. package/lib/form/helpers/grid.js +68 -69
  478. package/lib/form/helpers/index.js +1 -1
  479. package/lib/form/index.js +8 -8
  480. package/lib/form/layouts/DrawerForm/index.js +149 -241
  481. package/lib/form/layouts/DrawerForm/style.js +26 -26
  482. package/lib/form/layouts/LightFilter/index.d.ts +12 -1
  483. package/lib/form/layouts/LightFilter/index.js +158 -141
  484. package/lib/form/layouts/LightFilter/style.js +52 -49
  485. package/lib/form/layouts/LoginForm/index.js +44 -48
  486. package/lib/form/layouts/LoginForm/style.js +71 -68
  487. package/lib/form/layouts/LoginFormPage/index.js +45 -49
  488. package/lib/form/layouts/LoginFormPage/style.js +136 -127
  489. package/lib/form/layouts/ModalForm/index.js +118 -203
  490. package/lib/form/layouts/ProForm/index.d.ts +1 -1
  491. package/lib/form/layouts/ProForm/index.js +5 -5
  492. package/lib/form/layouts/QueryFilter/Actions.js +23 -22
  493. package/lib/form/layouts/QueryFilter/index.js +177 -202
  494. package/lib/form/layouts/QueryFilter/style.js +45 -38
  495. package/lib/form/layouts/StepsForm/StepForm.d.ts +2 -3
  496. package/lib/form/layouts/StepsForm/StepForm.js +50 -72
  497. package/lib/form/layouts/StepsForm/index.js +174 -216
  498. package/lib/form/layouts/StepsForm/style.js +30 -29
  499. package/lib/form/layouts/index.js +9 -9
  500. package/lib/index.js +11 -11
  501. package/lib/layout/ProLayout.js +281 -292
  502. package/lib/layout/WrapContent.js +18 -14
  503. package/lib/layout/assert/Logo.js +96 -97
  504. package/lib/layout/components/AppsLogoComponents/AppsLogo.js +11 -12
  505. package/lib/layout/components/AppsLogoComponents/DefaultContent.js +19 -17
  506. package/lib/layout/components/AppsLogoComponents/SimpleContent.js +22 -19
  507. package/lib/layout/components/AppsLogoComponents/index.js +36 -40
  508. package/lib/layout/components/AppsLogoComponents/style/default.js +4 -3
  509. package/lib/layout/components/AppsLogoComponents/style/index.js +52 -51
  510. package/lib/layout/components/AppsLogoComponents/style/simple.js +3 -2
  511. package/lib/layout/components/CollapsedIcon/index.js +20 -17
  512. package/lib/layout/components/CollapsedIcon/style.js +40 -41
  513. package/lib/layout/components/Footer.js +23 -22
  514. package/lib/layout/components/FooterToolbar/index.js +59 -53
  515. package/lib/layout/components/FooterToolbar/style/index.js +38 -38
  516. package/lib/layout/components/FooterToolbar/style/stylish.js +11 -10
  517. package/lib/layout/components/GlobalFooter/index.js +27 -27
  518. package/lib/layout/components/GlobalFooter/style.js +31 -31
  519. package/lib/layout/components/GlobalHeader/ActionsContent.js +65 -81
  520. package/lib/layout/components/GlobalHeader/index.js +61 -49
  521. package/lib/layout/components/GlobalHeader/rightContentStyle.js +49 -50
  522. package/lib/layout/components/GlobalHeader/style.js +58 -55
  523. package/lib/layout/components/GridContent/index.js +26 -21
  524. package/lib/layout/components/GridContent/style.js +14 -14
  525. package/lib/layout/components/Header/index.js +65 -59
  526. package/lib/layout/components/Header/style/header.js +49 -48
  527. package/lib/layout/components/Header/style/stylish.js +15 -12
  528. package/lib/layout/components/Help/AsyncContentPanel.js +15 -20
  529. package/lib/layout/components/Help/HelpProvide.js +1 -1
  530. package/lib/layout/components/Help/ProHelpContentPanel.js +66 -85
  531. package/lib/layout/components/Help/ProHelpDrawer.js +27 -32
  532. package/lib/layout/components/Help/ProHelpModal.d.ts +1 -1
  533. package/lib/layout/components/Help/ProHelpModal.js +26 -28
  534. package/lib/layout/components/Help/ProHelpPanel.js +86 -94
  535. package/lib/layout/components/Help/ProHelpPopover.js +20 -18
  536. package/lib/layout/components/Help/RenderContentPanel.js +36 -26
  537. package/lib/layout/components/Help/Search.js +55 -80
  538. package/lib/layout/components/Help/index.js +19 -20
  539. package/lib/layout/components/Help/style.js +82 -76
  540. package/lib/layout/components/PageContainer/index.js +172 -151
  541. package/lib/layout/components/PageContainer/style/index.js +95 -79
  542. package/lib/layout/components/PageContainer/style/stylish.js +11 -10
  543. package/lib/layout/components/PageHeader/index.js +99 -99
  544. package/lib/layout/components/PageHeader/style/index.js +142 -123
  545. package/lib/layout/components/PageLoading/index.js +18 -20
  546. package/lib/layout/components/SettingDrawer/BlockCheckbox.js +31 -34
  547. package/lib/layout/components/SettingDrawer/LayoutChange.js +25 -23
  548. package/lib/layout/components/SettingDrawer/RegionalChange.js +16 -16
  549. package/lib/layout/components/SettingDrawer/ThemeColor.js +34 -36
  550. package/lib/layout/components/SettingDrawer/index.js +138 -168
  551. package/lib/layout/components/SettingDrawer/style/index.js +141 -138
  552. package/lib/layout/components/SiderMenu/BaseMenu.js +235 -221
  553. package/lib/layout/components/SiderMenu/SiderMenu.js +128 -117
  554. package/lib/layout/components/SiderMenu/index.js +49 -44
  555. package/lib/layout/components/SiderMenu/style/index.js +179 -162
  556. package/lib/layout/components/SiderMenu/style/menu.js +148 -111
  557. package/lib/layout/components/SiderMenu/style/stylish.js +15 -12
  558. package/lib/layout/components/TopNavHeader/index.js +73 -62
  559. package/lib/layout/components/TopNavHeader/style.js +64 -64
  560. package/lib/layout/context/RouteContext.js +1 -1
  561. package/lib/layout/defaultSettings.js +1 -1
  562. package/lib/layout/getPageTitle.js +27 -26
  563. package/lib/layout/index.js +16 -16
  564. package/lib/layout/locales/en-US.js +3 -2
  565. package/lib/layout/locales/index.js +8 -6
  566. package/lib/layout/locales/it-IT.js +3 -2
  567. package/lib/layout/locales/ko-KR.js +3 -2
  568. package/lib/layout/locales/zh-CN.js +3 -2
  569. package/lib/layout/locales/zh-TW.js +3 -2
  570. package/lib/layout/style/index.js +48 -43
  571. package/lib/layout/utils/getBreadcrumbProps.js +65 -62
  572. package/lib/layout/utils/getMenuData.js +9 -13
  573. package/lib/layout/utils/pathTools.js +2 -6
  574. package/lib/layout/utils/useCurrentMenuLayoutProps.js +6 -11
  575. package/lib/layout/utils/utils.js +16 -18
  576. package/lib/list/Item.js +155 -136
  577. package/lib/list/ListView.js +110 -119
  578. package/lib/list/constants.js +2 -2
  579. package/lib/list/index.js +72 -70
  580. package/lib/list/style/index.js +281 -214
  581. package/lib/provider/index.js +128 -118
  582. package/lib/provider/intl.js +56 -56
  583. package/lib/provider/typing/layoutToken.js +28 -25
  584. package/lib/provider/useStyle/index.js +55 -60
  585. package/lib/provider/utils/merge.js +12 -14
  586. package/lib/skeleton/components/Descriptions/index.js +213 -229
  587. package/lib/skeleton/components/List/index.js +211 -221
  588. package/lib/skeleton/components/Result/index.js +45 -47
  589. package/lib/skeleton/index.js +23 -19
  590. package/lib/table/Store/Provide.d.ts +4 -4
  591. package/lib/table/Store/Provide.js +103 -117
  592. package/lib/table/Table.d.ts +5 -2
  593. package/lib/table/Table.js +524 -689
  594. package/lib/table/TableSearch.d.ts +24 -0
  595. package/lib/table/TableSearch.js +61 -0
  596. package/lib/table/TableToolbar.d.ts +22 -0
  597. package/lib/table/TableToolbar.js +55 -0
  598. package/lib/table/components/Alert/index.js +41 -40
  599. package/lib/table/components/Alert/style.js +28 -28
  600. package/lib/table/components/ColumnSetting/index.js +228 -224
  601. package/lib/table/components/ColumnSetting/style.js +86 -72
  602. package/lib/table/components/DragSortTable/index.js +64 -78
  603. package/lib/table/components/DragSortTable/style.js +20 -20
  604. package/lib/table/components/Dropdown/index.js +42 -48
  605. package/lib/table/components/EditableTable/CellEditorTable.js +24 -32
  606. package/lib/table/components/EditableTable/RowEditorTable.js +23 -28
  607. package/lib/table/components/EditableTable/index.js +293 -327
  608. package/lib/table/components/Form/FormRender.js +99 -104
  609. package/lib/table/components/Form/index.d.ts +4 -19
  610. package/lib/table/components/Form/index.js +113 -159
  611. package/lib/table/components/ListToolBar/HeaderMenu.js +42 -51
  612. package/lib/table/components/ListToolBar/index.js +123 -148
  613. package/lib/table/components/ListToolBar/style.js +127 -118
  614. package/lib/table/components/ToolBar/DensityIcon.js +10 -9
  615. package/lib/table/components/ToolBar/FullscreenIcon.js +5 -10
  616. package/lib/table/components/ToolBar/index.d.ts +2 -8
  617. package/lib/table/components/ToolBar/index.js +154 -194
  618. package/lib/table/index.js +27 -27
  619. package/lib/table/style/index.js +144 -113
  620. package/lib/table/typing.d.ts +4 -0
  621. package/lib/table/useFetchData.js +197 -337
  622. package/lib/table/utils/cellRenderToFromItem.js +106 -120
  623. package/lib/table/utils/columnRender.js +65 -54
  624. package/lib/table/utils/columnSort.js +24 -23
  625. package/lib/table/utils/genProColumnToColumn.d.ts +13 -9
  626. package/lib/table/utils/genProColumnToColumn.js +121 -99
  627. package/lib/table/utils/index.d.ts +10 -0
  628. package/lib/table/utils/index.js +127 -181
  629. package/lib/table/utils/useDragSort.d.ts +1 -1
  630. package/lib/table/utils/useDragSort.js +99 -93
  631. package/lib/table/utils/usePageInfo.d.ts +6 -0
  632. package/lib/table/utils/usePageInfo.js +61 -0
  633. package/lib/utils/components/DropdownFooter/index.js +25 -23
  634. package/lib/utils/components/DropdownFooter/style.js +16 -16
  635. package/lib/utils/components/ErrorBoundary/index.js +28 -50
  636. package/lib/utils/components/FieldLabel/index.js +70 -71
  637. package/lib/utils/components/FieldLabel/style.js +104 -82
  638. package/lib/utils/components/FilterDropdown/index.d.ts +11 -0
  639. package/lib/utils/components/FilterDropdown/index.js +44 -33
  640. package/lib/utils/components/FilterDropdown/style.js +19 -17
  641. package/lib/utils/components/InlineErrorFormItem/index.js +80 -80
  642. package/lib/utils/components/InlineErrorFormItem/style.js +56 -50
  643. package/lib/utils/components/LabelIconTip/index.js +30 -32
  644. package/lib/utils/components/LabelIconTip/style.js +36 -36
  645. package/lib/utils/components/ProFormContext/index.js +1 -1
  646. package/lib/utils/conversionMomentValue/index.js +22 -23
  647. package/lib/utils/dateArrayFormatter/index.js +11 -15
  648. package/lib/utils/genCopyable/index.js +75 -33
  649. package/lib/utils/getFieldPropsOrFormItemProps/index.js +3 -2
  650. package/lib/utils/hooks/useDebounceFn/index.js +18 -52
  651. package/lib/utils/hooks/useDebounceValue/index.js +7 -17
  652. package/lib/utils/hooks/useDeepCompareEffect/index.js +7 -19
  653. package/lib/utils/hooks/useDocumentTitle/index.js +2 -2
  654. package/lib/utils/hooks/useFetchData/index.js +36 -65
  655. package/lib/utils/hooks/useForceRender/index.js +2 -10
  656. package/lib/utils/hooks/useLatest/index.js +4 -3
  657. package/lib/utils/hooks/usePrevious/index.js +5 -4
  658. package/lib/utils/hooks/useReactiveRef/index.js +2 -2
  659. package/lib/utils/hooks/useRefCallback/index.js +3 -3
  660. package/lib/utils/hooks/useRefFunction/index.js +6 -11
  661. package/lib/utils/index.d.ts +1 -2
  662. package/lib/utils/index.js +57 -65
  663. package/lib/utils/isBrowser/index.js +4 -3
  664. package/lib/utils/isDeepEqualReact/index.js +9 -45
  665. package/lib/utils/isDropdownValueType/index.js +4 -3
  666. package/lib/utils/isNil/index.js +2 -3
  667. package/lib/utils/isUrl/index.js +4 -3
  668. package/lib/utils/merge/index.js +12 -14
  669. package/lib/utils/nanoid/index.js +7 -7
  670. package/lib/utils/omitBoolean/index.js +3 -2
  671. package/lib/utils/omitUndefined/index.js +5 -4
  672. package/lib/utils/omitUndefinedAndEmptyArr/index.js +6 -6
  673. package/lib/utils/parseValueToMoment/index.js +5 -8
  674. package/lib/utils/pickProFormItemProps/index.js +3 -3
  675. package/lib/utils/pickProProps/index.js +6 -7
  676. package/lib/utils/proFieldParsingText/index.js +89 -99
  677. package/lib/utils/runFunction/index.js +2 -5
  678. package/lib/utils/stringify/index.js +2 -2
  679. package/lib/utils/transformKeySubmitValue/index.js +101 -117
  680. package/lib/utils/useEditableArray/index.d.ts +6 -1
  681. package/lib/utils/useEditableArray/index.js +582 -735
  682. package/lib/utils/useEditableMap/index.d.ts +1 -1
  683. package/lib/utils/useEditableMap/index.js +88 -135
  684. package/lib/utils/useMediaQuery/index.js +19 -19
  685. package/lib/utils/useMediaQuery/query.js +7 -18
  686. package/lib/version.js +1 -1
  687. package/package.json +17 -28
  688. package/es/utils/useMountMergeState/index.d.ts +0 -2
  689. package/es/utils/useMountMergeState/index.js +0 -2
  690. package/lib/utils/useMountMergeState/index.d.ts +0 -2
  691. package/lib/utils/useMountMergeState/index.js +0 -12
@@ -1,39 +1,8 @@
1
- import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
2
- import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
3
- import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
4
- import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
5
- import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
6
- import _typeof from "@babel/runtime/helpers/esm/typeof";
7
- import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
8
- var _excluded = ["data", "success", "total"];
9
- import { useEffect, useRef } from 'react';
10
- import { runFunction, useDebounceFn, useDeepCompareEffect, useMountMergeState, usePrevious, useRefFunction } from "../utils";
1
+ import { useControlledState } from '@rc-component/util';
2
+ import { useCallback, useEffect, useRef, useState } from 'react';
3
+ import { runFunction, useDebounceFn, useDeepCompareEffect, usePrevious, useRefFunction } from "../utils";
11
4
  import { postDataPipeline } from "./utils/index";
12
-
13
- /**
14
- * 组合用户的配置和默认值
15
- *
16
- * @param param0
17
- */
18
- var mergeOptionAndPageInfo = function mergeOptionAndPageInfo(_ref) {
19
- var pageInfo = _ref.pageInfo;
20
- if (pageInfo) {
21
- var current = pageInfo.current,
22
- defaultCurrent = pageInfo.defaultCurrent,
23
- pageSize = pageInfo.pageSize,
24
- defaultPageSize = pageInfo.defaultPageSize;
25
- return {
26
- current: current || defaultCurrent || 1,
27
- total: 0,
28
- pageSize: pageSize || defaultPageSize || 20
29
- };
30
- }
31
- return {
32
- current: 1,
33
- total: 0,
34
- pageSize: 20
35
- };
36
- };
5
+ import { usePageInfo } from "./utils/usePageInfo";
37
6
 
38
7
  /**
39
8
  * useFetchData hook 用来获取数据并控制数据的状态和分页
@@ -44,18 +13,13 @@ var mergeOptionAndPageInfo = function mergeOptionAndPageInfo(_ref) {
44
13
  * @param {UseFetchProps} options - 配置项,包括了默认的分页参数、格式化数据的函数等
45
14
  * @returns {UseFetchDataAction} 返回一个对象,包含当前的数据列表、loading 状态、error、以及可控制的分页参数等
46
15
  */
47
- var useFetchData = function useFetchData(getData, defaultData, options) {
48
- var _options$loading;
49
- /**
50
- * 用于保存组件是否被卸载的状态的引用
51
- * @type {React.MutableRefObject<boolean>}
52
- */
53
- var umountRef = useRef(false);
16
+ const useFetchData = (getData, defaultData, options) => {
17
+ const umountRef = useRef(false);
54
18
  /**
55
19
  * 用于保存 AbortController 实例的引用,方便需要时进行请求的取消操作
56
20
  * @type {React.MutableRefObject<AbortController | null>}
57
21
  */
58
- var abortRef = useRef(null);
22
+ const abortRef = useRef(null);
59
23
  /**
60
24
  * useFetchData 钩子的配置项
61
25
  * @typedef {object} UseFetchProps
@@ -65,82 +29,65 @@ var useFetchData = function useFetchData(getData, defaultData, options) {
65
29
  * @property {function} [onRequestError] 请求错误的回调函数
66
30
  * @property {number} [debounceTime=20] 防抖时间,单位为毫秒,默认为 20ms
67
31
  */
68
- var _ref2 = options || {},
69
- onLoad = _ref2.onLoad,
70
- manual = _ref2.manual,
71
- polling = _ref2.polling,
72
- onRequestError = _ref2.onRequestError,
73
- _ref2$debounceTime = _ref2.debounceTime,
74
- debounceTime = _ref2$debounceTime === void 0 ? 20 : _ref2$debounceTime,
75
- _ref2$effects = _ref2.effects,
76
- effects = _ref2$effects === void 0 ? [] : _ref2$effects;
32
+ const {
33
+ onLoad,
34
+ manual,
35
+ polling,
36
+ onRequestError,
37
+ debounceTime = 20,
38
+ effects = []
39
+ } = options || {};
77
40
 
78
41
  /** 是否首次加载的指示器 */
79
- var manualRequestRef = useRef(manual);
42
+ const manualRequestRef = useRef(manual);
80
43
 
81
44
  /** 轮询的setTime ID 存储 */
82
- var pollingSetTimeRef = useRef();
45
+ const pollingSetTimeRef = useRef();
83
46
 
84
47
  /**
85
48
  * 用于存储最新的数据,这样可以在切换的时候保持数据的一致性
86
49
  */
87
- var _useMountMergeState = useMountMergeState(defaultData, {
88
- value: options === null || options === void 0 ? void 0 : options.dataSource,
89
- onChange: options === null || options === void 0 ? void 0 : options.onDataSourceChange
90
- }),
91
- _useMountMergeState2 = _slicedToArray(_useMountMergeState, 2),
92
- tableDataList = _useMountMergeState2[0],
93
- setTableDataList = _useMountMergeState2[1];
50
+ const [tableDataList, setTableDataListInner] = useControlledState(defaultData, options?.dataSource);
51
+ const setTableDataList = useCallback(updater => {
52
+ setTableDataListInner(prev => {
53
+ const next = typeof updater === 'function' ? updater(prev) : updater;
54
+ options?.onDataSourceChange?.(next);
55
+ return next;
56
+ });
57
+ }, [options?.onDataSourceChange]);
94
58
 
95
59
  /**
96
60
  * 表格的加载状态
97
61
  */
98
- var _useMountMergeState3 = useMountMergeState(false, {
99
- value: _typeof(options === null || options === void 0 ? void 0 : options.loading) === 'object' ? options === null || options === void 0 || (_options$loading = options.loading) === null || _options$loading === void 0 ? void 0 : _options$loading.spinning : options === null || options === void 0 ? void 0 : options.loading,
100
- onChange: options === null || options === void 0 ? void 0 : options.onLoadingChange
101
- }),
102
- _useMountMergeState4 = _slicedToArray(_useMountMergeState3, 2),
103
- tableLoading = _useMountMergeState4[0],
104
- setTableLoading = _useMountMergeState4[1];
62
+ const tableLoadingValue = typeof options?.loading === 'object' ? options?.loading?.spinning : options?.loading;
63
+ const [tableLoading, setTableLoadingInner] = useControlledState(false, tableLoadingValue);
64
+ const setTableLoading = useCallback(updater => {
65
+ setTableLoadingInner(prev => {
66
+ const next = typeof updater === 'function' ? updater(prev) : updater;
67
+ options?.onLoadingChange?.(next);
68
+ return next;
69
+ });
70
+ }, [options?.onLoadingChange]);
105
71
 
106
72
  /**
107
- * 表示页面信息的类型 useMountMergeState 钩子的初始值和参数
73
+ * 表示页面信息的类型
108
74
  * @typedef {object} PageInfo
109
75
  * @property {number} current 当前页码
110
76
  * @property {number} pageSize 页面大小
111
77
  * @property {number} total 数据总量
112
78
  * @type {[PageInfo, React.Dispatch<React.SetStateAction<PageInfo>>]}
113
79
  */
114
- var _useMountMergeState5 = useMountMergeState(function () {
115
- return mergeOptionAndPageInfo(options);
116
- }, {
117
- onChange: options === null || options === void 0 ? void 0 : options.onPageInfoChange
118
- }),
119
- _useMountMergeState6 = _slicedToArray(_useMountMergeState5, 2),
120
- pageInfo = _useMountMergeState6[0],
121
- setPageInfoState = _useMountMergeState6[1];
122
-
123
- /**
124
- * 用于比较并设置页面信息和回调函数的引用更新
125
- * @type {React.MutableRefObject<(changePageInfo: PageInfo) => void>}
126
- */
127
- var _setPageInfo = useRefFunction(function (changePageInfo) {
128
- if (changePageInfo.current !== pageInfo.current || changePageInfo.pageSize !== pageInfo.pageSize || changePageInfo.total !== pageInfo.total) {
129
- setPageInfoState(changePageInfo);
130
- }
131
- });
132
- var _useMountMergeState7 = useMountMergeState(false),
133
- _useMountMergeState8 = _slicedToArray(_useMountMergeState7, 2),
134
- pollingLoading = _useMountMergeState8[0],
135
- setPollingLoading = _useMountMergeState8[1];
80
+ const [pageInfo, setPageInfo] = usePageInfo(options);
81
+ const [pollingLoading, setPollingLoading] = useState(false);
136
82
 
137
83
  // Batching update https://github.com/facebook/react/issues/14259
138
- var setDataAndLoading = function setDataAndLoading(newData, dataTotal) {
84
+ const setDataAndLoading = (newData, dataTotal) => {
139
85
  setTableDataList(newData);
140
- if ((pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.total) !== dataTotal) {
141
- _setPageInfo(_objectSpread(_objectSpread({}, pageInfo), {}, {
86
+ if (pageInfo?.total !== dataTotal) {
87
+ setPageInfo({
88
+ ...pageInfo,
142
89
  total: dataTotal || newData.length
143
- }));
90
+ });
144
91
  }
145
92
  };
146
93
 
@@ -148,109 +95,85 @@ var useFetchData = function useFetchData(getData, defaultData, options) {
148
95
  * 上一页的页码
149
96
  * @type {number}
150
97
  */
151
- var prePage = usePrevious(pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.current);
98
+ const prePage = usePrevious(pageInfo?.current);
152
99
 
153
100
  /**
154
101
  * 上一页的页面大小
155
102
  * @type {number}
156
103
  */
157
- var prePageSize = usePrevious(pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.pageSize);
104
+ const prePageSize = usePrevious(pageInfo?.pageSize);
158
105
 
159
106
  /**
160
107
  * 上一页的轮询时间
161
108
  * @type {number|boolean}
162
109
  */
163
- var prePolling = usePrevious(polling);
110
+ const prePolling = usePrevious(polling);
164
111
 
165
112
  /**
166
113
  * 不这样做会导致状态不更新
167
114
  * https://github.com/ant-design/pro-components/issues/4390
168
115
  */
169
- var requestFinally = useRefFunction(function () {
116
+ const requestFinally = useRefFunction(() => {
170
117
  setTableLoading(false);
171
118
  setPollingLoading(false);
172
119
  });
173
120
  /** 请求数据 */
174
- var fetchList = /*#__PURE__*/function () {
175
- var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(isPolling) {
176
- var _ref4, pageSize, current, pageParams, _ref5, _ref5$data, data, success, _ref5$total, total, rest, responseData;
177
- return _regeneratorRuntime().wrap(function _callee$(_context) {
178
- while (1) switch (_context.prev = _context.next) {
179
- case 0:
180
- if (!manualRequestRef.current) {
181
- _context.next = 3;
182
- break;
183
- }
184
- manualRequestRef.current = false;
185
- return _context.abrupt("return");
186
- case 3:
187
- if (!isPolling) {
188
- setTableLoading(true);
189
- } else {
190
- setPollingLoading(true);
191
- }
192
- _ref4 = pageInfo || {}, pageSize = _ref4.pageSize, current = _ref4.current;
193
- _context.prev = 5;
194
- pageParams = (options === null || options === void 0 ? void 0 : options.pageInfo) !== false ? {
195
- current: current,
196
- pageSize: pageSize
197
- } : undefined;
198
- _context.next = 9;
199
- return getData === null || getData === void 0 ? void 0 : getData(pageParams);
200
- case 9:
201
- _context.t0 = _context.sent;
202
- if (_context.t0) {
203
- _context.next = 12;
204
- break;
205
- }
206
- _context.t0 = {};
207
- case 12:
208
- _ref5 = _context.t0;
209
- _ref5$data = _ref5.data;
210
- data = _ref5$data === void 0 ? [] : _ref5$data;
211
- success = _ref5.success;
212
- _ref5$total = _ref5.total;
213
- total = _ref5$total === void 0 ? 0 : _ref5$total;
214
- rest = _objectWithoutProperties(_ref5, _excluded);
215
- if (!(success === false)) {
216
- _context.next = 21;
217
- break;
218
- }
219
- return _context.abrupt("return", []);
220
- case 21:
221
- responseData = postDataPipeline(data, [options.postData].filter(function (item) {
222
- return item;
223
- })); // 设置表格数据
224
- setDataAndLoading(responseData, total);
225
- onLoad === null || onLoad === void 0 || onLoad(responseData, rest);
226
- return _context.abrupt("return", responseData);
227
- case 27:
228
- _context.prev = 27;
229
- _context.t1 = _context["catch"](5);
230
- if (!(onRequestError === undefined)) {
231
- _context.next = 31;
232
- break;
233
- }
234
- throw new Error(_context.t1);
235
- case 31:
236
- if (tableDataList === undefined) setTableDataList([]);
237
- onRequestError(_context.t1);
238
- case 33:
239
- _context.prev = 33;
240
- requestFinally();
241
- return _context.finish(33);
242
- case 36:
243
- return _context.abrupt("return", []);
244
- case 37:
245
- case "end":
246
- return _context.stop();
247
- }
248
- }, _callee, null, [[5, 27, 33, 36]]);
249
- }));
250
- return function fetchList(_x) {
251
- return _ref3.apply(this, arguments);
252
- };
253
- }();
121
+ const fetchList = async (isPolling, signal) => {
122
+ // 需要手动触发的首次请求
123
+ if (manualRequestRef.current) {
124
+ manualRequestRef.current = false;
125
+ return;
126
+ }
127
+ if (!isPolling) {
128
+ setTableLoading(true);
129
+ } else {
130
+ setPollingLoading(true);
131
+ }
132
+ const {
133
+ pageSize,
134
+ current
135
+ } = pageInfo || {};
136
+ try {
137
+ const pageParams = options?.pageInfo !== false ? {
138
+ current,
139
+ pageSize
140
+ } : undefined;
141
+ const {
142
+ data = [],
143
+ success,
144
+ total = 0,
145
+ ...rest
146
+ } = (await getData?.(pageParams)) || {};
147
+ // 如果被取消了,直接返回
148
+ if (signal?.aborted) {
149
+ return [];
150
+ }
151
+ // 如果失败了,直接返回,不走剩下的逻辑了
152
+ if (success === false) return [];
153
+ const responseData = postDataPipeline(data, [options.postData].filter(item => item));
154
+ // 设置表格数据
155
+ if (signal?.aborted) {
156
+ return [];
157
+ }
158
+ setDataAndLoading(responseData, total);
159
+ onLoad?.(responseData, rest);
160
+ return responseData;
161
+ } catch (e) {
162
+ // 如果被取消了,直接返回
163
+ if (signal?.aborted) {
164
+ return [];
165
+ }
166
+ // 如果没有传递这个方法的话,需要把错误抛出去,以免吞掉错误
167
+ if (onRequestError === undefined) throw new Error(e);
168
+ if (tableDataList === undefined) setTableDataList([]);
169
+ onRequestError(e);
170
+ } finally {
171
+ if (!signal?.aborted) {
172
+ requestFinally();
173
+ }
174
+ }
175
+ return [];
176
+ };
254
177
 
255
178
  /**
256
179
  * 该函数用于进行数据请求,可以用于轮询或单次请求。
@@ -258,118 +181,96 @@ var useFetchData = function useFetchData(getData, defaultData, options) {
258
181
  * 若需要轮询,则在一定时间后再次调用该函数,最小时间为 200ms,避免一直处于 loading 状态。
259
182
  * 如果请求被取消,则返回空。
260
183
  */
261
- var fetchListDebounce = useDebounceFn( /*#__PURE__*/function () {
262
- var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(isPolling) {
263
- var abort, msg, needPolling;
264
- return _regeneratorRuntime().wrap(function _callee2$(_context2) {
265
- while (1) switch (_context2.prev = _context2.next) {
266
- case 0:
267
- if (pollingSetTimeRef.current) {
268
- clearTimeout(pollingSetTimeRef.current);
269
- }
270
- if (getData) {
271
- _context2.next = 3;
272
- break;
273
- }
274
- return _context2.abrupt("return");
275
- case 3:
276
- abort = new AbortController();
277
- abortRef.current = abort;
278
- _context2.prev = 5;
279
- _context2.next = 8;
280
- return Promise.race([fetchList(isPolling), new Promise(function (_, reject) {
281
- var _abortRef$current, _abortRef$current$add;
282
- (_abortRef$current = abortRef.current) === null || _abortRef$current === void 0 || (_abortRef$current = _abortRef$current.signal) === null || _abortRef$current === void 0 || (_abortRef$current$add = _abortRef$current.addEventListener) === null || _abortRef$current$add === void 0 || _abortRef$current$add.call(_abortRef$current, 'abort', function () {
283
- reject('aborted');
284
- // 结束请求,并且清空loading控制
285
- fetchListDebounce.cancel();
286
- requestFinally();
287
- });
288
- })]);
289
- case 8:
290
- msg = _context2.sent;
291
- if (!abort.signal.aborted) {
292
- _context2.next = 11;
293
- break;
294
- }
295
- return _context2.abrupt("return");
296
- case 11:
297
- // 放到请求前面会导致数据是上一次的
298
- needPolling = runFunction(polling, msg);
299
- /*
300
- * 这段代码是用于控制轮询的。其中,needPolling 参数表明当前是否需要进行轮询,umountRef 是一个 ref,用来记录组件是否被卸载。
301
- * 如果需要轮询并且组件没有被卸载,就会调用 setTimeout,等待一定的时间,然后再次调用 fetchListDebounce 函数,并传入需要轮询的时间参数。
302
- * 其中 Math.max(needPolling, 2000) 用于确定最小的轮询时间为 2000ms,避免频繁请求导致一直处于 loading 状态。
303
- */
304
- if (needPolling && !umountRef.current) {
305
- pollingSetTimeRef.current = setTimeout(function () {
306
- fetchListDebounce.run(needPolling);
307
- // 这里判断最小要2000ms,不然一直loading
308
- }, Math.max(needPolling, 2000));
309
- }
310
- return _context2.abrupt("return", msg);
311
- case 16:
312
- _context2.prev = 16;
313
- _context2.t0 = _context2["catch"](5);
314
- if (!(_context2.t0 === 'aborted')) {
315
- _context2.next = 20;
316
- break;
317
- }
318
- return _context2.abrupt("return");
319
- case 20:
320
- throw _context2.t0;
321
- case 21:
322
- case "end":
323
- return _context2.stop();
324
- }
325
- }, _callee2, null, [[5, 16]]);
326
- }));
327
- return function (_x2) {
328
- return _ref6.apply(this, arguments);
329
- };
330
- }(), debounceTime || 30);
184
+ const fetchListDebounce = useDebounceFn(async isPolling => {
185
+ if (pollingSetTimeRef.current) {
186
+ clearTimeout(pollingSetTimeRef.current);
187
+ }
188
+ if (!getData) {
189
+ return;
190
+ }
191
+ const abort = new AbortController();
192
+ abortRef.current = abort;
193
+ try {
194
+ /**
195
+ * 这段代码使用了 Promise.race,同时发起了两个异步请求。
196
+ * fetchList 函数发起一个数据请求,而第二个 Promise 是等待通过 AbortSignal 取得一个信号。
197
+ * 如果第二个 Promise 得到了一个 AbortSignal 的信号,就会触发 reject,Promise.race 的结果也会结束。
198
+ * 这样,就达到了取消请求的目的。如果 fetchList 函数先返回了结果,那么该结果就是 Promise.race 的结果,
199
+ * 此时第二个 Promise 就会被取消。
200
+ */
201
+ const msg = await Promise.race([fetchList(isPolling, abort.signal), new Promise((_, reject) => {
202
+ abortRef.current?.signal?.addEventListener?.('abort', () => {
203
+ reject('aborted');
204
+ // 结束请求,并且清空loading控制
205
+ fetchListDebounce.cancel();
206
+ requestFinally();
207
+ });
208
+ })]);
209
+ if (abort.signal.aborted) return;
210
+ // 放到请求前面会导致数据是上一次的
211
+ const needPolling = runFunction(polling, msg);
212
+
213
+ /*
214
+ * 这段代码是用于控制轮询的。其中,needPolling 参数表明当前是否需要进行轮询,umountRef 是一个 ref,用来记录组件是否被卸载。
215
+ * 如果需要轮询并且组件没有被卸载,就会调用 setTimeout,等待一定的时间,然后再次调用 fetchListDebounce 函数,并传入需要轮询的时间参数。
216
+ * 其中 Math.max(needPolling, 2000) 用于确定最小的轮询时间为 2000ms,避免频繁请求导致一直处于 loading 状态。
217
+ */
218
+ if (needPolling && !umountRef.current) {
219
+ pollingSetTimeRef.current = setTimeout(() => {
220
+ fetchListDebounce.run(needPolling);
221
+ // 这里判断最小要2000ms,不然一直loading
222
+ }, Math.max(needPolling, 2000));
223
+ }
224
+ return msg;
225
+ } catch (error) {
226
+ if (error === 'aborted') {
227
+ return [];
228
+ }
229
+ throw error;
230
+ }
231
+ }, debounceTime || 30);
331
232
 
332
233
  /**
333
234
  * 取消请求
334
235
  */
335
- var abortFetch = function abortFetch() {
336
- var _abortRef$current2;
337
- (_abortRef$current2 = abortRef.current) === null || _abortRef$current2 === void 0 || _abortRef$current2.abort();
236
+ const abortFetch = () => {
237
+ abortRef.current?.abort();
338
238
  fetchListDebounce.cancel();
339
239
  requestFinally();
340
240
  };
341
241
 
342
242
  // 如果轮询结束了,直接销毁定时器
343
- useEffect(function () {
243
+ useEffect(() => {
344
244
  if (!polling) {
345
245
  clearTimeout(pollingSetTimeRef.current);
346
246
  }
347
247
  if (!prePolling && polling) {
348
248
  fetchListDebounce.run(true);
349
249
  }
350
- return function () {
250
+ return () => {
351
251
  clearTimeout(pollingSetTimeRef.current);
352
252
  };
353
253
  // eslint-disable-next-line react-hooks/exhaustive-deps
354
254
  }, [polling]);
355
- useEffect(function () {
255
+ useEffect(() => {
356
256
  umountRef.current = false;
357
- return function () {
257
+ return () => {
358
258
  umountRef.current = true;
359
259
  };
360
260
  }, []);
361
261
 
362
262
  /** PageIndex 改变的时候自动刷新 */
363
- useEffect(function () {
364
- var _ref7 = pageInfo || {},
365
- current = _ref7.current,
366
- pageSize = _ref7.pageSize;
263
+ useEffect(() => {
264
+ const {
265
+ current,
266
+ pageSize
267
+ } = pageInfo || {};
367
268
  // 如果上次的页码为空或者两次页码等于是没必要查询的
368
269
  // 如果 pageSize 发生变化是需要查询的,所以又加了 prePageSize
369
270
  if ((!prePage || prePage === current) && (!prePageSize || prePageSize === pageSize)) {
370
271
  return;
371
272
  }
372
- if (options.pageInfo && tableDataList && (tableDataList === null || tableDataList === void 0 ? void 0 : tableDataList.length) > pageSize || 0) {
273
+ if (options.pageInfo && tableDataList && tableDataList?.length > pageSize || 0) {
373
274
  return;
374
275
  }
375
276
 
@@ -383,24 +284,24 @@ var useFetchData = function useFetchData(getData, defaultData, options) {
383
284
  fetchListDebounce.run(false);
384
285
  }
385
286
  // eslint-disable-next-line react-hooks/exhaustive-deps
386
- }, [pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.current]);
287
+ }, [pageInfo?.current]);
387
288
 
388
289
  // pageSize 修改后返回第一页
389
- useEffect(function () {
290
+ useEffect(() => {
390
291
  if (!prePageSize) {
391
292
  return;
392
293
  }
393
294
  abortFetch();
394
295
  fetchListDebounce.run(false);
395
296
  // eslint-disable-next-line react-hooks/exhaustive-deps
396
- }, [pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.pageSize]);
297
+ }, [pageInfo?.pageSize]);
397
298
 
398
299
  /**
399
300
  * 检查是否有正在进行的请求需要被中止。如果是,则使用 abortRef 中的方法来中止请求。
400
301
  * 接下来,使用名为 fetchListDebounce 的防抖函数并传入 false 参数。这个函数可以防止请求过于频繁地发出,通过延迟执行传递给它的函数来实现。
401
302
  * 最后,检查是否有正在进行的请求,如果有,则中止它。
402
303
  */
403
- useDeepCompareEffect(function () {
304
+ useDeepCompareEffect(() => {
404
305
  abortFetch();
405
306
  fetchListDebounce.run(false);
406
307
  if (!manual) {
@@ -408,10 +309,10 @@ var useFetchData = function useFetchData(getData, defaultData, options) {
408
309
  // 用于跟踪当前的请求是否是手动发起的。
409
310
  manualRequestRef.current = false;
410
311
  }
411
- return function () {
312
+ return () => {
412
313
  abortFetch();
413
314
  };
414
- }, [].concat(_toConsumableArray(effects), [manual]));
315
+ }, [...effects, manual]);
415
316
  return {
416
317
  /**
417
318
  * 表格的数据列表。
@@ -428,40 +329,24 @@ var useFetchData = function useFetchData(getData, defaultData, options) {
428
329
  * 表示表格是否正在加载数据的标志。
429
330
  * @type {boolean}
430
331
  */
431
- loading: _typeof(options === null || options === void 0 ? void 0 : options.loading) === 'object' ? _objectSpread(_objectSpread({}, options === null || options === void 0 ? void 0 : options.loading), {}, {
332
+ loading: typeof options?.loading === 'object' ? {
333
+ ...options?.loading,
432
334
  spinning: tableLoading
433
- }) : tableLoading,
335
+ } : tableLoading,
434
336
  /**
435
337
  * 重新加载表格数据的函数。
436
338
  * @type {function}
437
339
  * @async
438
340
  * @returns {Promise<boolean>} - 数据重新加载完成后解决为 true 的 Promise。
439
341
  */
440
- reload: function () {
441
- var _reload = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
442
- var result;
443
- return _regeneratorRuntime().wrap(function _callee3$(_context3) {
444
- while (1) switch (_context3.prev = _context3.next) {
445
- case 0:
446
- abortFetch();
447
- // 对于手动 reload,我们需要强制执行请求,即使在 manualRequest 模式下
448
- manualRequestRef.current = false;
449
- _context3.next = 4;
450
- return fetchListDebounce.run(false);
451
- case 4:
452
- result = _context3.sent;
453
- return _context3.abrupt("return", result);
454
- case 6:
455
- case "end":
456
- return _context3.stop();
457
- }
458
- }, _callee3);
459
- }));
460
- function reload() {
461
- return _reload.apply(this, arguments);
462
- }
463
- return reload;
464
- }(),
342
+ reload: async () => {
343
+ abortFetch();
344
+ // 对于手动 reload,我们需要强制执行请求,即使在 manualRequest 模式下
345
+ manualRequestRef.current = false;
346
+ const result = await fetchListDebounce.run(false);
347
+ // 如果之前是手动模式,不要重置为 true,因为用户已经手动触发了请求
348
+ return result;
349
+ },
465
350
  /**
466
351
  * 当前的分页信息。
467
352
  * @type {Object}
@@ -469,43 +354,33 @@ var useFetchData = function useFetchData(getData, defaultData, options) {
469
354
  * @prop {number} total - 总数据数量。
470
355
  * @prop {number} pageSize - 每页数据数量。
471
356
  */
472
- pageInfo: pageInfo,
357
+ pageInfo,
473
358
  /**
474
359
  * 表示表格是否正在进行轮询请求的标志。
475
360
  * @type {boolean}
476
361
  */
477
- pollingLoading: pollingLoading,
362
+ pollingLoading,
478
363
  /**
479
364
  * 重置分页信息为其初始值的函数。
480
365
  * @type {function}
481
366
  * @async
482
367
  * @returns {Promise<void>} - 重置完成后解决的 Promise。
483
368
  */
484
- reset: function () {
485
- var _reset = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
486
- var _ref8, optionPageInfo, _ref9, _ref9$defaultCurrent, defaultCurrent, _ref9$defaultPageSize, defaultPageSize, initialPageInfo;
487
- return _regeneratorRuntime().wrap(function _callee4$(_context4) {
488
- while (1) switch (_context4.prev = _context4.next) {
489
- case 0:
490
- _ref8 = options || {}, optionPageInfo = _ref8.pageInfo;
491
- _ref9 = optionPageInfo || {}, _ref9$defaultCurrent = _ref9.defaultCurrent, defaultCurrent = _ref9$defaultCurrent === void 0 ? 1 : _ref9$defaultCurrent, _ref9$defaultPageSize = _ref9.defaultPageSize, defaultPageSize = _ref9$defaultPageSize === void 0 ? 20 : _ref9$defaultPageSize;
492
- initialPageInfo = {
493
- current: defaultCurrent,
494
- total: 0,
495
- pageSize: defaultPageSize
496
- };
497
- _setPageInfo(initialPageInfo);
498
- case 4:
499
- case "end":
500
- return _context4.stop();
501
- }
502
- }, _callee4);
503
- }));
504
- function reset() {
505
- return _reset.apply(this, arguments);
506
- }
507
- return reset;
508
- }(),
369
+ reset: async () => {
370
+ const {
371
+ pageInfo: optionPageInfo
372
+ } = options || {};
373
+ const {
374
+ defaultCurrent = 1,
375
+ defaultPageSize = 20
376
+ } = optionPageInfo || {};
377
+ const initialPageInfo = {
378
+ current: defaultCurrent,
379
+ total: 0,
380
+ pageSize: defaultPageSize
381
+ };
382
+ setPageInfo(initialPageInfo);
383
+ },
509
384
  /**
510
385
  * 更新分页信息的函数。
511
386
  * @type {function}
@@ -516,23 +391,9 @@ var useFetchData = function useFetchData(getData, defaultData, options) {
516
391
  * @prop {number} [pageSize] - 新的每页数据数量。
517
392
  * @returns {Promise<void>} - 更新完成后解决的 Promise。
518
393
  */
519
- setPageInfo: function () {
520
- var _setPageInfo2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(info) {
521
- return _regeneratorRuntime().wrap(function _callee5$(_context5) {
522
- while (1) switch (_context5.prev = _context5.next) {
523
- case 0:
524
- _setPageInfo(_objectSpread(_objectSpread({}, pageInfo), info));
525
- case 1:
526
- case "end":
527
- return _context5.stop();
528
- }
529
- }, _callee5);
530
- }));
531
- function setPageInfo(_x3) {
532
- return _setPageInfo2.apply(this, arguments);
533
- }
534
- return setPageInfo;
535
- }()
394
+ setPageInfo: async info => {
395
+ setPageInfo(info);
396
+ }
536
397
  };
537
398
  };
538
399
  export default useFetchData;