@teamix/pro 1.2.14 → 1.2.15

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

@@ -1,3 +1,11 @@
+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."); }
@@ -121,10 +129,23 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
 
 
   var moveUp = function moveUp(e, dataIndex) {
+    var _newColumns$filter, _newColumns$filter2;
+
     e.stopPropagation();
-    var keyNewColumns = cloneDeep(newColumns);
-    var index = keyNewColumns.findIndex(function (_ref) {
-      var index = _ref.dataIndex;
+    var keyNewColumns = cloneDeep(newColumns).filter(function (_ref) {
+      var lock = _ref.lock;
+      return !lock;
+    });
+    var headLock = 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 = 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;
     });
 
@@ -134,15 +155,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 = cloneDeep(newColumns);
-    var index = keyNewColumns.findIndex(function (_ref2) {
-      var index = _ref2.dataIndex;
+    var keyNewColumns = cloneDeep(newColumns).filter(function (_ref5) {
+      var lock = _ref5.lock;
+      return !lock;
+    });
+    var headLock = 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 = 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;
     });
 
@@ -152,7 +186,7 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
       keyNewColumns.unshift(keyNewColumns.splice(index, 1)[0]);
     }
 
-    notifyTableRender(keyNewColumns);
+    notifyTableRender([].concat(_toConsumableArray(headLock), _toConsumableArray(keyNewColumns), _toConsumableArray(tailLock)));
   }; // 通知表格渲染
 
 
@@ -220,23 +254,24 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
       type: "primary"
     }, getMessage('reset'))), /*#__PURE__*/React.createElement(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.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.createElement("div", {
+      }, title, !lock && /*#__PURE__*/React.createElement("div", {
         className: cls({
           sort: true
         })
@@ -293,8 +328,8 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
         key: index,
         className: cls('col')
       }, /*#__PURE__*/React.createElement(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/es/table/components/ToolBar/index.scss

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

package/es/table/index.js

@@ -564,7 +564,11 @@ var ProTable = function ProTable(props) {
   }
 
   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();
 
@@ -585,6 +589,8 @@ var ProTable = function ProTable(props) {
       if (window.onresize) {
         window.onresize = null;
       }
+
+      actionRef.current = undefined;
     };
   }, []);
 

package/es/table/typing.d.ts

@@ -178,10 +178,12 @@ export declare type ProTableActionType = {
 } & 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/es/table/utils/columnRender.js

@@ -40,10 +40,10 @@ export 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 : {};
@@ -66,16 +66,37 @@ export 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.createElement(ProField, {
+            style: {
+              display: 'inline-flex'
+            },
+            value: value,
+            type: "text",
+            render: {
+              ellipsis: true,
+              color: 'var(--table-th-color,#848484)'
+            }
+          });
         }
       }
     }
 
-    return item.title;
+    return /*#__PURE__*/React.createElement(ProField, {
+      style: {
+        display: 'inline-flex'
+      },
+      value: item.title,
+      type: "text",
+      render: {
+        ellipsis: true,
+        color: 'var(--table-th-color,#848484)'
+      }
+    });
   };
 
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(LabelIconTip, {
-    label: getItemLable(),
+    label: getItemLabel(),
     tooltip: item.tooltip,
     icon: item.tooltipIcon
   }), item.filters && /*#__PURE__*/React.createElement(Filter, {

package/es/table/utils/index.js

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

package/es/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/es/utils/message.js

@@ -6,14 +6,14 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 import React from 'react';
 import { Message } from '@alicloudfe/components';
-export var renderProMessage = function renderProMessage(message) {
+export var renderProMessage = function renderProMessage(message, defaultProps) {
+  if (!message) {
+    return null;
+  }
+
   if (typeof message === 'string') {
-    return /*#__PURE__*/React.createElement(Message, {
-      type: "notice"
-    }, message);
+    return /*#__PURE__*/React.createElement(Message, _objectSpread({}, defaultProps), message);
   }
 
-  return /*#__PURE__*/React.createElement(Message, _objectSpread({
-    type: "notice"
-  }, message));
+  return /*#__PURE__*/React.createElement(Message, _objectSpread(_objectSpread({}, defaultProps), message));
 };

package/lib/actions/dialog.js

@@ -251,7 +251,9 @@ function useDialogAction(action, actionContext) {
         className: "teamix-pro-dialog-before-content"
       }, addContextForReactNode(beforeContent, dialogContext)), message && /*#__PURE__*/_react.default.createElement("div", {
         className: "teamix-pro-dialog-message"
-      }, (0, _message.renderProMessage)(message)), dialogContent, afterContent && /*#__PURE__*/_react.default.createElement("div", {
+      }, (0, _message.renderProMessage)(message, {
+        type: 'notice'
+      })), dialogContent, afterContent && /*#__PURE__*/_react.default.createElement("div", {
         className: "teamix-pro-dialog-after-content"
       }, addContextForReactNode(afterContent, dialogContext)), footerDescription && /*#__PURE__*/_react.default.createElement("div", {
         className: (0, _classnames.default)('teamix-pro-dialog-footer-description', getFooterAlignClass(isDrawer, footerAlign))

package/lib/card/index.d.ts

@@ -1,5 +1,6 @@
 import React from 'react';
 import { ProTagItem } from '@teamix/utils';
+import { ProMessageProps } from '../utils/message';
 import { ProActionGroupProps } from '../actions';
 import './index.scss';
 export * from './card-container';
@@ -24,6 +25,8 @@ export interface ProCardProps extends Omit<React.HTMLAttributes<HTMLElement>, 't
     actions?: React.ReactNode | ProActionGroupProps;
     /** 卡片背景图 */
     image?: string;
+    /** 位于弹窗内容上方的消息提示区 */
+    message?: ProMessageProps;
     /** 卡片标题下方是否有分割线 */
     divider?: boolean;
     /**
@@ -87,7 +90,7 @@ export declare const ProCard: {
     Selectable: {
         (props: import("./selectable").ProCardSelectableProps): JSX.Element;
         defaultProps: {
-            hoveredShadow: boolean;
+            hoveredShadow: boolean; /** 标签组 */
         };
         isProCard: boolean;
     };

package/lib/card/index.js

@@ -20,6 +20,8 @@ var _icon = _interopRequireDefault(require("@teamix/icon"));
 
 var _utils = require("@teamix/utils");
 
+var _message = require("../utils/message");
+
 var _skeleton = require("../skeleton");
 
 var _actions = require("../actions");
@@ -48,7 +50,7 @@ Object.keys(_cardContainer).forEach(function (key) {
   });
 });
 var _excluded = ["context"],
-    _excluded2 = ["children", "title", "subTitle", "tooltip", "tooltipIcon", "tags", "description", "extra", "actions", "style", "className", "image", "hoveredShadow", "divider", "bordered", "compacted", "centered", "loading", "empty", "borderColor", "backgroundColor", "contentClassName", "contentStyle", "direction", "wrap", "spacing", "split", "collapsible", "defaultCollapsed", "collapsed", "onCollapse", "context"];
+    _excluded2 = ["children", "title", "subTitle", "tooltip", "tooltipIcon", "tags", "description", "extra", "actions", "message", "style", "className", "image", "hoveredShadow", "divider", "bordered", "compacted", "centered", "loading", "empty", "borderColor", "backgroundColor", "contentClassName", "contentStyle", "direction", "wrap", "spacing", "split", "collapsible", "defaultCollapsed", "collapsed", "onCollapse", "context"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -117,6 +119,7 @@ var ProCard = function ProCard(props) {
       description = props.description,
       extra = props.extra,
       actions = props.actions,
+      message = props.message,
       style = props.style,
       className = props.className,
       image = props.image,
@@ -287,7 +290,11 @@ var ProCard = function ProCard(props) {
     style: {
       padding: '50px 0 60px'
     }
-  })), !empty && childrenModified)));
+  })), !empty && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, message && /*#__PURE__*/_react.default.createElement("div", {
+    className: cls('content-message')
+  }, (0, _message.renderProMessage)(message, {
+    type: 'notice'
+  })), childrenModified))));
 };
 
 exports.ProCard = ProCard;

package/lib/card/index.scss

@@ -151,6 +151,10 @@
         }
       }
     }
+
+    &-message {
+      margin-bottom: var(--s-2);
+    }
   }
 
   &-tab {