amis-core 3.5.2 → 3.5.3

package/lib/store/combo.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.2
+ * amis-core v3.5.3
  * Copyright 2018-2023 fex
  */
 
@@ -7,6 +7,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var tslib = require('tslib');
 var mobxStateTree = require('mobx-state-tree');
 var iRenderer = require('./iRenderer.js');
 var manager = require('./manager.js');
@@ -39,7 +40,8 @@ var ComboStore = iRenderer.iRendererStore
     minLength: 0,
     maxLength: 0,
     length: 0,
-    activeKey: 0
+    activeKey: 0,
+    memberValidMap: mobxStateTree.types.optional(mobxStateTree.types.frozen(), {})
 })
     .views(function (self) {
     function getForms() {
@@ -148,13 +150,18 @@ var ComboStore = iRenderer.iRendererStore
     function setActiveKey(key) {
         self.activeKey = key;
     }
+    function setMemberValid(valid, index) {
+        var _a;
+        self.memberValidMap = tslib.__assign(tslib.__assign({}, self.memberValidMap), (_a = {}, _a[index] = valid, _a));
+    }
     return {
         config: config,
         setActiveKey: setActiveKey,
         bindUniuqueItem: bindUniuqueItem,
         unBindUniuqueItem: unBindUniuqueItem,
         addForm: addForm,
-        onChildStoreDispose: onChildStoreDispose
+        onChildStoreDispose: onChildStoreDispose,
+        setMemberValid: setMemberValid
     };
 });
 

package/lib/store/crud.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.2
+ * amis-core v3.5.3
  * Copyright 2018-2023 fex
  */
 
@@ -99,7 +99,24 @@ var CRUDStore = service.ServiceStore.named('CRUDStore')
         var originQuery = self.query;
         var query = replace
             ? tslib.__assign({}, values) : tslib.__assign(tslib.__assign({}, originQuery), values);
-        if (helper.isObjectShallowModified(originQuery, query, false)) {
+        /**
+         * 非严格模式下也需要严格比较的CASE
+         * @reference https://tc39.es/ecma262/#sec-islooselyequal
+         */
+        var exceptedLooselyRules = [
+            [0, ''],
+            [false, ''],
+            [false, '0'],
+            [false, 0],
+            [true, 1],
+            [true, '1']
+        ];
+        if (helper.isObjectShallowModified(originQuery, query, function (lhs, rhs) {
+            if (exceptedLooselyRules.some(function (rule) { return rule.includes(lhs) && rule.includes(rhs); })) {
+                return lhs !== rhs;
+            }
+            return lhs != rhs;
+        })) {
             if (query[pageField || 'page']) {
                 self.page = parseInt(query[pageField || 'page'], 10);
             }
@@ -485,7 +502,9 @@ var CRUDStore = service.ServiceStore.named('CRUDStore')
             var dir = /desc/i.test(self.query.orderDir) ? -1 : 1;
             items = helper.sortArray(items, self.query.orderBy, dir);
         }
-        var data = tslib.__assign(tslib.__assign({}, self.pristine), { items: items.slice((self.page - 1) * self.perPage, self.page * self.perPage), count: items.length, total: items.length });
+        var data = tslib.__assign(tslib.__assign({}, self.pristine), { items: items.length > self.perPage
+                ? items.slice((self.page - 1) * self.perPage, self.page * self.perPage)
+                : items, count: items.length, total: items.length });
         self.total = parseInt((_a = data.total) !== null && _a !== void 0 ? _a : data.count, 10) || 0;
         self.items.replace(items);
         self.reInitData(data);