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

package/dist/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/dist/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/dist/index.umd.js

@@ -223260,12 +223260,13 @@
       };
     }, [items]);
     var isOk = function isOk(active, over) {
+      var _items$row, _items$col;
       var item = filterColumns.find(function (item) {
         return item.title === active.id;
       });
-      if (over.id === 'row' || items.row.includes(over.id)) {
+      if (over.id === 'row' || (items === null || items === void 0 ? void 0 : (_items$row = items.row) === null || _items$row === void 0 ? void 0 : _items$row.includes(over.id))) {
         return item && item.rowGroup;
-      } else if (over.id === 'col' || items.col.includes(over.id)) {
+      } else if (over.id === 'col' || (items === null || items === void 0 ? void 0 : (_items$col = items.col) === null || _items$col === void 0 ? void 0 : _items$col.includes(over.id))) {
         return item && item.colGroup;
       }
       return true;
@@ -223758,8 +223759,24 @@
     }));
   };
 
+  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 _item$children;
     if (item === null || item === void 0 ? void 0 : (_item$children = item.children) === null || _item$children === void 0 ? void 0 : _item$children.length) {
       needCalcKeys.forEach(function (dkey) {
@@ -223770,20 +223787,12 @@
           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) {
@@ -223814,6 +223823,13 @@
             min = 0;
           }
           item[dataIndex] = min;
+        } else if (expression === 'percent') {
+          var _sum2 = getSum(item, dataIndex);
+          history.push({
+            item: item,
+            dataIndex: dataIndex,
+            sum: _sum2
+          });
         }
       });
     }
@@ -223912,20 +223928,35 @@
   LMSelect.Option = Select$1.Option;
   LMSelect.OptGroup = Select$1.OptGroup;
 
-  var _excluded$1Z = ["record", "col", "children", "onChangeRecord"];
+  var _excluded$1Z = ["record", "col", "columns", "children", "onChangeRecord"];
   var Option$3 = LMSelect.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: '平均值'
   }, {
@@ -223941,6 +223972,7 @@
   var CalcExpression = function CalcExpression(props) {
     var record = props.record,
       col = props.col,
+      columns = props.columns,
       children = props.children,
       onChangeRecord = props.onChangeRecord,
       rest = _objectWithoutProperties$1(props, _excluded$1Z);
@@ -223963,14 +223995,18 @@
         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__default['default'].createElement("td", _objectSpread({}, rest), record[col.dataIndex], /*#__PURE__*/React__default['default'].createElement(LMSelect, {
+      return /*#__PURE__*/React__default['default'].createElement("td", _objectSpread(_objectSpread({}, rest), {}, {
+        style: {
+          display: 'flex',
+          alignItems: 'center'
+        }
+      }), /*#__PURE__*/React__default['default'].createElement("span", null, record[col.dataIndex]), /*#__PURE__*/React__default['default'].createElement(LMSelect, {
         className: "calc-select",
         value: record["".concat(col.dataIndex, "_exp")],
         size: "small",
@@ -223981,7 +224017,8 @@
       }, currentStrategy.map(function (item) {
         return /*#__PURE__*/React__default['default'].createElement(Option$3, {
           className: "calc-option",
-          value: item.value
+          value: item.value,
+          key: item.value
         }, item.label);
       })));
     }
@@ -224078,6 +224115,7 @@
      * @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)) {
@@ -224701,7 +224739,13 @@
   function getSortDndColumns(value, _ref2) {
     var columns = _ref2.columns;
     var tableHeader = value.tableHeader;
-    var hiddenArr = [].concat(_toConsumableArray$1(value.row), _toConsumableArray$1(value.col)) || [];
+    var hiddenArr = [];
+    if (value.row) {
+      hiddenArr = [].concat(_toConsumableArray$1(hiddenArr), _toConsumableArray$1(value.row));
+    }
+    if (value.col) {
+      hiddenArr = [].concat(_toConsumableArray$1(hiddenArr), _toConsumableArray$1(value.col));
+    }
     if (!tableHeader || !tableHeader.length) {
       return [];
     }
@@ -224775,16 +224819,20 @@
     }, [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);
         }
@@ -224808,8 +224856,13 @@
     }, [columns]);
     // 更新
     var updateItems = function updateItems(value, resume) {
-      value.row = value.row.filter(Boolean);
-      value.col = value.col.filter(Boolean);
+      var _value$col;
+      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$1(value.row, resume);
@@ -224819,7 +224872,7 @@
         });
       }
       // 列分组进行覆盖，只允许存在一个
-      if (value.col.length >= 2) {
+      if ((value === null || value === void 0 ? void 0 : (_value$col = value.col) === null || _value$col === void 0 ? void 0 : _value$col.length) >= 2) {
         value.tableHeader = getSortInsert(value.tableHeader, items.col[0], {
           columns: columns
         });
@@ -225763,13 +225816,13 @@
                 };
               };
             } 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();
                   }
                 };