@teamix/pro 1.2.14 → 1.2.18

package/lib/form/typing.d.ts

@@ -65,6 +65,12 @@ export interface ProFormProps extends IFormLayoutProps {
     onSubmitFailed?: (feedbacks: IFormFeedback[]) => void;
 }
 export interface QueryFilterProps extends ProFormProps {
+    /**
+     * @deprecated triggerType已弃用
+     */
+    triggerType?: 'keydown' | 'change' | 'submit';
+    mode?: 'inline' | 'panel';
+    expand?: boolean;
     addonBefore?: ReactNode;
     addonAfter?: ReactNode;
     onFilter?: (values: any) => void;

package/lib/index.d.ts

@@ -21,5 +21,5 @@ export * from './page-container';
 export * from './page-header';
 export * from './skeleton';
 export * from './table';
-declare const version = "1.2.13";
+declare const version = "1.2.17";
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, hooks, nocode, templates, utils, };

package/lib/index.js

@@ -253,5 +253,5 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 _icon.default.setConfig(_utils.default.getTeamixIconConfig());
 
 // export * from './sidebar';
-var version = '1.2.13';
+var version = '1.2.17';
 exports.version = version;

package/lib/nocode/configurators/ProTable.js

@@ -26,6 +26,7 @@ var initialValues = {
   },
   mainAction: {
     actions: [{
+      key: 'action',
       children: '操作按钮'
     }]
   }

package/lib/page-header/index.js

@@ -82,21 +82,12 @@ var renderActionGroup = function renderActionGroup(group, defaultProps) {
   return group;
 };
 
-var isPresetColor = function isPresetColor(color) {
-  if (!color) {
-    return false;
-  }
-
-  var PRESET_COLOR_REG = /blue|green|orange|red|yellow/;
-  return PRESET_COLOR_REG.test(color);
-};
-
 var getColorAndStyle = function getColorAndStyle(color, backgroundColor, backgroundType) {
   var _classnames;
 
-  var isColorPresetColor = isPresetColor(color);
-  var isBgColorPresetColor = isPresetColor(backgroundColor);
-  var className = (0, _classnames2.default)((_classnames = {}, _defineProperty(_classnames, "".concat(cls("color-".concat(color))), isColorPresetColor), _defineProperty(_classnames, "".concat(cls("bg-color-".concat(backgroundColor))), isBgColorPresetColor), _defineProperty(_classnames, "".concat(cls("bg-type-".concat(backgroundType))), !!backgroundType), _classnames));
+  var isColorPresetColor = (0, _utils.isPresetColor)(color);
+  var isBgColorPresetColor = (0, _utils.isPresetColor)(backgroundColor);
+  var className = (0, _classnames2.default)((_classnames = {}, _defineProperty(_classnames, "".concat((0, _utils.getColorClassName)(color)), isColorPresetColor), _defineProperty(_classnames, "".concat((0, _utils.getBackgroundColorClassName)(backgroundColor)), isBgColorPresetColor), _defineProperty(_classnames, "".concat(cls("bg-type-".concat(backgroundType))), !!backgroundType), _classnames));
   var styleColor = isColorPresetColor ? undefined : color;
   var styleBgColor = isBgColorPresetColor ? undefined : backgroundColor;
   var style = {

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

@@ -160,7 +160,7 @@ var Filter = function Filter(props) {
   return /*#__PURE__*/_react.default.createElement(_components.Dropdown, {
     trigger: /*#__PURE__*/_react.default.createElement(_icon.default, {
       size: "small",
-      type: "filter-line",
+      type: selected.length > 0 && visible === false ? 'filter-fill' : 'filter-line',
       className: cls({
         icon: true,
         'icon-selected': selected.length > 0
@@ -169,6 +169,8 @@ var Filter = function Filter(props) {
         setVisible(!visible);
       }
     }),
+    //@ts-ignore
+    v2: true,
     triggerType: ['click'],
     align: "tl bl",
     visible: visible,
@@ -191,7 +193,7 @@ var Filter = function Filter(props) {
       btn: true
     }),
     onClick: function onClick() {
-      var _actionRef$current2, _actionRef$current2$f, _actionRef$current$ge5, _actionRef$current3, _actionRef$current3$g, _actionRef$current3$g2, _actionRef$current4, _actionRef$current5, _actionRef$current5$s, _actionRef$current6, _actionRef$current6$r, _actionRef$current7, _actionRef$current7$r, _actionRef$current8, _actionRef$current8$c;
+      var _actionRef$current2, _actionRef$current2$f, _actionRef$current$ge5, _actionRef$current3, _actionRef$current3$g, _actionRef$current3$g2, _actionRef$current4, _actionRef$current4$s;
 
       (_actionRef$current2 = actionRef.current) === null || _actionRef$current2 === void 0 ? void 0 : (_actionRef$current2$f = _actionRef$current2.filterDataSource) === null || _actionRef$current2$f === void 0 ? void 0 : _actionRef$current2$f.call(_actionRef$current2, column.dataIndex); // 先获取此列的param
 
@@ -219,24 +221,30 @@ var Filter = function Filter(props) {
         return null;
       })), [[column.dataIndex, param]]).filter(function (item) {
         return item && (item === null || item === void 0 ? void 0 : item[1]);
-      }));
-      var targetPageKey = 'currentPage';
-      var pageInfo = (_actionRef$current4 = actionRef.current) === null || _actionRef$current4 === void 0 ? void 0 : _actionRef$current4.pageInfo;
+      })); // 再设置所有的列筛选状态
 
-      if (pageInfo && (pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.targetPageKey)) {
-        targetPageKey = pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.targetPageKey;
-      } // 再设置所有的列筛选状态
-
-
-      (_actionRef$current5 = actionRef.current) === null || _actionRef$current5 === void 0 ? void 0 : (_actionRef$current5$s = _actionRef$current5.setFilterRules) === null || _actionRef$current5$s === void 0 ? void 0 : _actionRef$current5$s.call(_actionRef$current5, _objectSpread(_objectSpread({}, rules), {}, _defineProperty({}, column.dataIndex, {
+      (_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, _objectSpread(_objectSpread({}, rules), {}, _defineProperty({}, column.dataIndex, {
         rules: selected,
         params: param
-      }))); // 发送请求
+      })));
+
+      if (selected.length > 0) {
+        var _actionRef$current5, _actionRef$current6, _actionRef$current6$r, _actionRef$current7, _actionRef$current7$r, _actionRef$current8, _actionRef$current8$c;
+
+        var targetPageKey = 'currentPage';
+        var pageInfo = (_actionRef$current5 = actionRef.current) === null || _actionRef$current5 === void 0 ? void 0 : _actionRef$current5.pageInfo;
+
+        if (pageInfo && (pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.targetPageKey)) {
+          targetPageKey = pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.targetPageKey;
+        } // 发送请求
+
+
+        (_actionRef$current6 = actionRef.current) === null || _actionRef$current6 === void 0 ? void 0 : (_actionRef$current6$r = _actionRef$current6.request) === null || _actionRef$current6$r === void 0 ? void 0 : _actionRef$current6$r.call(_actionRef$current6, _objectSpread(_objectSpread({}, params), {}, _defineProperty({}, targetPageKey, 1)));
+        (_actionRef$current7 = actionRef.current) === null || _actionRef$current7 === void 0 ? void 0 : (_actionRef$current7$r = _actionRef$current7.resetPage) === null || _actionRef$current7$r === void 0 ? void 0 : _actionRef$current7$r.call(_actionRef$current7); // 清空表格选择
 
-      (_actionRef$current6 = actionRef.current) === null || _actionRef$current6 === void 0 ? void 0 : (_actionRef$current6$r = _actionRef$current6.request) === null || _actionRef$current6$r === void 0 ? void 0 : _actionRef$current6$r.call(_actionRef$current6, _objectSpread(_objectSpread({}, params), {}, _defineProperty({}, targetPageKey, 1)));
-      (_actionRef$current7 = actionRef.current) === null || _actionRef$current7 === void 0 ? void 0 : (_actionRef$current7$r = _actionRef$current7.resetPage) === null || _actionRef$current7$r === void 0 ? void 0 : _actionRef$current7$r.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);
+      }
 
-      (_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);
       setVisible(false);
     }
   }, (0, _utils.getMessage)('ok')), /*#__PURE__*/_react.default.createElement(_components.Button, {
@@ -254,7 +262,25 @@ var Filter = function Filter(props) {
         rules: [],
         params: ''
       })));
-      (_actionRef$current11 = actionRef.current) === null || _actionRef$current11 === void 0 ? void 0 : (_actionRef$current11$ = _actionRef$current11.filterDataSource) === null || _actionRef$current11$ === void 0 ? void 0 : _actionRef$current11$.call(_actionRef$current11, column.dataIndex); // setVisible(!visible);
+      (_actionRef$current11 = actionRef.current) === null || _actionRef$current11 === void 0 ? void 0 : (_actionRef$current11$ = _actionRef$current11.filterDataSource) === null || _actionRef$current11$ === void 0 ? void 0 : _actionRef$current11$.call(_actionRef$current11, column.dataIndex);
+
+      if (selected.length > 0) {
+        var _actionRef$current12, _actionRef$current13, _actionRef$current13$, _actionRef$current14, _actionRef$current14$, _actionRef$current15, _actionRef$current15$;
+
+        var targetPageKey = 'currentPage';
+        var pageInfo = (_actionRef$current12 = actionRef.current) === null || _actionRef$current12 === void 0 ? void 0 : _actionRef$current12.pageInfo;
+
+        if (pageInfo && (pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.targetPageKey)) {
+          targetPageKey = pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.targetPageKey;
+        } // 发送请求
+
+
+        (_actionRef$current13 = actionRef.current) === null || _actionRef$current13 === void 0 ? void 0 : (_actionRef$current13$ = _actionRef$current13.request) === null || _actionRef$current13$ === void 0 ? void 0 : _actionRef$current13$.call(_actionRef$current13, _defineProperty({}, targetPageKey, 1));
+        (_actionRef$current14 = actionRef.current) === null || _actionRef$current14 === void 0 ? void 0 : (_actionRef$current14$ = _actionRef$current14.resetPage) === null || _actionRef$current14$ === void 0 ? void 0 : _actionRef$current14$.call(_actionRef$current14); // 清空表格选择
+
+        (_actionRef$current15 = actionRef.current) === null || _actionRef$current15 === void 0 ? void 0 : (_actionRef$current15$ = _actionRef$current15.clearRowSelection) === null || _actionRef$current15$ === void 0 ? void 0 : _actionRef$current15$.call(_actionRef$current15);
+      } // setVisible(!visible);
+
     }
   }, (0, _utils.getMessage)('reset'))))));
 };

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

@@ -25,6 +25,14 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: 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 _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -138,10 +146,23 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
 
 
   var moveUp = function moveUp(e, dataIndex) {
+    var _newColumns$filter, _newColumns$filter2;
+
     e.stopPropagation();
-    var keyNewColumns = (0, _utils2.cloneDeep)(newColumns);
-    var index = keyNewColumns.findIndex(function (_ref) {
-      var index = _ref.dataIndex;
+    var keyNewColumns = (0, _utils2.cloneDeep)(newColumns).filter(function (_ref) {
+      var lock = _ref.lock;
+      return !lock;
+    });
+    var headLock = (0, _utils2.cloneDeep)((_newColumns$filter = newColumns.filter(function (_ref2) {
+      var lock = _ref2.lock;
+      return lock === true || lock === 'left';
+    })) !== null && _newColumns$filter !== void 0 ? _newColumns$filter : []);
+    var tailLock = (0, _utils2.cloneDeep)((_newColumns$filter2 = newColumns.filter(function (_ref3) {
+      var lock = _ref3.lock;
+      return lock === 'right';
+    })) !== null && _newColumns$filter2 !== void 0 ? _newColumns$filter2 : []);
+    var index = keyNewColumns.findIndex(function (_ref4) {
+      var index = _ref4.dataIndex;
       return index === dataIndex;
     });
 
@@ -151,15 +172,28 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
       keyNewColumns.push(keyNewColumns.shift());
     }
 
-    notifyTableRender(keyNewColumns);
+    notifyTableRender([].concat(_toConsumableArray(headLock), _toConsumableArray(keyNewColumns), _toConsumableArray(tailLock)));
   }; // 向下
 
 
   var moveDown = function moveDown(e, dataIndex) {
+    var _newColumns$filter3, _newColumns$filter4;
+
     e.stopPropagation();
-    var keyNewColumns = (0, _utils2.cloneDeep)(newColumns);
-    var index = keyNewColumns.findIndex(function (_ref2) {
-      var index = _ref2.dataIndex;
+    var keyNewColumns = (0, _utils2.cloneDeep)(newColumns).filter(function (_ref5) {
+      var lock = _ref5.lock;
+      return !lock;
+    });
+    var headLock = (0, _utils2.cloneDeep)((_newColumns$filter3 = newColumns.filter(function (_ref6) {
+      var lock = _ref6.lock;
+      return lock === true || lock === 'left';
+    })) !== null && _newColumns$filter3 !== void 0 ? _newColumns$filter3 : []);
+    var tailLock = (0, _utils2.cloneDeep)((_newColumns$filter4 = newColumns.filter(function (_ref7) {
+      var lock = _ref7.lock;
+      return lock === 'right';
+    })) !== null && _newColumns$filter4 !== void 0 ? _newColumns$filter4 : []);
+    var index = keyNewColumns.findIndex(function (_ref8) {
+      var index = _ref8.dataIndex;
       return index === dataIndex;
     });
 
@@ -169,7 +203,7 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
       keyNewColumns.unshift(keyNewColumns.splice(index, 1)[0]);
     }
 
-    notifyTableRender(keyNewColumns);
+    notifyTableRender([].concat(_toConsumableArray(headLock), _toConsumableArray(keyNewColumns), _toConsumableArray(tailLock)));
   }; // 通知表格渲染
 
 
@@ -237,23 +271,24 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
       type: "primary"
     }, (0, _utils.getMessage)('reset'))), /*#__PURE__*/_react.default.createElement(_components.Menu.Divider, {
       key: "divider"
-    }), newColumns.map(function (_ref3, index) {
+    }), newColumns.map(function (_ref9, index) {
       var _newColumns$find;
 
-      var dataIndex = _ref3.dataIndex,
-          title = _ref3.title,
-          columnFiltersDisabled = _ref3.columnFiltersDisabled;
+      var dataIndex = _ref9.dataIndex,
+          title = _ref9.title,
+          columnFiltersDisabled = _ref9.columnFiltersDisabled,
+          lock = _ref9.lock;
       return /*#__PURE__*/_react.default.createElement(CheckboxItem, {
         key: index,
-        checked: (_newColumns$find = newColumns.find(function (_ref4) {
-          var key = _ref4.dataIndex;
+        checked: (_newColumns$find = newColumns.find(function (_ref10) {
+          var key = _ref10.dataIndex;
           return key === dataIndex;
         })) === null || _newColumns$find === void 0 ? void 0 : _newColumns$find.columnFilters,
         onChange: function onChange(check) {
           return onChangeColumns(check, dataIndex);
         },
         disabled: columnFiltersDisabled
-      }, title, /*#__PURE__*/_react.default.createElement("div", {
+      }, title, !lock && /*#__PURE__*/_react.default.createElement("div", {
         className: cls({
           sort: true
         })
@@ -310,8 +345,8 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
         key: index,
         className: cls('col')
       }, /*#__PURE__*/_react.default.createElement(_components.Checkbox, {
-        checked: (_newColumns$find2 = newColumns.find(function (_ref5) {
-          var key = _ref5.dataIndex;
+        checked: (_newColumns$find2 = newColumns.find(function (_ref11) {
+          var key = _ref11.dataIndex;
           return key === dataIndex;
         })) === null || _newColumns$find2 === void 0 ? void 0 : _newColumns$find2.columnFilters,
         onChange: function onChange(check) {

package/lib/table/components/ToolBar/index.scss

@@ -40,6 +40,7 @@
         visibility: visible;
         cursor: pointer;
       }
+
     }
   }
   .next-menu-item-text {

package/lib/table/index.js

@@ -425,6 +425,15 @@ var ProTable = function ProTable(props) {
     },
     request: function request(params) {
       if (dataFilterForm.validate()) {
+        // 如果请求中还有翻页相关信息，需要自动设置到指定页
+        if (params === null || params === void 0 ? void 0 : params[targetPageKey]) {
+          setCurrentPage(params[targetPageKey]);
+        }
+
+        if (params === null || params === void 0 ? void 0 : params[targetPageSizeKey]) {
+          setPageSize(params[targetPageSizeKey]);
+        }
+
         _request(params);
       }
     },
@@ -442,6 +451,7 @@ var ProTable = function ProTable(props) {
     resetPage: function resetPage() {
       setCurrentPage(1);
     },
+    rowSelection: rowSelection,
     clearRowSelection: function clearRowSelection() {
       rowSelectionHook.setSelectedRowKeys([]);
       rowSelectionHook.setSelectedRecords([]);
@@ -454,6 +464,7 @@ var ProTable = function ProTable(props) {
       targetPageSizeKey: targetPageSizeKey,
       pageSize: pageSize
     },
+    data: data,
     dataFilterForm: dataFilterForm,
     resetTableMaxBodyHeight: function resetTableMaxBodyHeight() {
       getHeaderHeight().then(function (height) {
@@ -608,7 +619,11 @@ var ProTable = function ProTable(props) {
   }
 
   (0, _react.useEffect)(function () {
-    // 监听 浏览器变化 更吸底状态
+    var _actionRef$current5, _actionRef$current5$i;
+
+    // 初始化 state 状态
+    actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current5 = actionRef.current) === null || _actionRef$current5 === void 0 ? void 0 : (_actionRef$current5$i = _actionRef$current5.initState) === null || _actionRef$current5$i === void 0 ? void 0 : _actionRef$current5$i.call(_actionRef$current5); // 监听 浏览器变化 更吸底状态
+
     if (footerSuction) {
       getFooterSuctionState();
 
@@ -629,6 +644,8 @@ var ProTable = function ProTable(props) {
       if (window.onresize) {
         window.onresize = null;
       }
+
+      actionRef.current = undefined;
     };
   }, []);
 
@@ -646,6 +663,10 @@ var ProTable = function ProTable(props) {
       (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onFilter) && (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onFilter(_objectSpread({}, toJS(dataFilterForm.values))));
 
       if (dataFilterForm.validate()) {
+        var _actionRef$current6, _actionRef$current6$c;
+
+        // 搜索变化时，暂时先清空选择
+        (_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); // const { mode, schema } = propsDataFilter as ProTableDataFilterProps;
         // TODO: 针对 inline 模式下的 search 组件做一下处理，如果空值切换下拉的时候不触发请求
         // if (mode === 'inline') {
@@ -742,15 +763,21 @@ var ProTable = function ProTable(props) {
 
   var renderFooter = function renderFooter() {
     function onChangePagination(currentPage) {
+      var _actionRef$current7, _actionRef$current7$c;
+
       var params = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+      // 翻页暂时先清空选择
+      (_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 _request5;
+      var _actionRef$current8, _actionRef$current8$c, _request5;
 
+      // 翻页暂时先清空选择
+      (_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/typing.d.ts

@@ -129,6 +129,7 @@ export declare type rowSelectionType = {
     onSelect?: (selected: boolean, record: any, records: Array<any>) => void;
     onSelectAll?: (selected: boolean, records: Array<any>) => void;
     selectedRowKeys?: Array<any>;
+    selectedRecords?: any[];
     mode?: 'single' | 'multiple';
     titleProps?: () => any;
     columnProps?: () => any;
@@ -154,6 +155,8 @@ export declare type ProTableActionType = {
     request?: (params?: any) => void;
     /** 重置表格 */
     reset?: () => void;
+    /** 表格选择相关属性 */
+    rowSelection?: innerRowSelectionType | rowSelectionType;
     /** 清空表格选择 */
     clearRowSelection?: () => void;
     /** 过滤 DataSource */
@@ -175,13 +178,17 @@ export declare type ProTableActionType = {
     resetPage?: () => void;
     /** 获取数据过滤区表单实例 */
     dataFilterForm?: FormType;
+    /** 表格当前的数据 */
+    data?: any[];
 } & ProTableActionTypeMutations;
 /** action State 定义 */
 export declare type ProTableActionTypeMutations = {
-    /** 获取state状态 */
+    /** 获取state 状态 */
     getState?: () => ProTableActionTypeState;
-    /** 设置state状态 */
+    /** 设置state 状态 */
     setState?: (key: string, value: any) => void;
+    /** 初始化 state 状态 */
+    initState?: () => void;
     /** 设置全屏状态 */
     setFullScreenState?: (state: boolean) => void;
     /** 绑定state监听事件 */

package/lib/table/utils/columnRender.js

@@ -50,10 +50,10 @@ var renderColumnsTitle = function renderColumnsTitle(item, actionRef) {
   var filterMode = item.filterMode,
       filters = item.filters,
       dataIndex = item.dataIndex,
-      dataSource = item.dataSource;
+      dataSource = item.dataSource; // 为列过滤添加状态标题
 
-  var getItemLable = function getItemLable() {
-    if (filterMode !== 'multiple') {
+  var getItemLabel = function getItemLabel() {
+    if (filters && filterMode !== 'multiple') {
       var _actionRef$current$ge, _actionRef$current, _actionRef$current$ge2;
 
       var selectedItem = (_actionRef$current$ge = (_actionRef$current = actionRef.current) === null || _actionRef$current === void 0 ? void 0 : (_actionRef$current$ge2 = _actionRef$current.getState) === null || _actionRef$current$ge2 === void 0 ? void 0 : _actionRef$current$ge2.call(_actionRef$current).filterRules) !== null && _actionRef$current$ge !== void 0 ? _actionRef$current$ge : {};
@@ -76,16 +76,37 @@ var renderColumnsTitle = function renderColumnsTitle(item, actionRef) {
 
             return item.value === ((_selectedItem$dataInd2 = selectedItem[dataIndex]) === null || _selectedItem$dataInd2 === void 0 ? void 0 : _selectedItem$dataInd2.params);
           })) === null || _targetFilters$find === void 0 ? void 0 : _targetFilters$find.label;
-          return "".concat(item.title, " (").concat(label, ")");
+          var value = "".concat(item.title, " (").concat(label, ")");
+          return /*#__PURE__*/_react.default.createElement(_field.default, {
+            style: {
+              display: 'inline-flex'
+            },
+            value: value,
+            type: "text",
+            render: {
+              ellipsis: true,
+              color: 'var(--table-th-color,#848484)'
+            }
+          });
         }
       }
     }
 
-    return item.title;
+    return /*#__PURE__*/_react.default.createElement(_field.default, {
+      style: {
+        display: 'inline-flex'
+      },
+      value: item.title,
+      type: "text",
+      render: {
+        ellipsis: true,
+        color: 'var(--table-th-color,#848484)'
+      }
+    });
   };
 
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_utils.LabelIconTip, {
-    label: getItemLable(),
+    label: item.title,
     tooltip: item.tooltip,
     icon: item.tooltipIcon
   }), item.filters && /*#__PURE__*/_react.default.createElement(_Filter.default, {

package/lib/table/utils/index.js

@@ -33,7 +33,10 @@ var state = {
   fullScreenState: false,
   filterRules: {},
   filterColumns: []
-}; // 组件内全局监听事件
+};
+
+var _initState = (0, _lodash.default)(state); // 组件内全局监听事件
+
 
 var callback = {
   fullScreenState: {}
@@ -51,6 +54,9 @@ var mutations = {
       mutations[key] = value;
     }
   },
+  initState: function initState() {
+    state = (0, _lodash.default)(_initState);
+  },
   filterColumns: state.filterColumns,
   setFullScreenState: function setFullScreenState(fullScreenState) {
     state.fullScreenState = fullScreenState;

package/lib/utils/message.d.ts

@@ -1,3 +1,3 @@
 import { MessageProps } from '@alicloudfe/components/types/message';
 export declare type ProMessageProps = MessageProps | string;
-export declare const renderProMessage: (message: ProMessageProps) => JSX.Element;
+export declare const renderProMessage: (message?: ProMessageProps | undefined, defaultProps?: MessageProps | undefined) => JSX.Element | null;

package/lib/utils/message.js

@@ -17,16 +17,16 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 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; }
 
-var renderProMessage = function renderProMessage(message) {
+var renderProMessage = function renderProMessage(message, defaultProps) {
+  if (!message) {
+    return null;
+  }
+
   if (typeof message === 'string') {
-    return /*#__PURE__*/_react.default.createElement(_components.Message, {
-      type: "notice"
-    }, message);
+    return /*#__PURE__*/_react.default.createElement(_components.Message, _objectSpread({}, defaultProps), message);
   }
 
-  return /*#__PURE__*/_react.default.createElement(_components.Message, _objectSpread({
-    type: "notice"
-  }, message));
+  return /*#__PURE__*/_react.default.createElement(_components.Message, _objectSpread(_objectSpread({}, defaultProps), message));
 };
 
 exports.renderProMessage = renderProMessage;

package/package.json

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