npm - amis - Versions diffs - 2.3.0 → 2.3.2-beta.1 - Mend

@@ -206,8 +206,8 @@ export default class Page extends React.Component<PageProps> {
     handleResizeMouseMove(e: MouseEvent): void;
     handleResizeMouseUp(): void;
     openFeedback(dialog: any, ctx: any): Promise<unknown>;
-    reload(subpath?: any, query?: any, ctx?: any, silent?: boolean): void;
-    receive(values: object): void;
+    reload(subpath?: any, query?: any, ctx?: any, silent?: boolean, replace?: boolean): void;
+    receive(values: object, subPath?: string, replace?: boolean): void;
     silentReload(target?: string, query?: any): void;
     initInterval(value: any): any;
     handleRefresh(): Promise<void>;
@@ -224,6 +224,6 @@ export declare class PageRenderer extends Page {
     handleAction(e: React.UIEvent<any>, action: ActionObject, ctx: object, throwErrors?: boolean, delegate?: IScopedContext): void;
     handleDialogConfirm(values: object[], action: ActionObject, ...rest: Array<any>): void;
     handleDrawerConfirm(values: object[], action: ActionObject, ...rest: Array<any>): void;
-    setData(values: object): void;
+    setData(values: object, replace?: boolean): void;
 }
 export {};

package/esm/renderers/Page.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.0
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
@@ -295,9 +295,9 @@ var Page = /** @class */ (function (_super) {
             });
         });
     };
-    Page.prototype.reload = function (subpath, query, ctx, silent) {
+    Page.prototype.reload = function (subpath, query, ctx, silent, replace) {
         if (query) {
-            return this.receive(query);
+            return this.receive(query, undefined, replace);
         }
         var _a = this.props, store = _a.store, initApi = _a.initApi;
         clearTimeout(this.timer);
@@ -308,9 +308,9 @@ var Page = /** @class */ (function (_super) {
             })
                 .then(this.initInterval);
     };
-    Page.prototype.receive = function (values) {
+    Page.prototype.receive = function (values, subPath, replace) {
         var store = this.props.store;
-        store.updateData(values);
+        store.updateData(values, undefined, replace);
         this.reload();
     };
     Page.prototype.silentReload = function (target, query) {
@@ -581,8 +581,8 @@ var Page = /** @class */ (function (_super) {
             }
         }, 300);
     };
-    PageRenderer.prototype.setData = function (values) {
-        return this.props.store.updateData(values);
+    PageRenderer.prototype.setData = function (values, replace) {
+        return this.props.store.updateData(values, undefined, replace);
     };
     PageRenderer.contextType = ScopedContext;
     PageRenderer = __decorate([

package/esm/renderers/Pagination.js CHANGED Viewed

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

package/esm/renderers/PaginationWrapper.js CHANGED Viewed

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

package/esm/renderers/Panel.js CHANGED Viewed

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

package/esm/renderers/Plain.js CHANGED Viewed

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

package/esm/renderers/PopOver.js CHANGED Viewed

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

package/esm/renderers/Portlet.js CHANGED Viewed

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

package/esm/renderers/Progress.js CHANGED Viewed

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

package/esm/renderers/Property.js CHANGED Viewed

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

package/esm/renderers/QRCode.js CHANGED Viewed

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

package/esm/renderers/QuickEdit.js CHANGED Viewed

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

package/esm/renderers/Remark.js CHANGED Viewed

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

package/esm/renderers/SearchBox.js CHANGED Viewed

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

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

@@ -120,9 +120,9 @@ export default class Service extends React.Component<ServiceProps> {
     afterDataFetch(result: any): void;
     afterSchemaFetch(schema: any): void;
     initInterval(value: any): any;
-    reload(subpath?: string, query?: any, ctx?: RendererData, silent?: boolean): void;
+    reload(subpath?: string, query?: any, ctx?: RendererData, silent?: boolean, replace?: boolean): void;
     silentReload(target?: string, query?: any): void;
-    receive(values: object): void;
+    receive(values: object, subPath?: string, replace?: boolean): void;
     handleQuery(query: any): void;
     reloadTarget(target: string, data?: any): void;
     handleDialogConfirm(values: object[], action: ActionObject, ctx: any, targets: Array<any>): void;
@@ -136,9 +136,9 @@ export default class Service extends React.Component<ServiceProps> {
 export declare class ServiceRenderer extends Service {
     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;
+    reload(subpath?: string, query?: any, ctx?: any, silent?: boolean, replace?: boolean): void;
+    receive(values: any, subPath?: string, replace?: boolean): void;
     componentWillUnmount(): void;
     reloadTarget(target: string, data?: any): void;
-    setData(values: object): void;
+    setData(values: object, replace?: boolean): void;
 }

package/esm/renderers/Service.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.0
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
@@ -317,10 +317,10 @@ var Service = /** @class */ (function (_super) {
             (this.timer = setTimeout(silentPolling ? this.silentReload : this.reload, Math.max(interval, 1000)));
         return value;
     };
-    Service.prototype.reload = function (subpath, query, ctx, silent) {
+    Service.prototype.reload = function (subpath, query, ctx, silent, replace) {
         var _this = this;
         if (query) {
-            return this.receive(query);
+            return this.receive(query, undefined, replace);
         }
         var _a = this.props, schemaApi = _a.schemaApi; _a.initFetchSchema; var api = _a.api; _a.initFetch; _a.initFetchOn; var store = _a.store, dataProvider = _a.dataProvider, _b = _a.messages, fetchSuccess = _b.fetchSuccess, fetchFailed = _b.fetchFailed;
         clearTimeout(this.timer);
@@ -354,9 +354,9 @@ var Service = /** @class */ (function (_super) {
     Service.prototype.silentReload = function (target, query) {
         this.reload(target, query, undefined, true);
     };
-    Service.prototype.receive = function (values) {
+    Service.prototype.receive = function (values, subPath, replace) {
         var store = this.props.store;
-        store.updateData(values);
+        store.updateData(values, undefined, replace);
         this.reload();
     };
     Service.prototype.handleQuery = function (query) {
@@ -521,19 +521,19 @@ var Service = /** @class */ (function (_super) {
         scoped.registerComponent(_this);
         return _this;
     }
-    ServiceRenderer.prototype.reload = function (subpath, query, ctx, silent) {
+    ServiceRenderer.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, ctx, silent);
+        return _super.prototype.reload.call(this, subpath, query, ctx, silent, replace);
     };
-    ServiceRenderer.prototype.receive = function (values, subPath) {
+    ServiceRenderer.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, subPath, replace);
     };
     ServiceRenderer.prototype.componentWillUnmount = function () {
         _super.prototype.componentWillUnmount.call(this);
@@ -544,8 +544,8 @@ var Service = /** @class */ (function (_super) {
         var scoped = this.context;
         scoped.reload(target, data);
     };
-    ServiceRenderer.prototype.setData = function (values) {
-        return this.props.store.updateData(values);
+    ServiceRenderer.prototype.setData = function (values, replace) {
+        return this.props.store.updateData(values, undefined, replace);
     };
     ServiceRenderer.contextType = ScopedContext;
     ServiceRenderer = __decorate([

package/esm/renderers/SparkLine.js CHANGED Viewed

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

package/esm/renderers/Spinner.js CHANGED Viewed

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

package/esm/renderers/Status.js CHANGED Viewed

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

package/esm/renderers/Steps.js CHANGED Viewed

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

package/esm/renderers/Table/ColumnToggler.js CHANGED Viewed

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

package/esm/renderers/Table/HeadCellFilterDropdown.js CHANGED Viewed

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

package/esm/renderers/Table/HeadCellSearchDropdown.js CHANGED Viewed

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

package/esm/renderers/Table/ItemActionsWrapper.js CHANGED Viewed

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

package/esm/renderers/Table/TableBody.js CHANGED Viewed

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

package/esm/renderers/Table/TableCell.js CHANGED Viewed

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

package/esm/renderers/Table/TableContent.js CHANGED Viewed

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

package/esm/renderers/Table/TableRow.js CHANGED Viewed

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

package/esm/renderers/Table/exportExcel.js CHANGED Viewed

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

package/esm/renderers/Table/index.js CHANGED Viewed

@@ -1,11 +1,12 @@
 /**
- * amis v2.3.0
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 import { __extends, __awaiter, __generator, __spreadArray, __assign, __rest, __decorate, __metadata } from 'tslib';
 import React from 'react';
 import { findDOMNode } from 'react-dom';
+import isEqual from 'lodash/isEqual';
 import { resolveVariableAndFilter, getScrollParent, offset, getStyleNumber, isObject, anyChanged, isPureVariable, isArrayChildrenModified, createObject, difference, resizeSensor, eachTree, resolveVariable, filter, padArr, noop, evalExpression, ScopedContext, autobind, Renderer, TableStore } from 'amis-core';
 import forEach from 'lodash/forEach';
 import { Icon, Checkbox, Button, Spinner } from 'amis-ui';
@@ -96,8 +97,9 @@ var Table = /** @class */ (function (_super) {
         var value = props.value || props.items;
         var rows = [];
         var updateRows = false;
+        // 要严格比较前后的value值，否则某些情况下会导致循环update无限渲染
         if (Array.isArray(value) &&
-            (!prevProps || (prevProps.value || prevProps.items) !== value)) {
+            (!prevProps || !isEqual(prevProps.value || prevProps.items, value))) {
             updateRows = true;
             rows = value;
         }
@@ -210,6 +212,7 @@ var Table = /** @class */ (function (_super) {
         }
     };
     Table.prototype.componentDidUpdate = function (prevProps) {
+        var _this = this;
         var props = this.props;
         var store = props.store;
         if (anyChanged([
@@ -269,7 +272,8 @@ var Table = /** @class */ (function (_super) {
             var selectedRows = store.selectedRows.map(function (item) { return item.id; }).join(',');
             prevSelectedRows !== selectedRows && this.syncSelected();
         }
-        this.updateTableInfoLazy();
+        // 延迟执行，否则表格还没更新，拿到的宽度不对，导致表头错位
+        Promise.resolve().then(function () { return _this.updateTableInfoLazy(); });
     };
     Table.prototype.componentWillUnmount = function () {
         var formItem = this.props.formItem;
@@ -1014,10 +1018,10 @@ var Table = /** @class */ (function (_super) {
         }
         var affix = [];
         if (column.searchable && column.name && !autoGenerateFilter) {
-            affix.push(React.createElement(HeadCellSearchDropDown, __assign({}, this.props, { onQuery: onQuery, name: column.name, searchable: column.searchable, sortable: false, type: column.type, data: query, orderBy: store.orderBy, orderDir: store.orderDir, popOverContainer: this.getPopOverContainer })));
+            affix.push(React.createElement(HeadCellSearchDropDown, __assign({ key: "table-head-search" }, this.props, { onQuery: onQuery, name: column.name, searchable: column.searchable, sortable: false, type: column.type, data: query, orderBy: store.orderBy, orderDir: store.orderDir, popOverContainer: this.getPopOverContainer })));
         }
         if (column.sortable && column.name) {
-            affix.push(React.createElement("span", { className: cx('TableCell-sortBtn'), onClick: function () { return __awaiter(_this, void 0, void 0, function () {
+            affix.push(React.createElement("span", { key: "table-head-sort", className: cx('TableCell-sortBtn'), onClick: function () { return __awaiter(_this, void 0, void 0, function () {
                     var orderBy, orderDir, order, rendererEvent;
                     return __generator(this, function (_a) {
                         switch (_a.label) {
@@ -1066,7 +1070,7 @@ var Table = /** @class */ (function (_super) {
                     React.createElement(Icon, { icon: "sort-default", className: "icon" }))));
         }
         if (!column.searchable && column.filterable && column.name) {
-            affix.push(React.createElement(HeadCellFilterDropDown, __assign({}, this.props, { onQuery: onQuery, name: column.name, type: column.type, data: query, filterable: column.filterable, popOverContainer: this.getPopOverContainer })));
+            affix.push(React.createElement(HeadCellFilterDropDown, __assign({ key: "table-head-filter" }, this.props, { onQuery: onQuery, name: column.name, type: column.type, data: query, filterable: column.filterable, popOverContainer: this.getPopOverContainer })));
         }
         if (column.pristine.width) {
             props.style = props.style || {};

package/esm/renderers/Table-v2/ColumnToggler.js CHANGED Viewed

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

package/esm/renderers/Table-v2/HeadCellSearchDropdown.js CHANGED Viewed

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

package/esm/renderers/Table-v2/TableCell.js CHANGED Viewed

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

package/esm/renderers/Table-v2/index.js CHANGED Viewed

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

package/esm/renderers/Table2/ColumnToggler.js CHANGED Viewed

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

package/esm/renderers/Table2/HeadCellSearchDropdown.js CHANGED Viewed

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

package/esm/renderers/Table2/TableCell.js CHANGED Viewed

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

package/esm/renderers/Table2/index.js CHANGED Viewed

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

package/esm/renderers/TableView.js CHANGED Viewed

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

package/esm/renderers/Tabs.js CHANGED Viewed

@@ -1,11 +1,11 @@
 /**
- * amis v2.3.0
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 import { __extends, __assign, __awaiter, __generator, __decorate, __metadata } from 'tslib';
 import React from 'react';
-import { tokenize, resolveVariableAndFilter, createObject, isObject, getVariable, isObjectShallowModified, isVisible, filter, isDisabled, autobind, ScopedContext, Renderer, str2AsyncFunction } from 'amis-core';
+import { tokenize, resolveVariableAndFilter, createObject, isObject, getVariable, isObjectShallowModified, isVisible, resolveEventData, filter, isDisabled, autobind, ScopedContext, Renderer, str2AsyncFunction } from 'amis-core';
 import find from 'lodash/find';
 import findIndex from 'lodash/findIndex';
 import { Tab, Tabs as Tabs$1 } from 'amis-ui';
@@ -282,11 +282,11 @@ var Tabs = /** @class */ (function (_super) {
     Tabs.prototype.handleSelect = function (key) {
         var _a;
         return __awaiter(this, void 0, void 0, function () {
-            var _b, dispatchEvent, data, env, onSelect, id, localTabs, tab, rendererEvent, selectFunc;
+            var _b, dispatchEvent, env, onSelect, id, localTabs, tab, rendererEvent, selectFunc;
             return __generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
-                        _b = this.props, dispatchEvent = _b.dispatchEvent, data = _b.data, env = _b.env, onSelect = _b.onSelect, id = _b.id;
+                        _b = this.props, dispatchEvent = _b.dispatchEvent, _b.data, env = _b.env, onSelect = _b.onSelect, id = _b.id;
                         localTabs = this.state.localTabs;
                         (_a = env.tracker) === null || _a === void 0 ? void 0 : _a.call(env, {
                             eventType: 'tabChange',
@@ -296,9 +296,9 @@ var Tabs = /** @class */ (function (_super) {
                             }
                         });
                         tab = localTabs === null || localTabs === void 0 ? void 0 : localTabs.find(function (item, index) { return key === (item.hash ? item.hash : index); });
-                        return [4 /*yield*/, dispatchEvent('change', createObject(data, {
+                        return [4 /*yield*/, dispatchEvent('change', resolveEventData(this.props, {
                                 value: (tab === null || tab === void 0 ? void 0 : tab.hash) ? tab === null || tab === void 0 ? void 0 : tab.hash : key + 1
-                            }))];
+                            }, 'value'))];
                     case 1:
                         rendererEvent = _c.sent();
                         if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {

package/esm/renderers/Tag.js CHANGED Viewed

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

package/esm/renderers/Tasks.js CHANGED Viewed

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

package/esm/renderers/Timeline.js CHANGED Viewed

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

package/esm/renderers/TooltipWrapper.js CHANGED Viewed

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

package/esm/renderers/Tpl.js CHANGED Viewed

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