amis 2.1.1-beta.2 → 2.3.0

package/lib/renderers/QuickEdit.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.1.1-beta.2
+ * amis v2.3.0
  * Copyright 2018-2022 baidu
  */
 
@@ -185,7 +185,7 @@ var HocQuickEdit = function (config) {
             QuickEditComponent.prototype.handleSubmit = function (values) {
                 var _a = this.props, onQuickChange = _a.onQuickChange, quickEdit = _a.quickEdit;
                 this.closeQuickEdit();
-                onQuickChange(values, quickEdit.saveImmediately, false, quickEdit.resetOnFailed);
+                onQuickChange(values, quickEdit.saveImmediately, false, quickEdit);
                 return false;
             };
             QuickEditComponent.prototype.handleInit = function (values) {
@@ -194,7 +194,7 @@ var HocQuickEdit = function (config) {
             };
             QuickEditComponent.prototype.handleChange = function (values) {
                 var _a = this.props, onQuickChange = _a.onQuickChange, quickEdit = _a.quickEdit;
-                onQuickChange(values, quickEdit.saveImmediately, false, quickEdit.resetOnFailed);
+                onQuickChange(values, quickEdit.saveImmediately, false, quickEdit);
             };
             QuickEditComponent.prototype.openQuickEdit = function () {
                 currentOpened = this;

package/lib/renderers/Remark.d.ts

@@ -47,9 +47,9 @@ export declare function filterContents(tooltip: string | undefined | {
     content?: string;
     body?: string;
 }, data: any): string | {
-    children: any;
     title: string;
     content: string | undefined;
+    children?: any;
 } | undefined;
 export interface RemarkProps extends RendererProps, Omit<RemarkSchema, 'type' | 'className'> {
     icon: string;
@@ -59,13 +59,45 @@ declare class Remark extends React.Component<RemarkProps> {
     static propsList: Array<string>;
     static defaultProps: {
         icon: string;
-        trigger: ("click" | "focus" | "hover")[];
+        trigger: ("click" | "hover" | "focus")[];
     };
     showModalTip(tooltip?: string | TooltipObject): (e: React.MouseEvent) => void;
     renderLabel(finalIcon: any, finalLabel: string, cx: ClassNamesFn, shape?: 'circle' | 'square'): JSX.Element;
     render(): JSX.Element;
 }
-declare const _default: (React.ComponentType<any> & import("hoist-non-react-statics").NonReactStatics<React.ComponentType<any>, {}>) & {
+declare const _default: {
+    new (props: Omit<RemarkProps, keyof import("amis-core").ThemeProps> & import("amis-core/lib/theme").ThemeOutterProps): {
+        ref: any;
+        childRef(ref: any): void;
+        getWrappedInstance(): any;
+        render(): JSX.Element;
+        context: any;
+        setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<RemarkProps, keyof import("amis-core").ThemeProps> & import("amis-core/lib/theme").ThemeOutterProps>) => {} | Pick<{}, K> | null) | Pick<{}, K> | null, callback?: (() => void) | undefined): void;
+        forceUpdate(callback?: (() => void) | undefined): void;
+        readonly props: Readonly<Omit<RemarkProps, keyof import("amis-core").ThemeProps> & import("amis-core/lib/theme").ThemeOutterProps> & Readonly<{
+            children?: React.ReactNode;
+        }>;
+        state: Readonly<{}>;
+        refs: {
+            [key: string]: React.ReactInstance;
+        };
+        componentDidMount?(): void;
+        shouldComponentUpdate?(nextProps: Readonly<Omit<RemarkProps, keyof import("amis-core").ThemeProps> & import("amis-core/lib/theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): boolean;
+        componentWillUnmount?(): void;
+        componentDidCatch?(error: Error, errorInfo: React.ErrorInfo): void;
+        getSnapshotBeforeUpdate?(prevProps: Readonly<Omit<RemarkProps, keyof import("amis-core").ThemeProps> & import("amis-core/lib/theme").ThemeOutterProps>, prevState: Readonly<{}>): any;
+        componentDidUpdate?(prevProps: Readonly<Omit<RemarkProps, keyof import("amis-core").ThemeProps> & import("amis-core/lib/theme").ThemeOutterProps>, prevState: Readonly<{}>, snapshot?: any): void;
+        componentWillMount?(): void;
+        UNSAFE_componentWillMount?(): void;
+        componentWillReceiveProps?(nextProps: Readonly<Omit<RemarkProps, keyof import("amis-core").ThemeProps> & import("amis-core/lib/theme").ThemeOutterProps>, nextContext: any): void;
+        UNSAFE_componentWillReceiveProps?(nextProps: Readonly<Omit<RemarkProps, keyof import("amis-core").ThemeProps> & import("amis-core/lib/theme").ThemeOutterProps>, nextContext: any): void;
+        componentWillUpdate?(nextProps: Readonly<Omit<RemarkProps, keyof import("amis-core").ThemeProps> & import("amis-core/lib/theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): void;
+        UNSAFE_componentWillUpdate?(nextProps: Readonly<Omit<RemarkProps, keyof import("amis-core").ThemeProps> & import("amis-core/lib/theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): void;
+    };
+    displayName: string;
+    contextType: React.Context<string>;
+    ComposedComponent: React.ComponentType<typeof Remark>;
+} & import("hoist-non-react-statics").NonReactStatics<typeof Remark, {}> & {
     ComposedComponent: typeof Remark;
 };
 export default _default;

package/lib/renderers/Remark.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.1.1-beta.2
+ * amis v2.3.0
  * Copyright 2018-2022 baidu
  */
 
@@ -21,17 +21,9 @@ function filterContents(tooltip, data) {
         return amisCore.filter(tooltip, data);
     }
     else if (tooltip) {
-        return tooltip.title
-            ? {
-                children: tooltip === null || tooltip === void 0 ? void 0 : tooltip.children,
-                title: amisCore.filter(tooltip.title, data),
-                content: tooltip.content || tooltip.body
-                    ? amisCore.filter(tooltip.content || tooltip.body || '', data)
-                    : undefined
-            }
-            : tooltip.content || tooltip.body
-                ? amisCore.filter(tooltip.content || tooltip.body || '', data)
-                : undefined;
+        var title = tooltip.title, content = tooltip.content, body = tooltip.body, rest = tslib.__rest(tooltip, ["title", "content", "body"]);
+        return title || content || body
+            ? tslib.__assign(tslib.__assign({}, rest), { title: amisCore.filter(title, data), content: content || body ? amisCore.filter(content || body || '', data) : undefined }) : undefined;
     }
     return tooltip;
 }

package/lib/renderers/SearchBox.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.1.1-beta.2
+ * amis v2.3.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Service.d.ts

@@ -2,9 +2,14 @@ import React from 'react';
 import { RendererProps } from 'amis-core';
 import { IServiceStore } from 'amis-core';
 import { Api, RendererData, ActionObject } from 'amis-core';
-import Scoped, { IScopedContext } from 'amis-core';
+import { IScopedContext } from 'amis-core';
 import { BaseSchema, SchemaApi, SchemaCollection, SchemaExpression, SchemaMessage, SchemaName } from '../Schema';
 import type { ListenerAction } from 'amis-core';
+export declare const eventTypes: readonly ["inited", "onApiFetched", "onSchemaApiFetched", "onWsFetched"];
+export declare type ProviderEventType = typeof eventTypes[number];
+export declare type DataProviderCollection = Partial<Record<ProviderEventType, DataProvider>>;
+export declare type DataProvider = string | Function;
+export declare type ComposedDataProvider = DataProvider | DataProviderCollection;
 /**
  * Service 服务类控件。
  * 文档：https://baidu.gitee.io/amis/docs/components/service
@@ -25,7 +30,7 @@ export interface ServiceSchema extends BaseSchema {
     /**
      * 通过调用外部函数来获取数据
      */
-    dataProvider?: string | Function;
+    dataProvider?: ComposedDataProvider;
     /**
      * 内容区域
      */
@@ -80,7 +85,8 @@ export default class Service extends React.Component<ServiceProps> {
     timer: ReturnType<typeof setTimeout>;
     mounted: boolean;
     socket: any;
-    dataProviderUnsubscribe?: Function;
+    dataProviders: DataProviderCollection;
+    dataProviderUnsubscribe?: Partial<Record<ProviderEventType, Function>>;
     static defaultProps: Partial<ServiceProps>;
     static propsList: Array<string>;
     constructor(props: ServiceProps);
@@ -89,8 +95,26 @@ export default class Service extends React.Component<ServiceProps> {
     componentWillUnmount(): void;
     doAction(action: ListenerAction, args: any): void;
     initFetch(): void;
-    runDataProvider(): Promise<void>;
-    runDataProviderUnsubscribe(): void;
+    /**
+     * 初始化Provider函数集，将Schema配置统一转化为DataProviderCollection格式
+     */
+    initDataProviders(provider?: ComposedDataProvider): Partial<Record<"inited" | "onApiFetched" | "onSchemaApiFetched" | "onWsFetched", DataProvider>>;
+    /**
+     * 标准化处理Provider函数
+     */
+    normalizeProvider(provider: any, event?: ProviderEventType): DataProviderCollection | null;
+    /**
+     * 使用外部函数获取数据
+     *
+     * @param {ProviderEventType} event 触发provider函数执行的事件，默认初始时执行
+     */
+    runDataProvider(event: ProviderEventType): Promise<void>;
+    /**
+     * 运行销毁外部函数的方法
+     *
+     * @param {ProviderEventType} event 事件名称，不传参数即执行所有销毁函数
+     */
+    runDataProviderUnsubscribe(event?: ProviderEventType): void;
     dataProviderSetData(data: any): void;
     fetchWSData(ws: string | Api, data: any): void;
     afterDataFetch(result: any): void;
@@ -110,7 +134,7 @@ export default class Service extends React.Component<ServiceProps> {
     render(): JSX.Element;
 }
 export declare class ServiceRenderer extends Service {
-    static contextType: React.Context<Scoped.IScopedContext>;
+    static contextType: React.Context<IScopedContext>;
     constructor(props: ServiceProps, context: IScopedContext);
     reload(subpath?: string, query?: any, ctx?: any, silent?: boolean): void;
     receive(values: any, subPath?: string): void;

package/lib/renderers/Service.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.1.1-beta.2
+ * amis v2.3.0
  * Copyright 2018-2022 baidu
  */
 
@@ -9,17 +9,32 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var tslib = require('tslib');
 var React = require('react');
+var extend = require('lodash/extend');
+var cloneDeep = require('lodash/cloneDeep');
 var amisCore = require('amis-core');
 var amisUi = require('amis-ui');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
+var extend__default = /*#__PURE__*/_interopDefaultLegacy(extend);
+var cloneDeep__default = /*#__PURE__*/_interopDefaultLegacy(cloneDeep);
 
+var eventTypes = [
+    /* 初始化时执行，默认 */
+    'inited',
+    /* API请求调用成功之后执行 */
+    'onApiFetched',
+    /* Schema API请求调用成功之后执行 */
+    'onSchemaApiFetched',
+    /* WebSocket调用成功后执行 */
+    'onWsFetched'
+];
 var Service = /** @class */ (function (_super) {
     tslib.__extends(Service, _super);
     function Service(props) {
         var _this = _super.call(this, props) || this;
+        _this.dataProviders = _this.initDataProviders(props.dataProvider);
         _this.handleQuery = _this.handleQuery.bind(_this);
         _this.handleAction = _this.handleAction.bind(_this);
         _this.handleChange = _this.handleChange.bind(_this);
@@ -37,23 +52,38 @@ var Service = /** @class */ (function (_super) {
         this.initFetch();
     };
     Service.prototype.componentDidUpdate = function (prevProps) {
+        var _this = this;
+        var _a;
         var props = this.props;
         var store = props.store;
-        var _a = props.messages, fetchSuccess = _a.fetchSuccess, fetchFailed = _a.fetchFailed;
+        var _b = props.messages, fetchSuccess = _b.fetchSuccess, fetchFailed = _b.fetchFailed;
+        if (props.dataProvider !== prevProps.dataProvider) {
+            /* 重新构建provider函数 */
+            this.dataProviders = this.initDataProviders(props.dataProvider);
+            if (this.dataProviders && ((_a = this.dataProviders) === null || _a === void 0 ? void 0 : _a.inited)) {
+                this.runDataProvider('inited');
+            }
+        }
         amisCore.isApiOutdated(prevProps.api, props.api, prevProps.data, props.data) &&
             store
                 .fetchData(props.api, store.data, {
                 successMessage: fetchSuccess,
                 errorMessage: fetchFailed
             })
-                .then(this.afterDataFetch);
+                .then(function (res) {
+                _this.runDataProvider('onApiFetched');
+                _this.afterDataFetch(res);
+            });
         amisCore.isApiOutdated(prevProps.schemaApi, props.schemaApi, prevProps.data, props.data) &&
             store
                 .fetchSchema(props.schemaApi, store.data, {
                 successMessage: fetchSuccess,
                 errorMessage: fetchFailed
             })
-                .then(this.afterSchemaFetch);
+                .then(function (res) {
+                _this.runDataProvider('onSchemaApiFetched');
+                _this.afterSchemaFetch(res);
+            });
         if (props.ws && prevProps.ws !== props.ws) {
             if (this.socket) {
                 this.socket.close();
@@ -63,9 +93,6 @@ var Service = /** @class */ (function (_super) {
         if (amisCore.isObjectShallowModified(prevProps.defaultData, props.defaultData)) {
             store.reInitData(props.defaultData);
         }
-        if (props.dataProvider !== prevProps.dataProvider) {
-            this.runDataProvider();
-        }
     };
     Service.prototype.componentWillUnmount = function () {
         this.mounted = false;
@@ -89,11 +116,12 @@ var Service = /** @class */ (function (_super) {
                     .then(this.afterSchemaFetch);
             }
             if (dataProvider) {
-                this.runDataProvider();
+                this.runDataProvider('inited');
             }
         }
     };
     Service.prototype.initFetch = function () {
+        var _this = this;
         var _a = this.props, schemaApi = _a.schemaApi, initFetchSchema = _a.initFetchSchema, api = _a.api, ws = _a.ws, initFetch = _a.initFetch, initFetchOn = _a.initFetchOn, dataProvider = _a.dataProvider, store = _a.store, _b = _a.messages, fetchSuccess = _b.fetchSuccess, fetchFailed = _b.fetchFailed;
         if (amisCore.isEffectiveApi(schemaApi, store.data, initFetchSchema)) {
             store
@@ -101,7 +129,10 @@ var Service = /** @class */ (function (_super) {
                 successMessage: fetchSuccess,
                 errorMessage: fetchFailed
             })
-                .then(this.afterSchemaFetch);
+                .then(function (res) {
+                _this.runDataProvider('onSchemaApiFetched');
+                _this.afterSchemaFetch(res);
+            });
         }
         if (amisCore.isEffectiveApi(api, store.data, initFetch, initFetchOn)) {
             store
@@ -109,51 +140,127 @@ var Service = /** @class */ (function (_super) {
                 successMessage: fetchSuccess,
                 errorMessage: fetchFailed
             })
-                .then(this.afterDataFetch);
+                .then(function (res) {
+                _this.runDataProvider('onApiFetched');
+                _this.afterDataFetch(res);
+            });
         }
         if (ws) {
             this.socket = this.fetchWSData(ws, store.data);
         }
         if (dataProvider) {
-            this.runDataProvider();
+            this.runDataProvider('inited');
+        }
+    };
+    /**
+     * 初始化Provider函数集，将Schema配置统一转化为DataProviderCollection格式
+     */
+    Service.prototype.initDataProviders = function (provider) {
+        var _this = this;
+        var dataProvider = cloneDeep__default["default"](provider);
+        var fnCollection = {};
+        if (dataProvider) {
+            if (typeof dataProvider === 'object' && amisCore.isObject(dataProvider)) {
+                Object.keys(dataProvider).forEach(function (event) {
+                    var normalizedProvider = _this.normalizeProvider(dataProvider[event], event);
+                    fnCollection = extend__default["default"](fnCollection, normalizedProvider || {});
+                });
+            }
+            else {
+                var normalizedProvider = this.normalizeProvider(dataProvider, 'inited');
+                fnCollection = extend__default["default"](fnCollection, normalizedProvider || {});
+            }
+        }
+        return fnCollection;
+    };
+    /**
+     * 标准化处理Provider函数
+     */
+    Service.prototype.normalizeProvider = function (provider, event) {
+        var _a, _b;
+        if (event === void 0) { event = 'inited'; }
+        if (!~eventTypes.indexOf(event)) {
+            return null;
+        }
+        if (typeof provider === 'function') {
+            return _a = {}, _a[event] = provider, _a;
         }
+        else if (typeof provider === 'string') {
+            var asyncFn = amisCore.str2AsyncFunction(provider, 'data', 'setData', 'env');
+            return asyncFn
+                ? (_b = {},
+                    _b[event] = asyncFn,
+                    _b) : null;
+        }
+        return null;
     };
-    // 使用外部函数获取数据
-    Service.prototype.runDataProvider = function () {
+    /**
+     * 使用外部函数获取数据
+     *
+     * @param {ProviderEventType} event 触发provider函数执行的事件，默认初始时执行
+     */
+    Service.prototype.runDataProvider = function (event) {
         return tslib.__awaiter(this, void 0, void 0, function () {
-            var _a, dataProvider, store, dataProviderFunc, unsubscribe;
-            return tslib.__generator(this, function (_b) {
-                switch (_b.label) {
+            var store, dataProviders, fn, unsubscribe;
+            return tslib.__generator(this, function (_a) {
+                switch (_a.label) {
                     case 0:
-                        this.runDataProviderUnsubscribe();
-                        _a = this.props, dataProvider = _a.dataProvider, store = _a.store;
-                        dataProviderFunc = dataProvider;
-                        if (typeof dataProvider === 'string' && dataProvider) {
-                            dataProviderFunc = amisCore.str2AsyncFunction(dataProvider, 'data', 'setData', 'env');
-                        }
-                        if (!(typeof dataProviderFunc === 'function')) return [3 /*break*/, 2];
-                        return [4 /*yield*/, dataProviderFunc(store.data, this.dataProviderSetData, this.props.env)];
+                        this.runDataProviderUnsubscribe(event);
+                        store = this.props.store;
+                        dataProviders = this.dataProviders;
+                        if (!(dataProviders && ~eventTypes.indexOf(event))) return [3 /*break*/, 2];
+                        fn = dataProviders[event];
+                        if (!(fn && typeof fn === 'function')) return [3 /*break*/, 2];
+                        return [4 /*yield*/, fn(store.data, this.dataProviderSetData, this.props.env)];
                     case 1:
-                        unsubscribe = _b.sent();
+                        unsubscribe = _a.sent();
                         if (typeof unsubscribe === 'function') {
-                            this.dataProviderUnsubscribe = unsubscribe;
+                            if (!this.dataProviderUnsubscribe) {
+                                this.dataProviderUnsubscribe = {};
+                            }
+                            this.dataProviderUnsubscribe[event] = unsubscribe;
                         }
-                        _b.label = 2;
+                        _a.label = 2;
                     case 2: return [2 /*return*/];
                 }
             });
         });
     };
-    // 运行销毁外部函数的方法
-    Service.prototype.runDataProviderUnsubscribe = function () {
-        if (typeof this.dataProviderUnsubscribe === 'function') {
+    /**
+     * 运行销毁外部函数的方法
+     *
+     * @param {ProviderEventType} event 事件名称，不传参数即执行所有销毁函数
+     */
+    Service.prototype.runDataProviderUnsubscribe = function (event) {
+        var _a;
+        var dataProviderUnsubscribe = this.dataProviderUnsubscribe;
+        if (!dataProviderUnsubscribe) {
+            return;
+        }
+        if (event) {
+            var disposedFn = dataProviderUnsubscribe[event];
             try {
-                this.dataProviderUnsubscribe();
+                if (disposedFn && typeof disposedFn === 'function') {
+                    disposedFn();
+                }
             }
             catch (error) {
                 console.error(error);
             }
         }
+        else {
+            (_a = Object.keys(dataProviderUnsubscribe)) === null || _a === void 0 ? void 0 : _a.forEach(function (event) {
+                var disposedFn = dataProviderUnsubscribe[event];
+                try {
+                    if (disposedFn && typeof disposedFn === 'function') {
+                        disposedFn();
+                    }
+                }
+                catch (error) {
+                    console.error(error);
+                }
+            });
+        }
     };
     // 外部函数回调更新数据
     Service.prototype.dataProviderSetData = function (data) {
@@ -181,6 +288,7 @@ var Service = /** @class */ (function (_super) {
             }
             store.updateData(returndata, undefined, false);
             store.setHasRemoteData();
+            _this.runDataProvider('onWsFetched');
             // 因为 WebSocket 只会获取纯数据，所以没有 msg 之类的
             _this.afterDataFetch({ ok: true, data: returndata });
         }, function (error) {
@@ -220,6 +328,7 @@ var Service = /** @class */ (function (_super) {
         return value;
     };
     Service.prototype.reload = function (subpath, query, ctx, silent) {
+        var _this = this;
         if (query) {
             return this.receive(query);
         }
@@ -231,7 +340,10 @@ var Service = /** @class */ (function (_super) {
                 successMessage: fetchSuccess,
                 errorMessage: fetchFailed
             })
-                .then(this.afterSchemaFetch);
+                .then(function (res) {
+                _this.runDataProvider('onApiFetched');
+                _this.afterSchemaFetch(res);
+            });
         }
         if (amisCore.isEffectiveApi(api, store.data)) {
             store
@@ -240,10 +352,13 @@ var Service = /** @class */ (function (_super) {
                 successMessage: fetchSuccess,
                 errorMessage: fetchFailed
             })
-                .then(this.afterDataFetch);
+                .then(function (res) {
+                _this.runDataProvider('onSchemaApiFetched');
+                _this.afterDataFetch(res);
+            });
         }
         if (dataProvider) {
-            this.runDataProvider();
+            this.runDataProvider('inited');
         }
     };
     Service.prototype.silentReload = function (target, query) {
@@ -382,6 +497,18 @@ var Service = /** @class */ (function (_super) {
         tslib.__metadata("design:paramtypes", []),
         tslib.__metadata("design:returntype", void 0)
     ], Service.prototype, "initFetch", null);
+    tslib.__decorate([
+        amisCore.autobind,
+        tslib.__metadata("design:type", Function),
+        tslib.__metadata("design:paramtypes", [Object]),
+        tslib.__metadata("design:returntype", void 0)
+    ], Service.prototype, "initDataProviders", null);
+    tslib.__decorate([
+        amisCore.autobind,
+        tslib.__metadata("design:type", Function),
+        tslib.__metadata("design:paramtypes", [Object, String]),
+        tslib.__metadata("design:returntype", Object)
+    ], Service.prototype, "normalizeProvider", null);
     tslib.__decorate([
         amisCore.autobind,
         tslib.__metadata("design:type", Function),
@@ -444,3 +571,4 @@ var Service = /** @class */ (function (_super) {
 })(Service));
 
 exports["default"] = Service;
+exports.eventTypes = eventTypes;

package/lib/renderers/SparkLine.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.1.1-beta.2
+ * amis v2.3.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Spinner.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.1.1-beta.2
+ * amis v2.3.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Status.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.1.1-beta.2
+ * amis v2.3.0
  * Copyright 2018-2022 baidu
  */
 
@@ -9,12 +9,14 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var tslib = require('tslib');
 var React = require('react');
+var merge = require('lodash/merge');
 var amisCore = require('amis-core');
 var amisUi = require('amis-ui');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
+var merge__default = /*#__PURE__*/_interopDefaultLegacy(merge);
 
 var StatusField = /** @class */ (function (_super) {
     tslib.__extends(StatusField, _super);
@@ -22,11 +24,14 @@ var StatusField = /** @class */ (function (_super) {
         return _super !== null && _super.apply(this, arguments) || this;
     }
     StatusField.prototype.render = function () {
-        var _a = this.props, className = _a.className, placeholder = _a.placeholder, map = _a.map, labelMap = _a.labelMap, cx = _a.classnames, data = _a.data;
+        var _a, _b;
+        var _c = this.props, className = _c.className, placeholder = _c.placeholder, cx = _c.classnames, data = _c.data;
+        var map = merge__default["default"](StatusField.defaultProps.map, (_a = this.props) === null || _a === void 0 ? void 0 : _a.map);
+        var labelMap = merge__default["default"](StatusField.defaultProps.labelMap, (_b = this.props) === null || _b === void 0 ? void 0 : _b.labelMap);
         var value = amisCore.getPropValue(this.props);
         var viewValue = (React__default["default"].createElement("span", { className: "text-muted", key: "status-value" }, placeholder));
         var wrapClassName = '';
-        if (value !== undefined && value !== '' && map) {
+        if (value != undefined && value !== '' && map) {
             if (typeof value === 'boolean') {
                 value = value ? 1 : 0;
             }
@@ -34,7 +39,7 @@ var StatusField = /** @class */ (function (_super) {
                 value = parseInt(value, 10) || 0;
             }
             wrapClassName = "StatusField--".concat(value);
-            var itemClassName = map[value] || '';
+            var itemClassName = amisCore.filter(map[value], data) || '';
             var svgIcon_1 = '';
             itemClassName = itemClassName.replace(/\bsvg-([^\s|$]+)\b/g, function (_, icon) {
                 svgIcon_1 = icon;

package/lib/renderers/Steps.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.1.1-beta.2
+ * amis v2.3.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Table/ColumnToggler.d.ts

@@ -3,7 +3,7 @@ import Sortable from 'sortablejs';
 import { RendererProps } from 'amis-core';
 import type { TooltipObject } from 'amis-ui/lib/components/TooltipWrapper';
 import { IColumn } from 'amis-core/lib/store/table';
-import type { IColumnV2 } from 'amis-core/lib/store/table-v2';
+import type { IColumn2 } from 'amis-core/lib/store/table2';
 export interface ColumnTogglerProps extends RendererProps {
     /**
      * 按钮文字
@@ -80,12 +80,12 @@ export interface ColumnTogglerProps extends RendererProps {
     /**
      * 列数据
      */
-    columns: Array<IColumn | IColumnV2>;
+    columns: Array<IColumn | IColumn2>;
     /**
      * 弹窗底部按钮大小
      */
     footerBtnSize?: 'xs' | 'sm' | 'md' | 'lg';
-    activeToggaleColumns: Array<IColumn | IColumnV2>;
+    activeToggaleColumns: Array<IColumn | IColumn2>;
     onColumnToggle: (columns: Array<IColumn>) => void;
     modalContainer?: () => HTMLElement;
 }

package/lib/renderers/Table/ColumnToggler.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.1.1-beta.2
+ * amis v2.3.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Table/HeadCellFilterDropdown.d.ts

@@ -1,8 +1,10 @@
 import React from 'react';
 import { RendererProps } from 'amis-core';
+import type { Option } from 'amis-core';
 export interface QuickFilterConfig {
     options: Array<any>;
     multiple: boolean;
+    strictMode?: boolean;
     [propName: string]: any;
 }
 export interface HeadCellFilterProps extends RendererProps {
@@ -22,6 +24,7 @@ export declare class HeadCellFilterDropDown extends React.Component<HeadCellFilt
     componentDidUpdate(prevProps: HeadCellFilterProps, prevState: any): void;
     fetchOptions(): void;
     alterOptions(options: Array<any>): any[];
+    optionComparator(option: Option, selected: any): boolean;
     handleClickOutside(): void;
     open(): void;
     close(): void;