amis-core 3.5.2 → 3.6.0

package/lib/store/combo.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.2
+ * amis-core v3.6.0
  * 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.d.ts

@@ -1,11 +1,17 @@
 import { Instance } from 'mobx-state-tree';
 import { Api, fetchOptions, ActionObject } from '../types';
+import type { MatchSorterOptions } from 'match-sorter';
 interface MatchFunc {
     (items: any, itemsRaw: any, 
     /** 相关配置 */
     options?: {
         query: Record<string, any>;
         columns: any;
+        /**
+         * match-sorter 匹配函数
+         * @doc https://github.com/kentcdodds/match-sorter
+         */
+        matchSorter: (items: any[], value: string, options?: MatchSorterOptions<any>) => any[];
     }): any;
 }
 export declare const CRUDStore: import("mobx-state-tree").IModelType<{
@@ -120,7 +126,7 @@ export declare const CRUDStore: import("mobx-state-tree").IModelType<{
         columns?: Array<any>;
         isTable2?: Boolean;
     }) => Promise<any>;
-    changePage: (page: number, perPage?: number | string) => void;
+    changePage: (page: number | string, perPage?: number | string) => void;
     changePerPage: (perPage: number | string) => void;
     selectAction: (action: ActionObject) => void;
     saveRemote: (api: Api, data?: object, options?: fetchOptions) => Promise<any>;
@@ -138,6 +144,8 @@ export declare const CRUDStore: import("mobx-state-tree").IModelType<{
         api?: Api | undefined;
         data?: any;
         filename?: string | undefined;
+        pageField?: string | undefined;
+        perPageField?: 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.5.2
+ * amis-core v3.6.0
  * 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);
             }
@@ -131,7 +148,8 @@ var CRUDStore = service.ServiceStore.named('CRUDStore')
                         if (matchFunc && typeof matchFunc === 'function') {
                             items_1 = matchFunc(items_1, self.data.itemsRaw, {
                                 query: self.query,
-                                columns: options.columns
+                                columns: options.columns,
+                                matchSorter: matchSorter.matchSorter
                             });
                         }
                         else {
@@ -257,8 +275,11 @@ var CRUDStore = service.ServiceStore.named('CRUDStore')
                         }
                         data_2 = tslib.__assign(tslib.__assign(tslib.__assign({}, (api$1.replaceData ? {} : self.pristine)), { items: rowsData, count: count, total: total }), rest);
                         if (options.loadDataOnce) {
-                            // 记录原始集合，后续可能基于原始数据做排序查找。
-                            data_2.itemsRaw = oItems || oRows;
+                            /**
+                             * 1. 记录原始集合，后续可能基于原始数据做排序查找。
+                             * 2. 接口返回中没有 items 和 rows 字段，则直接用查到的数据。
+                             */
+                            data_2.itemsRaw = oItems || oRows || rowsData.concat();
                             filteredItems_1 = rowsData.concat();
                             if (Array.isArray(options.columns)) {
                                 options.columns.forEach(function (column) {
@@ -342,11 +363,13 @@ var CRUDStore = service.ServiceStore.named('CRUDStore')
         });
     });
     function changePage(page, perPage) {
-        self.page = page;
+        var pageNum = typeof page !== 'number' ? parseInt(page, 10) : page;
+        self.page = isNaN(pageNum) ? 1 : pageNum;
         perPage && changePerPage(perPage);
     }
     function changePerPage(perPage) {
-        self.perPage = parseInt(perPage, 10);
+        var perPageNum = typeof perPage !== 'number' ? parseInt(perPage, 10) : perPage;
+        self.perPage = isNaN(perPageNum) ? 10 : perPageNum;
     }
     function selectAction(action) {
         self.selectedAction = action;
@@ -444,7 +467,8 @@ var CRUDStore = service.ServiceStore.named('CRUDStore')
         if (matchFunc && typeof matchFunc === 'function') {
             items = matchFunc(items, items.concat(), {
                 query: self.query,
-                columns: options.columns
+                columns: options.columns,
+                matchSorter: matchSorter.matchSorter
             });
         }
         else {
@@ -460,6 +484,7 @@ var CRUDStore = service.ServiceStore.named('CRUDStore')
                             if (value.length > 0) {
                                 var arr_3 = tslib.__spreadArray([], tslib.__read(items), false);
                                 var arrItems_3 = [];
+                                /** 搜索 query 值为数组的情况 */
                                 value.forEach(function (item) {
                                     arrItems_3 = tslib.__spreadArray(tslib.__spreadArray([], tslib.__read(arrItems_3), false), tslib.__read(matchSorter.matchSorter(arr_3, item, {
                                         keys: [key],
@@ -485,7 +510,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);
@@ -493,19 +520,27 @@ 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, filename, env, res;
-            return tslib.__generator(this, function (_a) {
-                switch (_a.label) {
+            var items, filename, pageField, perPageField, env, ctx, res;
+            var _a;
+            return tslib.__generator(this, function (_b) {
+                switch (_b.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];
+                        pageField = options.pageField || 'page';
+                        perPageField = options.perPageField || 'perPage';
                         env = mobxStateTree.getEnv(self);
-                        return [4 /*yield*/, env.fetcher(options.api, options.data)];
+                        ctx = object.createObject(self.data, tslib.__assign(tslib.__assign(tslib.__assign({}, self.query), options.data), (_a = {}, _a[pageField] = self.page || 1, _a[perPageField] = self.perPage || 10, _a)));
+                        return [4 /*yield*/, env.fetcher(options.api, ctx, {
+                                autoAppend: true,
+                                pageField: pageField,
+                                perPageField: perPageField
+                            })];
                     case 1:
-                        res = _a.sent();
+                        res = _b.sent();
                         if (!res.data) {
                             return [2 /*return*/];
                         }
@@ -515,7 +550,7 @@ var CRUDStore = service.ServiceStore.named('CRUDStore')
                         else {
                             items = res.data.rows || res.data.items;
                         }
-                        _a.label = 2;
+                        _b.label = 2;
                     case 2:
                         Promise.resolve().then(function() {return new Promise(function(fullfill) {require(['papaparse'], function(mod) {fullfill(tslib.__importStar(mod))})})}).then(function (papaparse) {
                             var e_4, _a;