amis-core 3.1.1 → 3.3.0

package/lib/store/combo.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.1.1
+ * 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[];
@@ -123,9 +124,10 @@ export declare const CRUDStore: import("mobx-state-tree").IModelType<{
     setInnerModalOpened: (value: boolean) => void;
     initFromScope: (scope: any, source: string) => void;
     exportAsCSV: (options?: {
-        loadDataOnce?: boolean;
-        api?: Api;
+        loadDataOnce?: boolean | undefined;
+        api?: Api | undefined;
         data?: any;
+        filename?: string | undefined;
     }) => Promise<void>;
     updateColumns: (columns: Array<any>) => void;
     updateTotal: (total: number) => void;

package/lib/store/crud.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.1.1
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 
@@ -22,6 +22,7 @@ require('lodash/isPlainObject');
 require('../utils/filter.js');
 var api = require('../utils/api.js');
 var matchSorter = require('match-sorter');
+var tpl = require('../utils/tpl.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -62,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 }));
     },
@@ -192,9 +199,9 @@ var CRUDStore = service.ServiceStore.named('CRUDStore')
                         else {
                             items = result.items || result.rows;
                         }
-                        // 如果不按照 items 格式返回，就拿第一个数组当成 items
                         if (!Array.isArray(items)) {
                             try {
+                                // 如果不按照 items 格式返回，就拿第一个数组当成 items
                                 for (_a = tslib.__values(Object.keys(result)), _b = _a.next(); !_b.done; _b = _a.next()) {
                                     key = _b.value;
                                     if (result.hasOwnProperty(key) && Array.isArray(result[key])) {
@@ -211,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'));
                         }
@@ -413,11 +423,14 @@ var CRUDStore = service.ServiceStore.named('CRUDStore')
     var exportAsCSV = function (options) {
         if (options === void 0) { options = {}; }
         return tslib.__awaiter(void 0, void 0, void 0, function () {
-            var items, env, res;
+            var items, filename, env, res;
             return tslib.__generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         items = options.loadDataOnce ? self.data.itemsRaw : self.data.items;
+                        filename = options.filename
+                            ? tpl.filter(options.filename, options.data, '| raw')
+                            : 'data';
                         if (!options.api) return [3 /*break*/, 2];
                         env = mobxStateTree.getEnv(self);
                         return [4 /*yield*/, env.fetcher(options.api, options.data)];
@@ -468,7 +481,7 @@ var CRUDStore = service.ServiceStore.named('CRUDStore')
                                 [new Uint8Array([0xef, 0xbb, 0xbf]), csvText], {
                                     type: 'text/plain;charset=utf-8'
                                 });
-                                fileSaver.saveAs(blob, 'data.csv');
+                                fileSaver.saveAs(blob, "".concat(filename, ".csv"));
                             }
                         });
                         return [2 /*return*/];