@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,21 +1,14 @@
1
1
  "use strict";
2
2
 
3
- var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
4
3
  var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
5
4
  Object.defineProperty(exports, "__esModule", {
6
5
  value: true
7
6
  });
8
7
  exports.ProLayout = void 0;
9
- var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
10
- var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
11
- var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
12
- var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
13
- var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
14
- var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
15
8
  var _util = require("@rc-component/util");
16
9
  var _routeUtils = require("@umijs/route-utils");
17
10
  var _antd = require("antd");
18
- var _classnames = _interopRequireDefault(require("classnames"));
11
+ var _clsx = require("clsx");
19
12
  var _react = _interopRequireWildcard(require("react"));
20
13
  var _swr = _interopRequireWildcard(require("swr"));
21
14
  var _provider = require("../provider");
@@ -36,86 +29,84 @@ var _useCurrentMenuLayoutProps = require("./utils/useCurrentMenuLayoutProps");
36
29
  var _utils2 = require("./utils/utils");
37
30
  var _WrapContent = require("./WrapContent");
38
31
  var _jsxRuntime = require("react/jsx-runtime");
39
- var _excluded = ["id", "defaultMessage"],
40
- _excluded2 = ["fixSiderbar", "navTheme", "layout"];
41
- var layoutIndex = 0;
42
- var headerRender = function headerRender(props, matchMenuKeys) {
43
- var _props$stylish;
32
+ let layoutIndex = 0;
33
+ const headerRender = (props, matchMenuKeys) => {
44
34
  if (props.headerRender === false || props.pure) {
45
35
  return null;
46
36
  }
47
- return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Header.DefaultHeader, (0, _objectSpread2.default)((0, _objectSpread2.default)({
48
- matchMenuKeys: matchMenuKeys
49
- }, props), {}, {
50
- stylish: (_props$stylish = props.stylish) === null || _props$stylish === void 0 ? void 0 : _props$stylish.header
51
- }));
37
+ return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Header.DefaultHeader, {
38
+ matchMenuKeys: matchMenuKeys,
39
+ ...props,
40
+ stylish: props.stylish?.header
41
+ });
52
42
  };
53
- var footerRender = function footerRender(props) {
43
+ const footerRender = props => {
54
44
  if (props.footerRender === false || props.pure) {
55
45
  return null;
56
46
  }
57
47
  if (props.footerRender) {
58
- return props.footerRender((0, _objectSpread2.default)({}, props), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Footer.DefaultFooter, {}));
48
+ return props.footerRender({
49
+ ...props
50
+ }, /*#__PURE__*/(0, _jsxRuntime.jsx)(_Footer.DefaultFooter, {}));
59
51
  }
60
52
  return null;
61
53
  };
62
- var renderSiderMenu = function renderSiderMenu(props, matchMenuKeys) {
63
- var _props$stylish3;
64
- var layout = props.layout,
65
- isMobile = props.isMobile,
66
- selectedKeys = props.selectedKeys,
67
- openKeys = props.openKeys,
68
- splitMenus = props.splitMenus,
69
- suppressSiderWhenMenuEmpty = props.suppressSiderWhenMenuEmpty,
70
- menuRender = props.menuRender;
54
+ const renderSiderMenu = (props, matchMenuKeys) => {
55
+ const {
56
+ layout,
57
+ isMobile,
58
+ selectedKeys,
59
+ openKeys,
60
+ splitMenus,
61
+ suppressSiderWhenMenuEmpty,
62
+ menuRender
63
+ } = props;
71
64
  if (props.menuRender === false || props.pure) {
72
65
  return null;
73
66
  }
74
- var menuData = props.menuData;
67
+ let {
68
+ menuData
69
+ } = props;
75
70
 
76
71
  /** 如果是分割菜单模式,需要专门实现一下 */
77
72
  if (splitMenus && (openKeys !== false || layout === 'mix') && !isMobile) {
78
- var _ref = selectedKeys || matchMenuKeys,
79
- _ref2 = (0, _slicedToArray2.default)(_ref, 1),
80
- key = _ref2[0];
73
+ const [key] = selectedKeys || matchMenuKeys;
81
74
  if (key) {
82
- var _props$menuData;
83
- menuData = ((_props$menuData = props.menuData) === null || _props$menuData === void 0 || (_props$menuData = _props$menuData.find(function (item) {
84
- return item.key === key;
85
- })) === null || _props$menuData === void 0 ? void 0 : _props$menuData.children) || [];
75
+ menuData = props.menuData?.find(item => item.key === key)?.children || [];
86
76
  } else {
87
77
  menuData = [];
88
78
  }
89
79
  }
90
80
  // 这里走了可以少一次循环
91
- var clearMenuData = (0, _utils2.clearMenuItem)(menuData || []);
92
- if (clearMenuData && (clearMenuData === null || clearMenuData === void 0 ? void 0 : clearMenuData.length) < 1 && (splitMenus || suppressSiderWhenMenuEmpty)) {
81
+ const clearMenuData = (0, _utils2.clearMenuItem)(menuData || []);
82
+ if (clearMenuData && clearMenuData?.length < 1 && (splitMenus || suppressSiderWhenMenuEmpty)) {
93
83
  return null;
94
84
  }
95
85
  if (layout === 'top' && !isMobile) {
96
- var _props$stylish2;
97
- return /*#__PURE__*/(0, _jsxRuntime.jsx)(_SiderMenu.SiderMenu, (0, _objectSpread2.default)((0, _objectSpread2.default)({
98
- matchMenuKeys: matchMenuKeys
99
- }, props), {}, {
86
+ return /*#__PURE__*/(0, _jsxRuntime.jsx)(_SiderMenu.SiderMenu, {
87
+ matchMenuKeys: matchMenuKeys,
88
+ ...props,
100
89
  hide: true,
101
- stylish: (_props$stylish2 = props.stylish) === null || _props$stylish2 === void 0 ? void 0 : _props$stylish2.sider
102
- }));
90
+ stylish: props.stylish?.sider
91
+ });
103
92
  }
104
- var defaultDom = /*#__PURE__*/(0, _jsxRuntime.jsx)(_SiderMenu.SiderMenu, (0, _objectSpread2.default)((0, _objectSpread2.default)({
105
- matchMenuKeys: matchMenuKeys
106
- }, props), {}, {
93
+ const defaultDom = /*#__PURE__*/(0, _jsxRuntime.jsx)(_SiderMenu.SiderMenu, {
94
+ matchMenuKeys: matchMenuKeys,
95
+ ...props,
107
96
  // 这里走了可以少一次循环
108
97
  menuData: clearMenuData,
109
- stylish: (_props$stylish3 = props.stylish) === null || _props$stylish3 === void 0 ? void 0 : _props$stylish3.sider
110
- }));
98
+ stylish: props.stylish?.sider
99
+ });
111
100
  if (menuRender) {
112
101
  return menuRender(props, defaultDom);
113
102
  }
114
103
  return defaultDom;
115
104
  };
116
- var defaultPageTitleRender = function defaultPageTitleRender(pageProps, props) {
117
- var pageTitleRender = props.pageTitleRender;
118
- var pageTitleInfo = (0, _getPageTitle.getPageTitleInfo)(pageProps);
105
+ const defaultPageTitleRender = (pageProps, props) => {
106
+ const {
107
+ pageTitleRender
108
+ } = props;
109
+ const pageTitleInfo = (0, _getPageTitle.getPageTitleInfo)(pageProps);
119
110
  if (pageTitleRender === false) {
120
111
  return {
121
112
  title: props.title || '',
@@ -124,11 +115,12 @@ var defaultPageTitleRender = function defaultPageTitleRender(pageProps, props) {
124
115
  };
125
116
  }
126
117
  if (pageTitleRender) {
127
- var title = pageTitleRender(pageProps, pageTitleInfo.title, pageTitleInfo);
118
+ const title = pageTitleRender(pageProps, pageTitleInfo.title, pageTitleInfo);
128
119
  if (typeof title === 'string') {
129
- return (0, _getPageTitle.getPageTitleInfo)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, pageTitleInfo), {}, {
130
- title: title
131
- }));
120
+ return (0, _getPageTitle.getPageTitleInfo)({
121
+ ...pageTitleInfo,
122
+ title
123
+ });
132
124
  }
133
125
  (0, _util.warning)(typeof title === 'string', 'pro-layout: renderPageTitle return value should be a string');
134
126
  // 当 pageTitleRender 返回非字符串值时,返回默认的 pageTitleInfo
@@ -137,7 +129,7 @@ var defaultPageTitleRender = function defaultPageTitleRender(pageProps, props) {
137
129
  }
138
130
  return pageTitleInfo;
139
131
  };
140
- var getPaddingInlineStart = function getPaddingInlineStart(hasLeftPadding, collapsed, siderWidth) {
132
+ const getPaddingInlineStart = (hasLeftPadding, collapsed, siderWidth) => {
141
133
  if (hasLeftPadding) {
142
134
  return collapsed ? 64 : siderWidth;
143
135
  }
@@ -149,237 +141,232 @@ var getPaddingInlineStart = function getPaddingInlineStart(hasLeftPadding, colla
149
141
  *
150
142
  * @param props
151
143
  */
152
- var BaseProLayout = function BaseProLayout(props) {
153
- var _props$prefixCls, _location$pathname, _token$layout, _token$layout2, _token$layout3, _token$layout4, _token$layout5, _token$layout6, _token$layout7, _token$layout8, _token$layout9, _token$layout10, _token$layout11, _token$layout12;
154
- var _ref3 = props || {},
155
- children = _ref3.children,
156
- propsOnCollapse = _ref3.onCollapse,
157
- _ref3$location = _ref3.location,
158
- location = _ref3$location === void 0 ? {
144
+ const BaseProLayout = props => {
145
+ const {
146
+ children,
147
+ onCollapse: propsOnCollapse,
148
+ location = {
159
149
  pathname: '/'
160
- } : _ref3$location,
161
- contentStyle = _ref3.contentStyle,
162
- route = _ref3.route,
163
- defaultCollapsed = _ref3.defaultCollapsed,
164
- style = _ref3.style,
165
- propsSiderWidth = _ref3.siderWidth,
166
- menu = _ref3.menu,
167
- siderMenuType = _ref3.siderMenuType,
168
- propsIsChildrenLayout = _ref3.isChildrenLayout,
169
- menuDataRender = _ref3.menuDataRender,
170
- actionRef = _ref3.actionRef,
171
- bgLayoutImgList = _ref3.bgLayoutImgList,
172
- propsFormatMessage = _ref3.formatMessage,
173
- loading = _ref3.loading;
174
- var siderWidth = (0, _react.useMemo)(function () {
150
+ },
151
+ contentStyle,
152
+ route,
153
+ defaultCollapsed,
154
+ style,
155
+ siderWidth: propsSiderWidth,
156
+ menu,
157
+ siderMenuType,
158
+ isChildrenLayout: propsIsChildrenLayout,
159
+ menuDataRender,
160
+ actionRef,
161
+ bgLayoutImgList,
162
+ formatMessage: propsFormatMessage,
163
+ loading
164
+ } = props || {};
165
+ const siderWidth = (0, _react.useMemo)(() => {
175
166
  if (propsSiderWidth) return propsSiderWidth;
176
167
  if (props.layout === 'mix') return 215;
177
168
  return 256;
178
169
  }, [props.layout, propsSiderWidth]);
179
- var context = (0, _react.useContext)(_antd.ConfigProvider.ConfigContext);
180
- var prefixCls = (_props$prefixCls = props.prefixCls) !== null && _props$prefixCls !== void 0 ? _props$prefixCls : context.getPrefixCls('pro');
181
- var _useMountMergeState = (0, _utils.useMountMergeState)(false, {
182
- value: menu === null || menu === void 0 ? void 0 : menu.loading,
183
- onChange: menu === null || menu === void 0 ? void 0 : menu.onLoadingChange
184
- }),
185
- _useMountMergeState2 = (0, _slicedToArray2.default)(_useMountMergeState, 2),
186
- menuLoading = _useMountMergeState2[0],
187
- setMenuLoading = _useMountMergeState2[1];
170
+ const context = (0, _react.useContext)(_antd.ConfigProvider.ConfigContext);
171
+ const prefixCls = props.prefixCls ?? context.getPrefixCls('pro');
172
+ const [menuLoading, setMenuLoadingInner] = (0, _util.useControlledState)(false, menu?.loading);
173
+ const setMenuLoading = (0, _react.useCallback)(updater => {
174
+ setMenuLoadingInner(prev => {
175
+ const next = typeof updater === 'function' ? updater(prev) : updater;
176
+ menu?.onLoadingChange?.(next);
177
+ return next;
178
+ });
179
+ }, [menu?.onLoadingChange]);
188
180
 
189
181
  // give a default key for swr
190
- var _useState = (0, _react.useState)(function () {
191
- layoutIndex += 1;
192
- return "pro-layout-".concat(layoutIndex);
193
- }),
194
- _useState2 = (0, _slicedToArray2.default)(_useState, 1),
195
- defaultId = _useState2[0];
182
+ const [defaultId] = (0, _react.useState)(() => {
183
+ layoutIndex += 1;
184
+ return `pro-layout-${layoutIndex}`;
185
+ });
196
186
 
197
187
  /**
198
188
  * 处理国际化相关 formatMessage
199
189
  * 如果有用户配置的以用户为主
200
190
  * 如果没有用自己实现的
201
191
  */
202
- var formatMessage = (0, _react.useCallback)(function (_ref4) {
203
- var id = _ref4.id,
204
- defaultMessage = _ref4.defaultMessage,
205
- restParams = (0, _objectWithoutProperties2.default)(_ref4, _excluded);
192
+ const formatMessage = (0, _react.useCallback)(({
193
+ id,
194
+ defaultMessage,
195
+ ...restParams
196
+ }) => {
206
197
  if (propsFormatMessage) {
207
- return propsFormatMessage((0, _objectSpread2.default)({
208
- id: id,
209
- defaultMessage: defaultMessage
210
- }, restParams));
198
+ return propsFormatMessage({
199
+ id,
200
+ defaultMessage,
201
+ ...restParams
202
+ });
211
203
  }
212
- var locales = (0, _locales.gLocaleObject)();
204
+ const locales = (0, _locales.gLocaleObject)();
213
205
  return locales[id] ? locales[id] : defaultMessage;
214
206
  }, [propsFormatMessage]);
215
- var _useSWR = (0, _swr.default)([defaultId, menu === null || menu === void 0 ? void 0 : menu.params], /*#__PURE__*/function () {
216
- var _ref6 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(_ref5) {
217
- var _menu$request;
218
- var _ref7, params, menuDataItems;
219
- return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
220
- while (1) switch (_context.prev = _context.next) {
221
- case 0:
222
- _ref7 = (0, _slicedToArray2.default)(_ref5, 2), params = _ref7[1];
223
- setMenuLoading(true);
224
- _context.next = 4;
225
- return menu === null || menu === void 0 || (_menu$request = menu.request) === null || _menu$request === void 0 ? void 0 : _menu$request.call(menu, params || {}, (route === null || route === void 0 ? void 0 : route.children) || (route === null || route === void 0 ? void 0 : route.routes) || []);
226
- case 4:
227
- menuDataItems = _context.sent;
228
- setMenuLoading(false);
229
- return _context.abrupt("return", menuDataItems);
230
- case 7:
231
- case "end":
232
- return _context.stop();
233
- }
234
- }, _callee);
235
- }));
236
- return function (_x) {
237
- return _ref6.apply(this, arguments);
238
- };
239
- }(), {
240
- revalidateOnFocus: false,
241
- shouldRetryOnError: false,
242
- revalidateOnReconnect: false
243
- }),
244
- data = _useSWR.data,
245
- mutate = _useSWR.mutate,
246
- isLoading = _useSWR.isLoading;
247
- (0, _react.useEffect)(function () {
207
+ const {
208
+ data,
209
+ mutate,
210
+ isLoading
211
+ } = (0, _swr.default)([defaultId, menu?.params], async ([, params]) => {
212
+ setMenuLoading(true);
213
+ const menuDataItems = await menu?.request?.(params || {}, route?.children || route?.routes || []);
214
+ setMenuLoading(false);
215
+ return menuDataItems;
216
+ }, {
217
+ revalidateOnFocus: false,
218
+ shouldRetryOnError: false,
219
+ revalidateOnReconnect: false
220
+ });
221
+ (0, _react.useEffect)(() => {
248
222
  setMenuLoading(isLoading);
249
223
  // eslint-disable-next-line react-hooks/exhaustive-deps
250
224
  }, [isLoading]);
251
- var _useSWRConfig = (0, _swr.useSWRConfig)(),
252
- cache = _useSWRConfig.cache;
253
- (0, _react.useEffect)(function () {
254
- return function () {
225
+ const {
226
+ cache
227
+ } = (0, _swr.useSWRConfig)();
228
+ (0, _react.useEffect)(() => {
229
+ return () => {
255
230
  if (cache instanceof Map) cache.delete(defaultId);
256
231
  };
257
232
  // eslint-disable-next-line react-hooks/exhaustive-deps
258
233
  }, []);
259
- var menuInfoData = (0, _react.useMemo)(function () {
260
- return (0, _getMenuData.getMenuData)(data || (route === null || route === void 0 ? void 0 : route.children) || (route === null || route === void 0 ? void 0 : route.routes) || [], menu, formatMessage, menuDataRender);
261
- }, [formatMessage, menu, menuDataRender, data, route === null || route === void 0 ? void 0 : route.children]);
262
- var _ref8 = menuInfoData || {},
263
- breadcrumb = _ref8.breadcrumb,
264
- breadcrumbMap = _ref8.breadcrumbMap,
265
- _ref8$menuData = _ref8.menuData,
266
- menuData = _ref8$menuData === void 0 ? [] : _ref8$menuData;
267
- if (actionRef && menu !== null && menu !== void 0 && menu.request) {
234
+ const menuInfoData = (0, _react.useMemo)(() => (0, _getMenuData.getMenuData)(data || route?.children || route?.routes || [], menu, formatMessage, menuDataRender), [formatMessage, menu, menuDataRender, data, route?.children]);
235
+ const {
236
+ breadcrumb,
237
+ breadcrumbMap,
238
+ menuData = []
239
+ } = menuInfoData || {};
240
+ if (actionRef && menu?.request) {
268
241
  actionRef.current = {
269
- reload: function reload() {
242
+ reload: () => {
270
243
  mutate();
271
244
  }
272
245
  };
273
246
  }
274
- var matchMenus = (0, _react.useMemo)(function () {
247
+ const matchMenus = (0, _react.useMemo)(() => {
275
248
  return (0, _routeUtils.getMatchMenu)(location.pathname || '/', menuData || [], true);
276
249
  }, [location.pathname, menuData]);
277
- var matchMenuKeys = (0, _react.useMemo)(function () {
278
- return Array.from(new Set(matchMenus.map(function (item) {
279
- return item.key || item.path || '';
280
- })));
281
- }, [matchMenus]);
250
+ const matchMenuKeys = (0, _react.useMemo)(() => Array.from(new Set(matchMenus.map(item => item.key || item.path || ''))), [matchMenus]);
282
251
 
283
252
  // 当前选中的menu,一般不会为空
284
- var currentMenu = matchMenus[matchMenus.length - 1] || {};
285
- var currentMenuLayoutProps = (0, _useCurrentMenuLayoutProps.useCurrentMenuLayoutProps)(currentMenu);
286
- var _props$currentMenuLay = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, props), currentMenuLayoutProps),
287
- fixSiderbar = _props$currentMenuLay.fixSiderbar,
288
- navTheme = _props$currentMenuLay.navTheme,
289
- propsLayout = _props$currentMenuLay.layout,
290
- rest = (0, _objectWithoutProperties2.default)(_props$currentMenuLay, _excluded2);
291
- var colSize = (0, _utils.useBreakpoint)();
292
- var isMobile = (0, _react.useMemo)(function () {
253
+ const currentMenu = matchMenus[matchMenus.length - 1] || {};
254
+ const currentMenuLayoutProps = (0, _useCurrentMenuLayoutProps.useCurrentMenuLayoutProps)(currentMenu);
255
+ const {
256
+ fixSiderbar,
257
+ navTheme,
258
+ layout: propsLayout,
259
+ ...rest
260
+ } = {
261
+ ...props,
262
+ ...currentMenuLayoutProps
263
+ };
264
+ const colSize = (0, _utils.useBreakpoint)();
265
+ const isMobile = (0, _react.useMemo)(() => {
293
266
  return (colSize === 'sm' || colSize === 'xs') && !props.disableMobile;
294
267
  }, [colSize, props.disableMobile]);
295
268
 
296
269
  // If it is a fix menu, calculate padding
297
270
  // don't need padding in phone mode
298
271
  /* Checking if the menu is loading and if it is, it will return a skeleton loading screen. */
299
- var hasLeftPadding = propsLayout !== 'top' && !isMobile;
300
- var _useMergedState = (0, _util.useMergedState)(function () {
301
- if (defaultCollapsed !== undefined) return defaultCollapsed;
302
- if (process.env.NODE_ENV === 'TEST') return false;
303
- if (isMobile) return true;
304
- if (colSize === 'md') return true;
305
- return false;
306
- }, {
307
- value: props.collapsed,
308
- onChange: propsOnCollapse
309
- }),
310
- _useMergedState2 = (0, _slicedToArray2.default)(_useMergedState, 2),
311
- collapsed = _useMergedState2[0],
312
- onCollapse = _useMergedState2[1];
272
+ const hasLeftPadding = propsLayout !== 'top' && !isMobile;
273
+ const [collapsed, onCollapseInner] = (0, _util.useControlledState)(() => {
274
+ if (defaultCollapsed !== undefined) return defaultCollapsed;
275
+ if (process.env.NODE_ENV === 'TEST') return false;
276
+ if (isMobile) return true;
277
+ if (colSize === 'md') return true;
278
+ return false;
279
+ }, props.collapsed);
280
+ const onCollapse = (0, _react.useCallback)(updater => {
281
+ onCollapseInner(prev => {
282
+ const next = typeof updater === 'function' ? updater(prev) : updater;
283
+ propsOnCollapse?.(next);
284
+ return next;
285
+ });
286
+ }, [propsOnCollapse]);
313
287
 
314
288
  // Splicing parameters, adding menuData and formatMessage in props
315
- var defaultProps = (0, _util.omit)((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
316
- prefixCls: prefixCls
317
- }, props), {}, {
318
- siderWidth: siderWidth
319
- }, currentMenuLayoutProps), {}, {
320
- formatMessage: formatMessage,
321
- breadcrumb: breadcrumb,
322
- menu: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, menu), {}, {
323
- type: siderMenuType || (menu === null || menu === void 0 ? void 0 : menu.type),
289
+ const defaultProps = (0, _util.omit)({
290
+ prefixCls,
291
+ ...props,
292
+ siderWidth,
293
+ ...currentMenuLayoutProps,
294
+ formatMessage,
295
+ breadcrumb,
296
+ menu: {
297
+ ...menu,
298
+ type: siderMenuType || menu?.type,
324
299
  loading: menuLoading
325
- }),
300
+ },
326
301
  layout: propsLayout
327
- }), ['className', 'style', 'breadcrumbRender']);
302
+ }, ['className', 'style', 'breadcrumbRender']);
328
303
 
329
304
  // gen page title
330
- var pageTitleInfo = defaultPageTitleRender((0, _objectSpread2.default)((0, _objectSpread2.default)({
331
- pathname: location.pathname
332
- }, defaultProps), {}, {
333
- breadcrumbMap: breadcrumbMap
334
- }), props);
305
+ const pageTitleInfo = defaultPageTitleRender({
306
+ pathname: location.pathname,
307
+ ...defaultProps,
308
+ breadcrumbMap
309
+ }, props);
335
310
 
336
311
  // gen breadcrumbProps, parameter for pageHeader
337
- var breadcrumbProps = (0, _getBreadcrumbProps.getBreadcrumbProps)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, defaultProps), {}, {
312
+ const breadcrumbProps = (0, _getBreadcrumbProps.getBreadcrumbProps)({
313
+ ...defaultProps,
338
314
  breadcrumbRender: props.breadcrumbRender,
339
- breadcrumbMap: breadcrumbMap
340
- }), props);
315
+ breadcrumbMap
316
+ }, props);
341
317
 
342
318
  // render sider dom
343
- var siderMenuDom = renderSiderMenu((0, _objectSpread2.default)((0, _objectSpread2.default)({}, defaultProps), {}, {
344
- menuData: menuData,
345
- onCollapse: onCollapse,
346
- isMobile: isMobile,
347
- collapsed: collapsed
348
- }), matchMenuKeys);
319
+ const siderMenuDom = renderSiderMenu({
320
+ ...defaultProps,
321
+ menuData,
322
+ onCollapse,
323
+ isMobile,
324
+ collapsed
325
+ }, matchMenuKeys);
349
326
 
350
327
  // render header dom
351
- var headerDom = headerRender((0, _objectSpread2.default)((0, _objectSpread2.default)({}, defaultProps), {}, {
328
+ const headerDom = headerRender({
329
+ ...defaultProps,
352
330
  children: null,
353
331
  hasSiderMenu: !!siderMenuDom,
354
- menuData: menuData,
355
- isMobile: isMobile,
356
- collapsed: collapsed,
357
- onCollapse: onCollapse
358
- }), matchMenuKeys);
332
+ menuData,
333
+ isMobile,
334
+ collapsed,
335
+ onCollapse
336
+ }, matchMenuKeys);
359
337
 
360
338
  // render footer dom
361
- var footerDom = footerRender((0, _objectSpread2.default)({
362
- isMobile: isMobile,
363
- collapsed: collapsed
364
- }, defaultProps));
365
- var _useContext = (0, _react.useContext)(_RouteContext.RouteContext),
366
- contextIsChildrenLayout = _useContext.isChildrenLayout;
339
+ const footerDom = footerRender({
340
+ isMobile,
341
+ collapsed,
342
+ ...defaultProps
343
+ });
344
+ const {
345
+ isChildrenLayout: contextIsChildrenLayout
346
+ } = (0, _react.useContext)(_RouteContext.RouteContext);
367
347
 
368
348
  // 如果 props 中定义,以 props 为准
369
- var isChildrenLayout = propsIsChildrenLayout !== undefined ? propsIsChildrenLayout : contextIsChildrenLayout;
370
- var proLayoutClassName = "".concat(prefixCls, "-layout");
371
- var _useStyle = (0, _style.useStyle)(proLayoutClassName),
372
- wrapSSR = _useStyle.wrapSSR,
373
- hashId = _useStyle.hashId;
349
+ const isChildrenLayout = propsIsChildrenLayout !== undefined ? propsIsChildrenLayout : contextIsChildrenLayout;
350
+ const proLayoutClassName = `${prefixCls}-layout`;
351
+ const {
352
+ wrapSSR,
353
+ hashId
354
+ } = (0, _style.useStyle)(proLayoutClassName);
374
355
 
375
356
  // gen className
376
- var className = (0, _classnames.default)(props.className, hashId, 'ant-design-pro', proLayoutClassName, (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, "screen-".concat(colSize), colSize), "".concat(proLayoutClassName, "-top-menu"), propsLayout === 'top'), "".concat(proLayoutClassName, "-is-children"), isChildrenLayout), "".concat(proLayoutClassName, "-fix-siderbar"), fixSiderbar), "".concat(proLayoutClassName, "-").concat(propsLayout), propsLayout));
357
+ const className = (0, _clsx.clsx)(props.className, hashId, 'ant-design-pro', proLayoutClassName, {
358
+ [`screen-${colSize}`]: colSize,
359
+ [`${proLayoutClassName}-top-menu`]: propsLayout === 'top',
360
+ [`${proLayoutClassName}-is-children`]: isChildrenLayout,
361
+ [`${proLayoutClassName}-fix-siderbar`]: fixSiderbar,
362
+ [`${proLayoutClassName}-${propsLayout}`]: propsLayout
363
+ });
377
364
 
378
365
  /** 计算 slider 的宽度 */
379
- var leftSiderWidth = getPaddingInlineStart(!!hasLeftPadding, collapsed, siderWidth);
366
+ const leftSiderWidth = getPaddingInlineStart(!!hasLeftPadding, collapsed, siderWidth);
380
367
 
381
368
  // siderMenuDom 为空的时候,不需要 padding
382
- var genLayoutStyle = {
369
+ const genLayoutStyle = {
383
370
  position: 'relative'
384
371
  };
385
372
 
@@ -389,119 +376,116 @@ var BaseProLayout = function BaseProLayout(props) {
389
376
  }
390
377
 
391
378
  /** 页面切换的时候触发 */
392
- (0, _react.useEffect)(function () {
393
- var _props$onPageChange;
394
- (_props$onPageChange = props.onPageChange) === null || _props$onPageChange === void 0 || _props$onPageChange.call(props, props.location);
379
+ (0, _react.useEffect)(() => {
380
+ props.onPageChange?.(props.location);
395
381
  // eslint-disable-next-line react-hooks/exhaustive-deps
396
- }, [location.pathname, (_location$pathname = location.pathname) === null || _location$pathname === void 0 ? void 0 : _location$pathname.search]);
397
- var _useState3 = (0, _react.useState)(false),
398
- _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
399
- hasFooterToolbar = _useState4[0],
400
- setHasFooterToolbar = _useState4[1];
382
+ }, [location.pathname, location.pathname?.search]);
383
+ const [hasFooterToolbar, setHasFooterToolbar] = (0, _react.useState)(false);
401
384
  /**
402
385
  * 使用number是因为多标签页的时候有多个 PageContainer,只有有任意一个就应该展示这个className
403
386
  */
404
- var _useState5 = (0, _react.useState)(0),
405
- _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
406
- hasPageContainer = _useState6[0],
407
- setHasPageContainer = _useState6[1];
387
+ const [hasPageContainer, setHasPageContainer] = (0, _react.useState)(0);
408
388
  (0, _utils.useDocumentTitle)(pageTitleInfo, props.title || false);
409
- var _useContext2 = (0, _react.useContext)(_provider.ProProvider),
410
- token = _useContext2.token;
411
- var bgImgStyleList = (0, _react.useMemo)(function () {
389
+ const {
390
+ token
391
+ } = (0, _react.useContext)(_provider.ProProvider);
392
+ const bgImgStyleList = (0, _react.useMemo)(() => {
412
393
  if (bgLayoutImgList && bgLayoutImgList.length > 0) {
413
- return bgLayoutImgList === null || bgLayoutImgList === void 0 ? void 0 : bgLayoutImgList.map(function (item, index) {
394
+ return bgLayoutImgList?.map((item, index) => {
414
395
  return /*#__PURE__*/(0, _jsxRuntime.jsx)("img", {
415
396
  src: item.src,
416
- style: (0, _objectSpread2.default)({
417
- position: 'absolute'
418
- }, item)
397
+ style: {
398
+ position: 'absolute',
399
+ ...item
400
+ }
419
401
  }, index);
420
402
  });
421
403
  }
422
404
  return null;
423
405
  }, [bgLayoutImgList]);
424
406
  return wrapSSR( /*#__PURE__*/(0, _jsxRuntime.jsx)(_RouteContext.RouteContext.Provider, {
425
- value: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, defaultProps), {}, {
407
+ value: {
408
+ ...defaultProps,
426
409
  breadcrumb: breadcrumbProps,
427
- menuData: menuData,
428
- isMobile: isMobile,
429
- collapsed: collapsed,
430
- hasPageContainer: hasPageContainer,
431
- setHasPageContainer: setHasPageContainer,
410
+ menuData,
411
+ isMobile,
412
+ collapsed,
413
+ hasPageContainer,
414
+ setHasPageContainer,
432
415
  isChildrenLayout: true,
433
416
  title: pageTitleInfo.pageName,
434
417
  hasSiderMenu: !!siderMenuDom,
435
418
  hasHeader: !!headerDom,
436
419
  siderWidth: leftSiderWidth,
437
420
  hasFooter: !!footerDom,
438
- hasFooterToolbar: hasFooterToolbar,
439
- setHasFooterToolbar: setHasFooterToolbar,
440
- pageTitleInfo: pageTitleInfo,
441
- matchMenus: matchMenus,
442
- matchMenuKeys: matchMenuKeys,
443
- currentMenu: currentMenu
444
- }),
421
+ hasFooterToolbar,
422
+ setHasFooterToolbar,
423
+ pageTitleInfo,
424
+ matchMenus,
425
+ matchMenuKeys,
426
+ currentMenu
427
+ },
445
428
  children: props.pure ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
446
429
  children: children
447
430
  }) : /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
448
431
  className: className,
449
- children: [bgImgStyleList || (_token$layout = token.layout) !== null && _token$layout !== void 0 && _token$layout.bgLayout ? /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
450
- className: (0, _classnames.default)("".concat(proLayoutClassName, "-bg-list"), hashId),
432
+ children: [bgImgStyleList || token.layout?.bgLayout ? /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
433
+ className: (0, _clsx.clsx)(`${proLayoutClassName}-bg-list`, hashId),
451
434
  children: bgImgStyleList
452
435
  }) : null, /*#__PURE__*/(0, _jsxRuntime.jsxs)(_antd.Layout, {
453
- style: (0, _objectSpread2.default)({
436
+ style: {
454
437
  minHeight: '100%',
455
438
  // hack style
456
- flexDirection: siderMenuDom ? 'row' : undefined
457
- }, style),
439
+ flexDirection: siderMenuDom ? 'row' : undefined,
440
+ ...style
441
+ },
458
442
  children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.ConfigProvider
459
443
  // @ts-ignore
460
444
  , {
461
445
  theme: {
462
446
  hashed: (0, _provider.isNeedOpenHash)(),
463
447
  token: {
464
- controlHeightLG: ((_token$layout2 = token.layout) === null || _token$layout2 === void 0 || (_token$layout2 = _token$layout2.sider) === null || _token$layout2 === void 0 ? void 0 : _token$layout2.menuHeight) || (token === null || token === void 0 ? void 0 : token.controlHeightLG)
448
+ controlHeightLG: token.layout?.sider?.menuHeight || token?.controlHeightLG
465
449
  },
466
450
  components: {
467
451
  Menu: {
468
- itemBg: ((_token$layout3 = token.layout) === null || _token$layout3 === void 0 || (_token$layout3 = _token$layout3.sider) === null || _token$layout3 === void 0 ? void 0 : _token$layout3.colorMenuBackground) || 'transparent',
469
- subMenuItemBg: ((_token$layout4 = token.layout) === null || _token$layout4 === void 0 || (_token$layout4 = _token$layout4.sider) === null || _token$layout4 === void 0 ? void 0 : _token$layout4.colorMenuBackground) || 'transparent',
452
+ itemBg: token.layout?.sider?.colorMenuBackground || 'transparent',
453
+ subMenuItemBg: token.layout?.sider?.colorMenuBackground || 'transparent',
470
454
  itemBorderRadius: token.borderRadius,
471
- itemSelectedBg: ((_token$layout5 = token.layout) === null || _token$layout5 === void 0 || (_token$layout5 = _token$layout5.sider) === null || _token$layout5 === void 0 ? void 0 : _token$layout5.colorBgMenuItemSelected) || (token === null || token === void 0 ? void 0 : token.colorBgTextHover),
472
- itemHoverBg: ((_token$layout6 = token.layout) === null || _token$layout6 === void 0 || (_token$layout6 = _token$layout6.sider) === null || _token$layout6 === void 0 ? void 0 : _token$layout6.colorBgMenuItemHover) || (token === null || token === void 0 ? void 0 : token.colorBgTextHover),
473
- itemActiveBg: ((_token$layout7 = token.layout) === null || _token$layout7 === void 0 || (_token$layout7 = _token$layout7.sider) === null || _token$layout7 === void 0 ? void 0 : _token$layout7.colorBgMenuItemActive) || (token === null || token === void 0 ? void 0 : token.colorBgTextActive),
474
- horizontalItemSelectedBg: ((_token$layout8 = token.layout) === null || _token$layout8 === void 0 || (_token$layout8 = _token$layout8.sider) === null || _token$layout8 === void 0 ? void 0 : _token$layout8.colorBgMenuItemSelected) || (token === null || token === void 0 ? void 0 : token.colorBgTextHover),
455
+ itemSelectedBg: token.layout?.sider?.colorBgMenuItemSelected || token?.colorBgTextHover,
456
+ itemHoverBg: token.layout?.sider?.colorBgMenuItemHover || token?.colorBgTextHover,
457
+ itemActiveBg: token.layout?.sider?.colorBgMenuItemActive || token?.colorBgTextActive,
458
+ horizontalItemSelectedBg: token.layout?.sider?.colorBgMenuItemSelected || token?.colorBgTextHover,
475
459
  activeBarWidth: 0,
476
460
  activeBarHeight: 0,
477
461
  activeBarBorderWidth: 0,
478
- itemColor: ((_token$layout9 = token.layout) === null || _token$layout9 === void 0 || (_token$layout9 = _token$layout9.sider) === null || _token$layout9 === void 0 ? void 0 : _token$layout9.colorTextMenu) || (token === null || token === void 0 ? void 0 : token.colorTextSecondary),
479
- itemHoverColor: ((_token$layout10 = token.layout) === null || _token$layout10 === void 0 || (_token$layout10 = _token$layout10.sider) === null || _token$layout10 === void 0 ? void 0 : _token$layout10.colorTextMenuItemHover) || 'rgba(0, 0, 0, 0.85)',
462
+ itemColor: token.layout?.sider?.colorTextMenu || token?.colorTextSecondary,
463
+ itemHoverColor: token.layout?.sider?.colorTextMenuItemHover || 'rgba(0, 0, 0, 0.85)',
480
464
  // 悬浮态
481
- itemSelectedColor: ((_token$layout11 = token.layout) === null || _token$layout11 === void 0 || (_token$layout11 = _token$layout11.sider) === null || _token$layout11 === void 0 ? void 0 : _token$layout11.colorTextMenuSelected) || 'rgba(0, 0, 0, 1)',
482
- popupBg: token === null || token === void 0 ? void 0 : token.colorBgElevated,
465
+ itemSelectedColor: token.layout?.sider?.colorTextMenuSelected || 'rgba(0, 0, 0, 1)',
466
+ popupBg: token?.colorBgElevated,
483
467
  darkSubMenuItemBg: 'transparent',
484
- darkPopupBg: token === null || token === void 0 ? void 0 : token.colorBgElevated
468
+ darkPopupBg: token?.colorBgElevated
485
469
  }
486
470
  }
487
471
  },
488
472
  children: siderMenuDom
489
473
  }), /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
490
474
  style: genLayoutStyle,
491
- className: "".concat(proLayoutClassName, "-container ").concat(hashId).trim(),
492
- children: [headerDom, /*#__PURE__*/(0, _jsxRuntime.jsx)(_WrapContent.WrapContent, (0, _objectSpread2.default)((0, _objectSpread2.default)({
475
+ className: `${proLayoutClassName}-container ${hashId}`.trim(),
476
+ children: [headerDom, /*#__PURE__*/(0, _jsxRuntime.jsx)(_WrapContent.WrapContent, {
493
477
  hasPageContainer: hasPageContainer,
494
- isChildrenLayout: isChildrenLayout
495
- }, rest), {}, {
478
+ isChildrenLayout: isChildrenLayout,
479
+ ...rest,
496
480
  hasHeader: !!headerDom,
497
481
  prefixCls: proLayoutClassName,
498
482
  style: contentStyle,
499
483
  children: loading ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_PageLoading.PageLoading, {}) : children
500
- })), footerDom, hasFooterToolbar && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
501
- className: "".concat(proLayoutClassName, "-has-footer"),
484
+ }), footerDom, hasFooterToolbar && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
485
+ className: `${proLayoutClassName}-has-footer`,
502
486
  style: {
503
487
  height: 64,
504
- marginBlockStart: (_token$layout12 = token.layout) === null || _token$layout12 === void 0 || (_token$layout12 = _token$layout12.pageContainer) === null || _token$layout12 === void 0 ? void 0 : _token$layout12.paddingBlockPageContainerContent
488
+ marginBlockStart: token.layout?.pageContainer?.paddingBlockPageContainerContent
505
489
  }
506
490
  })]
507
491
  })]
@@ -509,9 +493,11 @@ var BaseProLayout = function BaseProLayout(props) {
509
493
  })
510
494
  }));
511
495
  };
512
- var ProLayout = exports.ProLayout = function ProLayout(props) {
513
- var colorPrimary = props.colorPrimary;
514
- var darkProps = props.navTheme !== undefined ? {
496
+ const ProLayout = props => {
497
+ const {
498
+ colorPrimary
499
+ } = props;
500
+ const darkProps = props.navTheme !== undefined ? {
515
501
  dark: props.navTheme === 'realDark'
516
502
  } : {};
517
503
  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.ConfigProvider, {
@@ -520,14 +506,17 @@ var ProLayout = exports.ProLayout = function ProLayout(props) {
520
506
  colorPrimary: colorPrimary
521
507
  }
522
508
  } : undefined,
523
- children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_provider.ProConfigProvider, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, darkProps), {}, {
509
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_provider.ProConfigProvider, {
510
+ ...darkProps,
524
511
  token: props.token,
525
512
  prefixCls: props.prefixCls,
526
- children: /*#__PURE__*/(0, _jsxRuntime.jsx)(BaseProLayout, (0, _objectSpread2.default)((0, _objectSpread2.default)({
527
- logo: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Logo.Logo, {})
528
- }, _defaultSettings.defaultSettings), {}, {
529
- location: (0, _utils.isBrowser)() ? window.location : undefined
530
- }, props))
531
- }))
513
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(BaseProLayout, {
514
+ logo: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Logo.Logo, {}),
515
+ ..._defaultSettings.defaultSettings,
516
+ location: (0, _utils.isBrowser)() ? window.location : undefined,
517
+ ...props
518
+ })
519
+ })
532
520
  });
533
- };
521
+ };
522
+ exports.ProLayout = ProLayout;