@gingkoo/pandora-metabase 1.0.23 → 1.0.24

package/lib/es/hooks/patch.js

@@ -4,33 +4,35 @@ import { buildSqlQuery } from '../utils';
 import { AtomsTypeEnum } from '../store/types';
 import { TypeEnum } from '../store/enum';
 export var dataPatch = function dataPatch(newMeta) {
-  var _newMeta$expressions;
-  var item = ((_newMeta$expressions = newMeta.expressions) === null || _newMeta$expressions === void 0 ? void 0 : _newMeta$expressions[0]) || {};
-  if (item !== null && item !== void 0 && item.type && Object.values(AtomsTypeEnum).includes(item.type)) {
-    if (item.type === AtomsTypeEnum.EXPRESSION && item.lhs) {
-      return newMeta;
-    }
-  }
+  // let item = newMeta.expressions?.[0] || {};
+  // if (item?.type && Object.values(AtomsTypeEnum).includes(item.type)) {
+  //   if (item.type === AtomsTypeEnum.EXPRESSION && item.lhs) {
+  //     return newMeta;
+  //   }
+  // }
   newMeta.subquery = _patchMetas(newMeta.subquery);
   return newMeta;
 };
 export var joinDataPatch = function joinDataPatch(newMeta) {
-  var _newMeta$expressions2, _fields, _fields2, _fields3, _fields4, _newMeta$expressions3;
-  var item = ((_newMeta$expressions2 = newMeta.expressions) === null || _newMeta$expressions2 === void 0 ? void 0 : _newMeta$expressions2[0]) || {};
-  if (item !== null && item !== void 0 && item.type && Object.values(AtomsTypeEnum).includes(item.type)) {
-    if ((item.type === AtomsTypeEnum.EXPRESSION || item.type === AtomsTypeEnum.JOIN_DEFAULT) && item.lhs) {
-      return newMeta;
-    }
-    if (item.type === AtomsTypeEnum.EXISTS && !item.tableUuid) {
-      return newMeta;
-    }
-    if (item.type === AtomsTypeEnum.NOT_EXISTS && !item.tableUuid) {
-      return newMeta;
-    }
-    if (item.type === AtomsTypeEnum.FIELD && item.fieldName) {
-      return newMeta;
-    }
-  }
+  var _fields, _fields2, _fields3, _fields4, _newMeta$expressions;
+  // let item = newMeta.expressions?.[0] || {};
+  // if (item?.type && Object.values(AtomsTypeEnum).includes(item.type)) {
+  //   if (
+  //     (item.type === AtomsTypeEnum.EXPRESSION || item.type === AtomsTypeEnum.JOIN_DEFAULT) &&
+  //     item.lhs
+  //   ) {
+  //     return newMeta;
+  //   }
+  //   if (item.type === AtomsTypeEnum.EXISTS && !item.tableUuid) {
+  //     return newMeta;
+  //   }
+  //   if (item.type === AtomsTypeEnum.NOT_EXISTS && !item.tableUuid) {
+  //     return newMeta;
+  //   }
+  //   if (item.type === AtomsTypeEnum.FIELD && item.fieldName) {
+  //     return newMeta;
+  //   }
+  // }
   // if (
   //   newMeta.expressions?.[0]?.type &&
   //   Object.values(AtomsTypeEnum).includes(newMeta.expressions[0].type)
@@ -120,7 +122,7 @@ export var joinDataPatch = function joinDataPatch(newMeta) {
       type: 'default' // 默认是字段模式
     }];
   }
-  var expressions = ((_newMeta$expressions3 = newMeta.expressions) === null || _newMeta$expressions3 === void 0 ? void 0 : _newMeta$expressions3.map(function (v) {
+  var expressions = ((_newMeta$expressions = newMeta.expressions) === null || _newMeta$expressions === void 0 ? void 0 : _newMeta$expressions.map(function (v) {
     var _left_fields, _right_fields;
     var left_fields = v.left_fields || [];
     var right_fields = v.right_fields || [];
@@ -261,23 +263,23 @@ export var joinDataPatch = function joinDataPatch(newMeta) {
   return newMeta;
 };
 export var filterPatch = function filterPatch(newMeta) {
-  var _newMeta$filter, _newMeta$filter2;
-  var item = ((_newMeta$filter = newMeta.filter) === null || _newMeta$filter === void 0 ? void 0 : _newMeta$filter[0]) || {};
-  if (item !== null && item !== void 0 && item.type && Object.values(AtomsTypeEnum).includes(item.type)) {
-    if (item.type === AtomsTypeEnum.EXPRESSION && item.lhs) {
-      return newMeta;
-    }
-    if (item.type === AtomsTypeEnum.EXISTS && !item.tableUuid) {
-      return newMeta;
-    }
-    if (item.type === AtomsTypeEnum.NOT_EXISTS && !item.tableUuid) {
-      return newMeta;
-    }
-    if (item.type === AtomsTypeEnum.FIELD && item.fieldName) {
-      return newMeta;
-    }
-  }
-  var _filter = (_newMeta$filter2 = newMeta.filter) === null || _newMeta$filter2 === void 0 ? void 0 : _newMeta$filter2.map(function (v) {
+  var _newMeta$filter;
+  // let item = newMeta.filter?.[0] || {};
+  // if (item?.type && Object.values(AtomsTypeEnum).includes(item.type)) {
+  //   if (item.type === AtomsTypeEnum.EXPRESSION && item.lhs) {
+  //     return newMeta;
+  //   }
+  //   if (item.type === AtomsTypeEnum.EXISTS && !item.tableUuid) {
+  //     return newMeta;
+  //   }
+  //   if (item.type === AtomsTypeEnum.NOT_EXISTS && !item.tableUuid) {
+  //     return newMeta;
+  //   }
+  //   if (item.type === AtomsTypeEnum.FIELD && item.fieldName) {
+  //     return newMeta;
+  //   }
+  // }
+  var _filter = (_newMeta$filter = newMeta.filter) === null || _newMeta$filter === void 0 ? void 0 : _newMeta$filter.map(function (v) {
     // 表达式
     var tem;
     if (typeof v === 'string') {
@@ -369,23 +371,23 @@ export var filterPatch = function filterPatch(newMeta) {
   return newMeta;
 };
 export var customColumnPatch = function customColumnPatch(newMeta) {
-  var _newMeta$customColumn, _newMeta$customColumn2;
-  var item = ((_newMeta$customColumn = newMeta.customColumn[0].formulaList) === null || _newMeta$customColumn === void 0 ? void 0 : _newMeta$customColumn[0]) || {};
-  if (item !== null && item !== void 0 && item.type && Object.values(AtomsTypeEnum).includes(item.type)) {
-    if (item.type === AtomsTypeEnum.EXPRESSION && item.lhs) {
-      return newMeta;
-    }
-    if (item.type === AtomsTypeEnum.EXISTS && !item.tableUuid) {
-      return newMeta;
-    }
-    if (item.type === AtomsTypeEnum.NOT_EXISTS && !item.tableUuid) {
-      return newMeta;
-    }
-    if (item.type === AtomsTypeEnum.FIELD && item.fieldName) {
-      return newMeta;
-    }
-  }
-  newMeta.customColumn = (newMeta === null || newMeta === void 0 || (_newMeta$customColumn2 = newMeta.customColumn) === null || _newMeta$customColumn2 === void 0 ? void 0 : _newMeta$customColumn2.map(function (v) {
+  var _newMeta$customColumn;
+  // let item = newMeta.customColumn?.[0]?.formulaList?.[0] || {};
+  // if (item?.type && Object.values(AtomsTypeEnum).includes(item.type)) {
+  //   if (item.type === AtomsTypeEnum.EXPRESSION && item.lhs) {
+  //     return newMeta;
+  //   }
+  //   if (item.type === AtomsTypeEnum.EXISTS && !item.tableUuid) {
+  //     return newMeta;
+  //   }
+  //   if (item.type === AtomsTypeEnum.NOT_EXISTS && !item.tableUuid) {
+  //     return newMeta;
+  //   }
+  //   if (item.type === AtomsTypeEnum.FIELD && item.fieldName) {
+  //     return newMeta;
+  //   }
+  // }
+  newMeta.customColumn = (newMeta === null || newMeta === void 0 || (_newMeta$customColumn = newMeta.customColumn) === null || _newMeta$customColumn === void 0 ? void 0 : _newMeta$customColumn.map(function (v) {
     var _formulaList = v.formulaList.map(function (formula) {
       var tem = formula;
       if (formula.type === 'expression') {
@@ -502,23 +504,23 @@ export var customColumnPatch = function customColumnPatch(newMeta) {
   return newMeta;
 };
 export var sortPatch = function sortPatch(newMeta) {
-  var _newMeta$sort, _newMeta$sort2;
-  var item = ((_newMeta$sort = newMeta.sort) === null || _newMeta$sort === void 0 || (_newMeta$sort = _newMeta$sort[0].expression) === null || _newMeta$sort === void 0 ? void 0 : _newMeta$sort[0]) || {};
-  if (item !== null && item !== void 0 && item.type && Object.values(AtomsTypeEnum).includes(item.type)) {
-    if (item.type === AtomsTypeEnum.EXPRESSION && item.lhs) {
-      return newMeta;
-    }
-    if (item.type === AtomsTypeEnum.EXISTS && !item.tableUuid) {
-      return newMeta;
-    }
-    if (item.type === AtomsTypeEnum.NOT_EXISTS && !item.tableUuid) {
-      return newMeta;
-    }
-    if (item.type === AtomsTypeEnum.FIELD && item.fieldName) {
-      return newMeta;
-    }
-  }
-  var _sort = (_newMeta$sort2 = newMeta.sort) === null || _newMeta$sort2 === void 0 ? void 0 : _newMeta$sort2.map(function (v) {
+  var _newMeta$sort;
+  // let item = newMeta.sort?.[0].expression?.[0] || {};
+  // if (item?.type && Object.values(AtomsTypeEnum).includes(item.type)) {
+  //   if (item.type === AtomsTypeEnum.EXPRESSION && item.lhs) {
+  //     return newMeta;
+  //   }
+  //   if (item.type === AtomsTypeEnum.EXISTS && !item.tableUuid) {
+  //     return newMeta;
+  //   }
+  //   if (item.type === AtomsTypeEnum.NOT_EXISTS && !item.tableUuid) {
+  //     return newMeta;
+  //   }
+  //   if (item.type === AtomsTypeEnum.FIELD && item.fieldName) {
+  //     return newMeta;
+  //   }
+  // }
+  var _sort = (_newMeta$sort = newMeta.sort) === null || _newMeta$sort === void 0 ? void 0 : _newMeta$sort.map(function (v) {
     return {
       expression: [{
         fieldName: v.name,

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

@@ -70,50 +70,54 @@ var useStore = function useStore() {
     _useState14 = _slicedToArray(_useState13, 2),
     constantList = _useState14[0],
     setConstantList = _useState14[1]; //常量列表
-  var _useState15 = useState(false),
+  var _useState15 = useState([]),
     _useState16 = _slicedToArray(_useState15, 2),
-    ignoreGroupByType = _useState16[0],
-    setIgnoreGroupByType = _useState16[1]; // 忽略groupBy类型
+    formulaTemplates = _useState16[0],
+    setFormulaTemplates = _useState16[1]; //公式配置数组
   var _useState17 = useState(false),
     _useState18 = _slicedToArray(_useState17, 2),
-    filterCustomType = _useState18[0],
-    setfilterCustomType = _useState18[1]; // 过滤器自定义类型
-  var _useState19 = useState({}),
+    ignoreGroupByType = _useState18[0],
+    setIgnoreGroupByType = _useState18[1]; // 忽略groupBy类型
+  var _useState19 = useState(false),
     _useState20 = _slicedToArray(_useState19, 2),
-    _cacheSource2TableMap = _useState20[0],
-    set_cacheSource2TableMap = _useState20[1]; //数据源id 对应数据集列表
+    filterCustomType = _useState20[0],
+    setfilterCustomType = _useState20[1]; // 过滤器自定义类型
   var _useState21 = useState({}),
     _useState22 = _slicedToArray(_useState21, 2),
-    _cacheColumnsMap = _useState22[0],
-    set_cacheColumnsMap = _useState22[1]; //数据源id 对应数据集列表
-  var _useState23 = useState(defaultMeta),
+    _cacheSource2TableMap = _useState22[0],
+    set_cacheSource2TableMap = _useState22[1]; //数据源id 对应数据集列表
+  var _useState23 = useState({}),
     _useState24 = _slicedToArray(_useState23, 2),
-    metaList = _useState24[0],
-    _setMeta = _useState24[1]; //数据源id 对应数据集列表
-  var _useState25 = useState({
+    _cacheColumnsMap = _useState24[0],
+    set_cacheColumnsMap = _useState24[1]; //数据源id 对应数据集列表
+  var _useState25 = useState(defaultMeta),
+    _useState26 = _slicedToArray(_useState25, 2),
+    metaList = _useState26[0],
+    _setMeta = _useState26[1]; //数据源id 对应数据集列表
+  var _useState27 = useState({
       visible: false,
       node: null,
       content: null
     }),
-    _useState26 = _slicedToArray(_useState25, 2),
-    popupData = _useState26[0],
-    setPopup = _useState26[1]; //弹窗
-  var _useState27 = useState({
+    _useState28 = _slicedToArray(_useState27, 2),
+    popupData = _useState28[0],
+    setPopup = _useState28[1]; //弹窗
+  var _useState29 = useState({
       visible: false,
       node: null,
       content: null
     }),
-    _useState28 = _slicedToArray(_useState27, 2),
-    popupData2 = _useState28[0],
-    setPopup2 = _useState28[1]; //弹窗
-  var _useState29 = useState(true),
     _useState30 = _slicedToArray(_useState29, 2),
-    popupClosable = _useState30[0],
-    setClosable = _useState30[1]; //是否可关闭 如果弹框里面再弹框 则不可关闭
+    popupData2 = _useState30[0],
+    setPopup2 = _useState30[1]; //弹窗
   var _useState31 = useState(true),
     _useState32 = _slicedToArray(_useState31, 2),
-    popupClosable2 = _useState32[0],
-    setClosable2 = _useState32[1]; //是否可关闭 如果弹框里面再弹框 则不可关闭
+    popupClosable = _useState32[0],
+    setClosable = _useState32[1]; //是否可关闭 如果弹框里面再弹框 则不可关闭
+  var _useState33 = useState(true),
+    _useState34 = _slicedToArray(_useState33, 2),
+    popupClosable2 = _useState34[0],
+    setClosable2 = _useState34[1]; //是否可关闭 如果弹框里面再弹框 则不可关闭
   // 外层ref
   var popupContainer = useRef();
   // const [fetchDatasetFn, setFetchDatasetFn] = useState<(id: string) => Promise<any>>(
@@ -585,7 +589,9 @@ var useStore = function useStore() {
     ignoreGroupByType: ignoreGroupByType,
     setIgnoreGroupByType: setIgnoreGroupByType,
     filterCustomType: filterCustomType,
-    setfilterCustomType: setfilterCustomType
+    setfilterCustomType: setfilterCustomType,
+    formulaTemplates: formulaTemplates,
+    setFormulaTemplates: setFormulaTemplates
   };
 };
 export default useStore;

package/lib/es/index.js

@@ -38,6 +38,7 @@ var SqlVisionBuilder = React.forwardRef(function (props, ref) {
     _props$subShowSubquer = props.subShowSubquery,
     subShowSubquery = _props$subShowSubquer === void 0 ? false : _props$subShowSubquer,
     constantList = props.constantList,
+    formulaTemplates = props.formulaTemplates,
     _props$ignoreGroupByT = props.ignoreGroupByType,
     ignoreGroupByType = _props$ignoreGroupByT === void 0 ? false : _props$ignoreGroupByT,
     _props$filterCustomTy = props.filterCustomType,
@@ -65,9 +66,10 @@ var SqlVisionBuilder = React.forwardRef(function (props, ref) {
     store.setShowSubquery(showSubquery);
     store._setShowSubquery(subShowSubquery);
     store.setConstantList(constantList || []);
+    store.setFormulaTemplates(formulaTemplates || []);
     store.setIgnoreGroupByType(ignoreGroupByType);
     store.setfilterCustomType(filterCustomType);
-  }, [showFields, fieldNameTpl, tableNameTpl, toolbar, showSubquery, subShowSubquery, constantList, ignoreGroupByType, filterCustomType]);
+  }, [showFields, fieldNameTpl, tableNameTpl, toolbar, showSubquery, subShowSubquery, constantList, formulaTemplates, ignoreGroupByType, filterCustomType]);
   React.useImperativeHandle(ref, function () {
     return {
       // setDatasource: (list) => {

package/lib/es/locale/en.js

@@ -33,8 +33,10 @@ export default register('en', {
   'SqlQueryBuilder.customExpression': 'customExpression',
   'SqlQueryBuilder.pickTable': 'Select data table...',
   'SqlQueryBuilder.pickConstant': 'Select constant...',
-  'SqlQueryBuilder.input': 'Input',
-  'SqlQueryBuilder.numberInput': 'Number Input',
+  'customColumn.input': 'Input',
+  'customColumn.numberInput': 'Number input',
+  'customColumn.formula': 'Formula',
+  'customColumn.selectFormula': 'Select formula...',
   'SqlQueryBuilder.switchSubQuery': 'Open subquery',
   'SqlQueryBuilder.setSubQuery': 'Set Subquery...',
   'SqlQueryBuilder.subquery': 'Subquery',

package/lib/es/locale/zh.js

@@ -33,8 +33,6 @@ export default register('zh', {
   'SqlQueryBuilder.customExpression': '自定义表达方式',
   'SqlQueryBuilder.pickTable': '选择数据表...',
   'SqlQueryBuilder.pickConstant': '选择常量...',
-  'SqlQueryBuilder.input': '输入框',
-  'SqlQueryBuilder.numberInput': '数字输入框',
   'SqlQueryBuilder.switchSubQuery': '切换子查询',
   'SqlQueryBuilder.setSubQuery': '设置子查询...',
   'SqlQueryBuilder.subquery': '子查询',
@@ -65,6 +63,10 @@ export default register('zh', {
   'customColumn.selectExpression': '选择表达式',
   'customColumn.selectOtherSyntax': '选择其他语法',
   'customColumn.selectCustomInput': '选择自定义输入框',
+  'customColumn.formula': '公式',
+  'customColumn.selectFormula': '选择公式...',
+  'customColumn.input': '输入框',
+  'customColumn.numberInput': '数字输入框',
   'filter.addFilter': '添加过滤器',
   'filter.confirm': '确认',
   'filter.pleaseEnter': '请输入',

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

@@ -1,4 +1,4 @@
-import { MetaListType, MetaSummarize_Group, AtomsTypeEnum, AtomsItem } from './types';
+import { MetaListType, MetaSummarize_Group } from './types';
 export declare const SummarizeAlias = "source";
 export declare const summarizeToSql: (arr: MetaSummarize_Group[], record: MetaSummarize_Group) => {
     sql: string;
@@ -6,4 +6,3 @@ export declare const summarizeToSql: (arr: MetaSummarize_Group[], record: MetaSu
 };
 export declare const compressionStructure: (data: MetaListType[]) => string;
 export declare const restoreStructure: (data: string) => MetaListType[];
-export declare const getTemItem: (type: AtomsTypeEnum) => AtomsItem;

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.js

@@ -439,6 +439,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 +585,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.24",
   "description": "",
   "main": "lib/es/index.js",
   "module": "lib/es/index.js",

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[];
-})[];