@gingkoo/pandora-metabase 1.0.108 → 1.0.110

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

@@ -40,20 +40,20 @@ var TableData = function TableData(props) {
     var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
       var _meta$table, _meta$table2;
       var tableName, tables, names;
-      return _regeneratorRuntime.wrap(function _callee$(_context) {
+      return _regeneratorRuntime.wrap(function (_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             tableName = (_meta$table = meta.table) === null || _meta$table === void 0 ? void 0 : _meta$table.name;
             if (meta !== null && meta !== void 0 && (_meta$table2 = meta.table) !== null && _meta$table2 !== void 0 && _meta$table2.datasourceId) {
-              _context.next = 4;
+              _context.next = 1;
               break;
             }
             setIsDel(false);
             return _context.abrupt("return");
-          case 4:
-            _context.next = 6;
+          case 1:
+            _context.next = 2;
             return store === null || store === void 0 ? void 0 : store.fetchDataset(meta.table.datasourceId);
-          case 6:
+          case 2:
             tables = _context.sent;
             names = (tables === null || tables === void 0 ? void 0 : tables.map(function (v) {
               return v.name;
@@ -63,7 +63,7 @@ var TableData = function TableData(props) {
             } else {
               setIsDel(false);
             }
-          case 9:
+          case 3:
           case "end":
             return _context.stop();
         }
@@ -152,16 +152,16 @@ var TableData = function TableData(props) {
       onOk: function () {
         var _onOk = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
           var newMetaList;
-          return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+          return _regeneratorRuntime.wrap(function (_context2) {
             while (1) switch (_context2.prev = _context2.next) {
               case 0:
                 if (isValidSQLAlias(alias)) {
-                  _context2.next = 3;
+                  _context2.next = 1;
                   break;
                 }
                 Toast.warning(__('SqlQueryBuilder.aliasForRules'));
                 return _context2.abrupt("return", false);
-              case 3:
+              case 1:
                 newMetaList = store.metaList[groupIndex].list.slice(); // @ts-ignore
                 newMetaList[0].table.alias = alias;
                 newMetaList = changeTableAlias(newMetaList, newMetaList[0].table);
@@ -169,7 +169,7 @@ var TableData = function TableData(props) {
                   obj: newMetaList[0].table,
                   type: ChangeType.tableAlias
                 });
-              case 7:
+              case 2:
               case "end":
                 return _context2.stop();
             }

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

@@ -1,3 +1,4 @@
+import _createForOfIteratorHelper from "@babel/runtime/helpers/esm/createForOfIteratorHelper";
 import _typeof from "@babel/runtime/helpers/esm/typeof";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
@@ -60,145 +61,145 @@ var useStore = function useStore() {
     toolbar = _useState8[0],
     setToolbar = _useState8[1]; //工具列表
   var _useState9 = useState('${name}'),
-    _useState10 = _slicedToArray(_useState9, 2),
-    fieldNameTpl = _useState10[0],
-    setFieldNameTpl = _useState10[1]; //显示字段
-  var _useState11 = useState('${name}'),
+    _useState0 = _slicedToArray(_useState9, 2),
+    fieldNameTpl = _useState0[0],
+    setFieldNameTpl = _useState0[1]; //显示字段
+  var _useState1 = useState('${name}'),
+    _useState10 = _slicedToArray(_useState1, 2),
+    tableNameTpl = _useState10[0],
+    setTableNameTpl = _useState10[1]; //显示字段
+  var _useState11 = useState([]),
     _useState12 = _slicedToArray(_useState11, 2),
-    tableNameTpl = _useState12[0],
-    setTableNameTpl = _useState12[1]; //显示字段
+    sourceList = _useState12[0],
+    setSourceList = _useState12[1]; //数据源列表
   var _useState13 = useState([]),
     _useState14 = _slicedToArray(_useState13, 2),
-    sourceList = _useState14[0],
-    setSourceList = _useState14[1]; //数据源列表
+    constantList = _useState14[0],
+    setConstantList = _useState14[1]; //常量列表
   var _useState15 = useState([]),
     _useState16 = _slicedToArray(_useState15, 2),
-    constantList = _useState16[0],
-    setConstantList = _useState16[1]; //常量列表
-  var _useState17 = useState([]),
+    formulaTemplates = _useState16[0],
+    _setFormulaTemplates = _useState16[1]; //公式配置数组
+  var _useState17 = useState(false),
     _useState18 = _slicedToArray(_useState17, 2),
-    formulaTemplates = _useState18[0],
-    _setFormulaTemplates = _useState18[1]; //公式配置数组
+    ignoreGroupByType = _useState18[0],
+    setIgnoreGroupByType = _useState18[1]; // 忽略groupBy类型
   var _useState19 = useState(false),
     _useState20 = _slicedToArray(_useState19, 2),
-    ignoreGroupByType = _useState20[0],
-    setIgnoreGroupByType = _useState20[1]; // 忽略groupBy类型
-  var _useState21 = useState(false),
+    filterCustomType = _useState20[0],
+    setfilterCustomType = _useState20[1]; // 过滤器自定义类型
+  var _useState21 = useState({}),
     _useState22 = _slicedToArray(_useState21, 2),
-    filterCustomType = _useState22[0],
-    setfilterCustomType = _useState22[1]; // 过滤器自定义类型
+    _cacheSource2TableMap = _useState22[0],
+    set_cacheSource2TableMap = _useState22[1]; //数据源id 对应数据集列表
   var _useState23 = useState({}),
     _useState24 = _slicedToArray(_useState23, 2),
-    _cacheSource2TableMap = _useState24[0],
-    set_cacheSource2TableMap = _useState24[1]; //数据源id 对应数据集列表
-  var _useState25 = useState({}),
+    _cacheColumnsMap = _useState24[0],
+    set_cacheColumnsMap = _useState24[1]; //数据源id 对应数据集列表
+  var _useState25 = useState(defaultMeta),
     _useState26 = _slicedToArray(_useState25, 2),
-    _cacheColumnsMap = _useState26[0],
-    set_cacheColumnsMap = _useState26[1]; //数据源id 对应数据集列表
-  var _useState27 = useState(defaultMeta),
-    _useState28 = _slicedToArray(_useState27, 2),
-    metaList = _useState28[0],
-    _setMeta = _useState28[1]; //数据源id 对应数据集列表
-  var _useState29 = useState({
+    metaList = _useState26[0],
+    _setMeta = _useState26[1]; //数据源id 对应数据集列表
+  var _useState27 = useState({
       visible: false,
       node: null,
       content: null
     }),
-    _useState30 = _slicedToArray(_useState29, 2),
-    popupData = _useState30[0],
-    setPopup = _useState30[1]; //弹窗
-  var _useState31 = useState({
+    _useState28 = _slicedToArray(_useState27, 2),
+    popupData = _useState28[0],
+    setPopup = _useState28[1]; //弹窗
+  var _useState29 = useState({
       visible: false,
       node: null,
       content: null
     }),
+    _useState30 = _slicedToArray(_useState29, 2),
+    popupData2 = _useState30[0],
+    setPopup2 = _useState30[1]; //弹窗
+  var _useState31 = useState(true),
     _useState32 = _slicedToArray(_useState31, 2),
-    popupData2 = _useState32[0],
-    setPopup2 = _useState32[1]; //弹窗
+    popupClosable = _useState32[0],
+    setClosable = _useState32[1]; //是否可关闭 如果弹框里面再弹框 则不可关闭
   var _useState33 = useState(true),
     _useState34 = _slicedToArray(_useState33, 2),
-    popupClosable = _useState34[0],
-    setClosable = _useState34[1]; //是否可关闭 如果弹框里面再弹框 则不可关闭
-  var _useState35 = useState(true),
+    popupClosable2 = _useState34[0],
+    setClosable2 = _useState34[1]; //是否可关闭 如果弹框里面再弹框 则不可关闭
+  var _useState35 = useState({}),
     _useState36 = _slicedToArray(_useState35, 2),
-    popupClosable2 = _useState36[0],
-    setClosable2 = _useState36[1]; //是否可关闭 如果弹框里面再弹框 则不可关闭
-  var _useState37 = useState({}),
+    currentTable = _useState36[0],
+    setCurrentTable = _useState36[1]; // 当前存在的表
+  var _useState37 = useState(false),
     _useState38 = _slicedToArray(_useState37, 2),
-    currentTable = _useState38[0],
-    setCurrentTable = _useState38[1]; // 当前存在的表
+    isExit = _useState38[0],
+    setIsExit = _useState38[1]; // 是否是notExit
   var _useState39 = useState(false),
     _useState40 = _slicedToArray(_useState39, 2),
-    isExit = _useState40[0],
-    setIsExit = _useState40[1]; // 是否是notExit
-  var _useState41 = useState(false),
+    isSubquery = _useState40[0],
+    setIsSubquery = _useState40[1]; // 是否是子查询
+  var _useState41 = useState(true),
     _useState42 = _slicedToArray(_useState41, 2),
-    isSubquery = _useState42[0],
-    setIsSubquery = _useState42[1]; // 是否是子查询
+    tableEnableAlias = _useState42[0],
+    setTableEnableAlias = _useState42[1]; // 表名是否开启别名
   var _useState43 = useState(true),
     _useState44 = _slicedToArray(_useState43, 2),
-    tableEnableAlias = _useState44[0],
-    setTableEnableAlias = _useState44[1]; // 表名是否开启别名
+    fieldEnableAlias = _useState44[0],
+    setFieldEnableAlias = _useState44[1]; // 字段名是否开启别名
   var _useState45 = useState(true),
     _useState46 = _slicedToArray(_useState45, 2),
-    fieldEnableAlias = _useState46[0],
-    setFieldEnableAlias = _useState46[1]; // 字段名是否开启别名
+    groupByEnableAlias = _useState46[0],
+    setGroupByEnableAlias = _useState46[1]; // 聚合是否开启别名
   var _useState47 = useState(true),
     _useState48 = _slicedToArray(_useState47, 2),
-    groupByEnableAlias = _useState48[0],
-    setGroupByEnableAlias = _useState48[1]; // 聚合是否开启别名
-  var _useState49 = useState(true),
+    isSelectFields = _useState48[0],
+    setIsSelectFields = _useState48[1]; // 是否默认勾选字段
+  var _useState49 = useState(false),
     _useState50 = _slicedToArray(_useState49, 2),
-    isSelectFields = _useState50[0],
-    setIsSelectFields = _useState50[1]; // 是否默认勾选字段
-  var _useState51 = useState(false),
+    tableFlat = _useState50[0],
+    setTableFlat = _useState50[1]; // 是否平铺数据表
+  var _useState51 = useState([]),
     _useState52 = _slicedToArray(_useState51, 2),
-    tableFlat = _useState52[0],
-    setTableFlat = _useState52[1]; // 是否平铺数据表
+    sourceTable = _useState52[0],
+    setSourceTable = _useState52[1];
   var _useState53 = useState([]),
     _useState54 = _slicedToArray(_useState53, 2),
-    sourceTable = _useState54[0],
-    setSourceTable = _useState54[1];
+    operatorList = _useState54[0],
+    setOperatorList = _useState54[1]; // 操作符
   var _useState55 = useState([]),
     _useState56 = _slicedToArray(_useState55, 2),
-    operatorList = _useState56[0],
-    setOperatorList = _useState56[1]; // 操作符
-  var _useState57 = useState([]),
+    copyType = _useState56[0],
+    setCopyType = _useState56[1]; // 复制类型
+  var _useState57 = useState(false),
     _useState58 = _slicedToArray(_useState57, 2),
-    copyType = _useState58[0],
-    setCopyType = _useState58[1]; // 复制类型
+    metabaseCopy = _useState58[0],
+    setMetabaseCopy = _useState58[1]; // 是否开启复制功能
   var _useState59 = useState(false),
     _useState60 = _slicedToArray(_useState59, 2),
-    metabaseCopy = _useState60[0],
-    setMetabaseCopy = _useState60[1]; // 是否开启复制功能
-  var _useState61 = useState(false),
+    moduleDiff = _useState60[0],
+    setModuleDiff = _useState60[1]; // 是否开启模块比对功能
+  var _useState61 = useState([]),
     _useState62 = _slicedToArray(_useState61, 2),
-    moduleDiff = _useState62[0],
-    setModuleDiff = _useState62[1]; // 是否开启模块比对功能
-  var _useState63 = useState([]),
+    sourceData = _useState62[0],
+    setSourceData = _useState62[1]; // 原始数据
+  var _useState63 = useState(false),
     _useState64 = _slicedToArray(_useState63, 2),
-    sourceData = _useState64[0],
-    setSourceData = _useState64[1]; // 原始数据
+    moduleCopy = _useState64[0],
+    setModuleCopy = _useState64[1]; // 是否开启模块复制功能
   var _useState65 = useState(false),
     _useState66 = _slicedToArray(_useState65, 2),
-    moduleCopy = _useState66[0],
-    setModuleCopy = _useState66[1]; // 是否开启模块复制功能
+    isMetabaseCopy = _useState66[0],
+    setIsMetabaseCopy = _useState66[1]; // 是否开启勾选组复制
   var _useState67 = useState(false),
     _useState68 = _slicedToArray(_useState67, 2),
-    isMetabaseCopy = _useState68[0],
-    setIsMetabaseCopy = _useState68[1]; // 是否开启勾选组复制
-  var _useState69 = useState(false),
+    joinAliasConflictCheck = _useState68[0],
+    setJoinAliasConflictCheck = _useState68[1]; // 是否开启关联别名冲突检测
+  var _useState69 = useState([]),
     _useState70 = _slicedToArray(_useState69, 2),
-    joinAliasConflictCheck = _useState70[0],
-    setJoinAliasConflictCheck = _useState70[1]; // 是否开启关联别名冲突检测
-  var _useState71 = useState([]),
+    existsError = _useState70[0],
+    setExistsError = _useState70[1]; // exists 的错误字段
+  var _useState71 = useState(storage._metabaseCopyModule || []),
     _useState72 = _slicedToArray(_useState71, 2),
-    existsError = _useState72[0],
-    setExistsError = _useState72[1]; // exists 的错误字段
-  var _useState73 = useState(storage._metabaseCopyModule || []),
-    _useState74 = _slicedToArray(_useState73, 2),
-    metabaseCopyModule = _useState74[0],
-    setMetabaseCopyModule = _useState74[1]; // 复制的内容
+    metabaseCopyModule = _useState72[0],
+    setMetabaseCopyModule = _useState72[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) {
@@ -234,22 +235,22 @@ var useStore = function useStore() {
   var setExistsErrorFn = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(fn, value) {
       var data;
-      return _regeneratorRuntime.wrap(function _callee$(_context) {
+      return _regeneratorRuntime.wrap(function (_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             if (!(!value || value.length < 1)) {
-              _context.next = 3;
+              _context.next = 1;
               break;
             }
             setExistsError([]);
             return _context.abrupt("return");
-          case 3:
-            _context.next = 5;
+          case 1:
+            _context.next = 2;
             return fn(value);
-          case 5:
+          case 2:
             data = _context.sent;
             setExistsError(data || []);
-          case 7:
+          case 3:
           case "end":
             return _context.stop();
         }
@@ -266,20 +267,20 @@ var useStore = function useStore() {
         newCode,
         data,
         _args2 = arguments;
-      return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+      return _regeneratorRuntime.wrap(function (_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
             oldCode = _args2.length > 0 && _args2[0] !== undefined ? _args2[0] : [];
             newCode = _args2.length > 1 ? _args2[1] : undefined;
-            _context2.next = 4;
+            _context2.next = 1;
             return fetchDiffFn.current({
               oldCode: oldCode,
               newCode: newCode
             });
-          case 4:
+          case 1:
             data = _context2.sent;
             return _context2.abrupt("return", data);
-          case 6:
+          case 2:
           case "end":
             return _context2.stop();
         }
@@ -329,24 +330,24 @@ var useStore = function useStore() {
   var getSourceTable = /*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee4(source) {
       var results;
-      return _regeneratorRuntime.wrap(function _callee4$(_context4) {
+      return _regeneratorRuntime.wrap(function (_context4) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
-            _context4.next = 2;
+            _context4.next = 1;
             return Promise.all(source.map(/*#__PURE__*/function () {
               var _ref4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee3(v) {
                 var tables;
-                return _regeneratorRuntime.wrap(function _callee3$(_context3) {
+                return _regeneratorRuntime.wrap(function (_context3) {
                   while (1) switch (_context3.prev = _context3.next) {
                     case 0:
-                      _context3.next = 2;
+                      _context3.next = 1;
                       return fetchDataset(v.datasourceId);
-                    case 2:
+                    case 1:
                       tables = _context3.sent;
                       return _context3.abrupt("return", _objectSpread(_objectSpread({}, v), {}, {
                         children: tables
                       }));
-                    case 4:
+                    case 2:
                     case "end":
                       return _context3.stop();
                   }
@@ -356,10 +357,10 @@ var useStore = function useStore() {
                 return _ref4.apply(this, arguments);
               };
             }()));
-          case 2:
+          case 1:
             results = _context4.sent;
             setSourceTable(results || []);
-          case 4:
+          case 2:
           case "end":
             return _context4.stop();
         }
@@ -387,25 +388,25 @@ var useStore = function useStore() {
   var fetchDataset = /*#__PURE__*/function () {
     var _ref5 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee5(datasourceId) {
       var tables, _tables;
-      return _regeneratorRuntime.wrap(function _callee5$(_context5) {
+      return _regeneratorRuntime.wrap(function (_context5) {
         while (1) switch (_context5.prev = _context5.next) {
           case 0:
             tables = getDataset(datasourceId);
             if (!tables.length) {
-              _context5.next = 3;
+              _context5.next = 1;
               break;
             }
             return _context5.abrupt("return", tables);
-          case 3:
-            _context5.next = 5;
+          case 1:
+            _context5.next = 2;
             return fetchDatasetFn.current(datasourceId, {
               isExit: isExit
             });
-          case 5:
+          case 2:
             _tables = _context5.sent;
             setDataset(datasourceId, _tables);
             return _context5.abrupt("return", _tables);
-          case 8:
+          case 3:
           case "end":
             return _context5.stop();
         }
@@ -438,7 +439,7 @@ var useStore = function useStore() {
         columns,
         _columns,
         _args6 = arguments;
-      return _regeneratorRuntime.wrap(function _callee6$(_context6) {
+      return _regeneratorRuntime.wrap(function (_context6) {
         while (1) switch (_context6.prev = _context6.next) {
           case 0:
             oldColumns = _args6.length > 2 && _args6[2] !== undefined ? _args6[2] : [];
@@ -456,7 +457,7 @@ var useStore = function useStore() {
             }).filter(function (v) {
               return v;
             });
-            if (_isSubquery) {
+            if (_isSubquery && oldColumns.length < 1) {
               selectId = [];
               isSelect = false;
             }
@@ -464,17 +465,17 @@ var useStore = function useStore() {
             tableName = table.name;
             columns = getColumns(tableName);
             if (columns.length) {
-              _context6.next = 16;
+              _context6.next = 2;
               break;
             }
-            _context6.next = 14;
+            _context6.next = 1;
             return fetchColumnsFn.current(extra, datasourceId, {
               isExit: _isExit
             });
-          case 14:
+          case 1:
             columns = _context6.sent;
             setColumns(tableName, columns);
-          case 16:
+          case 2:
             _columns = (_columns2 = columns) === null || _columns2 === void 0 ? void 0 : _columns2.map(function (v) {
               var select = selectId.includes(v.id);
               var obj = {};
@@ -485,7 +486,7 @@ var useStore = function useStore() {
               });
             });
             typeof callback === 'function' && callback(_columns);
-          case 18:
+          case 3:
           case "end":
             return _context6.stop();
         }
@@ -502,7 +503,7 @@ var useStore = function useStore() {
         newMeta,
         isChange,
         _args7 = arguments;
-      return _regeneratorRuntime.wrap(function _callee7$(_context7) {
+      return _regeneratorRuntime.wrap(function (_context7) {
         while (1) switch (_context7.prev = _context7.next) {
           case 0:
             changeObj = _args7.length > 2 && _args7[2] !== undefined ? _args7[2] : {};
@@ -514,22 +515,22 @@ var useStore = function useStore() {
             }
             // 过滤掉初始化
             if (!(changeObj === 'init')) {
-              _context7.next = 6;
+              _context7.next = 1;
               break;
             }
             return _context7.abrupt("return");
-          case 6:
-            _context7.next = 8;
+          case 1:
+            _context7.next = 2;
             return fetchChangeFn.current(splitByUnion(_metaList), changeObj, {
               isExit: isExit
             });
-          case 8:
+          case 2:
             isChange = _context7.sent;
             // 是否还原
             if (isChange === false) {
               _setMeta(_metaList);
             }
-          case 10:
+          case 3:
           case "end":
             return _context7.stop();
         }
@@ -828,49 +829,47 @@ var useStore = function useStore() {
     }
     return item;
   };
-  // 检查粘贴位置上下级的 table1 是否与被粘贴项的 table1 有相同的 alias
-  var checkTable1Conflict = function checkTable1Conflict(objList, index, groupIndex) {
-    var _metaList$groupIndex, _objList$;
+  // 检查所有同级 joinData 的 table1.id + table2.id 组合是否冲突
+  var checkTable1Conflict = function checkTable1Conflict(objList, _index, groupIndex) {
+    var _metaList$groupIndex;
     if (!objList || objList.length === 0) return {
       hasConflict: false
     };
     var groupList = ((_metaList$groupIndex = metaList[groupIndex]) === null || _metaList$groupIndex === void 0 ? void 0 : _metaList$groupIndex.list) || [];
-    // 获取被粘贴项的 table1 alias
-    var pastedTable1Alias = (_objList$ = objList[0]) === null || _objList$ === void 0 || (_objList$ = _objList$.table1) === null || _objList$ === void 0 ? void 0 : _objList$.alias;
-    if (!pastedTable1Alias) return {
-      hasConflict: false
+    // 获取所有同级 joinData 的 table1.id + table2.id 组合
+    var getJoinKey = function getJoinKey(table1, table2) {
+      return "".concat((table1 === null || table1 === void 0 ? void 0 : table1.id) || '', "_").concat((table2 === null || table2 === void 0 ? void 0 : table2.id) || '');
     };
-    // 检查上下级的 table1 和 table2 alias
-    var checkItem = function checkItem(item) {
-      if (!item) return undefined;
-      if (item.type === TypeEnum.joinData) {
-        var _item$table, _item$table2;
-        if (((_item$table = item.table1) === null || _item$table === void 0 ? void 0 : _item$table.alias) === pastedTable1Alias) return item.table1.alias;
-        if (((_item$table2 = item.table2) === null || _item$table2 === void 0 ? void 0 : _item$table2.alias) === pastedTable1Alias) return item.table2.alias;
+    // 收集已存在的 joinData 组合
+    var existingJoinKeys = new Set();
+    groupList.forEach(function (item) {
+      if (item.type === TypeEnum.joinData && item.table1 && item.table2) {
+        existingJoinKeys.add(getJoinKey(item.table1, item.table2));
       }
-      if (item.type === TypeEnum.data) {
-        var _item$table3;
-        if (((_item$table3 = item.table) === null || _item$table3 === void 0 ? void 0 : _item$table3.alias) === pastedTable1Alias) return item.table.alias;
+    });
+    // 检查每个被粘贴项的组合是否已存在
+    var _iterator = _createForOfIteratorHelper(objList),
+      _step;
+    try {
+      for (_iterator.s(); !(_step = _iterator.n()).done;) {
+        var pastedItem = _step.value;
+        if (pastedItem.type !== TypeEnum.joinData || !pastedItem.table1 || !pastedItem.table2) {
+          continue;
+        }
+        var pastedKey = getJoinKey(pastedItem.table1, pastedItem.table2);
+        if (existingJoinKeys.has(pastedKey)) {
+          var _pastedItem$table, _pastedItem$table2;
+          return {
+            hasConflict: true,
+            conflictingAlias: (_pastedItem$table = pastedItem.table2) === null || _pastedItem$table === void 0 ? void 0 : _pastedItem$table.alias,
+            conflictingId: (_pastedItem$table2 = pastedItem.table2) === null || _pastedItem$table2 === void 0 ? void 0 : _pastedItem$table2.id
+          };
+        }
       }
-      return undefined;
-    };
-    // 检查上邻（index - 1 位置）
-    var prevItem = groupList[index - 1];
-    var prevConflict = checkItem(prevItem);
-    if (prevConflict) {
-      return {
-        hasConflict: true,
-        conflictingAlias: pastedTable1Alias
-      };
-    }
-    // 检查下邻（index 位置，即被插入位置的原元素）
-    var nextItem = groupList[index];
-    var nextConflict = checkItem(nextItem);
-    if (nextConflict) {
-      return {
-        hasConflict: true,
-        conflictingAlias: pastedTable1Alias
-      };
+    } catch (err) {
+      _iterator.e(err);
+    } finally {
+      _iterator.f();
     }
     return {
       hasConflict: false

package/lib/es/utils/transformSql.js

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

package/lib/es/utils.js

@@ -307,7 +307,7 @@ var _changeAlias = function changeAlias(items, val, type) {
   });
 };
 export function isValidSQLAlias(str) {
-  if (!str) return false;
+  if (!str) return true;
   var regex = /^[a-zA-Z][a-zA-Z0-9_]{0,29}$/;
   return regex.test(str);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gingkoo/pandora-metabase",
-  "version": "1.0.108",
+  "version": "1.0.110",
   "description": "",
   "main": "lib/es/index.js",
   "module": "lib/es/index.js",