@gingkoo/pandora-metabase 1.0.23 → 1.0.24

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

@@ -4,9 +4,11 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getTemplate = void 0;
+exports.operatorList = exports.isOk = exports.insertTemplateAt = exports.getTemplateItem = exports.customTypes = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/toConsumableArray"));
+var _locale = require("../../../locale");
 var _types = require("../../../store/types");
+// import { FUNCTION_TEMPLATES } from '../function/utils';
 /**
  *
  * @param type 当前选择的类型
@@ -14,7 +16,7 @@ var _types = require("../../../store/types");
  * @param index 需要讲模版插入的位置
  * @returns
  */
-var getTemplate = exports.getTemplate = function getTemplate(oldType, type, list, index) {
+var insertTemplateAt = exports.insertTemplateAt = function insertTemplateAt(oldType, type, list, index) {
   var temList = [];
   var needChange = ['RANK()', 'DENSE_RANK()', 'ROW_NUMBER()', 'when', 'case', 'then'].includes(oldType);
   // 只改变类型不需要插入模版
@@ -123,4 +125,159 @@ var getTemplate = exports.getTemplate = function getTemplate(oldType, type, list
   }
   list.splice.apply(list, [index + 1, 0].concat((0, _toConsumableArray2["default"])(temList)));
   return list;
+};
+var operatorList = exports.operatorList = ['and', 'or', '(', ')', ',', '+', '-', '*', '/', '!=', '<=', '>=', '<', '>', '=', 'case', 'when', 'then', 'else', 'end', 'DESC', 'ASC', 'OVER', 'PARTITION BY', 'ORDER BY', 'RANK()', 'DENSE_RANK()', 'ROW_NUMBER()'];
+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.__)('customColumn.input')
+},
+// 数字输入框
+{
+  value: _types.AtomsTypeEnum.INPUT_NUMBER,
+  label: (0, _locale.__)('customColumn.numberInput')
+},
+// 数字输入框
+{
+  value: _types.AtomsTypeEnum.CONSTANT,
+  label: (0, _locale.__)('customColumn.constant')
+},
+// 连接符
+{
+  value: _types.AtomsTypeEnum.OPERATOR,
+  label: (0, _locale.__)('customColumn.operator'),
+  children: operatorList
+},
+// 函数
+{
+  value: _types.AtomsTypeEnum.FORMULA,
+  label: (0, _locale.__)('customColumn.formula'),
+  children: operatorList
+}];
+var getTemplateItem = exports.getTemplateItem = function getTemplateItem(type) {
+  var temItem;
+  // 字段
+  if (type === _types.AtomsTypeEnum.FIELD) {
+    temItem = {
+      fieldName: '',
+      // 字段名
+      fieldNameZh: '',
+      // 字段中文名
+      fieldAlias: '',
+      // 别名
+      fieldUuid: '',
+      // uuid
+      fieldId: '',
+      // 字段id
+      // quotes?: string; // 字段展示的 不知道有没有用
+      tableName: '',
+      // 表名
+      tableNameZh: '',
+      tableId: '',
+      // 表名
+      tableAlias: '',
+      // 别名
+      tableUuid: '',
+      // 表唯一标识
+      datasourceName: '',
+      // 数据源名
+      datasourceId: '',
+      // 数据源id
+      type: _types.AtomsTypeEnum.FIELD
+    };
+  }
+  // 表达式
+  else if (type === _types.AtomsTypeEnum.EXPRESSION || type === _types.AtomsTypeEnum.JOIN_DEFAULT) {
+    return {
+      lhs: [],
+      rhs: [],
+      condition: '',
+      quotes: '',
+      type: type
+    };
+  } else if (type === _types.AtomsTypeEnum.EXISTS || type === _types.AtomsTypeEnum.NOT_EXISTS) {
+    return {
+      quotes: '',
+      // 展示用户看的 组装的文字
+      notExists: [],
+      type: type
+    };
+  } else if (type === _types.AtomsTypeEnum.UNKNOWN) {
+    return {
+      // quotes: '', // 展示用户看的 组装的文字
+      // notExists: [],
+      val: '',
+      type: type
+    };
+  } else if (type === _types.AtomsTypeEnum.INPUT_NUMBER) {
+    return {
+      val: 0,
+      type: type
+    };
+  } else if (type === _types.AtomsTypeEnum.INPUT_NUMBER_LIST || type === _types.AtomsTypeEnum.INPUT_STRING_LIST) {
+    temItem = {
+      val: [],
+      type: type
+    };
+  } else if (type === _types.AtomsTypeEnum.FORMULA) {
+    temItem = {
+      args: [],
+      // params: FUNCTION_TEMPLATES?.[type]?.params || [],
+      // arity: FUNCTION_TEMPLATES?.[type]?.arity || {},
+      name: '',
+      quotes: '',
+      type: type
+    };
+  } else if (type === _types.AtomsTypeEnum.COLLECTION) {
+    return {
+      list: [],
+      quotes: '',
+      type: type
+    };
+  } else {
+    // 其他
+    temItem = {
+      val: '',
+      type: type
+    };
+  }
+  return temItem;
+};
+var _isOk = exports.isOk = function isOk(rhsVal) {
+  return rhsVal.every(function (v) {
+    if (v.type === _types.AtomsTypeEnum.UNKNOWN) {
+      return false;
+    } else if (v.type === _types.AtomsTypeEnum.JOIN_DEFAULT) {
+      // 这个情况应该是不存在的
+      return true; // 或者根据业务逻辑决定是否算“有效”
+    } else if (v.type === _types.AtomsTypeEnum.FIELD) {
+      return Boolean(v.fieldName); // 确保 fieldName 存在且非空
+    } else if (v.type === _types.AtomsTypeEnum.EXPRESSION || v.type === _types.AtomsTypeEnum.EXISTS || v.type === _types.AtomsTypeEnum.NOT_EXISTS) {
+      return Boolean(v.quotes); // 确保 quotes 存在
+    } else if (v.type === _types.AtomsTypeEnum.INPUT_STRING_LIST) {
+      return Array.isArray(v.val) && v.val.every(function (vv) {
+        return Boolean(vv);
+      });
+    } else if (v.type === _types.AtomsTypeEnum.COLLECTION) {
+      return _isOk(v.list || []);
+    } else if (v.type === _types.AtomsTypeEnum.FORMULA) {
+      if (!v.quotes) {
+        return false;
+      }
+      return _isOk(v.args || []);
+    } else {
+      return Boolean(v.val); // 兜底，确保 val 存在
+    }
+  });
 };

package/lib/cjs/components/metabase/index.less

@@ -152,6 +152,7 @@
           -webkit-box-align: center;
           align-items: center;
           cursor: pointer;
+          height: 36px;
           // &-OPERATOR {
           //   // 操作符
           //   background-color: var(--link-5);

package/lib/cjs/components/modules/enum/filter-enum.d.ts

@@ -28,7 +28,12 @@ export declare enum FunctionEnum {
     'COALESCE' = "coalesce"
 }
 export declare const operatorList: string[];
-export declare const customTypes: {
+export declare const customTypes: ({
     value: AtomsTypeEnum;
     label: any;
-}[];
+    children?: undefined;
+} | {
+    value: AtomsTypeEnum;
+    label: any;
+    children: string[];
+})[];

package/lib/cjs/components/modules/enum/filter-enum.js

@@ -104,12 +104,12 @@ var customTypes = exports.customTypes = [
 // 输入框
 {
   value: _types.AtomsTypeEnum.INPUT_STRING,
-  label: (0, _locale.__)('SqlQueryBuilder.input')
+  label: (0, _locale.__)('customColumn.input')
 },
 // 数字输入框
 {
   value: _types.AtomsTypeEnum.INPUT_NUMBER,
-  label: (0, _locale.__)('SqlQueryBuilder.numberInput')
+  label: (0, _locale.__)('customColumn.numberInput')
 },
 // 表达式
 {
@@ -121,6 +121,12 @@ var customTypes = exports.customTypes = [
   value: _types.AtomsTypeEnum.OPERATOR,
   label: (0, _locale.__)('customColumn.operator')
 },
+// 函数
+{
+  value: _types.AtomsTypeEnum.FORMULA,
+  label: (0, _locale.__)('customColumn.formula'),
+  children: operatorList
+},
 // EXISTS
 {
   value: _types.AtomsTypeEnum.NOT_EXISTS,

package/lib/cjs/components/modules/join-data.js

@@ -693,10 +693,10 @@ var JoinData = function JoinData(props) {
         // value={(((newMeta[index] as MetaJoin).expressions[_ind] as AtomsExpression)[position])[`type`]}
         list: [{
           value: _types.AtomsTypeEnum.INPUT_STRING,
-          label: (0, _locale.__)('SqlQueryBuilder.input')
+          label: (0, _locale.__)('customColumn.input')
         }, {
           value: _types.AtomsTypeEnum.INPUT_NUMBER,
-          label: (0, _locale.__)('SqlQueryBuilder.numberInput')
+          label: (0, _locale.__)('customColumn.numberInput')
         }, {
           value: _types.AtomsTypeEnum.CONSTANT,
           label: (0, _locale.__)('customColumn.constant')
@@ -1362,6 +1362,31 @@ var JoinData = function JoinData(props) {
                 })]
               }, i);
             }
+            // if (v.type === AtomsTypeEnum.COLLECTION) {
+            //   return (
+            //     <FormulaList
+            //       // check={formulaList?.[fun.name]?.args?.[i]?.check || ''}
+            //       value={v.list}
+            //       data={data}
+            //       ref={ref}
+            //       onChange={(data, _quotes) => {
+            //         const _args = cloneDeep(fun.args);
+            //         (_args[i] as AtomsCollection).list = data;
+            //         (_args[i] as AtomsCollection).quotes = _quotes || '';
+            //         const quotes = (_args as AtomsCollection[])
+            //           .map((v) => {
+            //             return v.quotes;
+            //           })
+            //           .join(' , ');
+            //         setFun({
+            //           ...fun,
+            //           quotes: fun.name + ' ( ' + quotes + ' ) ',
+            //           args: _args,
+            //         });
+            //       }}
+            //     ></FormulaList>
+            //   );
+            // }
           })), ((_meta$table9 = meta.table2) === null || _meta$table9 === void 0 ? void 0 : _meta$table9.name) && ((_meta$table0 = meta.table1) === null || _meta$table0 === void 0 ? void 0 : _meta$table0.name) && (((_meta$expressions2 = meta.expressions) === null || _meta$expressions2 === void 0 ? void 0 : _meta$expressions2.length) || 0) < 1 && (0, _jsxRuntime.jsx)(_pandora.Tooltip, {
             title: (0, _locale.__)('SqlQueryBuilder.add'),
             children: (0, _jsxRuntime.jsx)(_pandora.Dropdown, {

package/lib/cjs/hooks/patch.js

@@ -11,33 +11,35 @@ var _utils = require("../utils");
 var _types = require("../store/types");
 var _enum = require("../store/enum");
 var dataPatch = exports.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(_types.AtomsTypeEnum).includes(item.type)) {
-    if (item.type === _types.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;
 };
 var joinDataPatch = exports.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(_types.AtomsTypeEnum).includes(item.type)) {
-    if ((item.type === _types.AtomsTypeEnum.EXPRESSION || item.type === _types.AtomsTypeEnum.JOIN_DEFAULT) && item.lhs) {
-      return newMeta;
-    }
-    if (item.type === _types.AtomsTypeEnum.EXISTS && !item.tableUuid) {
-      return newMeta;
-    }
-    if (item.type === _types.AtomsTypeEnum.NOT_EXISTS && !item.tableUuid) {
-      return newMeta;
-    }
-    if (item.type === _types.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)
@@ -127,7 +129,7 @@ var joinDataPatch = exports.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 || [];
@@ -268,23 +270,23 @@ var joinDataPatch = exports.joinDataPatch = function joinDataPatch(newMeta) {
   return newMeta;
 };
 var filterPatch = exports.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(_types.AtomsTypeEnum).includes(item.type)) {
-    if (item.type === _types.AtomsTypeEnum.EXPRESSION && item.lhs) {
-      return newMeta;
-    }
-    if (item.type === _types.AtomsTypeEnum.EXISTS && !item.tableUuid) {
-      return newMeta;
-    }
-    if (item.type === _types.AtomsTypeEnum.NOT_EXISTS && !item.tableUuid) {
-      return newMeta;
-    }
-    if (item.type === _types.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') {
@@ -376,23 +378,23 @@ var filterPatch = exports.filterPatch = function filterPatch(newMeta) {
   return newMeta;
 };
 var customColumnPatch = exports.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(_types.AtomsTypeEnum).includes(item.type)) {
-    if (item.type === _types.AtomsTypeEnum.EXPRESSION && item.lhs) {
-      return newMeta;
-    }
-    if (item.type === _types.AtomsTypeEnum.EXISTS && !item.tableUuid) {
-      return newMeta;
-    }
-    if (item.type === _types.AtomsTypeEnum.NOT_EXISTS && !item.tableUuid) {
-      return newMeta;
-    }
-    if (item.type === _types.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') {
@@ -509,23 +511,23 @@ var customColumnPatch = exports.customColumnPatch = function customColumnPatch(n
   return newMeta;
 };
 var sortPatch = exports.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(_types.AtomsTypeEnum).includes(item.type)) {
-    if (item.type === _types.AtomsTypeEnum.EXPRESSION && item.lhs) {
-      return newMeta;
-    }
-    if (item.type === _types.AtomsTypeEnum.EXISTS && !item.tableUuid) {
-      return newMeta;
-    }
-    if (item.type === _types.AtomsTypeEnum.NOT_EXISTS && !item.tableUuid) {
-      return newMeta;
-    }
-    if (item.type === _types.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/cjs/hooks/use-state.js

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

package/lib/cjs/index.js

@@ -48,6 +48,7 @@ var SqlVisionBuilder = _react["default"].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,
@@ -75,9 +76,10 @@ var SqlVisionBuilder = _react["default"].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["default"].useImperativeHandle(ref, function () {
     return {
       // setDatasource: (list) => {

package/lib/cjs/locale/en.js

@@ -39,8 +39,10 @@ var _default = exports["default"] = (0, _index.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/cjs/locale/zh.js

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

package/lib/cjs/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;