@zat-design/sisyphus-react 3.8.0-beat.14 → 3.8.0-beat.15

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 (9) hide show
  1. package/es/ProTable/components/FormatColumn/index.d.ts +2 -1
  2. package/es/ProTable/components/FormatColumn/index.js +12 -9
  3. package/es/ProTable/index.js +11 -1
  4. package/es/ProTable/propsType.d.ts +4 -0
  5. package/lib/ProTable/components/FormatColumn/index.d.ts +2 -1
  6. package/lib/ProTable/components/FormatColumn/index.js +12 -9
  7. package/lib/ProTable/index.js +11 -1
  8. package/lib/ProTable/propsType.d.ts +4 -0
  9. package/package.json +1 -1
package/es/ProTable/components/FormatColumn/index.d.ts CHANGED
@@ -1,11 +1,12 @@
1
1
  import React from 'react';
2
2
  import { ProTableColumn } from '../../propsType';
3
- export declare const formatColumn: ({ column, originalObj, dataSourceObj, rowKey, diffToolTip, }: {
3
+ export declare const formatColumn: ({ column, originalObj, dataSourceObj, rowKey, diffToolTip, wrapToolTipProps, }: {
4
4
  column: ProTableColumn;
5
5
  originalObj: any;
6
6
  dataSourceObj: any;
7
7
  rowKey: any;
8
8
  diffToolTip?: boolean;
9
+ wrapToolTipProps?: any;
9
10
  }) => void;
10
11
  /**
11
12
  * 查找最近的父级className
package/es/ProTable/components/FormatColumn/index.js CHANGED
@@ -1,5 +1,6 @@
1
1
  import "antd/es/space/style";
2
2
  import _Space from "antd/es/space";
3
+ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
3
4
  import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
4
5
  import { isValidElement } from 'react';
5
6
  import moment from 'moment';
@@ -16,7 +17,8 @@ export var formatColumn = function formatColumn(_ref) {
16
17
  originalObj = _ref.originalObj,
17
18
  dataSourceObj = _ref.dataSourceObj,
18
19
  rowKey = _ref.rowKey,
19
- diffToolTip = _ref.diffToolTip;
20
+ diffToolTip = _ref.diffToolTip,
21
+ wrapToolTipProps = _ref.wrapToolTipProps;
20
22
  var title = column.title,
21
23
  valueType = column.valueType,
22
24
  _column$format = column.format,
@@ -36,6 +38,7 @@ export var formatColumn = function formatColumn(_ref) {
36
38
  originalDiffTip = _column$originalDiffT === void 0 ? true : _column$originalDiffT,
37
39
  _column$toolTipProps = column.toolTipProps,
38
40
  toolTipProps = _column$toolTipProps === void 0 ? {} : _column$toolTipProps;
41
+ var _toolTipProps = _objectSpread(_objectSpread({}, toolTipProps), wrapToolTipProps);
39
42
  var _originalDiffTip = diffToolTip !== null && diffToolTip !== void 0 ? diffToolTip : originalDiffTip;
40
43
  // 前缀处理
41
44
  var prefixNode = function prefixNode(value, record, index) {
@@ -105,7 +108,7 @@ export var formatColumn = function formatColumn(_ref) {
105
108
  value: value,
106
109
  currentValue: renderValue,
107
110
  originalDiffTip: _originalDiffTip,
108
- toolTipProps: toolTipProps
111
+ toolTipProps: _toolTipProps
109
112
  });
110
113
  };
111
114
  // 千分位, 千分位带CNY前缀
@@ -135,7 +138,7 @@ export var formatColumn = function formatColumn(_ref) {
135
138
  value: value,
136
139
  currentValue: renderValue,
137
140
  originalDiffTip: _originalDiffTip,
138
- toolTipProps: toolTipProps
141
+ toolTipProps: _toolTipProps
139
142
  });
140
143
  };
141
144
  } else if (['datePicker', 'date', 'dateTime', 'dateStartTime', 'dateEndTime', 'dateStartEndTime'].includes(valueType)) {
@@ -188,7 +191,7 @@ export var formatColumn = function formatColumn(_ref) {
188
191
  value: value,
189
192
  currentValue: renderValue,
190
193
  originalDiffTip: _originalDiffTip,
191
- toolTipProps: toolTipProps
194
+ toolTipProps: _toolTipProps
192
195
  });
193
196
  };
194
197
  } else if (['enumName', 'enumCodeName'].includes(valueType)) {
@@ -226,7 +229,7 @@ export var formatColumn = function formatColumn(_ref) {
226
229
  value: value,
227
230
  currentValue: renderValue,
228
231
  originalDiffTip: _originalDiffTip,
229
- toolTipProps: toolTipProps
232
+ toolTipProps: _toolTipProps
230
233
  });
231
234
  };
232
235
  } else if (precision || prefix || suffix) {
@@ -253,7 +256,7 @@ export var formatColumn = function formatColumn(_ref) {
253
256
  value: value,
254
257
  currentValue: renderValue,
255
258
  originalDiffTip: _originalDiffTip,
256
- toolTipProps: toolTipProps
259
+ toolTipProps: _toolTipProps
257
260
  });
258
261
  };
259
262
  } else if (valueType === 'address') {
@@ -309,7 +312,7 @@ export var formatColumn = function formatColumn(_ref) {
309
312
  node: value,
310
313
  value: value,
311
314
  currentValue: value,
312
- toolTipProps: toolTipProps
315
+ toolTipProps: _toolTipProps
313
316
  }), suffixNode(value, record, index)]
314
317
  });
315
318
  };
@@ -330,7 +333,7 @@ export var formatColumn = function formatColumn(_ref) {
330
333
  value: value,
331
334
  currentValue: value || '-',
332
335
  originalDiffTip: _originalDiffTip,
333
- toolTipProps: toolTipProps
336
+ toolTipProps: _toolTipProps
334
337
  }), suffixNode(value, record, index)]
335
338
  });
336
339
  };
@@ -353,7 +356,7 @@ export var formatColumn = function formatColumn(_ref) {
353
356
  value: value,
354
357
  currentValue: value || '-',
355
358
  originalDiffTip: _originalDiffTip,
356
- toolTipProps: toolTipProps
359
+ toolTipProps: _toolTipProps
357
360
  });
358
361
  };
359
362
  }
package/es/ProTable/index.js CHANGED
@@ -56,6 +56,15 @@ function ProTable(props) {
56
56
  onDragStartGuard = props.onDragStart,
57
57
  onDragEndGuard = props.onDragEnd,
58
58
  restProps = _objectWithoutProperties(props, _excluded);
59
+ var _props$scrollFollowPa = props.scrollFollowParent,
60
+ scrollFollowParent = _props$scrollFollowPa === void 0 ? true : _props$scrollFollowPa;
61
+ var wrapToolTipProps = {
62
+ getPopupContainer: scrollFollowParent ? function (triggerNode) {
63
+ return triggerNode.parentNode;
64
+ } : function () {
65
+ return document.body;
66
+ }
67
+ };
59
68
  var _ref3 = diffConfig || {},
60
69
  originalDataSource = _ref3.originalDataSource,
61
70
  changeTipColor = _ref3.changeTipColor,
@@ -198,7 +207,8 @@ function ProTable(props) {
198
207
  originalObj: originalObj,
199
208
  dataSourceObj: dataSourceObj,
200
209
  rowKey: 'rowKey',
201
- diffToolTip: toolTip
210
+ diffToolTip: toolTip,
211
+ wrapToolTipProps: wrapToolTipProps
202
212
  });
203
213
  });
204
214
  return newColumns;
package/es/ProTable/propsType.d.ts CHANGED
@@ -103,6 +103,10 @@ export interface ProTableProps<T = any> extends Omit<TableProps<any>, 'summary'
103
103
  */
104
104
  onDragStart?: DragStartGuardProps;
105
105
  onDragEnd?: DragEndGuardProps;
106
+ /**
107
+ * 滚动额外配置
108
+ */
109
+ scrollFollowParent?: boolean;
106
110
  }
107
111
  export type ProTableValueType = 'percentage' | 'permillage' | 'thousandth' | 'datePicker' | 'enumName' | 'enumCodeName' | 'address' | 'thousandthCNY' | 'date' | 'dateTime' | 'dateStartTime' | 'dateEndTime' | 'dateStartEndTime';
108
112
  export interface Response<T = any> {
package/lib/ProTable/components/FormatColumn/index.d.ts CHANGED
@@ -1,11 +1,12 @@
1
1
  import React from 'react';
2
2
  import { ProTableColumn } from '../../propsType';
3
- export declare const formatColumn: ({ column, originalObj, dataSourceObj, rowKey, diffToolTip, }: {
3
+ export declare const formatColumn: ({ column, originalObj, dataSourceObj, rowKey, diffToolTip, wrapToolTipProps, }: {
4
4
  column: ProTableColumn;
5
5
  originalObj: any;
6
6
  dataSourceObj: any;
7
7
  rowKey: any;
8
8
  diffToolTip?: boolean;
9
+ wrapToolTipProps?: any;
9
10
  }) => void;
10
11
  /**
11
12
  * 查找最近的父级className
package/lib/ProTable/components/FormatColumn/index.js CHANGED
@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
5
5
  value: true
6
6
  });
7
7
  exports.getParentElement = exports.formatColumn = void 0;
8
+ var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
8
9
  var _jsxRuntime = require("react/jsx-runtime");
9
10
  var _react = require("react");
10
11
  var _moment15 = _interopRequireDefault(require("moment"));
@@ -22,7 +23,8 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref) {
22
23
  originalObj = _ref.originalObj,
23
24
  dataSourceObj = _ref.dataSourceObj,
24
25
  rowKey = _ref.rowKey,
25
- diffToolTip = _ref.diffToolTip;
26
+ diffToolTip = _ref.diffToolTip,
27
+ wrapToolTipProps = _ref.wrapToolTipProps;
26
28
  var title = column.title,
27
29
  valueType = column.valueType,
28
30
  _column$format = column.format,
@@ -42,6 +44,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref) {
42
44
  originalDiffTip = _column$originalDiffT === void 0 ? true : _column$originalDiffT,
43
45
  _column$toolTipProps = column.toolTipProps,
44
46
  toolTipProps = _column$toolTipProps === void 0 ? {} : _column$toolTipProps;
47
+ var _toolTipProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, toolTipProps), wrapToolTipProps);
45
48
  var _originalDiffTip = diffToolTip !== null && diffToolTip !== void 0 ? diffToolTip : originalDiffTip;
46
49
  // 前缀处理
47
50
  var prefixNode = function prefixNode(value, record, index) {
@@ -111,7 +114,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref) {
111
114
  value: value,
112
115
  currentValue: renderValue,
113
116
  originalDiffTip: _originalDiffTip,
114
- toolTipProps: toolTipProps
117
+ toolTipProps: _toolTipProps
115
118
  });
116
119
  };
117
120
  // 千分位, 千分位带CNY前缀
@@ -141,7 +144,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref) {
141
144
  value: value,
142
145
  currentValue: renderValue,
143
146
  originalDiffTip: _originalDiffTip,
144
- toolTipProps: toolTipProps
147
+ toolTipProps: _toolTipProps
145
148
  });
146
149
  };
147
150
  } else if (['datePicker', 'date', 'dateTime', 'dateStartTime', 'dateEndTime', 'dateStartEndTime'].includes(valueType)) {
@@ -194,7 +197,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref) {
194
197
  value: value,
195
198
  currentValue: renderValue,
196
199
  originalDiffTip: _originalDiffTip,
197
- toolTipProps: toolTipProps
200
+ toolTipProps: _toolTipProps
198
201
  });
199
202
  };
200
203
  } else if (['enumName', 'enumCodeName'].includes(valueType)) {
@@ -232,7 +235,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref) {
232
235
  value: value,
233
236
  currentValue: renderValue,
234
237
  originalDiffTip: _originalDiffTip,
235
- toolTipProps: toolTipProps
238
+ toolTipProps: _toolTipProps
236
239
  });
237
240
  };
238
241
  } else if (precision || prefix || suffix) {
@@ -259,7 +262,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref) {
259
262
  value: value,
260
263
  currentValue: renderValue,
261
264
  originalDiffTip: _originalDiffTip,
262
- toolTipProps: toolTipProps
265
+ toolTipProps: _toolTipProps
263
266
  });
264
267
  };
265
268
  } else if (valueType === 'address') {
@@ -315,7 +318,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref) {
315
318
  node: value,
316
319
  value: value,
317
320
  currentValue: value,
318
- toolTipProps: toolTipProps
321
+ toolTipProps: _toolTipProps
319
322
  }), suffixNode(value, record, index)]
320
323
  });
321
324
  };
@@ -336,7 +339,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref) {
336
339
  value: value,
337
340
  currentValue: value || '-',
338
341
  originalDiffTip: _originalDiffTip,
339
- toolTipProps: toolTipProps
342
+ toolTipProps: _toolTipProps
340
343
  }), suffixNode(value, record, index)]
341
344
  });
342
345
  };
@@ -359,7 +362,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref) {
359
362
  value: value,
360
363
  currentValue: value || '-',
361
364
  originalDiffTip: _originalDiffTip,
362
- toolTipProps: toolTipProps
365
+ toolTipProps: _toolTipProps
363
366
  });
364
367
  };
365
368
  }
package/lib/ProTable/index.js CHANGED
@@ -63,6 +63,15 @@ function ProTable(props) {
63
63
  onDragStartGuard = props.onDragStart,
64
64
  onDragEndGuard = props.onDragEnd,
65
65
  restProps = (0, _objectWithoutProperties2.default)(props, _excluded);
66
+ var _props$scrollFollowPa = props.scrollFollowParent,
67
+ scrollFollowParent = _props$scrollFollowPa === void 0 ? true : _props$scrollFollowPa;
68
+ var wrapToolTipProps = {
69
+ getPopupContainer: scrollFollowParent ? function (triggerNode) {
70
+ return triggerNode.parentNode;
71
+ } : function () {
72
+ return document.body;
73
+ }
74
+ };
66
75
  var _ref3 = diffConfig || {},
67
76
  originalDataSource = _ref3.originalDataSource,
68
77
  changeTipColor = _ref3.changeTipColor,
@@ -205,7 +214,8 @@ function ProTable(props) {
205
214
  originalObj: originalObj,
206
215
  dataSourceObj: dataSourceObj,
207
216
  rowKey: 'rowKey',
208
- diffToolTip: toolTip
217
+ diffToolTip: toolTip,
218
+ wrapToolTipProps: wrapToolTipProps
209
219
  });
210
220
  });
211
221
  return newColumns;
package/lib/ProTable/propsType.d.ts CHANGED
@@ -103,6 +103,10 @@ export interface ProTableProps<T = any> extends Omit<TableProps<any>, 'summary'
103
103
  */
104
104
  onDragStart?: DragStartGuardProps;
105
105
  onDragEnd?: DragEndGuardProps;
106
+ /**
107
+ * 滚动额外配置
108
+ */
109
+ scrollFollowParent?: boolean;
106
110
  }
107
111
  export type ProTableValueType = 'percentage' | 'permillage' | 'thousandth' | 'datePicker' | 'enumName' | 'enumCodeName' | 'address' | 'thousandthCNY' | 'date' | 'dateTime' | 'dateStartTime' | 'dateEndTime' | 'dateStartEndTime';
108
112
  export interface Response<T = any> {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zat-design/sisyphus-react",
3
- "version": "3.8.0-beat.14",
3
+ "version": "3.8.0-beat.15",
4
4
  "license": "Apache-2.0",
5
5
  "main": "lib/index.js",
6
6
  "module": "es/index.js",