amis-core 3.5.3 → 3.6.0

package/lib/renderers/Item.d.ts

@@ -515,6 +515,9 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
             onChildStoreDispose(child: any): void;
             syncProps(props: any, prevProps: any, list?: string[]): void;
             dispose: (callback?: (() => void) | undefined) => void;
+            /**
+             * 配置当前表单项展示模式
+             */
             addChildId: (id: string) => void;
             removeChildId: (id: string) => void;
         } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
@@ -533,9 +536,15 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
             onChildStoreDispose(child: any): void;
             syncProps(props: any, prevProps: any, list?: string[]): void;
             dispose: (callback?: (() => void) | undefined) => void;
+            /**
+             * 配置当前表单项展示模式
+             */
             addChildId: (id: string) => void;
             removeChildId: (id: string) => void;
         }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>;
+        /**
+         * @deprecated 用 description 代替
+         */
         readonly stores: {
             [propName: string]: {
                 id: string;
@@ -553,6 +562,9 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
                 onChildStoreDispose(child: any): void;
                 syncProps(props: any, prevProps: any, list?: string[]): void;
                 dispose: (callback?: (() => void) | undefined) => void;
+                /**
+                 * 配置当前表单项展示模式
+                 */
                 addChildId: (id: string) => void;
                 removeChildId: (id: string) => void;
             } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
@@ -571,6 +583,9 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
                 onChildStoreDispose(child: any): void;
                 syncProps(props: any, prevProps: any, list?: string[]): void;
                 dispose: (callback?: (() => void) | undefined) => void;
+                /**
+                 * 配置当前表单项展示模式
+                 */
                 addChildId: (id: string) => void;
                 removeChildId: (id: string) => void;
             }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>;
@@ -598,6 +613,9 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
             onChildStoreDispose(child: any): void;
             syncProps(props: any, prevProps: any, list?: string[]): void;
             dispose: (callback?: (() => void) | undefined) => void;
+            /**
+             * 配置当前表单项展示模式
+             */
             addChildId: (id: string) => void;
             removeChildId: (id: string) => void;
         } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
@@ -616,6 +634,9 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
             onChildStoreDispose(child: any): void;
             syncProps(props: any, prevProps: any, list?: string[]): void;
             dispose: (callback?: (() => void) | undefined) => void;
+            /**
+             * 配置当前表单项展示模式
+             */
             addChildId: (id: string) => void;
             removeChildId: (id: string) => void;
         }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>;
@@ -635,6 +656,9 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
             onChildStoreDispose(child: any): void;
             syncProps(props: any, prevProps: any, list?: string[]): void;
             dispose: (callback?: (() => void) | undefined) => void;
+            /**
+             * 配置当前表单项展示模式
+             */
             addChildId: (id: string) => void;
             removeChildId: (id: string) => void;
         } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
@@ -653,6 +677,9 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
             onChildStoreDispose(child: any): void;
             syncProps(props: any, prevProps: any, list?: string[]): void;
             dispose: (callback?: (() => void) | undefined) => void;
+            /**
+             * 配置当前表单项展示模式
+             */
             addChildId: (id: string) => void;
             removeChildId: (id: string) => void;
         }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>): void;
@@ -679,6 +706,9 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
             onChildStoreDispose(child: any): void;
             syncProps(props: any, prevProps: any, list?: string[]): void;
             dispose: (callback?: (() => void) | undefined) => void;
+            /**
+             * 配置当前表单项展示模式
+             */
             addChildId: (id: string) => void;
             removeChildId: (id: string) => void;
         } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
@@ -697,9 +727,15 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
             onChildStoreDispose(child: any): void;
             syncProps(props: any, prevProps: any, list?: string[]): void;
             dispose: (callback?: (() => void) | undefined) => void;
+            /**
+             * 配置当前表单项展示模式
+             */
             addChildId: (id: string) => void;
             removeChildId: (id: string) => void;
         }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>;
+        /**
+         * @deprecated 用 description 代替
+         */
         readonly stores: {
             [propName: string]: {
                 id: string;
@@ -717,6 +753,9 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
                 onChildStoreDispose(child: any): void;
                 syncProps(props: any, prevProps: any, list?: string[]): void;
                 dispose: (callback?: (() => void) | undefined) => void;
+                /**
+                 * 配置当前表单项展示模式
+                 */
                 addChildId: (id: string) => void;
                 removeChildId: (id: string) => void;
             } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
@@ -735,6 +774,9 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
                 onChildStoreDispose(child: any): void;
                 syncProps(props: any, prevProps: any, list?: string[]): void;
                 dispose: (callback?: (() => void) | undefined) => void;
+                /**
+                 * 配置当前表单项展示模式
+                 */
                 addChildId: (id: string) => void;
                 removeChildId: (id: string) => void;
             }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>;
@@ -762,6 +804,9 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
             onChildStoreDispose(child: any): void;
             syncProps(props: any, prevProps: any, list?: string[]): void;
             dispose: (callback?: (() => void) | undefined) => void;
+            /**
+             * 配置当前表单项展示模式
+             */
             addChildId: (id: string) => void;
             removeChildId: (id: string) => void;
         } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
@@ -780,6 +825,9 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
             onChildStoreDispose(child: any): void;
             syncProps(props: any, prevProps: any, list?: string[]): void;
             dispose: (callback?: (() => void) | undefined) => void;
+            /**
+             * 配置当前表单项展示模式
+             */
             addChildId: (id: string) => void;
             removeChildId: (id: string) => void;
         }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>;
@@ -799,6 +847,9 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
             onChildStoreDispose(child: any): void;
             syncProps(props: any, prevProps: any, list?: string[]): void;
             dispose: (callback?: (() => void) | undefined) => void;
+            /**
+             * 配置当前表单项展示模式
+             */
             addChildId: (id: string) => void;
             removeChildId: (id: string) => void;
         } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
@@ -817,6 +868,9 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
             onChildStoreDispose(child: any): void;
             syncProps(props: any, prevProps: any, list?: string[]): void;
             dispose: (callback?: (() => void) | undefined) => void;
+            /**
+             * 配置当前表单项展示模式
+             */
             addChildId: (id: string) => void;
             removeChildId: (id: string) => void;
         }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>): void;

package/lib/renderers/Item.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.3
+ * amis-core v3.6.0
  * Copyright 2018-2023 fex
  */
 

package/lib/renderers/Options.d.ts

@@ -64,6 +64,10 @@ export interface FormOptionsControl extends FormBaseControl {
      * @default ''
      */
     resetValue?: string;
+    /**
+     * 懒加载字段
+     */
+    deferField?: string;
     /**
      * 延时加载的 API，当选项中有 defer: true 的选项时，点开会通过此接口扩充。
      */

package/lib/renderers/Options.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.3
+ * amis-core v3.6.0
  * Copyright 2018-2023 fex
  */
 
@@ -533,12 +533,12 @@ function registerOptionsControl(config) {
             if (idx === void 0) { idx = -1; }
             if (skipForm === void 0) { skipForm = false; }
             return tslib.__awaiter(this, void 0, void 0, function () {
-                var _c, addControls, addDialog, disabled, labelField, onOpenDialog, optionLabel, addApi, source, data, valueField, model, createBtnLabel, env, __, parent, ctx, result, _d, payload, e_1, isPrevented, options;
+                var _c, addControls, addDialog, disabled, labelField, onOpenDialog, optionLabel, addApi, source, data, valueField, deferField, model, createBtnLabel, env, __, parent, ctx, result, _d, payload, e_1, isPrevented, options;
                 var _e;
                 return tslib.__generator(this, function (_f) {
                     switch (_f.label) {
                         case 0:
-                            _c = this.props, addControls = _c.addControls, addDialog = _c.addDialog, disabled = _c.disabled, labelField = _c.labelField, onOpenDialog = _c.onOpenDialog, optionLabel = _c.optionLabel, addApi = _c.addApi, source = _c.source, data = _c.data, valueField = _c.valueField, model = _c.formItem, createBtnLabel = _c.createBtnLabel, env = _c.env, __ = _c.translate;
+                            _c = this.props, addControls = _c.addControls, addDialog = _c.addDialog, disabled = _c.disabled, labelField = _c.labelField, onOpenDialog = _c.onOpenDialog, optionLabel = _c.optionLabel, addApi = _c.addApi, source = _c.source, data = _c.data, valueField = _c.valueField, deferField = _c.deferField, model = _c.formItem, createBtnLabel = _c.createBtnLabel, env = _c.env, __ = _c.translate;
                             // 禁用或者没有配置 name
                             if (disabled || !model) {
                                 return [2 /*return*/];
@@ -623,7 +623,8 @@ function registerOptionsControl(config) {
                             if (isPrevented) {
                                 return [2 /*return*/];
                             }
-                            if (!(parent === null || parent === void 0 ? void 0 : parent.defer)) return [3 /*break*/, 10];
+                            if (!(((parent === null || parent === void 0 ? void 0 : parent.hasOwnProperty(deferField)) && parent[deferField]) ||
+                                (parent === null || parent === void 0 ? void 0 : parent.defer))) return [3 /*break*/, 10];
                             return [4 /*yield*/, this.deferLoad(parent)];
                         case 9:
                             _f.sent();

package/lib/renderers/Placeholder.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.3
+ * amis-core v3.6.0
  * Copyright 2018-2023 fex
  */
 

package/lib/renderers/builtin.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.3
+ * amis-core v3.6.0
  * Copyright 2018-2023 fex
  */
 

package/lib/renderers/register.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.3
+ * amis-core v3.6.0
  * Copyright 2018-2023 fex
  */
 

package/lib/renderers/wrapControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.3
+ * amis-core v3.6.0
  * Copyright 2018-2023 fex
  */
 
@@ -567,9 +567,7 @@ function wrapControl(ComposedComponent) {
                     formItem: this.model,
                     formMode: control.mode || formMode,
                     ref: this.controlRef,
-                    data: model
-                        ? model.getMergedData(data || (store === null || store === void 0 ? void 0 : store.data))
-                        : data || (store === null || store === void 0 ? void 0 : store.data),
+                    data: data || (store === null || store === void 0 ? void 0 : store.data),
                     name: (_c = model === null || model === void 0 ? void 0 : model.name) !== null && _c !== void 0 ? _c : control.name,
                     value: value,
                     changeMotivation: model === null || model === void 0 ? void 0 : model.changeMotivation,
@@ -582,8 +580,8 @@ function wrapControl(ComposedComponent) {
                     prinstine: model ? model.prinstine : undefined,
                     setPrinstineValue: this.setPrinstineValue,
                     onValidate: this.validate,
-                    onFlushChange: this.flushChange,
-                    render: this.renderChild // 如果覆盖，那么用的就是 form 上的 render，这个里面用到的 data 是比较旧的。
+                    onFlushChange: this.flushChange
+                    // render: this.renderChild // 如果覆盖，那么用的就是 form 上的 render，这个里面用到的 data 是比较旧的。
                     // !没了这个， tree 里的 options 渲染会出问题
                     // todo 理论上不应该影响，待确认
                     // _filteredOptions: this.model?.filteredOptions

package/lib/store/app.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.3
+ * amis-core v3.6.0
  * Copyright 2018-2023 fex
  */
 

package/lib/store/combo.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.3
+ * amis-core v3.6.0
  * Copyright 2018-2023 fex
  */
 

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.3
+ * amis-core v3.6.0
  * Copyright 2018-2023 fex
  */
 
@@ -148,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 {
@@ -274,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) {
@@ -359,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;
@@ -461,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 {
@@ -477,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],
@@ -512,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*/];
                         }
@@ -534,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;

package/lib/store/form.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.3
+ * amis-core v3.6.0
  * Copyright 2018-2023 fex
  */
 

package/lib/store/formItem.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.3
+ * amis-core v3.6.0
  * Copyright 2018-2023 fex
  */
 
@@ -340,7 +340,7 @@ var FormItemStore = node.StoreNode.named('FormItemStore')
     }
     var validateCancel = null;
     var validate = mobxStateTree.flow(function validate(data, hook, customRules) {
-        var json, combo, group;
+        var json, err_1, combo, group;
         var _a;
         var _b, _c, _d, _e, _f;
         return tslib.__generator(this, function (_g) {
@@ -358,24 +358,33 @@ var FormItemStore = node.StoreNode.named('FormItemStore')
                     _g.label = 2;
                 case 2:
                     addError(validations.validate(self.tmpValue, data, customRules ? validations.str2rules(customRules) : self.rules, self.messages, self.__));
-                    if (!(!self.errors.length && api.isEffectiveApi(self.validateApi, data))) return [3 /*break*/, 4];
+                    if (!(!self.errors.length && api.isEffectiveApi(self.validateApi, data))) return [3 /*break*/, 6];
                     if (validateCancel) {
                         validateCancel();
                         validateCancel = null;
                     }
+                    _g.label = 3;
+                case 3:
+                    _g.trys.push([3, 5, , 6]);
                     return [4 /*yield*/, mobxStateTree.getEnv(self).fetcher(self.validateApi, 
                         /** 如果配置validateApi，需要将用户最新输入同步到数据域内 */
                         object.createObject(data, (_a = {}, _a[self.name] = self.tmpValue, _a)), {
-                            cancelExecutor: function (executor) { return (validateCancel = executor); }
+                            cancelExecutor: function (executor) {
+                                return (validateCancel = executor);
+                            }
                         })];
-                case 3:
+                case 4:
                     json = _g.sent();
                     validateCancel = null;
                     if (!json.ok && json.status === 422 && json.errors) {
                         addError(String((_d = (_c = (_b = self.validateApi) === null || _b === void 0 ? void 0 : _b.messages) === null || _c === void 0 ? void 0 : _c.failed) !== null && _d !== void 0 ? _d : (json.errors || json.msg || "\u8868\u5355\u9879\u300C".concat(self.name, "\u300D\u6821\u9A8C\u5931\u8D25"))));
                     }
-                    _g.label = 4;
-                case 4:
+                    return [3 /*break*/, 6];
+                case 5:
+                    err_1 = _g.sent();
+                    addError(String(err_1));
+                    return [3 /*break*/, 6];
+                case 6:
                     self.validated = true;
                     if (self.unique && ((_f = (_e = self.form) === null || _e === void 0 ? void 0 : _e.parentStore) === null || _f === void 0 ? void 0 : _f.storeType) === 'ComboStore') {
                         combo = self.form.parentStore;

package/lib/store/iRenderer.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.3
+ * amis-core v3.6.0
  * Copyright 2018-2023 fex
  */
 

package/lib/store/index.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.3
+ * amis-core v3.6.0
  * Copyright 2018-2023 fex
  */
 

package/lib/store/list.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.3
+ * amis-core v3.6.0
  * Copyright 2018-2023 fex
  */
 

package/lib/store/manager.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.3
+ * amis-core v3.6.0
  * Copyright 2018-2023 fex
  */
 

package/lib/store/modal.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.3
+ * amis-core v3.6.0
  * Copyright 2018-2023 fex
  */
 

package/lib/store/node.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.3
+ * amis-core v3.6.0
  * Copyright 2018-2023 fex
  */
 

package/lib/store/pagination.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.3
+ * amis-core v3.6.0
  * Copyright 2018-2023 fex
  */
 

package/lib/store/root.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.3
+ * amis-core v3.6.0
  * Copyright 2018-2023 fex
  */
 

package/lib/store/service.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.3
+ * amis-core v3.6.0
  * Copyright 2018-2023 fex
  */
 

package/lib/store/status.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.3
+ * amis-core v3.6.0
  * Copyright 2018-2023 fex
  */
 

package/lib/store/table.d.ts

@@ -304,6 +304,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
     searchFormExpanded: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
     lazyRenderAfter: import("mobx-state-tree").IType<number | undefined, number, number>;
     tableLayout: import("mobx-state-tree").IType<string | undefined, string, string>;
+    theadHeight: import("mobx-state-tree").IType<number | undefined, number, number>;
 }, {
     readonly parentStore: any;
     readonly __: any;

package/lib/store/table.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.3
+ * amis-core v3.6.0
  * Copyright 2018-2023 fex
  */
 
@@ -402,7 +402,8 @@ var TableStore = iRenderer.iRendererStore
     exportExcelLoading: false,
     searchFormExpanded: false,
     lazyRenderAfter: 100,
-    tableLayout: 'auto'
+    tableLayout: 'auto',
+    theadHeight: 0
 })
     .views(function (self) {
     function getColumnsExceptBuiltinTypes() {
@@ -755,7 +756,7 @@ var TableStore = iRenderer.iRendererStore
             return self.rows.concat();
         },
         buildStyles: function (style) {
-            style = tslib.__assign({}, style);
+            style = tslib.__assign(tslib.__assign({}, style), { '--Table-thead-height': self.theadHeight + 'px' });
             getFilteredColumns().forEach(function (column) {
                 style["--Table-column-".concat(column.index, "-width")] =
                     column.realWidth + 'px';
@@ -788,14 +789,7 @@ var TableStore = iRenderer.iRendererStore
                     : 'asc'
                 : self.orderDir);
         }
-        if (config.multiple !== undefined) {
-            self.multiple = config.multiple;
-        }
-        else {
-            // 如果通过crud或picker，multiple始终设置了true或false
-            // 如果仅使用table，默认multiple为true，但props未设置multiple的情况下其实是展示单选
-            self.multiple = false;
-        }
+        config.multiple !== undefined && (self.multiple = config.multiple);
         config.footable !== undefined && (self.footable = config.footable);
         config.expandConfig !== undefined &&
             (self.expandConfig = config.expandConfig);
@@ -960,7 +954,9 @@ var TableStore = iRenderer.iRendererStore
         if (!table) {
             return;
         }
-        var cols = [].slice.call(table.querySelectorAll(':scope>thead>tr>th[data-index]'));
+        var thead = table.querySelector(':scope>thead');
+        var cols = [].slice.call(thead.querySelectorAll('tr>th[data-index]'));
+        self.theadHeight = thead.offsetHeight;
         cols.forEach(function (col) {
             var index = parseInt(col.getAttribute('data-index'), 10);
             var column = self.columns[index];

package/lib/store/table2.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.3
+ * amis-core v3.6.0
  * Copyright 2018-2023 fex
  */