@teamix/pro 1.2.14 → 1.2.15

package/es/actions/dialog.js

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

package/es/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/es/card/index.js

@@ -1,5 +1,5 @@
 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 _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
@@ -29,6 +29,7 @@ import Result from '@teamix/result';
 import { Card as BasicCard, Balloon } from '@alicloudfe/components';
 import TeamixIcon from '@teamix/icon';
 import { baseClass, getMessage, renderTags } from '@teamix/utils';
+import { renderProMessage } from '../utils/message';
 import { ProSkeletonRaw } from '../skeleton';
 import { ProActionGroup } from '../actions';
 import { formatSpacing, getColClassAndStyle } from './utils';
@@ -80,6 +81,7 @@ export 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,
@@ -249,7 +251,11 @@ export var ProCard = function ProCard(props) {
     style: {
       padding: '50px 0 60px'
     }
-  })), !empty && childrenModified)));
+  })), !empty && /*#__PURE__*/React.createElement(React.Fragment, null, message && /*#__PURE__*/React.createElement("div", {
+    className: cls('content-message')
+  }, renderProMessage(message, {
+    type: 'notice'
+  })), childrenModified))));
 };
 ProCard.defaultProps = {
   bordered: true,

package/es/card/index.scss

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

package/es/form/Filter/index2.js

@@ -1,6 +1,7 @@
-var _excluded = ["schema", "triggerType", "onFilter"],
-    _excluded2 = ["schema", "triggerType", "onFilter"],
-    _excluded3 = ["form", "addonAfter", "addonBefore", "onFilter"];
+var _excluded = ["schema", "onChange", "onSubmit"],
+    _excluded2 = ["form", "schema", "onSubmit", "onChange"],
+    _excluded3 = ["schema", "onSubmit", "onChange", "onReset", "layout", "labelAlign", "wrapperAlign", "labelCol", "wrapperCol"],
+    _excluded4 = ["addonAfter", "addonBefore", "onFilter", "mode", "expand"];
 
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
@@ -22,16 +23,16 @@ function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToAr
 
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 
-function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-
-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; }
-
 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 = 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; }
 
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+
+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; }
+
 import React, { memo, useCallback, useMemo, useState, useEffect } from 'react';
 import cls from 'classnames';
 import { Tag, Button, Badge } from '@alicloudfe/components';
@@ -44,42 +45,14 @@ import fieldTypeMap from '../fieldTypeMap';
 import { getFormDisplayValues } from '../ProForm/useFormDisplayValues';
 import { mergeArrayValue } from '../utils';
 import './index2.scss';
-
-var getEventProps = function getEventProps(triggerType, onFilter) {
-  var keydownEvent = {
-    onSubmit: onFilter
-  };
-  var changeEvent = {
-    onChange: onFilter
-  };
-  var eventMap = {
-    keydown: keydownEvent,
-    change: _objectSpread(_objectSpread({}, keydownEvent), changeEvent),
-    submit: keydownEvent
-  };
-  return eventMap[triggerType];
-};
-
-var schemaTemp = [{
-  name: 'taskName',
-  title: '实例名称',
-  component: 'Input',
-  required: true,
-  props: {
-    style: {
-      width: 180
-    },
-    placeholder: '请输入'
-  }
-}];
 /**
  * 简单筛选
  */
 
 var SimpleFilter = /*#__PURE__*/memo(function (props) {
   var schema = props.schema,
-      triggerType = props.triggerType,
-      onFilter = props.onFilter,
+      onChange = props.onChange,
+      onSubmit = props.onSubmit,
       otherProps = _objectWithoutProperties(props, _excluded);
 
   var prefixCls = usePrefixCls('', {
@@ -91,48 +64,87 @@ var SimpleFilter = /*#__PURE__*/memo(function (props) {
       props: {
         size: 8
       },
-      children: [].concat(_toConsumableArray(schema), [{
-        type: 'void',
-        decorator: null,
-        component: 'Submit',
-        props: {
-          style: _objectSpread({}, triggerType === 'submit' ? {} : {
-            display: 'none'
-          })
+      children: schema
+    }, {
+      component: 'Submit',
+      props: {
+        style: {
+          display: 'none'
         }
-      }])
+      }
     }];
-  }, []);
-  var eventProps = getEventProps(triggerType, onFilter);
-  return /*#__PURE__*/React.createElement(ProForm, _objectSpread(_objectSpread(_objectSpread({
+  }, [schema]);
+  return /*#__PURE__*/React.createElement(ProForm, _objectSpread(_objectSpread({}, otherProps), {}, {
+    className: cls(prefixCls, props.className),
+    schema: simpleSchema,
     feedbackLayout: "popover",
     breakpoints: [],
-    inset: true
-  }, otherProps), eventProps), {}, {
+    inset: true,
+    onSubmit: onSubmit,
+    onChange: onChange
+  }));
+});
+/**
+ * 轻量筛选
+ */
+
+var LightFilter = /*#__PURE__*/memo(function (props) {
+  var form = props.form,
+      schema = props.schema,
+      onSubmit = props.onSubmit,
+      onChange = props.onChange,
+      otherProps = _objectWithoutProperties(props, _excluded2);
+
+  var prefixCls = usePrefixCls('', {
+    prefix: 'teamix-pro-form-query-filter-light'
+  });
+  var LightSchema = useMemo(function () {
+    return [{
+      component: 'LightFilter',
+      children: schema
+    }, {
+      component: 'Submit',
+      props: {
+        style: {
+          display: 'none'
+        }
+      }
+    }];
+  }, [schema]); // useEffect(() => {
+  //   form.addEffects('onChange', () => {
+  //     onFieldValueChange('',(field:any) => {
+  //       console.log(field.value);
+  //     });
+  //   });
+  // }, [form, onChange]);
+
+  return /*#__PURE__*/React.createElement(ProForm, _objectSpread(_objectSpread({}, otherProps), {}, {
+    form: form,
     className: cls(prefixCls, props.className),
-    schema: simpleSchema
+    schema: LightSchema,
+    feedbackLayout: "popover",
+    breakpoints: [],
+    bordered: false,
+    onSubmit: onSubmit,
+    onChange: onChange
   }));
 });
-SimpleFilter.defaultProps = {
-  triggerType: 'change'
-};
 /**
  * 高级筛选
  */
 
 var AdvancedFilter = /*#__PURE__*/memo(function (props) {
-  var form = useMemo(function () {
-    return (props === null || props === void 0 ? void 0 : props.form) || createForm();
-  }, []);
   var schema = props.schema,
-      triggerType = props.triggerType,
-      onFilter = props.onFilter,
+      onSubmit = props.onSubmit,
+      onChange = props.onChange,
       onReset = props.onReset,
       layout = props.layout,
       labelAlign = props.labelAlign,
       wrapperAlign = props.wrapperAlign,
       labelCol = props.labelCol,
-      wrapperCol = props.wrapperCol;
+      wrapperCol = props.wrapperCol,
+      otherProps = _objectWithoutProperties(props, _excluded3);
+
   var prefixCls = usePrefixCls('', {
     prefix: 'teamix-pro-form-query-filter-advanced'
   });
@@ -160,26 +172,21 @@ var AdvancedFilter = /*#__PURE__*/memo(function (props) {
             component: 'Reset',
             props: {
               onResetValidateSuccess: onReset,
-              style: _objectSpread({}, triggerType === 'submit' ? {} : {
-                marginRight: -16
-              }),
               children: getMessage('reset')
             }
           }, {
             component: 'Submit',
             props: {
-              style: _objectSpread({}, triggerType === 'submit' ? {
+              style: {
                 marginRight: -8
-              } : {
-                display: 'none'
-              }),
+              },
               children: getMessage('search')
             }
           }]
         }]
       }])
     }];
-  }, []);
+  }, [schema, onReset]);
   var getTeamixLayout = useMemo(function () {
     return {
       breakpoints: [990],
@@ -190,61 +197,39 @@ var AdvancedFilter = /*#__PURE__*/memo(function (props) {
       wrapperCol: mergeArrayValue([24], wrapperCol)
     };
   }, [layout, labelAlign, wrapperAlign, labelCol, wrapperCol]);
-  var eventProps = getEventProps(triggerType, onFilter);
-  return /*#__PURE__*/React.createElement(ProForm, _objectSpread(_objectSpread(_objectSpread(_objectSpread({
-    feedbackLayout: "popover"
-  }, props), eventProps), getTeamixLayout), {}, {
-    form: form,
+  return /*#__PURE__*/React.createElement(ProForm, _objectSpread(_objectSpread(_objectSpread({
     className: cls(prefixCls, props.className),
     schema: gridSchema,
-    onSubmit: onFilter
+    feedbackLayout: "popover"
+  }, otherProps), getTeamixLayout), {}, {
+    onSubmit: onSubmit
   }));
 });
 AdvancedFilter.defaultProps = {
-  triggerType: 'change',
   layout: 'horizontal',
   labelAlign: 'right',
   labelCol: 6,
   wrapperCol: 18
 };
 /**
- * 聚合筛选
+ * 查询筛选
  */
 
-var LightFilter = /*#__PURE__*/memo(function (props) {
-  var schema = props.schema,
-      triggerType = props.triggerType,
+var QueryFilter = /*#__PURE__*/memo(function (props) {
+  var addonAfter = props.addonAfter,
+      addonBefore = props.addonBefore,
       onFilter = props.onFilter,
-      otherProps = _objectWithoutProperties(props, _excluded2);
+      mode = props.mode,
+      expand = props.expand,
+      otherProps = _objectWithoutProperties(props, _excluded4);
 
-  var prefixCls = usePrefixCls('', {
-    prefix: 'teamix-pro-form-query-filter-light'
-  });
-  var LightSchema = useMemo(function () {
-    return [{
-      component: 'LightFilter',
-      children: schema
-    }];
-  }, [schema]);
-  var eventProps = getEventProps(triggerType, onFilter);
-  return /*#__PURE__*/React.createElement(ProForm, _objectSpread(_objectSpread(_objectSpread({
-    feedbackLayout: "popover",
-    breakpoints: [],
-    bordered: false
-  }, otherProps), eventProps), {}, {
-    className: cls(prefixCls, props.className),
-    schema: LightSchema
-  }));
-});
-LightFilter.defaultProps = {
-  triggerType: 'change'
-};
-/**
- * 查询筛选
- */
+  var form = useMemo(function () {
+    return props.form || createForm({
+      validateFirst: true
+    });
+  }, []);
 
-var QueryFilter = /*#__PURE__*/memo(function (props) {
-  var _useState = useState(true),
+  var _useState = useState(expand),
       _useState2 = _slicedToArray(_useState, 2),
       advancedFilterVisible = _useState2[0],
       setAdvancedFilterVisible = _useState2[1];
@@ -254,17 +239,6 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
       tagDataSource = _useState4[0],
       setTagDataSource = _useState4[1];
 
-  var outerForm = props.form,
-      addonAfter = props.addonAfter,
-      addonBefore = props.addonBefore,
-      onFilter = props.onFilter,
-      otherProps = _objectWithoutProperties(props, _excluded3);
-
-  var form = useMemo(function () {
-    return outerForm || createForm({
-      validateFirst: true
-    });
-  }, []);
   var prefixCls = usePrefixCls('', {
     prefix: 'teamix-pro-form-query-filter'
   }); // 展开收起高级筛选
@@ -293,9 +267,20 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
     }).filter(function (item) {
       return isSignificative(item.value);
     });
-  }, []); // 表单值变化
+  }, []); // 表单值提交
+
+  var onFormSubmit = useCallback(function (values) {
+    setTagDataSource(getTagDataSource(form));
+    onFilter && onFilter(values);
+  }, []); // 轻量表单onChange
+
+  var onLightValueChange = useCallback(function (values) {
+    form.reset();
+    setTagDataSource(getTagDataSource(form));
+    onFilter && onFilter(values);
+  }, [form]); // 简单表单onChange
 
-  var onFormValueChange = useCallback(function (values) {
+  var onSimpleValueChange = useCallback(function (values) {
     setTagDataSource(getTagDataSource(form));
     onFilter && onFilter(values);
   }, []); // 关闭标签清空表单字段值
@@ -315,11 +300,12 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
     className: "".concat(prefixCls, "-left")
   }, addonBefore ? /*#__PURE__*/React.createElement("div", {
     className: "".concat(prefixCls, "-addonBefore")
-  }, addonBefore) : null, /*#__PURE__*/React.createElement("div", {
-    className: "".concat(prefixCls, "-light-wrap")
+  }, addonBefore) : null, mode === 'panel' ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
+    className: "".concat(prefixCls, "-inline-form")
   }, /*#__PURE__*/React.createElement(LightFilter, _objectSpread(_objectSpread({}, otherProps), {}, {
     form: form,
-    onFilter: onFormValueChange
+    onFilter: onLightValueChange,
+    onSubmit: onFormSubmit
   }))), /*#__PURE__*/React.createElement("div", {
     className: "".concat(prefixCls, "-toggle")
   }, /*#__PURE__*/React.createElement(Badge, {
@@ -336,9 +322,15 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
     type: "up-line"
   }) : /*#__PURE__*/React.createElement(TeamixIcon, {
     type: "filter-line"
-  }), getMessage('advancedFilter'))))), addonAfter ? /*#__PURE__*/React.createElement("div", {
+  }), getMessage('advancedFilter'))))) : /*#__PURE__*/React.createElement("div", {
+    className: "".concat(prefixCls, "-inline-form")
+  }, /*#__PURE__*/React.createElement(SimpleFilter, _objectSpread(_objectSpread({}, otherProps), {}, {
+    form: form,
+    onFilter: onSimpleValueChange,
+    onSubmit: onFormSubmit
+  })))), addonAfter ? /*#__PURE__*/React.createElement("div", {
     className: "".concat(prefixCls, "-addonAfter")
-  }, addonAfter) : null), /*#__PURE__*/React.createElement("div", {
+  }, addonAfter) : null), mode === 'panel' ? /*#__PURE__*/React.createElement("div", {
     className: "".concat(prefixCls, "-panel")
   }, /*#__PURE__*/React.createElement("div", {
     className: cls("".concat(prefixCls, "-tag"), advancedFilterVisible ? "".concat(prefixCls, "-tag-hidden") : '')
@@ -364,7 +356,11 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
     className: cls("".concat(prefixCls, "-advanced-wrap"), !advancedFilterVisible ? "".concat(prefixCls, "-advanced-wrap-hidden") : '')
   }, /*#__PURE__*/React.createElement(AdvancedFilter, _objectSpread(_objectSpread({}, otherProps), {}, {
     form: form,
-    onFilter: onFormValueChange
-  })))));
+    onSubmit: onFormSubmit
+  })))) : null);
 });
+QueryFilter.defaultProps = {
+  mode: 'inline',
+  expand: false
+};
 export { QueryFilter };

package/es/form/Filter/index2.scss

@@ -14,7 +14,7 @@ $query-filter: #{$teamix-pro-form}-query-filter;
     flex: 0 1 auto;
     margin-right: 8px;
   }
-  .#{$query-filter}-light-wrap {
+  .#{$query-filter}-inline-form {
     flex: 0 0 auto;
     margin-right: 8px;
     margin-bottom: 8px;

package/es/form/SchemaForm/reactions.js

@@ -4,7 +4,7 @@ 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; }
 
-import { isFn, isPlainObj, doCommonRequest } from '@teamix/utils'; // 配置请求
+import { isFn, isPlainObj, doCommonRequest, getValueByValue } from '@teamix/utils'; // 配置请求
 
 var $request = function $request(requestConfig) {
   return function (field, context) {
@@ -54,11 +54,7 @@ var $dataSource = function $dataSource(services, onComplete, context) {
       readOnly: true
     });
     return services(field, context).then(function (res) {
-      var _res$map;
-
-      var isValueInDataSource = res === null || res === void 0 ? void 0 : (_res$map = res.map(function (v) {
-        return v.value;
-      })) === null || _res$map === void 0 ? void 0 : _res$map.includes(field.value);
+      var isValueInDataSource = getValueByValue(res, field.value);
       var clearValue = isValueInDataSource ? {} : {
         value: undefined
       };

package/es/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/es/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.14";
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, hooks, nocode, templates, utils, };

package/es/index.js

@@ -27,7 +27,7 @@ export * from './page-header';
 export * from './skeleton';
 export * from './table'; // export * from './sidebar';
 
-var version = '1.2.13';
+var version = '1.2.14';
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, // ProLayout,
 ProPageContainer, ProPageHeader, ProSkeleton, ProTable, // ProSidebar,
 hooks, nocode, templates, utils };

package/es/page-header/index.js

@@ -17,7 +17,7 @@ import { useHistory } from 'react-router-dom';
 import classnames from 'classnames';
 import TeamixIcon from '@teamix/icon';
 import { Breadcrumb } from '@alicloudfe/components';
-import { baseClass, goToLink, renderTags } from '@teamix/utils';
+import { baseClass, goToLink, renderTags, isPresetColor, getColorClassName, getBackgroundColorClassName } from '@teamix/utils';
 import { ProActionGroup } from '../actions';
 import { ProSkeletonRaw } from '../skeleton';
 import ProInfo from '../info';
@@ -63,21 +63,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 = classnames((_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 className = classnames((_classnames = {}, _defineProperty(_classnames, "".concat(getColorClassName(color)), isColorPresetColor), _defineProperty(_classnames, "".concat(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 = {