@zat-design/sisyphus-react 4.0.0-beta.2 → 4.0.0-beta.4

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 (603) hide show
  1. package/babel.config.js +7 -30
  2. package/dist/esm/index.d.ts +5 -0
  3. package/dist/esm/index.js +5 -0
  4. package/dist/esm/regExp/index.d.ts +19 -0
  5. package/dist/esm/regExp/index.js +73 -0
  6. package/dist/esm/tools/calc/index.d.ts +4 -0
  7. package/dist/esm/tools/calc/index.js +67 -0
  8. package/dist/esm/tools/dateUtils.d.ts +7 -0
  9. package/dist/esm/tools/dateUtils.js +23 -0
  10. package/dist/esm/tools/disableDate/index.d.ts +9 -0
  11. package/dist/esm/tools/disableDate/index.js +43 -0
  12. package/dist/esm/tools/disableTimeRange/index.d.ts +9 -0
  13. package/dist/esm/tools/disableTimeRange/index.js +121 -0
  14. package/dist/esm/tools/formatAmount/index.d.ts +7 -0
  15. package/dist/esm/tools/formatAmount/index.js +14 -0
  16. package/dist/esm/tools/formatPerMill/index.d.ts +7 -0
  17. package/dist/esm/tools/formatPerMill/index.js +11 -0
  18. package/dist/esm/tools/formatPercent/index.d.ts +7 -0
  19. package/dist/esm/tools/formatPercent/index.js +11 -0
  20. package/dist/esm/tools/getDataByIdCard/index.d.ts +16 -0
  21. package/dist/esm/tools/getDataByIdCard/index.js +65 -0
  22. package/dist/esm/tools/index.d.ts +12 -0
  23. package/dist/esm/tools/index.js +14 -0
  24. package/dist/esm/tools/sumAmount/index.d.ts +16 -0
  25. package/dist/esm/tools/sumAmount/index.js +40 -0
  26. package/dist/esm/tools/toChineseNum/index.d.ts +7 -0
  27. package/dist/esm/tools/toChineseNum/index.js +103 -0
  28. package/dist/esm/tools/toFixed/index.d.ts +2 -0
  29. package/dist/esm/tools/toFixed/index.js +5 -0
  30. package/dist/esm/tools/transformDataName/index.d.ts +12 -0
  31. package/dist/esm/tools/transformDataName/index.js +37 -0
  32. package/dist/esm/transforms/dateTransformer/index.d.ts +24 -0
  33. package/dist/esm/transforms/dateTransformer/index.js +67 -0
  34. package/dist/esm/transforms/index.d.ts +6 -0
  35. package/dist/esm/transforms/index.js +6 -0
  36. package/dist/esm/transforms/propTypes.d.ts +7 -0
  37. package/dist/esm/transforms/propTypes.js +1 -0
  38. package/dist/esm/transforms/transformDate/index.d.ts +21 -0
  39. package/dist/esm/transforms/transformDate/index.js +141 -0
  40. package/dist/esm/transforms/transformDatePicker/index.d.ts +12 -0
  41. package/dist/esm/transforms/transformDatePicker/index.js +24 -0
  42. package/dist/esm/transforms/transformRangePicker/index.d.ts +29 -0
  43. package/dist/esm/transforms/transformRangePicker/index.js +61 -0
  44. package/dist/esm/transforms/transformSwitch/index.d.ts +13 -0
  45. package/dist/esm/transforms/transformSwitch/index.js +35 -0
  46. package/dist/esm/transforms/utils.d.ts +2 -0
  47. package/dist/esm/transforms/utils.js +8 -0
  48. package/dist/esm/validate/index.d.ts +107 -0
  49. package/dist/esm/validate/index.js +284 -0
  50. package/es/FormsProvider/index.js +4 -2
  51. package/es/ProAction/components/CheckModalContent/index.js +9 -8
  52. package/es/ProAction/index.js +77 -75
  53. package/es/ProAction/index.less +0 -2
  54. package/es/ProConfigProvider/index.d.ts +1 -0
  55. package/es/ProConfigProvider/index.js +20 -16
  56. package/es/ProDownload/index.js +89 -94
  57. package/es/ProDownload/style/index.less +0 -2
  58. package/es/ProDownload/utils.js +59 -50
  59. package/es/ProDrawerForm/components/ProDrawer/index.js +79 -72
  60. package/es/ProDrawerForm/components/ProModal/index.js +62 -60
  61. package/es/ProDrawerForm/components/index.js +2 -2
  62. package/es/ProDrawerForm/index.js +43 -37
  63. package/es/ProDrawerForm/style/index.less +0 -2
  64. package/es/ProEditLabel/components/RenderProForm.js +25 -21
  65. package/es/ProEditLabel/index.js +54 -46
  66. package/es/ProEditLabel/style/index.less +0 -2
  67. package/es/ProEditTable/components/ActionButton/index.js +31 -23
  68. package/es/ProEditTable/components/RcTable/BaseTable.js +16 -15
  69. package/es/ProEditTable/components/RcTable/DraggableTable.js +20 -19
  70. package/es/ProEditTable/components/RcTable/index.js +2 -2
  71. package/es/ProEditTable/components/RenderField/ListChangedWrapper.js +41 -19
  72. package/es/ProEditTable/components/RenderField/index.js +176 -145
  73. package/es/ProEditTable/components/RenderToolbar/index.js +26 -24
  74. package/es/ProEditTable/components/Summary/index.js +13 -11
  75. package/es/ProEditTable/components/Validator/index.js +6 -5
  76. package/es/ProEditTable/components/index.js +5 -5
  77. package/es/ProEditTable/index.d.ts +1 -1
  78. package/es/ProEditTable/index.js +96 -80
  79. package/es/ProEditTable/propsType.d.ts +1 -1
  80. package/es/ProEditTable/style/index.less +2 -4
  81. package/es/ProEditTable/utils/config.js +44 -37
  82. package/es/ProEditTable/utils/diffOriginal.d.ts +1 -0
  83. package/es/ProEditTable/utils/diffOriginal.js +76 -7
  84. package/es/ProEditTable/utils/getDefaultProps.js +8 -8
  85. package/es/ProEditTable/utils/index.js +86 -73
  86. package/es/ProEditTable/utils/tools.js +166 -157
  87. package/es/ProEditTable/utils/useEditTableError.js +17 -6
  88. package/es/ProEnum/components/Group.js +6 -6
  89. package/es/ProEnum/components/Tag.js +8 -6
  90. package/es/ProEnum/hooks/useEnum.js +31 -4
  91. package/es/ProEnum/hooks/useEnumRequest.js +59 -54
  92. package/es/ProEnum/index.js +48 -49
  93. package/es/ProEnum/style/index.less +0 -2
  94. package/es/ProEnum/utils/eventCenter.js +6 -4
  95. package/es/ProEnum/utils/getEnumLabel.js +9 -10
  96. package/es/ProEnum/utils/index.js +10 -5
  97. package/es/ProForm/components/Container.js +7 -5
  98. package/es/ProForm/components/FormFooter/index.js +16 -14
  99. package/es/ProForm/components/base/Checkbox/index.js +11 -8
  100. package/es/ProForm/components/base/DatePicker/index.js +33 -46
  101. package/es/ProForm/components/base/Input/index.js +17 -15
  102. package/es/ProForm/components/base/InputNumber/index.js +42 -38
  103. package/es/ProForm/components/base/Radio/index.js +10 -8
  104. package/es/ProForm/components/base/RangePicker/index.js +20 -20
  105. package/es/ProForm/components/base/Select/index.js +12 -10
  106. package/es/ProForm/components/base/Switch/index.js +12 -11
  107. package/es/ProForm/components/base/SwitchCheckbox/index.js +15 -14
  108. package/es/ProForm/components/base/SwitchCheckbox/style/index.less +0 -2
  109. package/es/ProForm/components/base/TextArea/index.js +12 -11
  110. package/es/ProForm/components/base/TextArea/index.less +0 -2
  111. package/es/ProForm/components/base/TimePicker/index.js +7 -6
  112. package/es/ProForm/components/base/TimePicker/style/index.less +0 -2
  113. package/es/ProForm/components/combination/Container/index.js +14 -12
  114. package/es/ProForm/components/combination/Container/style/index.less +0 -2
  115. package/es/ProForm/components/combination/FormList/components/ActionButton.js +45 -42
  116. package/es/ProForm/components/combination/FormList/components/BlockFields.js +14 -13
  117. package/es/ProForm/components/combination/FormList/components/BlockTitle.js +6 -6
  118. package/es/ProForm/components/combination/FormList/components/Empty.js +30 -27
  119. package/es/ProForm/components/combination/FormList/components/LineFields.js +12 -11
  120. package/es/ProForm/components/combination/FormList/components/ToolbarButton.js +31 -29
  121. package/es/ProForm/components/combination/FormList/index.js +22 -21
  122. package/es/ProForm/components/combination/FormList/style/index.less +0 -2
  123. package/es/ProForm/components/combination/FormList/utils.js +5 -3
  124. package/es/ProForm/components/combination/Group/component/AddonWrapper/index.js +7 -5
  125. package/es/ProForm/components/combination/Group/component/ComRender.js +27 -22
  126. package/es/ProForm/components/combination/Group/hooks/index.js +35 -19
  127. package/es/ProForm/components/combination/Group/index.d.ts +8 -2
  128. package/es/ProForm/components/combination/Group/index.js +27 -32
  129. package/es/ProForm/components/combination/Group/utils.js +22 -14
  130. package/es/ProForm/components/combination/ProCascader/index.js +144 -88
  131. package/es/ProForm/components/combination/ProCascader/propsType.d.ts +12 -4
  132. package/es/ProForm/components/combination/ProCascader/style/index.less +1 -3
  133. package/es/ProForm/components/combination/ProCascader/utils/index.js +3 -3
  134. package/es/ProForm/components/combination/ProModalSelect/hooks/useRequestList.js +24 -18
  135. package/es/ProForm/components/combination/ProModalSelect/index.js +185 -193
  136. package/es/ProForm/components/combination/ProModalSelect/propsType.d.ts +7 -3
  137. package/es/ProForm/components/combination/ProModalSelect/style/index.less +1 -4
  138. package/es/ProForm/components/combination/ProNumberRange/index.js +23 -20
  139. package/es/ProForm/components/combination/ProNumberRange/style/index.less +4 -3
  140. package/es/ProForm/components/combination/ProRangeLimit/index.js +33 -29
  141. package/es/ProForm/components/combination/ProTimeLimit/index.js +34 -28
  142. package/es/ProForm/components/combination/ProTimeLimit/style/index.less +0 -2
  143. package/es/ProForm/components/index.d.ts +2 -0
  144. package/es/ProForm/components/index.js +31 -27
  145. package/es/ProForm/components/render/ChangedWrapper.js +21 -15
  146. package/es/ProForm/components/render/ConfirmWrapper.js +35 -35
  147. package/es/ProForm/components/render/Render.js +109 -75
  148. package/es/ProForm/components/render/RenderFields.d.ts +1 -0
  149. package/es/ProForm/components/render/RenderFields.js +46 -29
  150. package/es/ProForm/components/render/propsType.d.ts +1 -0
  151. package/es/ProForm/components/render/propsType.js +25 -0
  152. package/es/ProForm/index.d.ts +2 -2
  153. package/es/ProForm/index.js +58 -38
  154. package/es/ProForm/propsType.d.ts +3 -1
  155. package/es/ProForm/propsType.js +5 -1
  156. package/es/ProForm/style/index.less +0 -2
  157. package/es/ProForm/utils/diffOriginal.d.ts +1 -0
  158. package/es/ProForm/utils/diffOriginal.js +75 -8
  159. package/es/ProForm/utils/getDefaultProps.js +7 -7
  160. package/es/ProForm/utils/index.js +64 -39
  161. package/es/ProForm/utils/processDependencies.js +11 -0
  162. package/es/ProForm/utils/rulesCreator.js +12 -13
  163. package/es/ProForm/utils/transformNames.js +5 -4
  164. package/es/ProForm/utils/transformValue.js +11 -6
  165. package/es/ProForm/utils/useDeepCompareMemo.js +6 -4
  166. package/es/ProForm/utils/useForm.js +71 -71
  167. package/es/ProForm/utils/useRules.js +11 -9
  168. package/es/ProForm/utils/useShouldUpdate.d.ts +1 -0
  169. package/es/ProForm/utils/useShouldUpdate.js +117 -29
  170. package/es/ProForm/utils/useWatch.js +25 -3
  171. package/es/ProForm/utils/valueType.js +14 -11
  172. package/es/ProIcon/config/index.js +2 -0
  173. package/es/ProIcon/index.js +33 -23
  174. package/es/ProIcon/style/index.less +0 -2
  175. package/es/ProIcon/utils/index.js +4 -5
  176. package/es/ProLayout/components/Layout/Header/index.js +12 -10
  177. package/es/ProLayout/components/Layout/Icon/Icon.js +3 -3
  178. package/es/ProLayout/components/Layout/Icon/index.js +1 -1
  179. package/es/ProLayout/components/Layout/Menu/FoldMenu/index.js +82 -25
  180. package/es/ProLayout/components/Layout/Menu/FoldMenu/style/index.less +0 -2
  181. package/es/ProLayout/components/Layout/Menu/OpenMenu/index.js +54 -27
  182. package/es/ProLayout/components/Layout/Menu/SideMenu/index.js +10 -7
  183. package/es/ProLayout/components/Layout/Menu/SideMenu/style/index.less +0 -2
  184. package/es/ProLayout/components/Layout/Menu/index.js +16 -11
  185. package/es/ProLayout/components/Layout/Menu/style/index.less +0 -2
  186. package/es/ProLayout/components/Layout/Notice/index.js +9 -8
  187. package/es/ProLayout/components/Layout/Notice/style/index.less +0 -2
  188. package/es/ProLayout/components/Layout/index.js +4 -4
  189. package/es/ProLayout/components/ProCollapse/PropTypes.d.ts +8 -3
  190. package/es/ProLayout/components/ProCollapse/index.js +44 -16
  191. package/es/ProLayout/components/ProCollapse/style/index.less +148 -4
  192. package/es/ProLayout/components/ProFooter/index.js +3 -3
  193. package/es/ProLayout/components/ProFooter/style/index.less +0 -2
  194. package/es/ProLayout/components/ProHeader/components/Copy/index.js +6 -6
  195. package/es/ProLayout/components/ProHeader/components/ProBackBtn/index.js +5 -4
  196. package/es/ProLayout/components/ProHeader/components/ProBackBtn/style/index.less +0 -2
  197. package/es/ProLayout/components/ProHeader/components/index.js +2 -2
  198. package/es/ProLayout/components/ProHeader/index.js +87 -75
  199. package/es/ProLayout/components/ProHeader/style/index.less +0 -2
  200. package/es/ProLayout/components/index.js +3 -3
  201. package/es/ProLayout/index.d.ts +1 -12
  202. package/es/ProLayout/index.js +73 -41
  203. package/es/ProLayout/propTypes.d.ts +9 -0
  204. package/es/ProLayout/style/index.less +0 -2
  205. package/es/ProLayout/utils/index.d.ts +7 -0
  206. package/es/ProLayout/utils/index.js +51 -18
  207. package/es/ProSelect/components/AdaptiveTooltip.js +5 -4
  208. package/es/ProSelect/index.js +44 -43
  209. package/es/ProSelect/index.less +0 -2
  210. package/es/ProSelect/utils/index.js +67 -5
  211. package/es/ProStep/components/Anchor/index.d.ts +1 -0
  212. package/es/ProStep/components/Anchor/index.js +19 -18
  213. package/es/ProStep/components/Item/index.d.ts +1 -0
  214. package/es/ProStep/components/Item/index.js +15 -12
  215. package/es/ProStep/components/Listener/index.js +18 -16
  216. package/es/ProStep/components/Step/index.js +15 -14
  217. package/es/ProStep/index.js +74 -62
  218. package/es/ProStep/style/index.less +0 -2
  219. package/es/ProStep/utils/index.js +6 -5
  220. package/es/ProStepTab/index.js +111 -77
  221. package/es/ProTable/components/FormatColumn/index.js +69 -66
  222. package/es/ProTable/components/RcTable/components/BaseTable/index.js +3 -3
  223. package/es/ProTable/components/RcTable/components/DraggableTable/components/DndWrapper/index.js +40 -36
  224. package/es/ProTable/components/RcTable/components/DraggableTable/components/DndWrapper/utils/index.js +10 -9
  225. package/es/ProTable/components/RcTable/components/DraggableTable/index.js +5 -5
  226. package/es/ProTable/components/RcTable/index.js +2 -2
  227. package/es/ProTable/components/RenderColumn/index.js +30 -26
  228. package/es/ProTable/components/RenderEmptyText/index.js +7 -6
  229. package/es/ProTable/components/RenderFooter/index.js +2 -2
  230. package/es/ProTable/components/RenderSummary/index.js +11 -10
  231. package/es/ProTable/components/RenderTableHeader/index.js +15 -13
  232. package/es/ProTable/components/RenderTabs/index.js +7 -6
  233. package/es/ProTable/components/TableResizable/index.js +9 -8
  234. package/es/ProTable/components/TooltipTitle/index.js +6 -5
  235. package/es/ProTable/components/index.js +11 -6
  236. package/es/ProTable/hooks/useAntdTable.d.ts +3 -0
  237. package/es/ProTable/hooks/useAntdTable.js +133 -98
  238. package/es/ProTable/index.d.ts +3 -7
  239. package/es/ProTable/index.js +83 -77
  240. package/es/ProTable/propsType.d.ts +3 -2
  241. package/es/ProTable/style/index.less +4 -6
  242. package/es/ProTable/utils/index.js +12 -5
  243. package/es/ProTabs/components/Card/index.js +12 -11
  244. package/es/ProTabs/components/index.js +1 -1
  245. package/es/ProTabs/index.js +9 -8
  246. package/es/ProTabs/style/index.less +0 -2
  247. package/es/ProThemeTools/component/ProTools/index.js +42 -41
  248. package/es/ProThemeTools/component/index.js +1 -1
  249. package/es/ProThemeTools/context/ThemeContext.js +18 -2
  250. package/es/ProThemeTools/index.d.ts +0 -7
  251. package/es/ProThemeTools/index.js +50 -26
  252. package/es/ProThemeTools/style/index.less +0 -2
  253. package/es/ProThemeTools/utils/index.js +9 -0
  254. package/es/ProTooltip/index.js +24 -22
  255. package/es/ProTooltip/style/index.less +0 -2
  256. package/es/ProTree/components/AdaptiveTooltip.js +4 -4
  257. package/es/ProTree/components/CloseIcon.js +5 -5
  258. package/es/ProTree/components/List.js +15 -13
  259. package/es/ProTree/components/ProTree.js +62 -56
  260. package/es/ProTree/components/ProTreeSelect/index.js +88 -73
  261. package/es/ProTree/components/ProTreeSelect/style/index.less +0 -2
  262. package/es/ProTree/components/SearchTitle.js +10 -9
  263. package/es/ProTree/components/Tree.js +53 -52
  264. package/es/ProTree/components/index.js +4 -4
  265. package/es/ProTree/index.js +4 -4
  266. package/es/ProTree/style/index.less +0 -2
  267. package/es/ProTree/utils.js +21 -14
  268. package/es/ProTreeModal/components/Cascader.js +23 -21
  269. package/es/ProTreeModal/components/CloseIcon.js +5 -5
  270. package/es/ProTreeModal/components/List.js +40 -33
  271. package/es/ProTreeModal/components/SearchTitle.js +5 -4
  272. package/es/ProTreeModal/components/SortableItem.js +10 -8
  273. package/es/ProTreeModal/components/Tree.js +37 -35
  274. package/es/ProTreeModal/components/Trigger.js +23 -22
  275. package/es/ProTreeModal/components/index.js +6 -6
  276. package/es/ProTreeModal/index.js +85 -65
  277. package/es/ProTreeModal/style/index.less +0 -2
  278. package/es/ProTreeModal/utils.js +22 -18
  279. package/es/ProUpload/components/ButtonRender.js +38 -37
  280. package/es/ProUpload/components/DragRender.js +41 -34
  281. package/es/ProUpload/components/DraggableUploadListItem.js +3 -2
  282. package/es/ProUpload/components/Example.js +10 -9
  283. package/es/ProUpload/components/FileItem.js +47 -42
  284. package/es/ProUpload/components/ImageRender.js +85 -85
  285. package/es/ProUpload/index.js +24 -19
  286. package/es/ProUpload/style/index.less +0 -2
  287. package/es/ProUpload/uitls.js +1 -1
  288. package/es/ProViewer/index.js +25 -19
  289. package/es/ProViewer/propsType.js +3 -1
  290. package/es/ProViewer/style/index.less +0 -2
  291. package/es/ProWaterMark/index.js +4 -3
  292. package/es/index.d.ts +1 -1
  293. package/es/index.js +38 -29
  294. package/es/locale/index.js +7 -2
  295. package/es/style/theme/antd.less +0 -2
  296. package/es/tokens.js +1 -0
  297. package/es/utils/index.js +7 -3
  298. package/jest.config.js +46 -4
  299. package/lib/FormsProvider/index.js +53 -29
  300. package/lib/ProAction/components/CheckModalContent/index.js +27 -33
  301. package/lib/ProAction/index.js +155 -198
  302. package/lib/ProAction/index.less +0 -2
  303. package/lib/ProAction/propsType.js +16 -4
  304. package/lib/ProConfigProvider/index.d.ts +1 -0
  305. package/lib/ProConfigProvider/index.js +141 -122
  306. package/lib/ProDownload/index.js +123 -194
  307. package/lib/ProDownload/propsType.js +16 -4
  308. package/lib/ProDownload/style/index.less +0 -2
  309. package/lib/ProDownload/utils.js +145 -179
  310. package/lib/ProDrawerForm/components/ProDrawer/index.js +169 -236
  311. package/lib/ProDrawerForm/components/ProModal/index.js +134 -188
  312. package/lib/ProDrawerForm/components/index.js +39 -17
  313. package/lib/ProDrawerForm/index.js +93 -80
  314. package/lib/ProDrawerForm/propsType.js +16 -4
  315. package/lib/ProDrawerForm/style/index.less +0 -2
  316. package/lib/ProDrawerForm/utils/index.js +31 -13
  317. package/lib/ProEditLabel/components/RenderProForm.js +60 -58
  318. package/lib/ProEditLabel/index.js +182 -237
  319. package/lib/ProEditLabel/propsType.js +16 -4
  320. package/lib/ProEditLabel/style/index.less +0 -2
  321. package/lib/ProEditLabel/utils/index.js +31 -15
  322. package/lib/ProEditTable/components/ActionButton/index.js +172 -153
  323. package/lib/ProEditTable/components/RcTable/BaseTable.js +103 -104
  324. package/lib/ProEditTable/components/RcTable/DraggableTable.js +159 -187
  325. package/lib/ProEditTable/components/RcTable/index.js +39 -17
  326. package/lib/ProEditTable/components/RenderField/ListChangedWrapper.js +192 -178
  327. package/lib/ProEditTable/components/RenderField/index.js +564 -646
  328. package/lib/ProEditTable/components/RenderToolbar/index.js +105 -125
  329. package/lib/ProEditTable/components/Summary/index.js +61 -67
  330. package/lib/ProEditTable/components/Validator/index.js +48 -27
  331. package/lib/ProEditTable/components/index.js +48 -38
  332. package/lib/ProEditTable/index.d.ts +1 -1
  333. package/lib/ProEditTable/index.js +372 -430
  334. package/lib/ProEditTable/propsType.d.ts +1 -1
  335. package/lib/ProEditTable/propsType.js +16 -4
  336. package/lib/ProEditTable/style/index.less +2 -4
  337. package/lib/ProEditTable/utils/config.js +180 -235
  338. package/lib/ProEditTable/utils/diffOriginal.d.ts +1 -0
  339. package/lib/ProEditTable/utils/diffOriginal.js +106 -50
  340. package/lib/ProEditTable/utils/getDefaultProps.js +44 -29
  341. package/lib/ProEditTable/utils/index.js +255 -325
  342. package/lib/ProEditTable/utils/tools.js +252 -436
  343. package/lib/ProEditTable/utils/transform.js +28 -19
  344. package/lib/ProEditTable/utils/useEditTableError.js +58 -60
  345. package/lib/ProEnum/components/Group.js +78 -54
  346. package/lib/ProEnum/components/Tag.js +55 -40
  347. package/lib/ProEnum/hooks/useEnum.js +56 -53
  348. package/lib/ProEnum/hooks/useEnumRequest.js +198 -268
  349. package/lib/ProEnum/index.js +235 -244
  350. package/lib/ProEnum/propsType.js +16 -4
  351. package/lib/ProEnum/style/index.less +0 -2
  352. package/lib/ProEnum/utils/eventCenter.js +25 -37
  353. package/lib/ProEnum/utils/getEnumLabel.js +65 -63
  354. package/lib/ProEnum/utils/index.js +67 -92
  355. package/lib/ProForm/components/Container.js +45 -32
  356. package/lib/ProForm/components/FormFooter/index.js +82 -64
  357. package/lib/ProForm/components/FormFooter/propsType.js +16 -4
  358. package/lib/ProForm/components/base/Checkbox/index.js +62 -65
  359. package/lib/ProForm/components/base/DatePicker/index.js +77 -78
  360. package/lib/ProForm/components/base/DatePicker/useDateLimit.js +31 -16
  361. package/lib/ProForm/components/base/Input/index.js +73 -61
  362. package/lib/ProForm/components/base/Input/propsType.js +16 -4
  363. package/lib/ProForm/components/base/InputNumber/index.js +177 -225
  364. package/lib/ProForm/components/base/Radio/index.js +69 -59
  365. package/lib/ProForm/components/base/RangePicker/index.js +90 -77
  366. package/lib/ProForm/components/base/RangePicker/useDateRange.js +46 -28
  367. package/lib/ProForm/components/base/Select/index.js +69 -60
  368. package/lib/ProForm/components/base/Switch/index.js +59 -42
  369. package/lib/ProForm/components/base/SwitchCheckbox/index.js +63 -62
  370. package/lib/ProForm/components/base/SwitchCheckbox/style/index.less +0 -2
  371. package/lib/ProForm/components/base/TextArea/index.js +67 -52
  372. package/lib/ProForm/components/base/TextArea/index.less +0 -2
  373. package/lib/ProForm/components/base/TimePicker/index.js +59 -43
  374. package/lib/ProForm/components/base/TimePicker/style/index.less +0 -2
  375. package/lib/ProForm/components/combination/Container/index.js +77 -62
  376. package/lib/ProForm/components/combination/Container/propsType.js +16 -4
  377. package/lib/ProForm/components/combination/Container/style/index.less +0 -2
  378. package/lib/ProForm/components/combination/FormList/components/ActionButton.js +195 -247
  379. package/lib/ProForm/components/combination/FormList/components/BlockFields.js +108 -81
  380. package/lib/ProForm/components/combination/FormList/components/BlockTitle.js +44 -25
  381. package/lib/ProForm/components/combination/FormList/components/Empty.js +55 -92
  382. package/lib/ProForm/components/combination/FormList/components/LineFields.js +120 -94
  383. package/lib/ProForm/components/combination/FormList/components/ToolbarButton.js +103 -136
  384. package/lib/ProForm/components/combination/FormList/index.js +168 -142
  385. package/lib/ProForm/components/combination/FormList/propsType.js +16 -4
  386. package/lib/ProForm/components/combination/FormList/style/index.less +0 -2
  387. package/lib/ProForm/components/combination/FormList/utils.js +54 -33
  388. package/lib/ProForm/components/combination/Group/component/AddonWrapper/index.js +38 -21
  389. package/lib/ProForm/components/combination/Group/component/ComRender.js +76 -77
  390. package/lib/ProForm/components/combination/Group/hooks/index.js +142 -130
  391. package/lib/ProForm/components/combination/Group/index.d.ts +8 -2
  392. package/lib/ProForm/components/combination/Group/index.js +113 -110
  393. package/lib/ProForm/components/combination/Group/propsType.js +16 -4
  394. package/lib/ProForm/components/combination/Group/utils.js +113 -128
  395. package/lib/ProForm/components/combination/ProCascader/index.js +255 -254
  396. package/lib/ProForm/components/combination/ProCascader/propsType.d.ts +12 -4
  397. package/lib/ProForm/components/combination/ProCascader/propsType.js +16 -4
  398. package/lib/ProForm/components/combination/ProCascader/style/index.less +1 -3
  399. package/lib/ProForm/components/combination/ProCascader/utils/index.js +35 -24
  400. package/lib/ProForm/components/combination/ProModalSelect/hooks/useRequestList.js +122 -115
  401. package/lib/ProForm/components/combination/ProModalSelect/index.js +494 -689
  402. package/lib/ProForm/components/combination/ProModalSelect/propsType.d.ts +7 -3
  403. package/lib/ProForm/components/combination/ProModalSelect/propsType.js +16 -4
  404. package/lib/ProForm/components/combination/ProModalSelect/style/index.less +1 -4
  405. package/lib/ProForm/components/combination/ProModalSelect/utils/index.js +45 -22
  406. package/lib/ProForm/components/combination/ProNumberRange/index.js +163 -182
  407. package/lib/ProForm/components/combination/ProNumberRange/propsType.js +16 -4
  408. package/lib/ProForm/components/combination/ProNumberRange/style/index.less +4 -3
  409. package/lib/ProForm/components/combination/ProRangeLimit/index.js +140 -164
  410. package/lib/ProForm/components/combination/ProRangeLimit/propsType.js +16 -4
  411. package/lib/ProForm/components/combination/ProTimeLimit/hooks/useControlled.js +49 -28
  412. package/lib/ProForm/components/combination/ProTimeLimit/index.js +128 -143
  413. package/lib/ProForm/components/combination/ProTimeLimit/style/index.less +0 -2
  414. package/lib/ProForm/components/index.d.ts +2 -0
  415. package/lib/ProForm/components/index.js +115 -192
  416. package/lib/ProForm/components/render/ChangedWrapper.js +147 -133
  417. package/lib/ProForm/components/render/ConfirmWrapper.js +78 -122
  418. package/lib/ProForm/components/render/Render.js +356 -419
  419. package/lib/ProForm/components/render/RenderFields.d.ts +1 -0
  420. package/lib/ProForm/components/render/RenderFields.js +188 -188
  421. package/lib/ProForm/components/render/propsType.d.ts +1 -0
  422. package/lib/ProForm/components/render/propsType.js +16 -5
  423. package/lib/ProForm/index.d.ts +2 -2
  424. package/lib/ProForm/index.js +241 -270
  425. package/lib/ProForm/propsType.d.ts +3 -1
  426. package/lib/ProForm/propsType.js +38 -5
  427. package/lib/ProForm/style/index.less +0 -2
  428. package/lib/ProForm/utils/diffOriginal.d.ts +1 -0
  429. package/lib/ProForm/utils/diffOriginal.js +103 -44
  430. package/lib/ProForm/utils/getDefaultProps.js +44 -28
  431. package/lib/ProForm/utils/index.js +270 -321
  432. package/lib/ProForm/utils/processDependencies.js +44 -52
  433. package/lib/ProForm/utils/rulesCreator.js +84 -61
  434. package/lib/ProForm/utils/transformNames.js +38 -27
  435. package/lib/ProForm/utils/transformValue.js +51 -48
  436. package/lib/ProForm/utils/useDeepCompareMemo.js +36 -16
  437. package/lib/ProForm/utils/useFieldProps.js +42 -11
  438. package/lib/ProForm/utils/useForm.js +118 -228
  439. package/lib/ProForm/utils/useRules.js +67 -60
  440. package/lib/ProForm/utils/useShouldUpdate.d.ts +1 -0
  441. package/lib/ProForm/utils/useShouldUpdate.js +153 -176
  442. package/lib/ProForm/utils/useWatch.js +93 -100
  443. package/lib/ProForm/utils/valueType.js +157 -224
  444. package/lib/ProIcon/config/index.js +365 -276
  445. package/lib/ProIcon/index.js +189 -214
  446. package/lib/ProIcon/propsTypes.js +16 -4
  447. package/lib/ProIcon/style/index.less +0 -2
  448. package/lib/ProIcon/symbolIcon.js +23 -30
  449. package/lib/ProIcon/utils/index.js +66 -57
  450. package/lib/ProLayout/components/Layout/Header/index.js +59 -42
  451. package/lib/ProLayout/components/Layout/Icon/Icon.js +49 -30
  452. package/lib/ProLayout/components/Layout/Icon/index.js +34 -7
  453. package/lib/ProLayout/components/Layout/Menu/FoldMenu/index.js +141 -119
  454. package/lib/ProLayout/components/Layout/Menu/FoldMenu/style/index.less +0 -2
  455. package/lib/ProLayout/components/Layout/Menu/OpenMenu/index.js +123 -123
  456. package/lib/ProLayout/components/Layout/Menu/OpenMenu/propsType.js +16 -4
  457. package/lib/ProLayout/components/Layout/Menu/SideMenu/index.js +60 -42
  458. package/lib/ProLayout/components/Layout/Menu/SideMenu/style/index.less +0 -2
  459. package/lib/ProLayout/components/Layout/Menu/index.js +79 -56
  460. package/lib/ProLayout/components/Layout/Menu/style/index.less +0 -2
  461. package/lib/ProLayout/components/Layout/Notice/index.js +39 -31
  462. package/lib/ProLayout/components/Layout/Notice/style/index.less +0 -2
  463. package/lib/ProLayout/components/Layout/index.js +45 -31
  464. package/lib/ProLayout/components/ProCollapse/PropTypes.d.ts +8 -3
  465. package/lib/ProLayout/components/ProCollapse/PropTypes.js +16 -4
  466. package/lib/ProLayout/components/ProCollapse/index.js +156 -135
  467. package/lib/ProLayout/components/ProCollapse/style/index.less +148 -4
  468. package/lib/ProLayout/components/ProFooter/PropTypes.js +16 -4
  469. package/lib/ProLayout/components/ProFooter/index.js +58 -44
  470. package/lib/ProLayout/components/ProFooter/style/index.less +0 -2
  471. package/lib/ProLayout/components/ProHeader/PropTypes.js +16 -4
  472. package/lib/ProLayout/components/ProHeader/components/Copy/index.js +53 -25
  473. package/lib/ProLayout/components/ProHeader/components/ProBackBtn/index.js +48 -27
  474. package/lib/ProLayout/components/ProHeader/components/ProBackBtn/propsType.js +16 -4
  475. package/lib/ProLayout/components/ProHeader/components/ProBackBtn/style/index.less +0 -2
  476. package/lib/ProLayout/components/ProHeader/components/index.js +39 -17
  477. package/lib/ProLayout/components/ProHeader/index.js +274 -452
  478. package/lib/ProLayout/components/ProHeader/style/index.less +0 -2
  479. package/lib/ProLayout/components/ProHeader/utils/index.js +32 -14
  480. package/lib/ProLayout/components/index.js +42 -24
  481. package/lib/ProLayout/index.d.ts +1 -12
  482. package/lib/ProLayout/index.js +158 -136
  483. package/lib/ProLayout/propTypes.d.ts +9 -0
  484. package/lib/ProLayout/propTypes.js +16 -4
  485. package/lib/ProLayout/style/index.less +0 -2
  486. package/lib/ProLayout/utils/index.d.ts +7 -0
  487. package/lib/ProLayout/utils/index.js +107 -103
  488. package/lib/ProSelect/components/AdaptiveTooltip.js +46 -40
  489. package/lib/ProSelect/index.js +218 -250
  490. package/lib/ProSelect/index.less +0 -2
  491. package/lib/ProSelect/propsType.js +16 -4
  492. package/lib/ProSelect/utils/index.js +110 -79
  493. package/lib/ProStep/components/Anchor/index.d.ts +1 -0
  494. package/lib/ProStep/components/Anchor/index.js +108 -101
  495. package/lib/ProStep/components/Item/index.d.ts +1 -0
  496. package/lib/ProStep/components/Item/index.js +82 -75
  497. package/lib/ProStep/components/Listener/index.js +62 -71
  498. package/lib/ProStep/components/Step/index.js +76 -67
  499. package/lib/ProStep/index.js +167 -225
  500. package/lib/ProStep/propsType.js +16 -4
  501. package/lib/ProStep/style/index.less +0 -2
  502. package/lib/ProStep/utils/index.js +59 -52
  503. package/lib/ProStepTab/index.js +179 -287
  504. package/lib/ProStepTab/propsType.js +16 -4
  505. package/lib/ProTable/components/FormatColumn/index.js +446 -495
  506. package/lib/ProTable/components/RcTable/components/BaseTable/index.js +53 -40
  507. package/lib/ProTable/components/RcTable/components/DraggableTable/components/DndWrapper/index.js +139 -200
  508. package/lib/ProTable/components/RcTable/components/DraggableTable/components/DndWrapper/utils/index.js +116 -95
  509. package/lib/ProTable/components/RcTable/components/DraggableTable/components/DndWrapper/utils/propsType.js +16 -4
  510. package/lib/ProTable/components/RcTable/components/DraggableTable/index.js +80 -59
  511. package/lib/ProTable/components/RcTable/index.js +39 -17
  512. package/lib/ProTable/components/RenderColumn/index.js +194 -200
  513. package/lib/ProTable/components/RenderEmptyText/index.js +27 -25
  514. package/lib/ProTable/components/RenderFooter/index.js +33 -17
  515. package/lib/ProTable/components/RenderSummary/index.js +46 -56
  516. package/lib/ProTable/components/RenderTableHeader/index.js +68 -59
  517. package/lib/ProTable/components/RenderTabs/index.js +89 -78
  518. package/lib/ProTable/components/TableResizable/index.js +88 -87
  519. package/lib/ProTable/components/TooltipTitle/index.js +40 -26
  520. package/lib/ProTable/components/index.js +51 -45
  521. package/lib/ProTable/hooks/useAntdTable.d.ts +3 -0
  522. package/lib/ProTable/hooks/useAntdTable.js +349 -376
  523. package/lib/ProTable/index.d.ts +3 -7
  524. package/lib/ProTable/index.js +353 -392
  525. package/lib/ProTable/propsType.d.ts +3 -2
  526. package/lib/ProTable/propsType.js +16 -4
  527. package/lib/ProTable/style/index.less +4 -6
  528. package/lib/ProTable/utils/index.js +84 -84
  529. package/lib/ProTabs/components/Card/index.js +30 -50
  530. package/lib/ProTabs/components/index.js +36 -10
  531. package/lib/ProTabs/index.js +92 -85
  532. package/lib/ProTabs/propType.js +16 -4
  533. package/lib/ProTabs/style/index.less +0 -2
  534. package/lib/ProThemeTools/component/ProTools/index.js +198 -238
  535. package/lib/ProThemeTools/component/index.js +36 -10
  536. package/lib/ProThemeTools/context/ThemeContext.js +96 -87
  537. package/lib/ProThemeTools/index.d.ts +0 -7
  538. package/lib/ProThemeTools/index.js +181 -195
  539. package/lib/ProThemeTools/propsType.js +16 -4
  540. package/lib/ProThemeTools/style/index.less +0 -2
  541. package/lib/ProThemeTools/utils/index.js +85 -79
  542. package/lib/ProTooltip/index.js +217 -221
  543. package/lib/ProTooltip/propsType.js +16 -4
  544. package/lib/ProTooltip/style/index.less +0 -2
  545. package/lib/ProTree/components/AdaptiveTooltip.js +33 -22
  546. package/lib/ProTree/components/CloseIcon.js +36 -31
  547. package/lib/ProTree/components/List.js +68 -72
  548. package/lib/ProTree/components/ProTree.js +262 -362
  549. package/lib/ProTree/components/ProTreeSelect/index.js +367 -474
  550. package/lib/ProTree/components/ProTreeSelect/propsType.js +16 -4
  551. package/lib/ProTree/components/ProTreeSelect/style/index.less +0 -2
  552. package/lib/ProTree/components/SearchTitle.js +47 -50
  553. package/lib/ProTree/components/Tree.js +230 -302
  554. package/lib/ProTree/components/index.js +45 -31
  555. package/lib/ProTree/index.js +45 -22
  556. package/lib/ProTree/propsType.js +16 -4
  557. package/lib/ProTree/style/index.less +0 -2
  558. package/lib/ProTree/utils.js +83 -135
  559. package/lib/ProTreeModal/components/Cascader.js +97 -93
  560. package/lib/ProTreeModal/components/CloseIcon.js +36 -31
  561. package/lib/ProTreeModal/components/List.js +194 -263
  562. package/lib/ProTreeModal/components/SearchTitle.js +30 -22
  563. package/lib/ProTreeModal/components/SortableItem.js +60 -59
  564. package/lib/ProTreeModal/components/Tree.js +162 -180
  565. package/lib/ProTreeModal/components/Trigger.js +108 -126
  566. package/lib/ProTreeModal/components/index.js +51 -45
  567. package/lib/ProTreeModal/index.js +464 -574
  568. package/lib/ProTreeModal/propsType.js +16 -4
  569. package/lib/ProTreeModal/style/index.less +0 -2
  570. package/lib/ProTreeModal/utils.js +105 -158
  571. package/lib/ProUpload/components/ButtonRender.js +86 -108
  572. package/lib/ProUpload/components/DragRender.js +120 -167
  573. package/lib/ProUpload/components/DraggableUploadListItem.js +50 -32
  574. package/lib/ProUpload/components/Example.js +56 -38
  575. package/lib/ProUpload/components/FileItem.js +114 -203
  576. package/lib/ProUpload/components/ImageRender.js +176 -246
  577. package/lib/ProUpload/index.js +204 -215
  578. package/lib/ProUpload/propsType.js +16 -4
  579. package/lib/ProUpload/style/index.less +0 -2
  580. package/lib/ProUpload/uitls.js +34 -10
  581. package/lib/ProUtils/utils/index.js +38 -26
  582. package/lib/ProViewer/index.js +173 -199
  583. package/lib/ProViewer/propsType.js +16 -4
  584. package/lib/ProViewer/style/index.less +0 -2
  585. package/lib/ProWaterMark/index.js +38 -18
  586. package/lib/ProWaterMark/propsType.js +16 -4
  587. package/lib/index.d.ts +1 -1
  588. package/lib/index.js +123 -272
  589. package/lib/locale/en_US.js +145 -127
  590. package/lib/locale/index.js +58 -38
  591. package/lib/locale/zh_CN.js +146 -128
  592. package/lib/style/theme/antd.less +0 -2
  593. package/lib/tokens.js +103 -86
  594. package/lib/utils/index.js +91 -63
  595. package/package.json +13 -12
  596. package/tests/__mocks__/fileMock.js +1 -0
  597. package/tests/__mocks__/zatUtils.js +27 -0
  598. package/tests/setup.ts +484 -0
  599. package/tests/test-utils.tsx +81 -0
  600. package/dist/index.esm.css +0 -6445
  601. package/dist/index.esm.js +0 -3
  602. package/dist/less.esm.css +0 -5871
  603. package/dist/less.esm.js +0 -3
@@ -1,148 +1,162 @@
1
- "use strict";
1
+ var __create = Object.create;
2
+ var __defProp = Object.defineProperty;
3
+ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
4
+ var __getOwnPropNames = Object.getOwnPropertyNames;
5
+ var __getProtoOf = Object.getPrototypeOf;
6
+ var __hasOwnProp = Object.prototype.hasOwnProperty;
7
+ var __export = (target, all) => {
8
+ for (var name in all)
9
+ __defProp(target, name, { get: all[name], enumerable: true });
10
+ };
11
+ var __copyProps = (to, from, except, desc) => {
12
+ if (from && typeof from === "object" || typeof from === "function") {
13
+ for (let key of __getOwnPropNames(from))
14
+ if (!__hasOwnProp.call(to, key) && key !== except)
15
+ __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
16
+ }
17
+ return to;
18
+ };
19
+ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
20
+ // If the importer is in node compatibility mode or this is not an ESM
21
+ // file that has been converted to a CommonJS file using a Babel-
22
+ // compatible transform (i.e. "__esModule" has not been set), then set
23
+ // "default" to the CommonJS "module.exports" for node compatibility.
24
+ isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
25
+ mod
26
+ ));
27
+ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
2
28
 
3
- var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
4
- var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
5
- Object.defineProperty(exports, "__esModule", {
6
- value: true
29
+ // src/ProForm/components/render/ChangedWrapper.tsx
30
+ var ChangedWrapper_exports = {};
31
+ __export(ChangedWrapper_exports, {
32
+ default: () => ChangedWrapper_default
7
33
  });
8
- exports.default = void 0;
9
- var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
10
- var _objectSpread3 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
11
- var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
12
- var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
13
- var _get2 = _interopRequireDefault(require("lodash/get"));
14
- var _jsxRuntime = require("react/jsx-runtime");
15
- var _antd = require("antd");
16
- var _classnames = _interopRequireDefault(require("classnames"));
17
- var _react = _interopRequireWildcard(require("react"));
18
- var _diffOriginal = require("../../utils/diffOriginal");
19
- var _ProConfigProvider = require("../../../ProConfigProvider");
20
- var _utils = require("../../../utils");
21
- var _excluded = ["name", "names", "namesStr", "form", "onDiff", "children", "type", "diffConfig", "valuePropName", "normalize", "getValueProps", "viewRender"];
22
- var componentsWithFloatWindow = ['Select', 'ProSelect', 'ProEnum', 'ProTimeLimit', 'ProModalSelect', 'ProCascader', 'DataPicker', 'RangePicker', 'TimePicker'];
23
- var ChangedWrapper = function ChangedWrapper(props) {
24
- var _diffConfig$toolTip, _children$props, _children$props2, _children$props3;
25
- var name = props.name,
26
- names = props.names,
27
- namesStr = props.namesStr,
28
- form = props.form,
29
- onDiff = props.onDiff,
30
- children = props.children,
31
- type = props.type,
32
- diffConfig = props.diffConfig,
33
- _props$valuePropName = props.valuePropName,
34
- valuePropName = _props$valuePropName === void 0 ? 'value' : _props$valuePropName,
35
- normalize = props.normalize,
36
- getValueProps = props.getValueProps,
37
- viewRender = props.viewRender,
38
- rest = (0, _objectWithoutProperties2.default)(props, _excluded);
39
- var _useProConfig = (0, _ProConfigProvider.useProConfig)('ProForm'),
40
- isDiffAll = _useProConfig.isDiffAll;
41
- var originalValues = diffConfig.originalValues,
42
- changeTipColor = diffConfig.changeTipColor,
43
- addTipColor = diffConfig.addTipColor,
44
- _diffConfig$scrollFol = diffConfig.scrollFollowParent,
45
- scrollFollowParent = _diffConfig$scrollFol === void 0 ? true : _diffConfig$scrollFol;
46
- var toolTip = (_diffConfig$toolTip = diffConfig.toolTip) !== null && _diffConfig$toolTip !== void 0 ? _diffConfig$toolTip : true;
47
- var isWatch = toolTip && !['FormList', 'ProEditTable'].includes(type);
48
- var originalValue = (names === null || names === void 0 ? void 0 : names.length) ? names.map(function (name) {
49
- return (0, _get2.default)(originalValues, name);
50
- }) : (0, _get2.default)(originalValues, name);
51
- var noChange = !onDiff && (!originalValues || isDiffAll ? false : (0, _utils.isEmpty)(originalValue));
52
- var diffType = (0, _react.useMemo)(function () {
53
- if (!isWatch || noChange) return 'same';
54
- var _value = normalize ? normalize(props[valuePropName], undefined, undefined, true) // true 代表是值比对时的调用
55
- : props[valuePropName];
56
- // fix:修复 DatePicker时,originalValue与最新值一致时,显示为 changed的问题
57
- var _originalValue = normalize && ['DatePicker'].includes(props.type) ? normalize(originalValue, undefined, undefined, true) : originalValue;
58
- // fix:修复 InputNumber 时,originalValue与最新值一致都为'0'时,显示为 changed的问题
59
- if (['InputNumber'].includes(props.type) && normalize && _value === Number(originalValue)) {
60
- return 'same';
34
+ module.exports = __toCommonJS(ChangedWrapper_exports);
35
+ var import_antd = require("antd");
36
+ var import_classnames = __toESM(require("classnames"));
37
+ var import_lodash = require("lodash");
38
+ var import_react = __toESM(require("react"));
39
+ var import_diffOriginal = require("../../utils/diffOriginal");
40
+ var import_ProConfigProvider = require("../../../ProConfigProvider");
41
+ var import_utils = require("../../../utils");
42
+ var componentsWithFloatWindow = [
43
+ "Select",
44
+ "ProSelect",
45
+ "ProEnum",
46
+ "ProTimeLimit",
47
+ "ProModalSelect",
48
+ "ProCascader",
49
+ "DataPicker",
50
+ "RangePicker",
51
+ "TimePicker"
52
+ ];
53
+ var ChangedWrapper = (props) => {
54
+ var _a, _b, _c;
55
+ const {
56
+ name,
57
+ names,
58
+ namesStr,
59
+ form,
60
+ onDiff,
61
+ children,
62
+ type,
63
+ diffConfig,
64
+ valuePropName = "value",
65
+ normalize,
66
+ getValueProps,
67
+ viewRender,
68
+ ...rest
69
+ } = props;
70
+ const { isDiffAll } = (0, import_ProConfigProvider.useProConfig)("ProForm");
71
+ const { originalValues, changeTipColor, addTipColor, scrollFollowParent = true } = diffConfig;
72
+ const toolTip = diffConfig.toolTip ?? true;
73
+ const isWatch = toolTip && !["FormList", "ProEditTable"].includes(type);
74
+ const originalValue = (names == null ? void 0 : names.length) ? names.map((name2) => (0, import_lodash.get)(originalValues, name2)) : (0, import_lodash.get)(originalValues, name);
75
+ const noChange = !onDiff && (!originalValues || isDiffAll ? false : (0, import_utils.isEmpty)(originalValue));
76
+ const diffType = (0, import_react.useMemo)(() => {
77
+ if (!isWatch || noChange)
78
+ return "same";
79
+ const _value = normalize ? normalize(props[valuePropName], void 0, void 0, true) : props[valuePropName];
80
+ const _originalValue = normalize && ["DatePicker"].includes(props.type) ? normalize(originalValue, void 0, void 0, true) : originalValue;
81
+ if (["InputNumber"].includes(props.type) && normalize && _value === Number(originalValue)) {
82
+ return "same";
61
83
  }
62
- return (0, _diffOriginal.diffOriginal)({
84
+ return (0, import_diffOriginal.diffOriginal)({
63
85
  value: _value,
64
86
  originalValue: _originalValue,
65
- form: form,
66
- onDiff: onDiff
67
- // name: namesStr || name,
87
+ form,
88
+ onDiff,
89
+ type: props.type
68
90
  });
69
- }, [isWatch, noChange, props[valuePropName], originalValue, (0, _typeof2.default)(onDiff)]);
70
- var isAdd = diffType === 'add';
71
- var isChanged = diffType === 'changed';
72
- var tipContent = (0, _react.useMemo)(function () {
73
- if (!isWatch || noChange) return undefined;
74
- var valueProps = getValueProps ? getValueProps(originalValue, true) : {
75
- value: originalValue
76
- };
91
+ }, [isWatch, noChange, props[valuePropName], originalValue, typeof onDiff]);
92
+ const isAdd = diffType === "add";
93
+ const isChanged = diffType === "changed";
94
+ const tipContent = (0, import_react.useMemo)(() => {
95
+ if (!isWatch || noChange)
96
+ return void 0;
97
+ const valueProps = getValueProps ? getValueProps(originalValue, true) : { value: originalValue };
77
98
  if (viewRender) {
78
- return viewRender(valueProps === null || valueProps === void 0 ? void 0 : valueProps.value, originalValues, {
79
- form: form
80
- });
99
+ return viewRender(valueProps == null ? void 0 : valueProps.value, originalValues, { form });
81
100
  }
82
- return /*#__PURE__*/_react.default.isValidElement(children) ? /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread3.default)((0, _objectSpread3.default)({}, children.props), {}, (0, _defineProperty2.default)({
83
- isView: true
84
- }, valuePropName, valueProps === null || valueProps === void 0 ? void 0 : valueProps.value))) : undefined;
85
- }, [(0, _typeof2.default)(viewRender), originalValue, children]);
101
+ return import_react.default.isValidElement(children) ? import_react.default.cloneElement(children, {
102
+ ...children.props,
103
+ isView: true,
104
+ [valuePropName]: valueProps == null ? void 0 : valueProps.value
105
+ }) : void 0;
106
+ }, [typeof viewRender, originalValue, children]);
86
107
  if (!isWatch || noChange) {
87
- // 嵌套子组件
88
- var isNestedField = ['ProEditTable'].includes(type);
89
- return /*#__PURE__*/_react.default.isValidElement(children) && /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread3.default)((0, _objectSpread3.default)({
90
- originalValues: isNestedField ? originalValues : undefined
91
- }, children.props), rest));
108
+ const isNestedField = ["ProEditTable"].includes(type);
109
+ return import_react.default.isValidElement(children) && import_react.default.cloneElement(children, {
110
+ originalValues: isNestedField ? originalValues : void 0,
111
+ ...children.props,
112
+ ...rest
113
+ });
92
114
  }
93
- // eslint-disable-next-line react-hooks/rules-of-hooks
94
- var tipOpenCalc = function tipOpenCalc() {
95
- if (!toolTip) return false;
96
- // 传入undefined 鼠标移入显示移出隐藏 获得焦点时不显示气泡
97
- return isChanged ? undefined : false;
115
+ const tipOpenCalc = () => {
116
+ if (!toolTip)
117
+ return false;
118
+ return isChanged ? void 0 : false;
98
119
  };
99
- var style = {
100
- '--zaui-contract-bg': changeTipColor,
101
- '--zaui-contract-bg-add': addTipColor
120
+ const style = {
121
+ "--zaui-contract-bg": changeTipColor,
122
+ "--zaui-contract-bg-add": addTipColor
102
123
  };
103
- // @ts-ignore
104
- var _showEllipse = ((_children$props = children.props) === null || _children$props === void 0 ? void 0 : _children$props.showEllipse) || ((_children$props2 = children.props) === null || _children$props2 === void 0 ? void 0 : _children$props2.tooltip);
105
- var diffClassName = (0, _classnames.default)({
106
- 'pro-form-item-changed': isChanged,
107
- 'pro-form-item-add': isAdd
124
+ const _showEllipse = ((_a = children.props) == null ? void 0 : _a.showEllipse) || ((_b = children.props) == null ? void 0 : _b.tooltip);
125
+ const diffClassName = (0, import_classnames.default)({
126
+ "pro-form-item-changed": isChanged,
127
+ "pro-form-item-add": isAdd
108
128
  });
109
- var open = tipOpenCalc();
110
- var scrollFollowParentConfig = componentsWithFloatWindow.includes(type) ? {
111
- scrollFollowParent: scrollFollowParent
112
- } : {};
113
- return (0, _jsxRuntime.jsx)(_antd.Tooltip, {
114
- open: open,
115
- getPopupContainer: function getPopupContainer(trigger) {
116
- return scrollFollowParent ? trigger.parentElement : document.body;
117
- },
118
- classNames: {
119
- root: 'original-value-tooltip'
129
+ const open = tipOpenCalc();
130
+ const scrollFollowParentConfig = componentsWithFloatWindow.includes(type) ? { scrollFollowParent } : {};
131
+ return /* @__PURE__ */ import_react.default.createElement(
132
+ import_antd.Tooltip,
133
+ {
134
+ open,
135
+ getPopupContainer: (trigger) => scrollFollowParent ? trigger.parentElement : document.body,
136
+ classNames: {
137
+ root: "original-value-tooltip"
138
+ },
139
+ placement: "topLeft",
140
+ autoAdjustOverflow: false,
141
+ title: /* @__PURE__ */ import_react.default.createElement(import_antd.Space, { direction: "vertical", className: "changed-tooltip" }, /* @__PURE__ */ import_react.default.createElement(import_antd.Space, { align: "start", className: "original-value-container" }, "初始值:", tipContent), _showEllipse && /* @__PURE__ */ import_react.default.createElement(import_antd.Space, { className: "current-value-container" }, "当前值:", import_react.default.isValidElement(children) ? import_react.default.cloneElement(children, {
142
+ // @ts-ignore
143
+ ...children.props,
144
+ ...rest,
145
+ ...scrollFollowParentConfig,
146
+ isView: true
147
+ }) : void 0))
120
148
  },
121
- placement: "topLeft",
122
- autoAdjustOverflow: false,
123
- title: (0, _jsxRuntime.jsxs)(_antd.Space, {
124
- direction: "vertical",
125
- className: "changed-tooltip",
126
- children: [(0, _jsxRuntime.jsxs)(_antd.Space, {
127
- align: "start",
128
- className: "original-value-container",
129
- children: ["\u521D\u59CB\u503C\uFF1A", tipContent]
130
- }), _showEllipse && (0, _jsxRuntime.jsxs)(_antd.Space, {
131
- className: "current-value-container",
132
- children: ["\u5F53\u524D\u503C\uFF1A", /*#__PURE__*/_react.default.isValidElement(children) ? /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread3.default)((0, _objectSpread3.default)((0, _objectSpread3.default)((0, _objectSpread3.default)({}, children.props), rest), scrollFollowParentConfig), {}, {
133
- isView: true
134
- })) : undefined]
135
- })]
136
- }),
137
- children: (0, _jsxRuntime.jsx)("div", {
138
- className: diffClassName,
139
- style: style,
140
- children: /*#__PURE__*/_react.default.isValidElement(children) ? /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread3.default)((0, _objectSpread3.default)((0, _objectSpread3.default)((0, _objectSpread3.default)({}, children.props), rest), scrollFollowParentConfig), {}, {
141
- otherProps: (0, _objectSpread3.default)((0, _objectSpread3.default)({}, (_children$props3 = children.props) === null || _children$props3 === void 0 ? void 0 : _children$props3.otherProps), {}, {
142
- isDiffChange: isChanged
143
- })
144
- })) : undefined
145
- })
146
- });
149
+ /* @__PURE__ */ import_react.default.createElement("div", { className: diffClassName, style }, import_react.default.isValidElement(children) ? import_react.default.cloneElement(children, {
150
+ // @ts-ignore
151
+ ...children.props,
152
+ ...rest,
153
+ ...scrollFollowParentConfig,
154
+ otherProps: {
155
+ // @ts-ignore
156
+ ...(_c = children.props) == null ? void 0 : _c.otherProps,
157
+ isDiffChange: isChanged
158
+ }
159
+ }) : void 0)
160
+ );
147
161
  };
148
- var _default = exports.default = ChangedWrapper;
162
+ var ChangedWrapper_default = ChangedWrapper;
@@ -1,128 +1,84 @@
1
- "use strict";
1
+ var __create = Object.create;
2
+ var __defProp = Object.defineProperty;
3
+ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
4
+ var __getOwnPropNames = Object.getOwnPropertyNames;
5
+ var __getProtoOf = Object.getPrototypeOf;
6
+ var __hasOwnProp = Object.prototype.hasOwnProperty;
7
+ var __export = (target, all) => {
8
+ for (var name in all)
9
+ __defProp(target, name, { get: all[name], enumerable: true });
10
+ };
11
+ var __copyProps = (to, from, except, desc) => {
12
+ if (from && typeof from === "object" || typeof from === "function") {
13
+ for (let key of __getOwnPropNames(from))
14
+ if (!__hasOwnProp.call(to, key) && key !== except)
15
+ __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
16
+ }
17
+ return to;
18
+ };
19
+ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
20
+ // If the importer is in node compatibility mode or this is not an ESM
21
+ // file that has been converted to a CommonJS file using a Babel-
22
+ // compatible transform (i.e. "__esModule" has not been set), then set
23
+ // "default" to the CommonJS "module.exports" for node compatibility.
24
+ isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
25
+ mod
26
+ ));
27
+ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
2
28
 
3
- var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
4
- Object.defineProperty(exports, "__esModule", {
5
- value: true
29
+ // src/ProForm/components/render/ConfirmWrapper.tsx
30
+ var ConfirmWrapper_exports = {};
31
+ __export(ConfirmWrapper_exports, {
32
+ default: () => ConfirmWrapper_default
6
33
  });
7
- exports.default = void 0;
8
- var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
9
- var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
10
- var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
11
- var _isObject2 = _interopRequireDefault(require("lodash/isObject"));
12
- var _isFunction2 = _interopRequireDefault(require("lodash/isFunction"));
13
- var _jsxRuntime = require("react/jsx-runtime");
14
- var _react = _interopRequireDefault(require("react"));
15
- var _antd = require("antd");
16
- var _index = _interopRequireDefault(require("../../index"));
17
- var _excluded = ["onChange", "children", "confirm", "otherProps"];
18
- function _regenerator() { /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/babel/babel/blob/main/packages/babel-helpers/LICENSE */ var e, t, r = "function" == typeof Symbol ? Symbol : {}, n = r.iterator || "@@iterator", o = r.toStringTag || "@@toStringTag"; function i(r, n, o, i) { var c = n && n.prototype instanceof Generator ? n : Generator, u = Object.create(c.prototype); return _regeneratorDefine2(u, "_invoke", function (r, n, o) { var i, c, u, f = 0, p = o || [], y = !1, G = { p: 0, n: 0, v: e, a: d, f: d.bind(e, 4), d: function d(t, r) { return i = t, c = 0, u = e, G.n = r, a; } }; function d(r, n) { for (c = r, u = n, t = 0; !y && f && !o && t < p.length; t++) { var o, i = p[t], d = G.p, l = i[2]; r > 3 ? (o = l === n) && (u = i[(c = i[4]) ? 5 : (c = 3, 3)], i[4] = i[5] = e) : i[0] <= d && ((o = r < 2 && d < i[1]) ? (c = 0, G.v = n, G.n = i[1]) : d < l && (o = r < 3 || i[0] > n || n > l) && (i[4] = r, i[5] = n, G.n = l, c = 0)); } if (o || r > 1) return a; throw y = !0, n; } return function (o, p, l) { if (f > 1) throw TypeError("Generator is already running"); for (y && 1 === p && d(p, l), c = p, u = l; (t = c < 2 ? e : u) || !y;) { i || (c ? c < 3 ? (c > 1 && (G.n = -1), d(c, u)) : G.n = u : G.v = u); try { if (f = 2, i) { if (c || (o = "next"), t = i[o]) { if (!(t = t.call(i, u))) throw TypeError("iterator result is not an object"); if (!t.done) return t; u = t.value, c < 2 && (c = 0); } else 1 === c && (t = i.return) && t.call(i), c < 2 && (u = TypeError("The iterator does not provide a '" + o + "' method"), c = 1); i = e; } else if ((t = (y = G.n < 0) ? u : r.call(n, G)) !== a) break; } catch (t) { i = e, c = 1, u = t; } finally { f = 1; } } return { value: t, done: y }; }; }(r, o, i), !0), u; } var a = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} t = Object.getPrototypeOf; var c = [][n] ? t(t([][n]())) : (_regeneratorDefine2(t = {}, n, function () { return this; }), t), u = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(c); function f(e) { return Object.setPrototypeOf ? Object.setPrototypeOf(e, GeneratorFunctionPrototype) : (e.__proto__ = GeneratorFunctionPrototype, _regeneratorDefine2(e, o, "GeneratorFunction")), e.prototype = Object.create(u), e; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, _regeneratorDefine2(u, "constructor", GeneratorFunctionPrototype), _regeneratorDefine2(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = "GeneratorFunction", _regeneratorDefine2(GeneratorFunctionPrototype, o, "GeneratorFunction"), _regeneratorDefine2(u), _regeneratorDefine2(u, o, "Generator"), _regeneratorDefine2(u, n, function () { return this; }), _regeneratorDefine2(u, "toString", function () { return "[object Generator]"; }), (_regenerator = function _regenerator() { return { w: i, m: f }; })(); }
19
- function _regeneratorDefine2(e, r, n, t) { var i = Object.defineProperty; try { i({}, "", {}); } catch (e) { i = 0; } _regeneratorDefine2 = function _regeneratorDefine(e, r, n, t) { if (r) i ? i(e, r, { value: n, enumerable: !t, configurable: !t, writable: !t }) : e[r] = n;else { var o = function o(r, n) { _regeneratorDefine2(e, r, function (e) { return this._invoke(r, n, e); }); }; o("next", 0), o("throw", 1), o("return", 2); } }, _regeneratorDefine2(e, r, n, t); }
34
+ module.exports = __toCommonJS(ConfirmWrapper_exports);
35
+ var import_lodash = require("lodash");
36
+ var import_react = __toESM(require("react"));
37
+ var import_antd = require("antd");
38
+ var import__ = __toESM(require("../../index"));
20
39
  var defaultConfirmProps = {
21
- title: '操作提示',
22
- content: '确定要修改该字段吗?'
40
+ title: "操作提示",
41
+ content: "确定要修改该字段吗?"
23
42
  };
24
- var ConfirmWrapper = function ConfirmWrapper(props) {
25
- var onChange = props.onChange,
26
- children = props.children,
27
- confirm = props.confirm,
28
- otherProps = props.otherProps,
29
- rest = (0, _objectWithoutProperties2.default)(props, _excluded);
30
- var _ProForm$useFieldProp = _index.default.useFieldProps(),
31
- form = _ProForm$useFieldProp.form;
32
- var handleChange = /*#__PURE__*/function () {
33
- var _ref = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator().m(function _callee2(value) {
34
- var _len,
35
- other,
36
- _key,
37
- _value,
38
- confirmProps,
39
- _args2 = arguments,
40
- _t;
41
- return _regenerator().w(function (_context2) {
42
- while (1) switch (_context2.n) {
43
- case 0:
44
- for (_len = _args2.length, other = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
45
- other[_key - 1] = _args2[_key];
46
- }
47
- _value = (value === null || value === void 0 ? void 0 : value.target) ? value.target.value : value;
48
- if (!(0, _isFunction2.default)(confirm)) {
49
- _context2.n = 2;
50
- break;
51
- }
52
- _context2.n = 1;
53
- return confirm(value, form.getFieldsValue(), {
54
- option: other[0],
55
- form: form,
56
- namePath: otherProps.namePath,
57
- name: otherProps.name,
58
- index: otherProps.index,
59
- preValue: form.getFieldValue(otherProps.listName || otherProps.name)
60
- });
61
- case 1:
62
- _t = _context2.v;
63
- _context2.n = 3;
64
- break;
65
- case 2:
66
- _t = confirm;
67
- case 3:
68
- confirmProps = _t;
69
- // 只处理 false, true 和 对象的情况
70
- if (confirmProps === false) {
71
- onChange === null || onChange === void 0 ? void 0 : onChange.apply(void 0, [_value].concat(other));
72
- }
73
- if (confirmProps === true) {
74
- _antd.Modal.confirm((0, _objectSpread2.default)((0, _objectSpread2.default)({}, defaultConfirmProps), {}, {
75
- onOk: function onOk() {
76
- return onChange === null || onChange === void 0 ? void 0 : onChange.apply(void 0, [_value].concat(other));
77
- }
78
- }));
79
- }
80
- if ((0, _isObject2.default)(confirmProps)) {
81
- _antd.Modal.confirm((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, 'title' in confirmProps || 'content' in confirmProps ? {} : defaultConfirmProps), confirmProps), {}, {
82
- onOk: function () {
83
- var _onOk = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator().m(function _callee() {
84
- var _confirmProps$onOk;
85
- var _len2,
86
- arg,
87
- _key2,
88
- _args = arguments;
89
- return _regenerator().w(function (_context) {
90
- while (1) switch (_context.n) {
91
- case 0:
92
- for (_len2 = _args.length, arg = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
93
- arg[_key2] = _args[_key2];
94
- }
95
- _context.n = 1;
96
- return (_confirmProps$onOk = confirmProps.onOk) === null || _confirmProps$onOk === void 0 ? void 0 : _confirmProps$onOk.call.apply(_confirmProps$onOk, [confirmProps].concat(arg));
97
- case 1:
98
- onChange === null || onChange === void 0 ? void 0 : onChange.apply(void 0, [_value].concat(other));
99
- case 2:
100
- return _context.a(2);
101
- }
102
- }, _callee);
103
- }));
104
- function onOk() {
105
- return _onOk.apply(this, arguments);
106
- }
107
- return onOk;
108
- }()
109
- }));
110
- }
111
- case 4:
112
- return _context2.a(2);
43
+ var ConfirmWrapper = (props) => {
44
+ const { onChange, children, confirm, otherProps, ...rest } = props;
45
+ const { form } = import__.default.useFieldProps();
46
+ const handleChange = async (value, ...other) => {
47
+ const _value = (value == null ? void 0 : value.target) ? value.target.value : value;
48
+ const confirmProps = (0, import_lodash.isFunction)(confirm) ? await confirm(value, form.getFieldsValue(), {
49
+ option: other[0],
50
+ form,
51
+ namePath: otherProps.namePath,
52
+ name: otherProps.name,
53
+ index: otherProps.index,
54
+ preValue: form.getFieldValue(otherProps.listName || otherProps.name)
55
+ }) : confirm;
56
+ if (confirmProps === false) {
57
+ onChange == null ? void 0 : onChange(_value, ...other);
58
+ }
59
+ if (confirmProps === true) {
60
+ import_antd.Modal.confirm({
61
+ ...defaultConfirmProps,
62
+ onOk: () => onChange == null ? void 0 : onChange(_value, ...other)
63
+ });
64
+ }
65
+ if ((0, import_lodash.isObject)(confirmProps)) {
66
+ import_antd.Modal.confirm({
67
+ ..."title" in confirmProps || "content" in confirmProps ? {} : defaultConfirmProps,
68
+ ...confirmProps,
69
+ onOk: async (...arg) => {
70
+ var _a;
71
+ await ((_a = confirmProps.onOk) == null ? void 0 : _a.call(confirmProps, ...arg));
72
+ onChange == null ? void 0 : onChange(_value, ...other);
113
73
  }
114
- }, _callee2);
115
- }));
116
- return function handleChange(_x) {
117
- return _ref.apply(this, arguments);
118
- };
119
- }();
120
- return (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
121
- children: /*#__PURE__*/_react.default.isValidElement(children) && /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, rest), {}, {
122
- // @ts-ignore
123
- value: rest.value === undefined ? null : rest.value,
124
- onChange: handleChange
125
- }))
126
- });
74
+ });
75
+ }
76
+ };
77
+ return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, import_react.default.isValidElement(children) && import_react.default.cloneElement(children, {
78
+ ...rest,
79
+ // @ts-ignore
80
+ value: rest.value === void 0 ? null : rest.value,
81
+ onChange: handleChange
82
+ }));
127
83
  };
128
- var _default = exports.default = ConfirmWrapper;
84
+ var ConfirmWrapper_default = ConfirmWrapper;