amis 2.3.0 → 2.3.1

package/lib/renderers/Page.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.0
+ * amis v2.3.1
  * Copyright 2018-2022 baidu
  */
 
@@ -303,9 +303,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);
@@ -316,9 +316,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) {
@@ -589,8 +589,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 = amisCore.ScopedContext;
     PageRenderer = tslib.__decorate([

package/lib/renderers/Pagination.js

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

package/lib/renderers/PaginationWrapper.js

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

package/lib/renderers/Panel.js

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

package/lib/renderers/Plain.js

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

package/lib/renderers/PopOver.js

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

package/lib/renderers/Portlet.js

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

package/lib/renderers/Progress.js

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

package/lib/renderers/Property.js

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

package/lib/renderers/QRCode.js

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

package/lib/renderers/QuickEdit.js

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

package/lib/renderers/Remark.d.ts

@@ -59,7 +59,7 @@ declare class Remark extends React.Component<RemarkProps> {
     static propsList: Array<string>;
     static defaultProps: {
         icon: string;
-        trigger: ("click" | "hover" | "focus")[];
+        trigger: ("click" | "focus" | "hover")[];
     };
     showModalTip(tooltip?: string | TooltipObject): (e: React.MouseEvent) => void;
     renderLabel(finalIcon: any, finalLabel: string, cx: ClassNamesFn, shape?: 'circle' | 'square'): JSX.Element;

package/lib/renderers/Remark.js

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

package/lib/renderers/SearchBox.js

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

package/lib/renderers/Service.d.ts

@@ -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/lib/renderers/Service.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.0
+ * amis v2.3.1
  * Copyright 2018-2022 baidu
  */
 
@@ -327,10 +327,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);
@@ -364,9 +364,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) {
@@ -531,19 +531,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(amisCore.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);
@@ -554,8 +554,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 = amisCore.ScopedContext;
     ServiceRenderer = tslib.__decorate([

package/lib/renderers/SparkLine.js

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

package/lib/renderers/Spinner.js

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

package/lib/renderers/Status.js

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

package/lib/renderers/Steps.js

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

package/lib/renderers/Table/ColumnToggler.js

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

package/lib/renderers/Table/HeadCellFilterDropdown.js

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

package/lib/renderers/Table/HeadCellSearchDropdown.js

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

package/lib/renderers/Table/ItemActionsWrapper.js

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

package/lib/renderers/Table/TableBody.js

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

package/lib/renderers/Table/TableCell.js

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

package/lib/renderers/Table/TableContent.js

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

package/lib/renderers/Table/TableRow.js

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

package/lib/renderers/Table/exportExcel.js

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

package/lib/renderers/Table/index.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.0
+ * amis v2.3.1
  * Copyright 2018-2022 baidu
  */
 
@@ -10,6 +10,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var tslib = require('tslib');
 var React = require('react');
 var ReactDOM = require('react-dom');
+var isEqual = require('lodash/isEqual');
 var amisCore = require('amis-core');
 var forEach = require('lodash/forEach');
 var amisUi = require('amis-ui');
@@ -28,6 +29,7 @@ var exportExcel = require('./exportExcel.js');
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
+var isEqual__default = /*#__PURE__*/_interopDefaultLegacy(isEqual);
 var forEach__default = /*#__PURE__*/_interopDefaultLegacy(forEach);
 var debouce__default = /*#__PURE__*/_interopDefaultLegacy(debouce);
 var Sortable__default = /*#__PURE__*/_interopDefaultLegacy(Sortable);
@@ -108,8 +110,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__default["default"](prevProps.value || prevProps.items, value))) {
             updateRows = true;
             rows = value;
         }
@@ -1026,10 +1029,10 @@ var Table = /** @class */ (function (_super) {
         }
         var affix = [];
         if (column.searchable && column.name && !autoGenerateFilter) {
-            affix.push(React__default["default"].createElement(HeadCellSearchDropdown.HeadCellSearchDropDown, tslib.__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__default["default"].createElement(HeadCellSearchDropdown.HeadCellSearchDropDown, tslib.__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__default["default"].createElement("span", { className: cx('TableCell-sortBtn'), onClick: function () { return tslib.__awaiter(_this, void 0, void 0, function () {
+            affix.push(React__default["default"].createElement("span", { key: "table-head-sort", className: cx('TableCell-sortBtn'), onClick: function () { return tslib.__awaiter(_this, void 0, void 0, function () {
                     var orderBy, orderDir, order, rendererEvent;
                     return tslib.__generator(this, function (_a) {
                         switch (_a.label) {
@@ -1078,7 +1081,7 @@ var Table = /** @class */ (function (_super) {
                     React__default["default"].createElement(amisUi.Icon, { icon: "sort-default", className: "icon" }))));
         }
         if (!column.searchable && column.filterable && column.name) {
-            affix.push(React__default["default"].createElement(HeadCellFilterDropdown.HeadCellFilterDropDown, tslib.__assign({}, this.props, { onQuery: onQuery, name: column.name, type: column.type, data: query, filterable: column.filterable, popOverContainer: this.getPopOverContainer })));
+            affix.push(React__default["default"].createElement(HeadCellFilterDropdown.HeadCellFilterDropDown, tslib.__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/lib/renderers/Table2/ColumnToggler.js

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

package/lib/renderers/Table2/HeadCellSearchDropdown.js

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

package/lib/renderers/Table2/TableCell.js

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

package/lib/renderers/Table2/index.js

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

package/lib/renderers/TableView.js

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

package/lib/renderers/Tabs.js

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

package/lib/renderers/Tag.js

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

package/lib/renderers/Tasks.js

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

package/lib/renderers/Timeline.js

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

package/lib/renderers/TooltipWrapper.js

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

package/lib/renderers/Tpl.js

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

package/lib/renderers/VBox.js

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

package/lib/renderers/Video.js

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

package/lib/renderers/WebComponent.js

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

package/lib/renderers/Wizard.d.ts

@@ -146,8 +146,8 @@ export default class Wizard extends React.Component<WizardProps, WizardState> {
     formRef(ref: any): void;
     submitToTarget(target: string, values: object): void;
     reloadTarget(target: string, data: any): void;
-    reload(subPath?: string, query?: any, ctx?: any): void;
-    receive(values: object): void;
+    reload(subPath?: string, query?: any, ctx?: any, silent?: boolean, replace?: boolean): void;
+    receive(values: object, subPath?: string, replace?: boolean): void;
     domRef(ref: any): void;
     getPopOverContainer(): any;
     checkSubmit(): void;
@@ -175,5 +175,5 @@ export declare class WizardRenderer extends Wizard {
     submitToTarget(target: string, values: object): void;
     reloadTarget(target: string, data: any): void;
     handleDialogConfirm(values: object[], action: ActionObject, targets: Array<any>): void;
-    setData(values: object): void;
+    setData(values: object, replace?: boolean): void;
 }

package/lib/renderers/Wizard.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.0
+ * amis v2.3.1
  * Copyright 2018-2022 baidu
  */
 
@@ -203,10 +203,10 @@ var Wizard = /** @class */ (function (_super) {
     Wizard.prototype.reloadTarget = function (target, data) {
         throw new Error('Please implements this!');
     };
-    Wizard.prototype.reload = function (subPath, query, ctx) {
+    Wizard.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, initApi = _a.initApi, initAsyncApi = _a.initAsyncApi, initFinishedField = _a.initFinishedField, store = _a.store, _b = _a.messages, fetchSuccess = _b.fetchSuccess, fetchFailed = _b.fetchFailed;
         if (amisCore.isEffectiveApi(initApi, store.data) && this.state.currentStep === 1) {
@@ -245,9 +245,9 @@ var Wizard = /** @class */ (function (_super) {
             });
         }
     };
-    Wizard.prototype.receive = function (values) {
+    Wizard.prototype.receive = function (values, subPath, replace) {
         var store = this.props.store;
-        store.updateData(values);
+        store.updateData(values, undefined, replace);
         this.reload();
     };
     Wizard.prototype.domRef = function (ref) {
@@ -907,8 +907,8 @@ function isJumpable(step, index, currentStep, data) {
             scoped.reload(store.action.reload, store.data);
         }
     };
-    WizardRenderer.prototype.setData = function (values) {
-        return this.props.store.updateData(values);
+    WizardRenderer.prototype.setData = function (values, replace) {
+        return this.props.store.updateData(values, undefined, replace);
     };
     WizardRenderer.contextType = amisCore.ScopedContext;
     tslib.__decorate([

package/lib/renderers/Wrapper.js

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

package/lib/schemaExtend.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amis",
-  "version": "2.3.0",
+  "version": "2.3.1",
   "description": "一种MIS页面生成工具",
   "main": "lib/index.js",
   "module": "esm/index.js",
@@ -40,8 +40,8 @@
     ]
   },
   "dependencies": {
-    "amis-core": "^2.3.0",
-    "amis-ui": "^2.3.0",
+    "amis-core": "^2.3.1",
+    "amis-ui": "^2.3.1",
     "attr-accept": "2.2.2",
     "blueimp-canvastoblob": "2.1.0",
     "classnames": "2.3.1",
@@ -83,7 +83,7 @@
     "@rollup/plugin-typescript": "^8.3.4",
     "@svgr/rollup": "^6.2.1",
     "@testing-library/jest-dom": "^5.16.4",
-    "@testing-library/react": "^13.0.0",
+    "@testing-library/react": "^13.4.0",
     "@types/async": "^2.0.45",
     "@types/codemirror": "^5.60.3",
     "@types/echarts": "^4.9.2",
@@ -227,5 +227,5 @@
     "react": ">=16.8.6",
     "react-dom": ">=16.8.6"
   },
-  "gitHead": "b68c3c583c6744b1538a1a6865d3a33e51cddd5d"
+  "gitHead": "af69249562f9de5efbd47fd5553bcdb73b2eab4f"
 }