@teamix/pro 1.3.4 → 1.3.7

package/lib/sidebar/utils/index.js

@@ -0,0 +1,247 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.findNodeWithPath = findNodeWithPath;
+exports.findNodeWithoutPath = findNodeWithoutPath;
+exports.getAllNodeKey = getAllNodeKey;
+exports.getTreeLevel = getTreeLevel;
+exports.getTreeLevelKey = getTreeLevelKey;
+exports.getTreeNodeLevel = getTreeNodeLevel;
+exports.loop = loop;
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+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 _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 _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+
+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 _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; }
+
+/**
+ * 深度遍历节点
+ * @param data 数据
+ * @param func 处理方法
+ * @param aliasMap 标识
+ * @param level 深度
+ */
+function loop(data, func, aliasMap) {
+  var level = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 0;
+
+  var _ref = aliasMap !== null && aliasMap !== void 0 ? aliasMap : {},
+      _ref$children = _ref.children,
+      children = _ref$children === void 0 ? 'children' : _ref$children;
+
+  if (data && data.length > 0) {
+    data.forEach(function (item) {
+      func(item, level, data);
+
+      if (Array.isArray(item[children])) {
+        loop(item[children], func, {
+          children: children
+        }, level + 1);
+      }
+    });
+  }
+}
+/**
+ * 深度遍历并查找节点（只保留二级路径）
+ * @param data 数据
+ * @param predicate 条件
+ * @param aliasMap 标识
+ * @returns
+ */
+
+
+function findNodeWithoutPath(data, predicate, aliasMap) {
+  var _ref2 = aliasMap !== null && aliasMap !== void 0 ? aliasMap : {},
+      _ref2$children = _ref2.children,
+      children = _ref2$children === void 0 ? 'children' : _ref2$children; // 如果已经没有节点了，结束递归
+
+
+  if (!(data && data.length)) {
+    return [];
+  }
+
+  var newChildren = [];
+
+  var _iterator = _createForOfIteratorHelper(data),
+      _step;
+
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var node = _step.value;
+
+      if (predicate(node)) {
+        var _node$children;
+
+        // 如果节点符合条件，直接加入新的节点集
+        newChildren.push(node);
+        node.children = findNodeWithoutPath((_node$children = node[children]) !== null && _node$children !== void 0 ? _node$children : [], predicate);
+      } else {
+        var _node$children2;
+
+        // 如果当前节点不符合条件，递归过滤子节点，
+        // 把符合条件的子节点提升上来，并入新节点集
+        newChildren.push.apply(newChildren, _toConsumableArray(findNodeWithoutPath((_node$children2 = node[children]) !== null && _node$children2 !== void 0 ? _node$children2 : [], predicate)));
+      }
+    }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
+
+  return newChildren;
+}
+/**
+ * 深度遍历并查找节点（保留全部路径）
+ * @param data 数据
+ * @param predicate 条件
+ * @param aliasMap 标识
+ * @returns
+ */
+
+
+function findNodeWithPath(data, predicate, aliasMap) {
+  var _ref3 = aliasMap !== null && aliasMap !== void 0 ? aliasMap : {},
+      _ref3$children = _ref3.children,
+      children = _ref3$children === void 0 ? 'children' : _ref3$children;
+
+  var getNodes = function getNodes(result, node) {
+    if (predicate(node)) {
+      result.push(node);
+      return result;
+    }
+
+    if (Array.isArray(node[children])) {
+      var nodes = node[children].reduce(getNodes, []);
+
+      if (nodes.length) {
+        result.push(_objectSpread(_objectSpread({}, node), {}, {
+          nodes: nodes
+        }));
+      }
+    }
+
+    return result;
+  };
+
+  return data.reduce(getNodes, []);
+}
+/**
+ * 获取树所有节点 key
+ * @param data 数据
+ * @param aliasMap 标识
+ * @returns
+ */
+
+
+function getAllNodeKey(data, aliasMap) {
+  var _ref4 = aliasMap !== null && aliasMap !== void 0 ? aliasMap : {},
+      _ref4$key = _ref4.key,
+      key = _ref4$key === void 0 ? 'value' : _ref4$key,
+      _ref4$children = _ref4.children,
+      children = _ref4$children === void 0 ? 'children' : _ref4$children;
+
+  var keyList = [];
+  loop(data, function (node) {
+    keyList.push(node[key]);
+  }, {
+    children: children
+  });
+  return keyList;
+}
+/**
+ * 获取当前节点的层级
+ * @param data 数据
+ * @param value 需要获取层级的 key
+ * @param aliasMap 标识
+ * @returns
+ */
+
+
+function getTreeNodeLevel(data, value, aliasMap) {
+  var _ref5 = aliasMap !== null && aliasMap !== void 0 ? aliasMap : {},
+      _ref5$key = _ref5.key,
+      key = _ref5$key === void 0 ? 'value' : _ref5$key,
+      _ref5$children = _ref5.children,
+      children = _ref5$children === void 0 ? 'children' : _ref5$children;
+
+  var result = 0;
+  loop(data, function (item, level) {
+    if (item[key] === value) {
+      result = level !== null && level !== void 0 ? level : 0;
+    }
+  }, {
+    children: children
+  });
+  return result;
+}
+/**
+ * 获取树的层级
+ * @param data 数据
+ * @param aliasMap 标识
+ * @returns
+ */
+
+
+function getTreeLevel(data, aliasMap) {
+  var _ref6 = aliasMap !== null && aliasMap !== void 0 ? aliasMap : {},
+      _ref6$children = _ref6.children,
+      children = _ref6$children === void 0 ? 'children' : _ref6$children;
+
+  var result = 1;
+  loop(data, function (item, level) {
+    if (result < level) {
+      result = level;
+    }
+
+    if ('children' in item) {
+      result += 1;
+    }
+  }, {
+    children: children
+  });
+  return result;
+}
+/**
+ * 获取树层级对应的所有 key
+ * @param data
+ * @param level
+ * @param aliasMap
+ * @returns
+ */
+
+
+function getTreeLevelKey(data, level, aliasMap) {
+  var _ref7 = aliasMap !== null && aliasMap !== void 0 ? aliasMap : {},
+      _ref7$key = _ref7.key,
+      key = _ref7$key === void 0 ? 'value' : _ref7$key,
+      _ref7$children = _ref7.children,
+      children = _ref7$children === void 0 ? 'children' : _ref7$children;
+
+  var result = []; // TODO 此处可做性能优化
+
+  loop(data, function (item, currentLevel) {
+    if (currentLevel + 1 <= level) {
+      result.push(item === null || item === void 0 ? void 0 : item[key]);
+    }
+  }, {
+    children: children
+  });
+  return result;
+}

package/lib/table/components/Pagination/index.js

@@ -178,7 +178,7 @@ var _default = function _default(props) {
     return /*#__PURE__*/_react.default.createElement("div", {
       className: cls('custom-jumper')
     }, /*#__PURE__*/_react.default.createElement(_components.Button, {
-      className: "next-prev next-pagination-item",
+      className: "".concat((0, _utils.usePrefixCls)(), "prev ").concat((0, _utils.usePrefixCls)(), "pagination-item"),
       onClick: handlePrevClick,
       disabled: Number(currentPage) <= 1
     }, /*#__PURE__*/_react.default.createElement(_components.Icon, {
@@ -200,7 +200,7 @@ var _default = function _default(props) {
         marginRight: 4
       }
     }, "/"), getTotalPage(total, pageSize)), /*#__PURE__*/_react.default.createElement(_components.Button, {
-      className: "next-next next-pagination-item",
+      className: "".concat((0, _utils.usePrefixCls)(), "next ").concat((0, _utils.usePrefixCls)(), "pagination-item"),
       onClick: handleNextClick,
       //@ts-ignore
       disabled: total && Number(currentPage) >= getTotalPage(total, pageSize)
@@ -218,7 +218,7 @@ var _default = function _default(props) {
         }, otherProps));
       } else {
         return /*#__PURE__*/_react.default.createElement("div", {
-          className: "".concat(cls('custom-mini-pagination'), "  next-pagination")
+          className: "".concat(cls('custom-mini-pagination'), "  ").concat((0, _utils.usePrefixCls)(), "pagination")
         }, customTotalRender(total), customJumpRender());
       }
     }

package/lib/table/components/ToolBar/FilterColumnIcon.js

@@ -64,8 +64,12 @@ var processColumns = function processColumns(columns) {
     columns = columns.filter(function (item) {
       return item.valueType !== 'selectGroup';
     });
-  }
+  } // hidden 为 true 时不展示
+
 
+  columns = columns.filter(function (item) {
+    return (item === null || item === void 0 ? void 0 : item.hidden) !== true;
+  });
   return columns.map(function (item) {
     if (item.columnFilters === false) {
       return item;

package/lib/table/index.js

@@ -109,7 +109,7 @@ var processColumns = function processColumns(columns, initialColumns) {
   var _filterColumns;
 
   var filterColumns = columns.filter(function (item) {
-    return item.columnFilters !== false;
+    return item.columnFilters !== false && (item === null || item === void 0 ? void 0 : item.hidden) !== true;
   });
 
   if (isRoot) {
@@ -313,7 +313,7 @@ var ProTable = function ProTable(props) {
 
     var tableDom = tableRef.current;
     var headerDom = tableDom === null || tableDom === void 0 ? void 0 : (_tableDom$getElements = tableDom.getElementsByClassName('teamix-pro-table-layout')) === null || _tableDom$getElements === void 0 ? void 0 : _tableDom$getElements[0];
-    var tableHeaderDom = tableDom === null || tableDom === void 0 ? void 0 : (_tableDom$getElements2 = tableDom.getElementsByClassName('next-table-header-inner')) === null || _tableDom$getElements2 === void 0 ? void 0 : _tableDom$getElements2[0];
+    var tableHeaderDom = tableDom === null || tableDom === void 0 ? void 0 : (_tableDom$getElements2 = tableDom.getElementsByClassName("".concat((0, _utils.usePrefixCls)(), "table-header-inner"))) === null || _tableDom$getElements2 === void 0 ? void 0 : _tableDom$getElements2[0];
     return new Promise(function (resolve) {
       setTimeout(function () {
         var _headerDom$offsetHeig, _tableHeaderDom$offse;
@@ -736,6 +736,11 @@ var ProTable = function ProTable(props) {
             setTotal(total || (data === null || data === void 0 ? void 0 : data.length));
             setShowSkeleton(false);
             setCustomTableLoading(false);
+          } // 重新计算是否需要吸底
+
+
+          if (footerSuction) {
+            getFooterSuctionState();
           }
         });
       } else {
@@ -794,7 +799,7 @@ var ProTable = function ProTable(props) {
     onInit: function onInit(values) {
       // 表单初始化请求处理
       (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onInit) && (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onInit(values));
-      !fullscreenState && _request({}, false, values);
+      !fullscreenState && requestWhenMount && _request({}, false, values);
       return true;
     },
     onFilter: function onFilter(values) {

package/lib/table/typing.d.ts

@@ -33,7 +33,9 @@ export declare type ProTableColumnProps = {
     tooltipIcon?: React.ReactNode;
     /** 对应 ProField 里面的 type */
     valueType?: ProFieldType;
-    /** 【列配置】是否默认隐藏列 */
+    /** 是否隐藏表格列，列配置也不显示 */
+    hidden?: boolean;
+    /** 【列配置】是否默认隐藏表格列，但列配置显示 */
     columnFilters?: boolean;
     /** 【列配置】是否禁用隐藏列 */
     columnFiltersDisabled?: boolean;

package/package.json

@@ -1,7 +1,21 @@
 {
   "name": "@teamix/pro",
-  "version": "1.3.4",
+  "version": "1.3.7",
   "description": "TeamixPro大包",
+  "keywords": [
+    "aliyun",
+    "hybridcloud",
+    "teamix",
+    "pro",
+    "components",
+    "ui",
+    "ui library",
+    "react",
+    "frontend",
+    "protable",
+    "proform",
+    "proaction"
+  ],
   "repository": "http://gitlab.alibaba-inc.com/teamix/pro",
   "author": "Velociraptor(迅猛龙)",
   "license": "MIT",
@@ -22,9 +36,9 @@
   ],
   "private": false,
   "dependencies": {
-    "@formily/core": "2.0.11",
-    "@formily/react": "2.0.11",
-    "@teamix/formily": "2.0.11",
+    "@formily/core": "2.0.15",
+    "@formily/react": "2.0.15",
+    "@teamix/formily": "2.0.15",
     "@teamix/hooks": "^0.1.0",
     "@teamix/pop-confirm": "^1.2.4",
     "@teamix/pro-field": "^1.0.0",