amis-core 3.4.0 → 3.4.2

package/lib/store/combo.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.0
+ * amis-core v3.4.2
  * Copyright 2018-2023 fex
  */
 

package/lib/store/crud.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.0
+ * amis-core v3.4.2
  * Copyright 2018-2023 fex
  */
 
@@ -93,17 +93,18 @@ var CRUDStore = service.ServiceStore.named('CRUDStore')
         if (perPageField === void 0) { perPageField = 'perPage'; }
         if (replace === void 0) { replace = false; }
         var originQuery = self.query;
-        self.query = replace
-            ? tslib.__assign({}, values) : tslib.__assign(tslib.__assign({}, self.query), values);
-        if (self.query[pageField || 'page']) {
-            self.page = parseInt(self.query[pageField || 'page'], 10);
-        }
-        if (self.query[perPageField || 'perPage']) {
-            self.perPage = parseInt(self.query[perPageField || 'perPage'], 10);
+        var query = replace
+            ? tslib.__assign({}, values) : tslib.__assign(tslib.__assign({}, originQuery), values);
+        if (helper.isObjectShallowModified(originQuery, query, false)) {
+            if (query[pageField || 'page']) {
+                self.page = parseInt(query[pageField || 'page'], 10);
+            }
+            if (query[perPageField || 'perPage']) {
+                self.perPage = parseInt(query[perPageField || 'perPage'], 10);
+            }
+            self.query = query;
+            updater && setTimeout(updater.bind(null, "?".concat(helper.qsstringify(query))), 4);
         }
-        updater &&
-            helper.isObjectShallowModified(originQuery, self.query, false) &&
-            setTimeout(updater.bind(null, "?".concat(helper.qsstringify(self.query))), 4);
     }
     var fetchInitData = mobxStateTree.flow(function getInitData(api$1, data, options) {
         var items_1, dir, data_1, ctx, json, result, total, count, page, hasNext, oItems, oRows, columns, rest, items, _a, _b, key, rowsData, data_2, filteredItems_1, dir, e_1, env;
@@ -178,12 +179,13 @@ var CRUDStore = service.ServiceStore.named('CRUDStore')
                     fetchCancel = null;
                     if (!json.ok) {
                         self.updateMessage((_j = (_h = (_g = (_f = api$1 === null || api$1 === void 0 ? void 0 : api$1.messages) === null || _f === void 0 ? void 0 : _f.failed) !== null && _g !== void 0 ? _g : json.msg) !== null && _h !== void 0 ? _h : options.errorMessage) !== null && _j !== void 0 ? _j : self.__('CRUD.fetchFailed'), true);
-                        mobxStateTree.getEnv(self).notify('error', json.msg, json.msgTimeout !== undefined
-                            ? {
-                                closeButton: true,
-                                timeout: json.msgTimeout
-                            }
-                            : undefined);
+                        !(api$1 === null || api$1 === void 0 ? void 0 : api$1.silent) &&
+                            mobxStateTree.getEnv(self).notify('error', json.msg, json.msgTimeout !== undefined
+                                ? {
+                                    closeButton: true,
+                                    timeout: json.msgTimeout
+                                }
+                                : undefined);
                     }
                     else {
                         if (!json.data) {
@@ -316,7 +318,7 @@ var CRUDStore = service.ServiceStore.named('CRUDStore')
                         return [2 /*return*/];
                     }
                     console.error(e_1);
-                    env.notify('error', e_1.message);
+                    !(api$1 === null || api$1 === void 0 ? void 0 : api$1.silent) && env.notify('error', e_1.message);
                     return [2 /*return*/];
                 case 3: return [2 /*return*/];
             }
@@ -354,12 +356,13 @@ var CRUDStore = service.ServiceStore.named('CRUDStore')
                     }
                     if (!json.ok) {
                         self.updateMessage((_d = (_c = (_b = (_a = api$1 === null || api$1 === void 0 ? void 0 : api$1.messages) === null || _a === void 0 ? void 0 : _a.failed) !== null && _b !== void 0 ? _b : json.msg) !== null && _c !== void 0 ? _c : options.errorMessage) !== null && _d !== void 0 ? _d : self.__('saveFailed'), true);
-                        mobxStateTree.getEnv(self).notify('error', self.msg, json.msgTimeout !== undefined
-                            ? {
-                                closeButton: true,
-                                timeout: json.msgTimeout
-                            }
-                            : undefined);
+                        !(api$1 === null || api$1 === void 0 ? void 0 : api$1.silent) &&
+                            mobxStateTree.getEnv(self).notify('error', self.msg, json.msgTimeout !== undefined
+                                ? {
+                                    closeButton: true,
+                                    timeout: json.msgTimeout
+                                }
+                                : undefined);
                         throw new ServerError(self.msg);
                     }
                     else {
@@ -379,7 +382,9 @@ var CRUDStore = service.ServiceStore.named('CRUDStore')
                     if (!mobxStateTree.isAlive(self) || self.disposed) {
                         return [2 /*return*/];
                     }
-                    e_3.type !== 'ServerError' && mobxStateTree.getEnv(self).notify('error', e_3.message);
+                    !(api$1 === null || api$1 === void 0 ? void 0 : api$1.silent) &&
+                        e_3.type !== 'ServerError' &&
+                        mobxStateTree.getEnv(self).notify('error', e_3.message);
                     throw e_3;
                 case 3: return [2 /*return*/];
             }
@@ -493,6 +498,7 @@ var CRUDStore = service.ServiceStore.named('CRUDStore')
         return object.createObject(superData, {
             total: self.total,
             page: self.page,
+            perPage: self.perPage,
             items: self.items.concat(),
             selectedItems: self.selectedItems.concat(),
             unSelectedItems: self.unSelectedItems.concat()