ns-base-module 2.0.14 → 2.0.16

package/dist/SubtotalsModal/addSubtotals.js

@@ -122,7 +122,8 @@ var Index = function Index(props, ref) {
     type: "primary",
     onClick: handleView,
     style: {
-      marginTop: 4
+      marginTop: 4,
+      height: "fit-content"
     },
     size: "small"
   }, initLang({

package/dist/SubtotalsModal/dndQuota.js

@@ -17,7 +17,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 /* eslint-disable no-case-declarations */
 /* eslint-disable react/no-unknown-property */
 import { ArrowDownOutlined, ArrowUpOutlined, BarChartOutlined, CalculatorOutlined, CalendarOutlined, ClearOutlined, DeleteOutlined, DotChartOutlined, DownOutlined, FieldNumberOutlined, FieldStringOutlined, LineChartOutlined, SortAscendingOutlined, SortDescendingOutlined, SwapOutlined, SwapRightOutlined } from "@ant-design/icons";
-import { Dropdown, Input, message, Popover, Space, Switch, Tooltip } from "antd";
+import { Dropdown, Input, Popover, Space, Switch, Tooltip } from "antd";
 import { cloneDeep, find, get, isEmpty } from "lodash";
 import React, { forwardRef, useEffect, useImperativeHandle, useMemo, useRef, useState } from "react";
 import { ReactSortable } from "react-sortablejs";
@@ -106,18 +106,19 @@ var Index = function Index(props, ref) {
   useImperativeHandle(ref, function () {
     return {
       getQuotaDataStr: function getQuotaDataStr() {
-        if (isEmpty(dimensionList)) {
-          message.warning("维度不能为空");
-          return "";
-        } else if (isEmpty(quotaList)) {
-          message.warning("指标不能为空");
-          return "";
-        } else if (valueRadio === "cross" || valueRadio === "trans") {
-          if ((chartColumns === null || chartColumns === void 0 ? void 0 : chartColumns.length) === 1) {
-            message.warning("列不能为空");
-            return "";
-          }
-        }
+        // if (isEmpty(dimensionList)) {
+        //   message.warning("维度不能为空");
+        //   return "";
+        // } else if (isEmpty(quotaList)) {
+        //   message.warning("指标不能为空");
+        //   return "";
+        // } else if (valueRadio === "cross" || valueRadio === "trans") {
+        //   if (chartColumns?.length === 1) {
+        //     message.warning("列不能为空");
+        //     return "";
+        //   }
+        // }
+
         return JSON.stringify({
           list: list,
           numberList: numberList,

package/dist/TableHeaderConfigPopover/index.js

@@ -160,7 +160,7 @@ var ColumnsToolbarRender = /*#__PURE__*/memo(function (props) {
 
     // 禁止跨层级拖拽 模板 和更新的数据匹配渲染问题， 渲染时也只匹配同级增删改
     // 修复 模板存储 a下的b, 新表头b在c下面 并改名d
-    if (node.parentCode !== dragNode.parentCode) {
+    if ((node.parentCode || dragNode.parentCode) && node.parentCode !== dragNode.parentCode) {
       message.warning("不允许改变层级");
       return;
     }

package/dist/TableHeaderConfigPopover/utils.js

@@ -1,4 +1,10 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -66,36 +72,69 @@ var flatColumns = function flatColumns(_columns) {
   return initArr;
 };
 
-// 遍历 模板的旧数据 被新数据替换
+// 遍历数据 引用旧模板的配置： 排序
+var updateTemplateSort = function updateTemplateSort(columns, JsonPares) {
+  var sortArr = [];
+  for (var r = 0, t = JsonPares.length; r < t; r++) {
+    var _loop = function _loop(n) {
+      var _JsonPares$r;
+      var _key = (_JsonPares$r = JsonPares[r]) !== null && _JsonPares$r !== void 0 && _JsonPares$r.code ? "code" : "dataIndex";
+      if (columns[n][_key] === JsonPares[r][_key]) {
+        var sortFindITem = find(sortArr, function (o) {
+          return o[_key] === columns[n][_key];
+        });
+        if (sortFindITem) {
+          return 1; // break
+        }
+        sortArr.push(columns[n]);
+        if (columns[n].children && columns[n].children.length && JsonPares[r].children && JsonPares[r].children.length) {
+          // 有子级 递归
+          sortArr[sortArr.length - 1].children = updateTemplateSort(columns[n].children, JsonPares[r].children);
+        }
+      }
+    };
+    for (var n = 0, l = columns.length; n < l; n++) {
+      if (_loop(n)) break;
+    }
+  }
+  var lastArr = columns.filter(function (d) {
+    var _key = d !== null && d !== void 0 && d.code ? "code" : "dataIndex";
+    return !find(sortArr, function (o) {
+      return o[_key] === d[_key];
+    });
+  });
+  return [].concat(sortArr, _toConsumableArray(lastArr));
+};
+
+// 遍历数据 引用旧模板的配置：  width fixed checked frontEndFold
 var updateTemplateFilds = function updateTemplateFilds(JsonPares, _columns) {
-  var _loop = function _loop(r) {
-    var _JsonPares$r;
+  var _loop2 = function _loop2(r) {
+    var _JsonPares$r2;
     if (JsonPares[r].children && JsonPares[r].children.length) {
       updateTemplateFilds(JsonPares[r].children, _columns);
     }
-    var _key = (_JsonPares$r = JsonPares[r]) !== null && _JsonPares$r !== void 0 && _JsonPares$r.code ? "code" : "dataIndex";
+    var _key = (_JsonPares$r2 = JsonPares[r]) !== null && _JsonPares$r2 !== void 0 && _JsonPares$r2.code ? "code" : "dataIndex";
     var _findItem = find(_columns, function (o) {
       return o[_key] === JsonPares[r][_key];
     });
     if (_findItem) {
-      JsonPares[r] = _objectSpread(_objectSpread({}, _findItem), {}, {
-        title: _findItem.title || JsonPares[r].title,
-        label: _findItem.label || JsonPares[r].label,
-        fixed: JsonPares[r].fixed,
-        width: JsonPares[r].width,
-        checked: JsonPares[r].checked,
-        children: JsonPares[r].children,
-        isAllChildrenFixed: JsonPares[r].isAllChildrenFixed,
-        _index: JsonPares[r]._index,
-        key: JsonPares[r].key,
-        return: JsonPares[r].return,
-        dataIndex: JsonPares[r].dataIndex,
-        frontEndFold: JsonPares[r].frontEndFold
+      // 模板的配置
+      JsonPares[r] = _objectSpread(_objectSpread({}, JsonPares[r]), {}, {
+        fixed: _findItem.fixed,
+        width: _findItem.width,
+        checked: _findItem.checked,
+        isAllChildrenFixed: _findItem.isAllChildrenFixed,
+        _index: _findItem._index,
+        key: _findItem.key,
+        return: _findItem.return,
+        frontEndFold: _findItem.frontEndFold
       });
+    } else {
+      JsonPares[r].checked = false;
     }
   };
   for (var r = 0, t = JsonPares.length; r < t; r++) {
-    _loop(r);
+    _loop2(r);
   }
 };
 
@@ -107,27 +146,6 @@ var updateTemplateFilds = function updateTemplateFilds(JsonPares, _columns) {
  * */
 export function adapterColumns(customColumns, columns) {
   if (customColumns && customColumns.length && columns && columns.length) {
-    // 展平 columns, 1,子是动态列 父级必须是，父级的表头宽度取决于子级设置.2,子级是浮动 父级同步 解决首行选择框的浮动
-    var _columns = flatColumns(columns);
-    var itemLoop = function itemLoop(arr, commad) {
-      var _loop2 = function _loop2(_k, j) {
-        var _code = arr[j].code ? "code" : "dataIndex";
-        if (commad === "del") {
-          if (!find(_columns, function (o) {
-            return o[_code] === arr[j][_code] && o.parentCode === arr[j].parentCode;
-          })) {
-            arr.splice(j, 1);
-            _k -= 1;
-          } else if (arr[j].children && arr[j].children.length) {
-            itemLoop(arr[j].children, commad);
-          }
-        }
-        k = _k;
-      };
-      for (var j = 0, k = arr.length; j < k; j++) {
-        _loop2(k, j);
-      }
-    };
     var item = null;
     for (var n = 0, leng = customColumns.length; n < leng; n++) {
       if (customColumns[n].is_default_public == "Y") {
@@ -139,96 +157,19 @@ export function adapterColumns(customColumns, columns) {
       }
     }
     try {
-      var _item2;
-      if ((_item2 = item) !== null && _item2 !== void 0 && _item2.is_default) {
+      var _item;
+      if ((_item = item) !== null && _item !== void 0 && _item.is_default) {
         var JsonPares = JSON.parse(item.define);
-
-        // 删 旧模板多出的字段
-        itemLoop(JsonPares, "del");
-
-        // 展平 columns
         var flaJsonPares = flatColumns(JsonPares);
-        // 增 新字段加最后
-        var _loop3 = function _loop3(j) {
-          var _code = _columns[j].code ? "code" : "dataIndex";
-          if (!find(flaJsonPares, function (o) {
-            return o[_code] === _columns[j][_code] && o.parentCode === _columns[j].parentCode;
-          })) {
-            var _item = initColumns([_columns[j]], null)[0];
-            if (_item.customizable !== false) {
-              // 不是动态列
-              if (_item.fixed === "left") {
-                JsonPares.unshift(_item);
-              } else {
-                JsonPares.push(_item);
-              }
-            }
-          }
+        var columnsClone = JSON.parse(JSON.stringify(columns));
 
-          // 动态列 columns[j].customizable === false 不能用模板，用列表数据
-          if (_columns[j].customizable === false && _code) {
-            var loopSetChildren = function loopSetChildren(arr1, arr2) {
-              arr1.forEach(function (d) {
-                var h = find(arr2, function (o) {
-                  return o[_code] === d[_code];
-                });
-                if (h) {
-                  d.width = h.width;
-                  d.fixed = h.fixed;
-                  d.checked = h.checked;
-                }
-                if (d.children && d.children.length && h !== null && h !== void 0 && h.children && h !== null && h !== void 0 && h.children.length) {
-                  loopSetChildren(d.children, h.children);
-                }
-              });
-            };
-            var loopSetZable = function loopSetZable(_JsonPares) {
-              for (var i = 0, l = _JsonPares.length; i < l; i++) {
-                if (_columns[j][_code] === _JsonPares[i][_code]) {
-                  var obj = {
-                    width: _JsonPares[i].width,
-                    fixed: _JsonPares[i].fixed,
-                    checked: _JsonPares[i].checked
-                  };
-                  _columns[j] = _objectSpread(_objectSpread({}, _columns[j]), obj);
-                  if (_columns[j].children && _columns[j].children.length && _JsonPares[i].children && _JsonPares[i].children.length) {
-                    loopSetChildren(_columns[j].children, _JsonPares[i].children);
-                  }
-                  var d = initColumns([_columns[j]], null)[0];
-                  _JsonPares[i] = _objectSpread({}, d);
-                  return;
-                }
-                // else {
-                //   if (_JsonPares[i].children && _JsonPares[i].children.length) {
-                //     loopSetZable(_JsonPares[i].children);
-                //   }
-                // }
-              }
-            };
-            loopSetZable(JsonPares);
-          }
-        };
-        for (var j = 0, k = _columns.length; j < k; j++) {
-          _loop3(j);
-        }
-
-        // 子级是否全部 浮动
-        JsonPares.forEach(function (dd) {
-          if (dd.fixed && dd.children && dd.children.length) {
-            var isAllChildrenFixed = true;
-            dd.children.forEach(function (hh) {
-              if (hh.checked && hh.fixed !== dd.fixed) {
-                isAllChildrenFixed = false;
-              }
-            });
-            dd.isAllChildrenFixed = isAllChildrenFixed;
-          }
-        });
+        // 模板字段排序 替换新字段
+        var newArr = updateTemplateSort(columnsClone, JsonPares);
 
-        // 替成新配置
-        updateTemplateFilds(JsonPares, _columns);
+        // 模板配置的字段替换给新字段
+        updateTemplateFilds(newArr, flaJsonPares);
         return {
-          JsonPares: JsonPares,
+          JsonPares: newArr,
           item: item
         };
       }