amis 1.4.2-beta.6 → 1.5.0

package/lib/components/InputBox.js

@@ -42,9 +42,17 @@ var InputBox = /** @class */ (function (_super) {
         });
     };
     InputBox.prototype.render = function () {
-        var _a = this.props, className = _a.className, cx = _a.classnames, classPrefix = _a.classPrefix, clearable = _a.clearable, disabled = _a.disabled, hasError = _a.hasError, value = _a.value, placeholder = _a.placeholder, result = _a.prefix, children = _a.children, rest = (0, tslib_1.__rest)(_a, ["className", "classnames", "classPrefix", "clearable", "disabled", "hasError", "value", "placeholder", "prefix", "children"]);
+        var _a;
+        var _b = this.props, className = _b.className, cx = _b.classnames, classPrefix = _b.classPrefix, clearable = _b.clearable, disabled = _b.disabled, hasError = _b.hasError, value = _b.value, placeholder = _b.placeholder, result = _b.prefix, children = _b.children, borderMode = _b.borderMode, rest = (0, tslib_1.__rest)(_b, ["className", "classnames", "classPrefix", "clearable", "disabled", "hasError", "value", "placeholder", "prefix", "children", "borderMode"]);
         var isFocused = this.state.isFocused;
-        return (react_1.default.createElement("div", { className: cx('InputBox', className, isFocused ? 'is-focused' : '', disabled ? 'is-disabled' : '', hasError ? 'is-error' : '', rest.onClick ? 'is-clickable' : '') },
+        return (react_1.default.createElement("div", { className: cx('InputBox', className, (_a = {
+                    'is-focused': isFocused,
+                    'is-disabled': disabled,
+                    'is-error': hasError,
+                    'is-clickable': rest.onClick
+                },
+                _a["InputBox--border" + (0, helper_1.ucFirst)(borderMode)] = borderMode,
+                _a)) },
             result,
             react_1.default.createElement(Input_1.default, (0, tslib_1.__assign)({}, rest, { value: value || '', onChange: this.handleChange, placeholder: placeholder, onFocus: this.handleFocus, onBlur: this.handleBlur, size: 12 })),
             children,

package/lib/components/InputBox.js.map

@@ -6,8 +6,8 @@
         "/src/components/InputBox.tsx"
     ],
     "names": [],
-    "mappings": "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",
+    "mappings": "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",
     "sourcesContent": [
-        "import React from 'react';\nimport {ThemeProps, themeable} from '../theme';\nimport Input from './Input';\nimport {autobind} from '../utils/helper';\nimport {Icon} from './icons';\n\nexport interface InputBoxProps\n  extends ThemeProps,\n    Omit<React.DOMAttributes<HTMLInputElement>, 'prefix' | 'onChange'> {\n  value?: string;\n  readOnly?: boolean;\n  onChange?: (value: string) => void;\n  onClear?: (e: React.MouseEvent<any>) => void;\n  clearable?: boolean;\n  disabled?: boolean;\n  hasError?: boolean;\n  placeholder?: string;\n  prefix?: JSX.Element;\n  children?: JSX.Element;\n}\n\nexport interface InputBoxState {\n  isFocused: boolean;\n}\n\nexport class InputBox extends React.Component<InputBoxProps, InputBoxState> {\n  static defaultProps = {\n    clearable: true,\n    placeholder: ''\n  };\n\n  state = {\n    isFocused: false\n  };\n\n  @autobind\n  clearValue(e: any) {\n    e.preventDefault();\n\n    const onClear = this.props.onClear;\n    const onChange = this.props.onChange;\n    onClear?.(e);\n    onChange?.('');\n  }\n\n  @autobind\n  handleChange(e: React.ChangeEvent<HTMLInputElement>) {\n    const onChange = this.props.onChange;\n    onChange && onChange(e.currentTarget.value);\n  }\n\n  @autobind\n  handleFocus(e: any) {\n    const onFocus = this.props.onFocus;\n    onFocus && onFocus(e);\n    this.setState({\n      isFocused: true\n    });\n  }\n\n  @autobind\n  handleBlur(e: any) {\n    const onBlur = this.props.onBlur;\n    onBlur && onBlur(e);\n    this.setState({\n      isFocused: false\n    });\n  }\n\n  render() {\n    const {\n      className,\n      classnames: cx,\n      classPrefix,\n      clearable,\n      disabled,\n      hasError,\n      value,\n      placeholder,\n      prefix: result,\n      children,\n      ...rest\n    } = this.props;\n    const isFocused = this.state.isFocused;\n\n    return (\n      <div\n        className={cx(\n          'InputBox',\n          className,\n          isFocused ? 'is-focused' : '',\n          disabled ? 'is-disabled' : '',\n          hasError ? 'is-error' : '',\n          rest.onClick ? 'is-clickable' : ''\n        )}\n      >\n        {result}\n\n        <Input\n          {...rest}\n          value={value || ''}\n          onChange={this.handleChange}\n          placeholder={placeholder}\n          onFocus={this.handleFocus}\n          onBlur={this.handleBlur}\n          size={12}\n        />\n\n        {children}\n\n        {clearable && !disabled && value ? (\n          <a onClick={this.clearValue} className={cx('InputBox-clear')}>\n            <Icon icon=\"close\" className=\"icon\" />\n          </a>\n        ) : null}\n      </div>\n    );\n  }\n}\n\nexport default themeable(InputBox);\n"
+        "import React from 'react';\nimport {ThemeProps, themeable} from '../theme';\nimport Input from './Input';\nimport {autobind, ucFirst} from '../utils/helper';\nimport {Icon} from './icons';\n\nexport interface InputBoxProps\n  extends ThemeProps,\n    Omit<React.DOMAttributes<HTMLInputElement>, 'prefix' | 'onChange'> {\n  value?: string;\n  readOnly?: boolean;\n  onChange?: (value: string) => void;\n  onClear?: (e: React.MouseEvent<any>) => void;\n  clearable?: boolean;\n  disabled?: boolean;\n  hasError?: boolean;\n  placeholder?: string;\n  prefix?: JSX.Element;\n  children?: JSX.Element;\n  borderMode?: 'full' | 'half' | 'none';\n}\n\nexport interface InputBoxState {\n  isFocused: boolean;\n}\n\nexport class InputBox extends React.Component<InputBoxProps, InputBoxState> {\n  static defaultProps = {\n    clearable: true,\n    placeholder: ''\n  };\n\n  state = {\n    isFocused: false\n  };\n\n  @autobind\n  clearValue(e: any) {\n    e.preventDefault();\n\n    const onClear = this.props.onClear;\n    const onChange = this.props.onChange;\n    onClear?.(e);\n    onChange?.('');\n  }\n\n  @autobind\n  handleChange(e: React.ChangeEvent<HTMLInputElement>) {\n    const onChange = this.props.onChange;\n    onChange && onChange(e.currentTarget.value);\n  }\n\n  @autobind\n  handleFocus(e: any) {\n    const onFocus = this.props.onFocus;\n    onFocus && onFocus(e);\n    this.setState({\n      isFocused: true\n    });\n  }\n\n  @autobind\n  handleBlur(e: any) {\n    const onBlur = this.props.onBlur;\n    onBlur && onBlur(e);\n    this.setState({\n      isFocused: false\n    });\n  }\n\n  render() {\n    const {\n      className,\n      classnames: cx,\n      classPrefix,\n      clearable,\n      disabled,\n      hasError,\n      value,\n      placeholder,\n      prefix: result,\n      children,\n      borderMode,\n      ...rest\n    } = this.props;\n    const isFocused = this.state.isFocused;\n\n    return (\n      <div\n        className={cx('InputBox', className, {\n          'is-focused': isFocused,\n          'is-disabled': disabled,\n          'is-error': hasError,\n          'is-clickable': rest.onClick,\n          [`InputBox--border${ucFirst(borderMode)}`]: borderMode\n        })}\n      >\n        {result}\n\n        <Input\n          {...rest}\n          value={value || ''}\n          onChange={this.handleChange}\n          placeholder={placeholder}\n          onFocus={this.handleFocus}\n          onBlur={this.handleBlur}\n          size={12}\n        />\n\n        {children}\n\n        {clearable && !disabled && value ? (\n          <a onClick={this.clearValue} className={cx('InputBox-clear')}>\n            <Icon icon=\"close\" className=\"icon\" />\n          </a>\n        ) : null}\n      </div>\n    );\n  }\n}\n\nexport default themeable(InputBox);\n"
     ]
 }

package/lib/components/Link.d.ts

@@ -1,16 +1,7 @@
 /// <reference types="hoist-non-react-statics" />
 import React from 'react';
-import { RendererProps } from '../factory';
-import { BaseSchema, SchemaTpl } from '../Schema';
-export interface LinkSchema extends BaseSchema {
-    /**
-     * 是否新窗口打开。
-     */
-    blank?: boolean;
-    /**
-     * 链接内容，如果不配置将显示链接地址。
-     */
-    body?: SchemaTpl;
+import { ThemeProps } from '../theme';
+export interface LinkProps extends ThemeProps, React.DOMAttributes<HTMLAnchorElement> {
     /**
      * 禁用
      */
@@ -20,24 +11,26 @@ export interface LinkSchema extends BaseSchema {
      */
     icon?: string;
     /**
-     * 图标位置
+     * 右侧图标
      */
-    position?: string;
-}
-export interface LinkProps extends RendererProps, Omit<LinkSchema, 'type' | 'className'> {
+    rightIcon?: string;
+    href?: string;
+    htmlTarget?: string;
+    title?: string;
+    children?: JSX.Element;
 }
 export declare class Link extends React.Component<LinkProps, object> {
     constructor(props: LinkProps);
-    aClick(e: React.MouseEvent<any>): void;
+    handleClick(e: React.MouseEvent<any>): void;
     render(): JSX.Element;
 }
 declare const _default: {
-    new (props: (Omit<LinkProps, keyof import("../theme").ThemeProps> & import("../theme").ThemeOutterProps) | Readonly<Omit<LinkProps, keyof import("../theme").ThemeProps> & import("../theme").ThemeOutterProps>): {
+    new (props: (Omit<LinkProps, keyof ThemeProps> & import("../theme").ThemeOutterProps) | Readonly<Omit<LinkProps, keyof ThemeProps> & import("../theme").ThemeOutterProps>): {
         render(): JSX.Element;
         context: any;
-        setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<LinkProps, keyof import("../theme").ThemeProps> & import("../theme").ThemeOutterProps>) => {} | Pick<{}, K> | null) | Pick<{}, K> | null, callback?: (() => void) | undefined): void;
+        setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<LinkProps, keyof ThemeProps> & import("../theme").ThemeOutterProps>) => {} | Pick<{}, K> | null) | Pick<{}, K> | null, callback?: (() => void) | undefined): void;
         forceUpdate(callback?: (() => void) | undefined): void;
-        readonly props: Readonly<Omit<LinkProps, keyof import("../theme").ThemeProps> & import("../theme").ThemeOutterProps> & Readonly<{
+        readonly props: Readonly<Omit<LinkProps, keyof ThemeProps> & import("../theme").ThemeOutterProps> & Readonly<{
             children?: React.ReactNode;
         }>;
         state: Readonly<{}>;
@@ -45,24 +38,24 @@ declare const _default: {
             [key: string]: React.ReactInstance;
         };
         componentDidMount?(): void;
-        shouldComponentUpdate?(nextProps: Readonly<Omit<LinkProps, keyof import("../theme").ThemeProps> & import("../theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): boolean;
+        shouldComponentUpdate?(nextProps: Readonly<Omit<LinkProps, keyof ThemeProps> & import("../theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): boolean;
         componentWillUnmount?(): void;
         componentDidCatch?(error: Error, errorInfo: React.ErrorInfo): void;
-        getSnapshotBeforeUpdate?(prevProps: Readonly<Omit<LinkProps, keyof import("../theme").ThemeProps> & import("../theme").ThemeOutterProps>, prevState: Readonly<{}>): any;
-        componentDidUpdate?(prevProps: Readonly<Omit<LinkProps, keyof import("../theme").ThemeProps> & import("../theme").ThemeOutterProps>, prevState: Readonly<{}>, snapshot?: any): void;
+        getSnapshotBeforeUpdate?(prevProps: Readonly<Omit<LinkProps, keyof ThemeProps> & import("../theme").ThemeOutterProps>, prevState: Readonly<{}>): any;
+        componentDidUpdate?(prevProps: Readonly<Omit<LinkProps, keyof ThemeProps> & import("../theme").ThemeOutterProps>, prevState: Readonly<{}>, snapshot?: any): void;
         componentWillMount?(): void;
         UNSAFE_componentWillMount?(): void;
-        componentWillReceiveProps?(nextProps: Readonly<Omit<LinkProps, keyof import("../theme").ThemeProps> & import("../theme").ThemeOutterProps>, nextContext: any): void;
-        UNSAFE_componentWillReceiveProps?(nextProps: Readonly<Omit<LinkProps, keyof import("../theme").ThemeProps> & import("../theme").ThemeOutterProps>, nextContext: any): void;
-        componentWillUpdate?(nextProps: Readonly<Omit<LinkProps, keyof import("../theme").ThemeProps> & import("../theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): void;
-        UNSAFE_componentWillUpdate?(nextProps: Readonly<Omit<LinkProps, keyof import("../theme").ThemeProps> & import("../theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): void;
+        componentWillReceiveProps?(nextProps: Readonly<Omit<LinkProps, keyof ThemeProps> & import("../theme").ThemeOutterProps>, nextContext: any): void;
+        UNSAFE_componentWillReceiveProps?(nextProps: Readonly<Omit<LinkProps, keyof ThemeProps> & import("../theme").ThemeOutterProps>, nextContext: any): void;
+        componentWillUpdate?(nextProps: Readonly<Omit<LinkProps, keyof ThemeProps> & import("../theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): void;
+        UNSAFE_componentWillUpdate?(nextProps: Readonly<Omit<LinkProps, keyof ThemeProps> & import("../theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): void;
     };
-    new (props: Omit<LinkProps, keyof import("../theme").ThemeProps> & import("../theme").ThemeOutterProps, context: any): {
+    new (props: Omit<LinkProps, keyof ThemeProps> & import("../theme").ThemeOutterProps, context: any): {
         render(): JSX.Element;
         context: any;
-        setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<LinkProps, keyof import("../theme").ThemeProps> & import("../theme").ThemeOutterProps>) => {} | Pick<{}, K> | null) | Pick<{}, K> | null, callback?: (() => void) | undefined): void;
+        setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<LinkProps, keyof ThemeProps> & import("../theme").ThemeOutterProps>) => {} | Pick<{}, K> | null) | Pick<{}, K> | null, callback?: (() => void) | undefined): void;
         forceUpdate(callback?: (() => void) | undefined): void;
-        readonly props: Readonly<Omit<LinkProps, keyof import("../theme").ThemeProps> & import("../theme").ThemeOutterProps> & Readonly<{
+        readonly props: Readonly<Omit<LinkProps, keyof ThemeProps> & import("../theme").ThemeOutterProps> & Readonly<{
             children?: React.ReactNode;
         }>;
         state: Readonly<{}>;
@@ -70,17 +63,17 @@ declare const _default: {
             [key: string]: React.ReactInstance;
         };
         componentDidMount?(): void;
-        shouldComponentUpdate?(nextProps: Readonly<Omit<LinkProps, keyof import("../theme").ThemeProps> & import("../theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): boolean;
+        shouldComponentUpdate?(nextProps: Readonly<Omit<LinkProps, keyof ThemeProps> & import("../theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): boolean;
         componentWillUnmount?(): void;
         componentDidCatch?(error: Error, errorInfo: React.ErrorInfo): void;
-        getSnapshotBeforeUpdate?(prevProps: Readonly<Omit<LinkProps, keyof import("../theme").ThemeProps> & import("../theme").ThemeOutterProps>, prevState: Readonly<{}>): any;
-        componentDidUpdate?(prevProps: Readonly<Omit<LinkProps, keyof import("../theme").ThemeProps> & import("../theme").ThemeOutterProps>, prevState: Readonly<{}>, snapshot?: any): void;
+        getSnapshotBeforeUpdate?(prevProps: Readonly<Omit<LinkProps, keyof ThemeProps> & import("../theme").ThemeOutterProps>, prevState: Readonly<{}>): any;
+        componentDidUpdate?(prevProps: Readonly<Omit<LinkProps, keyof ThemeProps> & import("../theme").ThemeOutterProps>, prevState: Readonly<{}>, snapshot?: any): void;
         componentWillMount?(): void;
         UNSAFE_componentWillMount?(): void;
-        componentWillReceiveProps?(nextProps: Readonly<Omit<LinkProps, keyof import("../theme").ThemeProps> & import("../theme").ThemeOutterProps>, nextContext: any): void;
-        UNSAFE_componentWillReceiveProps?(nextProps: Readonly<Omit<LinkProps, keyof import("../theme").ThemeProps> & import("../theme").ThemeOutterProps>, nextContext: any): void;
-        componentWillUpdate?(nextProps: Readonly<Omit<LinkProps, keyof import("../theme").ThemeProps> & import("../theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): void;
-        UNSAFE_componentWillUpdate?(nextProps: Readonly<Omit<LinkProps, keyof import("../theme").ThemeProps> & import("../theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): void;
+        componentWillReceiveProps?(nextProps: Readonly<Omit<LinkProps, keyof ThemeProps> & import("../theme").ThemeOutterProps>, nextContext: any): void;
+        UNSAFE_componentWillReceiveProps?(nextProps: Readonly<Omit<LinkProps, keyof ThemeProps> & import("../theme").ThemeOutterProps>, nextContext: any): void;
+        componentWillUpdate?(nextProps: Readonly<Omit<LinkProps, keyof ThemeProps> & import("../theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): void;
+        UNSAFE_componentWillUpdate?(nextProps: Readonly<Omit<LinkProps, keyof ThemeProps> & import("../theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): void;
     };
     displayName: string;
     contextType: React.Context<string>;

package/lib/components/Link.js

@@ -3,40 +3,39 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Link = void 0;
 var tslib_1 = require("tslib");
 var react_1 = (0, tslib_1.__importDefault)(require("react"));
-var helper_1 = require("../utils/helper");
-var tpl_1 = require("../utils/tpl");
 var theme_1 = require("../theme");
-var helper_2 = require("../utils/helper");
+var helper_1 = require("../utils/helper");
+var icon_1 = require("../utils/icon");
 var Link = /** @class */ (function (_super) {
     (0, tslib_1.__extends)(Link, _super);
     function Link(props) {
         return _super.call(this, props) || this;
     }
-    Link.prototype.aClick = function (e) {
-        var disabled = this.props.disabled;
+    Link.prototype.handleClick = function (e) {
+        var _a = this.props, disabled = _a.disabled, onClick = _a.onClick;
         if (disabled) {
             e.preventDefault();
             e.stopPropagation();
+            return;
         }
+        onClick === null || onClick === void 0 ? void 0 : onClick(e);
     };
     Link.prototype.render = function () {
-        var _a = this.props, className = _a.className, body = _a.body, href = _a.href, cx = _a.classnames, blank = _a.blank, disabled = _a.disabled, htmlTarget = _a.htmlTarget, data = _a.data, title = _a.title, icon = _a.icon, position = _a.position;
-        var value = (0, helper_1.getPropValue)(this.props);
-        var finnalHref = href ? (0, tpl_1.filter)(href, data, '| raw') : '';
-        return (react_1.default.createElement("a", { href: finnalHref || value, target: htmlTarget || (blank ? '_blank' : '_self'), className: cx("Link", {
+        var _a = this.props, className = _a.className, href = _a.href, cx = _a.classnames, disabled = _a.disabled, htmlTarget = _a.htmlTarget, title = _a.title, icon = _a.icon, rightIcon = _a.rightIcon, children = _a.children, classPrefix = _a.classPrefix, theme = _a.theme, rest = (0, tslib_1.__rest)(_a, ["className", "href", "classnames", "disabled", "htmlTarget", "title", "icon", "rightIcon", "children", "classPrefix", "theme"]);
+        return (react_1.default.createElement("a", (0, tslib_1.__assign)({}, rest, { href: href, target: htmlTarget, className: cx("Link", {
                 'is-disabled': disabled
-            }, className), title: title, onClick: this.aClick },
-            react_1.default.createElement("i", { className: icon, style: { display: position !== 'right' ? 'inline-block' : 'none' } }),
-            body,
-            react_1.default.createElement("i", { className: icon, style: { display: position !== 'right' ? 'none' : 'inline-block' } })));
+            }, className), title: title, onClick: this.handleClick }),
+            icon ? (0, icon_1.generateIcon)(cx, icon, 'Link-icon') : null,
+            children,
+            rightIcon ? (0, icon_1.generateIcon)(cx, rightIcon, 'Link-icon') : null));
     };
     var _a;
     (0, tslib_1.__decorate)([
-        helper_2.autobind,
+        helper_1.autobind,
         (0, tslib_1.__metadata)("design:type", Function),
         (0, tslib_1.__metadata)("design:paramtypes", [typeof (_a = typeof react_1.default !== "undefined" && react_1.default.MouseEvent) === "function" ? _a : Object]),
         (0, tslib_1.__metadata)("design:returntype", void 0)
-    ], Link.prototype, "aClick", null);
+    ], Link.prototype, "handleClick", null);
     return Link;
 }(react_1.default.Component));
 exports.Link = Link;

package/lib/components/Link.js.map

@@ -6,8 +6,8 @@
         "/src/components/Link.tsx"
     ],
     "names": [],
-    "mappings": ";;;;AAAA,6DAA0B;AAG1B,0CAA6C;AAC7C,oCAAoC;AACpC,kCAAmC;AACnC,0CAAyC;AAiCzC;IAA0B,qCAAkC;IAC1D,cAAY,KAAgB;eAC1B,kBAAM,KAAK,CAAC;IACd,CAAC;IAGD,qBAAM,GAAN,UAAO,CAAwB;QACtB,IAAA,QAAQ,GAAI,IAAI,CAAC,KAAK,SAAd,CAAe;QAC9B,IAAI,QAAQ,EAAE;YACZ,CAAC,CAAC,cAAc,EAAE,CAAC;YACnB,CAAC,CAAC,eAAe,EAAE,CAAC;SACrB;IACH,CAAC;IAED,qBAAM,GAAN;QACQ,IAAA,KAYF,IAAI,CAAC,KAAK,EAXZ,SAAS,eAAA,EACT,IAAI,UAAA,EACJ,IAAI,UAAA,EACQ,EAAE,gBAAA,EACd,KAAK,WAAA,EACL,QAAQ,cAAA,EACR,UAAU,gBAAA,EACV,IAAI,UAAA,EACJ,KAAK,WAAA,EACL,IAAI,UAAA,EACJ,QAAQ,cACI,CAAC;QAEf,IAAI,KAAK,GAAG,IAAA,qBAAY,EAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACrC,IAAM,UAAU,GAAG,IAAI,CAAC,CAAC,CAAC,IAAA,YAAM,EAAC,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAE3D,OAAO,CACL,qCACE,IAAI,EAAE,UAAU,IAAI,KAAK,EACzB,MAAM,EAAE,UAAU,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,EAClD,SAAS,EAAE,EAAE,CACX,MAAM,EACN;gBACE,aAAa,EAAE,QAAQ;aACxB,EACD,SAAS,CACV,EACD,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,IAAI,CAAC,MAAM;YAEpB,qCAAG,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,EAAC,OAAO,EAAE,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,MAAM,EAAE,GAAI;YACxF,IAAI;YACL,qCAAG,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,EAAC,OAAO,EAAE,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,cAAc,EAAE,GAAI,CACvF,CACL,CAAC;IACJ,CAAC;;IA7CD;QADC,iBAAQ;;0EACC,eAAK,oBAAL,eAAK,CAAC,UAAU;;sCAMzB;IAwCH,WAAC;CAAA,AApDD,CAA0B,eAAK,CAAC,SAAS,GAoDxC;AApDY,oBAAI;AAsDjB,kBAAe,IAAA,iBAAS,EAAC,IAAI,CAAC,CAAC",
+    "mappings": ";;;;AAAA,6DAA0B;AAC1B,kCAA+C;AAC/C,0CAAyC;AACzC,sCAA2C;AA0B3C;IAA0B,qCAAkC;IAC1D,cAAY,KAAgB;eAC1B,kBAAM,KAAK,CAAC;IACd,CAAC;IAGD,0BAAW,GAAX,UAAY,CAAwB;QAC5B,IAAA,KAAsB,IAAI,CAAC,KAAK,EAA/B,QAAQ,cAAA,EAAE,OAAO,aAAc,CAAC;QACvC,IAAI,QAAQ,EAAE;YACZ,CAAC,CAAC,cAAc,EAAE,CAAC;YACnB,CAAC,CAAC,eAAe,EAAE,CAAC;YACpB,OAAO;SACR;QACD,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAG,CAAC,CAAC,CAAC;IACf,CAAC;IAED,qBAAM,GAAN;QACE,IAAM,KAaF,IAAI,CAAC,KAAK,EAZZ,SAAS,eAAA,EACT,IAAI,UAAA,EACQ,EAAE,gBAAA,EACd,QAAQ,cAAA,EACR,UAAU,gBAAA,EACV,KAAK,WAAA,EACL,IAAI,UAAA,EACJ,SAAS,eAAA,EACT,QAAQ,cAAA,EACR,WAAW,iBAAA,EACX,KAAK,WAAA,EACF,IAAI,2BAZH,+HAaL,CAAa,CAAC;QAEf,OAAO,CACL,6DACM,IAAI,IACR,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,UAAU,EAClB,SAAS,EAAE,EAAE,CACX,MAAM,EACN;gBACE,aAAa,EAAE,QAAQ;aACxB,EACD,SAAS,CACV,EACD,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,IAAI,CAAC,WAAW;YAExB,IAAI,CAAC,CAAC,CAAC,IAAA,mBAAY,EAAC,EAAE,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,IAAI;YACjD,QAAQ;YACR,SAAS,CAAC,CAAC,CAAC,IAAA,mBAAY,EAAC,EAAE,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,IAAI,CAC1D,CACL,CAAC;IACJ,CAAC;;IA9CD;QADC,iBAAQ;;0EACM,eAAK,oBAAL,eAAK,CAAC,UAAU;;2CAQ9B;IAuCH,WAAC;CAAA,AArDD,CAA0B,eAAK,CAAC,SAAS,GAqDxC;AArDY,oBAAI;AAuDjB,kBAAe,IAAA,iBAAS,EAAC,IAAI,CAAC,CAAC",
     "sourcesContent": [
-        "import React from 'react';\nimport {RendererProps} from '../factory';\nimport {BaseSchema, SchemaTpl} from '../Schema';\nimport {getPropValue} from '../utils/helper';\nimport {filter} from '../utils/tpl';\nimport {themeable} from '../theme';\nimport {autobind} from '../utils/helper';\n\nexport interface LinkSchema extends BaseSchema {\n  /**\n   * 是否新窗口打开。\n   */\n  blank?: boolean;\n\n  /**\n   * 链接内容，如果不配置将显示链接地址。\n   */\n  body?: SchemaTpl;\n\n  /**\n   * 禁用\n   */\n  disabled?: boolean;\n\n  /**\n   * 图标\n   */\n  icon?: string;\n\n  /**\n   * 图标位置\n   */\n  position?: string;\n}\n\nexport interface LinkProps\n  extends RendererProps,\n    Omit<LinkSchema, 'type' | 'className'> {}\n\nexport class Link extends React.Component<LinkProps, object> {\n  constructor(props: LinkProps) {\n    super(props);\n  }\n\n  @autobind\n  aClick(e: React.MouseEvent<any>) {\n    const {disabled} = this.props;\n    if (disabled) {\n      e.preventDefault();\n      e.stopPropagation();\n    }\n  }\n\n  render() {\n    const {\n      className,\n      body,\n      href,\n      classnames: cx,\n      blank,\n      disabled,\n      htmlTarget,\n      data,\n      title,\n      icon,\n      position\n    } = this.props;\n\n    let value = getPropValue(this.props);\n    const finnalHref = href ? filter(href, data, '| raw') : '';\n\n    return (\n      <a\n        href={finnalHref || value}\n        target={htmlTarget || (blank ? '_blank' : '_self')}\n        className={cx(\n          `Link`,\n          {\n            'is-disabled': disabled\n          },\n          className\n        )}\n        title={title}\n        onClick={this.aClick}\n      >\n        <i className={icon} style={{display: position !== 'right' ? 'inline-block' : 'none' }} />\n        {body}\n        <i className={icon} style={{display: position !== 'right' ? 'none' : 'inline-block' }} />\n      </a>\n    );\n  }\n}\n\nexport default themeable(Link);\n"
+        "import React from 'react';\nimport {themeable, ThemeProps} from '../theme';\nimport {autobind} from '../utils/helper';\nimport {generateIcon} from '../utils/icon';\n\nexport interface LinkProps\n  extends ThemeProps,\n    React.DOMAttributes<HTMLAnchorElement> {\n  /**\n   * 禁用\n   */\n  disabled?: boolean;\n\n  /**\n   * 图标\n   */\n  icon?: string;\n\n  /**\n   * 右侧图标\n   */\n  rightIcon?: string;\n\n  href?: string;\n  htmlTarget?: string;\n  title?: string;\n  children?: JSX.Element;\n}\n\nexport class Link extends React.Component<LinkProps, object> {\n  constructor(props: LinkProps) {\n    super(props);\n  }\n\n  @autobind\n  handleClick(e: React.MouseEvent<any>) {\n    const {disabled, onClick} = this.props;\n    if (disabled) {\n      e.preventDefault();\n      e.stopPropagation();\n      return;\n    }\n    onClick?.(e);\n  }\n\n  render() {\n    const {\n      className,\n      href,\n      classnames: cx,\n      disabled,\n      htmlTarget,\n      title,\n      icon,\n      rightIcon,\n      children,\n      classPrefix,\n      theme,\n      ...rest\n    } = this.props;\n\n    return (\n      <a\n        {...rest}\n        href={href}\n        target={htmlTarget}\n        className={cx(\n          `Link`,\n          {\n            'is-disabled': disabled\n          },\n          className\n        )}\n        title={title}\n        onClick={this.handleClick}\n      >\n        {icon ? generateIcon(cx, icon, 'Link-icon') : null}\n        {children}\n        {rightIcon ? generateIcon(cx, rightIcon, 'Link-icon') : null}\n      </a>\n    );\n  }\n}\n\nexport default themeable(Link);\n"
     ]
 }