@gingkoo/pandora-metabase 1.0.58 → 1.0.59

package/lib/cjs/hooks/use-state.js

@@ -220,7 +220,9 @@ var useStore = function useStore() {
             return _context.abrupt("return", tables);
           case 1:
             _context.next = 2;
-            return fetchDatasetFn.current(datasourceId);
+            return fetchDatasetFn.current(datasourceId, {
+              isExit: isExit
+            });
           case 2:
             _tables = _context.sent;
             setDataset(datasourceId, _tables);
@@ -280,7 +282,9 @@ var useStore = function useStore() {
               break;
             }
             _context2.next = 1;
-            return fetchColumnsFn.current(extra, datasourceId);
+            return fetchColumnsFn.current(extra, datasourceId, {
+              isExit: isExit
+            });
           case 1:
             columns = _context2.sent;
             setColumns(tableName, columns);
@@ -330,9 +334,12 @@ var useStore = function useStore() {
             return _context3.abrupt("return");
           case 1:
             _context3.next = 2;
-            return fetchChangeFn.current((0, _utils.splitByUnion)(_metaList), changeObj);
+            return fetchChangeFn.current((0, _utils.splitByUnion)(_metaList), changeObj, {
+              isExit: isExit
+            });
           case 2:
             isChange = _context3.sent;
+            // 是否还原
             if (isChange === false) {
               _setMeta(_metaList);
             }

package/lib/cjs/types.d.ts

@@ -8,16 +8,19 @@ export interface MetaListProps {
     subquery?: MetaListType[];
     list: MetaListType[];
 }
+export interface FetchOptions {
+    isExit: boolean;
+}
 export interface MetabaseProps {
     loading?: boolean;
     btnText?: string;
     showFields?: boolean;
     readonly?: boolean;
-    getTables: (datasourceId: string) => Promise<any>;
+    getTables: (datasourceId: string, options: FetchOptions) => Promise<any>;
     getColumns: (table: {
         name: string;
         [key: string]: any;
-    }, datasourceId: string) => Promise<any>;
+    }, datasourceId: string, options: FetchOptions) => Promise<any>;
     toolbar?: ToolbarType[];
     subToolbar?: ToolbarType[];
     tableNameTpl?: string;
@@ -38,10 +41,10 @@ export interface MetabaseProps {
     tableEnableAlias?: boolean;
     fieldEnableAlias?: boolean;
     isSelectFields?: boolean;
-    onChange?: (newData: MetaListType[], curData?: {
+    onChange?: (newData: MetaListType[], curData: {
         data: any;
         type: ChangeType;
-    }) => Promise<void | Boolean>;
+    }, options: FetchOptions) => Promise<void | Boolean>;
 }
 export interface OptionItem {
     value?: string;

package/lib/es/hooks/use-state.js

@@ -214,7 +214,9 @@ var useStore = function useStore() {
             return _context.abrupt("return", tables);
           case 1:
             _context.next = 2;
-            return fetchDatasetFn.current(datasourceId);
+            return fetchDatasetFn.current(datasourceId, {
+              isExit: isExit
+            });
           case 2:
             _tables = _context.sent;
             setDataset(datasourceId, _tables);
@@ -274,7 +276,9 @@ var useStore = function useStore() {
               break;
             }
             _context2.next = 1;
-            return fetchColumnsFn.current(extra, datasourceId);
+            return fetchColumnsFn.current(extra, datasourceId, {
+              isExit: isExit
+            });
           case 1:
             columns = _context2.sent;
             setColumns(tableName, columns);
@@ -324,9 +328,12 @@ var useStore = function useStore() {
             return _context3.abrupt("return");
           case 1:
             _context3.next = 2;
-            return fetchChangeFn.current(splitByUnion(_metaList), changeObj);
+            return fetchChangeFn.current(splitByUnion(_metaList), changeObj, {
+              isExit: isExit
+            });
           case 2:
             isChange = _context3.sent;
+            // 是否还原
             if (isChange === false) {
               _setMeta(_metaList);
             }

package/lib/es/types.d.ts

@@ -8,16 +8,19 @@ export interface MetaListProps {
     subquery?: MetaListType[];
     list: MetaListType[];
 }
+export interface FetchOptions {
+    isExit: boolean;
+}
 export interface MetabaseProps {
     loading?: boolean;
     btnText?: string;
     showFields?: boolean;
     readonly?: boolean;
-    getTables: (datasourceId: string) => Promise<any>;
+    getTables: (datasourceId: string, options: FetchOptions) => Promise<any>;
     getColumns: (table: {
         name: string;
         [key: string]: any;
-    }, datasourceId: string) => Promise<any>;
+    }, datasourceId: string, options: FetchOptions) => Promise<any>;
     toolbar?: ToolbarType[];
     subToolbar?: ToolbarType[];
     tableNameTpl?: string;
@@ -38,10 +41,10 @@ export interface MetabaseProps {
     tableEnableAlias?: boolean;
     fieldEnableAlias?: boolean;
     isSelectFields?: boolean;
-    onChange?: (newData: MetaListType[], curData?: {
+    onChange?: (newData: MetaListType[], curData: {
         data: any;
         type: ChangeType;
-    }) => Promise<void | Boolean>;
+    }, options: FetchOptions) => Promise<void | Boolean>;
 }
 export interface OptionItem {
     value?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gingkoo/pandora-metabase",
-  "version": "1.0.58",
+  "version": "1.0.59",
   "description": "",
   "main": "lib/es/index.js",
   "module": "lib/es/index.js",