npm - amis - Versions diffs - 2.2.0 → 2.3.1 - Mend

@@ -1,10 +1,10 @@
 /**
- * amis v2.2.0
+ * amis v2.3.1
  * Copyright 2018-2022 baidu
  */
-import { extendDefaultEnv, render, addRootWrapper, LazyComponent } from 'amis-core';
-import { alert, confirm, toast, setRenderSchemaFn, ImageGallery, Spinner } from 'amis-ui';
+import { extendDefaultEnv, render, addRootWrapper, themeable, LazyComponent } from 'amis-core';
+import { alert, confirm, toast, setRenderSchemaFn, ImageGallery } from 'amis-ui';
 import React from 'react';
 extendDefaultEnv({
@@ -37,4 +37,9 @@ addRootWrapper(function (props) {
     var env = props.env, children = props.children;
     return (React.createElement(ImageGallery, { modalContainer: env.getModalContainer }, children));
 });
-LazyComponent.defaultProps.placeholder = React.createElement(Spinner, null);
+var SimpleSpinner = themeable(function (props) {
+    var cx = props.classnames;
+    return (React.createElement("div", { "data-testid": "spinner", className: cx("Spinner", 'in', props.className) },
+        React.createElement("div", { className: cx("Spinner-icon", 'Spinner-icon--default', props.spinnerClassName) })));
+});
+LazyComponent.defaultProps.placeholder = React.createElement(SimpleSpinner, null);

package/esm/renderers/Action.js CHANGED Viewed

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

package/esm/renderers/Alert.js CHANGED Viewed

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

package/esm/renderers/AnchorNav.js CHANGED Viewed

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

package/esm/renderers/App.d.ts CHANGED Viewed

@@ -117,8 +117,8 @@ export default class App extends React.Component<AppProps, object> {
     componentDidMount(): Promise<void>;
     componentDidUpdate(prevProps: AppProps): Promise<void>;
     componentWillUnmount(): void;
-    reload(subpath?: any, query?: any, ctx?: any, silent?: boolean): Promise<void>;
-    receive(values: object): void;
+    reload(subpath?: any, query?: any, ctx?: any, silent?: boolean, replace?: boolean): Promise<void>;
+    receive(values: object, subPath?: string, replace?: boolean): void;
     handleNavClick(e: React.MouseEvent): void;
     renderHeader(): JSX.Element;
     renderAside(): JSX.Element;
@@ -129,5 +129,5 @@ export declare class AppRenderer extends App {
     static contextType: React.Context<IScopedContext>;
     constructor(props: AppProps, context: IScopedContext);
     componentWillUnmount(): void;
-    setData(values: object): void;
+    setData(values: object, replace?: boolean): void;
 }

package/esm/renderers/App.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /**
- * amis v2.2.0
+ * amis v2.3.1
  * Copyright 2018-2022 baidu
  */
@@ -64,14 +64,14 @@ var App = /** @class */ (function (_super) {
         var _a;
         (_a = this.unWatchRouteChange) === null || _a === void 0 ? void 0 : _a.call(this);
     };
-    App.prototype.reload = function (subpath, query, ctx, silent) {
+    App.prototype.reload = function (subpath, query, ctx, silent, replace) {
         return __awaiter(this, void 0, void 0, function () {
             var _a, api, store, env, _b, showFullBreadcrumbPath, _c, showBreadcrumbHomePath, json;
             return __generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
                         if (query) {
-                            return [2 /*return*/, this.receive(query)];
+                            return [2 /*return*/, this.receive(query, undefined, replace)];
                         }
                         _a = this.props, api = _a.api, store = _a.store, env = _a.env, _b = _a.showFullBreadcrumbPath, showFullBreadcrumbPath = _b === void 0 ? false : _b, _c = _a.showBreadcrumbHomePath, showBreadcrumbHomePath = _c === void 0 ? true : _c;
                         if (!isEffectiveApi(api, store.data)) return [3 /*break*/, 2];
@@ -94,9 +94,9 @@ var App = /** @class */ (function (_super) {
             });
         });
     };
-    App.prototype.receive = function (values) {
+    App.prototype.receive = function (values, subPath, replace) {
         var store = this.props.store;
-        store.updateData(values);
+        store.updateData(values, undefined, replace);
         this.reload();
     };
     App.prototype.handleNavClick = function (e) {
@@ -197,8 +197,8 @@ var App = /** @class */ (function (_super) {
         scoped.unRegisterComponent(this);
         _super.prototype.componentWillUnmount.call(this);
     };
-    AppRenderer.prototype.setData = function (values) {
-        return this.props.store.updateData(values);
+    AppRenderer.prototype.setData = function (values, replace) {
+        return this.props.store.updateData(values, undefined, replace);
     };
     AppRenderer.contextType = ScopedContext;
     AppRenderer = __decorate([

package/esm/renderers/Audio.js CHANGED Viewed

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

package/esm/renderers/Avatar.js CHANGED Viewed

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

package/esm/renderers/BarCode.js CHANGED Viewed

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

package/esm/renderers/Breadcrumb.js CHANGED Viewed

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

package/esm/renderers/ButtonGroup.js CHANGED Viewed

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

package/esm/renderers/CRUD.d.ts CHANGED Viewed

@@ -271,9 +271,9 @@ export default class CRUD extends React.Component<CRUDProps, any> {
     handleSelect(items: Array<any>, unSelectedItems: Array<any>): void;
     handleChildPopOverOpen(popOver: any): void;
     handleChildPopOverClose(popOver: any): void;
-    handleQuery(values: object, forceReload?: boolean): void;
-    reload(subpath?: string, query?: any): void;
-    receive(values: object): void;
+    handleQuery(values: object, forceReload?: boolean, replace?: boolean): void;
+    reload(subpath?: string, query?: any, replace?: boolean): void;
+    receive(values: object, subPath?: string, replace?: boolean): void;
     reloadTarget(target: string, data: any): void;
     closeTarget(target: string): void;
     doAction(action: ActionObject, data: object, throwErrors?: boolean): any;
@@ -285,7 +285,7 @@ export default class CRUD extends React.Component<CRUDProps, any> {
     renderPagination(toolbar: SchemaNode): JSX.Element | null;
     renderStatistics(): JSX.Element | null;
     renderSwitchPerPage(childProps: any): JSX.Element | null;
-    renderLoadMore(): "" | JSX.Element;
+    renderLoadMore(): JSX.Element;
     renderFilterToggler(): JSX.Element | null;
     renderExportCSV(toolbar: Schema): JSX.Element;
     renderToolbar(toolbar?: SchemaNode, index?: number, childProps?: any, toolbarRenderer?: (toolbar: SchemaNode, index: number) => React.ReactNode): {} | null;
@@ -298,8 +298,8 @@ export declare class CRUDRenderer extends CRUD {
     static contextType: React.Context<IScopedContext>;
     constructor(props: CRUDProps, context: IScopedContext);
     componentWillUnmount(): void;
-    reload(subpath?: string, query?: any, ctx?: any): void;
-    receive(values: any, subPath?: string): void;
+    reload(subpath?: string, query?: any, ctx?: any, silent?: boolean, replace?: boolean): void;
+    receive(values: any, subPath?: string, replace?: boolean): void;
     reloadTarget(target: string, data: any): void;
     closeTarget(target: string): void;
 }

package/esm/renderers/CRUD.js CHANGED Viewed

@@ -1,11 +1,12 @@
 /**
- * amis v2.2.0
+ * amis v2.3.1
  * Copyright 2018-2022 baidu
  */
 import { __extends, __awaiter, __generator, __assign, __rest, __decorate, __metadata } from 'tslib';
 import React from 'react';
-import { qsparse, getPropValue, anyChanged, isArrayChildrenModified, isObjectShallowModified, isApiOutdated, isPureVariable, resolveVariableAndFilter, filter, createObject, isVisible, str2function, qsstringify, isEffectiveApi, evalExpression, extendObject, getExprProperties, getVariable, ScopedContext, Renderer, CRUDStore } from 'amis-core';
+import isEqual from 'lodash/isEqual';
+import { parseQuery, getPropValue, anyChanged, isArrayChildrenModified, isObjectShallowModified, isApiOutdated, isPureVariable, resolveVariableAndFilter, filter, createObject, isVisible, str2function, qsparse, qsstringify, isEffectiveApi, evalExpression, extendObject, getExprProperties, getVariable, ScopedContext, Renderer, CRUDStore } from 'amis-core';
 import { Select, Button, Icon, Html } from 'amis-ui';
 import pick from 'lodash/pick';
 import { findDOMNode } from 'react-dom';
@@ -41,10 +42,10 @@ var CRUD = /** @class */ (function (_super) {
         var location = props.location, store = props.store, pageField = props.pageField, perPageField = props.perPageField, syncLocation = props.syncLocation; props.loadDataOnce;
         _this.mounted = true;
         if (syncLocation && location && (location.query || location.search)) {
-            store.updateQuery(qsparse(location.search.substring(1)), undefined, pageField, perPageField);
+            store.updateQuery(parseQuery(location), undefined, pageField, perPageField);
         }
         else if (syncLocation && !location && window.location.search) {
-            store.updateQuery(qsparse(window.location.search.substring(1)), undefined, pageField, perPageField);
+            store.updateQuery(parseQuery(window.location), undefined, pageField, perPageField);
         }
         _this.props.store.setFilterTogglable(!!_this.props.filterTogglable, _this.props.filterDefaultVisible);
         // 如果有 api，data 里面先写个 空数组，面得继承外层的 items
@@ -86,7 +87,12 @@ var CRUD = /** @class */ (function (_super) {
         }
         var val;
         if (this.props.pickerMode &&
-            isArrayChildrenModified((val = getPropValue(this.props)), getPropValue(prevProps))) {
+            isArrayChildrenModified((val = getPropValue(this.props)), getPropValue(prevProps)) &&
+            !isEqual(val, store.selectedItems.concat())) {
+            /**
+             * 更新链：Table -> CRUD -> Picker -> Form
+             * 对于Picker模式来说，执行到这里的时候store.selectedItems已经更新过了，所以需要额外判断一下
+             */
             store.setSelectedItems(val);
         }
         if (this.props.filterTogglable !== prevProps.filterTogglable) {
@@ -97,7 +103,7 @@ var CRUD = /** @class */ (function (_super) {
             prevProps.location &&
             prevProps.location.search !== props.location.search) {
             // 同步地址栏，那么直接检测 query 是否变了，变了就重新拉数据
-            store.updateQuery(qsparse(props.location.search.substring(1)), undefined, props.pageField, props.perPageField);
+            store.updateQuery(parseQuery(props.location), undefined, props.pageField, props.perPageField);
             dataInvalid = !!(props.api && isObjectShallowModified(store.query, this.lastQuery, false));
         }
         if (dataInvalid) ;
@@ -693,7 +699,7 @@ var CRUD = /** @class */ (function (_super) {
                 else {
                     oldUnselectedItems_1.push(item);
                 }
-                ~idx2 && oldItems_1.splice(idx2, 1);
+                !~idx && ~idx2 && oldItems_1.splice(idx2, 1);
             });
             newItems = oldItems_1;
             newUnSelectedItems = oldUnselectedItems_1;
@@ -732,25 +738,25 @@ var CRUD = /** @class */ (function (_super) {
             }
         }
     };
-    CRUD.prototype.handleQuery = function (values, forceReload) {
+    CRUD.prototype.handleQuery = function (values, forceReload, replace) {
         var _a;
         if (forceReload === void 0) { forceReload = false; }
         var _b = this.props, store = _b.store, syncLocation = _b.syncLocation, env = _b.env, pageField = _b.pageField, perPageField = _b.perPageField;
         store.updateQuery(__assign(__assign({}, values), (_a = {}, _a[pageField || 'page'] = 1, _a)), syncLocation && env && env.updateLocation
             ? env.updateLocation
-            : undefined, pageField, perPageField);
+            : undefined, pageField, perPageField, replace);
         this.search(undefined, undefined, undefined, forceReload);
     };
-    CRUD.prototype.reload = function (subpath, query) {
+    CRUD.prototype.reload = function (subpath, query, replace) {
         if (query) {
-            return this.receive(query);
+            return this.receive(query, undefined, replace);
         }
         else {
             this.search(undefined, undefined, true, true);
         }
     };
-    CRUD.prototype.receive = function (values) {
-        this.handleQuery(values, true);
+    CRUD.prototype.receive = function (values, subPath, replace) {
+        this.handleQuery(values, true, replace);
     };
     CRUD.prototype.reloadTarget = function (target, data) {
         // implement this.
@@ -906,10 +912,10 @@ var CRUD = /** @class */ (function (_super) {
         var _this = this;
         var _a = this.props, store = _a.store, ns = _a.classPrefix, cx = _a.classnames, __ = _a.translate;
         var page = store.page, lastPage = store.lastPage;
-        return page < lastPage ? (React.createElement("div", { className: cx('Crud-loadMore') },
-            React.createElement(Button, { classPrefix: ns, onClick: function () {
+        return (React.createElement("div", { className: cx('Crud-loadMore') },
+            React.createElement(Button, { disabled: page >= lastPage, disabledTip: __('CRUD.loadMoreDisableTip'), classPrefix: ns, onClick: function () {
                     return _this.search({ page: page + 1, loadDataMode: 'load-more' });
-                }, size: "sm" }, __('CRUD.loadMore')))) : ('');
+                }, size: "sm" }, __('CRUD.loadMore'))));
     };
     CRUD.prototype.renderFilterToggler = function () {
         var _a = this.props, store = _a.store, cx = _a.classnames, __ = _a.translate;
@@ -1234,19 +1240,19 @@ var CRUD = /** @class */ (function (_super) {
         var scoped = this.context;
         scoped.unRegisterComponent(this);
     };
-    CRUDRenderer.prototype.reload = function (subpath, query, ctx) {
+    CRUDRenderer.prototype.reload = function (subpath, query, ctx, silent, replace) {
         var scoped = this.context;
         if (subpath) {
             return scoped.reload(query ? "".concat(subpath, "?").concat(qsstringify(query)) : subpath, ctx);
         }
-        return _super.prototype.reload.call(this, subpath, query);
+        return _super.prototype.reload.call(this, subpath, query, replace);
     };
-    CRUDRenderer.prototype.receive = function (values, subPath) {
+    CRUDRenderer.prototype.receive = function (values, subPath, replace) {
         var scoped = this.context;
         if (subPath) {
             return scoped.send(subPath, values);
         }
-        return _super.prototype.receive.call(this, values);
+        return _super.prototype.receive.call(this, values, undefined, replace);
     };
     CRUDRenderer.prototype.reloadTarget = function (target, data) {
         var scoped = this.context;

package/esm/renderers/CRUD2.js CHANGED Viewed

@@ -1,11 +1,11 @@
 /**
- * amis v2.2.0
+ * amis v2.3.1
  * Copyright 2018-2022 baidu
  */
 import { __extends, __assign, __rest, __decorate, __metadata } from 'tslib';
 import React from 'react';
-import { qsparse, getPropValue, isArrayChildrenModified, isObjectShallowModified, isApiOutdated, isPureVariable, resolveVariableAndFilter, qsstringify, createObject, isEffectiveApi, evalExpression, extendObject, filter, getVariable, autobind, ScopedContext, Renderer, CRUDStore } from 'amis-core';
+import { parseQuery, getPropValue, isArrayChildrenModified, isObjectShallowModified, isApiOutdated, isPureVariable, resolveVariableAndFilter, qsparse, qsstringify, createObject, isEffectiveApi, evalExpression, extendObject, filter, getVariable, autobind, ScopedContext, Renderer, CRUDStore } from 'amis-core';
 import pick from 'lodash/pick';
 import { findDOMNode } from 'react-dom';
 import findIndex from 'lodash/findIndex';
@@ -20,10 +20,10 @@ var CRUD2 = /** @class */ (function (_super) {
         var location = props.location, store = props.store, syncLocation = props.syncLocation, pageField = props.pageField, perPageField = props.perPageField;
         _this.mounted = true;
         if (syncLocation && location && (location.query || location.search)) {
-            store.updateQuery(qsparse(location.search.substring(1)), undefined, pageField, perPageField);
+            store.updateQuery(parseQuery(location), undefined, pageField, perPageField);
         }
         else if (syncLocation && !location && window.location.search) {
-            store.updateQuery(qsparse(window.location.search.substring(1)), undefined, pageField, perPageField);
+            store.updateQuery(parseQuery(window.location), undefined, pageField, perPageField);
         }
         // 如果有 api，data 里面先写个 空数组，面得继承外层的 items
         // 比如 crud 打开一个弹框，里面也是个 crud，默认一开始其实显示
@@ -74,7 +74,7 @@ var CRUD2 = /** @class */ (function (_super) {
             prevProps.location &&
             prevProps.location.search !== props.location.search) {
             // 同步地址栏，那么直接检测 query 是否变了，变了就重新拉数据
-            store.updateQuery(qsparse(props.location.search.substring(1)), undefined, props.pageField, props.perPageField);
+            store.updateQuery(parseQuery(props.location), undefined, props.pageField, props.perPageField);
             dataInvalid = !!(props.api && isObjectShallowModified(store.query, this.lastQuery, false));
         }
         if (dataInvalid) ;
@@ -428,7 +428,7 @@ var CRUD2 = /** @class */ (function (_super) {
                 else {
                     oldUnselectedItems_1.push(item);
                 }
-                ~idx2 && oldItems_1.splice(idx2, 1);
+                !~idx && ~idx2 && oldItems_1.splice(idx2, 1);
             });
             newItems = oldItems_1;
             newUnSelectedItems = oldUnselectedItems_1;

package/esm/renderers/Calendar.js CHANGED Viewed

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

package/esm/renderers/Card.js CHANGED Viewed

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

package/esm/renderers/Card2.js CHANGED Viewed

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

package/esm/renderers/Cards.js CHANGED Viewed

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

package/esm/renderers/Carousel.js CHANGED Viewed

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

package/esm/renderers/Chart.d.ts CHANGED Viewed

@@ -102,8 +102,8 @@ export declare class Chart extends React.Component<ChartProps> {
     componentWillUnmount(): void;
     handleClick(ctx: object): void;
     refFn(ref: any): void;
-    reload(subpath?: string, query?: any): void;
-    receive(data: object): void;
+    reload(subpath?: string, query?: any, ctx?: any, silent?: boolean, replace?: boolean): void;
+    receive(data: object, subPath?: string, replace?: boolean): void;
     renderChart(config?: object, data?: any): void;
     reloadEcharts(config: any): void;
     render(): JSX.Element;
@@ -112,5 +112,5 @@ export declare class ChartRenderer extends Chart {
     static contextType: React.Context<IScopedContext>;
     constructor(props: ChartProps, context: IScopedContext);
     componentWillUnmount(): void;
-    setData(values: object): void;
+    setData(values: object, replace?: boolean): void;
 }

package/esm/renderers/Chart.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /**
- * amis v2.2.0
+ * amis v2.3.1
  * Copyright 2018-2022 baidu
  */
@@ -188,12 +188,12 @@ var Chart = /** @class */ (function (_super) {
         }
         this.ref = ref;
     };
-    Chart.prototype.reload = function (subpath, query) {
+    Chart.prototype.reload = function (subpath, query, ctx, silent, replace) {
         var _this = this;
         var _a, _b;
         var _c = this.props, api = _c.api, env = _c.env, store = _c.store, interval = _c.interval, __ = _c.translate;
         if (query) {
-            return this.receive(query);
+            return this.receive(query, undefined, replace);
         }
         else if (!env || !env.fetcher || !isEffectiveApi(api, store.data)) {
             return;
@@ -225,8 +225,8 @@ var Chart = /** @class */ (function (_super) {
             var data = normalizeApiResponseData(result.data);
             // 说明返回的是数据接口。
             if (!data.series && _this.props.config) {
-                var ctx = createObject(_this.props.data, data);
-                _this.renderChart(_this.props.config, ctx);
+                var ctx_1 = createObject(_this.props.data, data);
+                _this.renderChart(_this.props.config, ctx_1);
             }
             else {
                 _this.renderChart(result.data || {});
@@ -246,9 +246,9 @@ var Chart = /** @class */ (function (_super) {
             (_a = _this.echarts) === null || _a === void 0 ? void 0 : _a.hideLoading();
         });
     };
-    Chart.prototype.receive = function (data) {
+    Chart.prototype.receive = function (data, subPath, replace) {
         var store = this.props.store;
-        store.updateData(data);
+        store.updateData(data, undefined, replace);
         this.reload();
     };
     Chart.prototype.renderChart = function (config, data) {
@@ -333,9 +333,9 @@ var Chart = /** @class */ (function (_super) {
         var scoped = this.context;
         scoped.unRegisterComponent(this);
     };
-    ChartRenderer.prototype.setData = function (values) {
+    ChartRenderer.prototype.setData = function (values, replace) {
         var store = this.props.store;
-        store.updateData(values);
+        store.updateData(values, undefined, replace);
         // 重新渲染
         this.renderChart(this.props.config, values);
     };

package/esm/renderers/Code.js CHANGED Viewed

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

package/esm/renderers/Collapse.d.ts CHANGED Viewed

@@ -77,6 +77,7 @@ export interface CollapseProps extends RendererProps, Omit<CollapseSchema, 'type
     children?: JSX.Element | ((props?: any) => JSX.Element);
 }
 export default class Collapse extends React.Component<CollapseProps, {}> {
+    static propsList: Array<string>;
     render(): JSX.Element;
 }
 export declare class CollapseRenderer extends Collapse {

package/esm/renderers/Collapse.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /**
- * amis v2.2.0
+ * amis v2.3.1
  * Copyright 2018-2022 baidu
  */
@@ -29,6 +29,17 @@ var Collapse = /** @class */ (function (_super) {
                     ? render('body', body)
                     : null, onCollapse: onCollapse }));
     };
+    Collapse.propsList = [
+        'collapsable',
+        'collapsed',
+        'collapseTitle',
+        'showArrow',
+        'headerPosition',
+        'bodyClassName',
+        'headingClassName',
+        'collapseHeader',
+        'size'
+    ];
     return Collapse;
 }(React.Component));
 /** @class */ ((function (_super) {

package/esm/renderers/CollapseGroup.js CHANGED Viewed

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