@teamix/pro 1.2.12 → 1.2.13

package/lib/table/index.js

@@ -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);
 
@@ -536,7 +544,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 +559,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));
 
@@ -638,7 +646,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

@@ -180,6 +180,8 @@ export declare type ProTableActionType = {
 export declare type ProTableActionTypeMutations = {
     /** 获取state状态 */
     getState?: () => ProTableActionTypeState;
+    /** 设置state状态 */
+    setState?: (key: string, value: any) => void;
     /** 设置全屏状态 */
     setFullScreenState?: (state: boolean) => void;
     /** 绑定state监听事件 */
@@ -192,11 +194,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

@@ -47,8 +47,45 @@ 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 getItemLable = function getItemLable() {
+    if (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;
+          return "".concat(item.title, " (").concat(label, ")");
+        }
+      }
+    }
+
+    return item.title;
+  };
+
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_utils.LabelIconTip, {
-    label: item.title,
+    label: getItemLable(),
     tooltip: item.tooltip,
     icon: item.tooltipIcon
   }), item.filters && /*#__PURE__*/_react.default.createElement(_Filter.default, {

package/lib/table/utils/index.js

@@ -31,7 +31,8 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 // 组件内全局状态
 var state = {
   fullScreenState: false,
-  filterRules: {}
+  filterRules: {},
+  filterColumns: []
 }; // 组件内全局监听事件
 
 var callback = {
@@ -42,6 +43,15 @@ 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;
+    }
+  },
+  filterColumns: state.filterColumns,
   setFullScreenState: function setFullScreenState(fullScreenState) {
     state.fullScreenState = fullScreenState;
     useOn('fullScreenState', fullScreenState);
@@ -85,6 +95,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/utils/components/tags/index.d.ts

@@ -1,3 +1,4 @@
+import React from 'react';
 import { TagProps, CloseableProps } from '@alicloudfe/components/types/tag';
 import './index.scss';
 export declare type ProTagItem = (TagProps | (CloseableProps & {
@@ -8,4 +9,7 @@ export declare type ProTagItem = (TagProps | (CloseableProps & {
      */
     text?: string;
 };
-export declare const renderTags: (tags?: ProTagItem[] | undefined, size?: "small" | "large" | "medium" | undefined) => JSX.Element | null;
+export declare type ProTagProps = ProTagItem[] | ProTagItem | React.ReactNode | React.ReactNode[];
+/** 全局注册 tag 配置 */
+export declare type GlobalTagProps = ProTagItem[];
+export declare const renderTags: (tags?: ProTagProps, size?: "small" | "medium" | "large" | undefined) => JSX.Element | null;

package/lib/utils/components/tags/index.js

@@ -1,21 +1,25 @@
 "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); }
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.renderTags = void 0;
 
-var _react = _interopRequireDefault(require("react"));
+var _react = _interopRequireWildcard(require("react"));
 
 var _components = require("@alicloudfe/components");
 
-var _utils = require("@teamix/utils");
+var _src = require("../../../../../utils/src");
 
 require("./index.scss");
 
-var _excluded = ["text", "children", "closable"];
+var _excluded = ["text", "children", "closable", "color"];
+
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+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 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; }
 
@@ -27,39 +31,83 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 
-var cls = (0, _utils.baseClass)('teamix-pro-tags');
+var cls = (0, _src.baseClass)('teamix-pro-tags');
 
 var renderTags = function renderTags(tags, size) {
-  if (!tags || !tags.length) {
+  if (!tags || Array.isArray(tags) && !tags.length) {
     return null;
-  }
+  } // 获取全局 tag
 
-  return /*#__PURE__*/_react.default.createElement(_components.Tag.Group, {
-    className: cls('')
-  }, tags.map(function (tag, i) {
+
+  var getGlobalTag = function getGlobalTag() {
+    var globalTag = (0, _src.getGlobalConfig)('tag'); // GlobalTagNodePropsItem 类型
+
+    if (globalTag) {
+      var globalTagMap = new Map(globalTag.map(function (item) {
+        return [item.color, item];
+      }));
+      return globalTagMap;
+    }
+
+    return null;
+  }; // 渲染单个 tag
+
+
+  var renderTag = function renderTag(item, index) {
     // @ts-ignore
-    var text = tag.text,
-        children = tag.children,
-        closable = tag.closable,
-        others = _objectWithoutProperties(tag, _excluded);
+    var text = item.text,
+        children = item.children,
+        closable = item.closable,
+        colorProps = item.color,
+        others = _objectWithoutProperties(item, _excluded);
+
+    var color = (0, _src.getTagColor)(colorProps !== null && colorProps !== void 0 ? colorProps : '', 'tag');
+    var otherProps = {};
+    var globalTagMap = getGlobalTag();
+
+    if (globalTagMap && globalTagMap.get(color)) {
+      var _globalTagMap$get;
+
+      otherProps = (_globalTagMap$get = globalTagMap.get(color)) !== null && _globalTagMap$get !== void 0 ? _globalTagMap$get : {};
+    }
 
     if (closable) {
-      return /*#__PURE__*/_react.default.createElement(_components.Tag.Closeable, _objectSpread({
-        key: i,
+      return /*#__PURE__*/_react.default.createElement(_components.Tag.Closeable, _objectSpread(_objectSpread({
+        key: index,
         size: size,
         style: {
           marginBottom: 0
-        }
-      }, others), text || children);
+        },
+        color: color
+      }, otherProps), others), text || children);
     }
 
-    return /*#__PURE__*/_react.default.createElement(_components.Tag, _objectSpread({
-      key: i,
+    return /*#__PURE__*/_react.default.createElement(_components.Tag, _objectSpread(_objectSpread({
+      key: index,
       size: size,
       style: {
         marginBottom: 0
-      }
-    }, others), text || children);
+      },
+      color: color
+    }, otherProps), others), text || children);
+  };
+
+  if (!Array.isArray(tags)) {
+    if ( /*#__PURE__*/(0, _react.isValidElement)(tags)) {
+      return tags;
+    }
+
+    return renderTag(tags, 0);
+  }
+
+  return /*#__PURE__*/_react.default.createElement(_components.Tag.Group, {
+    className: cls('')
+  }, tags.map(function (tag, i) {
+    if ( /*#__PURE__*/(0, _react.isValidElement)(tags)) {
+      return tags;
+    }
+
+    return renderTag(tag, i);
   }));
 };
 

package/package.json

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