amis 2.0.2 → 2.2.0

package/lib/renderers/Icon.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 import { RendererProps } from 'amis-core';
-import { BaseSchema } from '../Schema';
+import { BaseSchema, SchemaTpl } from '../Schema';
 import { BadgeObject } from 'amis-ui';
 /**
  * Icon 图表渲染器
@@ -11,7 +11,7 @@ export interface IconSchema extends BaseSchema {
     /**
      * 按钮类型
      */
-    icon: string;
+    icon: SchemaTpl;
     vendor?: 'iconfont' | 'fa' | '';
     /**
      * 角标

package/lib/renderers/Icon.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.2.0
  * Copyright 2018-2022 baidu
  */
 
@@ -23,7 +23,9 @@ var Icon = /** @class */ (function (_super) {
         return _super !== null && _super.apply(this, arguments) || this;
     }
     Icon.prototype.render = function () {
-        var _a = this.props, icon = _a.icon, vendor = _a.vendor, cx = _a.classnames, className = _a.className;
+        var _a = this.props, vendor = _a.vendor, cx = _a.classnames, className = _a.className, data = _a.data;
+        var icon = this.props.icon;
+        icon = amisCore.filter(icon, data);
         var CustomIcon = icons.getIcon(icon);
         if (CustomIcon) {
             return React__default["default"].createElement(CustomIcon, { className: cx(className, "icon-".concat(icon)) });

package/lib/renderers/Image.d.ts

@@ -56,18 +56,21 @@ export interface ImageSchema extends BaseSchema {
      * 宽度
      */
     width?: number;
-    /**
-     * 图片 css 类名
-     */
-    imageClassName?: SchemaClassName;
     /**
      * 外层 css 类名
      */
     className?: SchemaClassName;
+    /** 组件内层 css 类名 */
+    innerClassName?: SchemaClassName;
+    /**
+     * 图片 css 类名
+     */
+    imageClassName?: SchemaClassName;
     /**
-     * 图片缩率图外层 css 类名
+     * 图片缩略图外层 css 类名
      */
     thumbClassName?: SchemaClassName;
+    /** 图片说明文字 */
     caption?: SchemaTpl;
     /**
      * 图片展示模式，默认为缩略图模式、可以配置成原图模式
@@ -94,7 +97,7 @@ export interface ImageSchema extends BaseSchema {
      */
     htmlTarget?: string;
 }
-export interface ImageThumbProps extends LocaleProps, ThemeProps, Omit<ImageSchema, 'type' | 'className'> {
+export interface ImageThumbProps extends LocaleProps, ThemeProps, Omit<ImageSchema, 'type' | 'className' | 'innerClassName'> {
     onEnlarge?: (info: ImageThumbProps) => void;
     index?: number;
     onLoad?: React.EventHandler<any>;
@@ -184,6 +187,9 @@ declare const ThemedImageThumb: {
              */
             setState<K_1 extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<ImageThumbProps, keyof LocaleProps> & {
                 locale?: string | undefined;
+                /**
+                 * 图片缩略图外层 css 类名
+                 */
                 translate?: ((str: string, ...args: any[]) => string) | undefined;
             }>) => {} | Pick<{}, K_1> | null) | Pick<{}, K_1> | null, callback?: (() => void) | undefined): void;
             forceUpdate(callback?: (() => void) | undefined): void;
@@ -256,6 +262,9 @@ declare const ThemedImageThumb: {
          */
         setState<K_1 extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<ImageThumbProps, keyof LocaleProps> & {
             locale?: string | undefined;
+            /**
+             * 图片缩略图外层 css 类名
+             */
             translate?: ((str: string, ...args: any[]) => string) | undefined;
         }>) => {} | Pick<{}, K_1> | null) | Pick<{}, K_1> | null, callback?: (() => void) | undefined): void;
         forceUpdate(callback?: (() => void) | undefined): void;
@@ -328,6 +337,9 @@ declare const ThemedImageThumb: {
              */
             setState<K_1 extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<ImageThumbProps, keyof LocaleProps> & {
                 locale?: string | undefined;
+                /**
+                 * 图片缩略图外层 css 类名
+                 */
                 translate?: ((str: string, ...args: any[]) => string) | undefined;
             }>) => {} | Pick<{}, K_1> | null) | Pick<{}, K_1> | null, callback?: (() => void) | undefined): void;
             forceUpdate(callback?: (() => void) | undefined): void;
@@ -386,7 +398,9 @@ export default ThemedImageThumb;
 export declare const imagePlaceholder = "data:image/svg+xml,%3C%3Fxml version='1.0' standalone='no'%3F%3E%3C!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'%3E%3Csvg t='1631083237695' class='icon' viewBox='0 0 1024 1024' version='1.1' xmlns='http://www.w3.org/2000/svg' p-id='2420' xmlns:xlink='http://www.w3.org/1999/xlink' width='1024' height='1024'%3E%3Cdefs%3E%3Cstyle type='text/css'%3E%3C/style%3E%3C/defs%3E%3Cpath d='M959.872 128c0.032 0.032 0.096 0.064 0.128 0.128v767.776c-0.032 0.032-0.064 0.096-0.128 0.128H64.096c-0.032-0.032-0.096-0.064-0.128-0.128V128.128c0.032-0.032 0.064-0.096 0.128-0.128h895.776zM960 64H64C28.8 64 0 92.8 0 128v768c0 35.2 28.8 64 64 64h896c35.2 0 64-28.8 64-64V128c0-35.2-28.8-64-64-64z' p-id='2421' fill='%23bfbfbf'%3E%3C/path%3E%3Cpath d='M832 288c0 53.024-42.976 96-96 96s-96-42.976-96-96 42.976-96 96-96 96 42.976 96 96zM896 832H128V704l224-384 256 320h64l224-192z' p-id='2422' fill='%23bfbfbf'%3E%3C/path%3E%3C/svg%3E";
 export interface ImageFieldProps extends RendererProps {
     className?: string;
+    innerClassName?: string;
     imageClassName?: string;
+    thumbClassName?: string;
     placeholder: string;
     description?: string;
     enlargeTitle?: string;

package/lib/renderers/Image.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.2.0
  * Copyright 2018-2022 baidu
  */
 
@@ -84,13 +84,13 @@ var ImageField = /** @class */ (function (_super) {
     };
     ImageField.prototype.render = function () {
         var _a;
-        var _b = this.props, className = _b.className, defaultImage = _b.defaultImage, imageCaption = _b.imageCaption, title = _b.title, data = _b.data, imageClassName = _b.imageClassName, thumbClassName = _b.thumbClassName, height = _b.height, width = _b.width, cx = _b.classnames, src = _b.src, href = _b.href, thumbMode = _b.thumbMode, thumbRatio = _b.thumbRatio, placeholder = _b.placeholder, originalSrc = _b.originalSrc, enlargeAble = _b.enlargeAble, imageMode = _b.imageMode;
+        var _b = this.props, className = _b.className, innerClassName = _b.innerClassName, defaultImage = _b.defaultImage, imageCaption = _b.imageCaption, title = _b.title, data = _b.data, imageClassName = _b.imageClassName, thumbClassName = _b.thumbClassName, height = _b.height, width = _b.width, cx = _b.classnames, src = _b.src, href = _b.href, thumbMode = _b.thumbMode, thumbRatio = _b.thumbRatio, placeholder = _b.placeholder, originalSrc = _b.originalSrc, enlargeAble = _b.enlargeAble, imageMode = _b.imageMode;
         var finnalSrc = src ? amisCore.filter(src, data, '| raw') : '';
         var value = finnalSrc || amisCore.getPropValue(this.props) || defaultImage || imagePlaceholder;
         var finnalHref = href ? amisCore.filter(href, data, '| raw') : '';
         return (React__default["default"].createElement("div", { className: cx('ImageField', imageMode === 'original'
                 ? 'ImageField--original'
-                : 'ImageField--thumb', className), onClick: this.handleClick }, value ? (React__default["default"].createElement(ThemedImageThumb, { imageClassName: imageClassName, thumbClassName: thumbClassName, height: height, width: width, src: value, href: finnalHref, title: amisCore.filter(title, data), caption: amisCore.filter(imageCaption, data), thumbMode: thumbMode, thumbRatio: thumbRatio, originalSrc: (_a = amisCore.filter(originalSrc, data, '| raw')) !== null && _a !== void 0 ? _a : value, enlargeAble: enlargeAble && value !== defaultImage, onEnlarge: this.handleEnlarge, imageMode: imageMode })) : (React__default["default"].createElement("span", { className: "text-muted" }, placeholder))));
+                : 'ImageField--thumb', className), onClick: this.handleClick }, value ? (React__default["default"].createElement(ThemedImageThumb, { className: innerClassName, imageClassName: imageClassName, thumbClassName: thumbClassName, height: height, width: width, src: value, href: finnalHref, title: amisCore.filter(title, data), caption: amisCore.filter(imageCaption, data), thumbMode: thumbMode, thumbRatio: thumbRatio, originalSrc: (_a = amisCore.filter(originalSrc, data, '| raw')) !== null && _a !== void 0 ? _a : value, enlargeAble: enlargeAble && value !== defaultImage, onEnlarge: this.handleEnlarge, imageMode: imageMode })) : (React__default["default"].createElement("span", { className: "text-muted" }, placeholder))));
     };
     ImageField.defaultProps = {
         defaultImage: imagePlaceholder,

package/lib/renderers/Images.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.2.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Json.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.2.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Link.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.2.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/List.d.ts

@@ -168,7 +168,10 @@ export interface ListProps extends RendererProps, Omit<ListSchema, 'type' | 'cla
     selected?: Array<any>;
     draggable?: boolean;
     onSelect: (selectedItems: Array<object>, unSelectedItems: Array<object>) => void;
-    onSave?: (items: Array<object> | object, diff: Array<object> | object, rowIndexes: Array<number> | number, unModifiedItems?: Array<object>, rowOrigins?: Array<object> | object, resetOnFailed?: boolean) => void;
+    onSave?: (items: Array<object> | object, diff: Array<object> | object, rowIndexes: Array<number> | number, unModifiedItems?: Array<object>, rowOrigins?: Array<object> | object, options?: {
+        resetOnFailed?: boolean;
+        reload?: string;
+    }) => void;
     onSaveOrder?: (moved: Array<object>, items: Array<object>) => void;
     onQuery: (values: object) => void;
 }
@@ -192,7 +195,10 @@ export default class List extends React.Component<ListProps, object> {
     handleCheck(item: IItem): void;
     handleCheckAll(): void;
     syncSelected(): void;
-    handleQuickChange(item: IItem, values: object, saveImmediately?: boolean | any, savePristine?: boolean, resetOnFailed?: boolean): void;
+    handleQuickChange(item: IItem, values: object, saveImmediately?: boolean | any, savePristine?: boolean, options?: {
+        resetOnFailed?: boolean;
+        reload?: string;
+    }): void;
     handleSave(): void;
     handleSaveOrder(): void;
     reset(): void;
@@ -239,7 +245,10 @@ export declare class ListItem extends React.Component<ListItemProps> {
     handleClick(e: React.MouseEvent<HTMLDivElement>): void;
     handleCheck(): void;
     handleAction(e: React.UIEvent<any>, action: ActionObject, ctx: object): void;
-    handleQuickChange(values: object, saveImmediately?: boolean, savePristine?: boolean, resetOnFailed?: boolean): void;
+    handleQuickChange(values: object, saveImmediately?: boolean, savePristine?: boolean, options?: {
+        resetOnFailed?: boolean;
+        reload?: string;
+    }): void;
     renderLeft(): JSX.Element | null;
     renderRight(): JSX.Element | null;
     renderChild(node: SchemaNode, region?: string, key?: any): React.ReactNode;

package/lib/renderers/List.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.2.0
  * Copyright 2018-2022 baidu
  */
 
@@ -178,7 +178,7 @@ var List = /** @class */ (function (_super) {
         onSelect &&
             onSelect(store.selectedItems.map(function (item) { return item.data; }), store.unSelectedItems.map(function (item) { return item.data; }));
     };
-    List.prototype.handleQuickChange = function (item, values, saveImmediately, savePristine, resetOnFailed) {
+    List.prototype.handleQuickChange = function (item, values, saveImmediately, savePristine, options) {
         item.change(values, savePristine);
         if (!saveImmediately || savePristine) {
             return;
@@ -186,7 +186,8 @@ var List = /** @class */ (function (_super) {
         if (saveImmediately && saveImmediately.api) {
             this.props.onAction(null, {
                 actionType: 'ajax',
-                api: saveImmediately.api
+                api: saveImmediately.api,
+                reload: options === null || options === void 0 ? void 0 : options.reload
             }, values);
             return;
         }
@@ -194,7 +195,7 @@ var List = /** @class */ (function (_super) {
         if (!onSave) {
             return;
         }
-        onSave(item.data, amisCore.difference(item.data, item.pristine, ['id', primaryField]), item.index, undefined, item.pristine, resetOnFailed);
+        onSave(item.data, amisCore.difference(item.data, item.pristine, ['id', primaryField]), item.index, undefined, item.pristine, options);
     };
     List.prototype.handleSave = function () {
         var _a = this.props, store = _a.store, onSave = _a.onSave, primaryField = _a.primaryField;
@@ -415,7 +416,7 @@ var List = /** @class */ (function (_super) {
     List.prototype.render = function () {
         var _a;
         var _this = this;
-        var _b = this.props, className = _b.className, itemClassName = _b.itemClassName, store = _b.store, placeholder = _b.placeholder, render = _b.render; _b.multiple; var listItem = _b.listItem; _b.onAction; _b.hideCheckToggler; _b.checkOnItemClick; _b.itemAction; var affixHeader = _b.affixHeader, cx = _b.classnames, size = _b.size, __ = _b.translate;
+        var _b = this.props, className = _b.className, itemClassName = _b.itemClassName, store = _b.store, placeholder = _b.placeholder, render = _b.render; _b.multiple; var listItem = _b.listItem; _b.onAction; _b.hideCheckToggler; _b.checkOnItemClick; _b.itemAction; var affixHeader = _b.affixHeader, cx = _b.classnames, size = _b.size, __ = _b.translate, _c = _b.loading, loading = _c === void 0 ? false : _c;
         this.renderedToolbars = [];
         var heading = this.renderHeading();
         var header = this.renderHeader();
@@ -431,7 +432,8 @@ var List = /** @class */ (function (_super) {
             store.items.length ? (React__default["default"].createElement("div", { className: cx('List-items') }, store.items.map(function (item, index) {
                 return _this.renderListItem(index, listItem, item, itemClassName);
             }))) : (React__default["default"].createElement("div", { className: cx('List-placeholder') }, render('placeholder', __(placeholder)))),
-            this.renderFooter()));
+            this.renderFooter(),
+            React__default["default"].createElement(amisUi.Spinner, { overlay: true, show: loading })));
     };
     List.propsList = [
         'header',
@@ -505,10 +507,10 @@ var ListItem = /** @class */ (function (_super) {
         var _a = this.props, onAction = _a.onAction, item = _a.item;
         onAction && onAction(e, action, ctx || item.data);
     };
-    ListItem.prototype.handleQuickChange = function (values, saveImmediately, savePristine, resetOnFailed) {
+    ListItem.prototype.handleQuickChange = function (values, saveImmediately, savePristine, options) {
         var _a = this.props, onQuickChange = _a.onQuickChange, item = _a.item;
         onQuickChange &&
-            onQuickChange(item, values, saveImmediately, savePristine, resetOnFailed);
+            onQuickChange(item, values, saveImmediately, savePristine, options);
     };
     ListItem.prototype.renderLeft = function () {
         var _a = this.props, dragging = _a.dragging, selectable = _a.selectable, selected = _a.selected, checkable = _a.checkable, multiple = _a.multiple, hideCheckToggler = _a.hideCheckToggler, checkOnItemClick = _a.checkOnItemClick, cx = _a.classnames, ns = _a.classPrefix;

package/lib/renderers/Log.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.2.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Mapping.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.2.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Markdown.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.2.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Nav.d.ts

@@ -203,7 +203,7 @@ export declare class Navigation extends React.Component<NavigationProps, Navigat
     render(): JSX.Element;
 }
 declare const ThemedNavigation: {
-    new (props: Pick<Omit<NavigationProps, keyof ThemeProps>, "source" | "deferApi" | "$ref" | "disabled" | "disabledOn" | "hidden" | "hiddenOn" | "visible" | "visibleOn" | "id" | "onEvent" | "onToggle" | "render" | "env" | "data" | "loading" | "reload" | "itemBadge" | "draggable" | "onSelect" | "itemActions" | "saveOrderApi" | "links" | "stacked" | "dragOnSameLevel" | "overflow" | "onDragUpdate" | "onOrderChange" | "togglerClassName"> & Partial<Pick<Omit<NavigationProps, keyof ThemeProps>, "indentSize">> & Partial<Pick<Pick<NavigationProps, "indentSize">, never>> & import("amis-core/lib/theme").ThemeOutterProps): {
+    new (props: Pick<Omit<NavigationProps, keyof ThemeProps>, "source" | "$ref" | "disabled" | "disabledOn" | "hidden" | "hiddenOn" | "visible" | "visibleOn" | "id" | "onEvent" | "itemBadge" | "loading" | "reload" | "data" | "draggable" | "itemActions" | "onSelect" | "render" | "env" | "deferApi" | "onToggle" | "saveOrderApi" | "links" | "stacked" | "dragOnSameLevel" | "overflow" | "onDragUpdate" | "onOrderChange" | "togglerClassName"> & Partial<Pick<Omit<NavigationProps, keyof ThemeProps>, "indentSize">> & Partial<Pick<Pick<NavigationProps, "indentSize">, never>> & import("amis-core/lib/theme").ThemeOutterProps): {
         ref: any; /**
          * 包裹导航的外层标签名，可以使用其他标签渲染
          * @default "ul"
@@ -212,9 +212,9 @@ declare const ThemedNavigation: {
         getWrappedInstance(): any;
         render(): JSX.Element;
         context: any;
-        setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Pick<Omit<NavigationProps, keyof ThemeProps>, "source" | "deferApi" | "$ref" | "disabled" | "disabledOn" | "hidden" | "hiddenOn" | "visible" | "visibleOn" | "id" | "onEvent" | "onToggle" | "render" | "env" | "data" | "loading" | "reload" | "itemBadge" | "draggable" | "onSelect" | "itemActions" | "saveOrderApi" | "links" | "stacked" | "dragOnSameLevel" | "overflow" | "onDragUpdate" | "onOrderChange" | "togglerClassName"> & Partial<Pick<Omit<NavigationProps, keyof ThemeProps>, "indentSize">> & Partial<Pick<Pick<NavigationProps, "indentSize">, never>> & import("amis-core/lib/theme").ThemeOutterProps>) => {} | Pick<{}, K> | null) | Pick<{}, K> | null, callback?: (() => void) | undefined): void;
+        setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Pick<Omit<NavigationProps, keyof ThemeProps>, "source" | "$ref" | "disabled" | "disabledOn" | "hidden" | "hiddenOn" | "visible" | "visibleOn" | "id" | "onEvent" | "itemBadge" | "loading" | "reload" | "data" | "draggable" | "itemActions" | "onSelect" | "render" | "env" | "deferApi" | "onToggle" | "saveOrderApi" | "links" | "stacked" | "dragOnSameLevel" | "overflow" | "onDragUpdate" | "onOrderChange" | "togglerClassName"> & Partial<Pick<Omit<NavigationProps, keyof ThemeProps>, "indentSize">> & Partial<Pick<Pick<NavigationProps, "indentSize">, never>> & import("amis-core/lib/theme").ThemeOutterProps>) => {} | Pick<{}, K> | null) | Pick<{}, K> | null, callback?: (() => void) | undefined): void;
         forceUpdate(callback?: (() => void) | undefined): void;
-        readonly props: Readonly<Pick<Omit<NavigationProps, keyof ThemeProps>, "source" | "deferApi" | "$ref" | "disabled" | "disabledOn" | "hidden" | "hiddenOn" | "visible" | "visibleOn" | "id" | "onEvent" | "onToggle" | "render" | "env" | "data" | "loading" | "reload" | "itemBadge" | "draggable" | "onSelect" | "itemActions" | "saveOrderApi" | "links" | "stacked" | "dragOnSameLevel" | "overflow" | "onDragUpdate" | "onOrderChange" | "togglerClassName"> & Partial<Pick<Omit<NavigationProps, keyof ThemeProps>, "indentSize">> & Partial<Pick<Pick<NavigationProps, "indentSize">, never>> & import("amis-core/lib/theme").ThemeOutterProps> & Readonly<{
+        readonly props: Readonly<Pick<Omit<NavigationProps, keyof ThemeProps>, "source" | "$ref" | "disabled" | "disabledOn" | "hidden" | "hiddenOn" | "visible" | "visibleOn" | "id" | "onEvent" | "itemBadge" | "loading" | "reload" | "data" | "draggable" | "itemActions" | "onSelect" | "render" | "env" | "deferApi" | "onToggle" | "saveOrderApi" | "links" | "stacked" | "dragOnSameLevel" | "overflow" | "onDragUpdate" | "onOrderChange" | "togglerClassName"> & Partial<Pick<Omit<NavigationProps, keyof ThemeProps>, "indentSize">> & Partial<Pick<Pick<NavigationProps, "indentSize">, never>> & import("amis-core/lib/theme").ThemeOutterProps> & Readonly<{
             children?: React.ReactNode; /**
              * 懒加载 api，如果不配置复用 source 接口。
              */
@@ -224,17 +224,17 @@ declare const ThemedNavigation: {
             [key: string]: React.ReactInstance;
         };
         componentDidMount?(): void;
-        shouldComponentUpdate?(nextProps: Readonly<Pick<Omit<NavigationProps, keyof ThemeProps>, "source" | "deferApi" | "$ref" | "disabled" | "disabledOn" | "hidden" | "hiddenOn" | "visible" | "visibleOn" | "id" | "onEvent" | "onToggle" | "render" | "env" | "data" | "loading" | "reload" | "itemBadge" | "draggable" | "onSelect" | "itemActions" | "saveOrderApi" | "links" | "stacked" | "dragOnSameLevel" | "overflow" | "onDragUpdate" | "onOrderChange" | "togglerClassName"> & Partial<Pick<Omit<NavigationProps, keyof ThemeProps>, "indentSize">> & Partial<Pick<Pick<NavigationProps, "indentSize">, never>> & import("amis-core/lib/theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): boolean;
+        shouldComponentUpdate?(nextProps: Readonly<Pick<Omit<NavigationProps, keyof ThemeProps>, "source" | "$ref" | "disabled" | "disabledOn" | "hidden" | "hiddenOn" | "visible" | "visibleOn" | "id" | "onEvent" | "itemBadge" | "loading" | "reload" | "data" | "draggable" | "itemActions" | "onSelect" | "render" | "env" | "deferApi" | "onToggle" | "saveOrderApi" | "links" | "stacked" | "dragOnSameLevel" | "overflow" | "onDragUpdate" | "onOrderChange" | "togglerClassName"> & Partial<Pick<Omit<NavigationProps, keyof ThemeProps>, "indentSize">> & Partial<Pick<Pick<NavigationProps, "indentSize">, never>> & import("amis-core/lib/theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): boolean;
         componentWillUnmount?(): void;
         componentDidCatch?(error: Error, errorInfo: React.ErrorInfo): void;
-        getSnapshotBeforeUpdate?(prevProps: Readonly<Pick<Omit<NavigationProps, keyof ThemeProps>, "source" | "deferApi" | "$ref" | "disabled" | "disabledOn" | "hidden" | "hiddenOn" | "visible" | "visibleOn" | "id" | "onEvent" | "onToggle" | "render" | "env" | "data" | "loading" | "reload" | "itemBadge" | "draggable" | "onSelect" | "itemActions" | "saveOrderApi" | "links" | "stacked" | "dragOnSameLevel" | "overflow" | "onDragUpdate" | "onOrderChange" | "togglerClassName"> & Partial<Pick<Omit<NavigationProps, keyof ThemeProps>, "indentSize">> & Partial<Pick<Pick<NavigationProps, "indentSize">, never>> & import("amis-core/lib/theme").ThemeOutterProps>, prevState: Readonly<{}>): any;
-        componentDidUpdate?(prevProps: Readonly<Pick<Omit<NavigationProps, keyof ThemeProps>, "source" | "deferApi" | "$ref" | "disabled" | "disabledOn" | "hidden" | "hiddenOn" | "visible" | "visibleOn" | "id" | "onEvent" | "onToggle" | "render" | "env" | "data" | "loading" | "reload" | "itemBadge" | "draggable" | "onSelect" | "itemActions" | "saveOrderApi" | "links" | "stacked" | "dragOnSameLevel" | "overflow" | "onDragUpdate" | "onOrderChange" | "togglerClassName"> & Partial<Pick<Omit<NavigationProps, keyof ThemeProps>, "indentSize">> & Partial<Pick<Pick<NavigationProps, "indentSize">, never>> & import("amis-core/lib/theme").ThemeOutterProps>, prevState: Readonly<{}>, snapshot?: any): void;
+        getSnapshotBeforeUpdate?(prevProps: Readonly<Pick<Omit<NavigationProps, keyof ThemeProps>, "source" | "$ref" | "disabled" | "disabledOn" | "hidden" | "hiddenOn" | "visible" | "visibleOn" | "id" | "onEvent" | "itemBadge" | "loading" | "reload" | "data" | "draggable" | "itemActions" | "onSelect" | "render" | "env" | "deferApi" | "onToggle" | "saveOrderApi" | "links" | "stacked" | "dragOnSameLevel" | "overflow" | "onDragUpdate" | "onOrderChange" | "togglerClassName"> & Partial<Pick<Omit<NavigationProps, keyof ThemeProps>, "indentSize">> & Partial<Pick<Pick<NavigationProps, "indentSize">, never>> & import("amis-core/lib/theme").ThemeOutterProps>, prevState: Readonly<{}>): any;
+        componentDidUpdate?(prevProps: Readonly<Pick<Omit<NavigationProps, keyof ThemeProps>, "source" | "$ref" | "disabled" | "disabledOn" | "hidden" | "hiddenOn" | "visible" | "visibleOn" | "id" | "onEvent" | "itemBadge" | "loading" | "reload" | "data" | "draggable" | "itemActions" | "onSelect" | "render" | "env" | "deferApi" | "onToggle" | "saveOrderApi" | "links" | "stacked" | "dragOnSameLevel" | "overflow" | "onDragUpdate" | "onOrderChange" | "togglerClassName"> & Partial<Pick<Omit<NavigationProps, keyof ThemeProps>, "indentSize">> & Partial<Pick<Pick<NavigationProps, "indentSize">, never>> & import("amis-core/lib/theme").ThemeOutterProps>, prevState: Readonly<{}>, snapshot?: any): void;
         componentWillMount?(): void;
         UNSAFE_componentWillMount?(): void;
-        componentWillReceiveProps?(nextProps: Readonly<Pick<Omit<NavigationProps, keyof ThemeProps>, "source" | "deferApi" | "$ref" | "disabled" | "disabledOn" | "hidden" | "hiddenOn" | "visible" | "visibleOn" | "id" | "onEvent" | "onToggle" | "render" | "env" | "data" | "loading" | "reload" | "itemBadge" | "draggable" | "onSelect" | "itemActions" | "saveOrderApi" | "links" | "stacked" | "dragOnSameLevel" | "overflow" | "onDragUpdate" | "onOrderChange" | "togglerClassName"> & Partial<Pick<Omit<NavigationProps, keyof ThemeProps>, "indentSize">> & Partial<Pick<Pick<NavigationProps, "indentSize">, never>> & import("amis-core/lib/theme").ThemeOutterProps>, nextContext: any): void;
-        UNSAFE_componentWillReceiveProps?(nextProps: Readonly<Pick<Omit<NavigationProps, keyof ThemeProps>, "source" | "deferApi" | "$ref" | "disabled" | "disabledOn" | "hidden" | "hiddenOn" | "visible" | "visibleOn" | "id" | "onEvent" | "onToggle" | "render" | "env" | "data" | "loading" | "reload" | "itemBadge" | "draggable" | "onSelect" | "itemActions" | "saveOrderApi" | "links" | "stacked" | "dragOnSameLevel" | "overflow" | "onDragUpdate" | "onOrderChange" | "togglerClassName"> & Partial<Pick<Omit<NavigationProps, keyof ThemeProps>, "indentSize">> & Partial<Pick<Pick<NavigationProps, "indentSize">, never>> & import("amis-core/lib/theme").ThemeOutterProps>, nextContext: any): void;
-        componentWillUpdate?(nextProps: Readonly<Pick<Omit<NavigationProps, keyof ThemeProps>, "source" | "deferApi" | "$ref" | "disabled" | "disabledOn" | "hidden" | "hiddenOn" | "visible" | "visibleOn" | "id" | "onEvent" | "onToggle" | "render" | "env" | "data" | "loading" | "reload" | "itemBadge" | "draggable" | "onSelect" | "itemActions" | "saveOrderApi" | "links" | "stacked" | "dragOnSameLevel" | "overflow" | "onDragUpdate" | "onOrderChange" | "togglerClassName"> & Partial<Pick<Omit<NavigationProps, keyof ThemeProps>, "indentSize">> & Partial<Pick<Pick<NavigationProps, "indentSize">, never>> & import("amis-core/lib/theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): void;
-        UNSAFE_componentWillUpdate?(nextProps: Readonly<Pick<Omit<NavigationProps, keyof ThemeProps>, "source" | "deferApi" | "$ref" | "disabled" | "disabledOn" | "hidden" | "hiddenOn" | "visible" | "visibleOn" | "id" | "onEvent" | "onToggle" | "render" | "env" | "data" | "loading" | "reload" | "itemBadge" | "draggable" | "onSelect" | "itemActions" | "saveOrderApi" | "links" | "stacked" | "dragOnSameLevel" | "overflow" | "onDragUpdate" | "onOrderChange" | "togglerClassName"> & Partial<Pick<Omit<NavigationProps, keyof ThemeProps>, "indentSize">> & Partial<Pick<Pick<NavigationProps, "indentSize">, never>> & import("amis-core/lib/theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): void;
+        componentWillReceiveProps?(nextProps: Readonly<Pick<Omit<NavigationProps, keyof ThemeProps>, "source" | "$ref" | "disabled" | "disabledOn" | "hidden" | "hiddenOn" | "visible" | "visibleOn" | "id" | "onEvent" | "itemBadge" | "loading" | "reload" | "data" | "draggable" | "itemActions" | "onSelect" | "render" | "env" | "deferApi" | "onToggle" | "saveOrderApi" | "links" | "stacked" | "dragOnSameLevel" | "overflow" | "onDragUpdate" | "onOrderChange" | "togglerClassName"> & Partial<Pick<Omit<NavigationProps, keyof ThemeProps>, "indentSize">> & Partial<Pick<Pick<NavigationProps, "indentSize">, never>> & import("amis-core/lib/theme").ThemeOutterProps>, nextContext: any): void;
+        UNSAFE_componentWillReceiveProps?(nextProps: Readonly<Pick<Omit<NavigationProps, keyof ThemeProps>, "source" | "$ref" | "disabled" | "disabledOn" | "hidden" | "hiddenOn" | "visible" | "visibleOn" | "id" | "onEvent" | "itemBadge" | "loading" | "reload" | "data" | "draggable" | "itemActions" | "onSelect" | "render" | "env" | "deferApi" | "onToggle" | "saveOrderApi" | "links" | "stacked" | "dragOnSameLevel" | "overflow" | "onDragUpdate" | "onOrderChange" | "togglerClassName"> & Partial<Pick<Omit<NavigationProps, keyof ThemeProps>, "indentSize">> & Partial<Pick<Pick<NavigationProps, "indentSize">, never>> & import("amis-core/lib/theme").ThemeOutterProps>, nextContext: any): void;
+        componentWillUpdate?(nextProps: Readonly<Pick<Omit<NavigationProps, keyof ThemeProps>, "source" | "$ref" | "disabled" | "disabledOn" | "hidden" | "hiddenOn" | "visible" | "visibleOn" | "id" | "onEvent" | "itemBadge" | "loading" | "reload" | "data" | "draggable" | "itemActions" | "onSelect" | "render" | "env" | "deferApi" | "onToggle" | "saveOrderApi" | "links" | "stacked" | "dragOnSameLevel" | "overflow" | "onDragUpdate" | "onOrderChange" | "togglerClassName"> & Partial<Pick<Omit<NavigationProps, keyof ThemeProps>, "indentSize">> & Partial<Pick<Pick<NavigationProps, "indentSize">, never>> & import("amis-core/lib/theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): void;
+        UNSAFE_componentWillUpdate?(nextProps: Readonly<Pick<Omit<NavigationProps, keyof ThemeProps>, "source" | "$ref" | "disabled" | "disabledOn" | "hidden" | "hiddenOn" | "visible" | "visibleOn" | "id" | "onEvent" | "itemBadge" | "loading" | "reload" | "data" | "draggable" | "itemActions" | "onSelect" | "render" | "env" | "deferApi" | "onToggle" | "saveOrderApi" | "links" | "stacked" | "dragOnSameLevel" | "overflow" | "onDragUpdate" | "onOrderChange" | "togglerClassName"> & Partial<Pick<Omit<NavigationProps, keyof ThemeProps>, "indentSize">> & Partial<Pick<Pick<NavigationProps, "indentSize">, never>> & import("amis-core/lib/theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): void;
     };
     displayName: string;
     contextType: React.Context<string>;

package/lib/renderers/Nav.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.2.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Operation.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.2.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Page.d.ts

@@ -212,6 +212,7 @@ export default class Page extends React.Component<PageProps> {
     initInterval(value: any): any;
     handleRefresh(): Promise<void>;
     handleChange(value: any, name: string, submit?: boolean, changePristine?: boolean): void;
+    handleBulkChange(values: Object): void;
     renderHeader(): JSX.Element | undefined;
     render(): JSX.Element;
 }

package/lib/renderers/Page.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.2.0
  * Copyright 2018-2022 baidu
  */
 
@@ -25,6 +25,7 @@ var Page = /** @class */ (function (_super) {
         amisCore.bulkBindFunctions(_this, [
             'handleAction',
             'handleChange',
+            'handleBulkChange',
             'handleQuery',
             'handleDialogConfirm',
             'handleDialogClose',
@@ -40,7 +41,7 @@ var Page = /** @class */ (function (_super) {
         document.getElementsByTagName('head')[0].appendChild(_this.style);
         _this.updateStyle();
         _this.varStyle = document.createElement('style');
-        _this.style.setAttribute('data-vars', '');
+        _this.varStyle.setAttribute('data-vars', '');
         document.getElementsByTagName('head')[0].appendChild(_this.varStyle);
         _this.updateVarStyle();
         return _this;
@@ -130,14 +131,14 @@ var Page = /** @class */ (function (_super) {
                 })
                     .then(this.initInterval);
         }
-        else if (JSON.stringify(props.css) !== JSON.stringify(prevProps.css) ||
+        if (JSON.stringify(props.css) !== JSON.stringify(prevProps.css) ||
             JSON.stringify(props.mobileCSS) !== JSON.stringify(prevProps.mobileCSS)) {
             this.updateStyle();
         }
-        else if (JSON.stringify(props.cssVars) !== JSON.stringify(prevProps.cssVars)) {
+        if (JSON.stringify(props.cssVars) !== JSON.stringify(prevProps.cssVars)) {
             this.updateVarStyle();
         }
-        else if (amisCore.isObjectShallowModified(prevProps.defaultData, props.defaultData)) {
+        if (amisCore.isObjectShallowModified(prevProps.defaultData, props.defaultData)) {
             store.reInitData(props.defaultData);
         }
     };
@@ -360,6 +361,10 @@ var Page = /** @class */ (function (_super) {
         }
         onChange === null || onChange === void 0 ? void 0 : onChange.apply(null, arguments);
     };
+    Page.prototype.handleBulkChange = function (values) {
+        var _a, _b;
+        (_b = (_a = this.props.store) === null || _a === void 0 ? void 0 : _a.updateData) === null || _b === void 0 ? void 0 : _b.call(_a, values);
+    };
     Page.prototype.renderHeader = function () {
         var _a = this.props, title = _a.title, subTitle = _a.subTitle, remark = _a.remark, remarkPlacement = _a.remarkPlacement, headerClassName = _a.headerClassName, toolbarClassName = _a.toolbarClassName, toolbar = _a.toolbar, render = _a.render; _a.store; var initApi = _a.initApi, env = _a.env, cx = _a.classnames, regions = _a.regions; _a.translate;
         var subProps = {
@@ -399,6 +404,7 @@ var Page = /** @class */ (function (_super) {
             onAction: this.handleAction,
             onQuery: initApi ? this.handleQuery : undefined,
             onChange: this.handleChange,
+            onBulkChange: this.handleBulkChange,
             pageLoading: store.loading
         };
         var hasAside = Array.isArray(regions)

package/lib/renderers/Pagination.d.ts

@@ -58,6 +58,11 @@ export interface PaginationSchema extends BaseSchema {
      */
     disabled?: boolean;
     hasNext?: boolean;
+    /**
+     * 弹层挂载节点
+     * @default false
+     */
+    popOverContainerSelector?: string;
 }
 export interface PaginationProps extends RendererProps, Omit<PaginationSchema, 'type' | 'className'> {
 }

package/lib/renderers/Pagination.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.2.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/PaginationWrapper.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.2.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Panel.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.2.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Plain.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.2.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/PopOver.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.2.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Portlet.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.2.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Progress.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 import { RendererProps } from 'amis-core';
-import { BaseSchema, SchemaClassName } from '../Schema';
+import { BaseSchema, SchemaClassName, SchemaTpl } from '../Schema';
 import type { ColorMapType } from 'amis-ui/lib/components/Progress';
 /**
  * 进度展示控件。
@@ -60,6 +60,20 @@ export interface ProgressSchema extends BaseSchema {
      * 内容的模板函数
      */
     valueTpl?: string;
+    /**
+     * 阈值
+     */
+    threshold?: {
+        value: SchemaTpl;
+        color?: string;
+    } | {
+        value: SchemaTpl;
+        color?: string;
+    }[];
+    /**
+     * 是否显示阈值数值
+     */
+    showThresholdText?: boolean;
 }
 export interface ProgressProps extends RendererProps, Omit<ProgressSchema, 'type' | 'className'> {
 }

package/lib/renderers/Progress.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.2.0
  * Copyright 2018-2022 baidu
  */
 
@@ -28,12 +28,28 @@ var ProgressField = /** @class */ (function (_super) {
         });
     };
     ProgressField.prototype.render = function () {
-        var _a = this.props, mode = _a.mode, className = _a.className, placeholder = _a.placeholder, progressClassName = _a.progressClassName, map = _a.map, stripe = _a.stripe, animate = _a.animate, showLabel = _a.showLabel, strokeWidth = _a.strokeWidth, gapDegree = _a.gapDegree, gapPosition = _a.gapPosition; _a.classnames;
+        var _a = this.props, data = _a.data, mode = _a.mode, className = _a.className, placeholder = _a.placeholder, progressClassName = _a.progressClassName, map = _a.map, stripe = _a.stripe, animate = _a.animate, showLabel = _a.showLabel, strokeWidth = _a.strokeWidth, gapDegree = _a.gapDegree, gapPosition = _a.gapPosition; _a.classnames; var threshold = _a.threshold, showThresholdText = _a.showThresholdText;
         var value = amisCore.getPropValue(this.props);
+        value = typeof value === 'number' ? value : amisCore.filter(value, data);
         if (/^\d*\.?\d+$/.test(value)) {
             value = parseFloat(value);
         }
-        return (React__default["default"].createElement(amisUi.Progress, { value: value, type: mode, map: map, stripe: stripe, animate: animate, showLabel: showLabel, placeholder: placeholder, format: this.format, strokeWidth: strokeWidth, gapDegree: gapDegree, gapPosition: gapPosition, className: className, progressClassName: progressClassName }));
+        if (threshold) {
+            if (Array.isArray(threshold)) {
+                threshold.forEach(function (item) {
+                    item.value =
+                        typeof item.value === 'string'
+                            ? amisCore.filter(item.value, data)
+                            : item.value;
+                    item.color && (item.color = amisCore.filter(item.color, data));
+                });
+            }
+            else {
+                threshold.value = amisCore.filter(threshold.value, data);
+                threshold.color && (threshold.color = amisCore.filter(threshold.color, data));
+            }
+        }
+        return (React__default["default"].createElement(amisUi.Progress, { value: value, type: mode, map: map, stripe: stripe, animate: animate, showLabel: showLabel, placeholder: placeholder, format: this.format, strokeWidth: strokeWidth, gapDegree: gapDegree, gapPosition: gapPosition, className: className, progressClassName: progressClassName, threshold: threshold, showThresholdText: showThresholdText }));
     };
     ProgressField.defaultProps = {
         placeholder: '-',

package/lib/renderers/Property.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.2.0
  * Copyright 2018-2022 baidu
  */
 
@@ -28,9 +28,7 @@ var Property = /** @class */ (function (_super) {
      */
     Property.prototype.prepareRows = function () {
         var _a = this.props, _b = _a.column, column = _b === void 0 ? 3 : _b, items = _a.items, source = _a.source, data = _a.data;
-        var propertyItems = (items
-            ? items
-            : amisCore.resolveVariableAndFilter(source, data, '| raw')) || [];
+        var propertyItems = items ? items : source || [];
         var rows = [];
         var row = [];
         var columnLeft = column;
@@ -94,7 +92,8 @@ var Property = /** @class */ (function (_super) {
     }
     PropertyRenderer = tslib.__decorate([
         amisCore.Renderer({
-            type: 'property'
+            type: 'property',
+            autoVar: true
         })
     ], PropertyRenderer);
     return PropertyRenderer;

package/lib/renderers/QRCode.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.2.0
  * Copyright 2018-2022 baidu
  */