amis 1.9.1-beta.12 → 1.9.1-beta.18

package/lib/store/table-v2.d.ts

@@ -19,6 +19,7 @@ export declare type SColumn = 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>;
     pristine: import("mobx-state-tree").IType<any, any, any>;
     data: import("mobx-state-tree").IType<any, any, any>;
@@ -30,10 +31,13 @@ export declare const Row: import("mobx-state-tree").IModelType<{
 }, {
     readonly checked: boolean;
     readonly modified: boolean;
+    readonly moved: boolean;
     readonly locals: any;
+    getDataWithModifiedChilden(): any;
 } & {
     replaceWith(data: any): void;
     change(values: object, savePristine?: boolean | undefined): void;
+    reset(): void;
 }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>;
 export declare type IRow = Instance<typeof Row>;
 export declare type SRow = SnapshotIn<typeof Row>;
@@ -83,6 +87,7 @@ export declare const TableStoreV2: import("mobx-state-tree").IModelType<{
     rows: import("mobx-state-tree").IArrayType<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>;
         pristine: import("mobx-state-tree").IType<any, any, any>;
         data: import("mobx-state-tree").IType<any, any, any>;
@@ -94,15 +99,19 @@ export declare const TableStoreV2: import("mobx-state-tree").IModelType<{
     }, {
         readonly checked: boolean;
         readonly modified: boolean;
+        readonly moved: boolean;
         readonly locals: any;
+        getDataWithModifiedChilden(): any;
     } & {
         replaceWith(data: any): void;
         change(values: object, savePristine?: boolean | undefined): void;
+        reset(): void;
     }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>;
     selectedRowKeys: import("mobx-state-tree").IArrayType<import("mobx-state-tree").IType<any, any, any>>;
     selectedRows: import("mobx-state-tree").IArrayType<import("mobx-state-tree").IReferenceType<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>;
         pristine: import("mobx-state-tree").IType<any, any, any>;
         data: import("mobx-state-tree").IType<any, any, any>;
@@ -114,10 +123,13 @@ export declare const TableStoreV2: import("mobx-state-tree").IModelType<{
     }, {
         readonly checked: boolean;
         readonly modified: boolean;
+        readonly moved: boolean;
         readonly locals: any;
+        getDataWithModifiedChilden(): any;
     } & {
         replaceWith(data: any): void;
         change(values: object, savePristine?: boolean | undefined): void;
+        reset(): void;
     }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>>;
     expandedRowKeys: import("mobx-state-tree").IArrayType<import("mobx-state-tree").IType<any, any, any>>;
     columnsTogglable: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").ITypeUnion<boolean | "auto", boolean | "auto", boolean | "auto">, [undefined]>;
@@ -253,9 +265,194 @@ export declare const TableStoreV2: import("mobx-state-tree").IModelType<{
     readonly dataSource: any[];
     readonly currentSelectedRowKeys: any[];
     readonly currentExpandedKeys: any[];
+    readonly unSelectedRows: ({
+        storeType: string;
+        id: string;
+        parentId: string;
+        key: string;
+        pristine: any;
+        data: any;
+        index: number;
+        newIndex: number;
+        depth: number;
+        children: import("mobx-state-tree").IMSTArray<IAnyModelType> & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IArrayType<IAnyModelType>, [undefined]>>;
+        path: string;
+    } & import("mobx-state-tree/dist/internal").NonEmptyObject & {
+        readonly checked: boolean;
+        readonly modified: boolean;
+        readonly moved: boolean;
+        readonly locals: any;
+        getDataWithModifiedChilden(): any;
+    } & {
+        replaceWith(data: any): void;
+        change(values: object, savePristine?: boolean | undefined): void;
+        reset(): void;
+    } & import("mobx-state-tree").IStateTreeNode<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>;
+        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>;
+        newIndex: import("mobx-state-tree").ISimpleType<number>;
+        depth: import("mobx-state-tree").ISimpleType<number>;
+        children: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IArrayType<IAnyModelType>, [undefined]>;
+        path: import("mobx-state-tree").IType<string | undefined, string, string>;
+    }, {
+        readonly checked: boolean;
+        readonly modified: boolean;
+        readonly moved: boolean;
+        readonly locals: any;
+        getDataWithModifiedChilden(): any;
+    } & {
+        replaceWith(data: any): void;
+        change(values: object, savePristine?: boolean | undefined): void;
+        reset(): void;
+    }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>)[];
     hasColumnHidden(): boolean;
     getData: (superData: any) => any;
+    getRowById(id: string): 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>;
+        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>;
+        newIndex: import("mobx-state-tree").ISimpleType<number>;
+        depth: import("mobx-state-tree").ISimpleType<number>;
+        children: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IArrayType<IAnyModelType>, [undefined]>;
+        path: import("mobx-state-tree").IType<string | undefined, string, string>;
+    }>> | import("mobx-state-tree").ModelSnapshotType<{
+        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>;
+        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>;
+        newIndex: import("mobx-state-tree").ISimpleType<number>;
+        depth: import("mobx-state-tree").ISimpleType<number>;
+        children: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IArrayType<IAnyModelType>, [undefined]>;
+        path: import("mobx-state-tree").IType<string | undefined, string, string>;
+    }> | ({
+        storeType: string;
+        id: string;
+        parentId: string;
+        key: string;
+        pristine: any;
+        data: any;
+        index: number;
+        newIndex: number;
+        depth: number;
+        children: import("mobx-state-tree").IMSTArray<IAnyModelType> & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IArrayType<IAnyModelType>, [undefined]>>;
+        path: string;
+    } & import("mobx-state-tree/dist/internal").NonEmptyObject & {
+        readonly checked: boolean;
+        readonly modified: boolean;
+        readonly moved: boolean;
+        readonly locals: any;
+        getDataWithModifiedChilden(): any;
+    } & {
+        replaceWith(data: any): void;
+        change(values: object, savePristine?: boolean | undefined): void;
+        reset(): void;
+    } & import("mobx-state-tree").IStateTreeNode<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>;
+        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>;
+        newIndex: import("mobx-state-tree").ISimpleType<number>;
+        depth: import("mobx-state-tree").ISimpleType<number>;
+        children: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IArrayType<IAnyModelType>, [undefined]>;
+        path: import("mobx-state-tree").IType<string | undefined, string, string>;
+    }, {
+        readonly checked: boolean;
+        readonly modified: boolean;
+        readonly moved: boolean;
+        readonly locals: any;
+        getDataWithModifiedChilden(): any;
+    } & {
+        replaceWith(data: any): void;
+        change(values: object, savePristine?: boolean | undefined): void;
+        reset(): void;
+    }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>) | null;
     isSelected: (row: IRow) => boolean;
+    getRowByIndex: (rowIndex: number, levels?: string[] | undefined) => IRow;
+    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>;
+        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>;
+        newIndex: import("mobx-state-tree").ISimpleType<number>;
+        depth: import("mobx-state-tree").ISimpleType<number>;
+        children: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IArrayType<IAnyModelType>, [undefined]>;
+        path: import("mobx-state-tree").IType<string | undefined, string, string>;
+    }>> | import("mobx-state-tree").ModelSnapshotType<{
+        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>;
+        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>;
+        newIndex: import("mobx-state-tree").ISimpleType<number>;
+        depth: import("mobx-state-tree").ISimpleType<number>;
+        children: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IArrayType<IAnyModelType>, [undefined]>;
+        path: import("mobx-state-tree").IType<string | undefined, string, string>;
+    }> | ({
+        storeType: string;
+        id: string;
+        parentId: string;
+        key: string;
+        pristine: any;
+        data: any;
+        index: number;
+        newIndex: number;
+        depth: number;
+        children: import("mobx-state-tree").IMSTArray<IAnyModelType> & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IArrayType<IAnyModelType>, [undefined]>>;
+        path: string;
+    } & import("mobx-state-tree/dist/internal").NonEmptyObject & {
+        readonly checked: boolean;
+        readonly modified: boolean;
+        readonly moved: boolean;
+        readonly locals: any;
+        getDataWithModifiedChilden(): any;
+    } & {
+        replaceWith(data: any): void;
+        change(values: object, savePristine?: boolean | undefined): void;
+        reset(): void;
+    } & import("mobx-state-tree").IStateTreeNode<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>;
+        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>;
+        newIndex: import("mobx-state-tree").ISimpleType<number>;
+        depth: import("mobx-state-tree").ISimpleType<number>;
+        children: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IArrayType<IAnyModelType>, [undefined]>;
+        path: import("mobx-state-tree").IType<string | undefined, string, string>;
+    }, {
+        readonly checked: boolean;
+        readonly modified: boolean;
+        readonly moved: boolean;
+        readonly locals: any;
+        getDataWithModifiedChilden(): any;
+    } & {
+        replaceWith(data: any): void;
+        change(values: object, savePristine?: boolean | undefined): void;
+        reset(): void;
+    }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>))[];
 } & {
     update: (config: Partial<STableStore>) => void;
     persistSaveToggledColumns: () => void;
@@ -265,11 +462,10 @@ export declare const TableStoreV2: import("mobx-state-tree").IModelType<{
     updateSelected: (selectedKeys: Array<any>, keyField?: string | undefined) => void;
     updateSelectedAll: (keyField?: string | undefined) => void;
     updateExpanded: (expandedRowKeys: Array<any>, keyField?: string | undefined) => void;
-    afterCreate(): void;
-    saveRemote: (api: Api, data?: object | undefined, options?: fetchOptions | undefined) => Promise<any>;
-    getRowByIndex(rowIndex: number): {
+    exchange: (fromIndex: number, toIndex: number, item?: ({
         storeType: string;
         id: string;
+        parentId: string;
         key: string;
         pristine: any;
         data: any;
@@ -281,13 +477,17 @@ export declare const TableStoreV2: import("mobx-state-tree").IModelType<{
     } & import("mobx-state-tree/dist/internal").NonEmptyObject & {
         readonly checked: boolean;
         readonly modified: boolean;
+        readonly moved: boolean;
         readonly locals: any;
+        getDataWithModifiedChilden(): any;
     } & {
         replaceWith(data: any): void;
         change(values: object, savePristine?: boolean | undefined): void;
+        reset(): void;
     } & import("mobx-state-tree").IStateTreeNode<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>;
         pristine: import("mobx-state-tree").IType<any, any, any>;
         data: import("mobx-state-tree").IType<any, any, any>;
@@ -299,11 +499,17 @@ export declare const TableStoreV2: import("mobx-state-tree").IModelType<{
     }, {
         readonly checked: boolean;
         readonly modified: boolean;
+        readonly moved: boolean;
         readonly locals: any;
+        getDataWithModifiedChilden(): any;
     } & {
         replaceWith(data: any): void;
         change(values: object, savePristine?: boolean | undefined): void;
-    }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>;
+        reset(): void;
+    }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>) | undefined) => void;
+    reset: () => void;
+    afterCreate(): void;
+    saveRemote: (api: Api, data?: object | undefined, options?: fetchOptions | undefined) => Promise<any>;
 }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>;
 export declare type ITableStore = Instance<typeof TableStoreV2>;
 export declare type STableStore = SnapshotIn<typeof TableStoreV2>;

package/lib/store/table-v2.js

@@ -46,6 +46,7 @@ exports.Row = mobx_state_tree_1.types
     .model('Row', {
     storeType: 'Row',
     id: mobx_state_tree_1.types.identifier,
+    parentId: '',
     key: mobx_state_tree_1.types.string,
     pristine: mobx_state_tree_1.types.frozen({}),
     data: mobx_state_tree_1.types.frozen({}),
@@ -65,6 +66,9 @@ exports.Row = mobx_state_tree_1.types
         }
         return Object.keys(self.data).some(function (key) { return !(0, isEqual_1.default)(self.data[key], self.pristine[key]); });
     },
+    get moved() {
+        return self.index !== self.newIndex;
+    },
     get locals() {
         var children = null;
         if (self.children.length) {
@@ -77,6 +81,15 @@ exports.Row = mobx_state_tree_1.types
             parent: parent.storeType === exports.Row.name ? parent.data : undefined
         }), children
             ? (0, tslib_1.__assign)((0, tslib_1.__assign)({}, self.data), { children: children }) : self.data);
+    },
+    getDataWithModifiedChilden: function () {
+        var data = (0, tslib_1.__assign)({}, self.data);
+        if (data.children && self.children) {
+            data.children = self.children.map(function (item) {
+                return item.getDataWithModifiedChilden();
+            });
+        }
+        return data;
     }
 }); })
     .actions(function (self) { return ({
@@ -112,6 +125,10 @@ exports.Row = mobx_state_tree_1.types
     change: function (values, savePristine) {
         self.data = (0, helper_1.immutableExtends)(self.data, values);
         savePristine && (self.pristine = self.data);
+    },
+    reset: function () {
+        self.newIndex = self.index;
+        self.data = self.pristine;
     }
 }); });
 exports.TableStoreV2 = service_1.ServiceStore.named('TableStoreV2')
@@ -172,9 +189,22 @@ exports.TableStoreV2 = service_1.ServiceStore.named('TableStoreV2')
             unSelectedItems: getUnSelectedRows().map(function (item) { return item.data; })
         });
     }
+    function getRowByIndex(rowIndex, levels) {
+        if (levels && levels.length > 0) {
+            var index = +(levels.shift() || 0);
+            return getRowByIndex(index, levels);
+        }
+        return self.rows[rowIndex];
+    }
     function isSelected(row) {
         return !!~self.selectedRows.indexOf(row);
     }
+    function getMovedRows() {
+        return (0, helper_1.flattenTree)(self.rows).filter(function (item) { return item.moved; });
+    }
+    function getMoved() {
+        return getMovedRows().length;
+    }
     return {
         get toggable() {
             return getToggable();
@@ -200,12 +230,25 @@ exports.TableStoreV2 = service_1.ServiceStore.named('TableStoreV2')
         get currentExpandedKeys() {
             return self.expandedRowKeys.map(function (item) { return item; });
         },
+        get unSelectedRows() {
+            return getUnSelectedRows();
+        },
         // 是否隐藏了某列
         hasColumnHidden: function () {
             return hasColumnHidden();
         },
         getData: getData,
-        isSelected: isSelected
+        getRowById: function (id) {
+            return (0, helper_1.findTree)(self.rows, function (item) { return item.id === id; });
+        },
+        isSelected: isSelected,
+        getRowByIndex: getRowByIndex,
+        get moved() {
+            return getMoved();
+        },
+        get movedRows() {
+            return getMovedRows();
+        },
     };
 })
     .actions(function (self) {
@@ -227,6 +270,26 @@ exports.TableStoreV2 = service_1.ServiceStore.named('TableStoreV2')
             self.columns.replace(updateColumns(config.columns));
         }
     }
+    function exchange(fromIndex, toIndex, item) {
+        item = item || self.rows[fromIndex];
+        if (item.parentId) {
+            var parent = self.getRowById(item.parentId);
+            var offset = parent.children.indexOf(item) - fromIndex;
+            toIndex += offset;
+            fromIndex += offset;
+            var newRows_1 = parent.children.concat();
+            newRows_1.splice(fromIndex, 1);
+            newRows_1.splice(toIndex, 0, item);
+            newRows_1.forEach(function (item, index) { return (item.newIndex = index); });
+            parent.children.replace(newRows_1);
+            return;
+        }
+        var newRows = self.rows.concat();
+        newRows.splice(fromIndex, 1);
+        newRows.splice(toIndex, 0, item);
+        newRows.forEach(function (item, index) { return (item.newIndex = index); });
+        self.rows.replace(newRows);
+    }
     function persistSaveToggledColumns() {
         var key = location.pathname +
             self.path +
@@ -419,6 +482,21 @@ exports.TableStoreV2 = service_1.ServiceStore.named('TableStoreV2')
             }
         });
     });
+    function reset() {
+        self.rows.forEach(function (item) { return item.reset(); });
+        var rows = self.rows.concat();
+        (0, helper_1.eachTree)(rows, function (item) {
+            if (item.children) {
+                var rows_1 = item.children.concat().sort(function (a, b) { return a.index - b.index; });
+                rows_1.forEach(function (item) { return item.reset(); });
+                item.children.replace(rows_1);
+            }
+        });
+        rows.forEach(function (item) { return item.reset(); });
+        rows = rows.sort(function (a, b) { return a.index - b.index; });
+        self.rows.replace(rows);
+        self.dragging = false;
+    }
     return {
         update: update,
         persistSaveToggledColumns: persistSaveToggledColumns,
@@ -428,6 +506,8 @@ exports.TableStoreV2 = service_1.ServiceStore.named('TableStoreV2')
         updateSelected: updateSelected,
         updateSelectedAll: updateSelectedAll,
         updateExpanded: updateExpanded,
+        exchange: exchange,
+        reset: reset,
         // events
         afterCreate: function () {
             setTimeout(function () {
@@ -446,10 +526,7 @@ exports.TableStoreV2 = service_1.ServiceStore.named('TableStoreV2')
                 }
             }, 200);
         },
-        saveRemote: saveRemote,
-        getRowByIndex: function (rowIndex) {
-            return self.rows[rowIndex];
-        }
+        saveRemote: saveRemote
     };
 });
 //# sourceMappingURL=./store/table-v2.js.map