linkmore-design 1.0.100 → 1.1.1
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.
- package/dist/Affix/demos/basic.d.ts +1 -0
- package/dist/Alert/demos/basic.d.ts +1 -0
- package/dist/Alert/demos/visible.d.ts +1 -0
- package/dist/Approval/demos/basic.d.ts +1 -0
- package/dist/Avatar/demos/basic.d.ts +1 -0
- package/dist/Badge/SingleNumber.d.ts +1 -0
- package/dist/Badge/demos/basic.d.ts +1 -0
- package/dist/Breadcrumb/demos/basic.d.ts +1 -0
- package/dist/Breadcrumb/demos/basic1.d.ts +1 -0
- package/dist/Button/demos/basic.d.ts +1 -0
- package/dist/Button/demos/disabled.d.ts +1 -0
- package/dist/Button/demos/icon.d.ts +1 -0
- package/dist/Calendar/demos/basic.d.ts +1 -0
- package/dist/Card/demos/basic.d.ts +1 -0
- package/dist/Carousel/demos/basic.d.ts +1 -0
- package/dist/Cascader/demos/basic.d.ts +1 -0
- package/dist/Col/demos/basic.d.ts +1 -0
- package/dist/Collapse/demos/basic.d.ts +1 -0
- package/dist/Comment/demos/basic.d.ts +1 -0
- package/dist/ConfigProvider/demos/componentSize.d.ts +1 -0
- package/dist/CustomTableOption/demos/basic.d.ts +1 -0
- package/dist/DatePicker/PickerButton.d.ts +1 -0
- package/dist/DatePicker/PickerTag.d.ts +1 -0
- package/dist/DatePicker/demos/basic.d.ts +1 -0
- package/dist/Descriptions/demos/basic.d.ts +1 -0
- package/dist/Drawer/demos/basic.d.ts +1 -0
- package/dist/Drawer/demos/button.d.ts +1 -0
- package/dist/Drawer/demos/nested.d.ts +1 -0
- package/dist/Dropdown/demos/basic.d.ts +1 -0
- package/dist/Dropdown/demos/button.d.ts +1 -0
- package/dist/Dropdown/demos/icon.d.ts +1 -0
- package/dist/Dropdown/demos/local.d.ts +1 -0
- package/dist/Dropdown/demos/target.d.ts +1 -0
- package/dist/Empty/demos/basic.d.ts +1 -0
- package/dist/Empty/demos/custom.d.ts +1 -0
- package/dist/Empty/empty.d.ts +1 -0
- package/dist/Empty/simple.d.ts +1 -0
- package/dist/Form/demos/drawer1152-triple.d.ts +1 -0
- package/dist/Form/demos/drawer440-double.d.ts +1 -0
- package/dist/Form/demos/drawer440.d.ts +1 -0
- package/dist/Form/demos/drawer720-double.d.ts +1 -0
- package/dist/Form/demos/error-tip.d.ts +1 -0
- package/dist/Form/demos/formlist.d.ts +1 -0
- package/dist/Form/demos/horizontal.d.ts +1 -0
- package/dist/Form/demos/inline.d.ts +1 -0
- package/dist/Form/demos/modal416.d.ts +1 -0
- package/dist/Form/demos/modal552-double.d.ts +1 -0
- package/dist/Form/demos/responsive.d.ts +1 -0
- package/dist/Form/demos/vertical.d.ts +1 -0
- package/dist/FullScreen/demos/basic.d.ts +1 -0
- package/dist/FullScreen/demos/useInModal.d.ts +1 -0
- package/dist/Grid/demos/basic.d.ts +1 -0
- package/dist/Image/demos/basic.d.ts +1 -0
- package/dist/ImageViewer/components/Arrows.d.ts +1 -0
- package/dist/ImageViewer/components/Carousel.d.ts +1 -0
- package/dist/ImageViewer/components/Operate.d.ts +1 -0
- package/dist/ImageViewer/components/Thumb.d.ts +1 -0
- package/dist/ImageViewer/wrapeer/Container.d.ts +1 -0
- package/dist/ImageViewer/wrapeer/Wrapper.d.ts +1 -0
- package/dist/Input/demos/after.d.ts +1 -0
- package/dist/Input/demos/base.d.ts +1 -0
- package/dist/Input/demos/basic.d.ts +1 -0
- package/dist/Input/demos/color.d.ts +1 -0
- package/dist/Input/demos/combination.d.ts +1 -0
- package/dist/Input/demos/import.d.ts +1 -0
- package/dist/Input/demos/line.d.ts +1 -0
- package/dist/Input/demos/password.d.ts +1 -0
- package/dist/Input/demos/size.d.ts +1 -0
- package/dist/InputNumber/demos/basic.d.ts +1 -0
- package/dist/InputNumber/demos/format.d.ts +1 -0
- package/dist/InputNumber/demos/price.d.ts +1 -0
- package/dist/InputNumber/demos/status.d.ts +1 -0
- package/dist/InputNumber/demos/suffix.d.ts +1 -0
- package/dist/Layout/demos/basic.d.ts +1 -0
- package/dist/List/demos/basic.d.ts +1 -0
- package/dist/LmEditTable/DndContainer.d.ts +1 -0
- package/dist/LmEditTable/DragHandle.d.ts +1 -0
- package/dist/LmEditTable/demos/basic.d.ts +1 -0
- package/dist/LmEditTable/demos/colsort.d.ts +1 -0
- package/dist/LmEditTable/demos/group.d.ts +1 -0
- package/dist/LmEditTable/demos/sinleEdit.d.ts +1 -0
- package/dist/LmEditTable/demos/size.d.ts +1 -0
- package/dist/LmEditTable/sortableBox.d.ts +1 -0
- package/dist/LmEditTable/sortableBoxCol.d.ts +1 -0
- package/dist/LmEditTable/sortableItem.d.ts +1 -0
- package/dist/LmEditTable/sortableItemCol.d.ts +1 -0
- package/dist/LmFilter/filterFns/index.d.ts +5 -5
- package/dist/LmSelect/GhostSelect.d.ts +1 -0
- package/dist/LmSelect/demos/basic.d.ts +1 -0
- package/dist/LmSelect/demos/checkbox.d.ts +1 -0
- package/dist/LmSelect/demos/ghost.d.ts +1 -0
- package/dist/LmSelect/useCheckboxOptions.d.ts +1 -0
- package/dist/LmTable/components/DndContainer.d.ts +1 -0
- package/dist/LmTable/components/customRenderEmpty.d.ts +1 -0
- package/dist/LmTable/components/inputDataEdit.d.ts +1 -0
- package/dist/LmTable/components/tableChartsModal.d.ts +1 -0
- package/dist/LmTable/util.d.ts +10 -4
- package/dist/LmUpload/UploadList/ItemPicture.d.ts +1 -0
- package/dist/LmUpload/UploadList/ItemPictureCard.d.ts +1 -0
- package/dist/LmUpload/UploadList/ItemText.d.ts +1 -0
- package/dist/LmUpload/components/card.d.ts +1 -0
- package/dist/LmUpload/view/index.d.ts +1 -0
- package/dist/LmUpload/wrapper/Upload.d.ts +1 -0
- package/dist/Mentions/demos/basic.d.ts +1 -0
- package/dist/Menu/demos/basic.d.ts +1 -0
- package/dist/Modal/demos/basic.d.ts +1 -0
- package/dist/Modal/demos/info.d.ts +1 -0
- package/dist/PageHeader/demos/basic.d.ts +1 -0
- package/dist/Pagination/demos/basic.d.ts +1 -0
- package/dist/Popconfirm/demos/basic.d.ts +1 -0
- package/dist/Popover/demos/basic.d.ts +1 -0
- package/dist/Popover/demos/basic1.d.ts +1 -0
- package/dist/Popover/index.d.ts +1 -1
- package/dist/Progress/demos/basic.d.ts +1 -0
- package/dist/Progress/demos/circle.d.ts +1 -0
- package/dist/Progress/demos/dynamic.d.ts +1 -0
- package/dist/Progress/demos/small.d.ts +1 -0
- package/dist/QuickMenu/demos/basic.d.ts +1 -0
- package/dist/Rate/demos/basic.d.ts +1 -0
- package/dist/Result/demos/403.d.ts +1 -0
- package/dist/Result/demos/404.d.ts +1 -0
- package/dist/Result/demos/500.d.ts +1 -0
- package/dist/Result/demos/basic.d.ts +1 -0
- package/dist/Result/demos/customicon.d.ts +1 -0
- package/dist/Result/demos/error.d.ts +1 -0
- package/dist/Result/demos/info.d.ts +1 -0
- package/dist/Result/demos/success.d.ts +1 -0
- package/dist/Result/demos/warning.d.ts +1 -0
- package/dist/Result/noFound.d.ts +1 -0
- package/dist/Result/serverError.d.ts +1 -0
- package/dist/Result/unauthorized.d.ts +1 -0
- package/dist/Row/demos/basic.d.ts +1 -0
- package/dist/Segmented/demos/basic.d.ts +1 -0
- package/dist/Select/demos/basic.d.ts +1 -0
- package/dist/Select/demos/bordered.d.ts +1 -0
- package/dist/Skeleton/demos/basic.d.ts +1 -0
- package/dist/Slider/demos/basic.d.ts +1 -0
- package/dist/Space/demos/auto.d.ts +1 -0
- package/dist/Space/demos/basic.d.ts +1 -0
- package/dist/Space/demos/vertical.d.ts +1 -0
- package/dist/Spin/demos/basic.d.ts +1 -0
- package/dist/Spin/demos/size.d.ts +1 -0
- package/dist/Statistic/demos/basic.d.ts +1 -0
- package/dist/Steps/demos/basic.d.ts +1 -0
- package/dist/Switch/demos/basic.d.ts +1 -0
- package/dist/Switch/demos/table.d.ts +1 -0
- package/dist/Table/demos/basic.d.ts +1 -0
- package/dist/Tabs/demos/basic.d.ts +1 -0
- package/dist/Tabs/demos/nobroder.d.ts +1 -0
- package/dist/Tag/demos/CheckableTag.d.ts +1 -0
- package/dist/Tag/demos/ExigencyTag.d.ts +1 -0
- package/dist/Tag/demos/add.d.ts +1 -0
- package/dist/Tag/demos/basic.d.ts +1 -0
- package/dist/Tag/demos/border.d.ts +1 -0
- package/dist/Tag/demos/colors.d.ts +1 -0
- package/dist/Timeline/demos/basic.d.ts +1 -0
- package/dist/Tooltip/demos/basic.d.ts +1 -0
- package/dist/Tooltip/index.d.ts +1 -1
- package/dist/Transfer/demos/basic.d.ts +1 -0
- package/dist/Tree/demos/basic.d.ts +1 -0
- package/dist/Tree/demos/controlled.d.ts +1 -0
- package/dist/Tree/demos/search.d.ts +1 -0
- package/dist/Tree/demos/sort.d.ts +1 -0
- package/dist/Tree/utils/dropIndicator.d.ts +1 -0
- package/dist/TreeSelect/demos/basic.d.ts +1 -0
- package/dist/Typography/demos/basic.d.ts +1 -0
- package/dist/hooks/useFullscreen/demos/basic.d.ts +1 -0
- package/dist/hooks/useFullscreen/demos/useInModal.d.ts +1 -0
- package/dist/index.umd.css +286 -1227
- package/dist/index.umd.js +244456 -262909
- package/dist/index.umd.min.css +2 -2
- package/dist/index.umd.min.js +20 -20
- package/dist/locale-provider/index.d.ts +2 -2
- package/dist/message/demos/basic.d.ts +1 -0
- package/dist/message/demos/other.d.ts +1 -0
- package/dist/notification/demos/basic.d.ts +1 -0
- package/dist/notification/demos/button.d.ts +1 -0
- package/dist/notification/demos/icon.d.ts +1 -0
- package/es/Badge/SingleNumber.d.ts +1 -0
- package/es/DatePicker/PickerButton.d.ts +1 -0
- package/es/DatePicker/PickerTag.d.ts +1 -0
- package/es/Form/style/form.css +3 -3
- package/es/Form/style/index.css +6063 -3
- package/es/Form/style/tooltip.css +2 -2
- package/es/Form/style/variables.css +6063 -3
- package/es/LeftTable/index.js +6 -2
- package/es/LmEditTable/sortableItemCol.d.ts +1 -0
- package/es/LmFilter/LmFilter.js +2 -0
- package/es/LmFilter/filterFns/index.d.ts +60 -0
- package/es/LmFilter/filterFns/index.js +72 -102
- package/es/LmTable/Table.js +124 -95
- package/es/LmTable/components/sheelTableCell.js +6 -7
- package/es/LmTable/style/index.css +19 -0
- package/es/LmTable/style/variables.css +19 -0
- package/es/LmTable/util.js +69 -16
- package/es/Popover/index.d.ts +1 -1
- package/es/Tooltip/index.d.ts +1 -1
- package/es/Tree/utils/dropIndicator.d.ts +1 -0
- package/es/locale-provider/index.d.ts +2 -2
- package/es/styles/variables.css +6082 -3
- package/lib/Badge/SingleNumber.d.ts +1 -0
- package/lib/DatePicker/PickerButton.d.ts +1 -0
- package/lib/DatePicker/PickerTag.d.ts +1 -0
- package/lib/Form/style/form.css +3 -3
- package/lib/Form/style/index.css +6063 -3
- package/lib/Form/style/tooltip.css +2 -2
- package/lib/Form/style/variables.css +6063 -3
- package/lib/LeftTable/index.js +6 -2
- package/lib/LmEditTable/sortableItemCol.d.ts +1 -0
- package/lib/LmFilter/LmFilter.js +2 -0
- package/lib/LmFilter/filterFns/index.d.ts +60 -0
- package/lib/LmFilter/filterFns/index.js +41 -54
- package/lib/LmTable/Table.js +124 -95
- package/lib/LmTable/components/sheelTableCell.js +6 -7
- package/lib/LmTable/style/index.css +19 -0
- package/lib/LmTable/style/variables.css +19 -0
- package/lib/LmTable/util.js +69 -16
- package/lib/Popover/index.d.ts +1 -1
- package/lib/Tooltip/index.d.ts +1 -1
- package/lib/Tree/utils/dropIndicator.d.ts +1 -0
- package/lib/locale-provider/index.d.ts +2 -2
- package/lib/styles/variables.css +6082 -3
- package/package.json +1 -1
- package/CHANGELOG.md +0 -12
- package/dist/base.css +0 -511
package/es/LmTable/Table.js
CHANGED
|
@@ -59,7 +59,7 @@ var _resetConfig = _interopRequireDefault(require("./resetConfig"));
|
|
|
59
59
|
|
|
60
60
|
var _virTual = require("./virTual");
|
|
61
61
|
|
|
62
|
-
var _excluded = ["columns", "dataSource", "autoSize", "rowClick", "onDoubleClick", "checkConfig", "summary", "pagination", "hiddenPage", "loading", "virtual", "sortOpen", "colSortOpen", "resizeable", "customCheck", "components", "rowSelection", "columnsState", "onChange", "filterChange", "tableRowType", "size", "openSheet", "editSheet", "dataChange", "
|
|
62
|
+
var _excluded = ["columns", "dataSource", "autoSize", "rowClick", "onDoubleClick", "checkConfig", "summary", "pagination", "hiddenPage", "loading", "virtual", "sortOpen", "colSortOpen", "resizeable", "customCheck", "components", "rowSelection", "columnsState", "onChange", "filterChange", "tableRowType", "size", "openSheet", "editSheet", "dataChange", "groupRowKeys", "groupColKeys", "emptyProps"],
|
|
63
63
|
_excluded2 = ["className", "style"],
|
|
64
64
|
_excluded3 = ["onResize", "width", "onResizeStop"];
|
|
65
65
|
var Summary = _proTable.default.Summary;
|
|
@@ -131,9 +131,9 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
|
131
131
|
_props$editSheet = props.editSheet,
|
|
132
132
|
editSheet = _props$editSheet === void 0 ? false : _props$editSheet,
|
|
133
133
|
dataChange = props.dataChange,
|
|
134
|
-
|
|
134
|
+
groupRowKeys = props.groupRowKeys,
|
|
135
|
+
groupColKeys = props.groupColKeys,
|
|
135
136
|
emptyProps = props.emptyProps,
|
|
136
|
-
columnKeys = props.columnKeys,
|
|
137
137
|
resetProps = (0, _objectWithoutProperties2.default)(props, _excluded);
|
|
138
138
|
var _resetProps$rowKey = resetProps.rowKey,
|
|
139
139
|
rowKey = _resetProps$rowKey === void 0 ? 'id' : _resetProps$rowKey;
|
|
@@ -171,6 +171,12 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
|
171
171
|
|
|
172
172
|
var deepDataSourceRef = (0, _react.useRef)([]);
|
|
173
173
|
var deepColumnsRef = (0, _react.useRef)([]);
|
|
174
|
+
/** 行分组表格对应数据的隐藏数列表 */
|
|
175
|
+
|
|
176
|
+
var hideListRef = (0, _react.useRef)([]);
|
|
177
|
+
/** 行分组的空行列表数据 */
|
|
178
|
+
|
|
179
|
+
var skipListRef = (0, _react.useRef)([]);
|
|
174
180
|
/** 记录最原始数据 */
|
|
175
181
|
|
|
176
182
|
(0, _react.useEffect)(function () {
|
|
@@ -179,30 +185,33 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
|
179
185
|
/** 行分组 */
|
|
180
186
|
|
|
181
187
|
var groupDataSource = (0, _react.useMemo)(function () {
|
|
182
|
-
if (!(
|
|
188
|
+
if (!(groupRowKeys === null || groupRowKeys === void 0 ? void 0 : groupRowKeys.length)) {
|
|
183
189
|
return customizeDataSource;
|
|
184
190
|
}
|
|
185
191
|
|
|
186
|
-
return (0, _util.transformWithRowGroup)(customizeDataSource,
|
|
187
|
-
}, [customizeDataSource,
|
|
192
|
+
return (0, _util.transformWithRowGroup)(customizeDataSource, groupRowKeys);
|
|
193
|
+
}, [customizeDataSource, groupRowKeys]);
|
|
188
194
|
/** 列分组 */
|
|
189
195
|
|
|
190
196
|
var _useMemo = (0, _react.useMemo)(function () {
|
|
191
|
-
if (!(
|
|
197
|
+
if (!(groupColKeys === null || groupColKeys === void 0 ? void 0 : groupColKeys.length)) {
|
|
192
198
|
return {
|
|
193
199
|
dataSource: groupDataSource,
|
|
194
200
|
columns: customizeColumns
|
|
195
201
|
};
|
|
196
202
|
}
|
|
197
203
|
|
|
198
|
-
return (0, _util.transformWithColGroup)(customizeColumns, groupDataSource,
|
|
199
|
-
}, [customizeColumns, groupDataSource,
|
|
204
|
+
return (0, _util.transformWithColGroup)(customizeColumns, groupDataSource, groupColKeys);
|
|
205
|
+
}, [customizeColumns, groupDataSource, groupColKeys]),
|
|
200
206
|
columns = _useMemo.columns,
|
|
201
207
|
dataSource = _useMemo.dataSource;
|
|
202
208
|
|
|
203
209
|
(0, _react.useEffect)(function () {
|
|
204
210
|
setExpandedRowKeys([]);
|
|
205
|
-
|
|
211
|
+
deepDataSourceRef.current = [];
|
|
212
|
+
deepColumnsRef.current = [];
|
|
213
|
+
hideListRef.current = [];
|
|
214
|
+
}, [groupRowKeys]);
|
|
206
215
|
/** sheel数据的表格 */
|
|
207
216
|
|
|
208
217
|
var _useState9 = (0, _react.useState)({
|
|
@@ -286,18 +295,46 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
|
286
295
|
(0, _react.useEffect)(function () {
|
|
287
296
|
var source = [];
|
|
288
297
|
|
|
298
|
+
var dfs = function dfs(children) {
|
|
299
|
+
var num = 0;
|
|
300
|
+
children.forEach(function (item) {
|
|
301
|
+
if (item.children) {
|
|
302
|
+
num += dfs(item.children);
|
|
303
|
+
} else {
|
|
304
|
+
num += 1;
|
|
305
|
+
}
|
|
306
|
+
});
|
|
307
|
+
return num;
|
|
308
|
+
};
|
|
309
|
+
|
|
310
|
+
var hideList = [];
|
|
311
|
+
|
|
289
312
|
var deepChildren = function deepChildren(arr) {
|
|
290
313
|
arr.forEach(function (item) {
|
|
291
314
|
source.push((0, _lodash.omit)(item, 'children'));
|
|
315
|
+
var prev = hideList.length ? hideList[hideList.length - 1] : 0; // 展开
|
|
292
316
|
|
|
293
317
|
if ((item === null || item === void 0 ? void 0 : item.children) && expandedRowKeys.includes(item.key)) {
|
|
318
|
+
hideList.push(prev);
|
|
294
319
|
deepChildren(item === null || item === void 0 ? void 0 : item.children);
|
|
320
|
+
} // 隐藏
|
|
321
|
+
|
|
322
|
+
|
|
323
|
+
if ((item === null || item === void 0 ? void 0 : item.children) && !expandedRowKeys.includes(item.key)) {
|
|
324
|
+
var count = dfs(item.children);
|
|
325
|
+
hideList.push(count + prev);
|
|
326
|
+
}
|
|
327
|
+
|
|
328
|
+
if (!(item === null || item === void 0 ? void 0 : item.children)) {
|
|
329
|
+
hideList.push(prev);
|
|
295
330
|
}
|
|
296
331
|
});
|
|
297
332
|
};
|
|
298
333
|
|
|
299
334
|
deepChildren(dataSource);
|
|
300
335
|
deepDataSourceRef.current = source;
|
|
336
|
+
hideListRef.current = hideList;
|
|
337
|
+
skipListRef.current = (0, _util.getSkipList)((groupRowKeys === null || groupRowKeys === void 0 ? void 0 : groupRowKeys.length) ? deepDataSourceRef.current : dataSource);
|
|
301
338
|
}, [dataSource, expandedRowKeys]); // 列分组数据铺平,在框选时获取数据使用
|
|
302
339
|
|
|
303
340
|
(0, _react.useEffect)(function () {
|
|
@@ -315,7 +352,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
|
315
352
|
|
|
316
353
|
deepChildren(columns);
|
|
317
354
|
deepColumnsRef.current = source;
|
|
318
|
-
}, [columns,
|
|
355
|
+
}, [columns, groupColKeys]);
|
|
319
356
|
|
|
320
357
|
var onSortEnd = function onSortEnd(_ref) {
|
|
321
358
|
var oldIndex = _ref.oldIndex,
|
|
@@ -418,8 +455,8 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
|
418
455
|
return (0, _util.range)(start.j, end.j).map(function (j) {
|
|
419
456
|
var _columns$j, _columns$j2;
|
|
420
457
|
|
|
421
|
-
var columnKey = (
|
|
422
|
-
var dataItem = (
|
|
458
|
+
var columnKey = (groupColKeys === null || groupColKeys === void 0 ? void 0 : groupColKeys.length) ? deepColumnsRef.current[j].dataIndex : (_columns$j = columns[j]) === null || _columns$j === void 0 ? void 0 : _columns$j.dataIndex;
|
|
459
|
+
var dataItem = (groupRowKeys === null || groupRowKeys === void 0 ? void 0 : groupRowKeys.length) ? deepDataSourceRef.current[i] : dataSource[i];
|
|
423
460
|
var cell = dataItem === null || dataItem === void 0 ? void 0 : dataItem[columnKey];
|
|
424
461
|
|
|
425
462
|
if ((_columns$j2 = columns[j]) === null || _columns$j2 === void 0 ? void 0 : _columns$j2.render) {
|
|
@@ -514,14 +551,13 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
|
514
551
|
end = _shellStatusRef$curre10.end,
|
|
515
552
|
commiting = _shellStatusRef$curre10.commiting; //
|
|
516
553
|
|
|
517
|
-
var innerColumns = (
|
|
518
|
-
var innerDataSource = (
|
|
554
|
+
var innerColumns = (groupColKeys === null || groupColKeys === void 0 ? void 0 : groupColKeys.length) ? deepColumnsRef.current : columns;
|
|
555
|
+
var innerDataSource = (groupRowKeys === null || groupRowKeys === void 0 ? void 0 : groupRowKeys.length) ? deepDataSourceRef.current : dataSource; //
|
|
519
556
|
|
|
520
557
|
var columnsKeysList = innerColumns.map(function (item) {
|
|
521
558
|
return item.dataIndex;
|
|
522
|
-
}); //
|
|
559
|
+
}); // 空行值数组
|
|
523
560
|
|
|
524
|
-
var skipList = (0, _util.getSkipList)(innerDataSource);
|
|
525
561
|
var rowtext = (0, _util.getSelectionRowText)({
|
|
526
562
|
selection: commiting,
|
|
527
563
|
columnsKeysList: columnsKeysList,
|
|
@@ -574,9 +610,20 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
|
574
610
|
|
|
575
611
|
if ((_isSelected = isSelected(tri, tdj)) === null || _isSelected === void 0 ? void 0 : _isSelected.isSelected) {
|
|
576
612
|
var key = columnsKeysList[tdj];
|
|
577
|
-
var sourceIndex
|
|
613
|
+
var sourceIndex; // 列分组的情况下
|
|
614
|
+
|
|
615
|
+
if (groupColKeys === null || groupColKeys === void 0 ? void 0 : groupColKeys.length) {
|
|
616
|
+
sourceIndex = (0, _util.getDataSourceIndex)({
|
|
617
|
+
key: key,
|
|
618
|
+
dataSource: dataSource
|
|
619
|
+
});
|
|
620
|
+
var arr = key.split('_');
|
|
621
|
+
key = arr[arr.length - 2];
|
|
622
|
+
} else {
|
|
623
|
+
sourceIndex = tri - skipListRef.current[tri] + hideListRef.current[tri];
|
|
624
|
+
}
|
|
578
625
|
|
|
579
|
-
if (sourceIndex < 0) {
|
|
626
|
+
if (sourceIndex < 0 || sourceIndex >= data.length) {
|
|
580
627
|
return;
|
|
581
628
|
} // 行替换
|
|
582
629
|
|
|
@@ -638,62 +685,42 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
|
638
685
|
/** TODO: 在分组的情况,需要排除_group行的数据转换 */
|
|
639
686
|
|
|
640
687
|
|
|
641
|
-
var handlePaste = function handlePaste(e) {
|
|
642
|
-
|
|
643
|
-
|
|
644
|
-
|
|
645
|
-
|
|
646
|
-
|
|
647
|
-
|
|
648
|
-
|
|
649
|
-
|
|
650
|
-
|
|
651
|
-
|
|
652
|
-
|
|
653
|
-
|
|
654
|
-
|
|
655
|
-
|
|
656
|
-
|
|
657
|
-
|
|
658
|
-
|
|
659
|
-
|
|
660
|
-
|
|
661
|
-
|
|
662
|
-
|
|
663
|
-
|
|
664
|
-
|
|
665
|
-
|
|
666
|
-
|
|
667
|
-
|
|
668
|
-
|
|
669
|
-
|
|
670
|
-
|
|
671
|
-
|
|
672
|
-
|
|
673
|
-
|
|
674
|
-
|
|
675
|
-
|
|
676
|
-
|
|
677
|
-
});
|
|
678
|
-
});
|
|
679
|
-
var columnsKeysList = columns.map(function (item) {
|
|
680
|
-
return item.dataIndex;
|
|
681
|
-
});
|
|
682
|
-
var res = (0, _immer.produce)(dataSourceRef.current, function (draft) {
|
|
683
|
-
resultEnd.forEach(function (item) {
|
|
684
|
-
var _isSelected2;
|
|
685
|
-
|
|
686
|
-
if ((_isSelected2 = isSelected(item.i, item.j)) === null || _isSelected2 === void 0 ? void 0 : _isSelected2.isSelected) {
|
|
687
|
-
draft[item.i][columnsKeysList[item.j]] = item.value;
|
|
688
|
-
}
|
|
689
|
-
});
|
|
690
|
-
});
|
|
691
|
-
/** 只有开通了编辑权限之后才可以 */
|
|
692
|
-
|
|
693
|
-
if (editSheet) {
|
|
694
|
-
dataChange === null || dataChange === void 0 ? void 0 : dataChange(res);
|
|
695
|
-
}
|
|
696
|
-
}
|
|
688
|
+
var handlePaste = function handlePaste(e) {// if (isEmpty(shellStatusRef.current?.editing)) {
|
|
689
|
+
// let { start, end } = shellStatusRef.current
|
|
690
|
+
// start = { i: Math.min(start.i, end.i), j: Math.min(start.j, end.j) }
|
|
691
|
+
// end = { i: Math.max(start.i, end.i), j: Math.max(start.j, end.j) }
|
|
692
|
+
// const parse = defaultParsePaste
|
|
693
|
+
// let pasteData = []
|
|
694
|
+
// if (window.clipboardData && window.clipboardData.getData) {
|
|
695
|
+
// // IE
|
|
696
|
+
// pasteData = parse(window.clipboardData.getData('Text'))
|
|
697
|
+
// } else if (e.clipboardData && e.clipboardData.getData) {
|
|
698
|
+
// pasteData = parse(e.clipboardData.getData('text/plain'))
|
|
699
|
+
// }
|
|
700
|
+
// // in order of preference
|
|
701
|
+
// const resultEnd = []
|
|
702
|
+
// pasteData.forEach((row, i) => {
|
|
703
|
+
// row.forEach((value, j) => {
|
|
704
|
+
// resultEnd.push({
|
|
705
|
+
// i: start.i + i,
|
|
706
|
+
// j: start.j + j,
|
|
707
|
+
// value,
|
|
708
|
+
// })
|
|
709
|
+
// })
|
|
710
|
+
// })
|
|
711
|
+
// const columnsKeysList = columns.map((item) => item.dataIndex)
|
|
712
|
+
// const res = produce(dataSourceRef.current, (draft) => {
|
|
713
|
+
// resultEnd.forEach((item) => {
|
|
714
|
+
// if (isSelected(item.i, item.j)?.isSelected) {
|
|
715
|
+
// draft[item.i][columnsKeysList[item.j]] = item.value
|
|
716
|
+
// }
|
|
717
|
+
// })
|
|
718
|
+
// })
|
|
719
|
+
// /** 只有开通了编辑权限之后才可以 */
|
|
720
|
+
// if (editSheet) {
|
|
721
|
+
// dataChange?.(res)
|
|
722
|
+
// }
|
|
723
|
+
// }
|
|
697
724
|
};
|
|
698
725
|
|
|
699
726
|
var pageClick = function pageClick(e) {
|
|
@@ -737,13 +764,13 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
|
737
764
|
|
|
738
765
|
|
|
739
766
|
var sheelMouseDown = function sheelMouseDown(i, j, e, commitStatus) {
|
|
740
|
-
var _shellStatusRef$curre14, _shellStatusRef$curre15, _shellStatusRef$curre16, _shellStatusRef$curre17, _shellStatusRef$curre18, _shellStatusRef$curre19, _shellStatusRef$curre20, _shellStatusRef$curre21
|
|
767
|
+
var _shellStatusRef$curre12, _shellStatusRef$curre13, _shellStatusRef$curre14, _shellStatusRef$curre15, _shellStatusRef$curre16, _shellStatusRef$curre17, _shellStatusRef$curre18, _shellStatusRef$curre19, _shellStatusRef$curre20, _shellStatusRef$curre21;
|
|
741
768
|
|
|
742
|
-
var isNowEditingSameCell = !isEmpty((_shellStatusRef$
|
|
743
|
-
var editing = isEmpty((_shellStatusRef$
|
|
769
|
+
var isNowEditingSameCell = !isEmpty((_shellStatusRef$curre12 = shellStatusRef.current) === null || _shellStatusRef$curre12 === void 0 ? void 0 : _shellStatusRef$curre12.editing) && ((_shellStatusRef$curre13 = shellStatusRef.current) === null || _shellStatusRef$curre13 === void 0 ? void 0 : _shellStatusRef$curre13.editing.i) === i && ((_shellStatusRef$curre14 = shellStatusRef.current) === null || _shellStatusRef$curre14 === void 0 ? void 0 : _shellStatusRef$curre14.editing.j) === j;
|
|
770
|
+
var editing = isEmpty((_shellStatusRef$curre15 = shellStatusRef.current) === null || _shellStatusRef$curre15 === void 0 ? void 0 : _shellStatusRef$curre15.editing) || ((_shellStatusRef$curre16 = shellStatusRef.current) === null || _shellStatusRef$curre16 === void 0 ? void 0 : _shellStatusRef$curre16.editing.i) !== i || ((_shellStatusRef$curre17 = shellStatusRef.current) === null || _shellStatusRef$curre17 === void 0 ? void 0 : _shellStatusRef$curre17.editing.j) !== j ? {} : (_shellStatusRef$curre18 = shellStatusRef.current) === null || _shellStatusRef$curre18 === void 0 ? void 0 : _shellStatusRef$curre18.editing;
|
|
744
771
|
shellStatusRef.current = {
|
|
745
772
|
selecting: !isNowEditingSameCell,
|
|
746
|
-
start: (e === null || e === void 0 ? void 0 : e.shiftKey) || commitStatus ? (_shellStatusRef$
|
|
773
|
+
start: (e === null || e === void 0 ? void 0 : e.shiftKey) || commitStatus ? (_shellStatusRef$curre19 = shellStatusRef.current) === null || _shellStatusRef$curre19 === void 0 ? void 0 : _shellStatusRef$curre19.start : {
|
|
747
774
|
i: i,
|
|
748
775
|
j: j
|
|
749
776
|
},
|
|
@@ -754,7 +781,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
|
754
781
|
editing: editing,
|
|
755
782
|
forceEdit: !!isNowEditingSameCell,
|
|
756
783
|
commiting: commitStatus ? {
|
|
757
|
-
start: (_shellStatusRef$
|
|
784
|
+
start: (_shellStatusRef$curre20 = shellStatusRef.current) === null || _shellStatusRef$curre20 === void 0 ? void 0 : _shellStatusRef$curre20.start,
|
|
758
785
|
end: {
|
|
759
786
|
i: i,
|
|
760
787
|
j: j
|
|
@@ -767,7 +794,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
|
767
794
|
setCommitIng(true);
|
|
768
795
|
}
|
|
769
796
|
|
|
770
|
-
if (isEmpty((_shellStatusRef$
|
|
797
|
+
if (isEmpty((_shellStatusRef$curre21 = shellStatusRef.current) === null || _shellStatusRef$curre21 === void 0 ? void 0 : _shellStatusRef$curre21.editing)) {
|
|
771
798
|
setEditIng(false);
|
|
772
799
|
}
|
|
773
800
|
|
|
@@ -782,9 +809,9 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
|
782
809
|
|
|
783
810
|
var onContextMenu = function onContextMenu(evt, i, j) {
|
|
784
811
|
evt.preventDefault();
|
|
785
|
-
var _shellStatusRef$
|
|
786
|
-
start = _shellStatusRef$
|
|
787
|
-
end = _shellStatusRef$
|
|
812
|
+
var _shellStatusRef$curre22 = shellStatusRef.current,
|
|
813
|
+
start = _shellStatusRef$curre22.start,
|
|
814
|
+
end = _shellStatusRef$curre22.end;
|
|
788
815
|
/** 如果表格当前没有选择,则把当前的右击的td块默认选中 */
|
|
789
816
|
|
|
790
817
|
if (isEmpty(start) && isEmpty(end)) {
|
|
@@ -837,8 +864,10 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
|
837
864
|
};
|
|
838
865
|
|
|
839
866
|
var dataSourceChange = function dataSourceChange(i, j, newRecord) {
|
|
867
|
+
// 表格中的行数 转化为 对应的数据源索引
|
|
868
|
+
var rowIndex = i - skipListRef.current[i] + hideListRef.current[i];
|
|
840
869
|
var res = (0, _immer.produce)(dataSourceRef.current, function (draft) {
|
|
841
|
-
draft[
|
|
870
|
+
draft[rowIndex] = newRecord;
|
|
842
871
|
});
|
|
843
872
|
dataChange === null || dataChange === void 0 ? void 0 : dataChange(res);
|
|
844
873
|
shellStatusRef.current = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, shellStatusRef.current), {}, {
|
|
@@ -911,18 +940,19 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
|
911
940
|
var innerColumns = (0, _lodash.cloneDeep)(useColumns);
|
|
912
941
|
traverseColumns(innerColumns, null);
|
|
913
942
|
|
|
914
|
-
if (
|
|
943
|
+
if (groupRowKeys === null || groupRowKeys === void 0 ? void 0 : groupRowKeys.length) {
|
|
915
944
|
/** 如果是进行了行分组,则会生成一列dataIndex为Group的Col, 如果需要修改此处,请备注原因 */
|
|
916
945
|
innerColumns = [{
|
|
917
946
|
type: 'name',
|
|
918
947
|
title: '分组',
|
|
948
|
+
dataIndex: '_group',
|
|
919
949
|
key: '_group',
|
|
920
|
-
|
|
950
|
+
width: 100
|
|
921
951
|
}].concat((0, _toConsumableArray2.default)(innerColumns));
|
|
922
952
|
}
|
|
923
953
|
|
|
924
954
|
return sortOpen ? [sortDefaultColumnItem].concat((0, _toConsumableArray2.default)(innerColumns)) : innerColumns;
|
|
925
|
-
}, [useColumns, sortOpen, selectIng, dataSource,
|
|
955
|
+
}, [useColumns, sortOpen, selectIng, dataSource, groupRowKeys, commitIng]);
|
|
926
956
|
(0, _react.useEffect)(function () {
|
|
927
957
|
setColumns(columns);
|
|
928
958
|
}, [columns]); // 行点击事件
|
|
@@ -1014,8 +1044,8 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
|
1014
1044
|
}),
|
|
1015
1045
|
|
|
1016
1046
|
/** 如果开启了行分组,则需要把checkStrictly关闭,变成受控模式 */
|
|
1017
|
-
checkStrictly: !
|
|
1018
|
-
onChange: function onChange(selectedRowKeys, selectedRows
|
|
1047
|
+
checkStrictly: !(groupRowKeys === null || groupRowKeys === void 0 ? void 0 : groupRowKeys.length),
|
|
1048
|
+
onChange: function onChange(selectedRowKeys, selectedRows) {
|
|
1019
1049
|
setSelectedRows({
|
|
1020
1050
|
selectedRows: selectedRows
|
|
1021
1051
|
});
|
|
@@ -1024,7 +1054,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
|
1024
1054
|
}, rowSelection),
|
|
1025
1055
|
onRow: function onRow(record) {
|
|
1026
1056
|
return {
|
|
1027
|
-
onClick: function onClick(
|
|
1057
|
+
onClick: function onClick() {
|
|
1028
1058
|
onRecord(record);
|
|
1029
1059
|
},
|
|
1030
1060
|
onDoubleClick: function onDoubleClick() {
|
|
@@ -1223,7 +1253,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
|
1223
1253
|
dataSource: dataSource,
|
|
1224
1254
|
components: tableComponents,
|
|
1225
1255
|
onChange: onTableChange,
|
|
1226
|
-
expandable: {
|
|
1256
|
+
expandable: (resetProps === null || resetProps === void 0 ? void 0 : resetProps.expandable) || {
|
|
1227
1257
|
onExpand: function onExpand() {
|
|
1228
1258
|
shellStatusRef.current = {
|
|
1229
1259
|
start: {},
|
|
@@ -1249,7 +1279,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
|
1249
1279
|
dataSource: dataSource,
|
|
1250
1280
|
components: tableComponents,
|
|
1251
1281
|
onChange: onTableChange,
|
|
1252
|
-
expandable: {
|
|
1282
|
+
expandable: (resetProps === null || resetProps === void 0 ? void 0 : resetProps.expandable) || {
|
|
1253
1283
|
onExpand: function onExpand() {
|
|
1254
1284
|
shellStatusRef.current = {
|
|
1255
1285
|
start: {},
|
|
@@ -1361,8 +1391,7 @@ var ResizeSize = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
|
1361
1391
|
return h;
|
|
1362
1392
|
}, [props.hiddenPage, props.customCheck, props.columns, tableSize]);
|
|
1363
1393
|
var throttleSize = (0, _react.useCallback)(function () {
|
|
1364
|
-
var width = tableSize.width
|
|
1365
|
-
height = tableSize.height;
|
|
1394
|
+
var width = tableSize.width;
|
|
1366
1395
|
return /*#__PURE__*/_react.default.createElement(ResetTable, (0, _extends2.default)({
|
|
1367
1396
|
ref: defaultRef
|
|
1368
1397
|
}, props, {
|
|
@@ -124,13 +124,16 @@ var SheelTabelCell = function SheelTabelCell(props) {
|
|
|
124
124
|
|
|
125
125
|
var renderEditor = function renderEditor() {
|
|
126
126
|
if (isEditing) {
|
|
127
|
+
console.log(isEditing, '-----isEditing-----');
|
|
127
128
|
var Editor = (col === null || col === void 0 ? void 0 : col.dataEditor) || InputDataEdit;
|
|
128
129
|
return /*#__PURE__*/React.createElement(Editor, {
|
|
129
130
|
cell: col,
|
|
130
131
|
row: rowIndex,
|
|
131
132
|
col: colIndex,
|
|
132
133
|
value: value,
|
|
133
|
-
onChange:
|
|
134
|
+
onChange: function onChange(value) {
|
|
135
|
+
setValue(value);
|
|
136
|
+
},
|
|
134
137
|
handleSave: saveRenderValue
|
|
135
138
|
});
|
|
136
139
|
}
|
|
@@ -142,17 +145,13 @@ var SheelTabelCell = function SheelTabelCell(props) {
|
|
|
142
145
|
var content = renderComponent() || renderEditor() || renderViewer;
|
|
143
146
|
return /*#__PURE__*/React.createElement("td", Object.assign({}, omit(clearProps, ['commitIng', 'editIng']), {
|
|
144
147
|
// style={{ userSelect: 'none' }}
|
|
145
|
-
className: cls('unselection', sd && selectIng && 'selected', isEnd && 'end', isRightEnd && 'right_end', isEditing && 'editing', isVaildCommit && 'commiting'),
|
|
148
|
+
className: cls(colIndex === undefined && 'row_selection_td', 'unselection', sd && selectIng && 'selected', isEnd && 'end', isRightEnd && 'right_end', isEditing && 'editing', isVaildCommit && 'commiting'),
|
|
146
149
|
onMouseDown: handleMouseDown,
|
|
147
150
|
onMouseOver: handleMouseOver,
|
|
148
151
|
onContextMenu: handleContextMenu,
|
|
149
152
|
onDoubleClick: handleDoubleClick,
|
|
150
|
-
// onKeyUp={onKeyUp}
|
|
151
153
|
key: "".concat(rowIndex, "_").concat(colIndex)
|
|
152
|
-
}), content
|
|
153
|
-
ref: endCellRef,
|
|
154
|
-
className: 'lmtable_cell_end_icon'
|
|
155
|
-
}));
|
|
154
|
+
}), content);
|
|
156
155
|
};
|
|
157
156
|
|
|
158
157
|
export default SheelTabelCell;
|
|
@@ -888,6 +888,10 @@ p {
|
|
|
888
888
|
color: inherit;
|
|
889
889
|
background: inherit;
|
|
890
890
|
}
|
|
891
|
+
#lm_protable_warp .lm_protable .ant-table td.unselection.row_selection_td:first-child {
|
|
892
|
+
z-index: 1;
|
|
893
|
+
background-color: #fff;
|
|
894
|
+
}
|
|
891
895
|
#lm_protable_warp .lm_protable .ant-table td.selected,
|
|
892
896
|
#lm_protable_warp .lm_protable .ant-table td.editing {
|
|
893
897
|
border: 1px solid var(--primary-color);
|
|
@@ -1570,6 +1574,21 @@ p {
|
|
|
1570
1574
|
.ant-table.ant-table-middle tfoot > tr > td {
|
|
1571
1575
|
padding: 12px 8px !important;
|
|
1572
1576
|
}
|
|
1577
|
+
button.ant-table-row-expand-icon,
|
|
1578
|
+
button.ant-table-row-expand-icon:focus {
|
|
1579
|
+
border-color: #bfbfbf;
|
|
1580
|
+
}
|
|
1581
|
+
button.ant-table-row-expand-icon:hover {
|
|
1582
|
+
border-color: #40a9ff;
|
|
1583
|
+
}
|
|
1584
|
+
button.ant-table-row-expand-icon:hover::before,
|
|
1585
|
+
button.ant-table-row-expand-icon:hover::after {
|
|
1586
|
+
color: #40a9ff;
|
|
1587
|
+
}
|
|
1588
|
+
button.ant-table-row-expand-icon::before,
|
|
1589
|
+
button.ant-table-row-expand-icon::after {
|
|
1590
|
+
color: #bfbfbf;
|
|
1591
|
+
}
|
|
1573
1592
|
.ant-table-tbody > tr.ant-table-measure-row > td {
|
|
1574
1593
|
padding: 0 !important;
|
|
1575
1594
|
}
|
|
@@ -377,6 +377,10 @@
|
|
|
377
377
|
color: inherit;
|
|
378
378
|
background: inherit;
|
|
379
379
|
}
|
|
380
|
+
#lm_protable_warp .lm_protable .ant-table td.unselection.row_selection_td:first-child {
|
|
381
|
+
z-index: 1;
|
|
382
|
+
background-color: #fff;
|
|
383
|
+
}
|
|
380
384
|
#lm_protable_warp .lm_protable .ant-table td.selected,
|
|
381
385
|
#lm_protable_warp .lm_protable .ant-table td.editing {
|
|
382
386
|
border: 1px solid var(--primary-color);
|
|
@@ -1059,6 +1063,21 @@
|
|
|
1059
1063
|
.ant-table.ant-table-middle tfoot > tr > td {
|
|
1060
1064
|
padding: 12px 8px !important;
|
|
1061
1065
|
}
|
|
1066
|
+
button.ant-table-row-expand-icon,
|
|
1067
|
+
button.ant-table-row-expand-icon:focus {
|
|
1068
|
+
border-color: #bfbfbf;
|
|
1069
|
+
}
|
|
1070
|
+
button.ant-table-row-expand-icon:hover {
|
|
1071
|
+
border-color: #40a9ff;
|
|
1072
|
+
}
|
|
1073
|
+
button.ant-table-row-expand-icon:hover::before,
|
|
1074
|
+
button.ant-table-row-expand-icon:hover::after {
|
|
1075
|
+
color: #40a9ff;
|
|
1076
|
+
}
|
|
1077
|
+
button.ant-table-row-expand-icon::before,
|
|
1078
|
+
button.ant-table-row-expand-icon::after {
|
|
1079
|
+
color: #bfbfbf;
|
|
1080
|
+
}
|
|
1062
1081
|
.ant-table-tbody > tr.ant-table-measure-row > td {
|
|
1063
1082
|
padding: 0 !important;
|
|
1064
1083
|
}
|