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