@gingkoo/pandora-metabase 1.0.87 → 1.0.89

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

@@ -8,8 +8,8 @@ exports["default"] = exports.SummarizeAlias = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/toConsumableArray"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectWithoutProperties"));
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/asyncToGenerator"));
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/slicedToArray"));
 var _react = require("react");
 var _helper = require("../utils/helper");
@@ -64,133 +64,146 @@ 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]; //是否可关闭 如果弹框里面再弹框 则不可关闭
-  var _useState35 = (0, _react.useState)({}),
+    popupClosable = _useState34[0],
+    setClosable = _useState34[1]; //是否可关闭 如果弹框里面再弹框 则不可关闭
+  var _useState35 = (0, _react.useState)(true),
     _useState36 = (0, _slicedToArray2["default"])(_useState35, 2),
-    currentTable = _useState36[0],
-    setCurrentTable = _useState36[1]; // 当前存在的表
-  var _useState37 = (0, _react.useState)(false),
+    popupClosable2 = _useState36[0],
+    setClosable2 = _useState36[1]; //是否可关闭 如果弹框里面再弹框 则不可关闭
+  var _useState37 = (0, _react.useState)({}),
     _useState38 = (0, _slicedToArray2["default"])(_useState37, 2),
-    isExit = _useState38[0],
-    setIsExit = _useState38[1]; // 是否是notExit
+    currentTable = _useState38[0],
+    setCurrentTable = _useState38[1]; // 当前存在的表
   var _useState39 = (0, _react.useState)(false),
     _useState40 = (0, _slicedToArray2["default"])(_useState39, 2),
-    isSubquery = _useState40[0],
-    setIsSubquery = _useState40[1]; // 是否是子查询
-  var _useState41 = (0, _react.useState)(true),
+    isExit = _useState40[0],
+    setIsExit = _useState40[1]; // 是否是notExit
+  var _useState41 = (0, _react.useState)(false),
     _useState42 = (0, _slicedToArray2["default"])(_useState41, 2),
-    tableEnableAlias = _useState42[0],
-    setTableEnableAlias = _useState42[1]; // 表名是否开启别名
+    isSubquery = _useState42[0],
+    setIsSubquery = _useState42[1]; // 是否是子查询
   var _useState43 = (0, _react.useState)(true),
     _useState44 = (0, _slicedToArray2["default"])(_useState43, 2),
-    fieldEnableAlias = _useState44[0],
-    setFieldEnableAlias = _useState44[1]; // 字段名是否开启别名
+    tableEnableAlias = _useState44[0],
+    setTableEnableAlias = _useState44[1]; // 表名是否开启别名
   var _useState45 = (0, _react.useState)(true),
     _useState46 = (0, _slicedToArray2["default"])(_useState45, 2),
-    groupByEnableAlias = _useState46[0],
-    setGroupByEnableAlias = _useState46[1]; // 聚合是否开启别名
+    fieldEnableAlias = _useState46[0],
+    setFieldEnableAlias = _useState46[1]; // 字段名是否开启别名
   var _useState47 = (0, _react.useState)(true),
     _useState48 = (0, _slicedToArray2["default"])(_useState47, 2),
-    isSelectFields = _useState48[0],
-    setIsSelectFields = _useState48[1]; // 是否默认勾选字段
-  var _useState49 = (0, _react.useState)(false),
+    groupByEnableAlias = _useState48[0],
+    setGroupByEnableAlias = _useState48[1]; // 聚合是否开启别名
+  var _useState49 = (0, _react.useState)(true),
     _useState50 = (0, _slicedToArray2["default"])(_useState49, 2),
-    tableFlat = _useState50[0],
-    setTableFlat = _useState50[1]; // 是否平铺数据表
-  var _useState51 = (0, _react.useState)([]),
+    isSelectFields = _useState50[0],
+    setIsSelectFields = _useState50[1]; // 是否默认勾选字段
+  var _useState51 = (0, _react.useState)(false),
     _useState52 = (0, _slicedToArray2["default"])(_useState51, 2),
-    sourceTable = _useState52[0],
-    setSourceTable = _useState52[1];
+    tableFlat = _useState52[0],
+    setTableFlat = _useState52[1]; // 是否平铺数据表
   var _useState53 = (0, _react.useState)([]),
     _useState54 = (0, _slicedToArray2["default"])(_useState53, 2),
-    copyType = _useState54[0],
-    setCopyType = _useState54[1]; // 复制类型
-  var _useState55 = (0, _react.useState)(false),
+    sourceTable = _useState54[0],
+    setSourceTable = _useState54[1];
+  var _useState55 = (0, _react.useState)([]),
     _useState56 = (0, _slicedToArray2["default"])(_useState55, 2),
-    metabaseCopy = _useState56[0],
-    setMetabaseCopy = _useState56[1]; // 是否开启复制功能
+    copyType = _useState56[0],
+    setCopyType = _useState56[1]; // 复制类型
   var _useState57 = (0, _react.useState)(false),
     _useState58 = (0, _slicedToArray2["default"])(_useState57, 2),
-    moduleDiff = _useState58[0],
-    setModuleDiff = _useState58[1]; // 是否开启模块比对功能
-  var _useState59 = (0, _react.useState)([]),
+    metabaseCopy = _useState58[0],
+    setMetabaseCopy = _useState58[1]; // 是否开启复制功能
+  var _useState59 = (0, _react.useState)(false),
     _useState60 = (0, _slicedToArray2["default"])(_useState59, 2),
-    sourceData = _useState60[0],
-    setSourceData = _useState60[1]; // 原始数据
-  var _useState61 = (0, _react.useState)(false),
+    moduleDiff = _useState60[0],
+    setModuleDiff = _useState60[1]; // 是否开启模块比对功能
+  var _useState61 = (0, _react.useState)([]),
     _useState62 = (0, _slicedToArray2["default"])(_useState61, 2),
-    moduleCopy = _useState62[0],
-    setModuleCopy = _useState62[1]; // 是否开启模块复制功能
+    sourceData = _useState62[0],
+    setSourceData = _useState62[1]; // 原始数据
   var _useState63 = (0, _react.useState)(false),
     _useState64 = (0, _slicedToArray2["default"])(_useState63, 2),
-    isMetabaseCopy = _useState64[0],
-    setIsMetabaseCopy = _useState64[1]; // 是否开启勾选组复制
-  var _useState65 = (0, _react.useState)(_storage["default"]._metabaseCopyModule || []),
+    moduleCopy = _useState64[0],
+    setModuleCopy = _useState64[1]; // 是否开启模块复制功能
+  var _useState65 = (0, _react.useState)(false),
     _useState66 = (0, _slicedToArray2["default"])(_useState65, 2),
-    metabaseCopyModule = _useState66[0],
-    setMetabaseCopyModule = _useState66[1]; // 复制的内容
+    isMetabaseCopy = _useState66[0],
+    setIsMetabaseCopy = _useState66[1]; // 是否开启勾选组复制
+  var _useState67 = (0, _react.useState)(_storage["default"]._metabaseCopyModule || []),
+    _useState68 = (0, _slicedToArray2["default"])(_useState67, 2),
+    metabaseCopyModule = _useState68[0],
+    setMetabaseCopyModule = _useState68[1]; // 复制的内容
+  var setFormulaTemplates = function setFormulaTemplates(data) {
+    var newData = data === null || data === void 0 ? void 0 : data.map(function (v) {
+      var children = v.children.map(function (vv) {
+        return (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, vv), {}, {
+          id: vv.id || vv.name
+        });
+      });
+      return (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, v), {}, {
+        children: children
+      });
+    });
+    _setFormulaTemplates(newData);
+  };
   // 外层ref
   var popupContainer = (0, _react.useRef)();
   // const [fetchDatasetFn, setFetchDatasetFn] = useState<(id: string) => Promise<any>>(
@@ -216,20 +229,20 @@ var useStore = function useStore() {
         newCode,
         data,
         _args = arguments;
-      return _regenerator["default"].wrap(function (_context) {
+      return _regenerator["default"].wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             oldCode = _args.length > 0 && _args[0] !== undefined ? _args[0] : [];
             newCode = _args.length > 1 ? _args[1] : undefined;
-            _context.next = 1;
+            _context.next = 4;
             return fetchDiffFn.current({
               oldCode: oldCode,
               newCode: newCode
             });
-          case 1:
+          case 4:
             data = _context.sent;
             return _context.abrupt("return", data);
-          case 2:
+          case 6:
           case "end":
             return _context.stop();
         }
@@ -279,24 +292,24 @@ var useStore = function useStore() {
   var getSourceTable = /*#__PURE__*/function () {
     var _ref2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee3(source) {
       var results;
-      return _regenerator["default"].wrap(function (_context3) {
+      return _regenerator["default"].wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
           case 0:
-            _context3.next = 1;
+            _context3.next = 2;
             return Promise.all(source.map(/*#__PURE__*/function () {
               var _ref3 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2(v) {
                 var tables;
-                return _regenerator["default"].wrap(function (_context2) {
+                return _regenerator["default"].wrap(function _callee2$(_context2) {
                   while (1) switch (_context2.prev = _context2.next) {
                     case 0:
-                      _context2.next = 1;
+                      _context2.next = 2;
                       return fetchDataset(v.datasourceId);
-                    case 1:
+                    case 2:
                       tables = _context2.sent;
                       return _context2.abrupt("return", (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, v), {}, {
                         children: tables
                       }));
-                    case 2:
+                    case 4:
                     case "end":
                       return _context2.stop();
                   }
@@ -306,10 +319,10 @@ var useStore = function useStore() {
                 return _ref3.apply(this, arguments);
               };
             }()));
-          case 1:
+          case 2:
             results = _context3.sent;
             setSourceTable(results || []);
-          case 2:
+          case 4:
           case "end":
             return _context3.stop();
         }
@@ -337,25 +350,25 @@ var useStore = function useStore() {
   var fetchDataset = /*#__PURE__*/function () {
     var _ref4 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee4(datasourceId) {
       var tables, _tables;
-      return _regenerator["default"].wrap(function (_context4) {
+      return _regenerator["default"].wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
             tables = getDataset(datasourceId);
             if (!tables.length) {
-              _context4.next = 1;
+              _context4.next = 3;
               break;
             }
             return _context4.abrupt("return", tables);
-          case 1:
-            _context4.next = 2;
+          case 3:
+            _context4.next = 5;
             return fetchDatasetFn.current(datasourceId, {
               isExit: isExit
             });
-          case 2:
+          case 5:
             _tables = _context4.sent;
             setDataset(datasourceId, _tables);
             return _context4.abrupt("return", _tables);
-          case 3:
+          case 8:
           case "end":
             return _context4.stop();
         }
@@ -388,7 +401,7 @@ var useStore = function useStore() {
         columns,
         _columns,
         _args5 = arguments;
-      return _regenerator["default"].wrap(function (_context5) {
+      return _regenerator["default"].wrap(function _callee5$(_context5) {
         while (1) switch (_context5.prev = _context5.next) {
           case 0:
             oldColumns = _args5.length > 2 && _args5[2] !== undefined ? _args5[2] : [];
@@ -414,17 +427,17 @@ var useStore = function useStore() {
             tableName = table.name;
             columns = getColumns(tableName);
             if (columns.length) {
-              _context5.next = 2;
+              _context5.next = 16;
               break;
             }
-            _context5.next = 1;
+            _context5.next = 14;
             return fetchColumnsFn.current(extra, datasourceId, {
               isExit: _isExit
             });
-          case 1:
+          case 14:
             columns = _context5.sent;
             setColumns(tableName, columns);
-          case 2:
+          case 16:
             _columns = (_columns2 = columns) === null || _columns2 === void 0 ? void 0 : _columns2.map(function (v) {
               var select = selectId.includes(v.id);
               var obj = {};
@@ -435,7 +448,7 @@ var useStore = function useStore() {
               });
             });
             typeof callback === 'function' && callback(_columns);
-          case 3:
+          case 18:
           case "end":
             return _context5.stop();
         }
@@ -452,7 +465,7 @@ var useStore = function useStore() {
         newMeta,
         isChange,
         _args6 = arguments;
-      return _regenerator["default"].wrap(function (_context6) {
+      return _regenerator["default"].wrap(function _callee6$(_context6) {
         while (1) switch (_context6.prev = _context6.next) {
           case 0:
             changeObj = _args6.length > 2 && _args6[2] !== undefined ? _args6[2] : {};
@@ -464,22 +477,22 @@ var useStore = function useStore() {
             }
             // 过滤掉初始化
             if (!(changeObj === 'init')) {
-              _context6.next = 1;
+              _context6.next = 6;
               break;
             }
             return _context6.abrupt("return");
-          case 1:
-            _context6.next = 2;
+          case 6:
+            _context6.next = 8;
             return fetchChangeFn.current((0, _utils.splitByUnion)(_metaList), changeObj, {
               isExit: isExit
             });
-          case 2:
+          case 8:
             isChange = _context6.sent;
             // 是否还原
             if (isChange === false) {
               _setMeta(_metaList);
             }
-          case 3:
+          case 10:
           case "end":
             return _context6.stop();
         }

package/lib/cjs/index.js

@@ -18,7 +18,8 @@ var _Loading = _interopRequireDefault(require("./common/Loading"));
 var _metabase = _interopRequireDefault(require("./components/metabase"));
 var _utils = require("./utils");
 var _cloneDeep = _interopRequireDefault(require("lodash/cloneDeep"));
-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/store/types.d.ts

@@ -71,6 +71,7 @@ export interface AtomsFormula {
     arity?: Arity;
     quotes: string;
     name: string;
+    id?: string;
     type: AtomsTypeEnum.FORMULA;
 }
 export interface AtomsExpression {
@@ -365,6 +366,7 @@ export interface PopupData {
 }
 export interface FormulaTemplatesItem {
     name: string;
+    id: string;
     args: {
         type: AtomsTypeEnum;
         check?: string | null;

package/lib/cjs/utils/transformSql.js

@@ -604,9 +604,9 @@ var _handleNesting = function handleNesting(data) {
     var customColumnsConstants = [];
     var handleCustomColumn = function handleCustomColumn(data) {
       return data.map(function (it) {
-        var _handleBaseType2Sql0 = _handleBaseType2Sql8(it.formulaList, db),
-          field_sql = _handleBaseType2Sql0.sql,
-          constants = _handleBaseType2Sql0.constants;
+        var _handleBaseType2Sql10 = _handleBaseType2Sql8(it.formulaList, db),
+          field_sql = _handleBaseType2Sql10.sql,
+          constants = _handleBaseType2Sql10.constants;
         customColumnsConstants.push.apply(customColumnsConstants, (0, _toConsumableArray2["default"])(constants));
         return {
           field_sql: "".concat(field_sql, " as ").concat(it.name),
@@ -621,9 +621,9 @@ var _handleNesting = function handleNesting(data) {
     obj.customColumnsConstants = customColumnsConstants;
   }
   if (filterData && filterData.filter.length) {
-    var _handleBaseType2Sql1 = _handleBaseType2Sql8(filterData.filter, db),
-      sql = _handleBaseType2Sql1.sql,
-      constants = _handleBaseType2Sql1.constants;
+    var _handleBaseType2Sql11 = _handleBaseType2Sql8(filterData.filter, db),
+      sql = _handleBaseType2Sql11.sql,
+      constants = _handleBaseType2Sql11.constants;
     obj.filters = 'WHERE ' + sql;
     obj.filtersConstants = constants;
   }
@@ -668,8 +668,8 @@ var _handleNesting = function handleNesting(data) {
   }
   if (sortData && sortData.sort.length) {
     obj.orderInfos = "ORDER BY ".concat(sortData.sort.map(function (v) {
-      var _handleBaseType2Sql10 = _handleBaseType2Sql8(v.expression, db),
-        sql = _handleBaseType2Sql10.sql;
+      var _handleBaseType2Sql12 = _handleBaseType2Sql8(v.expression, db),
+        sql = _handleBaseType2Sql12.sql;
       return "".concat(sql, " ").concat(v.sort);
     }).join(', '));
   }

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

@@ -21,13 +21,17 @@ var VisualBox = Styled.div.attrs({
   className: 'visual-box'
 })(_templateObject || (_templateObject = _taggedTemplateLiteral([""])));
 var CaseEditor = React.forwardRef(function (props, ref) {
-  var _store$formulaTemplat, _fun$args;
+  var _store$formulaTemplat, _formulaList$fun$name, _formulaList$fun$name2, _fun$args;
   var store = useStore();
   var value = props.value,
     data = props.data,
     onOk = props.onOk,
     onCancel = props.onCancel;
-  var _useState = useState(value),
+  var _useState = useState(function () {
+      return _objectSpread(_objectSpread({}, value), {}, {
+        id: value.id || value.name
+      });
+    }),
     _useState2 = _slicedToArray(_useState, 2),
     fun = _useState2[0],
     setFun = _useState2[1];
@@ -72,13 +76,15 @@ var CaseEditor = React.forwardRef(function (props, ref) {
     })));
   };
   // 选择公式名
-  var handleFunName = function handleFunName(name) {
-    var _formulaList$name, _formulaList$name2;
+  var handleFunName = function handleFunName(id) {
+    var _formulaList$id, _formulaList$id2, _formulaList$id3;
+    var isId = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
     // formulaList?.[name].args;
     setFun(_objectSpread(_objectSpread({}, fun), {}, {
-      args: getTemArgs(formulaList === null || formulaList === void 0 ? void 0 : formulaList[name].args, formulaList === null || formulaList === void 0 || (_formulaList$name = formulaList[name]) === null || _formulaList$name === void 0 ? void 0 : _formulaList$name.arity),
-      arity: formulaList === null || formulaList === void 0 || (_formulaList$name2 = formulaList[name]) === null || _formulaList$name2 === void 0 ? void 0 : _formulaList$name2.arity,
-      name: name
+      args: getTemArgs(formulaList === null || formulaList === void 0 ? void 0 : formulaList[id].args, formulaList === null || formulaList === void 0 || (_formulaList$id = formulaList[id]) === null || _formulaList$id === void 0 ? void 0 : _formulaList$id.arity),
+      arity: formulaList === null || formulaList === void 0 || (_formulaList$id2 = formulaList[id]) === null || _formulaList$id2 === void 0 ? void 0 : _formulaList$id2.arity,
+      id: id,
+      name: formulaList === null || formulaList === void 0 || (_formulaList$id3 = formulaList[id]) === null || _formulaList$id3 === void 0 ? void 0 : _formulaList$id3.name
     }));
   };
   var getQuotes = function getQuotes(_args) {
@@ -139,7 +145,7 @@ var CaseEditor = React.forwardRef(function (props, ref) {
                 triggerProps: {
                   clickToClose: true
                 },
-                value: fun.name,
+                value: fun.id || fun.name,
                 triggerElement: function triggerElement(value) {
                   return _jsx("div", {
                     className: cx("Sqb-TableName Sqb-TableName-OPERATOR", {
@@ -156,9 +162,9 @@ var CaseEditor = React.forwardRef(function (props, ref) {
                     label: options.name,
                     children: Array.from(options.children || []).map(function (option, ind) {
                       return _jsx(Select.Option, {
-                        value: option.name,
+                        value: option.id,
                         children: option.name
-                      }, String(option.name + ind));
+                      }, option.id || String(option.name + ind));
                     })
                   }, index);
                   // <Select.Option key={index} value={option.name}>
@@ -173,14 +179,14 @@ var CaseEditor = React.forwardRef(function (props, ref) {
                 color: '#949aab'
               },
               children: [_jsxs("p", {
-                children: ["\u63CF\u8FF0\uFF1A", formulaList[fun.name].description]
+                children: ["\u63CF\u8FF0\uFF1A", (_formulaList$fun$name = formulaList[fun.name]) === null || _formulaList$fun$name === void 0 ? void 0 : _formulaList$fun$name.description]
               }), _jsxs("p", {
-                children: ["\u6848\u4F8B\uFF1A", formulaList[fun.name].example]
+                children: ["\u6848\u4F8B\uFF1A", (_formulaList$fun$name2 = formulaList[fun.name]) === null || _formulaList$fun$name2 === void 0 ? void 0 : _formulaList$fun$name2.example]
               })]
             })]
           }), fun === null || fun === void 0 || (_fun$args = fun.args) === null || _fun$args === void 0 ? void 0 : _fun$args.map(function (v, i) {
             if (v.type === AtomsTypeEnum.COLLECTION) {
-              var _formulaList$fun$name;
+              var _formulaList$fun$name3;
               return _jsxs("div", {
                 className: 'Sqb-item-formula-args',
                 children: [_jsxs("div", {
@@ -193,7 +199,7 @@ var CaseEditor = React.forwardRef(function (props, ref) {
                     },
                     children: ["\u53C2\u6570", i + 1, ":"]
                   }), _jsx(FormulaList, {
-                    check: (formulaList === null || formulaList === void 0 || (_formulaList$fun$name = formulaList[fun.name]) === null || _formulaList$fun$name === void 0 || (_formulaList$fun$name = _formulaList$fun$name.args) === null || _formulaList$fun$name === void 0 || (_formulaList$fun$name = _formulaList$fun$name[i]) === null || _formulaList$fun$name === void 0 ? void 0 : _formulaList$fun$name.check) || '',
+                    check: (formulaList === null || formulaList === void 0 || (_formulaList$fun$name3 = formulaList[fun.name]) === null || _formulaList$fun$name3 === void 0 || (_formulaList$fun$name3 = _formulaList$fun$name3.args) === null || _formulaList$fun$name3 === void 0 || (_formulaList$fun$name3 = _formulaList$fun$name3[i]) === null || _formulaList$fun$name3 === void 0 ? void 0 : _formulaList$fun$name3.check) || '',
                     value: v.list,
                     data: data,
                     ref: _ref,

package/lib/es/components/dialog/formula/utils.js

@@ -4,8 +4,11 @@ export var getObjTem = function getObjTem(arr) {
   var obj = {};
   arr === null || arr === void 0 || arr.map(function (v) {
     v.children.map(function (vv) {
-      if (vv.name) {
-        obj[vv.name] = vv;
+      // if (vv.name) {
+      //   obj[vv.name] = vv;
+      // }
+      if (vv.id) {
+        obj[vv.id] = vv;
       }
     });
   });