amis 1.5.6-beta.5 → 1.6.0

package/lib/renderers/Avatar.d.ts

@@ -3,63 +3,72 @@
  */
 import React from 'react';
 import { RendererProps } from '../factory';
-import { BaseSchema, SchemaClassName } from '../Schema';
 import { BadgeSchema } from '../components/Badge';
-/**
- * Avatar 用户头像显示
- * 文档：https://baidu.gitee.io/amis/docs/components/avatar
- */
+import { BaseSchema, SchemaClassName } from '../Schema';
 export interface AvatarSchema extends BaseSchema {
+    type: 'avatar';
     /**
-     *  指定为用户头像控件
+     * 类名
      */
-    type: 'avatar';
+    className?: SchemaClassName;
     /**
-     * 大小
+     * 自定义样式
+     */
+    style?: {
+        [propName: string]: any;
+    };
+    /**
+     * 角标
      */
-    size?: number;
+    badge?: BadgeSchema;
     /**
-     * 形状
+     * 图片地址
      */
-    shape?: 'circle' | 'square';
+    src?: string;
     /**
      * 图标
      */
     icon?: string;
     /**
-     * 文本
+     * 图片相对于容器的缩放方式
      */
-    text?: string;
+    fit?: 'fill' | 'contain' | 'cover' | 'none' | 'scale-down';
     /**
-     * 图片地址
+     * 形状
      */
-    src?: string;
+    shape?: 'circle' | 'square' | 'rounded';
     /**
-     * 图片相对于容器的缩放方式
+     * 大小
      */
-    fit?: 'fill' | 'contain' | 'cover' | 'none' | 'scale-down';
+    size?: number | 'small' | 'default' | 'large';
+    /**
+     * 文本
+     */
+    text?: string;
+    /**
+     * 字符类型距离左右两侧边界单位像素
+     */
+    gap?: number;
     /**
      * 图片无法显示时的替换文字地址
      */
     alt?: string;
     /**
-     * 类名
+     * 图片是否允许拖动
      */
-    className?: SchemaClassName;
+    draggable?: boolean;
     /**
-     * 自定义样式
+     * 图片CORS属性
      */
-    style?: {
-        [propName: string]: any;
-    };
+    crossOrigin: 'anonymous' | 'use-credentials' | '';
     /**
-     * 角标
+     * 图片加载失败的是否默认处理，字符串函数
      */
-    badge?: BadgeSchema;
+    onError?: string;
 }
 export interface AvatarProps extends RendererProps, Omit<AvatarSchema, 'type' | 'className'> {
 }
-export declare class AvatarField extends React.Component<AvatarProps, object> {
+export declare class AvatarField extends React.Component<AvatarProps> {
     render(): JSX.Element;
 }
 export declare class AvatarFieldRenderer extends AvatarField {

package/lib/renderers/Avatar.js

@@ -7,6 +7,7 @@ var tslib_1 = require("tslib");
  */
 var react_1 = (0, tslib_1.__importDefault)(require("react"));
 var factory_1 = require("../factory");
+var Avatar_1 = (0, tslib_1.__importDefault)(require("../components/Avatar"));
 var Badge_1 = require("../components/Badge");
 var tpl_builtin_1 = require("../utils/tpl-builtin");
 var AvatarField = /** @class */ (function (_super) {
@@ -15,32 +16,26 @@ var AvatarField = /** @class */ (function (_super) {
         return _super !== null && _super.apply(this, arguments) || this;
     }
     AvatarField.prototype.render = function () {
-        var _a = this.props, className = _a.className, _b = _a.icon, icon = _b === void 0 ? 'fa fa-user' : _b, text = _a.text, src = _a.src, _c = _a.fit, fit = _c === void 0 ? 'cover' : _c, data = _a.data, _d = _a.shape, shape = _d === void 0 ? 'circle' : _d, _e = _a.size, size = _e === void 0 ? 40 : _e, style = _a.style, cx = _a.classnames, props = _a.props;
-        var sizeStyle = {
-            height: size,
-            width: size,
-            lineHeight: size + 'px'
-        };
-        if ((0, tpl_builtin_1.isPureVariable)(text)) {
-            text = (0, tpl_builtin_1.resolveVariableAndFilter)(text, data);
+        var _a = this.props, _b = _a.style, style = _b === void 0 ? {} : _b, className = _a.className, cx = _a.classnames, src = _a.src, _c = _a.icon, icon = _c === void 0 ? 'fa fa-user' : _c, fit = _a.fit, shape = _a.shape, size = _a.size, text = _a.text, gap = _a.gap, alt = _a.alt, draggable = _a.draggable, crossOrigin = _a.crossOrigin, onError = _a.onError, data = _a.data;
+        var errHandler = function () { return false; };
+        if (typeof onError === 'string') {
+            try {
+                errHandler = new Function('event', onError);
+            }
+            catch (e) {
+                console.warn(onError, e);
+            }
         }
         if ((0, tpl_builtin_1.isPureVariable)(src)) {
             src = (0, tpl_builtin_1.resolveVariableAndFilter)(src, data, '| raw');
         }
+        if ((0, tpl_builtin_1.isPureVariable)(text)) {
+            text = (0, tpl_builtin_1.resolveVariableAndFilter)(text, data);
+        }
         if ((0, tpl_builtin_1.isPureVariable)(icon)) {
             icon = (0, tpl_builtin_1.resolveVariableAndFilter)(icon, data);
         }
-        var avatar = react_1.default.createElement("i", { className: icon });
-        if (text) {
-            if (text.length > 2) {
-                text = text.substring(0, 2).toUpperCase();
-            }
-            avatar = react_1.default.createElement("span", null, text);
-        }
-        if (src) {
-            avatar = react_1.default.createElement("img", { src: src, style: { objectFit: fit } });
-        }
-        return (react_1.default.createElement("div", (0, tslib_1.__assign)({ className: cx('Avatar', className, "Avatar--" + shape), style: (0, tslib_1.__assign)((0, tslib_1.__assign)({}, sizeStyle), style) }, props), avatar));
+        return (react_1.default.createElement(Avatar_1.default, { style: style, className: className, classnames: cx, src: src, icon: icon, fit: fit, shape: shape, size: size, text: text, gap: gap, alt: alt, draggable: draggable, crossOrigin: crossOrigin, onError: errHandler }));
     };
     return AvatarField;
 }(react_1.default.Component));

package/lib/renderers/Avatar.js.map

@@ -6,8 +6,8 @@
         "/src/renderers/Avatar.tsx"
     ],
     "names": [],
-    "mappings": ";;;;AAAA;;GAEG;AACH,6DAA0B;AAC1B,sCAAmD;AAOnD,6CAA2D;AAC3D,oDAI8B;AAqE9B;IAAiC,4CAAoC;IAArE;;IAyDA,CAAC;IAxDC,4BAAM,GAAN;QACM,IAAA,KAYA,IAAI,CAAC,KAAK,EAXZ,SAAS,eAAA,EACT,YAAmB,EAAnB,IAAI,mBAAG,YAAY,KAAA,EACnB,IAAI,UAAA,EACJ,GAAG,SAAA,EACH,WAAa,EAAb,GAAG,mBAAG,OAAO,KAAA,EACb,IAAI,UAAA,EACJ,aAAgB,EAAhB,KAAK,mBAAG,QAAQ,KAAA,EAChB,YAAS,EAAT,IAAI,mBAAG,EAAE,KAAA,EACT,KAAK,WAAA,EACO,EAAE,gBAAA,EACd,KAAK,WACO,CAAC;QAEf,IAAI,SAAS,GAAG;YACd,MAAM,EAAE,IAAI;YACZ,KAAK,EAAE,IAAI;YACX,UAAU,EAAE,IAAI,GAAG,IAAI;SACxB,CAAC;QAEF,IAAI,IAAA,4BAAc,EAAC,IAAI,CAAC,EAAE;YACxB,IAAI,GAAG,IAAA,sCAAwB,EAAC,IAAI,EAAE,IAAI,CAAC,CAAC;SAC7C;QAED,IAAI,IAAA,4BAAc,EAAC,GAAG,CAAC,EAAE;YACvB,GAAG,GAAG,IAAA,sCAAwB,EAAC,GAAG,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;SACpD;QAED,IAAI,IAAA,4BAAc,EAAC,IAAI,CAAC,EAAE;YACxB,IAAI,GAAG,IAAA,sCAAwB,EAAC,IAAI,EAAE,IAAI,CAAC,CAAC;SAC7C;QAED,IAAI,MAAM,GAAG,qCAAG,SAAS,EAAE,IAAI,GAAI,CAAC;QAEpC,IAAI,IAAI,EAAE;YACR,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;gBACnB,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;aAC3C;YACD,MAAM,GAAG,4CAAO,IAAI,CAAQ,CAAC;SAC9B;QAED,IAAI,GAAG,EAAE;YACP,MAAM,GAAG,uCAAK,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,EAAC,SAAS,EAAE,GAAG,EAAC,GAAI,CAAC;SACrD;QAED,OAAO,CACL,6DACE,SAAS,EAAE,EAAE,CAAC,QAAQ,EAAE,SAAS,EAAE,aAAW,KAAO,CAAC,EACtD,KAAK,kDAAM,SAAS,GAAK,KAAK,KAC1B,KAAK,GAER,MAAM,CACH,CACP,CAAC;IACJ,CAAC;IACH,kBAAC;AAAD,CAAC,AAzDD,CAAiC,eAAK,CAAC,SAAS,GAyD/C;AAzDY,kCAAW;AA+DxB;IAAyC,oDAAW;IAApD;;IAAsD,CAAC;IAA1C,mBAAmB;QAJ/B,IAAA,kBAAQ,EAAC;YACR,IAAI,EAAE,QAAQ;SACf,CAAC;QACD,iBAAS;OACG,mBAAmB,CAAuB;IAAD,0BAAC;CAAA,AAAvD,CAAyC,WAAW,GAAG;AAA1C,kDAAmB",
+    "mappings": ";;;;AAAA;;GAEG;AACH,6DAA0B;AAC1B,sCAAmD;AACnD,6EAA0C;AAC1C,6CAA2D;AAE3D,oDAA8E;AAiF9E;IAAiC,4CAA4B;IAA7D;;IA8DA,CAAC;IA5DC,4BAAM,GAAN;QACM,IAAA,KAgBA,IAAI,CAAC,KAAK,EAfZ,aAAU,EAAV,KAAK,mBAAG,EAAE,KAAA,EACV,SAAS,eAAA,EACG,EAAE,gBAAA,EACd,GAAG,SAAA,EACH,YAAmB,EAAnB,IAAI,mBAAG,YAAY,KAAA,EACnB,GAAG,SAAA,EACH,KAAK,WAAA,EACL,IAAI,UAAA,EACJ,IAAI,UAAA,EACJ,GAAG,SAAA,EACH,GAAG,SAAA,EACH,SAAS,eAAA,EACT,WAAW,iBAAA,EACX,OAAO,aAAA,EACP,IAAI,UACQ,CAAC;QAEf,IAAI,UAAU,GAAG,cAAM,OAAA,KAAK,EAAL,CAAK,CAAC;QAE7B,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;YAC/B,IAAI;gBACF,UAAU,GAAG,IAAI,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAkB,CAAC;aAC9D;YAAC,OAAO,CAAC,EAAE;gBACV,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;aAC1B;SACF;QAED,IAAI,IAAA,4BAAc,EAAC,GAAG,CAAC,EAAE;YACvB,GAAG,GAAG,IAAA,sCAAwB,EAAC,GAAG,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;SACpD;QAED,IAAI,IAAA,4BAAc,EAAC,IAAI,CAAC,EAAE;YACxB,IAAI,GAAG,IAAA,sCAAwB,EAAC,IAAI,EAAE,IAAI,CAAC,CAAC;SAC7C;QAED,IAAI,IAAA,4BAAc,EAAC,IAAI,CAAC,EAAE;YACxB,IAAI,GAAG,IAAA,sCAAwB,EAAC,IAAI,EAAE,IAAI,CAAC,CAAC;SAC7C;QAED,OAAO,CACL,8BAAC,gBAAM,IACL,KAAK,EAAE,KAAK,EACZ,SAAS,EAAE,SAAS,EACpB,UAAU,EAAE,EAAE,EACd,GAAG,EAAE,GAAG,EACR,IAAI,EAAE,IAAI,EACV,GAAG,EAAE,GAAG,EACR,KAAK,EAAE,KAAK,EACZ,IAAI,EAAE,IAAI,EACV,IAAI,EAAE,IAAI,EACV,GAAG,EAAE,GAAG,EACR,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,SAAS,EACpB,WAAW,EAAE,WAAW,EACxB,OAAO,EAAE,UAAU,GACnB,CACH,CAAC;IACJ,CAAC;IACH,kBAAC;AAAD,CAAC,AA9DD,CAAiC,eAAK,CAAC,SAAS,GA8D/C;AA9DY,kCAAW;AAoExB;IAAyC,oDAAW;IAApD;;IAAsD,CAAC;IAA1C,mBAAmB;QAJ/B,IAAA,kBAAQ,EAAC;YACR,IAAI,EAAE,QAAQ;SACf,CAAC;QACD,iBAAS;OACG,mBAAmB,CAAuB;IAAD,0BAAC;CAAA,AAAvD,CAAyC,WAAW,GAAG;AAA1C,kDAAmB",
     "sourcesContent": [
-        "/**\n * @file 用来展示用户头像\n */\nimport React from 'react';\nimport {Renderer, RendererProps} from '../factory';\nimport {\n  BaseSchema,\n  SchemaClassName,\n  SchemaIcon,\n  SchemaUrlPath\n} from '../Schema';\nimport {BadgeSchema, withBadge} from '../components/Badge';\nimport {\n  isPureVariable,\n  resolveVariable,\n  resolveVariableAndFilter\n} from '../utils/tpl-builtin';\n\n/**\n * Avatar 用户头像显示\n * 文档：https://baidu.gitee.io/amis/docs/components/avatar\n */\nexport interface AvatarSchema extends BaseSchema {\n  /**\n   *  指定为用户头像控件\n   */\n  type: 'avatar';\n\n  /**\n   * 大小\n   */\n  size?: number;\n\n  /**\n   * 形状\n   */\n  shape?: 'circle' | 'square';\n\n  /**\n   * 图标\n   */\n  icon?: string;\n\n  /**\n   * 文本\n   */\n  text?: string;\n\n  /**\n   * 图片地址\n   */\n  src?: string;\n\n  /**\n   * 图片相对于容器的缩放方式\n   */\n  fit?: 'fill' | 'contain' | 'cover' | 'none' | 'scale-down';\n\n  /**\n   * 图片无法显示时的替换文字地址\n   */\n  alt?: string;\n\n  /**\n   * 类名\n   */\n  className?: SchemaClassName;\n\n  /**\n   * 自定义样式\n   */\n  style?: {\n    [propName: string]: any;\n  };\n\n  /**\n   * 角标\n   */\n  badge?: BadgeSchema;\n}\n\nexport interface AvatarProps\n  extends RendererProps,\n    Omit<AvatarSchema, 'type' | 'className'> {}\n\nexport class AvatarField extends React.Component<AvatarProps, object> {\n  render() {\n    let {\n      className,\n      icon = 'fa fa-user',\n      text,\n      src,\n      fit = 'cover',\n      data,\n      shape = 'circle',\n      size = 40,\n      style,\n      classnames: cx,\n      props\n    } = this.props;\n\n    let sizeStyle = {\n      height: size,\n      width: size,\n      lineHeight: size + 'px'\n    };\n\n    if (isPureVariable(text)) {\n      text = resolveVariableAndFilter(text, data);\n    }\n\n    if (isPureVariable(src)) {\n      src = resolveVariableAndFilter(src, data, '| raw');\n    }\n\n    if (isPureVariable(icon)) {\n      icon = resolveVariableAndFilter(icon, data);\n    }\n\n    let avatar = <i className={icon} />;\n\n    if (text) {\n      if (text.length > 2) {\n        text = text.substring(0, 2).toUpperCase();\n      }\n      avatar = <span>{text}</span>;\n    }\n\n    if (src) {\n      avatar = <img src={src} style={{objectFit: fit}} />;\n    }\n\n    return (\n      <div\n        className={cx('Avatar', className, `Avatar--${shape}`)}\n        style={{...sizeStyle, ...style}}\n        {...props}\n      >\n        {avatar}\n      </div>\n    );\n  }\n}\n\n@Renderer({\n  type: 'avatar'\n})\n@withBadge\nexport class AvatarFieldRenderer extends AvatarField {}\n"
+        "/**\n * @file 用来展示用户头像\n */\nimport React from 'react';\nimport {Renderer, RendererProps} from '../factory';\nimport Avatar from '../components/Avatar';\nimport {BadgeSchema, withBadge} from '../components/Badge';\nimport {BaseSchema, SchemaClassName} from '../Schema';\nimport {isPureVariable, resolveVariableAndFilter} from '../utils/tpl-builtin';\n\nexport interface AvatarSchema extends BaseSchema {\n  // 指定类型\n  type: 'avatar';\n\n  /**\n   * 类名\n   */\n  className?: SchemaClassName;\n\n  /**\n   * 自定义样式\n   */\n  style?: {\n    [propName: string]: any;\n  };\n\n  /**\n   * 角标\n   */\n  badge?: BadgeSchema;\n\n  /**\n   * 图片地址\n   */\n  src?: string;\n\n  /**\n   * 图标\n   */\n  icon?: string;\n\n  /**\n   * 图片相对于容器的缩放方式\n   */\n  fit?: 'fill' | 'contain' | 'cover' | 'none' | 'scale-down';\n\n  /**\n   * 形状\n   */\n  shape?: 'circle' | 'square' | 'rounded';\n\n  /**\n   * 大小\n   */\n  size?: number | 'small' | 'default' | 'large';\n\n  /**\n   * 文本\n   */\n  text?: string;\n\n  /**\n   * 字符类型距离左右两侧边界单位像素\n   */\n  gap?: number;\n\n  /**\n   * 图片无法显示时的替换文字地址\n   */\n  alt?: string;\n\n  /**\n   * 图片是否允许拖动\n   */\n  draggable?: boolean;\n\n  /**\n   * 图片CORS属性\n   */\n  crossOrigin: 'anonymous' | 'use-credentials' | '';\n\n  /**\n   * 图片加载失败的是否默认处理，字符串函数\n   */\n  onError?: string\n}\n\nexport interface AvatarProps extends RendererProps, Omit<AvatarSchema, 'type' | 'className'> {}\n\nexport class AvatarField extends React.Component<AvatarProps> {\n\n  render() {\n    let {\n      style = {},\n      className,\n      classnames: cx,\n      src,\n      icon = 'fa fa-user',\n      fit,\n      shape,\n      size,\n      text,\n      gap,\n      alt,\n      draggable,\n      crossOrigin,\n      onError,\n      data\n    } = this.props;\n\n    let errHandler = () => false;\n\n    if (typeof onError === 'string') {\n      try {\n        errHandler = new Function('event', onError) as () => boolean;\n      } catch (e) {\n        console.warn(onError, e);\n      }\n    }\n\n    if (isPureVariable(src)) {\n      src = resolveVariableAndFilter(src, data, '| raw');\n    }\n\n    if (isPureVariable(text)) {\n      text = resolveVariableAndFilter(text, data);\n    }\n\n    if (isPureVariable(icon)) {\n      icon = resolveVariableAndFilter(icon, data);\n    }\n\n    return (\n      <Avatar\n        style={style}\n        className={className}\n        classnames={cx}\n        src={src}\n        icon={icon}\n        fit={fit}\n        shape={shape}\n        size={size}\n        text={text}\n        gap={gap}\n        alt={alt}\n        draggable={draggable}\n        crossOrigin={crossOrigin}\n        onError={errHandler}\n      />\n    );\n  }\n}\n\n@Renderer({\n  type: 'avatar'\n})\n@withBadge\nexport class AvatarFieldRenderer extends AvatarField {}\n"
     ]
 }

package/lib/renderers/CRUD.js

@@ -772,8 +772,7 @@ var CRUD = /** @class */ (function (_super) {
     CRUD.prototype.renderBulkActions = function (childProps) {
         var _this = this;
         var _a = this.props, bulkActions = _a.bulkActions, itemActions = _a.itemActions, store = _a.store, render = _a.render, cx = _a.classnames;
-        var items = childProps.items;
-        if (!items.length || !bulkActions || !bulkActions.length) {
+        if (!bulkActions || !bulkActions.length) {
             return null;
         }
         var selectedItems = store.selectedItems;