@teamix/pro 1.2.14 → 1.2.15

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: getItemLabel(),
     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.15",
   "description": "TeamixPro大包",
   "repository": "http://gitlab.alibaba-inc.com/teamix/pro",
   "author": "Velociraptor(迅猛龙)",