@gingkoo/pandora-metabase 0.0.30 → 1.0.0-alpha.10

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

@@ -10,13 +10,18 @@ export declare enum TypeEnum {
     filter = "filter",
     summarize = "summarize",
     sort = "sort",
-    rowLimit = "rowLimit"
+    rowLimit = "rowLimit",
+    union = "union"
 }
 export declare enum JoinEnum {
     left = "LEFT JOIN",
     right = "RIGHT JOIN",
     inner = "INNER JOIN"
 }
+export declare enum UnionEnum {
+    union = "UNION",
+    unionAll = "UNION ALL"
+}
 export declare enum ColumnsPopupThemeEnum {
     skyBlue = "skyBlue",
     greenGrass = "greenGrass",

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

@@ -1,7 +1,10 @@
 import { MetaListType, MetaFilter_Item, MetaSummarize_Group, ParamsStruct } from './types';
 export declare const SummarizeAlias = "source";
 export declare const filterToSql: (record: MetaFilter_Item) => string;
-export declare const summarizeToSql: (arr: MetaSummarize_Group[], record: MetaSummarize_Group) => string;
+export declare const summarizeToSql: (arr: MetaSummarize_Group[], record: MetaSummarize_Group) => {
+    sql: string;
+    fieldAlias: string;
+};
 export declare const handleSqlStruct: (list: MetaListType[]) => ParamsStruct;
 export declare const compressionStructure: (data: MetaListType[]) => string;
 export declare const restoreStructure: (data: string) => MetaListType[];

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

@@ -1,17 +1,22 @@
 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';
+export type ToolbarType = TypeEnum | 'filter' | 'summarize' | 'joinData' | 'permissionTable' | 'customColumn' | 'sort' | 'rowLimit' | 'union';
 export type MetaListType = MetaData | MetaJoin | MetaCustom | MetaFilter | MetaSummarize | MetaSort | MetaLimit | MetaPermissionTable;
 export type initColumnsType = MetaData_ColumnsType;
 interface ExpressionsType {
     operator: string;
-    left_column: string;
-    left_column_id: string;
+    left_fieldAlias: string;
+    left_fieldUuid: string;
+    left_quotes: string;
     left_string: string;
-    left_isString: boolean;
-    right_column: string;
-    right_column_id: string;
+    left_type: 'string' | 'constant' | 'field' | '' | null;
+    left_constant: string;
+    right_fieldAlias: string;
+    right_fieldUuid: string;
+    right_quotes: string;
     right_string: string;
+    right_type: 'string' | 'constant' | 'field' | '' | null;
+    right_constant: string;
     right_isString: boolean;
 }
 export interface TableColumnsMapType {
@@ -21,18 +26,22 @@ export interface TableType {
     name: string;
     id: string;
     alias: string;
+    tableUuid: string;
 }
 export type MetaData_TableType = TableType & DatasourceType;
 export interface MetaData_ColumnsType {
     name: string;
     id: string;
     name_zh?: string;
+    fieldAlias: string;
+    fieldUuid: string;
     realName?: string;
     database_type: SQL_COLUMN_TYPE | '';
     special_type: SpecialType | '';
     datasourceId: string;
     datasourceName: string;
     select: boolean;
+    summarizeType?: MetaSummarize_Enum;
 }
 export interface MetaData {
     metaKey: number;
@@ -45,13 +54,14 @@ export interface MetaData {
 export interface MetaJoin_TalbeType {
     name: string;
     id: string;
+    tableUuid: string;
     alias: string;
     datasourceName: string;
     datasourceId: string;
-    column: string;
-    column_id: string;
+    fieldAlias: string;
+    fieldUuid: string;
     groupSql?: string;
-    [name: string]: any;
+    quotes?: string;
 }
 export interface MetaJoin {
     metaKey: number;
@@ -68,7 +78,8 @@ export interface MetaJoin {
 }
 export interface MetaCustom_Item {
     name: string;
-    formula: string;
+    type?: string;
+    formulaList?: any[];
 }
 export interface MetaCustom {
     metaKey: number;
@@ -79,9 +90,16 @@ export interface Filter_Formula {
     type?: string;
     params?: string[] | number[];
 }
+export declare enum Filter_TypeEnum {
+    EXPRESSION = "expression",
+    NOT_EXISTS = "notExists"
+}
 export interface MetaFilter_Item {
     table: string;
     tableId: string;
+    tableUuid: string;
+    fieldUuid: string;
+    fieldAlias: string;
     alias: string;
     name: string;
     id: string;
@@ -93,8 +111,15 @@ export interface MetaFilter_Item {
     datasourceId: string;
     datasourceName: string;
     isField?: boolean;
-    table2?: Omit<MetaJoin_TalbeType, 'column' | 'column_id'> | null;
+    valType?: 'field' | 'string' | 'constant' | '';
+    constantName?: string;
+    table2?: MetaJoin_TalbeType | null;
     formula?: Filter_Formula;
+    subquery?: any[];
+    type?: Filter_TypeEnum;
+    summarizeType?: MetaSummarize_Enum;
+    sql?: string;
+    realName?: string;
 }
 export interface MetaFilter {
     metaKey: number;
@@ -102,48 +127,59 @@ export interface MetaFilter {
     isPermanent?: boolean;
     filter: MetaFilter_Item[];
 }
+export declare enum MetaSummarize_Enum {
+    GROUP = "group",
+    BY = "by"
+}
 export interface MetaSummarize_Group {
     table: string;
     tableId: string;
+    tableUuid: string;
     alias?: string;
     name: string;
     id: string;
     realName?: string;
     database_type?: SQL_COLUMN_TYPE | '';
     sql: string;
+    fieldAlias: string;
+    fieldUuid: string;
     condition: string;
     quotes: string;
     datasourceId: string;
     datasourceName: string;
-    column: string;
-    column_id: string;
+    summarizeType: MetaSummarize_Enum;
     [params: string]: any;
 }
 export interface MetaSummarize_By {
     table: string;
     tableId: string;
+    tableUuid: string;
     alias: string;
+    fieldAlias: string;
+    fieldUuid: string;
     name: string;
     id: string;
     datasourceId: string;
     datasourceName: string;
-    column: string;
-    column_id: string;
     realName?: string;
     sql: string;
     database_type: SQL_COLUMN_TYPE | '';
     condition: string;
     quotes: string;
+    summarizeType: MetaSummarize_Enum;
 }
 export interface MetaSummarize {
     metaKey: number;
     type: TypeEnum.summarize;
     alias: string;
+    tableUuid: string;
     group: MetaSummarize_Group[];
     by: MetaSummarize_By[];
 }
 export interface MetaSort_Item {
     table: string;
+    tableId: string;
+    tableUuid: string;
     alias: string;
     name: string;
     sql: string;
@@ -177,7 +213,6 @@ export interface LooseObject {
 }
 interface ParamsCustomColumns {
     alias: string;
-    formula: string;
 }
 interface ParamsJoinTables {
     alias: string;

package/lib/es/types.d.ts

@@ -1,4 +1,12 @@
 import type { MetaListType, ToolbarType } from './store/types';
+import { UnionEnum } from './store/enum';
+export interface MetaListProps {
+    name: string;
+    type: 'group' | 'union';
+    union?: UnionEnum;
+    subquery?: MetaListType[];
+    list: MetaListType[];
+}
 export interface MetabaseProps {
     loading?: boolean;
     btnText?: string;
@@ -17,7 +25,14 @@ export interface MetabaseProps {
     value?: MetaListType[];
     sourceList?: DatasourceType[];
     showSubquery?: boolean;
-    _showSubquery?: boolean;
+    subShowSubquery?: boolean;
+    constantList?: OptionItem[];
+    notExistsToolbar?: ToolbarType[];
+}
+export interface OptionItem {
+    value?: string;
+    label: string;
+    icon?: React.ReactNode;
 }
 export interface DatasourceType {
     datasourceId: string;

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

@@ -2,9 +2,10 @@ 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 getScrollTop: () => 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 getWindowSize: () => {
     width: number;
     height: number;

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

@@ -14,3 +14,4 @@ export declare const mobx2Object: (mobxObj: any, defaultType?: any) => any;
 export declare const replaceTpl: (inputString: string, values: {
     [key: string]: any;
 }) => string;
+export declare const uuidv4: (prefix?: string) => string;

package/lib/es/utils.d.ts

@@ -1,5 +1,5 @@
 import { TypeEnum } from './store/enum';
-import { MetaListType, MetaSummarize } from './store/types';
+import { MetaListType, MetaSummarize, MetaData_TableType, MetaData_ColumnsType } from './store/types';
 import { DataType } from './components/dialog/select-join-column';
 export declare const findIndex: <T>(arr: T[], item: T) => number;
 interface HelperResultType {
@@ -14,4 +14,8 @@ interface HelperResultType {
 }
 export declare const getHelper: (list: MetaListType[], item: MetaListType) => HelperResultType;
 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": "0.0.30",
+  "version": "1.0.0-alpha.10",
   "description": "",
   "main": "lib/es/index.js",
   "module": "lib/es/index.js",
@@ -25,11 +25,9 @@
     "react-dom": "^17.0.0 || ^18.0.0"
   },
   "dependencies": {
-    "@ant-design/icons": "^4.8.0",
-    "@gingkoo/pandora": "^1.0.0-alpha.79",
+    "@gingkoo/pandora": "^1.0.5",
     "@gingkoo/pandora-hooks": "^1.0.5",
     "@gingkoo/pandora-icons": "^0.0.1-alpha.28",
-    "antd": "5.0.7",
     "dayjs": "^1.11.11",
     "lodash": "^4.17.21",
     "mobx": "^6.7.0",