@gingkoo/pandora-metabase 1.0.14 → 1.0.15

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

@@ -1,31 +1,97 @@
 import type { DatasourceType } from '../types';
 import { TypeEnum, SpecialType, JoinEnum, SQL_COLUMN_TYPE, SortEnum } from './enum';
+export declare enum AtomsTypeEnum {
+    JOIN_DEFAULT = "joinDefault",// join默认
+    EXISTS = "exists",// notExists
+    NOT_EXISTS = "notExists",// notExists
+    FIELD = "field",// 字段
+    EXPRESSION = "expression",// 表达式
+    INPUT_STRING = "inputString",// 字符串输入框
+    INPUT_STRING_LIST = "inputStringList",// 字符串输入框
+    INPUT_NUMBER_LIST = "inputNumberList",// 数字输入框
+    INPUT_NUMBER = "inputNumber",// 数字输入框
+    CONSTANT = "constant",//  常量
+    OPERATOR = "operator",// 运算符
+    UNKNOWN = "unknown"
+}
+export interface AtomsNotExists {
+    quotes: string;
+    notExists?: MetaListType[];
+    type: AtomsTypeEnum.NOT_EXISTS;
+}
+export interface AtomsExists {
+    quotes: string;
+    notExists?: MetaListType[];
+    type: AtomsTypeEnum.EXISTS;
+}
+export interface AtomsExpression {
+    lhs: AtomsItem[];
+    rhs: AtomsItem[];
+    database_type?: SQL_COLUMN_TYPE | '';
+    condition: string;
+    quotes: string;
+    formula?: Filter_Formula;
+    type: AtomsTypeEnum.EXPRESSION;
+}
+export interface AtomsJoinDefault {
+    lhs: AtomsItem[];
+    condition: string;
+    rhs: AtomsItem[];
+    type: AtomsTypeEnum.JOIN_DEFAULT;
+}
+export interface AtomsField {
+    fieldName: string;
+    fieldNameZh: string;
+    fieldAlias: string;
+    fieldUuid: string;
+    fieldId: string;
+    tableName: string;
+    tableNameZh: string;
+    tableId: string;
+    tableAlias: string;
+    tableUuid: string;
+    datasourceName: string;
+    datasourceId: string;
+    type: AtomsTypeEnum.FIELD;
+}
+export interface AtomsInputString {
+    val: string;
+    type: AtomsTypeEnum.INPUT_STRING;
+}
+export interface AtomsInputStringList {
+    val: string[];
+    type: AtomsTypeEnum.INPUT_STRING_LIST;
+}
+export interface AtomsInputNumberList {
+    val: number[];
+    type: AtomsTypeEnum.INPUT_NUMBER_LIST;
+}
+export interface AtomsInputNumber {
+    val: number;
+    type: AtomsTypeEnum.INPUT_NUMBER;
+}
+export interface AtomsConstant {
+    val: string;
+    type: AtomsTypeEnum.CONSTANT;
+}
+export interface AtomsOprator {
+    val: string;
+    type: AtomsTypeEnum.OPERATOR;
+}
+export interface AtomsUnknown {
+    val: string;
+    type: AtomsTypeEnum.UNKNOWN;
+}
+export type AtomsItem = AtomsNotExists | AtomsExists | AtomsJoinDefault | AtomsExpression | AtomsField | AtomsInputString | AtomsInputStringList | AtomsInputNumberList | AtomsInputNumber | AtomsOprator | AtomsConstant | AtomsUnknown;
 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;
-    comparison_operator: string;
-    left_fieldAlias: string;
-    left_fieldUuid: string;
-    left_quotes: string;
-    left_string: string;
-    left_type: 'string' | 'constant' | 'field' | '' | null;
-    left_constant: string;
-    left_fields: MetaJoin_Field[];
-    right_fieldAlias: string;
-    right_fieldUuid: string;
-    right_quotes: string;
-    right_fields: MetaJoin_Field[];
-    right_string: string;
-    right_type: 'string' | 'constant' | 'field' | '' | null;
-    right_constant: string;
-}
 export interface TableColumnsMapType {
     [tableName: string]: initColumnsType[];
 }
 export interface TableType {
     name: string;
+    name_zh: string;
     id: string;
     alias: string;
     tableUuid: string;
@@ -56,24 +122,22 @@ export interface MetaData {
     subquery?: MetaListType[];
 }
 export interface MetaJoin_Field {
+    fieldName: string;
     fieldAlias: string;
     fieldUuid: string;
+    fieldId: string;
     quotes?: string;
 }
 export interface MetaJoin_TalbeType {
     name: string;
+    name_zh: string;
     id: string;
     tableUuid: string;
     alias: string;
     datasourceName: string;
     datasourceId: string;
-    column_id?: string;
-    column?: string;
-    fieldAlias: string;
-    fieldUuid: string;
-    groupSql?: string;
     quotes?: string;
-    fields: MetaJoin_Field[];
+    columns?: MetaData_ColumnsType[];
 }
 export interface MetaJoin {
     metaKey: number;
@@ -85,14 +149,14 @@ export interface MetaJoin {
     table1: MetaJoin_TalbeType;
     table2: MetaJoin_TalbeType;
     columns: MetaData_ColumnsType[];
-    expressions: ExpressionsType[];
+    expressions: AtomsItem[];
     isSubquery?: boolean;
     subquery?: MetaListType[];
 }
 export interface MetaCustom_Item {
     name: string;
     type?: string;
-    formulaList?: any[];
+    formulaList?: AtomsItem[];
 }
 export interface MetaCustom {
     metaKey: number;
@@ -103,49 +167,11 @@ export interface Filter_Formula {
     type?: string;
     params?: string[] | number[];
 }
-export declare enum Filter_TypeEnum {
-    EXISTS = "exists",
-    CONSTANT = "constant",// 常量
-    INPUT = "input",// 输入框
-    FIELD = "field",// 字段
-    OPERATOR = "operator",// 运算符
-    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;
-    groupSql?: string;
-    database_type: SQL_COLUMN_TYPE | '';
-    val: string[];
-    operator?: string;
-    condition: string;
-    special_type?: SQL_COLUMN_TYPE | '';
-    quotes: string;
-    datasourceId: string;
-    datasourceName: string;
-    isField?: boolean;
-    valType?: 'field' | 'string' | 'constant' | '';
-    constantName?: string;
-    table2?: Omit<MetaJoin_TalbeType, 'fields'> | null;
-    formula?: Filter_Formula;
-    notExists?: MetaListType[];
-    type?: Filter_TypeEnum;
-    summarizeType?: MetaSummarize_Enum;
-    sql?: string;
-    realName?: string;
-}
 export interface MetaFilter {
     metaKey: number;
     type: TypeEnum.filter;
     isPermanent?: boolean;
-    filter: MetaFilter_Item[];
+    filter: AtomsItem[];
 }
 export declare enum MetaSummarize_Enum {
     GROUP = "group",
@@ -177,7 +203,9 @@ export interface MetaSummarize_By {
     alias: string;
     fieldAlias: string;
     fieldUuid: string;
+    fieldId: string;
     name: string;
+    name_zh?: string;
     id: string;
     datasourceId: string;
     datasourceName: string;
@@ -197,12 +225,7 @@ export interface MetaSummarize {
     by: MetaSummarize_By[];
 }
 export interface MetaSort_Item {
-    table: string;
-    tableId: string;
-    tableUuid: string;
-    alias: string;
-    name: string;
-    sql: string;
+    expression: AtomsItem[];
     sort: SortEnum;
 }
 export interface MetaSort {

package/lib/es/store/types.js

@@ -1,14 +1,19 @@
-// 过滤器类型
-export var Filter_TypeEnum;
-(function (Filter_TypeEnum) {
-  Filter_TypeEnum["EXISTS"] = "exists";
-  Filter_TypeEnum["CONSTANT"] = "constant";
-  Filter_TypeEnum["INPUT"] = "input";
-  Filter_TypeEnum["FIELD"] = "field";
-  Filter_TypeEnum["OPERATOR"] = "operator";
-  Filter_TypeEnum["EXPRESSION"] = "expression";
-  Filter_TypeEnum["NOT_EXISTS"] = "notExists";
-})(Filter_TypeEnum || (Filter_TypeEnum = {}));
+// 表达式类型
+export var AtomsTypeEnum;
+(function (AtomsTypeEnum) {
+  AtomsTypeEnum["JOIN_DEFAULT"] = "joinDefault";
+  AtomsTypeEnum["EXISTS"] = "exists";
+  AtomsTypeEnum["NOT_EXISTS"] = "notExists";
+  AtomsTypeEnum["FIELD"] = "field";
+  AtomsTypeEnum["EXPRESSION"] = "expression";
+  AtomsTypeEnum["INPUT_STRING"] = "inputString";
+  AtomsTypeEnum["INPUT_STRING_LIST"] = "inputStringList";
+  AtomsTypeEnum["INPUT_NUMBER_LIST"] = "inputNumberList";
+  AtomsTypeEnum["INPUT_NUMBER"] = "inputNumber";
+  AtomsTypeEnum["CONSTANT"] = "constant";
+  AtomsTypeEnum["OPERATOR"] = "operator";
+  AtomsTypeEnum["UNKNOWN"] = "unknown";
+})(AtomsTypeEnum || (AtomsTypeEnum = {}));
 // ----------- 第五个模块 聚合模块 ------------
 export var MetaSummarize_Enum;
 (function (MetaSummarize_Enum) {

package/lib/es/utils.d.ts

@@ -1,6 +1,6 @@
 import { TypeEnum } from './store/enum';
 import { MetaListType, MetaSummarize, MetaData_TableType, MetaData_ColumnsType } from './store/types';
-import { DataType } from './components/dialog/select-join-column';
+import { DataType } from './components/dialog/select-column-multiple';
 export declare const findIndex: <T>(arr: T[], item: T) => number;
 interface HelperResultType {
     ExistAboveGroupBy: boolean;
@@ -14,8 +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 const changeTableAlias: (list: MetaListType[] | [], curObj: Pick<MetaData_TableType, "tableUuid" | "alias">) => MetaListType[];
+export declare const changeFieldAlias: (list: MetaListType[], curObj: Pick<MetaData_ColumnsType, "fieldUuid" | "fieldAlias">) => MetaListType[];
 export declare function splitByUnion(data: any): any[];
 export declare function reassembleByUnion(target?: any[]): any[];
 export declare const buildSqlQuery: (data: MetaListType[] | undefined, type: string) => string;