@gingkoo/pandora-metabase 1.0.0-alpha.17 → 1.0.0-alpha.2

package/lib/es/store/enum.d.ts

@@ -11,7 +11,7 @@ export declare enum TypeEnum {
     summarize = "summarize",
     sort = "sort",
     rowLimit = "rowLimit",
-    union = "union"
+    group = "group"
 }
 export declare enum JoinEnum {
     left = "LEFT JOIN",

package/lib/es/store/types.d.ts

@@ -1,19 +1,18 @@
 import type { DatasourceType } from '../types';
 import { TypeEnum, SpecialType, JoinEnum, SQL_COLUMN_TYPE, SortEnum } from './enum';
-export type ToolbarType = TypeEnum | 'filter' | 'summarize' | 'joinData' | 'permissionTable' | 'customColumn' | 'sort' | 'rowLimit' | 'union';
+export type ToolbarType = TypeEnum | 'filter' | 'summarize' | 'joinData' | 'permissionTable' | 'customColumn' | 'sort' | 'rowLimit' | 'group';
 export type MetaListType = MetaData | MetaJoin | MetaCustom | MetaFilter | MetaSummarize | MetaSort | MetaLimit | MetaPermissionTable;
 export type initColumnsType = MetaData_ColumnsType;
 interface ExpressionsType {
     operator: string;
-    left_fieldAlias: string;
-    left_fieldUuid: string;
-    left_quotes: string;
+    left_column: string;
+    left_column_id: string;
     left_string: string;
+    left_isString: boolean;
     left_type: 'string' | 'constant' | 'field' | '' | null;
     left_constant: string;
-    right_fieldAlias: string;
-    right_fieldUuid: string;
-    right_quotes: string;
+    right_column: string;
+    right_column_id: string;
     right_string: string;
     right_type: 'string' | 'constant' | 'field' | '' | null;
     right_constant: string;
@@ -41,7 +40,6 @@ export interface MetaData_ColumnsType {
     datasourceId: string;
     datasourceName: string;
     select: boolean;
-    summarizeType?: MetaSummarize_Enum;
 }
 export interface MetaData {
     metaKey: number;
@@ -58,12 +56,10 @@ export interface MetaJoin_TalbeType {
     alias: string;
     datasourceName: string;
     datasourceId: string;
-    column_id?: string;
-    column?: string;
-    fieldAlias: string;
-    fieldUuid: string;
+    column: string;
+    column_id: string;
     groupSql?: string;
-    quotes?: string;
+    [name: string]: any;
 }
 export interface MetaJoin {
     metaKey: number;
@@ -80,6 +76,7 @@ export interface MetaJoin {
 }
 export interface MetaCustom_Item {
     name: string;
+    formula: string;
     type?: string;
     formulaList?: any[];
 }
@@ -115,7 +112,7 @@ export interface MetaFilter_Item {
     isField?: boolean;
     valType?: 'field' | 'string' | 'constant' | '';
     constantName?: string;
-    table2?: MetaJoin_TalbeType | null;
+    table2?: Omit<MetaJoin_TalbeType, 'column' | 'column_id'> | null;
     formula?: Filter_Formula;
     subquery?: any[];
     type?: Filter_TypeEnum;
@@ -149,6 +146,8 @@ export interface MetaSummarize_Group {
     quotes: string;
     datasourceId: string;
     datasourceName: string;
+    column: string;
+    column_id: string;
     summarizeType: MetaSummarize_Enum;
     [params: string]: any;
 }
@@ -163,6 +162,8 @@ export interface MetaSummarize_By {
     id: string;
     datasourceId: string;
     datasourceName: string;
+    column: string;
+    column_id: string;
     realName?: string;
     sql: string;
     database_type: SQL_COLUMN_TYPE | '';
@@ -215,6 +216,7 @@ export interface LooseObject {
 }
 interface ParamsCustomColumns {
     alias: string;
+    formula: string;
 }
 interface ParamsJoinTables {
     alias: string;

package/lib/es/types.d.ts

@@ -2,9 +2,8 @@ import type { MetaListType, ToolbarType } from './store/types';
 import { UnionEnum } from './store/enum';
 export interface MetaListProps {
     name: string;
-    type: 'group' | 'union';
-    union?: UnionEnum;
-    subquery?: MetaListType[];
+    type: 'group' | 'operator';
+    operator?: UnionEnum;
     list: MetaListType[];
 }
 export interface MetabaseProps {
@@ -27,7 +26,6 @@ export interface MetabaseProps {
     showSubquery?: boolean;
     subShowSubquery?: boolean;
     constantList?: OptionItem[];
-    notExistsToolbar?: ToolbarType[];
 }
 export interface OptionItem {
     value?: string;

package/lib/es/utils/helper-dom.d.ts

@@ -2,10 +2,9 @@ export declare const getComputedTranslate: (obj: any) => {
     x: number;
     y: number;
 };
-export declare const getElementTop: (elem?: HTMLElement) => number;
-export declare const getElementLeft: (elem?: HTMLElement) => number;
-export declare const getContainerVisibleHeight: (container?: HTMLElement) => number;
-export declare const getScrollTop: (elem?: HTMLElement) => number;
+export declare const getElementTop: (elem: HTMLElement) => number;
+export declare const getElementLeft: (elem: HTMLElement) => number;
+export declare const getScrollTop: () => number;
 export declare const getWindowSize: () => {
     width: number;
     height: number;

package/lib/es/utils.d.ts

@@ -16,6 +16,4 @@ export declare const getHelper: (list: MetaListType[], item: MetaListType) => He
 export declare const getSubColumns: (metaList: any) => DataType[];
 export declare const changeTableAlias: (list: MetaListType[], curObj: MetaData_TableType) => MetaListType[];
 export declare const changeFieldAlias: (list: MetaListType[], curObj: MetaData_ColumnsType) => MetaListType[];
-export declare function splitByUnion(data: any): any[];
-export declare function reassembleByUnion(target?: any[]): any[];
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gingkoo/pandora-metabase",
-  "version": "1.0.0-alpha.17",
+  "version": "1.0.0-alpha.2",
   "description": "",
   "main": "lib/es/index.js",
   "module": "lib/es/index.js",