@gingkoo/pandora-metabase 1.0.87 → 1.0.89

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

@@ -90,9 +90,9 @@ var FormulaList = forwardRef(function (props, ref) {
     setOldCode(getPreviewStr(caseList));
   }, []);
   var _useState9 = useState(''),
-    _useState0 = _slicedToArray(_useState9, 2),
-    filterVal = _useState0[0],
-    setFilterVal = _useState0[1];
+    _useState10 = _slicedToArray(_useState9, 2),
+    filterVal = _useState10[0],
+    setFilterVal = _useState10[1];
   var setCaseList = function setCaseList(data) {
     var quotes = data.map(function (v, i) {
       if (v !== null && v !== void 0 && v.quotes) {
@@ -107,35 +107,35 @@ var FormulaList = forwardRef(function (props, ref) {
     caseList = data;
     caseListRef.current = data;
   };
-  var _useState1 = useState(-1),
-    _useState10 = _slicedToArray(_useState1, 2),
-    ind = _useState10[0],
-    setInd = _useState10[1];
+  var _useState11 = useState(-1),
+    _useState12 = _slicedToArray(_useState11, 2),
+    ind = _useState12[0],
+    setInd = _useState12[1];
   var filterCustomType = store.filterCustomType;
   var _ref = useRef(null);
-  var _useState11 = useState({
+  var _useState13 = useState({
       isError: false
     }),
-    _useState12 = _slicedToArray(_useState11, 2),
-    errorInfo = _useState12[0],
-    setErrorInfo = _useState12[1];
-  var _useState13 = useState(false),
     _useState14 = _slicedToArray(_useState13, 2),
-    isCheck = _useState14[0],
-    setIsCheck = _useState14[1];
-  var myInstanceIdRef = useRef(Math.random().toString(36).slice(2));
-  var _useState15 = useState(!!window.__sqb_selection_active__),
+    errorInfo = _useState14[0],
+    setErrorInfo = _useState14[1];
+  var _useState15 = useState(false),
     _useState16 = _slicedToArray(_useState15, 2),
-    globalSelectionActive = _useState16[0],
-    setGlobalSelectionActive = _useState16[1];
-  var _useState17 = useState(window.__sqb_selection_owner__ || null),
+    isCheck = _useState16[0],
+    setIsCheck = _useState16[1];
+  var myInstanceIdRef = useRef(Math.random().toString(36).slice(2));
+  var _useState17 = useState(!!window.__sqb_selection_active__),
     _useState18 = _slicedToArray(_useState17, 2),
-    globalSelectionOwner = _useState18[0],
-    setGlobalSelectionOwner = _useState18[1];
-  var _useState19 = useState([]),
+    globalSelectionActive = _useState18[0],
+    setGlobalSelectionActive = _useState18[1];
+  var _useState19 = useState(window.__sqb_selection_owner__ || null),
     _useState20 = _slicedToArray(_useState19, 2),
-    selectedIndices = _useState20[0],
-    setSelectedIndices = _useState20[1];
+    globalSelectionOwner = _useState20[0],
+    setGlobalSelectionOwner = _useState20[1];
+  var _useState21 = useState([]),
+    _useState22 = _slicedToArray(_useState21, 2),
+    selectedIndices = _useState22[0],
+    setSelectedIndices = _useState22[1];
   useEffect(function () {
     var leftBrackets = caseList.filter(function (v) {
       return v.type === AtomsTypeEnum.OPERATOR && v.val === '(';
@@ -373,7 +373,7 @@ var FormulaList = forwardRef(function (props, ref) {
       onOk: function () {
         var _onOk = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
           var _caseList;
-          return _regeneratorRuntime.wrap(function (_context) {
+          return _regeneratorRuntime.wrap(function _callee$(_context) {
             while (1) switch (_context.prev = _context.next) {
               case 0:
                 _caseList = caseList.slice(); // 删除选中项，selectedIndices 已经是排序好的了
@@ -382,7 +382,7 @@ var FormulaList = forwardRef(function (props, ref) {
                 });
                 setCaseList(_caseList);
                 initPaste();
-              case 1:
+              case 4:
               case "end":
                 return _context.stop();
             }
@@ -947,6 +947,9 @@ var FormulaList = forwardRef(function (props, ref) {
               style: {
                 pointerEvents: isCheck || store.isMetabaseCopy ? 'none' : 'auto'
               },
+              className: cx({
+                openCheck: isCheck
+              }),
               children: itemDom(v, i)
             }), selectOperator({
               triggerElement: function triggerElement(value) {

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

@@ -35,6 +35,11 @@
   //     transform: none;
   //   }
   // }
+  .openCheck {
+    .Sqb-TableName {
+      padding-left: 20px;
+    }
+  }
   &.item-selected {
     .item-check {
       display: block;

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

@@ -102,16 +102,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 (isValidSQLAlias(fieldAlias)) {
-                  _context.next = 1;
+                  _context.next = 3;
                   break;
                 }
                 Toast.warning(__('SqlQueryBuilder.aliasForRules'));
                 return _context.abrupt("return", false);
-              case 1:
+              case 3:
                 newColumns = cloneDeep(columns);
                 newMetaList = store.metaList[groupIndex].list.slice();
                 newColumns[i].fieldAlias = fieldAlias;
@@ -125,7 +125,7 @@ var SelectColumn = function SelectColumn(_ref) {
                 setTimeout(function () {
                   store.setClosable(true);
                 }, 0);
-              case 2:
+              case 11:
               case "end":
                 return _context.stop();
             }

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

@@ -73,9 +73,9 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
         columns: v.columns.slice()
       });
     })),
-    _useState0 = _slicedToArray(_useState9, 2),
-    tableList = _useState0[0],
-    setTableList = _useState0[1];
+    _useState10 = _slicedToArray(_useState9, 2),
+    tableList = _useState10[0],
+    setTableList = _useState10[1];
   useEffect(function () {
     setValue(_value);
     setCurColumn(_value.name);

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

@@ -47,13 +47,13 @@ var SelectTable = function SelectTable(_ref) {
     list = _useState8[0],
     setList = _useState8[1];
   var _useState9 = useState([]),
-    _useState0 = _slicedToArray(_useState9, 2),
-    originList = _useState0[0],
-    setOriginList = _useState0[1];
-  var _useState1 = useState(value),
-    _useState10 = _slicedToArray(_useState1, 2),
-    val = _useState10[0],
-    setVal = _useState10[1];
+    _useState10 = _slicedToArray(_useState9, 2),
+    originList = _useState10[0],
+    setOriginList = _useState10[1];
+  var _useState11 = useState(value),
+    _useState12 = _slicedToArray(_useState11, 2),
+    val = _useState12[0],
+    setVal = _useState12[1];
   useEffect(function () {
     if (value.datasourceId) {
       getTables(value.datasourceId);
@@ -65,18 +65,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();
         }

package/lib/es/components/icons.js

@@ -169,12 +169,12 @@ export var LeftJoinIcon = function LeftJoinIcon(_ref9) {
     })
   });
 };
-export var InnerJoinIcon = function InnerJoinIcon(_ref0) {
-  var _ref0$width = _ref0.width,
-    width = _ref0$width === void 0 ? 32 : _ref0$width,
-    _ref0$height = _ref0.height,
-    height = _ref0$height === void 0 ? 32 : _ref0$height,
-    style = _ref0.style;
+export var InnerJoinIcon = function InnerJoinIcon(_ref10) {
+  var _ref10$width = _ref10.width,
+    width = _ref10$width === void 0 ? 32 : _ref10$width,
+    _ref10$height = _ref10.height,
+    height = _ref10$height === void 0 ? 32 : _ref10$height,
+    style = _ref10.style;
   return _jsx("svg", {
     viewBox: '0 0 32 32',
     width: width,
@@ -188,11 +188,11 @@ export var InnerJoinIcon = function InnerJoinIcon(_ref0) {
     })
   });
 };
-export var UpArrowIcon = function UpArrowIcon(_ref1) {
-  var _ref1$width = _ref1.width,
-    width = _ref1$width === void 0 ? 16 : _ref1$width,
-    _ref1$height = _ref1.height,
-    height = _ref1$height === void 0 ? 17 : _ref1$height;
+export var UpArrowIcon = function UpArrowIcon(_ref11) {
+  var _ref11$width = _ref11.width,
+    width = _ref11$width === void 0 ? 16 : _ref11$width,
+    _ref11$height = _ref11.height,
+    height = _ref11$height === void 0 ? 17 : _ref11$height;
   return _jsx("svg", {
     className: 'sort-arrow',
     viewBox: '0 0 32 34',
@@ -206,11 +206,11 @@ export var UpArrowIcon = function UpArrowIcon(_ref1) {
     })
   });
 };
-export var DownArrowIcon = function DownArrowIcon(_ref10) {
-  var _ref10$width = _ref10.width,
-    width = _ref10$width === void 0 ? 16 : _ref10$width,
-    _ref10$height = _ref10.height,
-    height = _ref10$height === void 0 ? 17 : _ref10$height;
+export var DownArrowIcon = function DownArrowIcon(_ref12) {
+  var _ref12$width = _ref12.width,
+    width = _ref12$width === void 0 ? 16 : _ref12$width,
+    _ref12$height = _ref12.height,
+    height = _ref12$height === void 0 ? 17 : _ref12$height;
   return _jsx("svg", {
     className: 'sort-arrow',
     viewBox: '0 0 32 34',
@@ -224,11 +224,11 @@ export var DownArrowIcon = function DownArrowIcon(_ref10) {
     })
   });
 };
-export var CloseIcon = function CloseIcon(_ref11) {
-  var _ref11$width = _ref11.width,
-    width = _ref11$width === void 0 ? 16 : _ref11$width,
-    _ref11$height = _ref11.height,
-    height = _ref11$height === void 0 ? 16 : _ref11$height;
+export var CloseIcon = function CloseIcon(_ref13) {
+  var _ref13$width = _ref13.width,
+    width = _ref13$width === void 0 ? 16 : _ref13$width,
+    _ref13$height = _ref13.height,
+    height = _ref13$height === void 0 ? 16 : _ref13$height;
   return _jsx("svg", {
     className: 'closeIcon',
     viewBox: '0 0 32 32',
@@ -242,11 +242,11 @@ export var CloseIcon = function CloseIcon(_ref11) {
     })
   });
 };
-export var AddIcon = function AddIcon(_ref12) {
-  var _ref12$width = _ref12.width,
-    width = _ref12$width === void 0 ? 16 : _ref12$width,
-    _ref12$height = _ref12.height,
-    height = _ref12$height === void 0 ? 16 : _ref12$height;
+export var AddIcon = function AddIcon(_ref14) {
+  var _ref14$width = _ref14.width,
+    width = _ref14$width === void 0 ? 16 : _ref14$width,
+    _ref14$height = _ref14.height,
+    height = _ref14$height === void 0 ? 16 : _ref14$height;
   return _jsx("svg", {
     viewBox: '0 0 32 32',
     width: width,
@@ -259,11 +259,11 @@ export var AddIcon = function AddIcon(_ref12) {
     })
   });
 };
-export var TableIcon = function TableIcon(_ref13) {
-  var _ref13$width = _ref13.width,
-    width = _ref13$width === void 0 ? 18 : _ref13$width,
-    _ref13$height = _ref13.height,
-    height = _ref13$height === void 0 ? 18 : _ref13$height;
+export var TableIcon = function TableIcon(_ref15) {
+  var _ref15$width = _ref15.width,
+    width = _ref15$width === void 0 ? 18 : _ref15$width,
+    _ref15$height = _ref15.height,
+    height = _ref15$height === void 0 ? 18 : _ref15$height;
   return _jsx("svg", {
     viewBox: '0 0 32 32',
     width: width,
@@ -276,11 +276,11 @@ export var TableIcon = function TableIcon(_ref13) {
     })
   });
 };
-export var SearchIcon = function SearchIcon(_ref14) {
-  var _ref14$width = _ref14.width,
-    width = _ref14$width === void 0 ? 16 : _ref14$width,
-    _ref14$height = _ref14.height,
-    height = _ref14$height === void 0 ? 16 : _ref14$height;
+export var SearchIcon = function SearchIcon(_ref16) {
+  var _ref16$width = _ref16.width,
+    width = _ref16$width === void 0 ? 16 : _ref16$width,
+    _ref16$height = _ref16.height,
+    height = _ref16$height === void 0 ? 16 : _ref16$height;
   return _jsx("svg", {
     viewBox: '0 0 32 32',
     width: width,

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

@@ -72,12 +72,12 @@ var Metabase = function Metabase(props) {
         content: __('metabase.validationFailed'),
         onOk: function () {
           var _onOk = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-            return _regeneratorRuntime.wrap(function (_context) {
+            return _regeneratorRuntime.wrap(function _callee$(_context) {
               while (1) switch (_context.prev = _context.next) {
                 case 0:
-                  _context.next = 1;
+                  _context.next = 2;
                   return onSave();
-                case 1:
+                case 2:
                 case "end":
                   return _context.stop();
               }
@@ -96,7 +96,7 @@ var Metabase = function Metabase(props) {
   var onSave = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
       var intercept, _metaList;
-      return _regeneratorRuntime.wrap(function (_context2) {
+      return _regeneratorRuntime.wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
             intercept = false; // 是否返回
@@ -110,17 +110,17 @@ var Metabase = function Metabase(props) {
               }
             });
             if (!(saveLoading || intercept)) {
-              _context2.next = 1;
+              _context2.next = 6;
               break;
             }
             return _context2.abrupt("return", null);
-          case 1:
+          case 6:
             setSaveLoading(true);
-            _context2.next = 2;
+            _context2.next = 9;
             return onOk === null || onOk === void 0 ? void 0 : onOk(_metaList);
-          case 2:
+          case 9:
             setSaveLoading(false);
-          case 3:
+          case 10:
           case "end":
             return _context2.stop();
         }

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

@@ -16,7 +16,7 @@
   &-fun-btns {
     position: absolute;
     left: 0;
-    top: 7px;
+    top: 2px;
     display: flex;
     justify-content: end;
     width: 66.6667%;

package/lib/es/components/modules/components/Wrapper.js

@@ -25,19 +25,19 @@ var Wrapper = function Wrapper(_ref) {
   function _animation() {
     _animation = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
       var _couterRef$current;
-      return _regeneratorRuntime.wrap(function (_context) {
+      return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            _context.next = 1;
+            _context.next = 2;
             return sleep(10);
-          case 1:
+          case 2:
             setOpacity(1);
             ((_couterRef$current = couterRef.current) === null || _couterRef$current === void 0 || (_couterRef$current = _couterRef$current.childNodes) === null || _couterRef$current === void 0 ? void 0 : _couterRef$current.length) && setMaxHeight(couterRef.current.childNodes[0].clientHeight + 16);
-            _context.next = 2;
+            _context.next = 6;
             return sleep(500);
-          case 2:
+          case 6:
             setMaxHeight('auto');
-          case 3:
+          case 7:
           case "end":
             return _context.stop();
         }

package/lib/es/components/modules/components/header.js

@@ -16,14 +16,14 @@ var Header = function Header(props) {
   var diff = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
       var _oldMeta, _newMeta, _yield$store$getModul, oldCode, newCode, o;
-      return _regeneratorRuntime.wrap(function (_context) {
+      return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             _oldMeta = store.sourceData.slice();
             _newMeta = splitByUnion(store.metaList);
-            _context.next = 1;
+            _context.next = 4;
             return store.getModuleDiffCode(_oldMeta, _newMeta);
-          case 1:
+          case 4:
             _yield$store$getModul = _context.sent;
             oldCode = _yield$store$getModul.oldCode;
             newCode = _yield$store$getModul.newCode;
@@ -36,7 +36,7 @@ var Header = function Header(props) {
               }),
               onClose: function onClose() {}
             });
-          case 2:
+          case 8:
           case "end":
             return _context.stop();
         }

package/lib/es/components/modules/custom-column.js

@@ -74,14 +74,14 @@ var CustomColumn = function CustomColumn(props) {
   function _handleUpdate() {
     _handleUpdate = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(e, i) {
       var node, newMeta, value, columns;
-      return _regeneratorRuntime.wrap(function (_context) {
+      return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             node = e.currentTarget;
             closePopup();
-            _context.next = 1;
+            _context.next = 4;
             return sleep(100);
-          case 1:
+          case 4:
             newMeta = store.metaList[groupIndex].list.slice();
             value = customColumn[i];
             columns = getAvailableColumns();
@@ -106,7 +106,7 @@ var CustomColumn = function CustomColumn(props) {
                 onClose: closePopup
               })
             });
-          case 2:
+          case 8:
           case "end":
             return _context.stop();
         }
@@ -176,8 +176,8 @@ var CustomColumn = function CustomColumn(props) {
             tableId: v.table2.id,
             tableUuid: v.table2.tableUuid || uuidv4('table'),
             columns: v.columns,
-            datasourceId: mainTable.table.datasourceId,
-            datasourceName: mainTable.table.datasourceName
+            datasourceId: v.table2.datasourceId,
+            datasourceName: v.table2.datasourceName
           });
         }));
       }
@@ -200,8 +200,8 @@ var CustomColumn = function CustomColumn(props) {
             tableId: v.table2.id,
             tableUuid: v.table2.tableUuid || uuidv4('table'),
             columns: v.columns,
-            datasourceId: mainTable.table.datasourceId,
-            datasourceName: mainTable.table.datasourceName
+            datasourceId: v.table2.datasourceId,
+            datasourceName: v.table2.datasourceName
           });
         } else {
           return {

package/lib/es/components/modules/filter.js

@@ -91,8 +91,8 @@ var Filter = function Filter(props) {
             id: v.table2.id,
             tableUuid: v.table2.tableUuid || uuidv4('table'),
             columns: v.columns,
-            datasourceId: mainTable.table.datasourceId,
-            datasourceName: mainTable.table.datasourceName
+            datasourceId: v.table2.datasourceId,
+            datasourceName: v.table2.datasourceName
           };
         }));
       }
@@ -120,8 +120,8 @@ var Filter = function Filter(props) {
             id: v.table2.id,
             tableUuid: v.table2.tableUuid || uuidv4('table'),
             columns: v.columns,
-            datasourceId: mainTable.table.datasourceId,
-            datasourceName: mainTable.table.datasourceName
+            datasourceId: v.table2.datasourceId,
+            datasourceName: v.table2.datasourceName
           };
         } else {
           return {

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

@@ -65,7 +65,7 @@ var menuOperator = operators.map(function (v) {
   };
 });
 var JoinData = function JoinData(props) {
-  var _meta$subquery, _meta$subquery2, _meta$subquery3, _meta$table5, _meta$table6, _meta$table8, _meta$table9, _meta$table0, _meta$table1, _meta$expressions, _meta$table10, _meta$table11, _meta$expressions2, _store$showMainColumn, _store$showMainColumn2;
+  var _meta$subquery, _meta$subquery2, _meta$subquery3, _meta$table5, _meta$table6, _meta$table8, _meta$table9, _meta$table10, _meta$table11, _meta$expressions, _meta$table12, _meta$table13, _meta$expressions2, _store$showMainColumn, _store$showMainColumn2;
   var meta = props.meta,
     groupIndex = props.groupIndex;
   var store = useStore();
@@ -87,20 +87,20 @@ var JoinData = function JoinData(props) {
     var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
       var _meta$table, _meta$table2;
       var tableName, tables, names;
-      return _regeneratorRuntime.wrap(function (_context) {
+      return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             tableName = (_meta$table = meta.table2) === null || _meta$table === void 0 ? void 0 : _meta$table.name;
             if ((_meta$table2 = meta.table2) !== null && _meta$table2 !== void 0 && _meta$table2.datasourceId) {
-              _context.next = 1;
+              _context.next = 4;
               break;
             }
             setIsDel(false);
             return _context.abrupt("return");
-          case 1:
-            _context.next = 2;
+          case 4:
+            _context.next = 6;
             return store === null || store === void 0 ? void 0 : store.fetchDataset(meta.table2.datasourceId);
-          case 2:
+          case 6:
             tables = _context.sent;
             names = (tables === null || tables === void 0 ? void 0 : tables.map(function (v) {
               return v.name;
@@ -110,7 +110,7 @@ var JoinData = function JoinData(props) {
             } else {
               setIsDel(false);
             }
-          case 3:
+          case 9:
           case "end":
             return _context.stop();
         }
@@ -1196,16 +1196,16 @@ var JoinData = function JoinData(props) {
       onOk: function () {
         var _onOk = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
           var index, newMeta;
-          return _regeneratorRuntime.wrap(function (_context2) {
+          return _regeneratorRuntime.wrap(function _callee2$(_context2) {
             while (1) switch (_context2.prev = _context2.next) {
               case 0:
                 if (isValidSQLAlias(alias)) {
-                  _context2.next = 1;
+                  _context2.next = 3;
                   break;
                 }
                 Toast.warning(__('SqlQueryBuilder.aliasForRules'));
                 return _context2.abrupt("return", false);
-              case 1:
+              case 3:
                 index = findIndex(store.metaList[groupIndex].list, meta);
                 newMeta = store.metaList[groupIndex].list.slice();
                 newMeta[index].table2.alias = alias;
@@ -1214,7 +1214,7 @@ var JoinData = function JoinData(props) {
                   obj: newMeta[index].table2,
                   type: ChangeType.tableAlias
                 });
-              case 2:
+              case 8:
               case "end":
                 return _context2.stop();
             }
@@ -1655,7 +1655,7 @@ var JoinData = function JoinData(props) {
                 icon: _jsx(RelatedWork, {}),
                 onClick: switchSubQuery
               })
-            }), ((_meta$table0 = meta.table2) === null || _meta$table0 === void 0 ? void 0 : _meta$table0.name) && ((_meta$table1 = meta.table1) === null || _meta$table1 === void 0 ? void 0 : _meta$table1.name) && ((_meta$expressions = meta.expressions) === null || _meta$expressions === void 0 ? void 0 : _meta$expressions.map(function (v, i) {
+            }), ((_meta$table10 = meta.table2) === null || _meta$table10 === void 0 ? void 0 : _meta$table10.name) && ((_meta$table11 = meta.table1) === null || _meta$table11 === void 0 ? void 0 : _meta$table11.name) && ((_meta$expressions = meta.expressions) === null || _meta$expressions === void 0 ? void 0 : _meta$expressions.map(function (v, i) {
               if (v.type === AtomsTypeEnum.JOIN_DEFAULT) {
                 return _jsxs("div", {
                   className: cx("Sqb-where block"),
@@ -1883,7 +1883,7 @@ var JoinData = function JoinData(props) {
                   })]
                 }, i);
               }
-            })), ((_meta$table10 = meta.table2) === null || _meta$table10 === void 0 ? void 0 : _meta$table10.name) && ((_meta$table11 = meta.table1) === null || _meta$table11 === void 0 ? void 0 : _meta$table11.name) && (((_meta$expressions2 = meta.expressions) === null || _meta$expressions2 === void 0 ? void 0 : _meta$expressions2.length) || 0) < 1 && _jsx(Tooltip, {
+            })), ((_meta$table12 = meta.table2) === null || _meta$table12 === void 0 ? void 0 : _meta$table12.name) && ((_meta$table13 = meta.table1) === null || _meta$table13 === void 0 ? void 0 : _meta$table13.name) && (((_meta$expressions2 = meta.expressions) === null || _meta$expressions2 === void 0 ? void 0 : _meta$expressions2.length) || 0) < 1 && _jsx(Tooltip, {
               title: __('SqlQueryBuilder.add'),
               children: _jsx(Dropdown, {
                 trigger: ['click'],

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

@@ -249,16 +249,16 @@ var GroupBy = function GroupBy(props) {
       onOk: function () {
         var _onOk = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
           var newMeta;
-          return _regeneratorRuntime.wrap(function (_context) {
+          return _regeneratorRuntime.wrap(function _callee$(_context) {
             while (1) switch (_context.prev = _context.next) {
               case 0:
                 if (isValidSQLAlias(fieldAlias)) {
-                  _context.next = 1;
+                  _context.next = 3;
                   break;
                 }
                 Toast.warning(__('SqlQueryBuilder.aliasForRules'));
                 return _context.abrupt("return", false);
-              case 1:
+              case 3:
                 newMeta = store.metaList[groupIndex].list.slice(); // @ts-ignore
                 newMeta[index].by[i].sql = newMeta[index].by[i].sql.split('AS ')[0] + "AS ".concat(fieldAlias); //修改sql
                 newMeta[index].by[i].fieldAlias = fieldAlias;
@@ -267,7 +267,7 @@ var GroupBy = function GroupBy(props) {
                   obj: newMeta[index].by,
                   type: ChangeType.by
                 });
-              case 2:
+              case 8:
               case "end":
                 return _context.stop();
             }

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

@@ -247,16 +247,16 @@ var SelectIndex = function SelectIndex(props) {
       onOk: function () {
         var _onOk = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
           var newMeta;
-          return _regeneratorRuntime.wrap(function (_context) {
+          return _regeneratorRuntime.wrap(function _callee$(_context) {
             while (1) switch (_context.prev = _context.next) {
               case 0:
                 if (isValidSQLAlias(fieldAlias)) {
-                  _context.next = 1;
+                  _context.next = 3;
                   break;
                 }
                 Toast.warning(__('SqlQueryBuilder.aliasForRules'));
                 return _context.abrupt("return", false);
-              case 1:
+              case 3:
                 newMeta = store.metaList[groupIndex].list.slice(); // @ts-ignore
                 newMeta[index].group[i].fieldAlias = fieldAlias;
                 newMeta[index].group[i].sql = newMeta[index].group[i].sql.split('AS ')[0] + "AS ".concat(fieldAlias); //修改sql
@@ -265,7 +265,7 @@ var SelectIndex = function SelectIndex(props) {
                   obj: newMeta[index].group,
                   type: ChangeType.group
                 });
-              case 2:
+              case 8:
               case "end":
                 return _context.stop();
             }