amis-core 2.0.2 → 2.2.0

package/lib/store/table.d.ts

@@ -186,7 +186,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
     expandedRows: import("mobx-state-tree").IArrayType<import("mobx-state-tree").ISimpleType<string>>;
     primaryField: import("mobx-state-tree").IType<string | undefined, string, string>;
     orderBy: import("mobx-state-tree").IType<string | undefined, string, string>;
-    orderDir: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").ITypeUnion<"desc" | "asc", "desc" | "asc", "desc" | "asc">, [undefined]>;
+    orderDir: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").ITypeUnion<"" | "desc" | "asc", "" | "desc" | "asc", "" | "desc" | "asc">, [undefined]>;
     draggable: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
     dragging: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
     selectable: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
@@ -203,6 +203,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
     formsRef: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IArrayType<import("mobx-state-tree").IType<any, any, any>>, [undefined]>;
     maxKeepItemSelectionLength: import("mobx-state-tree").IType<number | undefined, number, number>;
     keepItemSelectionOnPageChange: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
+    searchFormExpanded: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
 }, {
     readonly parentStore: any;
     readonly __: any;
@@ -353,7 +354,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
             clearMessage: () => void;
             setHasRemoteData: () => void;
             saveRemote: (api: import("..").Api, data?: object | undefined, options?: import("..").fetchOptions | undefined) => Promise<any>;
-            fetchSchema: (api: import("..").Api, data?: object | undefined, options?: import("..").fetchOptions | undefined) => Promise<any>;
+            fetchSchema: (api: import("..").Api, data?: object | undefined, options?: import("..").fetchOptions | undefined) => Promise<any>; /** Group单元格包含的首列的索引值，范围[1, columns.length] */
             checkRemote: (api: import("..").Api, data?: object | undefined, options?: import("..").fetchOptions | undefined) => Promise<any>;
         } & {
             readonly loading: boolean;
@@ -480,6 +481,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
                 setSubStore: (store: any) => void;
                 getSubStore: () => any;
                 reset: (keepErrors?: boolean) => void;
+                resetValidationStatus: (tag?: string | undefined) => void;
                 openDialog: (schema: any, data: any, callback?: ((ret?: any) => void) | undefined) => void;
                 closeDialog: (result?: any) => void;
                 changeTmpValue: (value: any) => void;
@@ -889,6 +891,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
                 setSubStore: (store: any) => void;
                 getSubStore: () => any;
                 reset: (keepErrors?: boolean) => void;
+                resetValidationStatus: (tag?: string | undefined) => void;
                 openDialog: (schema: any, data: any, callback?: ((ret?: any) => void) | undefined) => void;
                 closeDialog: (result?: any) => void;
                 changeTmpValue: (value: any) => void;
@@ -1302,6 +1305,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
                 setSubStore: (store: any) => void;
                 getSubStore: () => any;
                 reset: (keepErrors?: boolean) => void;
+                resetValidationStatus: (tag?: string | undefined) => void;
                 openDialog: (schema: any, data: any, callback?: ((ret?: any) => void) | undefined) => void;
                 closeDialog: (result?: any) => void;
                 changeTmpValue: (value: any) => void;
@@ -1711,6 +1715,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
                 setSubStore: (store: any) => void;
                 getSubStore: () => any;
                 reset: (keepErrors?: boolean) => void;
+                resetValidationStatus: (tag?: string | undefined) => void;
                 openDialog: (schema: any, data: any, callback?: ((ret?: any) => void) | undefined) => void;
                 closeDialog: (result?: any) => void;
                 changeTmpValue: (value: any) => void;
@@ -2129,6 +2134,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
                 setSubStore: (store: any) => void;
                 getSubStore: () => any;
                 reset: (keepErrors?: boolean) => void;
+                resetValidationStatus: (tag?: string | undefined) => void;
                 openDialog: (schema: any, data: any, callback?: ((ret?: any) => void) | undefined) => void;
                 closeDialog: (result?: any) => void;
                 changeTmpValue: (value: any) => void;
@@ -2538,6 +2544,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
                 setSubStore: (store: any) => void;
                 getSubStore: () => any;
                 reset: (keepErrors?: boolean) => void;
+                resetValidationStatus: (tag?: string | undefined) => void;
                 openDialog: (schema: any, data: any, callback?: ((ret?: any) => void) | undefined) => void;
                 closeDialog: (result?: any) => void;
                 changeTmpValue: (value: any) => void;
@@ -2951,6 +2958,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
                 setSubStore: (store: any) => void;
                 getSubStore: () => any;
                 reset: (keepErrors?: boolean) => void;
+                resetValidationStatus: (tag?: string | undefined) => void;
                 openDialog: (schema: any, data: any, callback?: ((ret?: any) => void) | undefined) => void;
                 closeDialog: (result?: any) => void;
                 changeTmpValue: (value: any) => void;
@@ -3360,6 +3368,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
                 setSubStore: (store: any) => void;
                 getSubStore: () => any;
                 reset: (keepErrors?: boolean) => void;
+                resetValidationStatus: (tag?: string | undefined) => void;
                 openDialog: (schema: any, data: any, callback?: ((ret?: any) => void) | undefined) => void;
                 closeDialog: (result?: any) => void;
                 changeTmpValue: (value: any) => void;
@@ -3773,6 +3782,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
                 setSubStore: (store: any) => void;
                 getSubStore: () => any;
                 reset: (keepErrors?: boolean) => void;
+                resetValidationStatus: (tag?: string | undefined) => void;
                 openDialog: (schema: any, data: any, callback?: ((ret?: any) => void) | undefined) => void;
                 closeDialog: (result?: any) => void;
                 changeTmpValue: (value: any) => void;
@@ -4182,6 +4192,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
                 setSubStore: (store: any) => void;
                 getSubStore: () => any;
                 reset: (keepErrors?: boolean) => void;
+                resetValidationStatus: (tag?: string | undefined) => void;
                 openDialog: (schema: any, data: any, callback?: ((ret?: any) => void) | undefined) => void;
                 closeDialog: (result?: any) => void;
                 changeTmpValue: (value: any) => void;
@@ -4584,7 +4595,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
             clearMessage: () => void;
             setHasRemoteData: () => void;
             saveRemote: (api: import("..").Api, data?: object | undefined, options?: import("..").fetchOptions | undefined) => Promise<any>;
-            fetchSchema: (api: import("..").Api, data?: object | undefined, options?: import("..").fetchOptions | undefined) => Promise<any>;
+            fetchSchema: (api: import("..").Api, data?: object | undefined, options?: import("..").fetchOptions | undefined) => Promise<any>; /** Group单元格包含的首列的索引值，范围[1, columns.length] */
             checkRemote: (api: import("..").Api, data?: object | undefined, options?: import("..").fetchOptions | undefined) => Promise<any>;
         } & {
             readonly loading: boolean;
@@ -4711,6 +4722,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
                 setSubStore: (store: any) => void;
                 getSubStore: () => any;
                 reset: (keepErrors?: boolean) => void;
+                resetValidationStatus: (tag?: string | undefined) => void;
                 openDialog: (schema: any, data: any, callback?: ((ret?: any) => void) | undefined) => void;
                 closeDialog: (result?: any) => void;
                 changeTmpValue: (value: any) => void;
@@ -5120,6 +5132,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
                 setSubStore: (store: any) => void;
                 getSubStore: () => any;
                 reset: (keepErrors?: boolean) => void;
+                resetValidationStatus: (tag?: string | undefined) => void;
                 openDialog: (schema: any, data: any, callback?: ((ret?: any) => void) | undefined) => void;
                 closeDialog: (result?: any) => void;
                 changeTmpValue: (value: any) => void;
@@ -5533,6 +5546,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
                 setSubStore: (store: any) => void;
                 getSubStore: () => any;
                 reset: (keepErrors?: boolean) => void;
+                resetValidationStatus: (tag?: string | undefined) => void;
                 openDialog: (schema: any, data: any, callback?: ((ret?: any) => void) | undefined) => void;
                 closeDialog: (result?: any) => void;
                 changeTmpValue: (value: any) => void;
@@ -5942,6 +5956,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
                 setSubStore: (store: any) => void;
                 getSubStore: () => any;
                 reset: (keepErrors?: boolean) => void;
+                resetValidationStatus: (tag?: string | undefined) => void;
                 openDialog: (schema: any, data: any, callback?: ((ret?: any) => void) | undefined) => void;
                 closeDialog: (result?: any) => void;
                 changeTmpValue: (value: any) => void;
@@ -6360,6 +6375,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
                 setSubStore: (store: any) => void;
                 getSubStore: () => any;
                 reset: (keepErrors?: boolean) => void;
+                resetValidationStatus: (tag?: string | undefined) => void;
                 openDialog: (schema: any, data: any, callback?: ((ret?: any) => void) | undefined) => void;
                 closeDialog: (result?: any) => void;
                 changeTmpValue: (value: any) => void;
@@ -6769,6 +6785,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
                 setSubStore: (store: any) => void;
                 getSubStore: () => any;
                 reset: (keepErrors?: boolean) => void;
+                resetValidationStatus: (tag?: string | undefined) => void;
                 openDialog: (schema: any, data: any, callback?: ((ret?: any) => void) | undefined) => void;
                 closeDialog: (result?: any) => void;
                 changeTmpValue: (value: any) => void;
@@ -7182,6 +7199,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
                 setSubStore: (store: any) => void;
                 getSubStore: () => any;
                 reset: (keepErrors?: boolean) => void;
+                resetValidationStatus: (tag?: string | undefined) => void;
                 openDialog: (schema: any, data: any, callback?: ((ret?: any) => void) | undefined) => void;
                 closeDialog: (result?: any) => void;
                 changeTmpValue: (value: any) => void;
@@ -7591,6 +7609,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
                 setSubStore: (store: any) => void;
                 getSubStore: () => any;
                 reset: (keepErrors?: boolean) => void;
+                resetValidationStatus: (tag?: string | undefined) => void;
                 openDialog: (schema: any, data: any, callback?: ((ret?: any) => void) | undefined) => void;
                 closeDialog: (result?: any) => void;
                 changeTmpValue: (value: any) => void;
@@ -8004,6 +8023,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
                 setSubStore: (store: any) => void;
                 getSubStore: () => any;
                 reset: (keepErrors?: boolean) => void;
+                resetValidationStatus: (tag?: string | undefined) => void;
                 openDialog: (schema: any, data: any, callback?: ((ret?: any) => void) | undefined) => void;
                 closeDialog: (result?: any) => void;
                 changeTmpValue: (value: any) => void;
@@ -8413,6 +8433,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
                 setSubStore: (store: any) => void;
                 getSubStore: () => any;
                 reset: (keepErrors?: boolean) => void;
+                resetValidationStatus: (tag?: string | undefined) => void;
                 openDialog: (schema: any, data: any, callback?: ((ret?: any) => void) | undefined) => void;
                 closeDialog: (result?: any) => void;
                 changeTmpValue: (value: any) => void;
@@ -9682,8 +9703,11 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
     readonly columnGroup: {
         rowSpan: number;
         label: any;
+        /** Group单元格包含的首列的索引值，范围[1, columns.length] */
         index: number;
+        /** Group单元格包含列数 */
         colSpan: number;
+        /** Group单元格包含列信息 */
         has: Array<any>;
     }[];
     getRowById(id: string): import("mobx-state-tree").ModelCreationType<import("mobx-state-tree/dist/internal").ExtractCFromProps<{
@@ -9939,7 +9963,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
     toggleExpanded: (row: IRow) => void;
     collapseAllAtDepth: (depth: number) => void;
     clear: () => void;
-    setOrderByInfo: (key: string, direction: 'asc' | 'desc') => void;
+    setOrderByInfo: (key: string, direction: 'asc' | 'desc' | '') => void;
     reset: () => void;
     toggleDragging: () => void;
     stopDragging: () => void;
@@ -9947,6 +9971,8 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
     addForm: (form: IFormStore, rowIndex: number) => void;
     toggleAllColumns: () => void;
     persistSaveToggledColumns: () => void;
+    setSearchFormExpanded: (value: any) => void;
+    toggleSearchFormExpanded: () => void;
     afterCreate(): void;
 }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>;
 export declare type ITableStore = Instance<typeof TableStore>;

package/lib/store/table.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.2
+ * amis-core v2.2.0
  * Copyright 2018-2022 fex
  */
 
@@ -219,7 +219,7 @@ var TableStore = iRenderer.iRendererStore
     expandedRows: mobxStateTree.types.array(mobxStateTree.types.string),
     primaryField: 'id',
     orderBy: '',
-    orderDir: mobxStateTree.types.optional(mobxStateTree.types.union(mobxStateTree.types.literal('asc'), mobxStateTree.types.literal('desc')), 'asc'),
+    orderDir: mobxStateTree.types.optional(mobxStateTree.types.union(mobxStateTree.types.literal('asc'), mobxStateTree.types.literal('desc'), mobxStateTree.types.literal('')), 'asc'),
     draggable: false,
     dragging: false,
     selectable: false,
@@ -235,7 +235,8 @@ var TableStore = iRenderer.iRendererStore
     combineFromIndex: 0,
     formsRef: mobxStateTree.types.optional(mobxStateTree.types.array(mobxStateTree.types.frozen()), []),
     maxKeepItemSelectionLength: 0,
-    keepItemSelectionOnPageChange: false
+    keepItemSelectionOnPageChange: false,
+    searchFormExpanded: false // 用来控制搜索框是否展开了，那个自动根据 searchable 生成的表单 autoGenerateFilter
 })
     .views(function (self) {
     function getColumnsExceptBuiltinTypes() {
@@ -385,10 +386,6 @@ var TableStore = iRenderer.iRendererStore
                 has: [columns[0]]
             }
         ];
-        //  如果是勾选栏，让它和下一列合并。
-        if (columns[0].type === '__checkme' && columns[1]) {
-            groups[0].label = columns[1].groupName;
-        }
         // 用户是否启用了 groupName
         var hasGroupName = columns.some(function (column) { return column.groupName; });
         for (var i = 1; i < len; i++) {
@@ -404,7 +401,13 @@ var TableStore = iRenderer.iRendererStore
             }
             else {
                 groups.push({
-                    label: current.groupName || current.label || ' ',
+                    /**
+                     * 如果中间没有配置groupName，那么样式会错乱，这里设置列的label配置，lable也没有则设置一个空字符串
+                     * 注：内部列需要设置为undefined，保证rowSpan在下面计算为2
+                     */
+                    label: !!~['__checkme', '__expandme'].indexOf(current.type)
+                        ? undefined
+                        : current.groupName || current.label || ' ',
                     colSpan: 1,
                     rowSpan: 1,
                     index: current.index,
@@ -694,28 +697,24 @@ var TableStore = iRenderer.iRendererStore
                     ? 1
                     : 0);
         var keys = [];
-        var len = columns.length;
-        for (var i = 0; i < len; i++) {
-            var column = columns[i];
-            // maxCount 可能比实际配置的 columns 还有多。
-            if (!column) {
+        for (var i = 0; i < columns.length; i++) {
+            if (keys.length === maxCount) {
                 break;
             }
+            var column = columns[i];
             if ('__' === column.type.substring(0, 2)) {
-                maxCount++;
                 continue;
             }
             var key = column.name;
             if (!key) {
                 break;
             }
-            keys.push(key);
-        }
-        while (fromIndex--) {
-            keys.shift();
-        }
-        while (keys.length > maxCount) {
-            keys.pop();
+            if (fromIndex > 0) {
+                fromIndex--;
+            }
+            else {
+                keys.push(key);
+            }
         }
         return combineCell(arr, keys);
     }
@@ -968,7 +967,7 @@ var TableStore = iRenderer.iRendererStore
     }
     function setOrderByInfo(key, direction) {
         self.orderBy = key;
-        self.orderDir = direction;
+        self.orderDir = key ? direction : '';
     }
     function reset() {
         self.rows.forEach(function (item) { return item.reset(); });
@@ -1017,8 +1016,10 @@ var TableStore = iRenderer.iRendererStore
     function persistSaveToggledColumns() {
         var key = getPersistDataKey(self.columnsData);
         localStorage.setItem(key, JSON.stringify({
-            // 可显示列index
-            toggledColumnIndex: self.activeToggaleColumns.map(function (item) { return item.index; }),
+            // 可显示列index, 原始配置中存在 toggled: false 的列不持久化
+            toggledColumnIndex: self.activeToggaleColumns
+                .filter(function (item) { var _a; return !(((_a = item.pristine) === null || _a === void 0 ? void 0 : _a.toggled) === false); })
+                .map(function (item) { return item.index; }),
             // 列排序，name，label可能不存在
             columnOrder: self.columnsData.map(function (item) { return item.name || item.label || item.rawIndex; }),
             // 已激活的可查询列
@@ -1053,6 +1054,12 @@ var TableStore = iRenderer.iRendererStore
             self.path +
             sortBy__default["default"](columns.map(function (item, index) { return item.name || item.label || index; })).join('-'));
     }
+    function setSearchFormExpanded(value) {
+        self.searchFormExpanded = !!value;
+    }
+    function toggleSearchFormExpanded() {
+        self.searchFormExpanded = !self.searchFormExpanded;
+    }
     return {
         update: update,
         updateColumns: updateColumns,
@@ -1074,6 +1081,8 @@ var TableStore = iRenderer.iRendererStore
         addForm: addForm,
         toggleAllColumns: toggleAllColumns,
         persistSaveToggledColumns: persistSaveToggledColumns,
+        setSearchFormExpanded: setSearchFormExpanded,
+        toggleSearchFormExpanded: toggleSearchFormExpanded,
         // events
         afterCreate: function () {
             setTimeout(function () {

package/{esm/store/table-v2.d.ts → lib/store/table2.d.ts}

@@ -2,7 +2,7 @@ import { Instance, SnapshotIn, IAnyModelType } from 'mobx-state-tree';
 import { Api, fetchOptions } from '../types';
 export declare const Column: import("mobx-state-tree").IModelType<{
     title: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
-    key: import("mobx-state-tree").IType<string | undefined, string, string>;
+    name: import("mobx-state-tree").IType<string | undefined, string, string>;
     toggled: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
     breakpoint: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
     pristine: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
@@ -14,13 +14,13 @@ export declare const Column: import("mobx-state-tree").IModelType<{
     toggleToggle(): void;
     setToggled(value: boolean): void;
 }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>;
-export declare type IColumnV2 = Instance<typeof Column>;
-export declare type SColumnV2 = SnapshotIn<typeof Column>;
+export declare type IColumn2 = Instance<typeof Column>;
+export declare type SColumn2 = SnapshotIn<typeof Column>;
 export declare const Row: import("mobx-state-tree").IModelType<{
     storeType: import("mobx-state-tree").IType<string | undefined, string, string>;
     id: import("mobx-state-tree").ISimpleType<string>;
     parentId: import("mobx-state-tree").IType<string | undefined, string, string>;
-    key: import("mobx-state-tree").ISimpleType<string>;
+    name: import("mobx-state-tree").ISimpleType<string>;
     pristine: import("mobx-state-tree").IType<any, any, any>;
     data: import("mobx-state-tree").IType<any, any, any>;
     index: import("mobx-state-tree").ISimpleType<number>;
@@ -39,9 +39,9 @@ export declare const Row: import("mobx-state-tree").IModelType<{
     change(values: object, savePristine?: boolean): void;
     reset(): void;
 }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>;
-export declare type IRowV2 = Instance<typeof Row>;
-export declare type SRowV2 = SnapshotIn<typeof Row>;
-export declare const TableStoreV2: import("mobx-state-tree").IModelType<{
+export declare type IRow2 = Instance<typeof Row>;
+export declare type SRow2 = SnapshotIn<typeof Row>;
+export declare const TableStore2: import("mobx-state-tree").IModelType<{
     id: import("mobx-state-tree").ISimpleType<string>;
     path: import("mobx-state-tree").IType<string | undefined, string, string>;
     storeType: import("mobx-state-tree").ISimpleType<string>;
@@ -72,7 +72,7 @@ export declare const TableStoreV2: import("mobx-state-tree").IModelType<{
 } & {
     columns: import("mobx-state-tree").IArrayType<import("mobx-state-tree").IModelType<{
         title: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
-        key: import("mobx-state-tree").IType<string | undefined, string, string>;
+        name: import("mobx-state-tree").IType<string | undefined, string, string>;
         toggled: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
         breakpoint: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
         pristine: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
@@ -88,7 +88,7 @@ export declare const TableStoreV2: import("mobx-state-tree").IModelType<{
         storeType: import("mobx-state-tree").IType<string | undefined, string, string>;
         id: import("mobx-state-tree").ISimpleType<string>;
         parentId: import("mobx-state-tree").IType<string | undefined, string, string>;
-        key: import("mobx-state-tree").ISimpleType<string>;
+        name: import("mobx-state-tree").ISimpleType<string>;
         pristine: import("mobx-state-tree").IType<any, any, any>;
         data: import("mobx-state-tree").IType<any, any, any>;
         index: import("mobx-state-tree").ISimpleType<number>;
@@ -112,7 +112,7 @@ export declare const TableStoreV2: import("mobx-state-tree").IModelType<{
         storeType: import("mobx-state-tree").IType<string | undefined, string, string>;
         id: import("mobx-state-tree").ISimpleType<string>;
         parentId: import("mobx-state-tree").IType<string | undefined, string, string>;
-        key: import("mobx-state-tree").ISimpleType<string>;
+        name: import("mobx-state-tree").ISimpleType<string>;
         pristine: import("mobx-state-tree").IType<any, any, any>;
         data: import("mobx-state-tree").IType<any, any, any>;
         index: import("mobx-state-tree").ISimpleType<number>;
@@ -182,7 +182,7 @@ export declare const TableStoreV2: import("mobx-state-tree").IModelType<{
     readonly toggable: boolean;
     readonly columnsData: import("mobx-state-tree").IMSTArray<import("mobx-state-tree").IModelType<{
         title: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
-        key: import("mobx-state-tree").IType<string | undefined, string, string>;
+        name: import("mobx-state-tree").IType<string | undefined, string, string>;
         toggled: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
         breakpoint: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
         pristine: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
@@ -195,7 +195,7 @@ export declare const TableStoreV2: import("mobx-state-tree").IModelType<{
         setToggled(value: boolean): void;
     }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>> & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IArrayType<import("mobx-state-tree").IModelType<{
         title: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
-        key: import("mobx-state-tree").IType<string | undefined, string, string>;
+        name: import("mobx-state-tree").IType<string | undefined, string, string>;
         toggled: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
         breakpoint: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
         pristine: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
@@ -209,7 +209,7 @@ export declare const TableStoreV2: import("mobx-state-tree").IModelType<{
     }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>>;
     readonly toggableColumns: ({
         title: any;
-        key: string;
+        name: string;
         toggled: boolean;
         breakpoint: any;
         pristine: any;
@@ -222,7 +222,7 @@ export declare const TableStoreV2: import("mobx-state-tree").IModelType<{
         setToggled(value: boolean): void;
     } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
         title: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
-        key: import("mobx-state-tree").IType<string | undefined, string, string>;
+        name: import("mobx-state-tree").IType<string | undefined, string, string>;
         toggled: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
         breakpoint: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
         pristine: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
@@ -237,7 +237,7 @@ export declare const TableStoreV2: import("mobx-state-tree").IModelType<{
     readonly filteredColumns: any[];
     readonly activeToggaleColumns: ({
         title: any;
-        key: string;
+        name: string;
         toggled: boolean;
         breakpoint: any;
         pristine: any;
@@ -250,7 +250,7 @@ export declare const TableStoreV2: import("mobx-state-tree").IModelType<{
         setToggled(value: boolean): void;
     } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
         title: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
-        key: import("mobx-state-tree").IType<string | undefined, string, string>;
+        name: import("mobx-state-tree").IType<string | undefined, string, string>;
         toggled: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
         breakpoint: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
         pristine: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
@@ -269,7 +269,7 @@ export declare const TableStoreV2: import("mobx-state-tree").IModelType<{
         storeType: string;
         id: string;
         parentId: string;
-        key: string;
+        name: string;
         pristine: any;
         data: any;
         index: number;
@@ -291,7 +291,7 @@ export declare const TableStoreV2: import("mobx-state-tree").IModelType<{
         storeType: import("mobx-state-tree").IType<string | undefined, string, string>;
         id: import("mobx-state-tree").ISimpleType<string>;
         parentId: import("mobx-state-tree").IType<string | undefined, string, string>;
-        key: import("mobx-state-tree").ISimpleType<string>;
+        name: import("mobx-state-tree").ISimpleType<string>;
         pristine: import("mobx-state-tree").IType<any, any, any>;
         data: import("mobx-state-tree").IType<any, any, any>;
         index: import("mobx-state-tree").ISimpleType<number>;
@@ -316,7 +316,7 @@ export declare const TableStoreV2: import("mobx-state-tree").IModelType<{
         storeType: import("mobx-state-tree").IType<string | undefined, string, string>;
         id: import("mobx-state-tree").ISimpleType<string>;
         parentId: import("mobx-state-tree").IType<string | undefined, string, string>;
-        key: import("mobx-state-tree").ISimpleType<string>;
+        name: import("mobx-state-tree").ISimpleType<string>;
         pristine: import("mobx-state-tree").IType<any, any, any>;
         data: import("mobx-state-tree").IType<any, any, any>;
         index: import("mobx-state-tree").ISimpleType<number>;
@@ -328,7 +328,7 @@ export declare const TableStoreV2: import("mobx-state-tree").IModelType<{
         storeType: import("mobx-state-tree").IType<string | undefined, string, string>;
         id: import("mobx-state-tree").ISimpleType<string>;
         parentId: import("mobx-state-tree").IType<string | undefined, string, string>;
-        key: import("mobx-state-tree").ISimpleType<string>;
+        name: import("mobx-state-tree").ISimpleType<string>;
         pristine: import("mobx-state-tree").IType<any, any, any>;
         data: import("mobx-state-tree").IType<any, any, any>;
         index: import("mobx-state-tree").ISimpleType<number>;
@@ -340,7 +340,7 @@ export declare const TableStoreV2: import("mobx-state-tree").IModelType<{
         storeType: string;
         id: string;
         parentId: string;
-        key: string;
+        name: string;
         pristine: any;
         data: any;
         index: number;
@@ -362,7 +362,7 @@ export declare const TableStoreV2: import("mobx-state-tree").IModelType<{
         storeType: import("mobx-state-tree").IType<string | undefined, string, string>;
         id: import("mobx-state-tree").ISimpleType<string>;
         parentId: import("mobx-state-tree").IType<string | undefined, string, string>;
-        key: import("mobx-state-tree").ISimpleType<string>;
+        name: import("mobx-state-tree").ISimpleType<string>;
         pristine: import("mobx-state-tree").IType<any, any, any>;
         data: import("mobx-state-tree").IType<any, any, any>;
         index: import("mobx-state-tree").ISimpleType<number>;
@@ -381,14 +381,14 @@ export declare const TableStoreV2: import("mobx-state-tree").IModelType<{
         change(values: object, savePristine?: boolean): void;
         reset(): void;
     }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>) | null;
-    isSelected: (row: IRowV2) => boolean;
-    getRowByIndex: (rowIndex: number, levels?: Array<string>) => IRowV2;
+    isSelected: (row: IRow2) => boolean;
+    getRowByIndex: (rowIndex: number, levels?: Array<string>) => IRow2;
     readonly moved: number;
     readonly movedRows: (import("mobx-state-tree").ModelCreationType<import("mobx-state-tree/dist/internal").ExtractCFromProps<{
         storeType: import("mobx-state-tree").IType<string | undefined, string, string>;
         id: import("mobx-state-tree").ISimpleType<string>;
         parentId: import("mobx-state-tree").IType<string | undefined, string, string>;
-        key: import("mobx-state-tree").ISimpleType<string>;
+        name: import("mobx-state-tree").ISimpleType<string>;
         pristine: import("mobx-state-tree").IType<any, any, any>;
         data: import("mobx-state-tree").IType<any, any, any>;
         index: import("mobx-state-tree").ISimpleType<number>;
@@ -400,7 +400,7 @@ export declare const TableStoreV2: import("mobx-state-tree").IModelType<{
         storeType: import("mobx-state-tree").IType<string | undefined, string, string>;
         id: import("mobx-state-tree").ISimpleType<string>;
         parentId: import("mobx-state-tree").IType<string | undefined, string, string>;
-        key: import("mobx-state-tree").ISimpleType<string>;
+        name: import("mobx-state-tree").ISimpleType<string>;
         pristine: import("mobx-state-tree").IType<any, any, any>;
         data: import("mobx-state-tree").IType<any, any, any>;
         index: import("mobx-state-tree").ISimpleType<number>;
@@ -412,7 +412,7 @@ export declare const TableStoreV2: import("mobx-state-tree").IModelType<{
         storeType: string;
         id: string;
         parentId: string;
-        key: string;
+        name: string;
         pristine: any;
         data: any;
         index: number;
@@ -434,7 +434,7 @@ export declare const TableStoreV2: import("mobx-state-tree").IModelType<{
         storeType: import("mobx-state-tree").IType<string | undefined, string, string>;
         id: import("mobx-state-tree").ISimpleType<string>;
         parentId: import("mobx-state-tree").IType<string | undefined, string, string>;
-        key: import("mobx-state-tree").ISimpleType<string>;
+        name: import("mobx-state-tree").ISimpleType<string>;
         pristine: import("mobx-state-tree").IType<any, any, any>;
         data: import("mobx-state-tree").IType<any, any, any>;
         index: import("mobx-state-tree").ISimpleType<number>;
@@ -454,7 +454,7 @@ export declare const TableStoreV2: import("mobx-state-tree").IModelType<{
         reset(): void;
     }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>))[];
 } & {
-    update: (config: Partial<STableStoreV2>) => void;
+    update: (config: Partial<STableStore2>) => void;
     persistSaveToggledColumns: () => void;
     setOrderByInfo: (key: string, direction: 'asc' | 'desc') => void;
     updateQuery: (values: object, updater?: Function, pageNoField?: string, pageSizeField?: string, replace?: boolean) => void;
@@ -462,11 +462,11 @@ export declare const TableStoreV2: import("mobx-state-tree").IModelType<{
     updateSelected: (selectedKeys: Array<any>, keyField?: string) => void;
     updateSelectedAll: (keyField?: string) => void;
     updateExpanded: (expandedRowKeys: Array<any>, keyField?: string) => void;
-    exchange: (fromIndex: number, toIndex: number, item?: IRowV2) => void;
+    exchange: (fromIndex: number, toIndex: number, item?: IRow2) => void;
     reset: () => void;
     toggleAllColumns: () => void;
     afterCreate(): void;
     saveRemote: (api: Api, data?: object, options?: fetchOptions) => Promise<any>;
 }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>;
-export declare type ITableStoreV2 = Instance<typeof TableStoreV2>;
-export declare type STableStoreV2 = SnapshotIn<typeof TableStoreV2>;
+export declare type ITableStore2 = Instance<typeof TableStore2>;
+export declare type STableStore2 = SnapshotIn<typeof TableStore2>;