amis 2.2.0 → 2.3.0

package/esm/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/esm/renderers/Service.js

@@ -1,17 +1,30 @@
 /**
- * amis v2.2.0
+ * amis v2.3.0
  * Copyright 2018-2022 baidu
  */
 
 import { __extends, __awaiter, __generator, __assign, __decorate, __metadata } from 'tslib';
 import React from 'react';
-import { isApiOutdated, isObjectShallowModified, isEffectiveApi, str2AsyncFunction, buildApi, isEmpty, evalExpression, createObject, filter, isVisible, autobind, qsstringify, ScopedContext, Renderer, ServiceStore } from 'amis-core';
+import extend from 'lodash/extend';
+import cloneDeep from 'lodash/cloneDeep';
+import { isApiOutdated, isObjectShallowModified, isEffectiveApi, isObject, str2AsyncFunction, buildApi, isEmpty, evalExpression, createObject, filter, isVisible, autobind, qsstringify, ScopedContext, Renderer, ServiceStore } from 'amis-core';
 import { Spinner } from 'amis-ui';
 
+var eventTypes = [
+    /* 初始化时执行，默认 */
+    'inited',
+    /* API请求调用成功之后执行 */
+    'onApiFetched',
+    /* Schema API请求调用成功之后执行 */
+    'onSchemaApiFetched',
+    /* WebSocket调用成功后执行 */
+    'onWsFetched'
+];
 var Service = /** @class */ (function (_super) {
     __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);
@@ -29,23 +42,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');
+            }
+        }
         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);
+            });
         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();
@@ -55,9 +83,6 @@ var Service = /** @class */ (function (_super) {
         if (isObjectShallowModified(prevProps.defaultData, props.defaultData)) {
             store.reInitData(props.defaultData);
         }
-        if (props.dataProvider !== prevProps.dataProvider) {
-            this.runDataProvider();
-        }
     };
     Service.prototype.componentWillUnmount = function () {
         this.mounted = false;
@@ -81,11 +106,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 (isEffectiveApi(schemaApi, store.data, initFetchSchema)) {
             store
@@ -93,7 +119,10 @@ var Service = /** @class */ (function (_super) {
                 successMessage: fetchSuccess,
                 errorMessage: fetchFailed
             })
-                .then(this.afterSchemaFetch);
+                .then(function (res) {
+                _this.runDataProvider('onSchemaApiFetched');
+                _this.afterSchemaFetch(res);
+            });
         }
         if (isEffectiveApi(api, store.data, initFetch, initFetchOn)) {
             store
@@ -101,51 +130,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(provider);
+        var fnCollection = {};
+        if (dataProvider) {
+            if (typeof dataProvider === 'object' && isObject(dataProvider)) {
+                Object.keys(dataProvider).forEach(function (event) {
+                    var normalizedProvider = _this.normalizeProvider(dataProvider[event], event);
+                    fnCollection = extend(fnCollection, normalizedProvider || {});
+                });
+            }
+            else {
+                var normalizedProvider = this.normalizeProvider(dataProvider, 'inited');
+                fnCollection = extend(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 = 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 __awaiter(this, void 0, void 0, function () {
-            var _a, dataProvider, store, dataProviderFunc, unsubscribe;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
+            var store, dataProviders, fn, unsubscribe;
+            return __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 = 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) {
@@ -173,6 +278,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) {
@@ -212,6 +318,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);
         }
@@ -223,7 +330,10 @@ var Service = /** @class */ (function (_super) {
                 successMessage: fetchSuccess,
                 errorMessage: fetchFailed
             })
-                .then(this.afterSchemaFetch);
+                .then(function (res) {
+                _this.runDataProvider('onApiFetched');
+                _this.afterSchemaFetch(res);
+            });
         }
         if (isEffectiveApi(api, store.data)) {
             store
@@ -232,10 +342,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) {
@@ -374,6 +487,18 @@ var Service = /** @class */ (function (_super) {
         __metadata("design:paramtypes", []),
         __metadata("design:returntype", void 0)
     ], Service.prototype, "initFetch", null);
+    __decorate([
+        autobind,
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", [Object]),
+        __metadata("design:returntype", void 0)
+    ], Service.prototype, "initDataProviders", null);
+    __decorate([
+        autobind,
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", [Object, String]),
+        __metadata("design:returntype", Object)
+    ], Service.prototype, "normalizeProvider", null);
     __decorate([
         autobind,
         __metadata("design:type", Function),
@@ -435,4 +560,4 @@ var Service = /** @class */ (function (_super) {
     return ServiceRenderer;
 })(Service));
 
-export { Service as default };
+export { Service as default, eventTypes };

package/esm/renderers/SparkLine.js

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

package/esm/renderers/Spinner.js

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

package/esm/renderers/Status.js

@@ -1,10 +1,11 @@
 /**
- * amis v2.2.0
+ * amis v2.3.0
  * Copyright 2018-2022 baidu
  */
 
 import { __extends, __decorate } from 'tslib';
 import React from 'react';
+import merge from 'lodash/merge';
 import { getPropValue, filter, Renderer } from 'amis-core';
 import { Icon } from 'amis-ui';
 
@@ -14,11 +15,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(StatusField.defaultProps.map, (_a = this.props) === null || _a === void 0 ? void 0 : _a.map);
+        var labelMap = merge(StatusField.defaultProps.labelMap, (_b = this.props) === null || _b === void 0 ? void 0 : _b.labelMap);
         var value = getPropValue(this.props);
         var viewValue = (React.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;
             }
@@ -26,7 +30,7 @@ var StatusField = /** @class */ (function (_super) {
                 value = parseInt(value, 10) || 0;
             }
             wrapClassName = "StatusField--".concat(value);
-            var itemClassName = map[value] || '';
+            var itemClassName = filter(map[value], data) || '';
             var svgIcon_1 = '';
             itemClassName = itemClassName.replace(/\bsvg-([^\s|$]+)\b/g, function (_, icon) {
                 svgIcon_1 = icon;

package/esm/renderers/Steps.js

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

package/esm/renderers/Table/ColumnToggler.js

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

package/esm/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;

package/esm/renderers/Table/HeadCellFilterDropdown.js

@@ -1,11 +1,11 @@
 /**
- * amis v2.2.0
+ * amis v2.3.0
  * Copyright 2018-2022 baidu
  */
 
 import { __extends, __assign, __awaiter, __generator } from 'tslib';
 import React from 'react';
-import { isApiOutdated, getVariable, isEffectiveApi, normalizeApi, normalizeOptions, createObject, Overlay, PopOver } from 'amis-core';
+import { isApiOutdated, getVariable, isEffectiveApi, normalizeApi, normalizeOptions, isNumeric, createObject, Overlay, PopOver } from 'amis-core';
 import { Icon, Checkbox } from 'amis-ui';
 import { findDOMNode } from 'react-dom';
 import xor from 'lodash/xor';
@@ -98,6 +98,7 @@ var HeadCellFilterDropDown = /** @class */ (function (_super) {
         });
     };
     HeadCellFilterDropDown.prototype.alterOptions = function (options) {
+        var _this = this;
         var _a = this.props, data = _a.data, filterable = _a.filterable, name = _a.name;
         var filterValue = data && typeof data[name] !== 'undefined' ? data[name] : '';
         options = normalizeOptions(options);
@@ -105,10 +106,23 @@ var HeadCellFilterDropDown = /** @class */ (function (_super) {
             options = options.map(function (option) { return (__assign(__assign({}, option), { selected: filterValue.split(',').indexOf(option.value) > -1 })); });
         }
         else {
-            options = options.map(function (option) { return (__assign(__assign({}, option), { selected: option.value == filterValue })); });
+            options = options.map(function (option) { return (__assign(__assign({}, option), { selected: _this.optionComparator(option, filterValue) })); });
         }
         return options;
     };
+    HeadCellFilterDropDown.prototype.optionComparator = function (option, selected) {
+        var filterable = this.props.filterable;
+        /**
+         * 无论是否严格模式，需要考虑CRUD开启syncLocation后，参数值会被转化为string的情况：
+         * 数字类需要特殊处理，如果两边都为数字类时才进行比较，否则不相等，排除 1 == true 这种情况
+         */
+        if (isNumeric(option.value)) {
+            return isNumeric(selected) ? option.value == selected : false;
+        }
+        return (filterable === null || filterable === void 0 ? void 0 : filterable.strictMode) === true
+            ? option.value === selected
+            : option.value == selected;
+    };
     HeadCellFilterDropDown.prototype.handleClickOutside = function () {
         this.close();
     };

package/esm/renderers/Table/HeadCellSearchDropdown.js

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

package/esm/renderers/Table/ItemActionsWrapper.js

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

package/esm/renderers/Table/TableBody.js

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

package/esm/renderers/Table/TableCell.js

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

package/esm/renderers/Table/TableContent.js

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

package/esm/renderers/Table/TableRow.js

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