amis 1.3.5-beta.7 → 1.4.2-beta.11

package/lib/renderers/AnchorNav.js

@@ -45,7 +45,7 @@ var AnchorNav = /** @class */ (function (_super) {
     };
     AnchorNav.prototype.render = function () {
         var _this = this;
-        var _a = this.props, cx = _a.classnames, ns = _a.classPrefix, className = _a.className, linkClassName = _a.linkClassName, sectionClassName = _a.sectionClassName, sectionRender = _a.sectionRender, render = _a.render, data = _a.data;
+        var _a = this.props, cx = _a.classnames, ns = _a.classPrefix, className = _a.className, linkClassName = _a.linkClassName, sectionClassName = _a.sectionClassName, direction = _a.direction, sectionRender = _a.sectionRender, render = _a.render, data = _a.data;
         var links = this.props.links;
         if (!links) {
             return null;
@@ -59,7 +59,7 @@ var AnchorNav = /** @class */ (function (_super) {
                     ? sectionRender(section, _this.props, index)
                     : render("section/" + index, section.body || ''))) : null;
         });
-        return (react_1.default.createElement(AnchorNav_1.AnchorNav, { classPrefix: ns, classnames: cx, className: className, linkClassName: linkClassName, sectionClassName: sectionClassName, onSelect: this.handleSelect, active: this.state.active }, children));
+        return (react_1.default.createElement(AnchorNav_1.AnchorNav, { classPrefix: ns, classnames: cx, className: className, linkClassName: linkClassName, sectionClassName: sectionClassName, onSelect: this.handleSelect, active: this.state.active, direction: direction }, children));
     };
     AnchorNav.defaultProps = {
         className: '',

package/lib/renderers/AnchorNav.js.map

@@ -6,8 +6,8 @@
         "/src/renderers/AnchorNav.tsx"
     ],
     "names": [],
-    "mappings": "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",
+    "mappings": "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",
     "sourcesContent": [
-        "import React from 'react';\nimport {Renderer, RendererProps} from '../factory';\nimport {\n  AnchorNav as CAnchorNav,\n  AnchorNavSection\n} from '../components/AnchorNav';\nimport {isVisible, autobind} from '../utils/helper';\nimport {filter} from '../utils/tpl';\nimport find from 'lodash/find';\nimport {BaseSchema, SchemaClassName, SchemaCollection} from '../Schema';\n\n/**\n * AnchorNavSection 锚点区域渲染器\n * 文档：https://baidu.gitee.io/amis/docs/components/anchor-nav\n */\n\nexport type AnchorNavSectionSchema = {\n  /**\n   * 导航文字说明\n   */\n  title: string;\n\n  /**\n   * 锚点链接\n   */\n  href?: string;\n\n  /**\n   * 内容\n   */\n  body?: SchemaCollection;\n} & Omit<BaseSchema, 'type'>;\n\n/**\n * AnchorNav 锚点导航渲染器\n * 文档：https://baidu.gitee.io/amis/docs/components/anchor-nav\n */\nexport interface AnchorNavSchema extends BaseSchema {\n  /**\n   * 指定为 AnchorNav 锚点导航渲染器\n   */\n  type: 'anchor-nav';\n\n  /**\n   * 楼层集合\n   */\n  links: Array<AnchorNavSectionSchema>;\n\n  /**\n   * 被激活（定位）的楼层\n   */\n  active?: string | number;\n\n  /**\n   * 样式名\n   */\n  className?: SchemaClassName;\n\n  /**\n   * 导航样式名\n   */\n  linkClassName?: SchemaClassName;\n\n  /**\n   * 楼层样式名\n   */\n  sectionClassName?: SchemaClassName;\n}\n\nexport interface AnchorNavProps\n  extends RendererProps,\n    Omit<AnchorNavSchema, 'className' | 'linkClassName' | 'sectionClassName'> {\n  active?: string | number;\n  sectionRender?: (\n    section: AnchorNavSectionSchema,\n    props: AnchorNavProps,\n    index: number\n  ) => JSX.Element;\n}\n\nexport interface AnchorNavState {\n  active: any;\n}\n\nexport default class AnchorNav extends React.Component<\n  AnchorNavProps,\n  AnchorNavState\n> {\n  static defaultProps: Partial<AnchorNavProps> = {\n    className: '',\n    linkClassName: '',\n    sectionClassName: ''\n  };\n\n  renderSection?: (\n    section: AnchorNavSectionSchema,\n    props: AnchorNavProps,\n    index: number\n  ) => JSX.Element;\n\n  constructor(props: AnchorNavProps) {\n    super(props);\n\n    // 设置默认激活项\n    const links = props.links;\n    let active: any = 0;\n\n    if (typeof props.active !== 'undefined') {\n      active = props.active;\n    } else {\n      const section: AnchorNavSectionSchema = find(\n        links,\n        section => section.href === props.active\n      ) as AnchorNavSectionSchema;\n      active =\n        section && section.href\n          ? section.href\n          : (links[0] && links[0].href) || 0;\n    }\n\n    this.state = {\n      active\n    };\n  }\n\n  @autobind\n  handleSelect(key: any) {\n    this.setState({\n      active: key\n    });\n  }\n\n  @autobind\n  locateTo(index: number) {\n    const {links} = this.props;\n\n    Array.isArray(links) &&\n      links[index] &&\n      this.setState({\n        active: links[index].href || index\n      });\n  }\n\n  render() {\n    const {\n      classnames: cx,\n      classPrefix: ns,\n      className,\n      linkClassName,\n      sectionClassName,\n      sectionRender,\n      render,\n      data\n    } = this.props;\n\n    let links = this.props.links;\n    if (!links) {\n      return null;\n    }\n\n    links = Array.isArray(links) ? links : [links];\n    let children: Array<JSX.Element | null> = [];\n\n    children = links.map((section, index) =>\n      isVisible(section, data) ? (\n        <AnchorNavSection\n          {...(section as any)}\n          title={filter(section.title, data)}\n          key={index}\n          name={section.href || index}\n        >\n          {this.renderSection\n            ? this.renderSection(section, this.props, index)\n            : sectionRender\n            ? sectionRender(section, this.props, index)\n            : render(`section/${index}`, section.body || '')}\n        </AnchorNavSection>\n      ) : null\n    );\n\n    return (\n      <CAnchorNav\n        classPrefix={ns}\n        classnames={cx}\n        className={className}\n        linkClassName={linkClassName}\n        sectionClassName={sectionClassName}\n        onSelect={this.handleSelect}\n        active={this.state.active}\n      >\n        {children}\n      </CAnchorNav>\n    );\n  }\n}\n\n@Renderer({\n  type: 'anchor-nav'\n})\nexport class AnchorNavRenderer extends AnchorNav {}\n"
+        "import React from 'react';\nimport {Renderer, RendererProps} from '../factory';\nimport {\n  AnchorNav as CAnchorNav,\n  AnchorNavSection\n} from '../components/AnchorNav';\nimport {isVisible, autobind} from '../utils/helper';\nimport {filter} from '../utils/tpl';\nimport find from 'lodash/find';\nimport {BaseSchema, SchemaClassName, SchemaCollection} from '../Schema';\n\n/**\n * AnchorNavSection 锚点区域渲染器\n * 文档：https://baidu.gitee.io/amis/docs/components/anchor-nav\n */\n\nexport type AnchorNavSectionSchema = {\n  /**\n   * 导航文字说明\n   */\n  title: string;\n\n  /**\n   * 锚点链接\n   */\n  href?: string;\n\n  /**\n   * 内容\n   */\n  body?: SchemaCollection;\n} & Omit<BaseSchema, 'type'>;\n\n/**\n * AnchorNav 锚点导航渲染器\n * 文档：https://baidu.gitee.io/amis/docs/components/anchor-nav\n */\nexport interface AnchorNavSchema extends BaseSchema {\n  /**\n   * 指定为 AnchorNav 锚点导航渲染器\n   */\n  type: 'anchor-nav';\n\n  /**\n   * 楼层集合\n   */\n  links: Array<AnchorNavSectionSchema>;\n\n  /**\n   * 被激活（定位）的楼层\n   */\n  active?: string | number;\n\n  /**\n   * 样式名\n   */\n  className?: SchemaClassName;\n\n  /**\n   * 导航样式名\n   */\n  linkClassName?: SchemaClassName;\n\n  /**\n   * 楼层样式名\n   */\n  sectionClassName?: SchemaClassName;\n\n  direction?: 'vertical' | 'horizontal';\n}\n\nexport interface AnchorNavProps\n  extends RendererProps,\n    Omit<AnchorNavSchema, 'className' | 'linkClassName' | 'sectionClassName'> {\n  active?: string | number;\n  sectionRender?: (\n    section: AnchorNavSectionSchema,\n    props: AnchorNavProps,\n    index: number\n  ) => JSX.Element;\n}\n\nexport interface AnchorNavState {\n  active: any;\n}\n\nexport default class AnchorNav extends React.Component<\n  AnchorNavProps,\n  AnchorNavState\n> {\n  static defaultProps: Partial<AnchorNavProps> = {\n    className: '',\n    linkClassName: '',\n    sectionClassName: ''\n  };\n\n  renderSection?: (\n    section: AnchorNavSectionSchema,\n    props: AnchorNavProps,\n    index: number\n  ) => JSX.Element;\n\n  constructor(props: AnchorNavProps) {\n    super(props);\n\n    // 设置默认激活项\n    const links = props.links;\n    let active: any = 0;\n\n    if (typeof props.active !== 'undefined') {\n      active = props.active;\n    } else {\n      const section: AnchorNavSectionSchema = find(\n        links,\n        section => section.href === props.active\n      ) as AnchorNavSectionSchema;\n      active =\n        section && section.href\n          ? section.href\n          : (links[0] && links[0].href) || 0;\n    }\n\n    this.state = {\n      active\n    };\n  }\n\n  @autobind\n  handleSelect(key: any) {\n    this.setState({\n      active: key\n    });\n  }\n\n  @autobind\n  locateTo(index: number) {\n    const {links} = this.props;\n\n    Array.isArray(links) &&\n      links[index] &&\n      this.setState({\n        active: links[index].href || index\n      });\n  }\n\n  render() {\n    const {\n      classnames: cx,\n      classPrefix: ns,\n      className,\n      linkClassName,\n      sectionClassName,\n      direction,\n      sectionRender,\n      render,\n      data\n    } = this.props;\n\n    let links = this.props.links;\n    if (!links) {\n      return null;\n    }\n\n    links = Array.isArray(links) ? links : [links];\n    let children: Array<JSX.Element | null> = [];\n\n    children = links.map((section, index) =>\n      isVisible(section, data) ? (\n        <AnchorNavSection\n          {...(section as any)}\n          title={filter(section.title, data)}\n          key={index}\n          name={section.href || index}\n        >\n          {this.renderSection\n            ? this.renderSection(section, this.props, index)\n            : sectionRender\n            ? sectionRender(section, this.props, index)\n            : render(`section/${index}`, section.body || '')}\n        </AnchorNavSection>\n      ) : null\n    );\n\n    return (\n      <CAnchorNav\n        classPrefix={ns}\n        classnames={cx}\n        className={className}\n        linkClassName={linkClassName}\n        sectionClassName={sectionClassName}\n        onSelect={this.handleSelect}\n        active={this.state.active}\n        direction={direction}\n      >\n        {children}\n      </CAnchorNav>\n    );\n  }\n}\n\n@Renderer({\n  type: 'anchor-nav'\n})\nexport class AnchorNavRenderer extends AnchorNav {}\n"
     ]
 }

package/lib/renderers/Avatar.js

@@ -22,13 +22,13 @@ var AvatarField = /** @class */ (function (_super) {
             lineHeight: size + 'px'
         };
         if ((0, tpl_builtin_1.isPureVariable)(text)) {
-            text = (0, tpl_builtin_1.resolveVariable)(text, data);
+            text = (0, tpl_builtin_1.resolveVariableAndFilter)(text, data);
         }
         if ((0, tpl_builtin_1.isPureVariable)(src)) {
-            src = (0, tpl_builtin_1.resolveVariable)(src, data);
+            src = (0, tpl_builtin_1.resolveVariableAndFilter)(src, data, '| raw');
         }
         if ((0, tpl_builtin_1.isPureVariable)(icon)) {
-            icon = (0, tpl_builtin_1.resolveVariable)(icon, data);
+            icon = (0, tpl_builtin_1.resolveVariableAndFilter)(icon, data);
         }
         var avatar = react_1.default.createElement("i", { className: icon });
         if (text) {

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,oDAA+F;AAqE/F;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,6BAAe,EAAC,IAAI,EAAE,IAAI,CAAC,CAAC;SACpC;QAED,IAAI,IAAA,4BAAc,EAAC,GAAG,CAAC,EAAE;YACvB,GAAG,GAAG,IAAA,6BAAe,EAAC,GAAG,EAAE,IAAI,CAAC,CAAC;SAClC;QAED,IAAI,IAAA,4BAAc,EAAC,IAAI,CAAC,EAAE;YACxB,IAAI,GAAG,IAAA,6BAAe,EAAC,IAAI,EAAE,IAAI,CAAC,CAAC;SACpC;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;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",
     "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 {isPureVariable, resolveVariable, resolveVariableAndFilter} 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 = resolveVariable(text, data);\n    }\n\n    if (isPureVariable(src)) {\n      src = resolveVariable(src, data);\n    }\n\n    if (isPureVariable(icon)) {\n      icon = resolveVariable(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 {\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"
     ]
 }

package/lib/renderers/Breadcrumb.js

@@ -19,7 +19,7 @@ var BreadcrumbField = /** @class */ (function (_super) {
         var _a = this.props, className = _a.className, itemClassName = _a.itemClassName, separatorClassName = _a.separatorClassName, cx = _a.classnames, items = _a.items, source = _a.source, data = _a.data, separator = _a.separator, render = _a.render;
         var crumbItems = items
             ? items
-            : (0, tpl_builtin_1.resolveVariable)(source, data);
+            : (0, tpl_builtin_1.resolveVariableAndFilter)(source, data, '| raw');
         var crumbs = crumbItems
             .map(function (item, index) { return (react_1.default.createElement("span", { className: cx('Breadcrumb-item', itemClassName), key: index },
             item.icon

package/lib/renderers/Breadcrumb.js.map

@@ -6,8 +6,8 @@
         "/src/renderers/Breadcrumb.tsx"
     ],
     "names": [],
-    "mappings": ";;;;AAAA;;GAEG;AACH,6DAA0B;AAC1B,sCAAmD;AAEnD,sCAA2C;AAC3C,oCAAoC;AACpC,oDAA+E;AAiD/E;IAAqC,gDAAwC;IAA7E;;IAkDA,CAAC;IA3CC,gCAAM,GAAN;QACQ,IAAA,KAUF,IAAI,CAAC,KAAK,EATZ,SAAS,eAAA,EACT,aAAa,mBAAA,EACb,kBAAkB,wBAAA,EACN,EAAE,gBAAA,EACd,KAAK,WAAA,EACL,MAAM,YAAA,EACN,IAAI,UAAA,EACJ,SAAS,eAAA,EACT,MAAM,YACM,CAAC;QAEf,IAAM,UAAU,GAAG,KAAK;YACtB,CAAC,CAAC,KAAK;YACP,CAAC,CAAE,IAAA,6BAAe,EAAC,MAAM,EAAE,IAAI,CAAiC,CAAC;QAEnE,IAAM,MAAM,GAAG,UAAU;aACtB,GAAG,CAAkB,UAAC,IAAI,EAAE,KAAK,IAAK,OAAA,CACrC,wCAAM,SAAS,EAAE,EAAE,CAAC,iBAAiB,EAAE,aAAa,CAAC,EAAE,GAAG,EAAE,KAAK;YAC9D,IAAI,CAAC,IAAI;gBACR,CAAC,CAAC,IAAA,mBAAY,EAAC,EAAE,EAAE,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,iBAAiB,CAAC;gBACxD,CAAC,CAAC,IAAI;YACP,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CACX,qCAAG,IAAI,EAAE,IAAI,CAAC,IAAI,IAAG,IAAA,YAAM,EAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,CAAK,CACnD,CAAC,CAAC,CAAC,CACF,MAAM,CAAC,OAAO,EAAE,IAAA,YAAM,EAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAC1C,CACI,CACR,EAXsC,CAWtC,CAAC;aACD,MAAM,CAAC,UAAC,IAAI,EAAE,IAAI,EAAE,KAAK,IAAK,OAAA;YAC7B,IAAI;YACJ,wCACE,SAAS,EAAE,EAAE,CAAC,sBAAsB,EAAE,kBAAkB,CAAC,EACzD,GAAG,EAAE,eAAa,KAAO,IAExB,SAAS,CACL;YACP,IAAI;SACL,EAT8B,CAS9B,CAAC,CAAC;QAEL,OAAO,uCAAK,SAAS,EAAE,EAAE,CAAC,YAAY,EAAE,SAAS,CAAC,IAAG,MAAM,CAAO,CAAC;IACrE,CAAC;IAhDM,4BAAY,GAAG;QACpB,SAAS,EAAE,EAAE;QACb,aAAa,EAAE,EAAE;QACjB,SAAS,EAAE,GAAG;KACf,CAAC;IA6CJ,sBAAC;CAAA,AAlDD,CAAqC,eAAK,CAAC,SAAS,GAkDnD;AAlDY,0CAAe;AAuD5B;IAA6C,wDAAe;IAA5D;;IAA8D,CAAC;IAAlD,uBAAuB;QAHnC,IAAA,kBAAQ,EAAC;YACR,IAAI,EAAE,YAAY;SACnB,CAAC;OACW,uBAAuB,CAA2B;IAAD,8BAAC;CAAA,AAA/D,CAA6C,eAAe,GAAG;AAAlD,0DAAuB",
+    "mappings": ";;;;AAAA;;GAEG;AACH,6DAA0B;AAC1B,sCAAmD;AAEnD,sCAA2C;AAC3C,oCAAoC;AACpC,oDAA+E;AAiD/E;IAAqC,gDAAwC;IAA7E;;IAsDA,CAAC;IA/CC,gCAAM,GAAN;QACQ,IAAA,KAUF,IAAI,CAAC,KAAK,EATZ,SAAS,eAAA,EACT,aAAa,mBAAA,EACb,kBAAkB,wBAAA,EACN,EAAE,gBAAA,EACd,KAAK,WAAA,EACL,MAAM,YAAA,EACN,IAAI,UAAA,EACJ,SAAS,eAAA,EACT,MAAM,YACM,CAAC;QAEf,IAAM,UAAU,GAAG,KAAK;YACtB,CAAC,CAAC,KAAK;YACP,CAAC,CAAE,IAAA,sCAAwB,EACvB,MAAM,EACN,IAAI,EACJ,OAAO,CACwB,CAAC;QAEtC,IAAM,MAAM,GAAG,UAAU;aACtB,GAAG,CAAkB,UAAC,IAAI,EAAE,KAAK,IAAK,OAAA,CACrC,wCAAM,SAAS,EAAE,EAAE,CAAC,iBAAiB,EAAE,aAAa,CAAC,EAAE,GAAG,EAAE,KAAK;YAC9D,IAAI,CAAC,IAAI;gBACR,CAAC,CAAC,IAAA,mBAAY,EAAC,EAAE,EAAE,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,iBAAiB,CAAC;gBACxD,CAAC,CAAC,IAAI;YACP,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CACX,qCAAG,IAAI,EAAE,IAAI,CAAC,IAAI,IAAG,IAAA,YAAM,EAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,CAAK,CACnD,CAAC,CAAC,CAAC,CACF,MAAM,CAAC,OAAO,EAAE,IAAA,YAAM,EAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAC1C,CACI,CACR,EAXsC,CAWtC,CAAC;aACD,MAAM,CAAC,UAAC,IAAI,EAAE,IAAI,EAAE,KAAK,IAAK,OAAA;YAC7B,IAAI;YACJ,wCACE,SAAS,EAAE,EAAE,CAAC,sBAAsB,EAAE,kBAAkB,CAAC,EACzD,GAAG,EAAE,eAAa,KAAO,IAExB,SAAS,CACL;YACP,IAAI;SACL,EAT8B,CAS9B,CAAC,CAAC;QAEL,OAAO,uCAAK,SAAS,EAAE,EAAE,CAAC,YAAY,EAAE,SAAS,CAAC,IAAG,MAAM,CAAO,CAAC;IACrE,CAAC;IApDM,4BAAY,GAAG;QACpB,SAAS,EAAE,EAAE;QACb,aAAa,EAAE,EAAE;QACjB,SAAS,EAAE,GAAG;KACf,CAAC;IAiDJ,sBAAC;CAAA,AAtDD,CAAqC,eAAK,CAAC,SAAS,GAsDnD;AAtDY,0CAAe;AA2D5B;IAA6C,wDAAe;IAA5D;;IAA8D,CAAC;IAAlD,uBAAuB;QAHnC,IAAA,kBAAQ,EAAC;YACR,IAAI,EAAE,YAAY;SACnB,CAAC;OACW,uBAAuB,CAA2B;IAAD,8BAAC;CAAA,AAA/D,CAA6C,eAAe,GAAG;AAAlD,0DAAuB",
     "sourcesContent": [
-        "/**\n * @file 用来展示面包屑导航\n */\nimport React from 'react';\nimport {Renderer, RendererProps} from '../factory';\nimport {BaseSchema, SchemaIcon, SchemaUrlPath} from '../Schema';\nimport {generateIcon} from '../utils/icon';\nimport {filter} from '../utils/tpl';\nimport {resolveVariable, resolveVariableAndFilter} from '../utils/tpl-builtin';\n\nexport type BreadcrumbItemSchema = {\n  /**\n   * 文字\n   */\n  label?: string;\n\n  /**\n   * 图标类名\n   */\n  icon?: SchemaIcon;\n\n  /**\n   * 链接地址\n   */\n  href?: SchemaUrlPath;\n} & Omit<BaseSchema, 'type'>;\n\n/**\n * Breadcrumb 显示渲染器\n * 文档：https://baidu.gitee.io/amis/docs/components/breadcrumb\n */\nexport interface BreadcrumbSchema extends BaseSchema {\n  /**\n   *  指定为面包屑显示控件\n   */\n  type: 'breadcrumb';\n\n  /**\n   * 分隔符\n   */\n  separator?: string;\n\n  /**\n   * 分隔符类\n   */\n  separatorClassName?: string;\n\n  /**\n   * 列表\n   */\n  items: Array<BreadcrumbItemSchema>;\n}\n\nexport interface BreadcrumbProps\n  extends RendererProps,\n    Omit<BreadcrumbSchema, 'type' | 'className'> {}\n\nexport class BreadcrumbField extends React.Component<BreadcrumbProps, object> {\n  static defaultProps = {\n    className: '',\n    itemClassName: '',\n    separator: '/'\n  };\n\n  render() {\n    const {\n      className,\n      itemClassName,\n      separatorClassName,\n      classnames: cx,\n      items,\n      source,\n      data,\n      separator,\n      render\n    } = this.props;\n\n    const crumbItems = items\n      ? items\n      : (resolveVariable(source, data) as Array<BreadcrumbItemSchema>);\n\n    const crumbs = crumbItems\n      .map<React.ReactNode>((item, index) => (\n        <span className={cx('Breadcrumb-item', itemClassName)} key={index}>\n          {item.icon\n            ? generateIcon(cx, item.icon, 'Icon', 'Breadcrumb-icon')\n            : null}\n          {item.href ? (\n            <a href={item.href}>{filter(item.label, data)}</a>\n          ) : (\n            render('label', filter(item.label, data))\n          )}\n        </span>\n      ))\n      .reduce((prev, curr, index) => [\n        prev,\n        <span\n          className={cx('Breadcrumb-separator', separatorClassName)}\n          key={`separator-${index}`}\n        >\n          {separator}\n        </span>,\n        curr\n      ]);\n\n    return <div className={cx('Breadcrumb', className)}>{crumbs}</div>;\n  }\n}\n\n@Renderer({\n  type: 'breadcrumb'\n})\nexport class BreadcrumbFieldRenderer extends BreadcrumbField {}\n"
+        "/**\n * @file 用来展示面包屑导航\n */\nimport React from 'react';\nimport {Renderer, RendererProps} from '../factory';\nimport {BaseSchema, SchemaIcon, SchemaUrlPath} from '../Schema';\nimport {generateIcon} from '../utils/icon';\nimport {filter} from '../utils/tpl';\nimport {resolveVariable, resolveVariableAndFilter} from '../utils/tpl-builtin';\n\nexport type BreadcrumbItemSchema = {\n  /**\n   * 文字\n   */\n  label?: string;\n\n  /**\n   * 图标类名\n   */\n  icon?: SchemaIcon;\n\n  /**\n   * 链接地址\n   */\n  href?: SchemaUrlPath;\n} & Omit<BaseSchema, 'type'>;\n\n/**\n * Breadcrumb 显示渲染器\n * 文档：https://baidu.gitee.io/amis/docs/components/breadcrumb\n */\nexport interface BreadcrumbSchema extends BaseSchema {\n  /**\n   *  指定为面包屑显示控件\n   */\n  type: 'breadcrumb';\n\n  /**\n   * 分隔符\n   */\n  separator?: string;\n\n  /**\n   * 分隔符类\n   */\n  separatorClassName?: string;\n\n  /**\n   * 列表\n   */\n  items: Array<BreadcrumbItemSchema>;\n}\n\nexport interface BreadcrumbProps\n  extends RendererProps,\n    Omit<BreadcrumbSchema, 'type' | 'className'> {}\n\nexport class BreadcrumbField extends React.Component<BreadcrumbProps, object> {\n  static defaultProps = {\n    className: '',\n    itemClassName: '',\n    separator: '/'\n  };\n\n  render() {\n    const {\n      className,\n      itemClassName,\n      separatorClassName,\n      classnames: cx,\n      items,\n      source,\n      data,\n      separator,\n      render\n    } = this.props;\n\n    const crumbItems = items\n      ? items\n      : (resolveVariableAndFilter(\n          source,\n          data,\n          '| raw'\n        ) as Array<BreadcrumbItemSchema>);\n\n    const crumbs = crumbItems\n      .map<React.ReactNode>((item, index) => (\n        <span className={cx('Breadcrumb-item', itemClassName)} key={index}>\n          {item.icon\n            ? generateIcon(cx, item.icon, 'Icon', 'Breadcrumb-icon')\n            : null}\n          {item.href ? (\n            <a href={item.href}>{filter(item.label, data)}</a>\n          ) : (\n            render('label', filter(item.label, data))\n          )}\n        </span>\n      ))\n      .reduce((prev, curr, index) => [\n        prev,\n        <span\n          className={cx('Breadcrumb-separator', separatorClassName)}\n          key={`separator-${index}`}\n        >\n          {separator}\n        </span>,\n        curr\n      ]);\n\n    return <div className={cx('Breadcrumb', className)}>{crumbs}</div>;\n  }\n}\n\n@Renderer({\n  type: 'breadcrumb'\n})\nexport class BreadcrumbFieldRenderer extends BreadcrumbField {}\n"
     ]
 }

package/lib/renderers/CRUD.d.ts

@@ -186,6 +186,14 @@ export interface CRUDCommonSchema extends BaseSchema {
      * 默认只有当分页数大于 1 是才显示，如果总是想显示请配置。
      */
     alwaysShowPagination?: boolean;
+    /**
+     * 开启查询区域，会根据列元素的searchable属性值，自动生成查询条件表单
+     */
+    autoGenerateFilter?: boolean;
+    /**
+     * 内容区域占满屏幕剩余空间
+     */
+    autoFillHeight?: boolean;
 }
 export declare type CRUDCardsSchema = CRUDCommonSchema & {
     mode: 'cards';
@@ -222,6 +230,7 @@ export default class CRUD extends React.Component<CRUDProps, any> {
         filterDefaultVisible: boolean;
         loadDataOnce: boolean;
         loadDataOnceFetchOnFilter: boolean;
+        autoFillHeight: boolean;
     };
     control: any;
     lastQuery: any;

package/lib/renderers/CRUD.js

@@ -74,8 +74,8 @@ var CRUD = /** @class */ (function (_super) {
         if (!this.props.filter || (store.filterTogggable && !store.filterVisible)) {
             this.handleFilterInit({});
         }
-        var val = (0, helper_1.getPropValue)(this.props);
-        if (this.props.pickerMode && val) {
+        var val;
+        if (this.props.pickerMode && (val = (0, helper_1.getPropValue)(this.props))) {
             store.setSelectedItems(val);
         }
     };
@@ -87,8 +87,9 @@ var CRUD = /** @class */ (function (_super) {
             this.renderHeaderToolbar = this.renderHeaderToolbar.bind(this);
             this.renderFooterToolbar = this.renderFooterToolbar.bind(this);
         }
-        var val = (0, helper_1.getPropValue)(this.props);
-        if (this.props.pickerMode && val !== (0, helper_1.getPropValue)(prevProps)) {
+        var val;
+        if (this.props.pickerMode &&
+            (0, helper_1.isArrayChildrenModified)((val = (0, helper_1.getPropValue)(this.props)), (0, helper_1.getPropValue)(prevProps))) {
             store.setSelectedItems(val);
         }
         if (this.props.filterTogglable !== prevProps.filterTogglable) {
@@ -202,6 +203,14 @@ var CRUD = /** @class */ (function (_super) {
                 items: store.selectedItems.concat()
             });
         }
+        else if (action.onClick) {
+            store.setCurrentAction(action);
+            var onClick = action.onClick;
+            if (typeof onClick === 'string') {
+                onClick = (0, api_1.str2function)(onClick, 'event', 'props', 'data');
+            }
+            onClick && onClick(e, this.props, ctx);
+        }
         else {
             onAction(e, action, ctx, throwErrors, delegate || this.context);
         }
@@ -747,33 +756,23 @@ var CRUD = /** @class */ (function (_super) {
     };
     CRUD.prototype.hasBulkActions = function () {
         var _a = this.props, bulkActions = _a.bulkActions, itemActions = _a.itemActions, store = _a.store;
-        if ((!bulkActions || !bulkActions.length) &&
-            (!itemActions || !itemActions.length)) {
+        if (!bulkActions || !bulkActions.length) {
             return false;
         }
         var bulkBtns = [];
-        var itemBtns = [];
         var ctx = store.mergedData;
         if (bulkActions && bulkActions.length) {
             bulkBtns = bulkActions
                 .map(function (item) { return ((0, tslib_1.__assign)((0, tslib_1.__assign)({}, item), (0, filter_schema_1.default)(item, ctx))); })
                 .filter(function (item) { return !item.hidden && item.visible !== false; });
         }
-        var itemData = (0, helper_1.createObject)(store.data, store.selectedItems.length ? store.selectedItems[0] : {});
-        if (itemActions && itemActions.length) {
-            itemBtns = itemActions
-                .map(function (item) { return ((0, tslib_1.__assign)((0, tslib_1.__assign)({}, item), (0, filter_schema_1.default)(item, itemData))); })
-                .filter(function (item) { return !item.hidden && item.visible !== false; });
-        }
-        return bulkBtns.length || itemBtns.length;
+        return bulkBtns.length;
     };
     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) &&
-                (!itemActions || !itemActions.length))) {
+        if (!items.length || !bulkActions || !bulkActions.length) {
             return null;
         }
         var selectedItems = store.selectedItems;
@@ -802,7 +801,7 @@ var CRUD = /** @class */ (function (_super) {
         }
         return bulkBtns.length || itemBtns.length ? (react_1.default.createElement("div", { className: cx('Crud-actions') },
             bulkBtns.map(function (btn, index) {
-                return render("bulk-action/" + index, (0, tslib_1.__assign)((0, tslib_1.__assign)({ size: 'sm' }, (0, omit_1.default)(btn, ['visibleOn', 'hiddenOn', 'disabledOn'])), { type: 'button', ignoreConfirm: true }), {
+                return render("bulk-action/" + index, (0, tslib_1.__assign)((0, tslib_1.__assign)({}, (0, omit_1.default)(btn, ['visibleOn', 'hiddenOn', 'disabledOn'])), { type: 'button', ignoreConfirm: true }), {
                     key: "bulk-" + index,
                     data: ctx,
                     disabled: btn.disabled ||
@@ -811,7 +810,7 @@ var CRUD = /** @class */ (function (_super) {
                 });
             }),
             itemBtns.map(function (btn, index) {
-                return render("bulk-action/" + index, (0, tslib_1.__assign)((0, tslib_1.__assign)({ size: 'sm' }, (0, omit_1.default)(btn, ['visibleOn', 'hiddenOn', 'disabledOn'])), { type: 'button' }), {
+                return render("bulk-action/" + index, (0, tslib_1.__assign)((0, tslib_1.__assign)({}, (0, omit_1.default)(btn, ['visibleOn', 'hiddenOn', 'disabledOn'])), { type: 'button' }), {
                     key: "item-" + index,
                     data: itemData,
                     disabled: btn.disabled || selectedItems.length !== 1,
@@ -899,6 +898,7 @@ var CRUD = /** @class */ (function (_super) {
         if (!toolbar) {
             return null;
         }
+        var _a = this.props, render = _a.render, store = _a.store, __ = _a.translate;
         var type = toolbar.type || toolbar;
         if (type === 'bulkActions' || type === 'bulk-actions') {
             return this.renderBulkActions(childProps);
@@ -921,8 +921,26 @@ var CRUD = /** @class */ (function (_super) {
         else if (type === 'export-csv') {
             return this.renderExportCSV(toolbar);
         }
+        else if (type === 'reload') {
+            var reloadButton = {
+                label: '',
+                icon: 'fa fa-sync',
+                tooltip: __('reload'),
+                tooltipPlacement: 'top',
+                type: 'button'
+            };
+            if (typeof toolbar === 'object') {
+                reloadButton = (0, tslib_1.__assign)((0, tslib_1.__assign)({}, reloadButton), (0, omit_1.default)(toolbar, ['type', 'align']));
+            }
+            return render("toolbar/" + index, reloadButton, {
+                onAction: function () {
+                    _this.reload();
+                }
+            });
+        }
         else if (Array.isArray(toolbar)) {
             var children = toolbar
+                .filter(function (toolbar) { return (0, helper_1.isVisible)(toolbar, store.filterData); })
                 .map(function (toolbar, index) { return ({
                 dom: _this.renderToolbar(toolbar, index, childProps, toolbarRenderer),
                 toolbar: toolbar
@@ -946,7 +964,6 @@ var CRUD = /** @class */ (function (_super) {
         if (result !== void 0) {
             return result;
         }
-        var _a = this.props, render = _a.render, store = _a.store;
         var $$editable = childProps.$$editable;
         return render("toolbar/" + index, toolbar, {
             // 包两层，主要是为了处理以下 case
@@ -1018,7 +1035,7 @@ var CRUD = /** @class */ (function (_super) {
     };
     CRUD.prototype.render = function () {
         var _a;
-        var _b = this.props, className = _b.className, bodyClassName = _b.bodyClassName, filter = _b.filter, render = _b.render, store = _b.store, mode = _b.mode, syncLocation = _b.syncLocation, children = _b.children, bulkActions = _b.bulkActions, pickerMode = _b.pickerMode, multiple = _b.multiple, valueField = _b.valueField, primaryField = _b.primaryField, value = _b.value, hideQuickSaveBtn = _b.hideQuickSaveBtn, itemActions = _b.itemActions, cx = _b.classnames, keepItemSelectionOnPageChange = _b.keepItemSelectionOnPageChange, maxKeepItemSelectionLength = _b.maxKeepItemSelectionLength, onAction = _b.onAction, popOverContainer = _b.popOverContainer, __ = _b.translate, onQuery = _b.onQuery, rest = (0, tslib_1.__rest)(_b, ["className", "bodyClassName", "filter", "render", "store", "mode", "syncLocation", "children", "bulkActions", "pickerMode", "multiple", "valueField", "primaryField", "value", "hideQuickSaveBtn", "itemActions", "classnames", "keepItemSelectionOnPageChange", "maxKeepItemSelectionLength", "onAction", "popOverContainer", "translate", "onQuery"]);
+        var _b = this.props, className = _b.className, bodyClassName = _b.bodyClassName, filter = _b.filter, render = _b.render, store = _b.store, mode = _b.mode, syncLocation = _b.syncLocation, children = _b.children, bulkActions = _b.bulkActions, pickerMode = _b.pickerMode, multiple = _b.multiple, valueField = _b.valueField, primaryField = _b.primaryField, value = _b.value, hideQuickSaveBtn = _b.hideQuickSaveBtn, itemActions = _b.itemActions, cx = _b.classnames, keepItemSelectionOnPageChange = _b.keepItemSelectionOnPageChange, maxKeepItemSelectionLength = _b.maxKeepItemSelectionLength, onAction = _b.onAction, popOverContainer = _b.popOverContainer, __ = _b.translate, onQuery = _b.onQuery, autoGenerateFilter = _b.autoGenerateFilter, onSelect = _b.onSelect, autoFillHeight = _b.autoFillHeight, rest = (0, tslib_1.__rest)(_b, ["className", "bodyClassName", "filter", "render", "store", "mode", "syncLocation", "children", "bulkActions", "pickerMode", "multiple", "valueField", "primaryField", "value", "hideQuickSaveBtn", "itemActions", "classnames", "keepItemSelectionOnPageChange", "maxKeepItemSelectionLength", "onAction", "popOverContainer", "translate", "onQuery", "autoGenerateFilter", "onSelect", "autoFillHeight"]);
         return (react_1.default.createElement("div", { className: cx('Crud', className, {
                 'is-loading': store.loading
             }) },
@@ -1040,6 +1057,8 @@ var CRUD = /** @class */ (function (_super) {
                 key: 'body',
                 className: cx('Crud-body', bodyClassName),
                 ref: this.controlRef,
+                autoGenerateFilter: !filter && autoGenerateFilter,
+                autoFillHeight: autoFillHeight,
                 selectable: !!((this.hasBulkActionsToolbar() && this.hasBulkActions()) ||
                     pickerMode),
                 itemActions: itemActions,
@@ -1068,6 +1087,9 @@ var CRUD = /** @class */ (function (_super) {
                 onSelect: this.handleSelect,
                 onPopOverOpened: this.handleChildPopOverOpen,
                 onPopOverClosed: this.handleChildPopOverClose,
+                onSearchableFromReset: this.handleFilterReset,
+                onSearchableFromSubmit: this.handleFilterSubmit,
+                onSearchableFromInit: this.handleFilterInit,
                 headerToolbarRender: this.renderHeaderToolbar,
                 footerToolbarRender: this.renderFooterToolbar,
                 data: store.mergedData
@@ -1118,6 +1140,7 @@ var CRUD = /** @class */ (function (_super) {
         'footerToolbar',
         'filterTogglable',
         'filterDefaultVisible',
+        'autoGenerateFilter',
         'syncResponse2Query',
         'keepItemSelectionOnPageChange',
         'labelTpl',
@@ -1132,7 +1155,8 @@ var CRUD = /** @class */ (function (_super) {
         'onInit',
         'onSaved',
         'onQuery',
-        'formStore'
+        'formStore',
+        'autoFillHeight'
     ];
     CRUD.defaultProps = {
         toolbarInline: true,
@@ -1148,7 +1172,8 @@ var CRUD = /** @class */ (function (_super) {
         filterTogglable: false,
         filterDefaultVisible: true,
         loadDataOnce: false,
-        loadDataOnceFetchOnFilter: true
+        loadDataOnceFetchOnFilter: true,
+        autoFillHeight: false
     };
     return CRUD;
 }(react_1.default.Component));