amis-core 3.2.0 → 3.3.0

package/lib/store/combo.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.2.0
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 
@@ -131,7 +131,14 @@ var ComboStore = iRenderer.iRendererStore
                     }
                 });
                 self.forms.forEach(function (form) {
-                    return form.items.forEach(function (item) { return item.unique && item.syncOptions(undefined, form.data); });
+                    return form.items.forEach(function (item) {
+                        if (item.unique) {
+                            item.syncOptions(undefined, form.data);
+                            if (item.errors.length) {
+                                item.validate(item.tmpValue);
+                            }
+                        }
+                    });
                 });
             }
         }

package/lib/store/crud.d.ts

@@ -90,6 +90,7 @@ export declare const CRUDStore: import("mobx-state-tree").IModelType<{
 } & {
     readonly lastPage: number;
     readonly filterData: object;
+    readonly toolbarData: object;
     readonly mergedData: any;
     readonly hasModalOpened: boolean;
     readonly selectedItemsAsArray: any[];

package/lib/store/crud.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.2.0
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 
@@ -63,6 +63,12 @@ var CRUDStore = service.ServiceStore.named('CRUDStore')
     get filterData() {
         return object.createObject(self.data, tslib.__assign({}, self.query));
     },
+    get toolbarData() {
+        // 包两层，主要是为了处理以下 case
+        // 里面放了个 form，form 提交过来的时候不希望把 items 这些发送过来。
+        // 因为会把数据呈现在地址栏上。
+        return object.createObject(object.createObject(self.data, tslib.__assign(tslib.__assign({}, self.query), { items: self.items.concat(), selectedItems: self.selectedItems.concat(), unSelectedItems: self.unSelectedItems.concat() })), {});
+    },
     get mergedData() {
         return object.extendObject(self.data, tslib.__assign(tslib.__assign(tslib.__assign({}, self.query), self.data), { selectedItems: self.selectedItems, unSelectedItems: self.unSelectedItems }));
     },
@@ -193,10 +199,7 @@ var CRUDStore = service.ServiceStore.named('CRUDStore')
                         else {
                             items = result.items || result.rows;
                         }
-                        if (items == null) {
-                            items = [];
-                        }
-                        else if (!Array.isArray(items)) {
+                        if (!Array.isArray(items)) {
                             try {
                                 // 如果不按照 items 格式返回，就拿第一个数组当成 items
                                 for (_a = tslib.__values(Object.keys(result)), _b = _a.next(); !_b.done; _b = _a.next()) {
@@ -215,6 +218,9 @@ var CRUDStore = service.ServiceStore.named('CRUDStore')
                                 finally { if (e_2) throw e_2.error; }
                             }
                         }
+                        else if (items == null) {
+                            items = [];
+                        }
                         if (!Array.isArray(items)) {
                             throw new Error(self.__('CRUD.invalidArray'));
                         }