@teamix/pro 1.2.12 → 1.2.16

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

@@ -21,9 +21,9 @@ require("./index.scss");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+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; }
 

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

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

package/lib/table/index.js

@@ -63,7 +63,7 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 
@@ -73,9 +73,9 @@ function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symb
 
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+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; }
 
@@ -393,7 +393,11 @@ var ProTable = function ProTable(props) {
     }
   }, [propsActionRef]);
   (0, _react.useEffect)(function () {
-    setFilteredColumns(processColumns(propsColumns !== null && propsColumns !== void 0 ? propsColumns : []));
+    var _actionRef$current, _actionRef$current$se;
+
+    var columns = processColumns(propsColumns !== null && propsColumns !== void 0 ? propsColumns : []);
+    setFilteredColumns(columns);
+    (_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, 'filterColumns', columns);
   }, [propsColumns]); // 绑定 Actions
 
   (0, _utils2.useActionType)(actionRef, {
@@ -407,7 +411,11 @@ var ProTable = function ProTable(props) {
       return state;
     },
     setColumn: function setColumn(newColumns) {
-      setFilteredColumns(processColumns(newColumns));
+      var _actionRef$current2, _actionRef$current2$s;
+
+      var columns = processColumns(newColumns);
+      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);
     },
     setSize: function setSize(mode) {
       _setSize(mode);
@@ -421,11 +429,11 @@ var ProTable = function ProTable(props) {
       }
     },
     reset: function reset() {
-      var _actionRef$current, _actionRef$current$se;
+      var _actionRef$current3, _actionRef$current3$s;
 
       (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onReset) && (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onReset()); // 清空列过滤参数
 
-      (_actionRef$current = actionRef.current) === null || _actionRef$current === void 0 ? void 0 : (_actionRef$current$se = _actionRef$current.setFilterRules) === null || _actionRef$current$se === void 0 ? void 0 : _actionRef$current$se.call(_actionRef$current, {});
+      (_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, {});
       dataFilterForm.reset();
       setCurrentPage(1);
 
@@ -434,6 +442,7 @@ var ProTable = function ProTable(props) {
     resetPage: function resetPage() {
       setCurrentPage(1);
     },
+    rowSelection: rowSelection,
     clearRowSelection: function clearRowSelection() {
       rowSelectionHook.setSelectedRowKeys([]);
       rowSelectionHook.setSelectedRecords([]);
@@ -536,7 +545,7 @@ var ProTable = function ProTable(props) {
   }); // 请求函数
 
   function _request(params, noLoading) {
-    var _actionRef$current$ge, _actionRef$current2, _actionRef$current2$g, _objectSpread2;
+    var _actionRef$current$ge, _actionRef$current4, _actionRef$current4$g, _objectSpread2;
 
     // 如果没有传 url 且没有 customRequest，直接返回
     if (!url && !customRequest) {
@@ -551,7 +560,7 @@ var ProTable = function ProTable(props) {
 
     var dataFilterParams = toJS(dataFilterForm.values); // 列过滤请求参数
 
-    var columnsFilterParams = (_actionRef$current$ge = (_actionRef$current2 = actionRef.current) === null || _actionRef$current2 === void 0 ? void 0 : (_actionRef$current2$g = _actionRef$current2.getFilterRules) === null || _actionRef$current2$g === void 0 ? void 0 : _actionRef$current2$g.call(_actionRef$current2)) !== null && _actionRef$current$ge !== void 0 ? _actionRef$current$ge : {}; // 格式化后的请求参数
+    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 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));
 
@@ -600,7 +609,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();
 
@@ -621,6 +634,8 @@ var ProTable = function ProTable(props) {
       if (window.onresize) {
         window.onresize = null;
       }
+
+      actionRef.current = undefined;
     };
   }, []);
 
@@ -638,7 +653,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()) {
-        setCurrentPage(1);
+        setCurrentPage(1); // const { mode, schema } = propsDataFilter as ProTableDataFilterProps;
+        // TODO: 针对 inline 模式下的 search 组件做一下处理，如果空值切换下拉的时候不触发请求
+        // if (mode === 'inline') {
+        // }
 
         _request(_defineProperty({}, targetPageKey, 1));
       }

package/lib/table/typing.d.ts

@@ -154,6 +154,8 @@ export declare type ProTableActionType = {
     request?: (params?: any) => void;
     /** 重置表格 */
     reset?: () => void;
+    /** 表格选择相关属性 */
+    rowSelection?: innerRowSelectionType | rowSelectionType;
     /** 清空表格选择 */
     clearRowSelection?: () => void;
     /** 过滤 DataSource */
@@ -178,8 +180,12 @@ export declare type ProTableActionType = {
 } & ProTableActionTypeMutations;
 /** action State 定义 */
 export declare type ProTableActionTypeMutations = {
-    /** 获取state状态 */
+    /** 获取state 状态 */
     getState?: () => ProTableActionTypeState;
+    /** 设置state 状态 */
+    setState?: (key: string, value: any) => void;
+    /** 初始化 state 状态 */
+    initState?: () => void;
     /** 设置全屏状态 */
     setFullScreenState?: (state: boolean) => void;
     /** 绑定state监听事件 */
@@ -192,11 +198,15 @@ export declare type ProTableActionTypeMutations = {
     getFilterRules?: () => object;
     /** 重新计算表格maxHeight高度 */
     resetTableMaxBodyHeight?: () => void;
+    /** 列筛选规则 */
+    filterColumns?: any[];
 };
 /** action Mutations 定义 */
 export declare type ProTableActionTypeState = {
     fullScreenState: boolean;
     filterRules: ProTableColumnsFilterRulesItem;
+    filterColumns: ProTableColumnProps[];
+    [key: string]: any;
 };
 export declare type ProTableDataFilterProps = {
     /** 展示形式 */

package/lib/table/utils/columnRender.js

@@ -37,9 +37,9 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+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; }
 
@@ -47,8 +47,66 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
  * 增加了 icon 的功能 render title
  */
 var renderColumnsTitle = function renderColumnsTitle(item, actionRef) {
+  var filterMode = item.filterMode,
+      filters = item.filters,
+      dataIndex = item.dataIndex,
+      dataSource = item.dataSource; // 为列过滤添加状态标题
+
+  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 : {};
+
+      if (Object.keys(selectedItem).length > 0) {
+        var _selectedItem$dataInd;
+
+        if ((_selectedItem$dataInd = selectedItem[dataIndex]) === null || _selectedItem$dataInd === void 0 ? void 0 : _selectedItem$dataInd.params) {
+          var _targetFilters$find;
+
+          // 找到对应的 label
+          var targetFilters = filters !== null && filters !== void 0 ? filters : [];
+
+          if (filters === true) {
+            targetFilters = dataSource !== null && dataSource !== void 0 ? dataSource : [];
+          }
+
+          var label = (_targetFilters$find = targetFilters.find(function (item) {
+            var _selectedItem$dataInd2;
+
+            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;
+          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 /*#__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: item.title,
+    label: getItemLabel(),
     tooltip: item.tooltip,
     icon: item.tooltipIcon
   }), item.filters && /*#__PURE__*/_react.default.createElement(_Filter.default, {

package/lib/table/utils/genProColumnToColumn.js

@@ -15,9 +15,9 @@ var _excluded = ["filters", "dataIndex"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+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; }
 

package/lib/table/utils/index.js

@@ -10,9 +10,9 @@ var _lodash = _interopRequireDefault(require("lodash.clonedeep"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+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; }
 
@@ -31,8 +31,12 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 // 组件内全局状态
 var state = {
   fullScreenState: false,
-  filterRules: {}
-}; // 组件内全局监听事件
+  filterRules: {},
+  filterColumns: []
+};
+
+var _initState = (0, _lodash.default)(state); // 组件内全局监听事件
+
 
 var callback = {
   fullScreenState: {}
@@ -42,6 +46,18 @@ 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);
@@ -85,6 +101,10 @@ var mutations = {
    * @param name 监听名（作为销毁唯一id使用）
    */
   on: function on(fun, state, name) {
+    if (!callback[state]) {
+      callback[state] = {};
+    }
+
     callback[state][name] = fun;
   },
   off: function off(name) {

package/lib/table/utils/useTableSelection.js

@@ -9,9 +9,9 @@ var _react = require("react");
 
 var _utils = require("@teamix/utils");
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+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; }
 

package/lib/templates/List/index.js

@@ -1,6 +1,6 @@
 "use strict";
 
-function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 
 Object.defineProperty(exports, "__esModule", {
   value: true
@@ -23,9 +23,9 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+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; }
 

package/lib/utils/index.js

@@ -1,6 +1,6 @@
 "use strict";
 
-function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 
 Object.defineProperty(exports, "__esModule", {
   value: true

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

@@ -11,22 +11,22 @@ var _components = require("@alicloudfe/components");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+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; }
 
-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.12",
+  "version": "1.2.16",
   "description": "TeamixPro大包",
   "repository": "http://gitlab.alibaba-inc.com/teamix/pro",
   "author": "Velociraptor(迅猛龙)",
@@ -24,7 +24,7 @@
   "dependencies": {
     "@formily/core": "2.0.5",
     "@formily/react": "2.0.5",
-    "@teamix/formily": "2.0.5",
+    "@teamix/formily": "2.0.5-1",
     "@teamix/hooks": "^0.1.0",
     "@teamix/pop-confirm": "^1.2.2",
     "@teamix/pro-field": "^1.0.0",

package/es/form/Components/Query/index.d.ts

@@ -1,4 +0,0 @@
-import React from 'react';
-import './index.scss';
-declare const Query: React.FC<any>;
-export default Query;

package/es/form/Components/Query/index.js

@@ -1,70 +0,0 @@
-import React, { memo } from 'react';
-import { Tag, Select } from '@alicloudfe/components';
-import cls from 'classnames';
-import { usePrefixCls, isArr, isObj } from '@teamix/utils';
-import './index.scss';
-var TagGroup = Tag.Group,
-    CloseableTag = Tag.Closeable;
-var TagText = /*#__PURE__*/memo(function (_ref) {
-  var tagPrefixCls = _ref.tagPrefixCls,
-      title = _ref.title,
-      content = _ref.content;
-  var prefixCls = "".concat(tagPrefixCls, "-tag");
-  return /*#__PURE__*/React.createElement("span", {
-    className: prefixCls
-  }, /*#__PURE__*/React.createElement("span", {
-    className: "".concat(prefixCls, "-title")
-  }, title), /*#__PURE__*/React.createElement("span", {
-    className: "".concat(prefixCls, "-content")
-  }, function () {
-    if (isArr(content)) {
-      return content.join(', ');
-    }
-
-    if (isObj(content)) {
-      return /*#__PURE__*/React.createElement(TagText, {
-        tagPrefixCls: tagPrefixCls,
-        title: content.title,
-        content: content.content
-      });
-    }
-
-    return content;
-  }()));
-});
-var Query = /*#__PURE__*/memo(function (_ref2) {
-  var size = _ref2.size,
-      tags = _ref2.tags,
-      filterItems = _ref2.filterItems,
-      onFilterItemsChange = _ref2.onFilterItemsChange,
-      children = _ref2.children;
-  var defaultCls = usePrefixCls();
-  var prefixCls = usePrefixCls('filter');
-  return /*#__PURE__*/React.createElement("span", {
-    className: cls(prefixCls, "".concat(defaultCls).concat(size))
-  }, /*#__PURE__*/React.createElement(TagGroup, null, tags === null || tags === void 0 ? void 0 : tags.map(function (_ref3) {
-    var key = _ref3.key,
-        title = _ref3.title,
-        content = _ref3.content;
-    return /*#__PURE__*/React.createElement(CloseableTag, {
-      key: key,
-      onClose: function onClose() {
-        console.log('onClose', key);
-        return false;
-      }
-    }, /*#__PURE__*/React.createElement(TagText, {
-      tagPrefixCls: prefixCls,
-      title: title,
-      content: content
-    }));
-  })), /*#__PURE__*/React.createElement(Select, {
-    className: "".concat(prefixCls, "-select"),
-    placeholder: "\u8BF7\u6DFB\u52A0\u7B5B\u9009\u6761\u4EF6",
-    dataSource: filterItems,
-    onChange: onFilterItemsChange
-  }), children);
-});
-Query.defaultProps = {
-  size: 'medium'
-};
-export default Query;

package/es/form/Components/Query/index.scss

@@ -1,85 +0,0 @@
-@import '../../global.scss';
-
-// Query样式
-.#{$css-prefix}filter {
-  display: flex;
-  width: 100%;
-  box-sizing: border-box;
-
-  border-color: var(--input-focus-border-color, #ababab);
-  border-style: solid;
-  transition: box-shadow var(--active-transition);
-  &:hover {
-    box-shadow: var(--active-shadow);
-  }
-  .#{$css-prefix}filter-tag {
-    .#{$css-prefix}filter-tag-title {
-      margin-right: 8px;
-      color: var(--color-text1-8, #848484);
-    }
-    .#{$css-prefix}filter-tag-content {
-      color: var(--color-text1-3, #333333);
-      .#{$css-prefix}filter-tag-title {
-        margin-right: 0;
-        color: var(--color-text1-3, #333333);
-        font-weight: bold;
-        &::after {
-          position: relative;
-          top: -0.5px;
-          content: ':';
-          margin: 0 4px 0 4px;
-        }
-      }
-    }
-  }
-
-  // 表单项选择模块
-  .#{$css-prefix}filter-select {
-    min-width: auto;
-    .#{$css-prefix}input {
-      min-width: auto;
-      border: 0;
-      .#{$css-prefix}input-text-field {
-        padding-right: 0;
-      }
-    }
-    .#{$css-prefix}input.#{$css-prefix}medium {
-      height: $noborder-font-weight-medium;
-    }
-    .#{$css-prefix}input-control {
-      display: none;
-    }
-  }
-}
-
-// Query尺寸
-.#{$css-prefix}filter.#{$css-prefix}medium {
-  padding: 0 8px;
-  height: var(--search-normal-normal-m-height, 32px);
-  border-width: var(--search-normal-normal-border-width, 1px);
-  border-radius: var(--search-normal-corner, 2px);
-  .#{$css-prefix}tag-group {
-    .#{$css-prefix}tag-medium {
-      margin: 3px 4px 3px 0;
-    }
-  }
-}
-
-// Query无边框模式
-.#{$form-item-cls}-bordered-none {
-  .#{$form-item-cls}-control {
-    .#{$form-item-cls}-control-content {
-      .#{$form-item-cls}-control-content-component {
-        min-height: $noborder-font-weight-medium;
-        .#{$css-prefix}date-picker2-input {
-          border: 0;
-          box-shadow: none !important;
-        }
-        .#{$css-prefix}date-picker2-input.#{$css-prefix}date-picker2-input-medium,
-        .#{$css-prefix}input.#{$css-prefix}medium {
-          height: $noborder-font-weight-medium;
-        }
-      }
-    }
-  }
-}

package/es/form/Components/QueryFilter/index.d.ts

@@ -1,3 +0,0 @@
-import React from 'react';
-declare const QueryFilter: React.FC<any>;
-export default QueryFilter;

package/es/utils/components/tags/index.d.ts

@@ -1,11 +0,0 @@
-import { TagProps, CloseableProps } from '@alicloudfe/components/types/tag';
-import './index.scss';
-export declare type ProTagItem = (TagProps | (CloseableProps & {
-    closable: true;
-})) & {
-    /**
-     * @deprecated 建议使用 children 代替
-     */
-    text?: string;
-};
-export declare const renderTags: (tags?: ProTagItem[] | undefined, size?: "small" | "large" | "medium" | undefined) => JSX.Element | null;