linkmore-design 1.1.27-beta.5 → 1.1.28

package/lib/LmTable/expression.d.ts

@@ -1,2 +1 @@
-export default function calc(item: any, needCalcKeys: string[][], history: any): void;
-export declare const reset: (arr: any, dataIndex: any) => void;
+export default function calcExpression(item: any, needCalcKeys: string[]): void;

package/lib/LmTable/expression.js

@@ -1,96 +1,41 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = calc;
-exports.reset = void 0;
+exports.default = calcExpression;
+
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-function getSum(item, dataIndex) {
-  var sum = 0;
-  item.children.forEach(function (subItem) {
-    var value;
-    if (/\%/.test("".concat(subItem[dataIndex]))) {
-      value = Number(subItem["".concat(dataIndex, "_sum")]);
-    } else {
-      value = Number(subItem[dataIndex]);
-    }
-    if (Number.isNaN(value)) {
-      return;
-    }
-    sum += value;
-  });
-  return sum;
-}
+
 // 分组求和计算
-function calc(item, needCalcKeys, history) {
+function calcExpression(item, needCalcKeys) {
   var _a;
+
   if ((_a = item === null || item === void 0 ? void 0 : item.children) === null || _a === void 0 ? void 0 : _a.length) {
     needCalcKeys.forEach(function (dkey) {
-      if (!item.children || !item.children.length) {
+      var sum = 0;
+
+      var _dkey = (0, _slicedToArray2.default)(dkey, 2),
+          key = _dkey[0],
+          expression = _dkey[1];
+
+      item.children.forEach(function (subItem) {
+        if (key in subItem) {
+          sum += Number(subItem[key]);
+        }
+      });
+
+      if (!sum) {
         return;
       }
-      var _dkey = (0, _slicedToArray2.default)(dkey, 2),
-        dataIndex = _dkey[0],
-        expression = _dkey[1];
-      item["".concat(dataIndex, "_exp")] = expression;
+
       if (expression === 'sum') {
-        var sum = getSum(item, dataIndex);
-        item[dataIndex] = sum;
+        item[key] = sum;
       } else if (expression === 'average') {
-        var _sum = getSum(item, dataIndex);
-        item[dataIndex] = (_sum / item.children.length).toFixed(2);
-      } else if (expression === 'max') {
-        var max = -Number.MAX_VALUE;
-        item.children.forEach(function (subItem) {
-          var value = Number(subItem[dataIndex]);
-          if (Number.isNaN(value)) {
-            return;
-          }
-          if (value > max) {
-            max = value;
-          }
-        });
-        if (max === -Number.MAX_VALUE) {
-          max = 0;
-        }
-        item[dataIndex] = max;
-      } else if (expression === 'min') {
-        var min = Number.MAX_VALUE;
-        item.children.forEach(function (subItem) {
-          var value = Number(subItem[dataIndex]);
-          if (Number.isNaN(value)) {
-            return;
-          }
-          if (value < min) {
-            min = value;
-          }
-        });
-        if (min === Number.MAX_VALUE) {
-          min = 0;
-        }
-        item[dataIndex] = min;
-      } else if (expression === 'percent') {
-        var _sum2 = getSum(item, dataIndex);
-        history.push({
-          item: item,
-          dataIndex: dataIndex,
-          sum: _sum2
-        });
+        item[key] = sum / item.children.length;
       }
     });
   }
-}
-var reset = function reset(arr, dataIndex) {
-  arr === null || arr === void 0 ? void 0 : arr.forEach(function (item) {
-    if (item === null || item === void 0 ? void 0 : item.children) {
-      reset(item === null || item === void 0 ? void 0 : item.children, dataIndex);
-    }
-    if (item.children) {
-      delete item[dataIndex];
-      delete item["".concat(dataIndex, "_exp")];
-    }
-  });
-};
-exports.reset = reset;
+}

package/lib/LmTable/hooks/useGroupDataSource.js

@@ -1,23 +1,50 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+
 var _react = require("react");
+
 var _util = require("../util");
+
+var _expression = _interopRequireDefault(require("../expression"));
+
 /** 行分组 */
 function useGroupDataSource(_ref) {
   var groupRowKeys = _ref.groupRowKeys,
-    customizeDataSource = _ref.customizeDataSource;
+      customizeDataSource = _ref.customizeDataSource,
+      columnsRef = _ref.columnsRef;
   var groupDataSource = (0, _react.useMemo)(function () {
     if (!(groupRowKeys === null || groupRowKeys === void 0 ? void 0 : groupRowKeys.length)) {
       return customizeDataSource;
     }
-    var source = (0, _util.transformWithRowGroup)(customizeDataSource, groupRowKeys);
+
+    var source = (0, _util.transformWithRowGroup)(customizeDataSource, groupRowKeys); // 获取需要计算的key，生成数组
+
+    var needCalcKeys = columnsRef.current.filter(function (col) {
+      return col.expression;
+    }).map(function (col) {
+      return [col.dataIndex, col.expression];
+    });
+
+    var deepChildren = function deepChildren(arr) {
+      arr === null || arr === void 0 ? void 0 : arr.forEach(function (item) {
+        if (item === null || item === void 0 ? void 0 : item.children) {
+          deepChildren(item === null || item === void 0 ? void 0 : item.children);
+          (0, _expression.default)(item, needCalcKeys);
+        }
+      });
+    };
+
+    deepChildren(source);
     return source;
   }, [customizeDataSource, groupRowKeys]);
   return [groupDataSource];
 }
+
 var _default = useGroupDataSource;
 exports.default = _default;

package/lib/LmTable/hooks/useRowSelectControllableValue.js

@@ -4,19 +4,23 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+
 var _react = require("react");
+
 var _utils = require("ahooks/lib/utils");
+
 var _ahooks = require("ahooks");
+
 function useControllableValue() {
   var props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   var defaultValue = options.defaultValue,
-    _options$defaultValue = options.defaultValuePropName,
-    defaultValuePropName = _options$defaultValue === void 0 ? 'defaultValue' : _options$defaultValue,
-    _options$valuePropNam = options.valuePropName,
-    valuePropName = _options$valuePropNam === void 0 ? 'value' : _options$valuePropNam,
-    _options$trigger = options.trigger,
-    trigger = _options$trigger === void 0 ? 'onChange' : _options$trigger;
+      _options$defaultValue = options.defaultValuePropName,
+      defaultValuePropName = _options$defaultValue === void 0 ? 'defaultValue' : _options$defaultValue,
+      _options$valuePropNam = options.valuePropName,
+      valuePropName = _options$valuePropNam === void 0 ? 'value' : _options$valuePropNam,
+      _options$trigger = options.trigger,
+      trigger = _options$trigger === void 0 ? 'onChange' : _options$trigger;
   var value = props[valuePropName];
   var isControlled = props === null || props === void 0 ? void 0 : props.hasOwnProperty(valuePropName);
   var isControlledOnChange = props[trigger];
@@ -24,30 +28,40 @@ function useControllableValue() {
     if (isControlled) {
       return value;
     }
+
     if (props === null || props === void 0 ? void 0 : props.hasOwnProperty(defaultValuePropName)) {
       return props[defaultValuePropName];
     }
+
     return defaultValue;
   }, []);
   var stateRef = (0, _react.useRef)(initialValue);
+
   if (isControlled && isControlledOnChange) {
     stateRef.current = value;
   }
+
   var update = (0, _ahooks.useUpdate)();
+
   function setState(v) {
     var r = (0, _utils.isFunction)(v) ? v(stateRef.current) : v;
+
     if (!isControlledOnChange) {
       stateRef.current = r;
       update();
     }
+
     if (props[trigger]) {
       for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
         args[_key - 1] = arguments[_key];
       }
+
       props[trigger].apply(props, [r].concat(args));
     }
   }
+
   return [stateRef.current, (0, _ahooks.useMemoizedFn)(setState)];
 }
+
 var _default = useControllableValue;
 exports.default = _default;

package/lib/LmTable/index.js

@@ -1,11 +1,14 @@
 "use strict";
 
 var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+
 var _Table = _interopRequireWildcard(require("./Table"));
+
 _Table.default.Summary = _Table.Summary;
 var _default = _Table.default;
 exports.default = _default;

package/lib/LmTable/resetConfig.js

@@ -9,23 +9,23 @@ exports.default = void 0;
 var checkConfig = {
   trigger: 'row',
   highlight: false
-};
-// 列排序
+}; // 列排序
+
 var sortConfig = {
   trigger: 'default',
   checkRowIds: []
-};
-// 列过滤
+}; // 列过滤
+
 var filterConfig = {
   trigger: 'default',
   checkRowIds: []
-};
-// 分页
+}; // 分页
+
 var pagerConfig = {
   pageSize: 30,
   pageIndex: 0
-};
-// 编辑配置
+}; // 编辑配置
+
 var editConfig = {
   enabled: false
 };

package/lib/LmTable/style/index.css

@@ -870,15 +870,10 @@ p {
 #lm_protable_warp .ant-table-wrapper,
 #lm_protable_warp .ant-spin-nested-loading,
 #lm_protable_warp .ant-spin-container,
-#lm_protable_warp .ant-table-container {
+#lm_protable_warp .ant-table-container,
+#lm_protable_warp .ant-table-body {
   height: 100%;
 }
-#lm_protable_warp.lm_protable_with_footer .ant-table-container {
-  height: auto;
-}
-#lm_protable_warp.lm_protable_with_footer .ant-table-footer {
-  background-color: #fff;
-}
 #lm_protable_warp .ant-card-body,
 #lm_protable_warp .ant-pro-card-body {
   padding: 0;
@@ -1666,9 +1661,3 @@ button.ant-table-row-expand-icon::after {
 .WeChatContactsAvatarTools .rightClickItems:last-child {
   border-bottom: 0;
 }
-.calc-select .ant-select-selection-item {
-  font-size: 12px !important;
-}
-.calc-select .ant-select-selection-placeholder {
-  font-size: 12px;
-}

package/lib/LmTable/style/variables.css

@@ -358,15 +358,10 @@
 #lm_protable_warp .ant-table-wrapper,
 #lm_protable_warp .ant-spin-nested-loading,
 #lm_protable_warp .ant-spin-container,
-#lm_protable_warp .ant-table-container {
+#lm_protable_warp .ant-table-container,
+#lm_protable_warp .ant-table-body {
   height: 100%;
 }
-#lm_protable_warp.lm_protable_with_footer .ant-table-container {
-  height: auto;
-}
-#lm_protable_warp.lm_protable_with_footer .ant-table-footer {
-  background-color: #fff;
-}
 #lm_protable_warp .ant-card-body,
 #lm_protable_warp .ant-pro-card-body {
   padding: 0;
@@ -1154,9 +1149,3 @@ button.ant-table-row-expand-icon::after {
 .WeChatContactsAvatarTools .rightClickItems:last-child {
   border-bottom: 0;
 }
-.calc-select .ant-select-selection-item {
-  font-size: 12px !important;
-}
-.calc-select .ant-select-selection-placeholder {
-  font-size: 12px;
-}