@gingkoo/pandora-metabase 1.0.141 → 1.0.143

package/lib/cjs/components/dialog/formula-list/index.less

@@ -1,12 +1,19 @@
 .preview-box {
-  .pd-Radio-button-solid .pd-Radio-button.pd-Radio-checked {
-    background-color: #509ee3;
-    border-color: #509ee3;
-  }
   .preview-container {
     width: 100%;
   }
 
+  .Sqb-FormulaPreviewHeader {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    flex-wrap: wrap;
+
+    p {
+      margin: 0;
+    }
+  }
+
   .isSqlError {
     background-color: rgba(255, 0, 0, 0.1) !important;
     padding: 5px;
@@ -20,6 +27,12 @@
     // font-size: 10px;
   }
 }
+
+.Sqb-FormulaSqlPreview {
+  max-height: 100%;
+  overflow: auto;
+}
+
 .Sqb-Filter-item {
   --sqb-item-shell-margin-x: 14px;
   --sqb-item-gap-x: 8px;
@@ -1441,7 +1454,7 @@
     vertical-align: middle;
   }
 
-  .Sqb-FormulaGroup.logic-group > .Sqb-TableName.logic-operator {
+  .Sqb-FormulaGroup.logic-group .Sqb-TableName.logic-operator {
     justify-content: center;
     flex: 0 0 32px;
     width: 32px;

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

@@ -220,14 +220,17 @@ var getTemplateItem = exports.getTemplateItem = function getTemplateItem(type, i
     };
   } else if (type === _types.AtomsTypeEnum.AND_OR) {
     return {
-      operator: 'and',
-      leftAtoms: [{
-        val: '',
-        type: _types.AtomsTypeEnum.UNKNOWN
-      }],
-      rightAtoms: [{
-        val: '',
-        type: _types.AtomsTypeEnum.UNKNOWN
+      items: [{
+        atoms: [{
+          val: '',
+          type: _types.AtomsTypeEnum.UNKNOWN
+        }]
+      }, {
+        operator: 'and',
+        atoms: [{
+          val: '',
+          type: _types.AtomsTypeEnum.UNKNOWN
+        }]
       }],
       quotes: '',
       type: type
@@ -278,12 +281,20 @@ var _isOk = exports.isOk = function isOk(rhsVal) {
         return _isOk(clause.whenAtoms || []) && _isOk(clause.thenAtoms || []);
       }) && _isOk(v.caseAtoms || []) && _isOk(v.elseAtoms || []);
     } else if (v.type === _types.AtomsTypeEnum.AND_OR) {
-      var hasBinarySides = Array.isArray(v.leftAtoms) || Array.isArray(v.rightAtoms);
+      if (Array.isArray(v.items) && v.items.length > 0) {
+        return v.items.every(function (item, index) {
+          var _item$atoms;
+          if (index > 0 && !item.operator) return false;
+          return Boolean((_item$atoms = item.atoms) === null || _item$atoms === void 0 ? void 0 : _item$atoms.length) && _isOk(item.atoms || []);
+        });
+      }
+      var legacyItem = v;
+      var hasBinarySides = Array.isArray(legacyItem.leftAtoms) || Array.isArray(legacyItem.rightAtoms);
       if (hasBinarySides) {
-        var _v$leftAtoms, _v$rightAtoms;
-        return Boolean(v.operator) && Boolean((_v$leftAtoms = v.leftAtoms) === null || _v$leftAtoms === void 0 ? void 0 : _v$leftAtoms.length) && Boolean((_v$rightAtoms = v.rightAtoms) === null || _v$rightAtoms === void 0 ? void 0 : _v$rightAtoms.length) && _isOk(v.leftAtoms || []) && _isOk(v.rightAtoms || []);
+        var _legacyItem$leftAtoms, _legacyItem$rightAtom;
+        return Boolean(legacyItem.operator) && Boolean((_legacyItem$leftAtoms = legacyItem.leftAtoms) === null || _legacyItem$leftAtoms === void 0 ? void 0 : _legacyItem$leftAtoms.length) && Boolean((_legacyItem$rightAtom = legacyItem.rightAtoms) === null || _legacyItem$rightAtom === void 0 ? void 0 : _legacyItem$rightAtom.length) && _isOk(legacyItem.leftAtoms || []) && _isOk(legacyItem.rightAtoms || []);
       }
-      return Boolean(v.operator) && _isOk(v.atoms || []);
+      return Boolean(legacyItem.operator) && _isOk(legacyItem.atoms || []);
     } else if (v.type === _types.AtomsTypeEnum.FORMULA) {
       if (!v.quotes) {
         return false;
@@ -408,25 +419,42 @@ function validateExpressionIntegrity(list) {
     for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
       var item = _step2.value;
       if (item.type === _types.AtomsTypeEnum.AND_OR) {
-        if (!item.operator) {
+        if (Array.isArray(item.items) && item.items.length > 0) {
+          for (var index = 0; index < item.items.length; index++) {
+            var logicItem = item.items[index];
+            if (index > 0 && !logicItem.operator) {
+              return {
+                isError: true,
+                error: 'AND / OR 结构缺少操作符'
+              };
+            }
+            var _nestedError = validateExpressionIntegrity(logicItem.atoms || []);
+            if (_nestedError.isError) {
+              return _nestedError;
+            }
+          }
+          continue;
+        }
+        var legacyItem = item;
+        if (!legacyItem.operator) {
           return {
             isError: true,
             error: 'AND / OR 结构缺少操作符'
           };
         }
-        var hasBinarySides = Array.isArray(item.leftAtoms) || Array.isArray(item.rightAtoms);
+        var hasBinarySides = Array.isArray(legacyItem.leftAtoms) || Array.isArray(legacyItem.rightAtoms);
         if (hasBinarySides) {
-          var leftError = validateExpressionIntegrity(item.leftAtoms || []);
+          var leftError = validateExpressionIntegrity(legacyItem.leftAtoms || []);
           if (leftError.isError) {
             return leftError;
           }
-          var rightError = validateExpressionIntegrity(item.rightAtoms || []);
+          var rightError = validateExpressionIntegrity(legacyItem.rightAtoms || []);
           if (rightError.isError) {
             return rightError;
           }
           continue;
         }
-        var nestedError = validateExpressionIntegrity(item.atoms || []);
+        var nestedError = validateExpressionIntegrity(legacyItem.atoms || []);
         if (nestedError.isError) {
           return nestedError;
         }

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

@@ -46,10 +46,12 @@ var SelectColumn = function SelectColumn(_ref) {
   (0, _react.useEffect)(function () {
     setOriginList(function (currentList) {
       return data.map(function (item) {
+        var _ref2, _existingItem$fieldAl;
         var existingItem = currentList.find(function (current) {
           return (0, _helper.isSameColumnByIdFirst)(current, item);
         });
         return (0, _objectSpread2["default"])((0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, existingItem || {}), item), {}, {
+          fieldAlias: (_ref2 = (_existingItem$fieldAl = existingItem === null || existingItem === void 0 ? void 0 : existingItem.fieldAlias) !== null && _existingItem$fieldAl !== void 0 ? _existingItem$fieldAl : item.fieldAlias) !== null && _ref2 !== void 0 ? _ref2 : '',
           fieldUuid: item.fieldUuid || (existingItem === null || existingItem === void 0 ? void 0 : existingItem.fieldUuid) || (0, _helper.uuidv4)('field')
         });
       });
@@ -88,8 +90,9 @@ var SelectColumn = function SelectColumn(_ref) {
     }
   }, [isAllSelect]);
   function onSelect(columns, newMetaList) {
+    var useColumnsDirectly = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
     var originalData = (0, _cloneDeep["default"])(originList);
-    var mergedColumns = originalData.map(function (item) {
+    var mergedColumns = useColumnsDirectly ? (0, _cloneDeep["default"])(columns) : originalData.map(function (item) {
       var match = columns.find(function (col) {
         return (0, _helper.isSameColumnByIdFirst)(col, item);
       });
@@ -131,7 +134,7 @@ var SelectColumn = function SelectColumn(_ref) {
                   obj: newColumns[i],
                   type: _types.ChangeType.fieldAlias
                 });
-                onSelect(newColumns, newMetaList);
+                onSelect(newColumns, newMetaList, true);
                 setTimeout(function () {
                   store.setClosable(true);
                 }, 0);

package/lib/cjs/components/dialog/select-summarize/index.js

@@ -140,6 +140,13 @@ var SelectSummarize = function SelectSummarize(_ref) {
         return [lhs, item.condition, rhs].filter(Boolean).join(' ').trim();
       }
       if (item.type === _types.AtomsTypeEnum.AND_OR) {
+        if (Array.isArray(item.items) && item.items.length > 0) {
+          var itemsText = item.items.map(function (logicItem, index) {
+            var atomsText = getFormulaSummary(logicItem.atoms || []);
+            return index === 0 ? atomsText : "".concat(logicItem.operator || 'and', " ").concat(atomsText);
+          }).join(' ');
+          return "( ".concat(itemsText, " )").replace(/\s+/g, ' ').trim();
+        }
         var hasBinarySides = Array.isArray(item.leftAtoms) || Array.isArray(item.rightAtoms);
         if (hasBinarySides) {
           var leftText = getFormulaSummary(item.leftAtoms || []);

package/lib/cjs/components/modules/summarize/group-by.js

@@ -45,6 +45,13 @@ var _getSummaryText = function getSummaryText() {
       return [lhs, item.condition, rhs].filter(Boolean).join(' ').trim();
     }
     if (item.type === _types.AtomsTypeEnum.AND_OR) {
+      if (Array.isArray(item.items) && item.items.length > 0) {
+        var itemsText = item.items.map(function (logicItem, index) {
+          var atomsText = _getSummaryText(logicItem.atoms || []);
+          return index === 0 ? atomsText : "".concat(logicItem.operator || 'and', " ").concat(atomsText);
+        }).join(' ');
+        return "( ".concat(itemsText, " )").replace(/\s+/g, ' ').trim();
+      }
       var hasBinarySides = Array.isArray(item.leftAtoms) || Array.isArray(item.rightAtoms);
       if (hasBinarySides) {
         var leftText = _getSummaryText(item.leftAtoms || []);
@@ -439,7 +446,9 @@ var GroupBy = function GroupBy(props) {
           if (_found) return _found;
         }
         if (item.type === _types.AtomsTypeEnum.AND_OR) {
-          var _found2 = _getFirstField([].concat((0, _toConsumableArray2["default"])(item.leftAtoms || []), (0, _toConsumableArray2["default"])(item.rightAtoms || []), (0, _toConsumableArray2["default"])(item.atoms || [])));
+          var _found2 = _getFirstField([].concat((0, _toConsumableArray2["default"])((item.items || []).flatMap(function (logicItem) {
+            return logicItem.atoms || [];
+          })), (0, _toConsumableArray2["default"])(item.leftAtoms || []), (0, _toConsumableArray2["default"])(item.rightAtoms || []), (0, _toConsumableArray2["default"])(item.atoms || [])));
           if (_found2) return _found2;
         }
         if (item.type === _types.AtomsTypeEnum.CASE_WHEN) {

package/lib/cjs/components/modules/summarize/select-index.js

@@ -352,7 +352,9 @@ var SelectIndex = function SelectIndex(props) {
           if (_found) return _found;
         }
         if (item.type === _types.AtomsTypeEnum.AND_OR) {
-          var _found2 = _getFirstField([].concat((0, _toConsumableArray2["default"])(item.leftAtoms || []), (0, _toConsumableArray2["default"])(item.rightAtoms || []), (0, _toConsumableArray2["default"])(item.atoms || [])));
+          var _found2 = _getFirstField([].concat((0, _toConsumableArray2["default"])((item.items || []).flatMap(function (logicItem) {
+            return logicItem.atoms || [];
+          })), (0, _toConsumableArray2["default"])(item.leftAtoms || []), (0, _toConsumableArray2["default"])(item.rightAtoms || []), (0, _toConsumableArray2["default"])(item.atoms || [])));
           if (_found2) return _found2;
         }
         if (item.type === _types.AtomsTypeEnum.CASE_WHEN) {

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

@@ -186,30 +186,46 @@ var useStore = function useStore() {
     _useState60 = (0, _slicedToArray2["default"])(_useState59, 2),
     moduleDiff = _useState60[0],
     setModuleDiff = _useState60[1];
-  var _useState61 = (0, _react.useState)([]),
+  var _useState61 = (0, _react.useState)(false),
     _useState62 = (0, _slicedToArray2["default"])(_useState61, 2),
-    sourceData = _useState62[0],
-    setSourceData = _useState62[1];
+    showFormulaSql = _useState62[0],
+    setShowFormulaSql = _useState62[1];
   var _useState63 = (0, _react.useState)(false),
     _useState64 = (0, _slicedToArray2["default"])(_useState63, 2),
-    moduleCopy = _useState64[0],
-    setModuleCopy = _useState64[1];
+    showFormulaDiff = _useState64[0],
+    setShowFormulaDiff = _useState64[1];
   var _useState65 = (0, _react.useState)(false),
     _useState66 = (0, _slicedToArray2["default"])(_useState65, 2),
-    isMetabaseCopy = _useState66[0],
-    setIsMetabaseCopy = _useState66[1];
+    hasFormulaSqlCode = _useState66[0],
+    setHasFormulaSqlCode = _useState66[1];
   var _useState67 = (0, _react.useState)(false),
     _useState68 = (0, _slicedToArray2["default"])(_useState67, 2),
-    joinAliasConflictCheck = _useState68[0],
-    setJoinAliasConflictCheck = _useState68[1];
+    hasFormulaDiffCode = _useState68[0],
+    setHasFormulaDiffCode = _useState68[1];
   var _useState69 = (0, _react.useState)([]),
     _useState70 = (0, _slicedToArray2["default"])(_useState69, 2),
-    existsError = _useState70[0],
-    setExistsError = _useState70[1];
-  var _useState71 = (0, _react.useState)(_storage["default"]._metabaseCopyModule || []),
+    sourceData = _useState70[0],
+    setSourceData = _useState70[1];
+  var _useState71 = (0, _react.useState)(false),
     _useState72 = (0, _slicedToArray2["default"])(_useState71, 2),
-    metabaseCopyModule = _useState72[0],
-    setMetabaseCopyModule = _useState72[1];
+    moduleCopy = _useState72[0],
+    setModuleCopy = _useState72[1];
+  var _useState73 = (0, _react.useState)(false),
+    _useState74 = (0, _slicedToArray2["default"])(_useState73, 2),
+    isMetabaseCopy = _useState74[0],
+    setIsMetabaseCopy = _useState74[1];
+  var _useState75 = (0, _react.useState)(false),
+    _useState76 = (0, _slicedToArray2["default"])(_useState75, 2),
+    joinAliasConflictCheck = _useState76[0],
+    setJoinAliasConflictCheck = _useState76[1];
+  var _useState77 = (0, _react.useState)([]),
+    _useState78 = (0, _slicedToArray2["default"])(_useState77, 2),
+    existsError = _useState78[0],
+    setExistsError = _useState78[1];
+  var _useState79 = (0, _react.useState)(_storage["default"]._metabaseCopyModule || []),
+    _useState80 = (0, _slicedToArray2["default"])(_useState79, 2),
+    metabaseCopyModule = _useState80[0],
+    setMetabaseCopyModule = _useState80[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) {
@@ -231,6 +247,8 @@ var useStore = function useStore() {
   var fetchColumnsFn = (0, _react.useRef)();
   var fetchChangeFn = (0, _react.useRef)();
   var fetchDiffFn = (0, _react.useRef)();
+  var fetchFormulaSqlFn = (0, _react.useRef)();
+  var fetchFormulaDiffFn = (0, _react.useRef)();
   var fetchExistsError = (0, _react.useRef)();
   var setFetchChangeFn = function setFetchChangeFn(fn) {
     fetchChangeFn.current = fn;
@@ -238,6 +256,14 @@ var useStore = function useStore() {
   var setFetchDiffFn = function setFetchDiffFn(fn) {
     fetchDiffFn.current = fn;
   };
+  var setFetchFormulaSqlFn = function setFetchFormulaSqlFn(fn) {
+    fetchFormulaSqlFn.current = fn;
+    setHasFormulaSqlCode(Boolean(fn));
+  };
+  var setFetchFormulaDiffFn = function setFetchFormulaDiffFn(fn) {
+    fetchFormulaDiffFn.current = fn;
+    setHasFormulaDiffCode(Boolean(fn));
+  };
   var setExistsErrorFn = function () {
     var _ref = (0, _asyncToGenerator2["default"])(_regenerator["default"].mark(function _callee(fn, value) {
       var data;
@@ -295,6 +321,60 @@ var useStore = function useStore() {
       return _ref2.apply(this, arguments);
     };
   }();
+  var getFormulaSqlCode = function () {
+    var _ref3 = (0, _asyncToGenerator2["default"])(_regenerator["default"].mark(function _callee3(value) {
+      var data;
+      return _regenerator["default"].wrap(function (_context3) {
+        while (1) switch (_context3.prev = _context3.next) {
+          case 0:
+            if (fetchFormulaSqlFn.current) {
+              _context3.next = 1;
+              break;
+            }
+            return _context3.abrupt("return", '');
+          case 1:
+            _context3.next = 2;
+            return fetchFormulaSqlFn.current(value);
+          case 2:
+            data = _context3.sent;
+            return _context3.abrupt("return", data);
+          case 3:
+          case "end":
+            return _context3.stop();
+        }
+      }, _callee3);
+    }));
+    return function getFormulaSqlCode(_x3) {
+      return _ref3.apply(this, arguments);
+    };
+  }();
+  var getFormulaDiffCode = function () {
+    var _ref4 = (0, _asyncToGenerator2["default"])(_regenerator["default"].mark(function _callee4(params) {
+      var data;
+      return _regenerator["default"].wrap(function (_context4) {
+        while (1) switch (_context4.prev = _context4.next) {
+          case 0:
+            if (fetchFormulaDiffFn.current) {
+              _context4.next = 1;
+              break;
+            }
+            return _context4.abrupt("return", undefined);
+          case 1:
+            _context4.next = 2;
+            return fetchFormulaDiffFn.current(params);
+          case 2:
+            data = _context4.sent;
+            return _context4.abrupt("return", data);
+          case 3:
+          case "end":
+            return _context4.stop();
+        }
+      }, _callee4);
+    }));
+    return function getFormulaDiffCode(_x4) {
+      return _ref4.apply(this, arguments);
+    };
+  }();
   var setFetchColumnsFn = function setFetchColumnsFn(fn) {
     fetchColumnsFn.current = fn;
   };
@@ -328,84 +408,84 @@ var useStore = function useStore() {
     }
   }, [sourceList, isExit, tableFlat]);
   var getSourceTable = function () {
-    var _ref3 = (0, _asyncToGenerator2["default"])(_regenerator["default"].mark(function _callee4(source) {
+    var _ref5 = (0, _asyncToGenerator2["default"])(_regenerator["default"].mark(function _callee6(source) {
       var results;
-      return _regenerator["default"].wrap(function (_context4) {
-        while (1) switch (_context4.prev = _context4.next) {
+      return _regenerator["default"].wrap(function (_context6) {
+        while (1) switch (_context6.prev = _context6.next) {
           case 0:
-            _context4.next = 1;
+            _context6.next = 1;
             return Promise.all(source.map(function () {
-              var _ref4 = (0, _asyncToGenerator2["default"])(_regenerator["default"].mark(function _callee3(v) {
+              var _ref6 = (0, _asyncToGenerator2["default"])(_regenerator["default"].mark(function _callee5(v) {
                 var tables;
-                return _regenerator["default"].wrap(function (_context3) {
-                  while (1) switch (_context3.prev = _context3.next) {
+                return _regenerator["default"].wrap(function (_context5) {
+                  while (1) switch (_context5.prev = _context5.next) {
                     case 0:
-                      _context3.next = 1;
+                      _context5.next = 1;
                       return fetchDataset(v.datasourceId);
                     case 1:
-                      tables = _context3.sent;
-                      return _context3.abrupt("return", (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, v), {}, {
+                      tables = _context5.sent;
+                      return _context5.abrupt("return", (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, v), {}, {
                         children: tables
                       }));
                     case 2:
                     case "end":
-                      return _context3.stop();
+                      return _context5.stop();
                   }
-                }, _callee3);
+                }, _callee5);
               }));
-              return function (_x4) {
-                return _ref4.apply(this, arguments);
+              return function (_x6) {
+                return _ref6.apply(this, arguments);
               };
             }()));
           case 1:
-            results = _context4.sent;
+            results = _context6.sent;
             setSourceTable(results || []);
           case 2:
           case "end":
-            return _context4.stop();
+            return _context6.stop();
         }
-      }, _callee4);
+      }, _callee6);
     }));
-    return function getSourceTable(_x3) {
-      return _ref3.apply(this, arguments);
+    return function getSourceTable(_x5) {
+      return _ref5.apply(this, arguments);
     };
   }();
   var showToolbar = function showToolbar(name) {
     return !!~toolbar.indexOf(name);
   };
   var fetchDataset = function () {
-    var _ref5 = (0, _asyncToGenerator2["default"])(_regenerator["default"].mark(function _callee5(datasourceId) {
+    var _ref7 = (0, _asyncToGenerator2["default"])(_regenerator["default"].mark(function _callee7(datasourceId) {
       var tables, _tables;
-      return _regenerator["default"].wrap(function (_context5) {
-        while (1) switch (_context5.prev = _context5.next) {
+      return _regenerator["default"].wrap(function (_context7) {
+        while (1) switch (_context7.prev = _context7.next) {
           case 0:
             tables = getDataset(datasourceId);
             if (!tables.length) {
-              _context5.next = 1;
+              _context7.next = 1;
               break;
             }
-            return _context5.abrupt("return", tables);
+            return _context7.abrupt("return", tables);
           case 1:
-            _context5.next = 2;
+            _context7.next = 2;
             return fetchDatasetFn.current(datasourceId, {
               isExit: isExit
             });
           case 2:
-            _tables = _context5.sent;
+            _tables = _context7.sent;
             setDataset(datasourceId, _tables);
-            return _context5.abrupt("return", _tables);
+            return _context7.abrupt("return", _tables);
           case 3:
           case "end":
-            return _context5.stop();
+            return _context7.stop();
         }
-      }, _callee5);
+      }, _callee7);
     }));
-    return function fetchDataset(_x5) {
-      return _ref5.apply(this, arguments);
+    return function fetchDataset(_x7) {
+      return _ref7.apply(this, arguments);
     };
   }();
   var fetchColumns = function () {
-    var _ref6 = (0, _asyncToGenerator2["default"])(_regenerator["default"].mark(function _callee6(table, datasourceId) {
+    var _ref8 = (0, _asyncToGenerator2["default"])(_regenerator["default"].mark(function _callee8(table, datasourceId) {
       var _columns2;
       var oldColumns,
         callback,
@@ -423,15 +503,15 @@ var useStore = function useStore() {
         tableName,
         columns,
         _columns,
-        _args6 = arguments;
-      return _regenerator["default"].wrap(function (_context6) {
-        while (1) switch (_context6.prev = _context6.next) {
+        _args8 = arguments;
+      return _regenerator["default"].wrap(function (_context8) {
+        while (1) switch (_context8.prev = _context8.next) {
           case 0:
-            oldColumns = _args6.length > 2 && _args6[2] !== undefined ? _args6[2] : [];
-            callback = _args6.length > 3 ? _args6[3] : undefined;
-            isSelect = _args6.length > 4 && _args6[4] !== undefined ? _args6[4] : isSelectFields;
-            _isSubquery = _args6.length > 5 && _args6[5] !== undefined ? _args6[5] : isSubquery;
-            _isExit = _args6.length > 6 && _args6[6] !== undefined ? _args6[6] : isExit;
+            oldColumns = _args8.length > 2 && _args8[2] !== undefined ? _args8[2] : [];
+            callback = _args8.length > 3 ? _args8[3] : undefined;
+            isSelect = _args8.length > 4 && _args8[4] !== undefined ? _args8[4] : isSelectFields;
+            _isSubquery = _args8.length > 5 && _args8[5] !== undefined ? _args8[5] : isSubquery;
+            _isExit = _args8.length > 6 && _args8[6] !== undefined ? _args8[6] : isExit;
             oldObj = {};
             selectId = oldColumns.filter(function (v) {
               oldObj[v.id] = v;
@@ -449,51 +529,53 @@ var useStore = function useStore() {
             tableName = table.name;
             columns = getColumns(tableName);
             if (columns.length) {
-              _context6.next = 2;
+              _context8.next = 2;
               break;
             }
-            _context6.next = 1;
+            _context8.next = 1;
             return fetchColumnsFn.current(extra, datasourceId, {
               isExit: _isExit
             });
           case 1:
-            columns = _context6.sent;
+            columns = _context8.sent;
             setColumns(tableName, columns);
           case 2:
             _columns = (_columns2 = columns) === null || _columns2 === void 0 ? void 0 : _columns2.map(function (v) {
+              var _ref9, _obj$fieldAlias;
               var obj = oldColumns.find(function (oldColumn) {
                 return (0, _helper.isSameColumnByIdFirst)(oldColumn, v);
               });
               var select = selectId.includes(v.id) || Boolean(obj === null || obj === void 0 ? void 0 : obj.select);
               return (0, _objectSpread2["default"])((0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, obj), v), {}, {
                 select: isSelect || select,
+                fieldAlias: (_ref9 = (_obj$fieldAlias = obj === null || obj === void 0 ? void 0 : obj.fieldAlias) !== null && _obj$fieldAlias !== void 0 ? _obj$fieldAlias : v.fieldAlias) !== null && _ref9 !== void 0 ? _ref9 : '',
                 fieldUuid: (obj === null || obj === void 0 ? void 0 : obj.fieldUuid) || v.fieldUuid || (0, _helper.uuidv4)('field')
               });
             });
             typeof callback === 'function' && callback(_columns);
           case 3:
           case "end":
-            return _context6.stop();
+            return _context8.stop();
         }
-      }, _callee6);
+      }, _callee8);
     }));
-    return function fetchColumns(_x6, _x7) {
-      return _ref6.apply(this, arguments);
+    return function fetchColumns(_x8, _x9) {
+      return _ref8.apply(this, arguments);
     };
   }();
   var setMeta = function () {
-    var _ref7 = (0, _asyncToGenerator2["default"])(_regenerator["default"].mark(function _callee7(curData, groupInd) {
+    var _ref0 = (0, _asyncToGenerator2["default"])(_regenerator["default"].mark(function _callee9(curData, groupInd) {
       var changeObj,
         _metaList,
         prevMeta,
         newMeta,
         isChange,
-        _args7 = arguments;
-      return _regenerator["default"].wrap(function (_context7) {
-        while (1) switch (_context7.prev = _context7.next) {
+        _args9 = arguments;
+      return _regenerator["default"].wrap(function (_context9) {
+        while (1) switch (_context9.prev = _context9.next) {
           case 0:
-            changeObj = _args7.length > 2 && _args7[2] !== undefined ? _args7[2] : {};
-            _metaList = _args7.length > 3 ? _args7[3] : undefined;
+            changeObj = _args9.length > 2 && _args9[2] !== undefined ? _args9[2] : {};
+            _metaList = _args9.length > 3 ? _args9[3] : undefined;
             prevMeta = (0, _cloneDeep["default"])(_metaList || latestMetaListRef.current);
             newMeta = (0, _cloneDeep["default"])(prevMeta);
             if (newMeta[groupInd]) {
@@ -501,28 +583,28 @@ var useStore = function useStore() {
               _setMeta(newMeta);
             }
             if (!(changeObj === 'init')) {
-              _context7.next = 1;
+              _context9.next = 1;
               break;
             }
-            return _context7.abrupt("return");
+            return _context9.abrupt("return");
           case 1:
-            _context7.next = 2;
+            _context9.next = 2;
             return fetchChangeFn.current((0, _utils.splitByUnion)(newMeta), changeObj, {
               isExit: isExit
             });
           case 2:
-            isChange = _context7.sent;
+            isChange = _context9.sent;
             if (isChange === false) {
               _setMeta(prevMeta);
             }
           case 3:
           case "end":
-            return _context7.stop();
+            return _context9.stop();
         }
-      }, _callee7);
+      }, _callee9);
     }));
-    return function setMeta(_x8, _x9) {
-      return _ref7.apply(this, arguments);
+    return function setMeta(_x0, _x1) {
+      return _ref0.apply(this, arguments);
     };
   }();
   var setPreData = function setPreData(data) {
@@ -1004,10 +1086,20 @@ var useStore = function useStore() {
     setMetabaseCopy: setMetabaseCopy,
     moduleDiff: moduleDiff,
     setModuleDiff: setModuleDiff,
+    showFormulaSql: showFormulaSql,
+    setShowFormulaSql: setShowFormulaSql,
+    showFormulaDiff: showFormulaDiff,
+    setShowFormulaDiff: setShowFormulaDiff,
+    hasFormulaSqlCode: hasFormulaSqlCode,
+    hasFormulaDiffCode: hasFormulaDiffCode,
     sourceData: sourceData,
     setSourceData: setSourceData,
     setFetchDiffFn: setFetchDiffFn,
     getModuleDiffCode: getModuleDiffCode,
+    setFetchFormulaSqlFn: setFetchFormulaSqlFn,
+    getFormulaSqlCode: getFormulaSqlCode,
+    setFetchFormulaDiffFn: setFetchFormulaDiffFn,
+    getFormulaDiffCode: getFormulaDiffCode,
     isSubquery: isSubquery,
     setIsSubquery: setIsSubquery,
     moduleCopy: moduleCopy,