@gingkoo/pandora-metabase 1.0.23 → 1.0.25

package/lib/es/store/helper.js

@@ -2,7 +2,6 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["children"],
   _excluded2 = ["metaKey"];
-import { AtomsTypeEnum } from './types';
 // import { SummarizeAlias } from './index';
 import { TypeEnum, SQL_COLUMN_TYPE } from './enum';
 export var SummarizeAlias = 'source';
@@ -416,78 +415,4 @@ export var restoreStructure = function restoreStructure(data) {
   } catch (e) {
     return [];
   }
-};
-export var getTemItem = function getTemItem(type) {
-  var temItem;
-  // 字段
-  if (type === AtomsTypeEnum.FIELD) {
-    temItem = {
-      fieldName: '',
-      // 字段名
-      fieldNameZh: '',
-      // 字段中文名
-      fieldAlias: '',
-      // 别名
-      fieldUuid: '',
-      // uuid
-      fieldId: '',
-      // 字段id
-      // quotes?: string; // 字段展示的 不知道有没有用
-      tableName: '',
-      // 表名
-      tableNameZh: '',
-      tableId: '',
-      // 表名
-      tableAlias: '',
-      // 别名
-      tableUuid: '',
-      // 表唯一标识
-      datasourceName: '',
-      // 数据源名
-      datasourceId: '',
-      // 数据源id
-      type: AtomsTypeEnum.FIELD
-    };
-  }
-  // 表达式
-  else if (type === AtomsTypeEnum.EXPRESSION || type === AtomsTypeEnum.JOIN_DEFAULT) {
-    return {
-      lhs: [],
-      rhs: [],
-      condition: '',
-      quotes: '',
-      type: type
-    };
-  } else if (type === AtomsTypeEnum.EXISTS || type === AtomsTypeEnum.NOT_EXISTS) {
-    return {
-      quotes: '',
-      // 展示用户看的 组装的文字
-      notExists: [],
-      type: type
-    };
-  } else if (type === AtomsTypeEnum.UNKNOWN) {
-    return {
-      // quotes: '', // 展示用户看的 组装的文字
-      // notExists: [],
-      val: '',
-      type: type
-    };
-  } else if (type === AtomsTypeEnum.INPUT_NUMBER) {
-    return {
-      val: 0,
-      type: type
-    };
-  } else if (type === AtomsTypeEnum.INPUT_NUMBER_LIST || type === AtomsTypeEnum.INPUT_STRING_LIST) {
-    temItem = {
-      val: [],
-      type: type
-    };
-  } else {
-    // 其他
-    temItem = {
-      val: '',
-      type: type
-    };
-  }
-  return temItem;
 };

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

@@ -12,7 +12,9 @@ export declare enum AtomsTypeEnum {
     INPUT_NUMBER = "inputNumber",// 数字输入框
     CONSTANT = "constant",//  常量
     OPERATOR = "operator",// 运算符
-    UNKNOWN = "unknown"
+    UNKNOWN = "unknown",//未选具体类型
+    FORMULA = "FORMULA",
+    COLLECTION = "collection"
 }
 export interface AtomsNotExists {
     quotes: string;
@@ -24,6 +26,21 @@ export interface AtomsExists {
     notExists?: MetaListType[];
     type: AtomsTypeEnum.EXISTS;
 }
+export type Arity = {
+    exact: number;
+} | {
+    min: number;
+} | {
+    min: number;
+    max: number;
+};
+export interface AtomsFormula {
+    args: AtomsItem[];
+    arity?: Arity;
+    quotes: string;
+    name: string;
+    type: AtomsTypeEnum.FORMULA;
+}
 export interface AtomsExpression {
     lhs: AtomsItem[];
     rhs: AtomsItem[];
@@ -82,7 +99,12 @@ export interface AtomsUnknown {
     val: string;
     type: AtomsTypeEnum.UNKNOWN;
 }
-export type AtomsItem = AtomsNotExists | AtomsExists | AtomsJoinDefault | AtomsExpression | AtomsField | AtomsInputString | AtomsInputStringList | AtomsInputNumberList | AtomsInputNumber | AtomsOprator | AtomsConstant | AtomsUnknown;
+export interface AtomsCollection {
+    list: AtomsItem[];
+    quotes: string;
+    type: AtomsTypeEnum.COLLECTION;
+}
+export type AtomsItem = AtomsNotExists | AtomsExists | AtomsJoinDefault | AtomsExpression | AtomsFormula | AtomsField | AtomsInputString | AtomsInputStringList | AtomsInputNumberList | AtomsInputNumber | AtomsOprator | AtomsConstant | AtomsUnknown | AtomsCollection;
 export type ToolbarType = TypeEnum | 'filter' | 'summarize' | 'joinData' | 'permissionTable' | 'customColumn' | 'sort' | 'rowLimit' | 'union';
 export type MetaListType = MetaData | MetaJoin | MetaCustom | MetaFilter | MetaSummarize | MetaSort | MetaLimit | MetaPermissionTable | MetaUnion;
 export type initColumnsType = MetaData_ColumnsType;
@@ -293,10 +315,22 @@ export interface ParamsType {
     code: string;
 }
 export interface PopupData {
+    container?: any;
     visible: boolean;
     node?: any;
     content?: any;
 }
+export interface FormulaTemplatesItem {
+    name: string;
+    args: {
+        type: AtomsTypeEnum;
+        check?: string | null;
+    }[];
+    arity?: Arity;
+    output?: string;
+    description?: string;
+    example?: string;
+}
 export {};
 /**
 let a = {

package/lib/es/store/types.js

@@ -6,6 +6,7 @@ export var AtomsTypeEnum;
   AtomsTypeEnum["NOT_EXISTS"] = "notExists";
   AtomsTypeEnum["FIELD"] = "field";
   AtomsTypeEnum["EXPRESSION"] = "expression";
+  // FUNCTION = 'function', // 函数
   AtomsTypeEnum["INPUT_STRING"] = "inputString";
   AtomsTypeEnum["INPUT_STRING_LIST"] = "inputStringList";
   AtomsTypeEnum["INPUT_NUMBER_LIST"] = "inputNumberList";
@@ -13,6 +14,8 @@ export var AtomsTypeEnum;
   AtomsTypeEnum["CONSTANT"] = "constant";
   AtomsTypeEnum["OPERATOR"] = "operator";
   AtomsTypeEnum["UNKNOWN"] = "unknown";
+  AtomsTypeEnum["FORMULA"] = "FORMULA";
+  AtomsTypeEnum["COLLECTION"] = "collection";
 })(AtomsTypeEnum || (AtomsTypeEnum = {}));
 // ----------- 第五个模块 聚合模块 ------------
 export var MetaSummarize_Enum;

package/lib/es/types.d.ts

@@ -1,4 +1,4 @@
-import type { MetaListType, ToolbarType } from './store/types';
+import type { MetaListType, ToolbarType, FormulaTemplatesItem } from './store/types';
 import { UnionEnum } from './store/enum';
 import { DataType } from './components/dialog/select-join-column';
 export interface MetaListProps {
@@ -32,6 +32,7 @@ export interface MetabaseProps {
     ignoreGroupByType?: boolean;
     filterCustomType?: boolean;
     notExistsColumns?: DataType[];
+    formulaTemplates?: FormulaTemplatesItem[];
 }
 export interface OptionItem {
     value?: string;

package/lib/es/types.js

@@ -1 +1,18 @@
-export {};
+export {};
+// {
+//   name: 'LENGTH', // 函数名
+//   args: [
+//     {
+//       type: 'field', // 参数类型
+//       check: 'string', // null 啥都可以， string 字符串， number 数字， (默认不传是 null)
+//     },
+//     {
+//       type: 'constant', // 参数类型
+//       check: null, // null 啥都可以， string 字符串， number 数字， (默认不传是 null)
+//     },
+//   ],
+//   arity: { max: 4 },
+//   output: 'number', // string | number| null  （默认是 null）
+//   description: '返回字符串的长度',
+//   example: 'LENGTH("hello")',
+// },

package/lib/es/utils.d.ts

@@ -14,6 +14,7 @@ interface HelperResultType {
 }
 export declare const getHelper: (list: MetaListType[], item: MetaListType) => HelperResultType;
 export declare const getSubColumns: (metaList: any) => DataType[];
+export declare function isValidSQLAlias(str: string): boolean;
 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[];

package/lib/es/utils.js

@@ -241,11 +241,22 @@ var _changeAlias = function changeAlias(items, val, type) {
         });
       }
       return v;
+    } else if (v.type === AtomsTypeEnum.FORMULA) {
+      v.args = _changeAlias(v.args, val, type);
+      return v;
+    } else if (v.type === AtomsTypeEnum.COLLECTION) {
+      v.list = _changeAlias(v.list, val, type);
+      return v;
     } else {
       return v;
     }
   });
 };
+export function isValidSQLAlias(str) {
+  if (!str) return false;
+  var regex = /^[A-Za-z_][A-Za-z0-9_]{0,29}$/;
+  return regex.test(str);
+}
 export var changeTableAlias = function changeTableAlias(list, curObj) {
   var _cloneDeep = cloneDeep(curObj),
     tableUuid = _cloneDeep.tableUuid,
@@ -439,6 +450,7 @@ export function splitByUnion(data) {
   return result;
 }
 export var patchData = function patchData(metas) {
+  return metas;
   var mainTable = metas[0] || {};
   var version = (mainTable === null || mainTable === void 0 ? void 0 : mainTable.patchVersion) || '';
   if (version != '1.0.0') {
@@ -584,7 +596,7 @@ export var buildSqlQuery = function buildSqlQuery() {
       var filterStrings = item.filter.map(function (f) {
         if (f.type === AtomsTypeEnum.FIELD) {
           return f.fieldName;
-        } else if (f.type === AtomsTypeEnum.EXPRESSION || f.type === AtomsTypeEnum.EXISTS || f.type === AtomsTypeEnum.NOT_EXISTS) {
+        } else if (f.type === AtomsTypeEnum.EXPRESSION || f.type === AtomsTypeEnum.EXISTS || f.type === AtomsTypeEnum.NOT_EXISTS || f.type === AtomsTypeEnum.FORMULA || f.type === AtomsTypeEnum.COLLECTION) {
           return f.quotes;
         } else if (f.type === AtomsTypeEnum.JOIN_DEFAULT) {
           return '';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gingkoo/pandora-metabase",
-  "version": "1.0.23",
+  "version": "1.0.25",
   "description": "",
   "main": "lib/es/index.js",
   "module": "lib/es/index.js",
@@ -27,7 +27,7 @@
     "react-dom": "^17.0.0 || ^18.0.0"
   },
   "dependencies": {
-    "@gingkoo/pandora": "1.2.0",
+    "@gingkoo/pandora": "1.2.3",
     "@gingkoo/pandora-hooks": "1.0.5",
     "@gingkoo/pandora-icons": "0.0.1-alpha.28",
     "dayjs": "^1.11.11",

package/lib/cjs/components/dialog/formula-list/enum.d.ts

@@ -1,39 +0,0 @@
-import { AtomsTypeEnum } from '../../../store/types';
-export declare enum FunctionEnum {
-    LOWER = "lower",
-    UPPER = "upper",
-    SUBSTRING = "substring",
-    REGEX_MATCH_FIRST = "regex-match-first",
-    'CONCAT' = "concat",
-    'REPLACE' = "replace",
-    'TRIM' = "trim",
-    'RTRIM' = "RTRIM",
-    'LTRIM' = "rtrim",
-    'LENGTH' = "length",
-    'ABS' = "abs",
-    'FLOOR' = "floor",
-    'CEIL' = "ceil",
-    'ROUND' = "round",
-    'SQRT' = "sqrt",
-    'POWER' = "power",
-    'LOG' = "log",
-    'EXP' = "exp",
-    'CONTAINS' = "contains",
-    'ENDS_WITH' = "ends-with",
-    'STARTS_WITH' = "starts-with",
-    'BETWEEN' = "between",
-    'TIME_INTERVAL' = "time-interval",
-    'IS_NULL' = "is-null",
-    'IS_EMPTY' = "is-empty",
-    'COALESCE' = "coalesce"
-}
-export declare const operatorList: string[];
-export declare const customTypes: ({
-    value: AtomsTypeEnum;
-    label: any;
-    children?: undefined;
-} | {
-    value: AtomsTypeEnum;
-    label: any;
-    children: string[];
-})[];

package/lib/cjs/components/dialog/formula-list/enum.js

@@ -1,123 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.operatorList = exports.customTypes = exports.FunctionEnum = void 0;
-var _locale = require("../../../locale");
-var _types = require("../../../store/types");
-// export enum OptionsTypeEnum {
-//   // CONSTANT = 'constant', // 常量
-//   NOT_EXISTS = 'notExists', // 输入框
-//   INPUT = 'input', // 输入框
-//   FIELD = 'field', // 字段
-//   OPERATOR = 'operator', // 运算符
-//   EXPRESSION = 'expression', // 公式
-//   OTHER = 'other', //  其他
-// }
-var FunctionEnum;
-(function (FunctionEnum) {
-  FunctionEnum["LOWER"] = "lower";
-  FunctionEnum["UPPER"] = "upper";
-  FunctionEnum["SUBSTRING"] = "substring";
-  FunctionEnum["REGEX_MATCH_FIRST"] = "regex-match-first";
-  FunctionEnum["CONCAT"] = "concat";
-  FunctionEnum["REPLACE"] = "replace";
-  FunctionEnum["TRIM"] = "trim";
-  FunctionEnum["RTRIM"] = "RTRIM";
-  FunctionEnum["LTRIM"] = "rtrim";
-  FunctionEnum["LENGTH"] = "length";
-  // NUMBER
-  FunctionEnum["ABS"] = "abs";
-  FunctionEnum["FLOOR"] = "floor";
-  FunctionEnum["CEIL"] = "ceil";
-  FunctionEnum["ROUND"] = "round";
-  FunctionEnum["SQRT"] = "sqrt";
-  FunctionEnum["POWER"] = "power";
-  FunctionEnum["LOG"] = "log";
-  FunctionEnum["EXP"] = "exp";
-  // BOOLEAN
-  FunctionEnum["CONTAINS"] = "contains";
-  FunctionEnum["ENDS_WITH"] = "ends-with";
-  FunctionEnum["STARTS_WITH"] = "starts-with";
-  FunctionEnum["BETWEEN"] = "between";
-  FunctionEnum["TIME_INTERVAL"] = "time-interval";
-  FunctionEnum["IS_NULL"] = "is-null";
-  FunctionEnum["IS_EMPTY"] = "is-empty";
-  // OTHER
-  FunctionEnum["COALESCE"] = "coalesce";
-})(FunctionEnum || (exports.FunctionEnum = FunctionEnum = {}));
-var operatorList = exports.operatorList = ['and', 'or', '(', ')', ',', '+', '-', '*', '/', '!=', '<=', '>=', '<', '>', '=', 'case', 'when', 'then', 'else', 'end', 'DESC', 'ASC', 'OVER', 'PARTITION BY', 'ORDER BY', 'RANK()', 'DENSE_RANK()', 'ROW_NUMBER()'];
-// export const otherList = [
-//   'case',
-//   'when',
-//   'then',
-//   'else',
-//   'end',
-//   'RANK()',
-//   'DENSE_RANK()',
-//   'ROW_NUMBER()',
-// ];
-// export const functionList = [
-//   'lower',
-//   'upper',
-//   'substring',
-//   'regex-match-first',
-//   'concat',
-//   'replace',
-//   'trim',
-//   'rtrim',
-//   'ltrim',
-//   'length',
-//   // number
-//   'abs',
-//   'floor',
-//   'ceil',
-//   'round',
-//   'sqrt',
-//   'power',
-//   'log',
-//   'exp',
-//   // boolean
-//   'contains',
-//   'ends-with',
-//   'starts-with',
-//   'between',
-//   'time-interval',
-//   'is-null',
-//   'is-empty',
-//   // other
-//   'coalesce',
-// ];
-var customTypes = exports.customTypes = [
-// 字段
-{
-  value: _types.AtomsTypeEnum.FIELD,
-  label: (0, _locale.__)('customColumn.field')
-},
-// 表达式
-{
-  value: _types.AtomsTypeEnum.EXPRESSION,
-  label: (0, _locale.__)('customColumn.expression')
-},
-// 输入框
-{
-  value: _types.AtomsTypeEnum.INPUT_STRING,
-  label: (0, _locale.__)('SqlQueryBuilder.input')
-},
-// 数字输入框
-{
-  value: _types.AtomsTypeEnum.INPUT_NUMBER,
-  label: (0, _locale.__)('SqlQueryBuilder.numberInput')
-},
-// 数字输入框
-{
-  value: _types.AtomsTypeEnum.CONSTANT,
-  label: (0, _locale.__)('customColumn.constant')
-},
-// 连接符
-{
-  value: _types.AtomsTypeEnum.OPERATOR,
-  label: (0, _locale.__)('customColumn.operator'),
-  children: operatorList
-}];

package/lib/es/components/dialog/formula-list/enum.d.ts

@@ -1,39 +0,0 @@
-import { AtomsTypeEnum } from '../../../store/types';
-export declare enum FunctionEnum {
-    LOWER = "lower",
-    UPPER = "upper",
-    SUBSTRING = "substring",
-    REGEX_MATCH_FIRST = "regex-match-first",
-    'CONCAT' = "concat",
-    'REPLACE' = "replace",
-    'TRIM' = "trim",
-    'RTRIM' = "RTRIM",
-    'LTRIM' = "rtrim",
-    'LENGTH' = "length",
-    'ABS' = "abs",
-    'FLOOR' = "floor",
-    'CEIL' = "ceil",
-    'ROUND' = "round",
-    'SQRT' = "sqrt",
-    'POWER' = "power",
-    'LOG' = "log",
-    'EXP' = "exp",
-    'CONTAINS' = "contains",
-    'ENDS_WITH' = "ends-with",
-    'STARTS_WITH' = "starts-with",
-    'BETWEEN' = "between",
-    'TIME_INTERVAL' = "time-interval",
-    'IS_NULL' = "is-null",
-    'IS_EMPTY' = "is-empty",
-    'COALESCE' = "coalesce"
-}
-export declare const operatorList: string[];
-export declare const customTypes: ({
-    value: AtomsTypeEnum;
-    label: any;
-    children?: undefined;
-} | {
-    value: AtomsTypeEnum;
-    label: any;
-    children: string[];
-})[];

package/lib/es/components/dialog/formula-list/enum.js

@@ -1,117 +0,0 @@
-import { __ } from '../../../locale';
-import { AtomsTypeEnum } from '../../../store/types';
-// export enum OptionsTypeEnum {
-//   // CONSTANT = 'constant', // 常量
-//   NOT_EXISTS = 'notExists', // 输入框
-//   INPUT = 'input', // 输入框
-//   FIELD = 'field', // 字段
-//   OPERATOR = 'operator', // 运算符
-//   EXPRESSION = 'expression', // 公式
-//   OTHER = 'other', //  其他
-// }
-export var FunctionEnum;
-(function (FunctionEnum) {
-  FunctionEnum["LOWER"] = "lower";
-  FunctionEnum["UPPER"] = "upper";
-  FunctionEnum["SUBSTRING"] = "substring";
-  FunctionEnum["REGEX_MATCH_FIRST"] = "regex-match-first";
-  FunctionEnum["CONCAT"] = "concat";
-  FunctionEnum["REPLACE"] = "replace";
-  FunctionEnum["TRIM"] = "trim";
-  FunctionEnum["RTRIM"] = "RTRIM";
-  FunctionEnum["LTRIM"] = "rtrim";
-  FunctionEnum["LENGTH"] = "length";
-  // NUMBER
-  FunctionEnum["ABS"] = "abs";
-  FunctionEnum["FLOOR"] = "floor";
-  FunctionEnum["CEIL"] = "ceil";
-  FunctionEnum["ROUND"] = "round";
-  FunctionEnum["SQRT"] = "sqrt";
-  FunctionEnum["POWER"] = "power";
-  FunctionEnum["LOG"] = "log";
-  FunctionEnum["EXP"] = "exp";
-  // BOOLEAN
-  FunctionEnum["CONTAINS"] = "contains";
-  FunctionEnum["ENDS_WITH"] = "ends-with";
-  FunctionEnum["STARTS_WITH"] = "starts-with";
-  FunctionEnum["BETWEEN"] = "between";
-  FunctionEnum["TIME_INTERVAL"] = "time-interval";
-  FunctionEnum["IS_NULL"] = "is-null";
-  FunctionEnum["IS_EMPTY"] = "is-empty";
-  // OTHER
-  FunctionEnum["COALESCE"] = "coalesce";
-})(FunctionEnum || (FunctionEnum = {}));
-export var operatorList = ['and', 'or', '(', ')', ',', '+', '-', '*', '/', '!=', '<=', '>=', '<', '>', '=', 'case', 'when', 'then', 'else', 'end', 'DESC', 'ASC', 'OVER', 'PARTITION BY', 'ORDER BY', 'RANK()', 'DENSE_RANK()', 'ROW_NUMBER()'];
-// export const otherList = [
-//   'case',
-//   'when',
-//   'then',
-//   'else',
-//   'end',
-//   'RANK()',
-//   'DENSE_RANK()',
-//   'ROW_NUMBER()',
-// ];
-// export const functionList = [
-//   'lower',
-//   'upper',
-//   'substring',
-//   'regex-match-first',
-//   'concat',
-//   'replace',
-//   'trim',
-//   'rtrim',
-//   'ltrim',
-//   'length',
-//   // number
-//   'abs',
-//   'floor',
-//   'ceil',
-//   'round',
-//   'sqrt',
-//   'power',
-//   'log',
-//   'exp',
-//   // boolean
-//   'contains',
-//   'ends-with',
-//   'starts-with',
-//   'between',
-//   'time-interval',
-//   'is-null',
-//   'is-empty',
-//   // other
-//   'coalesce',
-// ];
-export var customTypes = [
-// 字段
-{
-  value: AtomsTypeEnum.FIELD,
-  label: __('customColumn.field')
-},
-// 表达式
-{
-  value: AtomsTypeEnum.EXPRESSION,
-  label: __('customColumn.expression')
-},
-// 输入框
-{
-  value: AtomsTypeEnum.INPUT_STRING,
-  label: __('SqlQueryBuilder.input')
-},
-// 数字输入框
-{
-  value: AtomsTypeEnum.INPUT_NUMBER,
-  label: __('SqlQueryBuilder.numberInput')
-},
-// 数字输入框
-{
-  value: AtomsTypeEnum.CONSTANT,
-  label: __('customColumn.constant')
-},
-// 连接符
-{
-  value: AtomsTypeEnum.OPERATOR,
-  label: __('customColumn.operator'),
-  children: operatorList
-}];