@zat-design/sisyphus-react 3.9.7 → 3.9.8-beta.10

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 (258) hide show
  1. package/dist/index.esm.css +6 -5
  2. package/dist/less.esm.css +6 -5
  3. package/es/ProAction/index.js +5 -5
  4. package/es/ProDownload/index.d.ts +1 -1
  5. package/es/ProDownload/index.js +3 -3
  6. package/es/ProDownload/utils.js +3 -3
  7. package/es/ProDrawerForm/components/ProDrawer/index.js +4 -4
  8. package/es/ProDrawerForm/components/ProModal/index.js +3 -3
  9. package/es/ProEditLabel/index.js +3 -3
  10. package/es/ProEditTable/components/ActionButton/index.d.ts +1 -1
  11. package/es/ProEditTable/components/ActionButton/index.js +51 -11
  12. package/es/ProEditTable/components/RcTable/BaseTable.d.ts +1 -1
  13. package/es/ProEditTable/components/RcTable/DraggableTable.d.ts +1 -1
  14. package/es/ProEditTable/components/RcTable/VirtualTable.d.ts +1 -1
  15. package/es/ProEditTable/components/RenderField/index.d.ts +1 -1
  16. package/es/ProEditTable/components/RenderField/index.js +28 -19
  17. package/es/ProEditTable/components/RenderToolbar/index.d.ts +1 -1
  18. package/es/ProEditTable/components/RenderToolbar/index.js +17 -15
  19. package/es/ProEditTable/components/Summary/index.d.ts +1 -1
  20. package/es/ProEditTable/index.js +1 -1
  21. package/es/ProEditTable/propsType.d.ts +5 -3
  22. package/es/ProEditTable/utils/config.d.ts +1 -1
  23. package/es/ProEditTable/utils/config.js +8 -9
  24. package/es/ProEditTable/utils/diffOriginal.d.ts +1 -1
  25. package/es/ProEditTable/utils/diffOriginal.js +21 -22
  26. package/es/ProEditTable/utils/index.js +37 -33
  27. package/es/ProEditTable/utils/tools.js +4 -4
  28. package/es/ProEnum/components/Group.d.ts +1 -1
  29. package/es/ProEnum/components/Tag.d.ts +1 -1
  30. package/es/ProEnum/hooks/useEnumRequest.js +2 -2
  31. package/es/ProEnum/index.d.ts +2 -2
  32. package/es/ProEnum/index.js +1 -1
  33. package/es/ProEnum/utils/eventCenter.js +2 -1
  34. package/es/ProEnum/utils/getEnumLabel.d.ts +1 -1
  35. package/es/ProForm/components/base/Input/index.d.ts +1 -1
  36. package/es/ProForm/components/combination/FormList/components/ActionButton.js +2 -2
  37. package/es/ProForm/components/combination/FormList/components/BlockTitle.js +1 -1
  38. package/es/ProForm/components/combination/FormList/components/ToolbarButton.js +1 -1
  39. package/es/ProForm/components/combination/FormList/utils.js +1 -1
  40. package/es/ProForm/components/combination/Group/component/ComRender.js +1 -1
  41. package/es/ProForm/components/combination/Group/index.js +7 -2
  42. package/es/ProForm/components/combination/Group/propsType.d.ts +1 -0
  43. package/es/ProForm/components/combination/Group/utils.d.ts +6 -1
  44. package/es/ProForm/components/combination/Group/utils.js +28 -6
  45. package/es/ProForm/components/combination/ProCascader/index.d.ts +1 -1
  46. package/es/ProForm/components/combination/ProCascader/index.js +8 -8
  47. package/es/ProForm/components/combination/ProModalSelect/hooks/useRequestList.js +1 -1
  48. package/es/ProForm/components/combination/ProModalSelect/index.js +5 -5
  49. package/es/ProForm/components/old/InputRange/index.d.ts +1 -1
  50. package/es/ProForm/components/old/InputWithSuffix/index.d.ts +1 -1
  51. package/es/ProForm/components/old/ProAddress/index.d.ts +2 -1
  52. package/es/ProForm/components/old/ProAddress/index.js +1 -1
  53. package/es/ProForm/components/old/ProRangeBox/index.d.ts +2 -1
  54. package/es/ProForm/components/render/ConfirmWrapper.js +1 -1
  55. package/es/ProForm/components/render/Render.js +25 -13
  56. package/es/ProForm/components/render/RenderFields.d.ts +1 -0
  57. package/es/ProForm/components/render/RenderFields.js +8 -4
  58. package/es/ProForm/components/render/propsType.d.ts +3 -1
  59. package/es/ProForm/index.js +6 -3
  60. package/es/ProForm/propsType.d.ts +3 -0
  61. package/es/ProForm/utils/diffOriginal.js +9 -2
  62. package/es/ProForm/utils/index.js +10 -14
  63. package/es/ProForm/utils/useForm.js +1 -1
  64. package/es/ProForm/utils/useShouldUpdate.js +25 -5
  65. package/es/ProForm/utils/valueType.d.ts +8 -0
  66. package/es/ProForm/utils/valueType.js +98 -33
  67. package/es/ProIcon/utils/index.js +3 -4
  68. package/es/ProLayout/components/Layout/Menu/OpenMenu/index.d.ts +1 -1
  69. package/es/ProLayout/components/Layout/Menu/OpenMenu/index.js +3 -3
  70. package/es/ProLayout/components/ProCollapse/index.d.ts +1 -1
  71. package/es/ProLayout/components/ProFooter/index.d.ts +1 -1
  72. package/es/ProLayout/components/ProHeader/components/Copy/index.d.ts +1 -1
  73. package/es/ProLayout/components/ProHeader/index.d.ts +1 -1
  74. package/es/ProLayout/components/ProHeader/style/index.less +0 -8
  75. package/es/ProLayout/index.d.ts +4 -4
  76. package/es/ProLayout/utils/index.js +9 -9
  77. package/es/ProSelect/components/AdaptiveTooltip.d.ts +1 -1
  78. package/es/ProSelect/index.d.ts +1 -1
  79. package/es/ProStep/components/Anchor/index.d.ts +1 -1
  80. package/es/ProStep/components/Item/index.d.ts +1 -1
  81. package/es/ProStep/components/Listener/index.js +1 -1
  82. package/es/ProStep/components/Step/index.d.ts +1 -1
  83. package/es/ProStep/index.d.ts +2 -2
  84. package/es/ProStep/index.js +13 -12
  85. package/es/ProTable/components/FormatColumn/index.js +34 -5
  86. package/es/ProTable/components/RcTable/components/BaseTable/index.d.ts +1 -1
  87. package/es/ProTable/components/RcTable/components/DraggableTable/components/DndWrapper/index.js +2 -2
  88. package/es/ProTable/components/RcTable/components/DraggableTable/components/DndWrapper/utils/index.js +8 -9
  89. package/es/ProTable/components/RcTable/components/DraggableTable/index.d.ts +1 -1
  90. package/es/ProTable/components/RenderColumn/index.d.ts +2 -0
  91. package/es/ProTable/components/RenderColumn/index.js +10 -2
  92. package/es/ProTable/components/RenderFooter/index.d.ts +1 -1
  93. package/es/ProTable/components/RenderTableHeader/index.d.ts +1 -1
  94. package/es/ProTable/components/TableResizable/index.d.ts +1 -1
  95. package/es/ProTable/hooks/useAntdTable.js +7 -6
  96. package/es/ProTable/index.d.ts +1 -1
  97. package/es/ProTable/index.js +8 -5
  98. package/es/ProTable/propsType.d.ts +2 -0
  99. package/es/ProTable/style/index.less +7 -0
  100. package/es/ProTable/utils/index.d.ts +4 -0
  101. package/es/ProTable/utils/index.js +15 -0
  102. package/es/ProTabs/components/Card/index.d.ts +1 -1
  103. package/es/ProThemeTools/component/ProTools/index.d.ts +1 -1
  104. package/es/ProThemeTools/index.d.ts +1 -1
  105. package/es/ProTooltip/index.d.ts +1 -1
  106. package/es/ProTree/components/AdaptiveTooltip.d.ts +1 -1
  107. package/es/ProTree/components/CloseIcon.d.ts +2 -1
  108. package/es/ProTree/components/List.d.ts +1 -1
  109. package/es/ProTree/components/ProTree.d.ts +1 -1
  110. package/es/ProTree/components/ProTree.js +1 -1
  111. package/es/ProTree/components/ProTreeSelect/index.d.ts +1 -1
  112. package/es/ProTree/components/ProTreeSelect/index.js +22 -22
  113. package/es/ProTree/components/SearchTitle.d.ts +1 -1
  114. package/es/ProTree/components/Tree.d.ts +1 -1
  115. package/es/ProTree/components/Tree.js +4 -4
  116. package/es/ProTree/index.d.ts +1 -1
  117. package/es/ProTree/utils.js +11 -12
  118. package/es/ProTreeModal/components/Cascader.d.ts +1 -1
  119. package/es/ProTreeModal/components/CloseIcon.d.ts +2 -1
  120. package/es/ProTreeModal/components/SearchTitle.d.ts +1 -1
  121. package/es/ProTreeModal/components/Tree.js +6 -6
  122. package/es/ProTreeModal/components/Trigger.d.ts +1 -1
  123. package/es/ProTreeModal/index.d.ts +1 -1
  124. package/es/ProTreeModal/index.js +3 -3
  125. package/es/ProTreeModal/utils.js +14 -16
  126. package/es/ProUpload/components/DraggableUploadListItem.d.ts +1 -1
  127. package/es/ProUpload/components/ImageRender.js +1 -1
  128. package/es/ProViewer/index.js +2 -2
  129. package/es/old/ProEditableTable/index.js +4 -4
  130. package/lib/ProAction/index.js +5 -5
  131. package/lib/ProDownload/index.d.ts +1 -1
  132. package/lib/ProDownload/index.js +3 -3
  133. package/lib/ProDownload/utils.js +3 -3
  134. package/lib/ProDrawerForm/components/ProDrawer/index.js +4 -4
  135. package/lib/ProDrawerForm/components/ProModal/index.js +3 -3
  136. package/lib/ProEditLabel/index.js +3 -3
  137. package/lib/ProEditTable/components/ActionButton/index.d.ts +1 -1
  138. package/lib/ProEditTable/components/ActionButton/index.js +51 -11
  139. package/lib/ProEditTable/components/RcTable/BaseTable.d.ts +1 -1
  140. package/lib/ProEditTable/components/RcTable/DraggableTable.d.ts +1 -1
  141. package/lib/ProEditTable/components/RcTable/VirtualTable.d.ts +1 -1
  142. package/lib/ProEditTable/components/RenderField/index.d.ts +1 -1
  143. package/lib/ProEditTable/components/RenderField/index.js +27 -18
  144. package/lib/ProEditTable/components/RenderToolbar/index.d.ts +1 -1
  145. package/lib/ProEditTable/components/RenderToolbar/index.js +17 -15
  146. package/lib/ProEditTable/components/Summary/index.d.ts +1 -1
  147. package/lib/ProEditTable/index.js +1 -1
  148. package/lib/ProEditTable/propsType.d.ts +5 -3
  149. package/lib/ProEditTable/utils/config.d.ts +1 -1
  150. package/lib/ProEditTable/utils/config.js +8 -9
  151. package/lib/ProEditTable/utils/diffOriginal.d.ts +1 -1
  152. package/lib/ProEditTable/utils/diffOriginal.js +21 -22
  153. package/lib/ProEditTable/utils/index.js +37 -33
  154. package/lib/ProEditTable/utils/tools.js +4 -4
  155. package/lib/ProEnum/components/Group.d.ts +1 -1
  156. package/lib/ProEnum/components/Tag.d.ts +1 -1
  157. package/lib/ProEnum/hooks/useEnumRequest.js +2 -2
  158. package/lib/ProEnum/index.d.ts +2 -2
  159. package/lib/ProEnum/index.js +1 -1
  160. package/lib/ProEnum/utils/eventCenter.js +2 -1
  161. package/lib/ProEnum/utils/getEnumLabel.d.ts +1 -1
  162. package/lib/ProForm/components/base/Input/index.d.ts +1 -1
  163. package/lib/ProForm/components/combination/FormList/components/ActionButton.js +2 -2
  164. package/lib/ProForm/components/combination/FormList/components/BlockTitle.js +1 -1
  165. package/lib/ProForm/components/combination/FormList/components/ToolbarButton.js +1 -1
  166. package/lib/ProForm/components/combination/FormList/utils.js +1 -1
  167. package/lib/ProForm/components/combination/Group/component/ComRender.js +1 -1
  168. package/lib/ProForm/components/combination/Group/index.js +7 -2
  169. package/lib/ProForm/components/combination/Group/propsType.d.ts +1 -0
  170. package/lib/ProForm/components/combination/Group/utils.d.ts +6 -1
  171. package/lib/ProForm/components/combination/Group/utils.js +28 -6
  172. package/lib/ProForm/components/combination/ProCascader/index.d.ts +1 -1
  173. package/lib/ProForm/components/combination/ProCascader/index.js +8 -8
  174. package/lib/ProForm/components/combination/ProModalSelect/hooks/useRequestList.js +1 -1
  175. package/lib/ProForm/components/combination/ProModalSelect/index.js +5 -5
  176. package/lib/ProForm/components/old/InputRange/index.d.ts +1 -1
  177. package/lib/ProForm/components/old/InputWithSuffix/index.d.ts +1 -1
  178. package/lib/ProForm/components/old/ProAddress/index.d.ts +2 -1
  179. package/lib/ProForm/components/old/ProAddress/index.js +1 -1
  180. package/lib/ProForm/components/old/ProRangeBox/index.d.ts +2 -1
  181. package/lib/ProForm/components/render/ConfirmWrapper.js +1 -1
  182. package/lib/ProForm/components/render/Render.js +25 -13
  183. package/lib/ProForm/components/render/RenderFields.d.ts +1 -0
  184. package/lib/ProForm/components/render/RenderFields.js +8 -4
  185. package/lib/ProForm/components/render/propsType.d.ts +3 -1
  186. package/lib/ProForm/index.js +6 -3
  187. package/lib/ProForm/propsType.d.ts +3 -0
  188. package/lib/ProForm/utils/diffOriginal.js +9 -2
  189. package/lib/ProForm/utils/index.js +10 -10
  190. package/lib/ProForm/utils/useForm.js +1 -1
  191. package/lib/ProForm/utils/useShouldUpdate.js +25 -5
  192. package/lib/ProForm/utils/valueType.d.ts +8 -0
  193. package/lib/ProForm/utils/valueType.js +99 -34
  194. package/lib/ProIcon/utils/index.js +3 -3
  195. package/lib/ProLayout/components/Layout/Menu/OpenMenu/index.d.ts +1 -1
  196. package/lib/ProLayout/components/Layout/Menu/OpenMenu/index.js +3 -3
  197. package/lib/ProLayout/components/ProCollapse/index.d.ts +1 -1
  198. package/lib/ProLayout/components/ProFooter/index.d.ts +1 -1
  199. package/lib/ProLayout/components/ProHeader/components/Copy/index.d.ts +1 -1
  200. package/lib/ProLayout/components/ProHeader/index.d.ts +1 -1
  201. package/lib/ProLayout/components/ProHeader/style/index.less +0 -8
  202. package/lib/ProLayout/index.d.ts +4 -4
  203. package/lib/ProLayout/utils/index.js +9 -9
  204. package/lib/ProSelect/components/AdaptiveTooltip.d.ts +1 -1
  205. package/lib/ProSelect/index.d.ts +1 -1
  206. package/lib/ProStep/components/Anchor/index.d.ts +1 -1
  207. package/lib/ProStep/components/Item/index.d.ts +1 -1
  208. package/lib/ProStep/components/Listener/index.js +1 -1
  209. package/lib/ProStep/components/Step/index.d.ts +1 -1
  210. package/lib/ProStep/index.d.ts +2 -2
  211. package/lib/ProStep/index.js +12 -11
  212. package/lib/ProTable/components/FormatColumn/index.js +34 -5
  213. package/lib/ProTable/components/RcTable/components/BaseTable/index.d.ts +1 -1
  214. package/lib/ProTable/components/RcTable/components/DraggableTable/components/DndWrapper/index.js +2 -2
  215. package/lib/ProTable/components/RcTable/components/DraggableTable/components/DndWrapper/utils/index.js +8 -8
  216. package/lib/ProTable/components/RcTable/components/DraggableTable/index.d.ts +1 -1
  217. package/lib/ProTable/components/RenderColumn/index.d.ts +2 -0
  218. package/lib/ProTable/components/RenderColumn/index.js +10 -2
  219. package/lib/ProTable/components/RenderFooter/index.d.ts +1 -1
  220. package/lib/ProTable/components/RenderTableHeader/index.d.ts +1 -1
  221. package/lib/ProTable/components/TableResizable/index.d.ts +1 -1
  222. package/lib/ProTable/hooks/useAntdTable.js +6 -5
  223. package/lib/ProTable/index.d.ts +1 -1
  224. package/lib/ProTable/index.js +8 -5
  225. package/lib/ProTable/propsType.d.ts +2 -0
  226. package/lib/ProTable/style/index.less +7 -0
  227. package/lib/ProTable/utils/index.d.ts +4 -0
  228. package/lib/ProTable/utils/index.js +17 -1
  229. package/lib/ProTabs/components/Card/index.d.ts +1 -1
  230. package/lib/ProThemeTools/component/ProTools/index.d.ts +1 -1
  231. package/lib/ProThemeTools/index.d.ts +1 -1
  232. package/lib/ProTooltip/index.d.ts +1 -1
  233. package/lib/ProTree/components/AdaptiveTooltip.d.ts +1 -1
  234. package/lib/ProTree/components/CloseIcon.d.ts +2 -1
  235. package/lib/ProTree/components/List.d.ts +1 -1
  236. package/lib/ProTree/components/ProTree.d.ts +1 -1
  237. package/lib/ProTree/components/ProTree.js +1 -1
  238. package/lib/ProTree/components/ProTreeSelect/index.d.ts +1 -1
  239. package/lib/ProTree/components/ProTreeSelect/index.js +22 -22
  240. package/lib/ProTree/components/SearchTitle.d.ts +1 -1
  241. package/lib/ProTree/components/Tree.d.ts +1 -1
  242. package/lib/ProTree/components/Tree.js +4 -4
  243. package/lib/ProTree/index.d.ts +1 -1
  244. package/lib/ProTree/utils.js +11 -11
  245. package/lib/ProTreeModal/components/Cascader.d.ts +1 -1
  246. package/lib/ProTreeModal/components/CloseIcon.d.ts +2 -1
  247. package/lib/ProTreeModal/components/SearchTitle.d.ts +1 -1
  248. package/lib/ProTreeModal/components/Tree.js +6 -6
  249. package/lib/ProTreeModal/components/Trigger.d.ts +1 -1
  250. package/lib/ProTreeModal/index.d.ts +1 -1
  251. package/lib/ProTreeModal/index.js +3 -3
  252. package/lib/ProTreeModal/utils.js +13 -13
  253. package/lib/ProUpload/components/DraggableUploadListItem.d.ts +1 -1
  254. package/lib/ProUpload/components/ImageRender.js +1 -1
  255. package/lib/ProViewer/index.js +2 -2
  256. package/lib/old/ProEditableTable/index.js +4 -4
  257. package/package.json +1 -1
  258. package/.vscode/extensions.json +0 -5
@@ -78,6 +78,7 @@ export var formatColumn = function formatColumn(_ref2) {
78
78
  minWidth = column.minWidth,
79
79
  onDiff = column.onDiff,
80
80
  otherProps = _objectWithoutProperties(column, _excluded);
81
+ otherProps.scroll = scroll;
81
82
  // 仅在 {x: 'max-content', y: 300 } 且 column无指定 width minWidth 情况下 才开启 minWidth的自动计算
82
83
  var isMaxContentOverFlow = isObject(scroll) ? (scroll === null || scroll === void 0 ? void 0 : scroll.x) === 'max-content' && Reflect.ownKeys(scroll).includes('y') : false;
83
84
  calcMinWidth({
@@ -139,8 +140,29 @@ export var formatColumn = function formatColumn(_ref2) {
139
140
  index: index
140
141
  });
141
142
  // viewRender 返回值为 false 时,不显示对比
142
- if (isBoolean(diffResult) && !diffResult) {
143
- otherProps.isChanged = false;
143
+ if (isBoolean(diffResult)) {
144
+ if (!diffResult) {
145
+ otherProps.isChanged = false;
146
+ _isAddCell = false;
147
+ } else {
148
+ otherProps.isChanged = true;
149
+ _isAddCell = false;
150
+ }
151
+ }
152
+ // 指定返回相同了
153
+ if (typeof diffResult === 'string') {
154
+ if (diffResult === 'changed') {
155
+ _isAddCell = false;
156
+ otherProps.isChanged = true;
157
+ }
158
+ if (diffResult === 'same') {
159
+ _isAddCell = false;
160
+ otherProps.isChanged = false;
161
+ }
162
+ if (diffResult === 'add') {
163
+ _isAddCell = true;
164
+ otherProps.isChanged = false;
165
+ }
144
166
  }
145
167
  originalValue = diffResult;
146
168
  }
@@ -155,9 +177,11 @@ export var formatColumn = function formatColumn(_ref2) {
155
177
  index: index
156
178
  });
157
179
  if (_diffResult === 'changed') {
180
+ _isAddCell = false;
158
181
  otherProps.isChanged = true;
159
182
  }
160
183
  if (_diffResult === 'same') {
184
+ _isAddCell = false;
161
185
  otherProps.isChanged = false;
162
186
  }
163
187
  if (_diffResult === 'add') {
@@ -317,6 +341,11 @@ export var formatColumn = function formatColumn(_ref2) {
317
341
  if (!originalValue) {
318
342
  originalRenderValue = '-';
319
343
  }
344
+ if (originalObj && renderValue !== originalRenderValue) {
345
+ otherProps.isChanged = true;
346
+ } else {
347
+ otherProps.isChanged = false;
348
+ }
320
349
  var node = _jsxs(_Space, {
321
350
  size: 8,
322
351
  children: [prefixNode(value, record, index), renderValue, suffixNode(value, record, index)]
@@ -588,14 +617,14 @@ export var getParentElement = function getParentElement(element, name) {
588
617
  if (!element || !name) {
589
618
  return result;
590
619
  }
591
- var _searchDom = function searchDom(element, name) {
620
+ var searchDom = function searchDom(element, name) {
592
621
  var type = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'className';
593
622
  if (element.parentElement[type] === name) {
594
623
  result = element.parentElement;
595
624
  return false;
596
625
  }
597
- _searchDom(element.parentElement, name, type = 'className');
626
+ searchDom(element.parentElement, name, type = 'className');
598
627
  };
599
- _searchDom(element, name, type = 'className');
628
+ searchDom(element, name, type = 'className');
600
629
  return result;
601
630
  };
@@ -7,5 +7,5 @@ declare const _default: import("react").MemoExoticComponent<({ dataSource, table
7
7
  draggableProps: any;
8
8
  summaryProps: any;
9
9
  emptyTextProps: any;
10
- }) => import("react/jsx-runtime").JSX.Element>;
10
+ }) => JSX.Element>;
11
11
  export default _default;
@@ -74,7 +74,7 @@ var DndWrapper = function DndWrapper(_ref2) {
74
74
  onDragStartGuard = _ref2.onDragStartGuard,
75
75
  onDragEndGuard = _ref2.onDragEndGuard;
76
76
  var onDragStart = /*#__PURE__*/function () {
77
- var _ref4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref3) {
77
+ var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref3) {
78
78
  var active, _transformedValue, activeObject;
79
79
  return _regeneratorRuntime().wrap(function _callee$(_context) {
80
80
  while (1) switch (_context.prev = _context.next) {
@@ -105,7 +105,7 @@ var DndWrapper = function DndWrapper(_ref2) {
105
105
  };
106
106
  }();
107
107
  var onDragEnd = /*#__PURE__*/function () {
108
- var _ref6 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref5) {
108
+ var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref5) {
109
109
  var active, over, transformedValue, activeObject, overObject, activeLevel, activeParentId, overLevel, overParentId, nextDataSource, _nextDataSource, _flatTree, activeIndex, overIndex, nextValue;
110
110
  return _regeneratorRuntime().wrap(function _callee2$(_context2) {
111
111
  while (1) switch (_context2.prev = _context2.next) {
@@ -9,7 +9,7 @@ export var getRowKey = function getRowKey(rowKey, record) {
9
9
  }
10
10
  return key;
11
11
  };
12
- var _addLevelAndParentId = function addLevelAndParentId(tree, rowKey) {
12
+ export var addLevelAndParentId = function addLevelAndParentId(tree, rowKey) {
13
13
  var currentLevel = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
14
14
  var currentParentId = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : null;
15
15
  return tree.map(function (node) {
@@ -18,12 +18,11 @@ var _addLevelAndParentId = function addLevelAndParentId(tree, rowKey) {
18
18
  newNode.parentId = currentParentId;
19
19
  newNode.rowKey = getRowKey(rowKey, node);
20
20
  if (node.children) {
21
- newNode.children = _addLevelAndParentId(node.children, rowKey, currentLevel + 1, newNode.rowKey);
21
+ newNode.children = addLevelAndParentId(node.children, rowKey, currentLevel + 1, newNode.rowKey);
22
22
  }
23
23
  return newNode;
24
24
  });
25
25
  };
26
- export { _addLevelAndParentId as addLevelAndParentId };
27
26
  export function getFinalChildrenKey(tree, meta, options) {
28
27
  if (typeof options.getChildrenKey === 'function') {
29
28
  var dynamicChildrenKey = options.getChildrenKey(tree, meta);
@@ -34,7 +33,7 @@ export function getFinalChildrenKey(tree, meta, options) {
34
33
  return options.childrenKey;
35
34
  }
36
35
  // 前置深度优先遍历
37
- var _treeNodePreImpl = function treeNodePreImpl(treeItem, callback, options) {
36
+ var treeNodePreImpl = function treeNodePreImpl(treeItem, callback, options) {
38
37
  var callbackResult = callback(treeItem, options);
39
38
  if (callbackResult) {
40
39
  return treeItem;
@@ -46,7 +45,7 @@ var _treeNodePreImpl = function treeNodePreImpl(treeItem, callback, options) {
46
45
  }
47
46
  for (var i = 0, count = children.length; i < count; i++) {
48
47
  var childItem = children[i];
49
- var findOne = _treeNodePreImpl(childItem, callback, _objectSpread(_objectSpread({}, options), {}, {
48
+ var findOne = treeNodePreImpl(childItem, callback, _objectSpread(_objectSpread({}, options), {}, {
50
49
  parents: [].concat(_toConsumableArray(options.parents), [treeItem]),
51
50
  depth: options.depth + 1
52
51
  }));
@@ -57,7 +56,7 @@ var _treeNodePreImpl = function treeNodePreImpl(treeItem, callback, options) {
57
56
  return undefined;
58
57
  };
59
58
  var treeNodeStrategies = {
60
- pre: _treeNodePreImpl
59
+ pre: treeNodePreImpl
61
60
  };
62
61
  export function treeNodeFind(tree, callback, options) {
63
62
  var _options$childrenKey, _options$strategy;
@@ -122,7 +121,7 @@ export function createTreeFromArray(array, options) {
122
121
  return result;
123
122
  }
124
123
  // 前置遍历
125
- var _treeForEachPreImpl = function treeForEachPreImpl(treeItem, callback, options) {
124
+ var treeForEachPreImpl = function treeForEachPreImpl(treeItem, callback, options) {
126
125
  callback(treeItem, options);
127
126
  var finalChildrenKey = getFinalChildrenKey(treeItem, options, options);
128
127
  var children = treeItem === null || treeItem === void 0 ? void 0 : treeItem[finalChildrenKey];
@@ -132,12 +131,12 @@ var _treeForEachPreImpl = function treeForEachPreImpl(treeItem, callback, option
132
131
  depth: options.depth + 1
133
132
  });
134
133
  children.forEach(function (childItem) {
135
- _treeForEachPreImpl(childItem, callback, nextLevelOptions);
134
+ treeForEachPreImpl(childItem, callback, nextLevelOptions);
136
135
  });
137
136
  }
138
137
  };
139
138
  var treeForEachStrategies = {
140
- pre: _treeForEachPreImpl
139
+ pre: treeForEachPreImpl
141
140
  };
142
141
  export function treeForEach(tree, callback, options) {
143
142
  var _options$childrenKey2, _options$strategy2;
@@ -7,5 +7,5 @@ declare const _default: import("react").MemoExoticComponent<({ dataSource, table
7
7
  draggableProps: any;
8
8
  summaryProps: any;
9
9
  emptyTextProps: any;
10
- }) => import("react/jsx-runtime").JSX.Element>;
10
+ }) => JSX.Element>;
11
11
  export default _default;
@@ -15,6 +15,8 @@ interface Props {
15
15
  isChanged?: boolean;
16
16
  /** 新增单元格字段 */
17
17
  isAddCell?: boolean;
18
+ /** 表格透传下来的scroll配置 */
19
+ scroll?: any;
18
20
  }
19
21
  declare const RenderColumn: FC<Props>;
20
22
  export default RenderColumn;
@@ -29,7 +29,8 @@ var RenderColumn = function RenderColumn(props) {
29
29
  _props$toolTipProps = props.toolTipProps,
30
30
  toolTipProps = _props$toolTipProps === void 0 ? {} : _props$toolTipProps,
31
31
  minWidth = props.minWidth,
32
- isInNewRowFlag = props.isInNewRowFlag;
32
+ isInNewRowFlag = props.isInNewRowFlag,
33
+ scroll = props.scroll;
33
34
  var _useSetState = useSetState({
34
35
  tooltip: false
35
36
  }),
@@ -43,8 +44,9 @@ var RenderColumn = function RenderColumn(props) {
43
44
  // 比对场景走的逻辑
44
45
  if (!isInNewRowFlag && isBoolean(props === null || props === void 0 ? void 0 : props.isChanged)) {
45
46
  var renderNode = value ? node : '-';
47
+ var isXMaxContent = (scroll === null || scroll === void 0 ? void 0 : scroll.x) === 'max-content';
46
48
  if (ellipsis || (props === null || props === void 0 ? void 0 : props.isChanged)) {
47
- renderNode = _jsx(Text, {
49
+ renderNode = !isXMaxContent ? _jsx(Text, {
48
50
  style: {
49
51
  width: currentValue === '-' ? 32.5 : width,
50
52
  minWidth: minWidth
@@ -53,6 +55,12 @@ var RenderColumn = function RenderColumn(props) {
53
55
  tooltip: false
54
56
  },
55
57
  children: ellipsis ? currentValue : renderNode
58
+ }) : _jsx("div", {
59
+ style: {
60
+ minWidth: minWidth,
61
+ width: width
62
+ },
63
+ children: ellipsis ? currentValue : renderNode
56
64
  });
57
65
  if ((props === null || props === void 0 ? void 0 : props.isChanged) === false) {
58
66
  return renderNode;
@@ -1,2 +1,2 @@
1
- declare const RenderFooter: (props: any) => import("react/jsx-runtime").JSX.Element;
1
+ declare const RenderFooter: (props: any) => JSX.Element;
2
2
  export default RenderFooter;
@@ -1,2 +1,2 @@
1
- declare const RenderTableHeader: (props: any) => import("react/jsx-runtime").JSX.Element;
1
+ declare const RenderTableHeader: (props: any) => JSX.Element;
2
2
  export default RenderTableHeader;
@@ -6,7 +6,7 @@ declare const _default: {
6
6
  onDrag: any;
7
7
  width: number;
8
8
  minwidth?: number;
9
- }) => import("react/jsx-runtime").JSX.Element;
9
+ }) => JSX.Element;
10
10
  };
11
11
  };
12
12
  };
@@ -11,7 +11,7 @@ import { useCallback, useMemo, useState } from 'react';
11
11
  import { useRequest, useSetState, useDeepCompareEffect } from 'ahooks';
12
12
  import { pickBy, isObject, merge, set, isEqual } from 'lodash';
13
13
  import { defaultPage } from '../index';
14
- import { isListResult } from '../utils';
14
+ import { isListResult, removeEmptyKeys } from '../utils';
15
15
  import locale, { formatMessage } from '../../locale';
16
16
  var useDefaultOptions = function useDefaultOptions(options) {
17
17
  var _useState = useState((options === null || options === void 0 ? void 0 : options.page) || defaultPage),
@@ -219,16 +219,17 @@ function useAntdTable(service, options, useRequestOptions) {
219
219
  pageNum: 1,
220
220
  pageSize: page.pageSize
221
221
  };
222
+ var _values = removeEmptyKeys(values);
222
223
  onPageChange(newPage);
223
224
  setState({
224
- searchValues: values,
225
+ searchValues: _values,
225
226
  allSelected: false,
226
227
  selectedRecords: [],
227
228
  selectedRowKeys: []
228
229
  });
229
230
  run(getTransformParams(_objectSpread(_objectSpread({
230
231
  page: newPage
231
- }, extraFilter), values)));
232
+ }, extraFilter), _values)));
232
233
  }, [extraFilter, page.pageSize, run, getTransformParams]);
233
234
  var resetParams = useCallback(function () {
234
235
  var page = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : initPage;
@@ -276,7 +277,7 @@ function useAntdTable(service, options, useRequestOptions) {
276
277
  }
277
278
  };
278
279
  var handleRefresh = /*#__PURE__*/function () {
279
- var _ref4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
280
+ var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
280
281
  var res;
281
282
  return _regeneratorRuntime().wrap(function _callee$(_context) {
282
283
  while (1) switch (_context.prev = _context.next) {
@@ -388,7 +389,7 @@ function useAntdTable(service, options, useRequestOptions) {
388
389
  total: total
389
390
  }),
390
391
  onSelect: function () {
391
- var _onSelect = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(changeableRowKeys) {
392
+ var _onSelect = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(changeableRowKeys) {
392
393
  return _regeneratorRuntime().wrap(function _callee2$(_context2) {
393
394
  while (1) switch (_context2.prev = _context2.next) {
394
395
  case 0:
@@ -412,7 +413,7 @@ function useAntdTable(service, options, useRequestOptions) {
412
413
  key: 'uncheckAll',
413
414
  text: locale === null || locale === void 0 ? void 0 : (_locale$ProTable4 = locale.ProTable) === null || _locale$ProTable4 === void 0 ? void 0 : _locale$ProTable4.deselect,
414
415
  onSelect: function () {
415
- var _onSelect2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
416
+ var _onSelect2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
416
417
  return _regeneratorRuntime().wrap(function _callee3$(_context3) {
417
418
  while (1) switch (_context3.prev = _context3.next) {
418
419
  case 0:
@@ -7,7 +7,7 @@ export declare const defaultPage: {
7
7
  pageSize: number;
8
8
  };
9
9
  declare const ProTable: {
10
- (props: ProTableProps): import("react/jsx-runtime").JSX.Element;
10
+ (props: ProTableProps): JSX.Element;
11
11
  defaultProps: {
12
12
  quickConfig: boolean;
13
13
  stripe: boolean;
@@ -187,7 +187,7 @@ var ProTable = function ProTable(props) {
187
187
  return 'new-cell';
188
188
  }
189
189
  };
190
- var _formatColumns = function formatColumns(nextColumns) {
190
+ var formatColumns = function formatColumns(nextColumns) {
191
191
  nextColumns === null || nextColumns === void 0 ? void 0 : nextColumns.forEach(function (item, index) {
192
192
  formatColumn({
193
193
  column: item,
@@ -202,7 +202,7 @@ var ProTable = function ProTable(props) {
202
202
  isInNewRow: _rowClassName
203
203
  });
204
204
  if (item.children && Array.isArray(item.children)) {
205
- _formatColumns(item.children);
205
+ formatColumns(item.children);
206
206
  }
207
207
  });
208
208
  return nextColumns;
@@ -228,7 +228,7 @@ var ProTable = function ProTable(props) {
228
228
  }).filter(function (item) {
229
229
  return !(item === null || item === void 0 ? void 0 : item.delete);
230
230
  });
231
- var nextColumns = _formatColumns(newColumns);
231
+ var nextColumns = formatColumns(newColumns);
232
232
  return nextColumns;
233
233
  }, [curColumns, handleResize, _scroll, originalDataSource, originalObj, _rowClassName]);
234
234
  var _columns = useMemo(function () {
@@ -250,8 +250,11 @@ var ProTable = function ProTable(props) {
250
250
  if (isExistPercentWidth) {
251
251
  _scroll = props === null || props === void 0 ? void 0 : props.scroll;
252
252
  }
253
+ if (props.expandable) {
254
+ _scroll = {};
255
+ }
253
256
  var handleColumnConfig = /*#__PURE__*/function () {
254
- var _ref6 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(checkList) {
257
+ var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(checkList) {
255
258
  var newColumns, _columnConfig$onColum, catchColumns;
256
259
  return _regeneratorRuntime().wrap(function _callee$(_context) {
257
260
  while (1) switch (_context.prev = _context.next) {
@@ -360,7 +363,7 @@ var ProTable = function ProTable(props) {
360
363
  return _rowSelection;
361
364
  };
362
365
  var onDataSourceChange = /*#__PURE__*/function () {
363
- var _ref7 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(nextDataSource) {
366
+ var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(nextDataSource) {
364
367
  return _regeneratorRuntime().wrap(function _callee2$(_context2) {
365
368
  while (1) switch (_context2.prev = _context2.next) {
366
369
  case 0:
@@ -46,6 +46,8 @@ export interface ProTableColumn extends Omit<ColumnType<any>, 'dataIndex'> {
46
46
  viewRender?: ({ value, record, index, originalValue, originalRecord, }: any) => 'same' | 'changed' | 'add' | undefined;
47
47
  isChanged?: boolean | null;
48
48
  children?: ProTableColumn[];
49
+ /** table透传下来的scroll配置 */
50
+ scroll?: any;
49
51
  }
50
52
  export interface CreateTreeFromArrayOptions {
51
53
  itemKey?: string;
@@ -40,6 +40,13 @@
40
40
  .pro-form-view-container_nowrap {
41
41
  white-space: normal;
42
42
  }
43
+ &.@{ant-prefix}-table-row-expand-icon-cell {
44
+ >button.@{ant-prefix}-table-row-expand-icon{
45
+ left: 50%;
46
+ top: 50%;
47
+ transform: translate(-50%, -50%);
48
+ }
49
+ }
43
50
  }
44
51
 
45
52
  .@{ant-prefix}-table-thead
@@ -29,3 +29,7 @@ export declare const isListResult: (data: {
29
29
  [key: string]: any;
30
30
  }) => boolean;
31
31
  export declare const getRowKey: (rowKey: any, record: any) => any;
32
+ /** 移除对象中的 null , undefined, '' 的key */
33
+ export declare const removeEmptyKeys: (obj: any) => {
34
+ [k: string]: unknown;
35
+ };
@@ -1,3 +1,4 @@
1
+ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
1
2
  import { get, isEqual } from 'lodash';
2
3
  import { validate } from '@zat-design/utils';
3
4
  var isEmpty = validate.isEmpty;
@@ -70,4 +71,18 @@ export var getRowKey = function getRowKey(rowKey, record) {
70
71
  key = (_ref = typeof rowKey === 'function' ? rowKey(record) : record[rowKey]) !== null && _ref !== void 0 ? _ref : key;
71
72
  }
72
73
  return key;
74
+ };
75
+ /** 移除对象中的 null , undefined, '' 的key */
76
+ export var removeEmptyKeys = function removeEmptyKeys(obj) {
77
+ // 使用 Object.entries() 将对象转换为键值对数组
78
+ var entries = Object.entries(obj);
79
+ // 过滤掉值为 null, undefined, 或 '' 的键值对
80
+ var filteredEntries = entries.filter(function (_ref2) {
81
+ var _ref3 = _slicedToArray(_ref2, 2),
82
+ key = _ref3[0],
83
+ value = _ref3[1];
84
+ return !isEmpty(value);
85
+ });
86
+ // 使用 Object.fromEntries() 将过滤后的键值对数组转换回对象
87
+ return Object.fromEntries(filteredEntries);
73
88
  };
@@ -1,3 +1,3 @@
1
1
  import { CardProps } from '../../propType';
2
- declare const Card: (props: CardProps) => import("react/jsx-runtime").JSX.Element;
2
+ declare const Card: (props: CardProps) => JSX.Element;
3
3
  export default Card;
@@ -1,3 +1,3 @@
1
1
  import type { DevToolsPropsType } from '../../propsType';
2
- declare const ProTools: ({ onReset, onClose, setState, open, state, tableBorder, tableStripe, }: DevToolsPropsType) => import("react/jsx-runtime").JSX.Element;
2
+ declare const ProTools: ({ onReset, onClose, setState, open, state, tableBorder, tableStripe, }: DevToolsPropsType) => JSX.Element;
3
3
  export default ProTools;
@@ -1,6 +1,6 @@
1
1
  import type { ProThemeToolsProps } from './propsType';
2
2
  declare const ProThemeTools: {
3
- ({ size, className, cacheTime, color, mode, iconFollowTheme, prefixCls, tableBorder, tableStripe, theme, onChange, ...props }: ProThemeToolsProps): import("react/jsx-runtime").JSX.Element;
3
+ ({ size, className, cacheTime, color, mode, iconFollowTheme, prefixCls, tableBorder, tableStripe, theme, onChange, ...props }: ProThemeToolsProps): JSX.Element;
4
4
  defaultProps: {
5
5
  size: number;
6
6
  mode: string;
@@ -1,4 +1,4 @@
1
1
  import { ProTooltipPropsType } from './propsType';
2
2
  import './style/index.less';
3
- declare const ProTooltip: (props: ProTooltipPropsType) => import("react/jsx-runtime").JSX.Element;
3
+ declare const ProTooltip: (props: ProTooltipPropsType) => JSX.Element;
4
4
  export default ProTooltip;
@@ -1,4 +1,4 @@
1
1
  declare const AdaptiveTooltip: ({ children }: {
2
2
  children: any;
3
- }) => import("react/jsx-runtime").JSX.Element;
3
+ }) => JSX.Element;
4
4
  export default AdaptiveTooltip;
@@ -1,2 +1,3 @@
1
- declare function CloseIcon(props: any): import("react/jsx-runtime").JSX.Element;
1
+ /// <reference types="react" />
2
+ declare function CloseIcon(props: any): JSX.Element;
2
3
  export default CloseIcon;
@@ -12,6 +12,6 @@ interface ListProps {
12
12
  handleFilterClose?: (code: string) => void;
13
13
  optionRender?: (item: any, searchStr?: string) => string | ReactNode;
14
14
  }
15
- declare function List(props: ListProps): import("react/jsx-runtime").JSX.Element;
15
+ declare function List(props: ListProps): JSX.Element;
16
16
  declare const _default: import("react").MemoExoticComponent<typeof List>;
17
17
  export default _default;
@@ -1,4 +1,4 @@
1
1
  import { ProTreeProps } from '../propsType';
2
2
  import '../style/index.less';
3
- declare const ProTree: (props: ProTreeProps) => import("react/jsx-runtime").JSX.Element;
3
+ declare const ProTree: (props: ProTreeProps) => JSX.Element;
4
4
  export default ProTree;
@@ -359,7 +359,7 @@ var ProTree = function ProTree(props) {
359
359
  };
360
360
  /** 点击了树节点开始loading,改变自身state并将值通过onchange上传到form */
361
361
  var onSelectTreeNode = /*#__PURE__*/function () {
362
- var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(props, info) {
362
+ var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(props, info) {
363
363
  var _options$;
364
364
  var values, options, option;
365
365
  return _regeneratorRuntime().wrap(function _callee$(_context) {
@@ -1,5 +1,5 @@
1
1
  import React from 'react';
2
2
  import { PropTreeSelectProps } from './propsType';
3
- export declare const ProTreeSelect: (props: PropTreeSelectProps, ref: React.Ref<unknown> | undefined) => import("react/jsx-runtime").JSX.Element;
3
+ export declare const ProTreeSelect: (props: PropTreeSelectProps, ref: React.Ref<unknown> | undefined) => JSX.Element;
4
4
  declare const _default: React.ForwardRefExoticComponent<PropTreeSelectProps & React.RefAttributes<unknown>>;
5
5
  export default _default;