linkmore-design 1.1.39 → 1.1.41

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 (7) hide show
  1. package/dist/index.umd.js +19 -9
  2. package/dist/index.umd.min.js +1 -1
  3. package/es/LmTable/Table.js +16 -7
  4. package/es/LmTable/virTual/VirtualTable.js +4 -2
  5. package/lib/LmTable/Table.js +16 -7
  6. package/lib/LmTable/virTual/VirtualTable.js +4 -2
  7. package/package.json +1 -1
package/es/LmTable/Table.js CHANGED
@@ -936,7 +936,6 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
936
936
  var innerColumns = (0, _lodash.cloneDeep)(useColumns.filter(function (item) {
937
937
  return item.show !== false;
938
938
  }));
939
- traverseColumns(innerColumns, null);
940
939
  if (groupRowKeys === null || groupRowKeys === void 0 ? void 0 : groupRowKeys.length) {
941
940
  /** 如果是进行了行分组，则会生成一列dataIndex为Group的Col, 如果需要修改此处，请备注原因 */
942
941
  innerColumns = [{
@@ -948,6 +947,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
948
947
  fixed: 'left'
949
948
  }].concat((0, _toConsumableArray2.default)(innerColumns));
950
949
  }
950
+ traverseColumns(innerColumns, null);
951
951
  return sortOpen ? [sortDefaultColumnItem].concat((0, _toConsumableArray2.default)(innerColumns)) : innerColumns;
952
952
  }, [useColumns, sortOpen, selectIng, dataSource, groupRowKeys, commitIng]);
953
953
 
@@ -1182,6 +1182,12 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
1182
1182
  dataIndex = props.dataIndex,
1183
1183
  onResizeStop = props.onResizeStop,
1184
1184
  restProps = (0, _objectWithoutProperties2.default)(props, _excluded3);
1185
+ var style = customizeDataSource.length === 0 ? {
1186
+ width: width + 'px',
1187
+ position: 'static',
1188
+ left: 'auto',
1189
+ right: 'auto'
1190
+ } : {};
1185
1191
  if (!width) {
1186
1192
  return /*#__PURE__*/_react.default.createElement("th", restProps);
1187
1193
  }
@@ -1189,7 +1195,9 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
1189
1195
  return node.dataIndex === dataIndex;
1190
1196
  });
1191
1197
  if (!column || groupRowKeys.includes(dataIndex)) {
1192
- return /*#__PURE__*/_react.default.createElement("th", restProps);
1198
+ return /*#__PURE__*/_react.default.createElement("th", (0, _extends2.default)({}, restProps, {
1199
+ style: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, restProps.style), style)
1200
+ }));
1193
1201
  }
1194
1202
  return /*#__PURE__*/_react.default.createElement(_reactResizable.Resizable, {
1195
1203
  width: width,
@@ -1205,7 +1213,9 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
1205
1213
  draggableOpts: {
1206
1214
  enableUserSelectHack: false
1207
1215
  }
1208
- }, /*#__PURE__*/_react.default.createElement("th", restProps, /*#__PURE__*/_react.default.createElement(_HeaderCol.default, (0, _extends2.default)({
1216
+ }, /*#__PURE__*/_react.default.createElement("th", (0, _extends2.default)({}, restProps, {
1217
+ style: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, restProps.style), style)
1218
+ }), /*#__PURE__*/_react.default.createElement(_HeaderCol.default, (0, _extends2.default)({
1209
1219
  column: column
1210
1220
  }, props, {
1211
1221
  openRowGroup: openRowGroup,
@@ -1229,7 +1239,8 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
1229
1239
  if (virtual) {
1230
1240
  table = function InnerVirtualTable(props) {
1231
1241
  return /*#__PURE__*/_react.default.createElement(_virTual.VirtualTable, (0, _extends2.default)({}, props, {
1232
- isEmpty: !customizeDataSource.length
1242
+ isEmpty: !customizeDataSource.length,
1243
+ emptyProps: emptyProps
1233
1244
  }));
1234
1245
  };
1235
1246
  }
@@ -1274,9 +1285,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
1274
1285
  width: '100%'
1275
1286
  },
1276
1287
  ref: tableWarpRef
1277
- }, /*#__PURE__*/_react.default.createElement(_ConfigProvider.default
1278
- // locale={locale}
1279
- , {
1288
+ }, /*#__PURE__*/_react.default.createElement(_ConfigProvider.default, {
1280
1289
  renderEmpty: loading ? function () {
1281
1290
  return null;
1282
1291
  } : emptyProps ? function () {
package/es/LmTable/virTual/VirtualTable.js CHANGED
@@ -14,11 +14,13 @@ import { useVirtual } from 'react-virtual';
14
14
  import cls from 'classnames';
15
15
  import { TableContext, useRealive } from './context';
16
16
  import CustomizeRenderEmpty from '../components/customRenderEmpty';
17
+ import Empty from '../../Empty';
17
18
  var VirtualTable = /*#__PURE__*/React.memo(function (tableProps) {
18
19
  var _a, _b, _c, _d;
19
20
  var className = tableProps.className,
20
21
  isEmpty = tableProps.isEmpty,
21
- rest = __rest(tableProps, ["className", "isEmpty"]);
22
+ emptyProps = tableProps.emptyProps,
23
+ rest = __rest(tableProps, ["className", "isEmpty", "emptyProps"]);
22
24
  var bodyRef = useRef(null);
23
25
  var _useRealive = useRealive(),
24
26
  _useRealive2 = _slicedToArray(_useRealive, 2),
@@ -69,7 +71,7 @@ var VirtualTable = /*#__PURE__*/React.memo(function (tableProps) {
69
71
  }, isEmpty ? /*#__PURE__*/React.createElement("table", Object.assign({
70
72
  className: cls('lm_virtual_table', className),
71
73
  ref: bodyRef
72
- }, rest), /*#__PURE__*/React.createElement("tbody", null, /*#__PURE__*/React.createElement("tr", null, /*#__PURE__*/React.createElement("td", null, /*#__PURE__*/React.createElement(CustomizeRenderEmpty, null))))) : /*#__PURE__*/React.createElement("table", Object.assign({
74
+ }, rest), /*#__PURE__*/React.createElement("tbody", null, /*#__PURE__*/React.createElement("tr", null, /*#__PURE__*/React.createElement("td", null, emptyProps ? /*#__PURE__*/React.createElement(Empty, Object.assign({}, emptyProps), (emptyProps === null || emptyProps === void 0 ? void 0 : emptyProps.footer) || null) : /*#__PURE__*/React.createElement(CustomizeRenderEmpty, null))))) : /*#__PURE__*/React.createElement("table", Object.assign({
73
75
  className: cls('lm_virtual_table', className),
74
76
  ref: bodyRef
75
77
  }, rest)));
package/lib/LmTable/Table.js CHANGED
@@ -936,7 +936,6 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
936
936
  var innerColumns = (0, _lodash.cloneDeep)(useColumns.filter(function (item) {
937
937
  return item.show !== false;
938
938
  }));
939
- traverseColumns(innerColumns, null);
940
939
  if (groupRowKeys === null || groupRowKeys === void 0 ? void 0 : groupRowKeys.length) {
941
940
  /** 如果是进行了行分组，则会生成一列dataIndex为Group的Col, 如果需要修改此处，请备注原因 */
942
941
  innerColumns = [{
@@ -948,6 +947,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
948
947
  fixed: 'left'
949
948
  }].concat((0, _toConsumableArray2.default)(innerColumns));
950
949
  }
950
+ traverseColumns(innerColumns, null);
951
951
  return sortOpen ? [sortDefaultColumnItem].concat((0, _toConsumableArray2.default)(innerColumns)) : innerColumns;
952
952
  }, [useColumns, sortOpen, selectIng, dataSource, groupRowKeys, commitIng]);
953
953
 
@@ -1182,6 +1182,12 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
1182
1182
  dataIndex = props.dataIndex,
1183
1183
  onResizeStop = props.onResizeStop,
1184
1184
  restProps = (0, _objectWithoutProperties2.default)(props, _excluded3);
1185
+ var style = customizeDataSource.length === 0 ? {
1186
+ width: width + 'px',
1187
+ position: 'static',
1188
+ left: 'auto',
1189
+ right: 'auto'
1190
+ } : {};
1185
1191
  if (!width) {
1186
1192
  return /*#__PURE__*/_react.default.createElement("th", restProps);
1187
1193
  }
@@ -1189,7 +1195,9 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
1189
1195
  return node.dataIndex === dataIndex;
1190
1196
  });
1191
1197
  if (!column || groupRowKeys.includes(dataIndex)) {
1192
- return /*#__PURE__*/_react.default.createElement("th", restProps);
1198
+ return /*#__PURE__*/_react.default.createElement("th", (0, _extends2.default)({}, restProps, {
1199
+ style: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, restProps.style), style)
1200
+ }));
1193
1201
  }
1194
1202
  return /*#__PURE__*/_react.default.createElement(_reactResizable.Resizable, {
1195
1203
  width: width,
@@ -1205,7 +1213,9 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
1205
1213
  draggableOpts: {
1206
1214
  enableUserSelectHack: false
1207
1215
  }
1208
- }, /*#__PURE__*/_react.default.createElement("th", restProps, /*#__PURE__*/_react.default.createElement(_HeaderCol.default, (0, _extends2.default)({
1216
+ }, /*#__PURE__*/_react.default.createElement("th", (0, _extends2.default)({}, restProps, {
1217
+ style: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, restProps.style), style)
1218
+ }), /*#__PURE__*/_react.default.createElement(_HeaderCol.default, (0, _extends2.default)({
1209
1219
  column: column
1210
1220
  }, props, {
1211
1221
  openRowGroup: openRowGroup,
@@ -1229,7 +1239,8 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
1229
1239
  if (virtual) {
1230
1240
  table = function InnerVirtualTable(props) {
1231
1241
  return /*#__PURE__*/_react.default.createElement(_virTual.VirtualTable, (0, _extends2.default)({}, props, {
1232
- isEmpty: !customizeDataSource.length
1242
+ isEmpty: !customizeDataSource.length,
1243
+ emptyProps: emptyProps
1233
1244
  }));
1234
1245
  };
1235
1246
  }
@@ -1274,9 +1285,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
1274
1285
  width: '100%'
1275
1286
  },
1276
1287
  ref: tableWarpRef
1277
- }, /*#__PURE__*/_react.default.createElement(_ConfigProvider.default
1278
- // locale={locale}
1279
- , {
1288
+ }, /*#__PURE__*/_react.default.createElement(_ConfigProvider.default, {
1280
1289
  renderEmpty: loading ? function () {
1281
1290
  return null;
1282
1291
  } : emptyProps ? function () {
package/lib/LmTable/virTual/VirtualTable.js CHANGED
@@ -12,6 +12,7 @@ var _reactVirtual = require("react-virtual");
12
12
  var _classnames = _interopRequireDefault(require("classnames"));
13
13
  var _context = require("./context");
14
14
  var _customRenderEmpty = _interopRequireDefault(require("../components/customRenderEmpty"));
15
+ var _Empty = _interopRequireDefault(require("../../Empty"));
15
16
  var __rest = void 0 && (void 0).__rest || function (s, e) {
16
17
  var t = {};
17
18
  for (var p in s) {
@@ -26,7 +27,8 @@ var VirtualTable = /*#__PURE__*/_react.default.memo(function (tableProps) {
26
27
  var _a, _b, _c, _d;
27
28
  var className = tableProps.className,
28
29
  isEmpty = tableProps.isEmpty,
29
- rest = __rest(tableProps, ["className", "isEmpty"]);
30
+ emptyProps = tableProps.emptyProps,
31
+ rest = __rest(tableProps, ["className", "isEmpty", "emptyProps"]);
30
32
  var bodyRef = (0, _react.useRef)(null);
31
33
  var _useRealive = (0, _context.useRealive)(),
32
34
  _useRealive2 = (0, _slicedToArray2.default)(_useRealive, 2),
@@ -77,7 +79,7 @@ var VirtualTable = /*#__PURE__*/_react.default.memo(function (tableProps) {
77
79
  }, isEmpty ? /*#__PURE__*/_react.default.createElement("table", Object.assign({
78
80
  className: (0, _classnames.default)('lm_virtual_table', className),
79
81
  ref: bodyRef
80
- }, rest), /*#__PURE__*/_react.default.createElement("tbody", null, /*#__PURE__*/_react.default.createElement("tr", null, /*#__PURE__*/_react.default.createElement("td", null, /*#__PURE__*/_react.default.createElement(_customRenderEmpty.default, null))))) : /*#__PURE__*/_react.default.createElement("table", Object.assign({
82
+ }, rest), /*#__PURE__*/_react.default.createElement("tbody", null, /*#__PURE__*/_react.default.createElement("tr", null, /*#__PURE__*/_react.default.createElement("td", null, emptyProps ? /*#__PURE__*/_react.default.createElement(_Empty.default, Object.assign({}, emptyProps), (emptyProps === null || emptyProps === void 0 ? void 0 : emptyProps.footer) || null) : /*#__PURE__*/_react.default.createElement(_customRenderEmpty.default, null))))) : /*#__PURE__*/_react.default.createElement("table", Object.assign({
81
83
  className: (0, _classnames.default)('lm_virtual_table', className),
82
84
  ref: bodyRef
83
85
  }, rest)));
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "linkmore-design",
3
- "version": "1.1.39",
3
+ "version": "1.1.41",
4
4
  "author": {
5
5
  "name": "nowthen",
6
6
  "email": "rnlvwyx@gmail.com"