@teamix/pro 1.1.36 → 1.1.37

package/es/actions/link.js

@@ -5,11 +5,13 @@ 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 { getTargetValue, goToLink } from '@teamix/utils';
+import { useHistory } from 'react-router-dom';
 import { eventHandler } from './base';
 export function useLinkAction(action, context) {
-  var linkAction = getTargetValue(action, context);
+  var history = useHistory();
   return _objectSpread({}, eventHandler(action, function () {
-    goToLink(linkAction);
+    var linkAction = getTargetValue(action, context);
+    goToLink(linkAction, history);
   }));
 }
 export default useLinkAction;

package/es/page-header/index.d.ts

@@ -1,4 +1,5 @@
 import React from 'react';
+import { TagProps, CloseableProps } from '@alicloudfe/components/types/tag';
 import { ActionGroupProps } from '../actions';
 import { ProInfoProps } from '../info';
 import './index.scss';
@@ -12,11 +13,14 @@ export interface LinkItem {
     text: string;
     onClick?: (e?: React.MouseEvent<Element, MouseEvent>) => void;
 }
-export interface TagItem {
-    type?: 'normal' | 'primary';
-    color?: string;
-    text: string;
-}
+export declare type TagItem = (TagProps | (CloseableProps & {
+    closable: true;
+})) & {
+    /**
+     * @deprecated 建议使用 children 代替
+     */
+    text?: string;
+};
 declare type Color = 'blue' | 'green' | 'orange' | 'red' | 'yellow' | string;
 export interface DataItem {
     title: string;

package/es/page-header/index.js

@@ -1,4 +1,5 @@
-var _excluded = ["title", "description", "icon", "iconColor", "iconBackgroundType", "iconBackgroundColor", "goback", "operation", "extra", "image", "loading", "breadcrumb", "tags", "data", "info", "children", "className", "style"];
+var _excluded = ["text", "children", "closable"],
+    _excluded2 = ["title", "description", "icon", "iconColor", "iconBackgroundType", "iconBackgroundColor", "goback", "operation", "extra", "image", "loading", "breadcrumb", "tags", "data", "info", "children", "className", "style"];
 
 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; }
 
@@ -66,15 +67,29 @@ var renderTags = function renderTags(tags) {
   return /*#__PURE__*/React.createElement(Tag.Group, {
     className: cls('tags')
   }, tags.map(function (tag, i) {
-    return /*#__PURE__*/React.createElement(Tag, {
+    // @ts-ignore
+    var text = tag.text,
+        children = tag.children,
+        closable = tag.closable,
+        others = _objectWithoutProperties(tag, _excluded);
+
+    if (closable) {
+      return /*#__PURE__*/React.createElement(Tag.Closeable, _objectSpread({
+        key: i,
+        size: "large",
+        style: {
+          marginBottom: 0
+        }
+      }, others), text || children);
+    }
+
+    return /*#__PURE__*/React.createElement(Tag, _objectSpread({
       key: i,
       size: "large",
-      type: tag.type,
-      color: tag.color,
       style: {
         marginBottom: 0
       }
-    }, tag.text);
+    }, others), text || children);
   }));
 };
 
@@ -159,7 +174,7 @@ var PageHeader = function PageHeader(props) {
       children = props.children,
       className = props.className,
       style = props.style,
-      others = _objectWithoutProperties(props, _excluded);
+      others = _objectWithoutProperties(props, _excluded2);
 
   var history = useHistory();
   var backgroundImage = image ? "url('".concat(image, "')") : undefined;

package/lib/actions/link.js

@@ -8,6 +8,8 @@ exports.useLinkAction = useLinkAction;
 
 var _utils = require("@teamix/utils");
 
+var _reactRouterDom = require("react-router-dom");
+
 var _base = require("./base");
 
 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; }
@@ -17,9 +19,10 @@ 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; }
 
 function useLinkAction(action, context) {
-  var linkAction = (0, _utils.getTargetValue)(action, context);
+  var history = (0, _reactRouterDom.useHistory)();
   return _objectSpread({}, (0, _base.eventHandler)(action, function () {
-    (0, _utils.goToLink)(linkAction);
+    var linkAction = (0, _utils.getTargetValue)(action, context);
+    (0, _utils.goToLink)(linkAction, history);
   }));
 }
 

package/lib/page-header/index.d.ts

@@ -1,4 +1,5 @@
 import React from 'react';
+import { TagProps, CloseableProps } from '@alicloudfe/components/types/tag';
 import { ActionGroupProps } from '../actions';
 import { ProInfoProps } from '../info';
 import './index.scss';
@@ -12,11 +13,14 @@ export interface LinkItem {
     text: string;
     onClick?: (e?: React.MouseEvent<Element, MouseEvent>) => void;
 }
-export interface TagItem {
-    type?: 'normal' | 'primary';
-    color?: string;
-    text: string;
-}
+export declare type TagItem = (TagProps | (CloseableProps & {
+    closable: true;
+})) & {
+    /**
+     * @deprecated 建议使用 children 代替
+     */
+    text?: string;
+};
 declare type Color = 'blue' | 'green' | 'orange' | 'red' | 'yellow' | string;
 export interface DataItem {
     title: string;

package/lib/page-header/index.js

@@ -25,7 +25,8 @@ var _info = _interopRequireDefault(require("../info"));
 
 require("./index.scss");
 
-var _excluded = ["title", "description", "icon", "iconColor", "iconBackgroundType", "iconBackgroundColor", "goback", "operation", "extra", "image", "loading", "breadcrumb", "tags", "data", "info", "children", "className", "style"];
+var _excluded = ["text", "children", "closable"],
+    _excluded2 = ["title", "description", "icon", "iconColor", "iconBackgroundType", "iconBackgroundColor", "goback", "operation", "extra", "image", "loading", "breadcrumb", "tags", "data", "info", "children", "className", "style"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -85,15 +86,29 @@ var renderTags = function renderTags(tags) {
   return /*#__PURE__*/_react.default.createElement(_components.Tag.Group, {
     className: cls('tags')
   }, tags.map(function (tag, i) {
-    return /*#__PURE__*/_react.default.createElement(_components.Tag, {
+    // @ts-ignore
+    var text = tag.text,
+        children = tag.children,
+        closable = tag.closable,
+        others = _objectWithoutProperties(tag, _excluded);
+
+    if (closable) {
+      return /*#__PURE__*/_react.default.createElement(_components.Tag.Closeable, _objectSpread({
+        key: i,
+        size: "large",
+        style: {
+          marginBottom: 0
+        }
+      }, others), text || children);
+    }
+
+    return /*#__PURE__*/_react.default.createElement(_components.Tag, _objectSpread({
       key: i,
       size: "large",
-      type: tag.type,
-      color: tag.color,
       style: {
         marginBottom: 0
       }
-    }, tag.text);
+    }, others), text || children);
   }));
 };
 
@@ -178,7 +193,7 @@ var PageHeader = function PageHeader(props) {
       children = props.children,
       className = props.className,
       style = props.style,
-      others = _objectWithoutProperties(props, _excluded);
+      others = _objectWithoutProperties(props, _excluded2);
 
   var history = (0, _reactRouterDom.useHistory)();
   var backgroundImage = image ? "url('".concat(image, "')") : undefined;

package/package.json

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