linkmore-design 1.0.37 → 1.0.40

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.
@@ -5,6 +5,7 @@
5
5
  align-items: center;
6
6
  justify-content: center;
7
7
  vertical-align: middle;
8
+ box-shadow: none;
8
9
  }
9
10
  .ant-btn.lm-button .anticon {
10
11
  font-size: 12px;
@@ -14,6 +15,7 @@
14
15
  margin-left: 4px;
15
16
  overflow: hidden;
16
17
  white-space: nowrap;
18
+ max-width: 96px;
17
19
  }
18
20
  .ant-btn.lm-button > span:not(.anticon) {
19
21
  display: inline-block;
@@ -31,6 +33,7 @@
31
33
  .ant-btn.lm-button > span:not(.anticon) {
32
34
  font-size: 12px;
33
35
  line-height: 20px;
36
+ max-width: 96px;
34
37
  }
35
38
  .ant-btn.lm-button-small {
36
39
  height: 24px;
@@ -44,7 +47,7 @@
44
47
  .ant-btn.lm-button-middle {
45
48
  height: 32px;
46
49
  padding: 6px 12px;
47
- max-width: 120px;
50
+ max-width: 142px;
48
51
  }
49
52
  .ant-btn.lm-button-middle .anticon {
50
53
  font-size: 16px;
@@ -507,8 +507,8 @@ html {
507
507
  display: flex;
508
508
  flex-wrap: wrap;
509
509
  font-size: 12px;
510
- gap: 8px;
511
- margin-bottom: 8px;
510
+ gap: 12px;
511
+ margin-bottom: 12px;
512
512
  }
513
513
  .lm_filter_base .filter_custom {
514
514
  display: inline-flex;
@@ -88,12 +88,11 @@ var LMCustomTableOption = /*#__PURE__*/forwardRef(function (props, ref) {
88
88
  setVisible(false);
89
89
  };
90
90
 
91
- return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(IconFont, {
92
- type: 'lmweb-setting',
93
- style: {
94
- fontSize: '20px'
95
- },
96
- onClick: openSetting
91
+ return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Button, {
92
+ onClick: openSetting,
93
+ icon: /*#__PURE__*/React.createElement(IconFont, {
94
+ type: 'lmweb-setting'
95
+ })
97
96
  }), /*#__PURE__*/React.createElement(Drawer, {
98
97
  className: classNames(className, prefixCls),
99
98
  title: "\u4E2A\u6027\u5316\u8BBE\u7F6E",
@@ -506,7 +506,7 @@ html {
506
506
  .lm_grid_tree {
507
507
  position: relative;
508
508
  font-size: 12px;
509
- height: calc(100% - 36px);
509
+ height: calc(100% - 39px);
510
510
  width: 168px;
511
511
  border: 1px solid var(--line-color);
512
512
  transition: all 0.3s;
@@ -16,7 +16,7 @@ var __rest = this && this.__rest || function (s, e) {
16
16
  return t;
17
17
  };
18
18
 
19
- import { useEvent } from '@/hooks';
19
+ import { useEvent } from '../hooks';
20
20
  import { useControllableValue } from 'ahooks';
21
21
  import cn from 'classnames';
22
22
  import { Button, Checkbox, Dropdown, Input } from 'linkmore-design';
@@ -15,7 +15,7 @@ var __rest = this && this.__rest || function (s, e) {
15
15
  return t;
16
16
  };
17
17
 
18
- import { useEvent } from '@/hooks';
18
+ import { useEvent } from '../hooks';
19
19
  import classNames from 'classnames';
20
20
  import React, { forwardRef, useMemo } from 'react';
21
21
  import { useCheckboxOptions } from './useCheckboxOptions';
@@ -14,7 +14,7 @@ var __rest = this && this.__rest || function (s, e) {
14
14
  return t;
15
15
  };
16
16
 
17
- import { useEvent } from '@/hooks';
17
+ import { useEvent } from '../hooks';
18
18
  import { useControllableValue } from 'ahooks';
19
19
  import classNames from 'classnames';
20
20
  import { Checkbox, VirtualList } from 'linkmore-design';
@@ -13,29 +13,53 @@ require("antd/es/config-provider/style");
13
13
 
14
14
  var _configProvider = _interopRequireDefault(require("antd/es/config-provider"));
15
15
 
16
- var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/extends"));
17
-
18
16
  var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/toConsumableArray"));
19
17
 
20
18
  var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
21
19
 
20
+ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/extends"));
21
+
22
22
  var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/slicedToArray"));
23
23
 
24
24
  var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectWithoutProperties"));
25
25
 
26
+ var _icons = require("@ant-design/icons");
27
+
26
28
  var _proTable = _interopRequireDefault(require("@ant-design/pro-table"));
27
29
 
30
+ var _sortable = require("@dnd-kit/sortable");
31
+
28
32
  var _lodash = require("lodash");
29
33
 
30
34
  var _react = _interopRequireWildcard(require("react"));
31
35
 
36
+ var _reactSortableHoc = require("react-sortable-hoc");
37
+
32
38
  var _empty = _interopRequireDefault(require("./assets/empty.png"));
33
39
 
34
40
  var _resetConfig = _interopRequireDefault(require("./resetConfig"));
35
41
 
36
- var _excluded = ["dataSource", "autoSize", "columns", "rowClick", "onDoubleClick", "checkConfig", "summary", "pagination", "hiddenPage", "loading", "virtual", "customCheck", "rowSelection", "columnsState", "tableRowType"];
42
+ var _excluded = ["dataSource", "autoSize", "columns", "rowClick", "onDoubleClick", "checkConfig", "summary", "pagination", "hiddenPage", "loading", "virtual", "sortOpen", "customCheck", "rowSelection", "columnsState", "tableRowType"],
43
+ _excluded2 = ["className", "style"];
37
44
  var Summary = _proTable.default.Summary;
38
45
  exports.Summary = Summary;
46
+ var DragHandle = (0, _reactSortableHoc.SortableHandle)(function () {
47
+ return /*#__PURE__*/_react.default.createElement(_icons.MenuOutlined, {
48
+ style: {
49
+ cursor: 'grab',
50
+ color: '#999'
51
+ }
52
+ });
53
+ });
54
+ var sortDefaultColumnItem = {
55
+ title: '排序',
56
+ dataIndex: 'sort',
57
+ width: 60,
58
+ className: 'drag-visible',
59
+ render: function render() {
60
+ return /*#__PURE__*/_react.default.createElement(DragHandle, null);
61
+ }
62
+ };
39
63
  var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
40
64
  var dataSource = props.dataSource,
41
65
  autoSize = props.autoSize,
@@ -49,6 +73,8 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
49
73
  loading = props.loading,
50
74
  _props$virtual = props.virtual,
51
75
  virtual = _props$virtual === void 0 ? false : _props$virtual,
76
+ _props$sortOpen = props.sortOpen,
77
+ sortOpen = _props$sortOpen === void 0 ? false : _props$sortOpen,
52
78
  customCheck = props.customCheck,
53
79
  rowSelection = props.rowSelection,
54
80
  columnsState = props.columnsState,
@@ -81,7 +107,48 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
81
107
  var _useState7 = (0, _react.useState)(),
82
108
  _useState8 = (0, _slicedToArray2.default)(_useState7, 2),
83
109
  columnsStateMap = _useState8[0],
84
- setColumnsStateMap = _useState8[1]; // 原宽度,先宽度,序号
110
+ setColumnsStateMap = _useState8[1];
111
+
112
+ var SortableItem = (0, _reactSortableHoc.SortableElement)(function (props) {
113
+ return /*#__PURE__*/_react.default.createElement("tr", props);
114
+ });
115
+ var SortContainer = (0, _reactSortableHoc.SortableContainer)(function (props) {
116
+ return /*#__PURE__*/_react.default.createElement("tbody", props);
117
+ });
118
+
119
+ var onSortEnd = function onSortEnd(_ref) {
120
+ var oldIndex = _ref.oldIndex,
121
+ newIndex = _ref.newIndex;
122
+
123
+ if (oldIndex !== newIndex) {
124
+ var newData = (0, _sortable.arrayMove)(dataSource, oldIndex, newIndex).filter(function (el) {
125
+ return !!el;
126
+ });
127
+ console.log(newData, 'nnnnnn'); // setDataSource([...newData])
128
+ }
129
+ };
130
+
131
+ var DraggableContainer = function DraggableContainer(props) {
132
+ return /*#__PURE__*/_react.default.createElement(SortContainer, (0, _extends2.default)({
133
+ useDragHandle: true,
134
+ disableAutoscroll: true,
135
+ helperClass: "row-dragging",
136
+ onSortEnd: onSortEnd
137
+ }, props));
138
+ };
139
+
140
+ var DraggableBodyRow = function DraggableBodyRow(props) {
141
+ var className = props.className,
142
+ style = props.style,
143
+ restProps = (0, _objectWithoutProperties2.default)(props, _excluded2);
144
+ var index = dataSource.findIndex(function (x) {
145
+ return x[rowKey || 'index'] === restProps['data-row-key'];
146
+ });
147
+ console.log(dataSource, restProps, 222, index);
148
+ return /*#__PURE__*/_react.default.createElement(SortableItem, (0, _extends2.default)({
149
+ index: index
150
+ }, restProps));
151
+ }; // 原宽度,先宽度,序号
85
152
 
86
153
 
87
154
  var handleResize = function handleResize(sc, size, index) {
@@ -98,7 +165,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
98
165
  };
99
166
 
100
167
  var resetColumns = (0, _react.useCallback)(function () {
101
- return useColumns.filter(function (item) {
168
+ var result = useColumns.filter(function (item) {
102
169
  return item.show !== false;
103
170
  }).map(function (col, index) {
104
171
  return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, col), {}, {
@@ -113,7 +180,9 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
113
180
  }
114
181
  });
115
182
  });
116
- }, [useColumns]);
183
+ console.log(sortOpen ? [sortDefaultColumnItem].concat((0, _toConsumableArray2.default)(result)) : result, sortOpen, 111);
184
+ return sortOpen ? [sortDefaultColumnItem].concat((0, _toConsumableArray2.default)(result)) : result;
185
+ }, [useColumns, sortOpen]);
117
186
  (0, _react.useEffect)(function () {
118
187
  setColumns(columns);
119
188
  }, [columns]); // 行点击事件
@@ -250,10 +319,10 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
250
319
  var obj = (0, _objectSpread2.default)({}, columnsState);
251
320
  columns === null || columns === void 0 ? void 0 : columns.forEach(function (item) {
252
321
  /** 目前支持三种 */
253
- var _ref = obj[item.dataIndex || item.key] || {},
254
- order = _ref.order,
255
- show = _ref.show,
256
- fixed = _ref.fixed;
322
+ var _ref2 = obj[item.dataIndex || item.key] || {},
323
+ order = _ref2.order,
324
+ show = _ref2.show,
325
+ fixed = _ref2.fixed;
257
326
 
258
327
  obj[item.dataIndex || item.key] = {
259
328
  fixed: fixed || item.fixed,
@@ -322,7 +391,12 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
322
391
  }, /*#__PURE__*/_react.default.createElement(_proTable.default, (0, _extends2.default)({}, config, {
323
392
  loading: loading,
324
393
  dataSource: dataSource,
325
- components: virtual ? vComponents : null,
394
+ components: sortOpen ? {
395
+ body: {
396
+ wrapper: DraggableContainer,
397
+ row: DraggableBodyRow
398
+ }
399
+ } : null,
326
400
  tableClassName: "lm_protable",
327
401
  summary: function summary(pageData) {
328
402
  return _summary && _summary(pageData, resultColumns);
@@ -1410,3 +1410,16 @@ html {
1410
1410
  height: 48px;
1411
1411
  display: flex;
1412
1412
  }
1413
+ .row-dragging {
1414
+ background: var(--color-6);
1415
+ border: 1px solid var(--color-6);
1416
+ display: flex;
1417
+ align-items: center;
1418
+ font-size: 12px;
1419
+ }
1420
+ .row-dragging td {
1421
+ padding: 16px;
1422
+ }
1423
+ .row-dragging .drag-visible {
1424
+ visibility: visible;
1425
+ }
@@ -28,15 +28,15 @@
28
28
  }
29
29
  .lm-radio-group .ant-radio-button-wrapper {
30
30
  font-size: 12px;
31
- line-height: 30px;
32
31
  height: 32px;
33
- padding: 1px 12px;
32
+ padding: 0px 12px;
34
33
  color: var(--font-color);
35
34
  vertical-align: middle;
36
35
  }
37
36
  .lm-radio-group .ant-radio-button-wrapper .anticon {
38
37
  font-size: 16px;
39
38
  vertical-align: middle;
39
+ line-height: 1;
40
40
  }
41
41
  .lm-radio-group .ant-radio-button-wrapper:hover {
42
42
  color: var(--primary-color);
@@ -44,7 +44,6 @@
44
44
  .lm-radio-group .ant-radio-button-wrapper > span:last-child {
45
45
  display: inline-block;
46
46
  font-size: 12px;
47
- line-height: 30px;
48
47
  max-width: 96px;
49
48
  overflow: hidden;
50
49
  white-space: nowrap;
@@ -73,7 +72,7 @@
73
72
  .lm-radio-group.ant-radio-group-small .ant-radio-button-wrapper {
74
73
  line-height: 22px;
75
74
  height: 24px;
76
- padding: 1px 8px;
75
+ padding: 0px 8px;
77
76
  }
78
77
  .lm-radio-group.ant-radio-group-small .ant-radio-button-wrapper > span:last-child {
79
78
  line-height: 22px;
@@ -5,6 +5,7 @@
5
5
  align-items: center;
6
6
  justify-content: center;
7
7
  vertical-align: middle;
8
+ box-shadow: none;
8
9
  }
9
10
  .ant-btn.lm-button .anticon {
10
11
  font-size: 12px;
@@ -14,6 +15,7 @@
14
15
  margin-left: 4px;
15
16
  overflow: hidden;
16
17
  white-space: nowrap;
18
+ max-width: 96px;
17
19
  }
18
20
  .ant-btn.lm-button > span:not(.anticon) {
19
21
  display: inline-block;
@@ -31,6 +33,7 @@
31
33
  .ant-btn.lm-button > span:not(.anticon) {
32
34
  font-size: 12px;
33
35
  line-height: 20px;
36
+ max-width: 96px;
34
37
  }
35
38
  .ant-btn.lm-button-small {
36
39
  height: 24px;
@@ -44,7 +47,7 @@
44
47
  .ant-btn.lm-button-middle {
45
48
  height: 32px;
46
49
  padding: 6px 12px;
47
- max-width: 120px;
50
+ max-width: 142px;
48
51
  }
49
52
  .ant-btn.lm-button-middle .anticon {
50
53
  font-size: 16px;
@@ -507,8 +507,8 @@ html {
507
507
  display: flex;
508
508
  flex-wrap: wrap;
509
509
  font-size: 12px;
510
- gap: 8px;
511
- margin-bottom: 8px;
510
+ gap: 12px;
511
+ margin-bottom: 12px;
512
512
  }
513
513
  .lm_filter_base .filter_custom {
514
514
  display: inline-flex;
@@ -104,12 +104,11 @@ var LMCustomTableOption = /*#__PURE__*/(0, _react.forwardRef)(function (props, r
104
104
  setVisible(false);
105
105
  };
106
106
 
107
- return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.IconFont, {
108
- type: 'lmweb-setting',
109
- style: {
110
- fontSize: '20px'
111
- },
112
- onClick: openSetting
107
+ return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
108
+ onClick: openSetting,
109
+ icon: /*#__PURE__*/_react.default.createElement(_linkmoreDesign.IconFont, {
110
+ type: 'lmweb-setting'
111
+ })
113
112
  }), /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Drawer, {
114
113
  className: (0, _classnames.default)(className, prefixCls),
115
114
  title: "\u4E2A\u6027\u5316\u8BBE\u7F6E",
@@ -506,7 +506,7 @@ html {
506
506
  .lm_grid_tree {
507
507
  position: relative;
508
508
  font-size: 12px;
509
- height: calc(100% - 36px);
509
+ height: calc(100% - 39px);
510
510
  width: 168px;
511
511
  border: 1px solid var(--line-color);
512
512
  transition: all 0.3s;
@@ -17,7 +17,7 @@ var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers
17
17
 
18
18
  var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
19
19
 
20
- var _hooks = require("@/hooks");
20
+ var _hooks = require("../hooks");
21
21
 
22
22
  var _ahooks = require("ahooks");
23
23
 
@@ -15,7 +15,7 @@ var _select = _interopRequireDefault(require("antd/es/select"));
15
15
 
16
16
  var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
17
17
 
18
- var _hooks = require("@/hooks");
18
+ var _hooks = require("../hooks");
19
19
 
20
20
  var _classnames = _interopRequireDefault(require("classnames"));
21
21
 
@@ -13,7 +13,7 @@ var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers
13
13
 
14
14
  var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
15
15
 
16
- var _hooks = require("@/hooks");
16
+ var _hooks = require("../hooks");
17
17
 
18
18
  var _ahooks = require("ahooks");
19
19
 
@@ -13,29 +13,53 @@ require("antd/es/config-provider/style");
13
13
 
14
14
  var _configProvider = _interopRequireDefault(require("antd/es/config-provider"));
15
15
 
16
- var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
17
-
18
16
  var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
19
17
 
20
18
  var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
21
19
 
20
+ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
21
+
22
22
  var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
23
23
 
24
24
  var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
25
25
 
26
+ var _icons = require("@ant-design/icons");
27
+
26
28
  var _proTable = _interopRequireDefault(require("@ant-design/pro-table"));
27
29
 
30
+ var _sortable = require("@dnd-kit/sortable");
31
+
28
32
  var _lodash = require("lodash");
29
33
 
30
34
  var _react = _interopRequireWildcard(require("react"));
31
35
 
36
+ var _reactSortableHoc = require("react-sortable-hoc");
37
+
32
38
  var _empty = _interopRequireDefault(require("./assets/empty.png"));
33
39
 
34
40
  var _resetConfig = _interopRequireDefault(require("./resetConfig"));
35
41
 
36
- var _excluded = ["dataSource", "autoSize", "columns", "rowClick", "onDoubleClick", "checkConfig", "summary", "pagination", "hiddenPage", "loading", "virtual", "customCheck", "rowSelection", "columnsState", "tableRowType"];
42
+ var _excluded = ["dataSource", "autoSize", "columns", "rowClick", "onDoubleClick", "checkConfig", "summary", "pagination", "hiddenPage", "loading", "virtual", "sortOpen", "customCheck", "rowSelection", "columnsState", "tableRowType"],
43
+ _excluded2 = ["className", "style"];
37
44
  var Summary = _proTable.default.Summary;
38
45
  exports.Summary = Summary;
46
+ var DragHandle = (0, _reactSortableHoc.SortableHandle)(function () {
47
+ return /*#__PURE__*/_react.default.createElement(_icons.MenuOutlined, {
48
+ style: {
49
+ cursor: 'grab',
50
+ color: '#999'
51
+ }
52
+ });
53
+ });
54
+ var sortDefaultColumnItem = {
55
+ title: '排序',
56
+ dataIndex: 'sort',
57
+ width: 60,
58
+ className: 'drag-visible',
59
+ render: function render() {
60
+ return /*#__PURE__*/_react.default.createElement(DragHandle, null);
61
+ }
62
+ };
39
63
  var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
40
64
  var dataSource = props.dataSource,
41
65
  autoSize = props.autoSize,
@@ -49,6 +73,8 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
49
73
  loading = props.loading,
50
74
  _props$virtual = props.virtual,
51
75
  virtual = _props$virtual === void 0 ? false : _props$virtual,
76
+ _props$sortOpen = props.sortOpen,
77
+ sortOpen = _props$sortOpen === void 0 ? false : _props$sortOpen,
52
78
  customCheck = props.customCheck,
53
79
  rowSelection = props.rowSelection,
54
80
  columnsState = props.columnsState,
@@ -81,7 +107,48 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
81
107
  var _useState7 = (0, _react.useState)(),
82
108
  _useState8 = (0, _slicedToArray2.default)(_useState7, 2),
83
109
  columnsStateMap = _useState8[0],
84
- setColumnsStateMap = _useState8[1]; // 原宽度,先宽度,序号
110
+ setColumnsStateMap = _useState8[1];
111
+
112
+ var SortableItem = (0, _reactSortableHoc.SortableElement)(function (props) {
113
+ return /*#__PURE__*/_react.default.createElement("tr", props);
114
+ });
115
+ var SortContainer = (0, _reactSortableHoc.SortableContainer)(function (props) {
116
+ return /*#__PURE__*/_react.default.createElement("tbody", props);
117
+ });
118
+
119
+ var onSortEnd = function onSortEnd(_ref) {
120
+ var oldIndex = _ref.oldIndex,
121
+ newIndex = _ref.newIndex;
122
+
123
+ if (oldIndex !== newIndex) {
124
+ var newData = (0, _sortable.arrayMove)(dataSource, oldIndex, newIndex).filter(function (el) {
125
+ return !!el;
126
+ });
127
+ console.log(newData, 'nnnnnn'); // setDataSource([...newData])
128
+ }
129
+ };
130
+
131
+ var DraggableContainer = function DraggableContainer(props) {
132
+ return /*#__PURE__*/_react.default.createElement(SortContainer, (0, _extends2.default)({
133
+ useDragHandle: true,
134
+ disableAutoscroll: true,
135
+ helperClass: "row-dragging",
136
+ onSortEnd: onSortEnd
137
+ }, props));
138
+ };
139
+
140
+ var DraggableBodyRow = function DraggableBodyRow(props) {
141
+ var className = props.className,
142
+ style = props.style,
143
+ restProps = (0, _objectWithoutProperties2.default)(props, _excluded2);
144
+ var index = dataSource.findIndex(function (x) {
145
+ return x[rowKey || 'index'] === restProps['data-row-key'];
146
+ });
147
+ console.log(dataSource, restProps, 222, index);
148
+ return /*#__PURE__*/_react.default.createElement(SortableItem, (0, _extends2.default)({
149
+ index: index
150
+ }, restProps));
151
+ }; // 原宽度,先宽度,序号
85
152
 
86
153
 
87
154
  var handleResize = function handleResize(sc, size, index) {
@@ -98,7 +165,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
98
165
  };
99
166
 
100
167
  var resetColumns = (0, _react.useCallback)(function () {
101
- return useColumns.filter(function (item) {
168
+ var result = useColumns.filter(function (item) {
102
169
  return item.show !== false;
103
170
  }).map(function (col, index) {
104
171
  return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, col), {}, {
@@ -113,7 +180,9 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
113
180
  }
114
181
  });
115
182
  });
116
- }, [useColumns]);
183
+ console.log(sortOpen ? [sortDefaultColumnItem].concat((0, _toConsumableArray2.default)(result)) : result, sortOpen, 111);
184
+ return sortOpen ? [sortDefaultColumnItem].concat((0, _toConsumableArray2.default)(result)) : result;
185
+ }, [useColumns, sortOpen]);
117
186
  (0, _react.useEffect)(function () {
118
187
  setColumns(columns);
119
188
  }, [columns]); // 行点击事件
@@ -250,10 +319,10 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
250
319
  var obj = (0, _objectSpread2.default)({}, columnsState);
251
320
  columns === null || columns === void 0 ? void 0 : columns.forEach(function (item) {
252
321
  /** 目前支持三种 */
253
- var _ref = obj[item.dataIndex || item.key] || {},
254
- order = _ref.order,
255
- show = _ref.show,
256
- fixed = _ref.fixed;
322
+ var _ref2 = obj[item.dataIndex || item.key] || {},
323
+ order = _ref2.order,
324
+ show = _ref2.show,
325
+ fixed = _ref2.fixed;
257
326
 
258
327
  obj[item.dataIndex || item.key] = {
259
328
  fixed: fixed || item.fixed,
@@ -322,7 +391,12 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
322
391
  }, /*#__PURE__*/_react.default.createElement(_proTable.default, (0, _extends2.default)({}, config, {
323
392
  loading: loading,
324
393
  dataSource: dataSource,
325
- components: virtual ? vComponents : null,
394
+ components: sortOpen ? {
395
+ body: {
396
+ wrapper: DraggableContainer,
397
+ row: DraggableBodyRow
398
+ }
399
+ } : null,
326
400
  tableClassName: "lm_protable",
327
401
  summary: function summary(pageData) {
328
402
  return _summary && _summary(pageData, resultColumns);
@@ -1410,3 +1410,16 @@ html {
1410
1410
  height: 48px;
1411
1411
  display: flex;
1412
1412
  }
1413
+ .row-dragging {
1414
+ background: var(--color-6);
1415
+ border: 1px solid var(--color-6);
1416
+ display: flex;
1417
+ align-items: center;
1418
+ font-size: 12px;
1419
+ }
1420
+ .row-dragging td {
1421
+ padding: 16px;
1422
+ }
1423
+ .row-dragging .drag-visible {
1424
+ visibility: visible;
1425
+ }
@@ -28,15 +28,15 @@
28
28
  }
29
29
  .lm-radio-group .ant-radio-button-wrapper {
30
30
  font-size: 12px;
31
- line-height: 30px;
32
31
  height: 32px;
33
- padding: 1px 12px;
32
+ padding: 0px 12px;
34
33
  color: var(--font-color);
35
34
  vertical-align: middle;
36
35
  }
37
36
  .lm-radio-group .ant-radio-button-wrapper .anticon {
38
37
  font-size: 16px;
39
38
  vertical-align: middle;
39
+ line-height: 1;
40
40
  }
41
41
  .lm-radio-group .ant-radio-button-wrapper:hover {
42
42
  color: var(--primary-color);
@@ -44,7 +44,6 @@
44
44
  .lm-radio-group .ant-radio-button-wrapper > span:last-child {
45
45
  display: inline-block;
46
46
  font-size: 12px;
47
- line-height: 30px;
48
47
  max-width: 96px;
49
48
  overflow: hidden;
50
49
  white-space: nowrap;
@@ -73,7 +72,7 @@
73
72
  .lm-radio-group.ant-radio-group-small .ant-radio-button-wrapper {
74
73
  line-height: 22px;
75
74
  height: 24px;
76
- padding: 1px 8px;
75
+ padding: 0px 8px;
77
76
  }
78
77
  .lm-radio-group.ant-radio-group-small .ant-radio-button-wrapper > span:last-child {
79
78
  line-height: 22px;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "linkmore-design",
3
- "version": "1.0.37",
3
+ "version": "1.0.40",
4
4
  "author": {
5
5
  "name": "nowthen",
6
6
  "email": "rnlvwyx@gmail.com"
@@ -66,6 +66,7 @@
66
66
  "react-cookies": "^0.1.1",
67
67
  "react-query": "^3.34.15",
68
68
  "react-resizable": "^3.0.4",
69
+ "react-sortable-hoc": "^2.0.0",
69
70
  "react-virtual": "^2.10.4",
70
71
  "react-virtualized-auto-sizer": "^1.0.6",
71
72
  "react-window": "^1.8.6",