linkmore-design 1.1.27-beta.1 → 1.1.27-beta.3

package/es/LmTable/Table.js

@@ -909,13 +909,13 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
               };
             };
           } else if (openRowGroup) {
-            col.onCell = function (record, rowIndex) {
+            col.onCell = function (record) {
               i = _i;
               return {
                 record: record,
-                rowIndex: rowIndex,
                 col: col,
-                onChangeRecord: function onChangeRecord() {
+                onChangeRecord: function onChangeRecord(dfs, dataIndex, value) {
+                  dfs(dataSource, dataIndex, value);
                   update();
                 }
               };

package/es/LmTable/components/CalcExpression.d.ts

@@ -3,8 +3,6 @@ export interface IProps {
     record: Record<string, any>;
     rowKey: string;
     col: any;
-    rowIndex: number;
-    colIndex: number;
     [key: string]: any;
 }
 declare const CalcExpression: React.FC<IProps>;

package/es/LmTable/components/CalcExpression.js

@@ -12,18 +12,33 @@ import React from 'react';
 import calc, { reset } from '../expression';
 import Select from '../../Select';
 var Option = Select.Option;
-var dfs = function dfs(record, dataIndex, expression) {
+var dfs = function dfs(dataSource, dataIndex, expression) {
   var average = function average(arr) {
+    var history = [];
     arr === null || arr === void 0 ? void 0 : arr.forEach(function (item) {
       if (item === null || item === void 0 ? void 0 : item.children) {
         average(item === null || item === void 0 ? void 0 : item.children);
       }
-      calc(item, [[dataIndex, expression]]);
+      calc(item, [[dataIndex, expression]], history);
     });
+    console.log(history);
+    if (history && history.length) {
+      var sum = 0;
+      history.forEach(function (h) {
+        sum += h.sum;
+      });
+      history.forEach(function (h) {
+        h.item[h.dataIndex] = (h.sum / sum * 100).toFixed(2) + '%';
+        h.item["".concat(h.dataIndex, "_sum")] = sum;
+      });
+    }
   };
-  average([record]);
+  average(dataSource);
 };
 var strategy = [{
+  value: 'percent',
+  label: '百分比'
+}, {
   value: 'average',
   label: '平均值'
 }, {
@@ -39,11 +54,12 @@ var strategy = [{
 var CalcExpression = function CalcExpression(props) {
   var record = props.record,
     col = props.col,
+    columns = props.columns,
     children = props.children,
     onChangeRecord = props.onChangeRecord,
     rest = __rest(props
     // 列参数
-    , ["record", "col", "children", "onChangeRecord"]);
+    , ["record", "col", "columns", "children", "onChangeRecord"]);
   // 列参数
   var isShowSelect = false;
   var currentStrategy = [];
@@ -63,14 +79,18 @@ var CalcExpression = function CalcExpression(props) {
       throw Error('no parameter dataIndex');
     }
     if (value) {
-      dfs(record, col.dataIndex, value);
+      onChangeRecord(dfs, col.dataIndex, value);
     } else {
-      reset([record], col.dataIndex);
+      onChangeRecord(reset, col.dataIndex, value);
     }
-    onChangeRecord(record);
   };
   if (record && record._group && isShowSelect && (col === null || col === void 0 ? void 0 : col.dataIndex)) {
-    return /*#__PURE__*/React.createElement("td", Object.assign({}, rest), record[col.dataIndex], /*#__PURE__*/React.createElement(Select, {
+    return /*#__PURE__*/React.createElement("td", Object.assign({}, rest, {
+      style: {
+        display: 'flex',
+        alignItems: 'center'
+      }
+    }), /*#__PURE__*/React.createElement("span", null, record[col.dataIndex]), /*#__PURE__*/React.createElement(Select, {
       className: "calc-select",
       value: record["".concat(col.dataIndex, "_exp")],
       size: "small",
@@ -81,7 +101,8 @@ var CalcExpression = function CalcExpression(props) {
     }, currentStrategy.map(function (item) {
       return /*#__PURE__*/React.createElement(Option, {
         className: "calc-option",
-        value: item.value
+        value: item.value,
+        key: item.value
       }, item.label);
     })));
   }

package/es/LmTable/components/DndContainer.js

@@ -288,12 +288,13 @@ export default function DndContainer(_ref2) {
     };
   }, [items]);
   var isOk = function isOk(active, over) {
+    var _a, _b;
     var item = filterColumns.find(function (item) {
       return item.title === active.id;
     });
-    if (over.id === 'row' || items.row.includes(over.id)) {
+    if (over.id === 'row' || ((_a = items === null || items === void 0 ? void 0 : items.row) === null || _a === void 0 ? void 0 : _a.includes(over.id))) {
       return item && item.rowGroup;
-    } else if (over.id === 'col' || items.col.includes(over.id)) {
+    } else if (over.id === 'col' || ((_b = items === null || items === void 0 ? void 0 : items.col) === null || _b === void 0 ? void 0 : _b.includes(over.id))) {
       return item && item.colGroup;
     }
     return true;

package/es/LmTable/expression.d.ts

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

package/es/LmTable/expression.js

@@ -1,6 +1,22 @@
 import _slicedToArray from "@babel/runtime/helpers/esm/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;
+}
 // 分组求和计算
-export default function calc(item, needCalcKeys) {
+export default function calc(item, needCalcKeys, history) {
   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) {
@@ -11,20 +27,12 @@ export default function calc(item, needCalcKeys) {
         dataIndex = _dkey[0],
         expression = _dkey[1];
       item["".concat(dataIndex, "_exp")] = expression;
-      if (expression === 'sum' || expression === 'average') {
-        var sum = 0;
-        item.children.forEach(function (subItem) {
-          var value = Number(subItem[dataIndex]);
-          if (Number.isNaN(value)) {
-            return;
-          }
-          sum += value;
-        });
-        if (expression === 'sum') {
-          item[dataIndex] = sum;
-        } else if (expression === 'average') {
-          item[dataIndex] = (sum / item.children.length).toFixed(2);
-        }
+      if (expression === 'sum') {
+        var sum = getSum(item, dataIndex);
+        item[dataIndex] = 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) {
@@ -55,6 +63,13 @@ export default function calc(item, needCalcKeys) {
           min = 0;
         }
         item[dataIndex] = min;
+      } else if (expression === 'percent') {
+        var _sum2 = getSum(item, dataIndex);
+        history.push({
+          item: item,
+          dataIndex: dataIndex,
+          sum: _sum2
+        });
       }
     });
   }

package/es/LmTable/hooks/useDndItems.js

@@ -32,7 +32,13 @@ function getSortInsert(tableHeader, value, _ref) {
 function getSortDndColumns(value, _ref2) {
   var columns = _ref2.columns;
   var tableHeader = value.tableHeader;
-  var hiddenArr = [].concat(_toConsumableArray(value.row), _toConsumableArray(value.col)) || [];
+  var hiddenArr = [];
+  if (value.row) {
+    hiddenArr = [].concat(_toConsumableArray(hiddenArr), _toConsumableArray(value.row));
+  }
+  if (value.col) {
+    hiddenArr = [].concat(_toConsumableArray(hiddenArr), _toConsumableArray(value.col));
+  }
   if (!tableHeader || !tableHeader.length) {
     return [];
   }
@@ -106,16 +112,20 @@ function useDndItems(props) {
   }, [customizeGroupRowKeys, customizeGroupColKeys]);
   // 初始化
   var defaultItems = {
-    row: [],
-    col: [],
     tableHeader: []
   };
+  if (openRowGroup) {
+    defaultItems.row = [];
+  }
+  if (openColGroup) {
+    defaultItems.col = [];
+  }
   if (openColGroup || openRowGroup || colSortOpen) {
     treeFind(columns, function (node) {
-      if (groupRowKeys.includes(node.dataIndex)) {
-        defaultItems.row.push(node.title);
+      if (openRowGroup && groupRowKeys.includes(node.dataIndex)) {
+        defaultItems.row && defaultItems.row.push(node.title);
       } else if (groupColKeys.includes(node.dataIndex)) {
-        defaultItems.col.push(node.title);
+        defaultItems.col && defaultItems.col.push(node.title);
       } else {
         defaultItems.tableHeader.push(node.title);
       }
@@ -139,8 +149,13 @@ function useDndItems(props) {
   }, [columns]);
   // 更新
   var updateItems = function updateItems(value, resume) {
-    value.row = value.row.filter(Boolean);
-    value.col = value.col.filter(Boolean);
+    var _a;
+    if (value.row) {
+      value.row = value === null || value === void 0 ? void 0 : value.row.filter(Boolean);
+    }
+    if (value.col) {
+      value.col = value.col.filter(Boolean);
+    }
     if (resume) {
       // 删除
       del(value.row, resume);
@@ -150,7 +165,7 @@ function useDndItems(props) {
       });
     }
     // 列分组进行覆盖，只允许存在一个
-    if (value.col.length >= 2) {
+    if (((_a = value === null || value === void 0 ? void 0 : value.col) === null || _a === void 0 ? void 0 : _a.length) >= 2) {
       value.tableHeader = getSortInsert(value.tableHeader, items.col[0], {
         columns: columns
       });

package/es/LmTable/util.js

@@ -93,6 +93,7 @@ function transformWithColGroup(columns, dataSource, groupColKeys, groupRowKeys)
    * @param {Array<string>} oGroup 数组，列分组的keys值
    * @param {string} markStr
    * @returns
+   * 2万条数据 393ms
    */
   var groupBy = function groupBy(source, columns, oGroup, markStr) {
     if (!(oGroup === null || oGroup === void 0 ? void 0 : oGroup.length)) {

package/lib/LmTable/Table.js

@@ -909,13 +909,13 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
               };
             };
           } else if (openRowGroup) {
-            col.onCell = function (record, rowIndex) {
+            col.onCell = function (record) {
               i = _i;
               return {
                 record: record,
-                rowIndex: rowIndex,
                 col: col,
-                onChangeRecord: function onChangeRecord() {
+                onChangeRecord: function onChangeRecord(dfs, dataIndex, value) {
+                  dfs(dataSource, dataIndex, value);
                   update();
                 }
               };

package/lib/LmTable/components/CalcExpression.d.ts

@@ -3,8 +3,6 @@ export interface IProps {
     record: Record<string, any>;
     rowKey: string;
     col: any;
-    rowIndex: number;
-    colIndex: number;
     [key: string]: any;
 }
 declare const CalcExpression: React.FC<IProps>;

package/lib/LmTable/components/CalcExpression.js

@@ -20,18 +20,33 @@ var __rest = void 0 && (void 0).__rest || function (s, e) {
   return t;
 };
 var Option = _Select.default.Option;
-var dfs = function dfs(record, dataIndex, expression) {
+var dfs = function dfs(dataSource, dataIndex, expression) {
   var average = function average(arr) {
+    var history = [];
     arr === null || arr === void 0 ? void 0 : arr.forEach(function (item) {
       if (item === null || item === void 0 ? void 0 : item.children) {
         average(item === null || item === void 0 ? void 0 : item.children);
       }
-      (0, _expression.default)(item, [[dataIndex, expression]]);
+      (0, _expression.default)(item, [[dataIndex, expression]], history);
     });
+    console.log(history);
+    if (history && history.length) {
+      var sum = 0;
+      history.forEach(function (h) {
+        sum += h.sum;
+      });
+      history.forEach(function (h) {
+        h.item[h.dataIndex] = (h.sum / sum * 100).toFixed(2) + '%';
+        h.item["".concat(h.dataIndex, "_sum")] = sum;
+      });
+    }
   };
-  average([record]);
+  average(dataSource);
 };
 var strategy = [{
+  value: 'percent',
+  label: '百分比'
+}, {
   value: 'average',
   label: '平均值'
 }, {
@@ -47,11 +62,12 @@ var strategy = [{
 var CalcExpression = function CalcExpression(props) {
   var record = props.record,
     col = props.col,
+    columns = props.columns,
     children = props.children,
     onChangeRecord = props.onChangeRecord,
     rest = __rest(props
     // 列参数
-    , ["record", "col", "children", "onChangeRecord"]);
+    , ["record", "col", "columns", "children", "onChangeRecord"]);
   // 列参数
   var isShowSelect = false;
   var currentStrategy = [];
@@ -71,14 +87,18 @@ var CalcExpression = function CalcExpression(props) {
       throw Error('no parameter dataIndex');
     }
     if (value) {
-      dfs(record, col.dataIndex, value);
+      onChangeRecord(dfs, col.dataIndex, value);
     } else {
-      (0, _expression.reset)([record], col.dataIndex);
+      onChangeRecord(_expression.reset, col.dataIndex, value);
     }
-    onChangeRecord(record);
   };
   if (record && record._group && isShowSelect && (col === null || col === void 0 ? void 0 : col.dataIndex)) {
-    return /*#__PURE__*/_react.default.createElement("td", Object.assign({}, rest), record[col.dataIndex], /*#__PURE__*/_react.default.createElement(_Select.default, {
+    return /*#__PURE__*/_react.default.createElement("td", Object.assign({}, rest, {
+      style: {
+        display: 'flex',
+        alignItems: 'center'
+      }
+    }), /*#__PURE__*/_react.default.createElement("span", null, record[col.dataIndex]), /*#__PURE__*/_react.default.createElement(_Select.default, {
       className: "calc-select",
       value: record["".concat(col.dataIndex, "_exp")],
       size: "small",
@@ -89,7 +109,8 @@ var CalcExpression = function CalcExpression(props) {
     }, currentStrategy.map(function (item) {
       return /*#__PURE__*/_react.default.createElement(Option, {
         className: "calc-option",
-        value: item.value
+        value: item.value,
+        key: item.value
       }, item.label);
     })));
   }

package/lib/LmTable/components/DndContainer.js

@@ -294,12 +294,13 @@ function DndContainer(_ref2) {
     };
   }, [items]);
   var isOk = function isOk(active, over) {
+    var _a, _b;
     var item = filterColumns.find(function (item) {
       return item.title === active.id;
     });
-    if (over.id === 'row' || items.row.includes(over.id)) {
+    if (over.id === 'row' || ((_a = items === null || items === void 0 ? void 0 : items.row) === null || _a === void 0 ? void 0 : _a.includes(over.id))) {
       return item && item.rowGroup;
-    } else if (over.id === 'col' || items.col.includes(over.id)) {
+    } else if (over.id === 'col' || ((_b = items === null || items === void 0 ? void 0 : items.col) === null || _b === void 0 ? void 0 : _b.includes(over.id))) {
       return item && item.colGroup;
     }
     return true;

package/lib/LmTable/expression.d.ts

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

package/lib/LmTable/expression.js

@@ -7,8 +7,24 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = calc;
 exports.reset = void 0;
 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) {
+function calc(item, needCalcKeys, history) {
   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) {
@@ -19,20 +35,12 @@ function calc(item, needCalcKeys) {
         dataIndex = _dkey[0],
         expression = _dkey[1];
       item["".concat(dataIndex, "_exp")] = expression;
-      if (expression === 'sum' || expression === 'average') {
-        var sum = 0;
-        item.children.forEach(function (subItem) {
-          var value = Number(subItem[dataIndex]);
-          if (Number.isNaN(value)) {
-            return;
-          }
-          sum += value;
-        });
-        if (expression === 'sum') {
-          item[dataIndex] = sum;
-        } else if (expression === 'average') {
-          item[dataIndex] = (sum / item.children.length).toFixed(2);
-        }
+      if (expression === 'sum') {
+        var sum = getSum(item, dataIndex);
+        item[dataIndex] = 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) {
@@ -63,6 +71,13 @@ function calc(item, needCalcKeys) {
           min = 0;
         }
         item[dataIndex] = min;
+      } else if (expression === 'percent') {
+        var _sum2 = getSum(item, dataIndex);
+        history.push({
+          item: item,
+          dataIndex: dataIndex,
+          sum: _sum2
+        });
       }
     });
   }

package/lib/LmTable/hooks/useDndItems.js

@@ -39,7 +39,13 @@ function getSortInsert(tableHeader, value, _ref) {
 function getSortDndColumns(value, _ref2) {
   var columns = _ref2.columns;
   var tableHeader = value.tableHeader;
-  var hiddenArr = [].concat((0, _toConsumableArray2.default)(value.row), (0, _toConsumableArray2.default)(value.col)) || [];
+  var hiddenArr = [];
+  if (value.row) {
+    hiddenArr = [].concat((0, _toConsumableArray2.default)(hiddenArr), (0, _toConsumableArray2.default)(value.row));
+  }
+  if (value.col) {
+    hiddenArr = [].concat((0, _toConsumableArray2.default)(hiddenArr), (0, _toConsumableArray2.default)(value.col));
+  }
   if (!tableHeader || !tableHeader.length) {
     return [];
   }
@@ -113,16 +119,20 @@ function useDndItems(props) {
   }, [customizeGroupRowKeys, customizeGroupColKeys]);
   // 初始化
   var defaultItems = {
-    row: [],
-    col: [],
     tableHeader: []
   };
+  if (openRowGroup) {
+    defaultItems.row = [];
+  }
+  if (openColGroup) {
+    defaultItems.col = [];
+  }
   if (openColGroup || openRowGroup || colSortOpen) {
     (0, _index.treeFind)(columns, function (node) {
-      if (groupRowKeys.includes(node.dataIndex)) {
-        defaultItems.row.push(node.title);
+      if (openRowGroup && groupRowKeys.includes(node.dataIndex)) {
+        defaultItems.row && defaultItems.row.push(node.title);
       } else if (groupColKeys.includes(node.dataIndex)) {
-        defaultItems.col.push(node.title);
+        defaultItems.col && defaultItems.col.push(node.title);
       } else {
         defaultItems.tableHeader.push(node.title);
       }
@@ -146,8 +156,13 @@ function useDndItems(props) {
   }, [columns]);
   // 更新
   var updateItems = function updateItems(value, resume) {
-    value.row = value.row.filter(Boolean);
-    value.col = value.col.filter(Boolean);
+    var _a;
+    if (value.row) {
+      value.row = value === null || value === void 0 ? void 0 : value.row.filter(Boolean);
+    }
+    if (value.col) {
+      value.col = value.col.filter(Boolean);
+    }
     if (resume) {
       // 删除
       del(value.row, resume);
@@ -157,7 +172,7 @@ function useDndItems(props) {
       });
     }
     // 列分组进行覆盖，只允许存在一个
-    if (value.col.length >= 2) {
+    if (((_a = value === null || value === void 0 ? void 0 : value.col) === null || _a === void 0 ? void 0 : _a.length) >= 2) {
       value.tableHeader = getSortInsert(value.tableHeader, items.col[0], {
         columns: columns
       });

package/lib/LmTable/util.js

@@ -93,6 +93,7 @@ function transformWithColGroup(columns, dataSource, groupColKeys, groupRowKeys)
    * @param {Array<string>} oGroup 数组，列分组的keys值
    * @param {string} markStr
    * @returns
+   * 2万条数据 393ms
    */
   var groupBy = function groupBy(source, columns, oGroup, markStr) {
     if (!(oGroup === null || oGroup === void 0 ? void 0 : oGroup.length)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "linkmore-design",
-  "version": "1.1.27-beta.1",
+  "version": "1.1.27-beta.3",
   "author": {
     "name": "nowthen",
     "email": "rnlvwyx@gmail.com"