@gingkoo/pandora-metabase 1.0.24 → 1.0.25

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

@@ -62,69 +62,69 @@ var useStore = function useStore() {
     toolbar = _useState8[0],
     setToolbar = _useState8[1]; //工具列表
   var _useState9 = (0, _react.useState)('${name}'),
-    _useState0 = (0, _slicedToArray2["default"])(_useState9, 2),
-    fieldNameTpl = _useState0[0],
-    setFieldNameTpl = _useState0[1]; //显示字段
-  var _useState1 = (0, _react.useState)('${name}'),
-    _useState10 = (0, _slicedToArray2["default"])(_useState1, 2),
-    tableNameTpl = _useState10[0],
-    setTableNameTpl = _useState10[1]; //显示字段
-  var _useState11 = (0, _react.useState)([]),
+    _useState10 = (0, _slicedToArray2["default"])(_useState9, 2),
+    fieldNameTpl = _useState10[0],
+    setFieldNameTpl = _useState10[1]; //显示字段
+  var _useState11 = (0, _react.useState)('${name}'),
     _useState12 = (0, _slicedToArray2["default"])(_useState11, 2),
-    sourceList = _useState12[0],
-    setSourceList = _useState12[1]; //数据源列表
+    tableNameTpl = _useState12[0],
+    setTableNameTpl = _useState12[1]; //显示字段
   var _useState13 = (0, _react.useState)([]),
     _useState14 = (0, _slicedToArray2["default"])(_useState13, 2),
-    constantList = _useState14[0],
-    setConstantList = _useState14[1]; //常量列表
+    sourceList = _useState14[0],
+    setSourceList = _useState14[1]; //数据源列表
   var _useState15 = (0, _react.useState)([]),
     _useState16 = (0, _slicedToArray2["default"])(_useState15, 2),
-    formulaTemplates = _useState16[0],
-    setFormulaTemplates = _useState16[1]; //公式配置数组
-  var _useState17 = (0, _react.useState)(false),
+    constantList = _useState16[0],
+    setConstantList = _useState16[1]; //常量列表
+  var _useState17 = (0, _react.useState)([]),
     _useState18 = (0, _slicedToArray2["default"])(_useState17, 2),
-    ignoreGroupByType = _useState18[0],
-    setIgnoreGroupByType = _useState18[1]; // 忽略groupBy类型
+    formulaTemplates = _useState18[0],
+    setFormulaTemplates = _useState18[1]; //公式配置数组
   var _useState19 = (0, _react.useState)(false),
     _useState20 = (0, _slicedToArray2["default"])(_useState19, 2),
-    filterCustomType = _useState20[0],
-    setfilterCustomType = _useState20[1]; // 过滤器自定义类型
-  var _useState21 = (0, _react.useState)({}),
+    ignoreGroupByType = _useState20[0],
+    setIgnoreGroupByType = _useState20[1]; // 忽略groupBy类型
+  var _useState21 = (0, _react.useState)(false),
     _useState22 = (0, _slicedToArray2["default"])(_useState21, 2),
-    _cacheSource2TableMap = _useState22[0],
-    set_cacheSource2TableMap = _useState22[1]; //数据源id 对应数据集列表
+    filterCustomType = _useState22[0],
+    setfilterCustomType = _useState22[1]; // 过滤器自定义类型
   var _useState23 = (0, _react.useState)({}),
     _useState24 = (0, _slicedToArray2["default"])(_useState23, 2),
-    _cacheColumnsMap = _useState24[0],
-    set_cacheColumnsMap = _useState24[1]; //数据源id 对应数据集列表
-  var _useState25 = (0, _react.useState)(defaultMeta),
+    _cacheSource2TableMap = _useState24[0],
+    set_cacheSource2TableMap = _useState24[1]; //数据源id 对应数据集列表
+  var _useState25 = (0, _react.useState)({}),
     _useState26 = (0, _slicedToArray2["default"])(_useState25, 2),
-    metaList = _useState26[0],
-    _setMeta = _useState26[1]; //数据源id 对应数据集列表
-  var _useState27 = (0, _react.useState)({
+    _cacheColumnsMap = _useState26[0],
+    set_cacheColumnsMap = _useState26[1]; //数据源id 对应数据集列表
+  var _useState27 = (0, _react.useState)(defaultMeta),
+    _useState28 = (0, _slicedToArray2["default"])(_useState27, 2),
+    metaList = _useState28[0],
+    _setMeta = _useState28[1]; //数据源id 对应数据集列表
+  var _useState29 = (0, _react.useState)({
       visible: false,
       node: null,
       content: null
     }),
-    _useState28 = (0, _slicedToArray2["default"])(_useState27, 2),
-    popupData = _useState28[0],
-    setPopup = _useState28[1]; //弹窗
-  var _useState29 = (0, _react.useState)({
+    _useState30 = (0, _slicedToArray2["default"])(_useState29, 2),
+    popupData = _useState30[0],
+    setPopup = _useState30[1]; //弹窗
+  var _useState31 = (0, _react.useState)({
       visible: false,
       node: null,
       content: null
     }),
-    _useState30 = (0, _slicedToArray2["default"])(_useState29, 2),
-    popupData2 = _useState30[0],
-    setPopup2 = _useState30[1]; //弹窗
-  var _useState31 = (0, _react.useState)(true),
     _useState32 = (0, _slicedToArray2["default"])(_useState31, 2),
-    popupClosable = _useState32[0],
-    setClosable = _useState32[1]; //是否可关闭 如果弹框里面再弹框 则不可关闭
+    popupData2 = _useState32[0],
+    setPopup2 = _useState32[1]; //弹窗
   var _useState33 = (0, _react.useState)(true),
     _useState34 = (0, _slicedToArray2["default"])(_useState33, 2),
-    popupClosable2 = _useState34[0],
-    setClosable2 = _useState34[1]; //是否可关闭 如果弹框里面再弹框 则不可关闭
+    popupClosable = _useState34[0],
+    setClosable = _useState34[1]; //是否可关闭 如果弹框里面再弹框 则不可关闭
+  var _useState35 = (0, _react.useState)(true),
+    _useState36 = (0, _slicedToArray2["default"])(_useState35, 2),
+    popupClosable2 = _useState36[0],
+    setClosable2 = _useState36[1]; //是否可关闭 如果弹框里面再弹框 则不可关闭
   // 外层ref
   var popupContainer = (0, _react.useRef)();
   // const [fetchDatasetFn, setFetchDatasetFn] = useState<(id: string) => Promise<any>>(
@@ -149,14 +149,21 @@ var useStore = function useStore() {
       var summarizeItems = item.list.filter(function (v) {
         return v.type === _enum.TypeEnum.summarize;
       });
+      var index = (0, _utils.findIndex)(item.list, summarizeItems[summarizeItems.length - 1]);
       // 如果没有汇总项，默认显示主列
       if (summarizeItems.length === 0) {
-        return true;
+        return {
+          showColumn: true,
+          index: -1
+        };
       }
       // 如果只有一个汇总项，并且 group 和 by 都为空，则也显示主列
       var onlyItem = summarizeItems[0];
       var hasGroupOrBy = Array.isArray(onlyItem.group) && onlyItem.group.length > 0 || Array.isArray(onlyItem.by) && onlyItem.by.length > 0;
-      return !hasGroupOrBy;
+      return {
+        showColumn: !hasGroupOrBy,
+        index: index
+      };
     });
   }, [metaList]);
   // const showMainColumn = useMemo(() => {
@@ -177,23 +184,23 @@ var useStore = function useStore() {
   var fetchDataset = /*#__PURE__*/function () {
     var _ref = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(datasourceId) {
       var tables, _tables;
-      return _regenerator["default"].wrap(function (_context) {
+      return _regenerator["default"].wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             tables = getDataset(datasourceId);
             if (!tables.length) {
-              _context.next = 1;
+              _context.next = 3;
               break;
             }
             return _context.abrupt("return", tables);
-          case 1:
-            _context.next = 2;
+          case 3:
+            _context.next = 5;
             return fetchDatasetFn.current(datasourceId);
-          case 2:
+          case 5:
             _tables = _context.sent;
             setDataset(datasourceId, _tables);
             return _context.abrupt("return", _tables);
-          case 3:
+          case 8:
           case "end":
             return _context.stop();
         }
@@ -207,38 +214,60 @@ var useStore = function useStore() {
   //  fetchDataset():
   // 查询表字段
   var fetchColumns = /*#__PURE__*/function () {
-    var _ref2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2(table, datasourceId, callback) {
+    var _ref2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2(table, datasourceId) {
       var _columns2;
-      var _table$alias, alias, datasourceName, did, column, extra, tableName, columns, _columns;
-      return _regenerator["default"].wrap(function (_context2) {
+      var oldColumns,
+        callback,
+        selectId,
+        _table$alias,
+        alias,
+        datasourceName,
+        did,
+        column,
+        extra,
+        tableName,
+        columns,
+        _columns,
+        _args2 = arguments;
+      return _regenerator["default"].wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
+            oldColumns = _args2.length > 2 && _args2[2] !== undefined ? _args2[2] : [];
+            callback = _args2.length > 3 ? _args2[3] : undefined;
+            // 获取之前选中的数据
+            selectId = oldColumns.filter(function (v) {
+              return v.select;
+            }).map(function (v) {
+              return v.id;
+            });
             _table$alias = table.alias, alias = _table$alias === void 0 ? '' : _table$alias, datasourceName = table.datasourceName, did = table.datasourceId, column = table.column, extra = (0, _objectWithoutProperties2["default"])(table, _excluded);
             tableName = table.name;
             columns = getColumns(tableName);
             if (columns.length) {
-              _context2.next = 2;
+              _context2.next = 11;
               break;
             }
-            _context2.next = 1;
+            _context2.next = 9;
             return fetchColumnsFn.current(extra, datasourceId);
-          case 1:
+          case 9:
             columns = _context2.sent;
             setColumns(tableName, columns);
-          case 2:
+          case 11:
             _columns = (_columns2 = columns) === null || _columns2 === void 0 ? void 0 : _columns2.map(function (v) {
+              var select = selectId.includes(v.id);
               return (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, v), {}, {
-                fieldUuid: v.fieldAlias || (0, _helper.uuidv4)('field')
+                select: select,
+                fieldUuid: v.fieldUuid || (0, _helper.uuidv4)('field')
               });
             });
             typeof callback === 'function' && callback(_columns);
-          case 3:
+          case 13:
           case "end":
             return _context2.stop();
         }
       }, _callee2);
     }));
-    return function fetchColumns(_x2, _x3, _x4) {
+    return function fetchColumns(_x2, _x3) {
       return _ref2.apply(this, arguments);
     };
   }();
@@ -294,8 +323,8 @@ var useStore = function useStore() {
           //   newMeta[i] = setFilterQuotes(newMeta[i]);
           // }
           // 设置右侧column
-          if ((_v$table = v.table2) !== null && _v$table !== void 0 && _v$table.datasourceId && v.columns.length < 1) {
-            fetchColumns(newMeta[i].table2, newMeta[i].table2.datasourceId, function () {
+          if ((_v$table = v.table2) !== null && _v$table !== void 0 && _v$table.datasourceId) {
+            fetchColumns(newMeta[i].table2, newMeta[i].table2.datasourceId, v.columns, function () {
               var columns = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
               if (v.isSubquery) {
                 var newColumns = [];
@@ -312,8 +341,8 @@ var useStore = function useStore() {
             return (0, _objectSpread2["default"])({}, v);
           }
           // 设置column
-          if ((_v$table2 = v.table) !== null && _v$table2 !== void 0 && _v$table2.datasourceId && v.columns.length < 1) {
-            fetchColumns(newMeta[i].table, newMeta[i].table.datasourceId, function () {
+          if ((_v$table2 = v.table) !== null && _v$table2 !== void 0 && _v$table2.datasourceId) {
+            fetchColumns(newMeta[i].table, newMeta[i].table.datasourceId, v.columns, function () {
               var columns = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
               if (v.isSubquery) {
                 var newColumns = [];

package/lib/cjs/index.js

@@ -17,7 +17,8 @@ var _locale = require("./locale");
 var _Loading = _interopRequireDefault(require("./common/Loading"));
 var _metabase = _interopRequireDefault(require("./components/metabase"));
 var _utils = require("./utils");
-function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
 // export { restoreStructure, handleSqlStruct, compressionStructure } from './store/helper';
 
 /**

package/lib/cjs/locale/en.js

@@ -55,8 +55,9 @@ var _default = exports["default"] = (0, _index.register)('en', {
   'SqlQueryBuilder.visualize': 'visualize',
   'SqlQueryBuilder.selectColumnAll': 'select all',
   'SqlQueryBuilder.alias': 'alias',
-  'SqlQueryBuilder.aliasCannotEmpty': 'Alias cannot be empty',
+  'SqlQueryBuilder.aliasForRules': 'Please modify the alias according to the rules, and ensure its length does not exceed 30 characters',
   'customColumn.operator': 'operator',
+  'customColumn.collection': 'collection',
   'customColumn.field': 'field',
   'customColumn.constant': 'constant',
   'customColumn.str': 'string',

package/lib/cjs/locale/zh.js

@@ -51,8 +51,9 @@ var _default = exports["default"] = (0, _index.register)('zh', {
   'SqlQueryBuilder.visualize': '可视化',
   'SqlQueryBuilder.selectColumnAll': '全选',
   'SqlQueryBuilder.alias': '别名',
-  'SqlQueryBuilder.aliasCannotEmpty': '别名不能为空',
+  'SqlQueryBuilder.aliasForRules': '请按规则修改别名，且长度不能超过30',
   'customColumn.operator': '操作符',
+  'customColumn.collection': '自定义组合',
   'customColumn.field': '字段',
   'customColumn.constant': '常量',
   'customColumn.str': '字符串',

package/lib/cjs/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/cjs/utils.js

@@ -4,7 +4,9 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.patchData = exports.getSubColumns = exports.getHelper = exports.findIndex = exports.changeTableAlias = exports.changeFieldAlias = exports.buildSqlQuery = void 0;
+exports.getSubColumns = exports.getHelper = exports.findIndex = exports.changeTableAlias = exports.changeFieldAlias = exports.buildSqlQuery = void 0;
+exports.isValidSQLAlias = isValidSQLAlias;
+exports.patchData = void 0;
 exports.reassembleByUnion = reassembleByUnion;
 exports.splitByUnion = splitByUnion;
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectWithoutProperties"));
@@ -250,11 +252,22 @@ var _changeAlias = function changeAlias(items, val, type) {
         });
       }
       return v;
+    } else if (v.type === _types.AtomsTypeEnum.FORMULA) {
+      v.args = _changeAlias(v.args, val, type);
+      return v;
+    } else if (v.type === _types.AtomsTypeEnum.COLLECTION) {
+      v.list = _changeAlias(v.list, val, type);
+      return v;
     } else {
       return v;
     }
   });
 };
+function isValidSQLAlias(str) {
+  if (!str) return false;
+  var regex = /^[A-Za-z_][A-Za-z0-9_]{0,29}$/;
+  return regex.test(str);
+}
 var changeTableAlias = exports.changeTableAlias = function changeTableAlias(list, curObj) {
   var _cloneDeep = (0, _cloneDeep3["default"])(curObj),
     tableUuid = _cloneDeep.tableUuid,

package/lib/es/common/SplitView/index.js

@@ -51,17 +51,17 @@ var SplitView = React.forwardRef(function (props, ref) {
     hMaximum = _useState8[0],
     setHMaximum = _useState8[1];
   var _useState9 = useState(false),
-    _useState0 = _slicedToArray(_useState9, 2),
-    vMinimum = _useState0[0],
-    setVMinimum = _useState0[1];
-  var _useState1 = useState(false),
-    _useState10 = _slicedToArray(_useState1, 2),
-    vMaximum = _useState10[0],
-    setVMaximum = _useState10[1];
-  var _useState11 = useState(0),
+    _useState10 = _slicedToArray(_useState9, 2),
+    vMinimum = _useState10[0],
+    setVMinimum = _useState10[1];
+  var _useState11 = useState(false),
     _useState12 = _slicedToArray(_useState11, 2),
-    bottomHeight = _useState12[0],
-    setBottomHeight = _useState12[1];
+    vMaximum = _useState12[0],
+    setVMaximum = _useState12[1];
+  var _useState13 = useState(0),
+    _useState14 = _slicedToArray(_useState13, 2),
+    bottomHeight = _useState14[0],
+    setBottomHeight = _useState14[1];
   React.useImperativeHandle(ref, function () {
     return {
       open: function open() {

package/lib/es/components/dialog/custom-editor/index.js

@@ -73,6 +73,7 @@ var CaseEditor = function CaseEditor(props) {
               })
             })]
           }), _jsx(FormulaList, {
+            isCustom: true,
             value: caseList,
             data: data,
             ref: ref,

package/lib/es/components/dialog/expression/index.js

@@ -79,18 +79,18 @@ var SelectFilterColumn = function SelectFilterColumn(_ref) {
     special_type = _useState8[0],
     setSpecial_type = _useState8[1];
   var _useState9 = useState(value.formula || {}),
-    _useState0 = _slicedToArray(_useState9, 2),
-    formula = _useState0[0],
-    setFormula = _useState0[1];
+    _useState10 = _slicedToArray(_useState9, 2),
+    formula = _useState10[0],
+    setFormula = _useState10[1];
   var store = useStore();
-  var _useState1 = useState(false),
-    _useState10 = _slicedToArray(_useState1, 2),
-    popupVisible = _useState10[0],
-    setPopupVisible = _useState10[1];
-  var _useState11 = useState((value === null || value === void 0 || (_value$lhs = value.lhs) === null || _value$lhs === void 0 ? void 0 : _value$lhs.length) > 0 || false),
+  var _useState11 = useState(false),
     _useState12 = _slicedToArray(_useState11, 2),
-    isNext = _useState12[0],
-    setIsNext = _useState12[1];
+    popupVisible = _useState12[0],
+    setPopupVisible = _useState12[1];
+  var _useState13 = useState((value === null || value === void 0 || (_value$lhs = value.lhs) === null || _value$lhs === void 0 ? void 0 : _value$lhs.length) > 0 || false),
+    _useState14 = _slicedToArray(_useState13, 2),
+    isNext = _useState14[0],
+    setIsNext = _useState14[1];
   var table2Selected = Boolean(rhsVal && (rhsVal === null || rhsVal === void 0 ? void 0 : rhsVal.length) > 0);
   var disabled = useMemo(function () {
     if (!condition) return true;

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

@@ -6,8 +6,10 @@ interface PropsType {
     value: AtomsItem[];
     data: any;
     exitData?: any;
-    onChange?: (atoms: AtomsItem[], quotes?: string) => void;
+    onChange?: (atoms: AtomsItem[], quotes: string) => void;
     check?: string;
+    isCustom?: boolean;
+    showPreview?: boolean;
 }
 declare const FormulaList: React.ForwardRefExoticComponent<PropsType & React.RefAttributes<unknown>>;
 export default FormulaList;

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

@@ -31,6 +31,10 @@ var FormulaList = forwardRef(function (props, ref) {
     _customTypes = _props$customTypes === void 0 ? customTypes : _props$customTypes,
     _props$operatorList = props.operatorList,
     _operatorList = _props$operatorList === void 0 ? operatorList : _props$operatorList,
+    _props$isCustom = props.isCustom,
+    isCustom = _props$isCustom === void 0 ? false : _props$isCustom,
+    _props$showPreview = props.showPreview,
+    showPreview = _props$showPreview === void 0 ? true : _props$showPreview,
     check = props.check;
   var caseList = value || [];
   var setCaseList = function setCaseList(data) {
@@ -91,6 +95,7 @@ var FormulaList = forwardRef(function (props, ref) {
       node: e.currentTarget,
       container: ref === null || ref === void 0 ? void 0 : ref.current,
       content: _jsx(Expression, {
+        isCustom: isCustom,
         filterCustomType: filterCustomType,
         data: data,
         container: ref === null || ref === void 0 ? void 0 : ref.current,
@@ -165,7 +170,7 @@ var FormulaList = forwardRef(function (props, ref) {
                 type: caseList[i].type
               };
               caseList[i] = expression;
-              onChange === null || onChange === void 0 || onChange(caseList);
+              onChange === null || onChange === void 0 || onChange(caseList, '');
               setCaseList(_toConsumableArray(caseList));
               o.close();
             } catch (e) {
@@ -428,8 +433,8 @@ var FormulaList = forwardRef(function (props, ref) {
       });
     }
   };
-  return _jsxs(_Fragment, {
-    children: [_jsxs("div", {
+  return _jsx(_Fragment, {
+    children: _jsxs("div", {
       className: "Sqb-NotebookCell",
       children: [caseList === null || caseList === void 0 ? void 0 : caseList.map(function (v, i) {
         return _jsxs("div", {
@@ -534,23 +539,24 @@ var FormulaList = forwardRef(function (props, ref) {
             children: option.label
           }, index + '' + ind);
         })
+      }), showPreview && _jsxs("p", {
+        className: "mb-2 font-bold uppercase tracking-wider",
+        style: {
+          fontSize: 12,
+          color: '#949aab',
+          width: '100%'
+        },
+        children: ["\u9884\u89C8\uFF1A", caseList.map(function (v, i) {
+          if (v !== null && v !== void 0 && v.quotes) {
+            return v === null || v === void 0 ? void 0 : v.quotes;
+          } else if (v !== null && v !== void 0 && v.fieldName) {
+            return v === null || v === void 0 ? void 0 : v.fieldName;
+          } else {
+            return v.val;
+          }
+        }).join(' ')]
       })]
-    }), _jsxs("p", {
-      className: "mb-2 font-bold uppercase tracking-wider",
-      style: {
-        fontSize: 12,
-        color: '#949aab'
-      },
-      children: ["\u9884\u89C8\uFF1A", caseList.map(function (v, i) {
-        if (v !== null && v !== void 0 && v.quotes) {
-          return v === null || v === void 0 ? void 0 : v.quotes;
-        } else if (v !== null && v !== void 0 && v.fieldName) {
-          return v === null || v === void 0 ? void 0 : v.fieldName;
-        } else {
-          return v.val;
-        }
-      }).join(' ')]
-    })]
+    })
   });
 });
 export default FormulaList;

package/lib/es/components/dialog/index.d.ts

@@ -8,3 +8,4 @@ export { default as SelectTable } from './select-table/index';
 export { default as SelectPermissionTable } from './select-permission-table/index';
 export { default as FormulaList } from './formula-list/index';
 export { default as Expression } from './expression/index';
+export { getTemplateItem } from './formula-list/utils';

package/lib/es/components/dialog/index.js

@@ -7,4 +7,5 @@ export { default as SelectJoin } from './select-join/index';
 export { default as SelectTable } from './select-table/index';
 export { default as SelectPermissionTable } from './select-permission-table/index';
 export { default as FormulaList } from './formula-list/index'; // 自定义公式列表
-export { default as Expression } from './expression/index'; // 表达式编辑器
+export { default as Expression } from './expression/index'; // 表达式编辑器
+export { getTemplateItem } from './formula-list/utils'; // 表达式编辑器

package/lib/es/components/dialog/select-column/index.js

@@ -18,7 +18,7 @@ import { __ } from '../../../locale';
 import { NotSelectIcon, SelectIcon } from '../../icons';
 import { useStore } from '../../../hooks/use-provider';
 import { uuidv4 } from '../../../utils/helper';
-import { changeFieldAlias } from '../../../utils';
+import { changeFieldAlias, isValidSQLAlias } from '../../../utils';
 import { SearchIcon } from '../../icons';
 // 选择表中参数
 var SelectColumn = function SelectColumn(_ref) {
@@ -97,23 +97,16 @@ var SelectColumn = function SelectColumn(_ref) {
       onOk: function () {
         var _onOk = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
           var newColumns, newMetaList;
-          return _regeneratorRuntime.wrap(function (_context) {
+          return _regeneratorRuntime.wrap(function _callee$(_context) {
             while (1) switch (_context.prev = _context.next) {
               case 0:
-                if (fieldAlias) {
-                  _context.next = 1;
+                if (isValidSQLAlias(fieldAlias)) {
+                  _context.next = 3;
                   break;
                 }
-                Toast.warning(__('SqlQueryBuilder.aliasCannotEmpty'));
+                Toast.warning(__('SqlQueryBuilder.aliasForRules'));
                 return _context.abrupt("return", false);
-              case 1:
-                if (!(fieldAlias.length > 30)) {
-                  _context.next = 2;
-                  break;
-                }
-                Toast.warning('别名长度不能超过30');
-                return _context.abrupt("return", false);
-              case 2:
+              case 3:
                 newColumns = cloneDeep(columns);
                 newMetaList = store.metaList[groupIndex].list.slice();
                 newColumns[i].fieldAlias = fieldAlias;
@@ -124,7 +117,7 @@ var SelectColumn = function SelectColumn(_ref) {
                 setTimeout(function () {
                   store.setClosable(true);
                 }, 0);
-              case 3:
+              case 11:
               case "end":
                 return _context.stop();
             }

package/lib/es/components/dialog/select-column-multiple/index.js

@@ -269,7 +269,6 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
                       if (isSummarize) {
                         // console.log(v, 'v');
                       }
-                      console.log('🚀 ~ SelectJoinColumn ~ tableItem:', tableItem);
                       changeValue(tableUuid, {
                         tableName: tableItem.name,
                         tableId: tableItem.id,

package/lib/es/components/dialog/select-table/index.js

@@ -43,9 +43,9 @@ var SelectTable = function SelectTable(_ref) {
     originList = _useState8[0],
     setOriginList = _useState8[1];
   var _useState9 = useState(value),
-    _useState0 = _slicedToArray(_useState9, 2),
-    val = _useState0[0],
-    setVal = _useState0[1];
+    _useState10 = _slicedToArray(_useState9, 2),
+    val = _useState10[0],
+    setVal = _useState10[1];
   useEffect(function () {
     if (value.datasourceId) {
       getTables(value.datasourceId);
@@ -57,18 +57,18 @@ var SelectTable = function SelectTable(_ref) {
   function _getTables() {
     _getTables = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(datasourceId) {
       var tables;
-      return _regeneratorRuntime.wrap(function (_context) {
+      return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             setLoading(true);
-            _context.next = 1;
+            _context.next = 3;
             return store.fetchDataset(datasourceId);
-          case 1:
+          case 3:
             tables = _context.sent;
             setLoading(false);
             setList(tables);
             setOriginList(tables);
-          case 2:
+          case 7:
           case "end":
             return _context.stop();
         }