linkmore-design 1.1.40 → 1.1.42

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/dist/index.umd.js +14 -8
  2. package/dist/index.umd.min.js +1 -1
  3. package/es/LmTable/Table.js +2 -1
  4. package/es/LmTable/components/CalcExpression.js +10 -6
  5. package/es/LmTable/virTual/VirtualTable.js +4 -2
  6. package/lib/LmTable/Table.js +2 -1
  7. package/lib/LmTable/components/CalcExpression.js +11 -7
  8. package/lib/LmTable/virTual/VirtualTable.js +4 -2
  9. package/package.json +1 -1
package/es/LmTable/Table.js CHANGED
@@ -1239,7 +1239,8 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
1239
1239
  if (virtual) {
1240
1240
  table = function InnerVirtualTable(props) {
1241
1241
  return /*#__PURE__*/_react.default.createElement(_virTual.VirtualTable, (0, _extends2.default)({}, props, {
1242
- isEmpty: !customizeDataSource.length
1242
+ isEmpty: !customizeDataSource.length,
1243
+ emptyProps: emptyProps
1243
1244
  }));
1244
1245
  };
1245
1246
  }
package/es/LmTable/components/CalcExpression.js CHANGED
@@ -8,7 +8,7 @@ var __rest = this && this.__rest || function (s, e) {
8
8
  }
9
9
  return t;
10
10
  };
11
- import React, { useEffect } from 'react';
11
+ import React from 'react';
12
12
  import { omit } from 'lodash';
13
13
  import calc, { reset } from '../expression';
14
14
  import Select from '../../Select';
@@ -96,12 +96,16 @@ var CalcExpression = function CalcExpression(props) {
96
96
  }
97
97
  onExpressionChange && onExpressionChange(col, value);
98
98
  };
99
- useEffect(function () {
99
+ // useEffect(() => {
100
+ // // 使用默认值初始化
101
+ // if (col?.defaultExpression) {
102
+ // onChangeRecord(dfs, col.dataIndex, col?.defaultExpression, false)
103
+ // }
104
+ // }, [col?.defaultExpression])
105
+ if (col === null || col === void 0 ? void 0 : col.defaultExpression) {
100
106
  // 使用默认值初始化
101
- if (col === null || col === void 0 ? void 0 : col.defaultExpression) {
102
- onChangeRecord(dfs, col.dataIndex, col === null || col === void 0 ? void 0 : col.defaultExpression, false);
103
- }
104
- }, [col === null || col === void 0 ? void 0 : col.defaultExpression]);
107
+ onChangeRecord(dfs, col.dataIndex, col === null || col === void 0 ? void 0 : col.defaultExpression, false);
108
+ }
105
109
  if (record && record._group && isShowSelect && (col === null || col === void 0 ? void 0 : col.dataIndex)) {
106
110
  var select = Object.assign({
107
111
  placeholder: '不计算',
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
@@ -1239,7 +1239,8 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
1239
1239
  if (virtual) {
1240
1240
  table = function InnerVirtualTable(props) {
1241
1241
  return /*#__PURE__*/_react.default.createElement(_virTual.VirtualTable, (0, _extends2.default)({}, props, {
1242
- isEmpty: !customizeDataSource.length
1242
+ isEmpty: !customizeDataSource.length,
1243
+ emptyProps: emptyProps
1243
1244
  }));
1244
1245
  };
1245
1246
  }
package/lib/LmTable/components/CalcExpression.js CHANGED
@@ -1,12 +1,12 @@
1
1
  "use strict";
2
2
 
3
- var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
3
  var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
4
+ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
5
5
  Object.defineProperty(exports, "__esModule", {
6
6
  value: true
7
7
  });
8
8
  exports.default = void 0;
9
- var _react = _interopRequireWildcard(require("react"));
9
+ var _react = _interopRequireDefault(require("react"));
10
10
  var _lodash = require("lodash");
11
11
  var _expression = _interopRequireWildcard(require("../expression"));
12
12
  var _Select = _interopRequireDefault(require("../../Select"));
@@ -104,12 +104,16 @@ var CalcExpression = function CalcExpression(props) {
104
104
  }
105
105
  onExpressionChange && onExpressionChange(col, value);
106
106
  };
107
- (0, _react.useEffect)(function () {
107
+ // useEffect(() => {
108
+ // // 使用默认值初始化
109
+ // if (col?.defaultExpression) {
110
+ // onChangeRecord(dfs, col.dataIndex, col?.defaultExpression, false)
111
+ // }
112
+ // }, [col?.defaultExpression])
113
+ if (col === null || col === void 0 ? void 0 : col.defaultExpression) {
108
114
  // 使用默认值初始化
109
- if (col === null || col === void 0 ? void 0 : col.defaultExpression) {
110
- onChangeRecord(dfs, col.dataIndex, col === null || col === void 0 ? void 0 : col.defaultExpression, false);
111
- }
112
- }, [col === null || col === void 0 ? void 0 : col.defaultExpression]);
115
+ onChangeRecord(dfs, col.dataIndex, col === null || col === void 0 ? void 0 : col.defaultExpression, false);
116
+ }
113
117
  if (record && record._group && isShowSelect && (col === null || col === void 0 ? void 0 : col.dataIndex)) {
114
118
  var select = Object.assign({
115
119
  placeholder: '不计算',
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.40",
3
+ "version": "1.1.42",
4
4
  "author": {
5
5
  "name": "nowthen",
6
6
  "email": "rnlvwyx@gmail.com"