amis-core 3.4.2 → 3.5.0

package/lib/store/combo.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.2
+ * amis-core v3.5.0
  * Copyright 2018-2023 fex
  */
 
@@ -10,6 +10,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var mobxStateTree = require('mobx-state-tree');
 var iRenderer = require('./iRenderer.js');
 var manager = require('./manager.js');
+var helper = require('../utils/helper.js');
 
 var UniqueGroup = mobxStateTree.types
     .model('UniqueGroup', {
@@ -58,7 +59,7 @@ var ComboStore = iRenderer.iRendererStore
                     if (isFull_1 || !item.items.length) {
                         return;
                     }
-                    var total = item.items[0].options.length;
+                    var total = helper.countTree(item.items[0].options, function (item) { return typeof item.value !== 'undefined'; });
                     var current = item.items.reduce(function (total, item) {
                         return total + item.selectedOptions.length;
                     }, 0);

package/lib/store/crud.d.ts

@@ -1,5 +1,13 @@
 import { Instance } from 'mobx-state-tree';
 import { Api, fetchOptions, ActionObject } from '../types';
+interface MatchFunc {
+    (items: any, itemsRaw: any, 
+    /** 相关配置 */
+    options?: {
+        query: Record<string, any>;
+        columns: any;
+    }): any;
+}
 export declare const CRUDStore: import("mobx-state-tree").IModelType<{
     id: import("mobx-state-tree").ISimpleType<string>;
     path: import("mobx-state-tree").IType<string | undefined, string, string>;
@@ -106,7 +114,6 @@ export declare const CRUDStore: import("mobx-state-tree").IModelType<{
     fetchInitData: (api: Api, data?: object, options?: fetchOptions & {
         forceReload?: boolean;
         loadDataOnce?: boolean;
-        loadDataOnceFetchOnFilter?: boolean;
         source?: string;
         loadDataMode?: boolean;
         syncResponse2Query?: boolean;
@@ -122,7 +129,10 @@ export declare const CRUDStore: import("mobx-state-tree").IModelType<{
     setSelectedItems: (items: Array<any>) => void;
     setUnSelectedItems: (items: Array<any>) => void;
     setInnerModalOpened: (value: boolean) => void;
-    initFromScope: (scope: any, source: string) => void;
+    initFromScope: (scope: any, source: string, options: {
+        columns?: any[] | undefined;
+        matchFunc?: MatchFunc | null | undefined;
+    }) => void;
     exportAsCSV: (options?: {
         loadDataOnce?: boolean | undefined;
         api?: Api | undefined;
@@ -133,3 +143,4 @@ export declare const CRUDStore: import("mobx-state-tree").IModelType<{
     updateTotal: (total: number) => void;
 }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>;
 export type ICRUDStore = Instance<typeof CRUDStore>;
+export {};

package/lib/store/crud.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.2
+ * amis-core v3.5.0
  * Copyright 2018-2023 fex
  */
 
@@ -67,7 +67,11 @@ var CRUDStore = service.ServiceStore.named('CRUDStore')
         // 包两层，主要是为了处理以下 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() })), {});
+        return object.createObject(object.createObject(self.data, {
+            items: self.items.concat(),
+            selectedItems: self.selectedItems.concat(),
+            unSelectedItems: self.unSelectedItems.concat()
+        }), tslib.__assign({}, self.query));
     },
     get mergedData() {
         return object.extendObject(self.data, tslib.__assign(tslib.__assign(tslib.__assign({}, self.query), self.data), { selectedItems: self.selectedItems, unSelectedItems: self.unSelectedItems }));
@@ -107,7 +111,7 @@ var CRUDStore = service.ServiceStore.named('CRUDStore')
         }
     }
     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;
+        var matchFunc, 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;
         var _c, e_2, _d;
         var _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
         if (options === void 0) { options = {}; }
@@ -116,27 +120,37 @@ var CRUDStore = service.ServiceStore.named('CRUDStore')
                 case 0:
                     _q.trys.push([0, 2, , 3]);
                     if (!options.forceReload && options.loadDataOnce && self.total) {
+                        matchFunc = options.matchFunc;
                         items_1 = options.source
                             ? resolveVariableAndFilter.resolveVariableAndFilter(options.source, object.createObject(self.mergedData, {
                                 items: self.data.itemsRaw,
                                 rows: self.data.itemsRaw
                             }), '| raw')
                             : self.items.concat();
-                        if (Array.isArray(options.columns)) {
-                            options.columns.forEach(function (column) {
-                                var value;
-                                var key = column.name;
-                                if ((column.searchable || column.filterable) && key) {
-                                    // value可能为null、undefined、''、0
-                                    value = getVariable.getVariable(self.query, key);
-                                    if (value != null) {
+                        /** 字段的格式类型无法穷举，所以支持使用函数过滤 */
+                        if (matchFunc && typeof matchFunc === 'function') {
+                            items_1 = matchFunc(items_1, self.data.itemsRaw, {
+                                query: self.query,
+                                columns: options.columns
+                            });
+                        }
+                        else {
+                            if (Array.isArray(options.columns)) {
+                                options.columns.forEach(function (column) {
+                                    var value = typeof column.name === 'string'
+                                        ? getVariable.getVariable(self.query, column.name)
+                                        : undefined;
+                                    var key = column.name;
+                                    if (value != null && key) {
+                                        // value可能为null、undefined、''、0
                                         if (Array.isArray(value)) {
                                             if (value.length > 0) {
                                                 var arr_1 = tslib.__spreadArray([], tslib.__read(items_1), false);
                                                 var arrItems_1 = [];
                                                 value.forEach(function (item) {
                                                     arrItems_1 = tslib.__spreadArray(tslib.__spreadArray([], tslib.__read(arrItems_1), false), tslib.__read(matchSorter.matchSorter(arr_1, item, {
-                                                        keys: [key]
+                                                        keys: [key],
+                                                        threshold: matchSorter.matchSorter.rankings.CONTAINS
                                                     })), false);
                                                 });
                                                 items_1 = items_1.filter(function (item) {
@@ -146,12 +160,13 @@ var CRUDStore = service.ServiceStore.named('CRUDStore')
                                         }
                                         else {
                                             items_1 = matchSorter.matchSorter(items_1, value, {
-                                                keys: [key]
+                                                keys: [key],
+                                                threshold: matchSorter.matchSorter.rankings.CONTAINS
                                             });
                                         }
                                     }
-                                }
-                            });
+                                });
+                            }
                         }
                         if (self.query.orderBy) {
                             dir = /desc/i.test(self.query.orderDir) ? -1 : 1;
@@ -258,7 +273,8 @@ var CRUDStore = service.ServiceStore.named('CRUDStore')
                                                 var arrItems_2 = [];
                                                 value.forEach(function (item) {
                                                     arrItems_2 = tslib.__spreadArray(tslib.__spreadArray([], tslib.__read(arrItems_2), false), tslib.__read(matchSorter.matchSorter(arr_2, item, {
-                                                        keys: [key]
+                                                        keys: [key],
+                                                        threshold: matchSorter.matchSorter.rankings.CONTAINS
                                                     })), false);
                                                 });
                                                 filteredItems_1 = filteredItems_1.filter(function (item) {
@@ -268,7 +284,8 @@ var CRUDStore = service.ServiceStore.named('CRUDStore')
                                         }
                                         else {
                                             filteredItems_1 = matchSorter.matchSorter(filteredItems_1, value, {
-                                                keys: [key]
+                                                keys: [key],
+                                                threshold: matchSorter.matchSorter.rankings.CONTAINS
                                             });
                                         }
                                     }
@@ -415,14 +432,62 @@ var CRUDStore = service.ServiceStore.named('CRUDStore')
     var setInnerModalOpened = function (value) {
         self.hasInnerModalOpen = value;
     };
-    var initFromScope = function (scope, source) {
-        var rowsData = resolveVariableAndFilter.resolveVariableAndFilter(source, scope, '| raw');
-        if (!Array.isArray(rowsData) && !self.items.length) {
+    var initFromScope = function (scope, source, options) {
+        var _a;
+        var matchFunc = options.matchFunc;
+        var items = resolveVariableAndFilter.resolveVariableAndFilter(source, scope, '| raw');
+        if (!Array.isArray(items) && !self.items.length) {
             return;
         }
-        rowsData = Array.isArray(rowsData) ? rowsData : [];
-        var data = tslib.__assign(tslib.__assign({}, self.pristine), { items: rowsData, count: 0, total: rowsData.length });
-        self.items.replace(rowsData);
+        items = Array.isArray(items) ? items : [];
+        /** 字段的格式类型无法穷举，所以支持使用函数过滤 */
+        if (matchFunc && typeof matchFunc === 'function') {
+            items = matchFunc(items, items.concat(), {
+                query: self.query,
+                columns: options.columns
+            });
+        }
+        else {
+            if (Array.isArray(options.columns)) {
+                options.columns.forEach(function (column) {
+                    var value = typeof column.name === 'string'
+                        ? getVariable.getVariable(self.query, column.name)
+                        : undefined;
+                    var key = column.name;
+                    if (value != null && key) {
+                        // value可能为null、undefined、''、0
+                        if (Array.isArray(value)) {
+                            if (value.length > 0) {
+                                var arr_3 = tslib.__spreadArray([], tslib.__read(items), false);
+                                var arrItems_3 = [];
+                                value.forEach(function (item) {
+                                    arrItems_3 = tslib.__spreadArray(tslib.__spreadArray([], tslib.__read(arrItems_3), false), tslib.__read(matchSorter.matchSorter(arr_3, item, {
+                                        keys: [key],
+                                        threshold: matchSorter.matchSorter.rankings.CONTAINS
+                                    })), false);
+                                });
+                                items = items.filter(function (item) {
+                                    return arrItems_3.find(function (a) { return a === item; });
+                                });
+                            }
+                        }
+                        else {
+                            items = matchSorter.matchSorter(items, value, {
+                                keys: [key],
+                                threshold: matchSorter.matchSorter.rankings.CONTAINS
+                            });
+                        }
+                    }
+                });
+            }
+        }
+        if (self.query.orderBy) {
+            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 });
+        self.total = parseInt((_a = data.total) !== null && _a !== void 0 ? _a : data.count, 10) || 0;
+        self.items.replace(items);
         self.reInitData(data);
     };
     var exportAsCSV = function (options) {