@teamix/pro 1.2.29 → 1.2.33

package/lib/table/index.js

@@ -281,7 +281,24 @@ var ProTable = function ProTable(props) {
   var _useState19 = (0, _react.useState)(true),
       _useState20 = _slicedToArray(_useState19, 2),
       showLoading = _useState20[0],
-      setShowLoading = _useState20[1]; // 存储定时器 id
+      setShowLoading = _useState20[1]; // 存储能够被 on 监听到的 ProTable 状态
+  // 因为只做存储用。不需要更新视图以及需要同步更改。所以不使用 setState 更新
+
+
+  var _useState21 = (0, _react.useState)({
+    fullScreenState: false,
+    filterRules: {},
+    filterColumns: []
+  }),
+      _useState22 = _slicedToArray(_useState21, 1),
+      actionRefState = _useState22[0]; // 存储 on 监听事件
+
+
+  var _useState23 = (0, _react.useState)({
+    fullScreenState: {}
+  }),
+      _useState24 = _slicedToArray(_useState23, 1),
+      actionRefCallback = _useState24[0]; // 存储定时器 id
 
 
   var autoRefreshTimerRef = (0, _react.useRef)(); // 获取header高度，用作全屏吸底吸底高度计算
@@ -305,16 +322,16 @@ var ProTable = function ProTable(props) {
   }; // header 区域高度。用作全屏计算吸顶吸底高度。默认不做计算
 
 
-  var _useState21 = (0, _react.useState)(0),
-      _useState22 = _slicedToArray(_useState21, 2),
-      headerHeight = _useState22[0],
-      setHeaderHeight = _useState22[1]; // 全屏显示 className
+  var _useState25 = (0, _react.useState)(0),
+      _useState26 = _slicedToArray(_useState25, 2),
+      headerHeight = _useState26[0],
+      setHeaderHeight = _useState26[1]; // 全屏显示 className
 
 
-  var _useState23 = (0, _react.useState)(false),
-      _useState24 = _slicedToArray(_useState23, 2),
-      fullscreenState = _useState24[0],
-      setFullscreenState = _useState24[1]; // 非全屏状态下的
+  var _useState27 = (0, _react.useState)(false),
+      _useState28 = _slicedToArray(_useState27, 2),
+      fullscreenState = _useState28[0],
+      setFullscreenState = _useState28[1]; // 非全屏状态下的
 
 
   var normalDataFilterFormRef = (0, _react.useRef)();
@@ -325,10 +342,10 @@ var ProTable = function ProTable(props) {
   var dataFilterFormRef = !fullscreenState ? normalDataFilterFormRef : fullscreenDataFilterFormRef;
   var dataFilterForm = dataFilterFormRef.current; // 整个内容区是否超过一屏。用于表格在非全屏模式下的吸底
 
-  var _useState25 = (0, _react.useState)(false),
-      _useState26 = _slicedToArray(_useState25, 2),
-      footerSuctionState = _useState26[0],
-      setFooterSuctionState = _useState26[1]; // TODO 获取内容区是否超出一屏（暂时仅支持全家桶）
+  var _useState29 = (0, _react.useState)(false),
+      _useState30 = _slicedToArray(_useState29, 2),
+      footerSuctionState = _useState30[0],
+      setFooterSuctionState = _useState30[1]; // TODO 获取内容区是否超出一屏（暂时仅支持全家桶）
 
 
   var getFooterSuctionState = function getFooterSuctionState() {
@@ -451,25 +468,63 @@ var ProTable = function ProTable(props) {
     if (propsDataSource) {
       setData(propsDataSource);
     }
-  }, [propsDataSource]); // 绑定 Actions
+  }, [propsDataSource]); // 初始化 ActionRef。
+
+  (0, _utils2.initActionRef)(actionRef, {
+    getState: function getState() {
+      return actionRefState;
+    },
+    getCallback: function getCallback() {
+      return actionRefCallback;
+    },
+    setState: function setState(key, value) {
+      actionRefState[key] = value;
+      (0, _utils2.actionRefUseStateOn)(actionRefCallback, key, value);
+    },
+    on: function on(fun, state, name) {
+      if (!actionRefCallback[state]) {
+        actionRefCallback[state] = {};
+      }
+
+      actionRefCallback[state][name] = fun;
+    },
+    off: function off(name) {
+      actionRefCallback = Object.fromEntries(Object.entries(actionRefCallback).map(function (_ref) {
+        var _ref2 = _slicedToArray(_ref, 2),
+            k = _ref2[0],
+            v = _ref2[1];
+
+        var filterV = Object.fromEntries(Object.entries(v).filter(function (_ref3) {
+          var _ref4 = _slicedToArray(_ref3, 1),
+              k = _ref4[0];
+
+          return k !== name;
+        }));
+        return [k, filterV];
+      }));
+    }
+  }); // 绑定 Actions
 
   (0, _utils2.useActionType)(actionRef, {
     fullScreen: function fullScreen() {
+      var _actionRef$current2, _actionRef$current2$s;
+
       var state = !fullscreenState; // 全屏时需要重新计算header高度
 
       getHeaderHeight().then(function (height) {
         setHeaderHeight(height);
       });
       setFullscreenState(state);
+      actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current2 = actionRef.current) === null || _actionRef$current2 === void 0 ? void 0 : (_actionRef$current2$s = _actionRef$current2.setState) === null || _actionRef$current2$s === void 0 ? void 0 : _actionRef$current2$s.call(_actionRef$current2, 'fullScreenState', state);
       return state;
     },
     setColumn: function setColumn(newColumns) {
-      var _actionRef$current2, _actionRef$current2$s;
+      var _actionRef$current3, _actionRef$current3$s;
 
       var update = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
       var columns = processColumns(newColumns, propsColumns);
       setFilteredColumns(columns);
-      (_actionRef$current2 = actionRef.current) === null || _actionRef$current2 === void 0 ? void 0 : (_actionRef$current2$s = _actionRef$current2.setState) === null || _actionRef$current2$s === void 0 ? void 0 : _actionRef$current2$s.call(_actionRef$current2, 'filterColumns', columns);
+      (_actionRef$current3 = actionRef.current) === null || _actionRef$current3 === void 0 ? void 0 : (_actionRef$current3$s = _actionRef$current3.setState) === null || _actionRef$current3$s === void 0 ? void 0 : _actionRef$current3$s.call(_actionRef$current3, 'filterColumns', columns);
 
       if (update) {
         (0, _utils2.emit)('refreshFilterState', newColumns);
@@ -494,11 +549,11 @@ var ProTable = function ProTable(props) {
       _request(params);
     },
     reset: function reset() {
-      var _actionRef$current3, _actionRef$current3$s, _dataFilterForm;
+      var _actionRef$current4, _actionRef$current4$s, _dataFilterForm;
 
       (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onReset) && (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onReset()); // 清空列过滤参数
 
-      (_actionRef$current3 = actionRef.current) === null || _actionRef$current3 === void 0 ? void 0 : (_actionRef$current3$s = _actionRef$current3.setFilterRules) === null || _actionRef$current3$s === void 0 ? void 0 : _actionRef$current3$s.call(_actionRef$current3, {});
+      (_actionRef$current4 = actionRef.current) === null || _actionRef$current4 === void 0 ? void 0 : (_actionRef$current4$s = _actionRef$current4.setFilterRules) === null || _actionRef$current4$s === void 0 ? void 0 : _actionRef$current4$s.call(_actionRef$current4, {});
       (_dataFilterForm = dataFilterForm) === null || _dataFilterForm === void 0 ? void 0 : _dataFilterForm.reset();
       setCurrentPage(1);
 
@@ -613,7 +668,7 @@ var ProTable = function ProTable(props) {
   }); // 请求函数
 
   function _request(params, noLoading) {
-    var _dataFilterForm2, _actionRef$current$ge, _actionRef$current4, _actionRef$current4$g, _objectSpread2;
+    var _dataFilterForm2, _actionRef$current$ge, _actionRef$current5, _actionRef$current5$g, _objectSpread2;
 
     // 如果没有传 url 且没有 customRequest，直接返回
     if (!url && !customRequest) {
@@ -628,7 +683,7 @@ var ProTable = function ProTable(props) {
 
     var dataFilterParams = toJS((_dataFilterForm2 = dataFilterForm) === null || _dataFilterForm2 === void 0 ? void 0 : _dataFilterForm2.values); // 列过滤请求参数
 
-    var columnsFilterParams = (_actionRef$current$ge = (_actionRef$current4 = actionRef.current) === null || _actionRef$current4 === void 0 ? void 0 : (_actionRef$current4$g = _actionRef$current4.getFilterRules) === null || _actionRef$current4$g === void 0 ? void 0 : _actionRef$current4$g.call(_actionRef$current4)) !== null && _actionRef$current$ge !== void 0 ? _actionRef$current$ge : {}; // 格式化后的请求参数
+    var columnsFilterParams = (_actionRef$current$ge = (_actionRef$current5 = actionRef.current) === null || _actionRef$current5 === void 0 ? void 0 : (_actionRef$current5$g = _actionRef$current5.getFilterRules) === null || _actionRef$current5$g === void 0 ? void 0 : _actionRef$current5$g.call(_actionRef$current5)) !== null && _actionRef$current$ge !== void 0 ? _actionRef$current$ge : {}; // 格式化后的请求参数
 
     var requestData = formatParams(_objectSpread(_objectSpread({}, !showPagination ? _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, dataFilterParams), propsParams), sortParams), columnsFilterParams) : _objectSpread(_objectSpread(_objectSpread(_objectSpread((_objectSpread2 = {}, _defineProperty(_objectSpread2, targetPageKey, currentPage), _defineProperty(_objectSpread2, targetPageSizeKey, pageSize), _objectSpread2), dataFilterParams), propsParams), sortParams), columnsFilterParams)), params));
 
@@ -677,8 +732,6 @@ var ProTable = function ProTable(props) {
   }
 
   (0, _react.useEffect)(function () {
-    // 初始化 actionRef state、callback 此时 actionRef 已初始化完成
-    (0, _utils2.initActionRef)();
     dataFilterForm = dataFilterFormRef.current; // 监听 浏览器变化 更吸底状态
 
     if (footerSuction) {
@@ -732,11 +785,11 @@ var ProTable = function ProTable(props) {
     mode: 'inline'
   }, propsDataFilter), {}, {
     onFilter: function onFilter(values) {
-      var _actionRef$current5, _actionRef$current5$c;
+      var _actionRef$current6, _actionRef$current6$c;
 
       (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onFilter) && (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onFilter(values)); // 搜索变化时，暂时先清空选择
 
-      (_actionRef$current5 = actionRef.current) === null || _actionRef$current5 === void 0 ? void 0 : (_actionRef$current5$c = _actionRef$current5.clearRowSelection) === null || _actionRef$current5$c === void 0 ? void 0 : _actionRef$current5$c.call(_actionRef$current5);
+      (_actionRef$current6 = actionRef.current) === null || _actionRef$current6 === void 0 ? void 0 : (_actionRef$current6$c = _actionRef$current6.clearRowSelection) === null || _actionRef$current6$c === void 0 ? void 0 : _actionRef$current6$c.call(_actionRef$current6);
       setCurrentPage(1);
 
       _request(_defineProperty({}, targetPageKey, 1));
@@ -832,21 +885,21 @@ var ProTable = function ProTable(props) {
 
   var renderFooter = function renderFooter() {
     function onChangePagination(currentPage) {
-      var _actionRef$current6, _actionRef$current6$c;
+      var _actionRef$current7, _actionRef$current7$c;
 
       var params = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       // 翻页暂时先清空选择
-      (_actionRef$current6 = actionRef.current) === null || _actionRef$current6 === void 0 ? void 0 : (_actionRef$current6$c = _actionRef$current6.clearRowSelection) === null || _actionRef$current6$c === void 0 ? void 0 : _actionRef$current6$c.call(_actionRef$current6);
+      (_actionRef$current7 = actionRef.current) === null || _actionRef$current7 === void 0 ? void 0 : (_actionRef$current7$c = _actionRef$current7.clearRowSelection) === null || _actionRef$current7$c === void 0 ? void 0 : _actionRef$current7$c.call(_actionRef$current7);
       setCurrentPage(currentPage);
 
       _request(_objectSpread(_defineProperty({}, targetPageKey, currentPage), params));
     }
 
     function onChangePaginationSize(currentPageSize) {
-      var _actionRef$current7, _actionRef$current7$c, _request5;
+      var _actionRef$current8, _actionRef$current8$c, _request5;
 
       // 翻页暂时先清空选择
-      (_actionRef$current7 = actionRef.current) === null || _actionRef$current7 === void 0 ? void 0 : (_actionRef$current7$c = _actionRef$current7.clearRowSelection) === null || _actionRef$current7$c === void 0 ? void 0 : _actionRef$current7$c.call(_actionRef$current7);
+      (_actionRef$current8 = actionRef.current) === null || _actionRef$current8 === void 0 ? void 0 : (_actionRef$current8$c = _actionRef$current8.clearRowSelection) === null || _actionRef$current8$c === void 0 ? void 0 : _actionRef$current8$c.call(_actionRef$current8);
       setPageSize(currentPageSize);
       setCurrentPage(1);
 

package/lib/table/index.scss

@@ -114,4 +114,8 @@ $fullscreenPadding: 24px;
 // 后面在基础组件里面覆盖
 .next-table.next-table td .next-table-cell-wrapper {
   text-overflow: unset;
+}
+
+.mb8 {
+  margin-bottom: 8px;
 }

package/lib/table/typing.d.ts

@@ -201,8 +201,6 @@ export declare type ProTableActionTypeMutations = {
     getState?: () => ProTableActionTypeState;
     /** 设置state 状态 */
     setState?: (key: string, value: any) => void;
-    /** 初始化 state 状态 */
-    initState?: () => void;
     /** 设置全屏状态 */
     setFullScreenState?: (state: boolean) => void;
     /** 绑定state监听事件 */
@@ -217,6 +215,8 @@ export declare type ProTableActionTypeMutations = {
     resetTableMaxBodyHeight?: () => void;
     /** 列筛选规则 */
     filterColumns?: any[];
+    /** 获取所有 on 监听事件 */
+    getCallback?: () => any;
 };
 /** action Mutations 定义 */
 export declare type ProTableActionTypeState = {

package/lib/table/utils/columnRender.js

@@ -157,7 +157,7 @@ var renderCell = function renderCell(value, item, index, record, actionRef) {
 
     if (valueType === 'selectGroup') {
       newRender = _objectSpread(_objectSpread({
-        maxShowNumber: 1,
+        maxShowNumber: 'auto',
         foldText: 'more',
         editOnClick: function editOnClick() {},
         edit: true

package/lib/table/utils/index.d.ts

@@ -1,13 +1,14 @@
 /// <reference types="react" />
 import { ProTableActionType } from '../typing';
 import { ProTableProps, ProTableColumnProps } from '..';
-export declare function initActionRef(): void;
+export declare function actionRefUseStateOn(callback: any, state: string, ...args: any): void;
 /** table 组件内监听 不对外暴露 */
 export declare function on(fun: any, key: string): void;
 /** table 组件内销毁监听 不对外暴露 */
 export declare function off(key: string): void;
 /** table 组件内触发事件 不对外暴露 */
 export declare function emit(key: string, ...args: any): void;
+export declare function initActionRef(ref: React.MutableRefObject<ProTableActionType | undefined>, action: ProTableActionType): void;
 export declare function useActionType<T>(ref: React.MutableRefObject<ProTableActionType | undefined>, action: ProTableActionType): void;
 export declare function cloneDeep<T>(obj: T): T;
 /**

package/lib/table/utils/index.js

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.actionRefUseStateOn = actionRefUseStateOn;
 exports.cloneDeep = cloneDeep;
 exports.emit = emit;
 exports.initActionRef = initActionRef;
@@ -33,128 +34,75 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-// 组件内全局状态 每次初始化 ActionRef 会重新深拷贝对象
-var state = {
-  fullScreenState: false,
-  filterRules: {},
-  filterColumns: []
-};
-
-var _initState = (0, _lodash.default)(state); // state监听事件 每次初始化 ActionRef 会重新深拷贝对象
-
-
-var callback = {
-  fullScreenState: {}
-};
-var initCallback = (0, _lodash.default)(callback); // 所有 ProTable 组件公用一套组件内事件转发机制
-
-var tableCallback = {}; // 组件内监听事件
-// 组件内对全局状态的更改
-
-var mutations = {
-  getState: function getState() {
-    return state;
-  },
-  setState: function setState(key, value) {
-    state[key] = value;
-    useOn(key, value);
-
-    if (mutations.hasOwnProperty(key)) {
-      mutations[key] = value;
-    }
-  },
-  initState: function initState() {
-    state = (0, _lodash.default)(_initState);
-  },
-  filterColumns: state.filterColumns,
-  setFullScreenState: function setFullScreenState(fullScreenState) {
-    state.fullScreenState = fullScreenState;
-    useOn('fullScreenState', fullScreenState);
-  },
-
-  /**
-   * 设置筛选列规则
-   * @param rules 规则
-   * @param dataIndex column.dataIndex
-   */
-  setFilterRules: function setFilterRules(rules) {
-    state.filterRules = rules;
-  },
-
-  /**
-   * 获取筛选规则。为params
-   */
-  getFilterRules: function getFilterRules() {
-    var result = {};
-
-    if (state.filterRules) {
-      result = Object.entries(state.filterRules).map(function (_ref) {
-        var _ref2 = _slicedToArray(_ref, 2),
-            k = _ref2[0],
-            v = _ref2[1];
-
-        return _defineProperty({}, k, v.params);
-      }).reduce(function (acc, cur) {
-        acc = _objectSpread(_objectSpread({}, acc), cur);
-        return acc;
-      }, {});
-    }
+// 所有 ProTable 组件公用一套组件内事件转发机制
+var tableCallback = {}; // 组件内对全局状态的更改
+
+var getMutations = function getMutations(actionRef) {
+  var _actionRef$current2, _actionRef$current2$g, _actionRef$current2$g2;
+
+  return {
+    setFullScreenState: function setFullScreenState(fullScreenState) {
+      var _actionRef$current, _actionRef$current$se;
+
+      (_actionRef$current = actionRef.current) === null || _actionRef$current === void 0 ? void 0 : (_actionRef$current$se = _actionRef$current.setState) === null || _actionRef$current$se === void 0 ? void 0 : _actionRef$current$se.call(_actionRef$current, 'fullScreenState', fullScreenState);
+    },
+    filterColumns: (_actionRef$current2 = actionRef.current) === null || _actionRef$current2 === void 0 ? void 0 : (_actionRef$current2$g = _actionRef$current2.getState) === null || _actionRef$current2$g === void 0 ? void 0 : (_actionRef$current2$g2 = _actionRef$current2$g.call(_actionRef$current2)) === null || _actionRef$current2$g2 === void 0 ? void 0 : _actionRef$current2$g2.filterColumns,
+
+    /**
+     * 设置筛选列规则
+     * @param rules 规则
+     * @param dataIndex column.dataIndex
+     */
+    setFilterRules: function setFilterRules(rules) {
+      var _actionRef$current3, _actionRef$current3$s;
+
+      (_actionRef$current3 = actionRef.current) === null || _actionRef$current3 === void 0 ? void 0 : (_actionRef$current3$s = _actionRef$current3.setState) === null || _actionRef$current3$s === void 0 ? void 0 : _actionRef$current3$s.call(_actionRef$current3, 'filterRules', rules);
+    },
+
+    /**
+     * 获取筛选规则。为params
+     */
+    getFilterRules: function getFilterRules() {
+      var _actionRef$current4, _actionRef$current4$g;
+
+      var result = {};
+      var filterRules = (_actionRef$current4 = actionRef.current) === null || _actionRef$current4 === void 0 ? void 0 : (_actionRef$current4$g = _actionRef$current4.getState) === null || _actionRef$current4$g === void 0 ? void 0 : _actionRef$current4$g.call(_actionRef$current4).filterRules;
+
+      if (filterRules) {
+        result = Object.entries(filterRules).map(function (_ref) {
+          var _ref2 = _slicedToArray(_ref, 2),
+              k = _ref2[0],
+              v = _ref2[1];
+
+          return _defineProperty({}, k, v.params);
+        }).reduce(function (acc, cur) {
+          acc = _objectSpread(_objectSpread({}, acc), cur);
+          return acc;
+        }, {});
+      }
 
-    return result;
-  },
-
-  /**
-   * 绑定监听函数
-   * @param fun 监听函数
-   * @param state 需要监听的state
-   * @param name 监听名（作为销毁唯一id使用）
-   */
-  on: function on(fun, state, name) {
-    if (!callback[state]) {
-      callback[state] = {};
+      return result;
     }
-
-    callback[state][name] = fun;
-  },
-  off: function off(name) {
-    callback = Object.fromEntries(Object.entries(callback).map(function (_ref4) {
-      var _ref5 = _slicedToArray(_ref4, 2),
-          k = _ref5[0],
-          v = _ref5[1];
-
-      var filterV = Object.fromEntries(Object.entries(v).filter(function (_ref6) {
-        var _ref7 = _slicedToArray(_ref6, 1),
-            k = _ref7[0];
-
-        return k !== name;
-      }));
-      return [k, filterV];
-    }));
-  }
+  };
 }; // 调用绑定的监听函数
 
-var useOn = function useOn(state) {
-  for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
-    args[_key - 1] = arguments[_key];
+
+function actionRefUseStateOn(callback, state) {
+  for (var _len = arguments.length, args = new Array(_len > 2 ? _len - 2 : 0), _key = 2; _key < _len; _key++) {
+    args[_key - 2] = arguments[_key];
   }
 
   if (callback[state]) {
-    Object.entries(callback[state]).forEach(function (_ref8) {
-      var _ref9 = _slicedToArray(_ref8, 2),
-          k = _ref9[0],
-          v = _ref9[1];
+    Object.entries(callback[state]).forEach(function (_ref4) {
+      var _ref5 = _slicedToArray(_ref4, 2),
+          k = _ref5[0],
+          v = _ref5[1];
 
       if (v) {
         v === null || v === void 0 ? void 0 : v.apply(void 0, args);
       }
     });
   }
-}; // 初始化 actionRef
-
-
-function initActionRef() {
-  state = (0, _lodash.default)(_initState);
-  callback = (0, _lodash.default)(initCallback);
 }
 /** table 组件内监听 不对外暴露 */
 
@@ -185,13 +133,16 @@ function emit(key) {
   }
 }
 
-function useActionType(ref, action) {
-  // 合并自定义事件
-  var userAction = _objectSpread(_objectSpread({}, action), mutations);
+function initActionRef(ref, action) {
+  var userAction = _objectSpread(_objectSpread({}, action), getMutations(ref));
 
   ref.current = userAction;
 }
 
+function useActionType(ref, action) {
+  ref.current = _objectSpread(_objectSpread({}, ref.current), action);
+}
+
 function cloneDeep(obj) {
   return (0, _lodash.default)(obj);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teamix/pro",
-  "version": "1.2.29",
+  "version": "1.2.33",
   "description": "TeamixPro大包",
   "repository": "http://gitlab.alibaba-inc.com/teamix/pro",
   "author": "Velociraptor(迅猛龙)",