@gingkoo/pandora-metabase 1.0.130 → 1.0.132

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

@@ -72,7 +72,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$table4, _meta$table5, _meta$table7, _meta$table8, _meta$table9, _meta$table0, _meta$expressions, _meta$table1, _meta$table10, _meta$expressions2, _store$showMainColumn, _store$showMainColumn2;
   var meta = props.meta,
     groupIndex = props.groupIndex;
   var store = (0, _useProvider.useStore)();
@@ -92,13 +92,13 @@ var JoinData = function JoinData(props) {
     setIsDel = _useState2[1];
   var tableIsDel = function () {
     var _ref = (0, _asyncToGenerator2["default"])(_regenerator["default"].mark(function _callee() {
-      var _meta$table, _meta$table2;
-      var tableId, tables, ids;
+      var _meta$table;
+      var tableInfo, tables;
       return _regenerator["default"].wrap(function (_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            tableId = (_meta$table = meta.table2) === null || _meta$table === void 0 ? void 0 : _meta$table.id;
-            if ((_meta$table2 = meta.table2) !== null && _meta$table2 !== void 0 && _meta$table2.datasourceId) {
+            tableInfo = meta.table2;
+            if ((_meta$table = meta.table2) !== null && _meta$table !== void 0 && _meta$table.datasourceId) {
               _context.next = 1;
               break;
             }
@@ -106,13 +106,12 @@ var JoinData = function JoinData(props) {
             return _context.abrupt("return");
           case 1:
             _context.next = 2;
-            return store === null || store === void 0 ? void 0 : store.fetchDataset(meta.table2.datasourceId, meta.table2.datasourceType);
+            return store === null || store === void 0 ? void 0 : store.fetchDataset(meta.table2.datasourceId);
           case 2:
             tables = _context.sent;
-            ids = (tables === null || tables === void 0 ? void 0 : tables.map(function (v) {
-              return v.id;
-            })) || [];
-            if (!ids.includes(tableId)) {
+            if (!(tables !== null && tables !== void 0 && tables.some(function (v) {
+              return (0, _helper.isSameTableByIdFirst)(tableInfo, v);
+            }))) {
               setIsDel(true);
             } else {
               setIsDel(false);
@@ -148,7 +147,6 @@ var JoinData = function JoinData(props) {
         name_zh: prevGroupBy.alias,
         datasourceId: '',
         datasourceName: '',
-        datasourceType: '',
         columns: []
       };
       if (prevGroupBy !== null && prevGroupBy !== void 0 && (_prevGroupBy$group = prevGroupBy.group) !== null && _prevGroupBy$group !== void 0 && _prevGroupBy$group.length) {
@@ -193,7 +191,6 @@ var JoinData = function JoinData(props) {
             tableUuid: v.table2.tableUuid || (0, _helper.uuidv4)('table'),
             datasourceId: v.table2.datasourceId,
             datasourceName: v.table2.datasourceName,
-            datasourceType: v.table2.datasourceType,
             columns: v.columns || []
           };
         }));
@@ -209,8 +206,7 @@ var JoinData = function JoinData(props) {
             tableUuid: v.table.tableUuid || (0, _helper.uuidv4)('table'),
             columns: v.columns,
             datasourceId: v.table.datasourceId,
-            datasourceName: v.table.datasourceName,
-            datasourceType: v.table.datasourceType
+            datasourceName: v.table.datasourceName
           }));
         } else if (v.type === _enum.TypeEnum.joinData) {
           mo.push({
@@ -221,8 +217,7 @@ var JoinData = function JoinData(props) {
             tableUuid: v.table2.tableUuid || (0, _helper.uuidv4)('table'),
             columns: v.columns,
             datasourceId: v.table2.datasourceId,
-            datasourceName: v.table2.datasourceName,
-            datasourceType: v.table2.datasourceType
+            datasourceName: v.table2.datasourceName
           });
         }
         return mo;
@@ -238,7 +233,6 @@ var JoinData = function JoinData(props) {
       tableUuid: meta.table2.tableUuid || (0, _helper.uuidv4)('table'),
       datasourceId: meta.table2.datasourceId,
       datasourceName: meta.table2.datasourceName,
-      datasourceType: meta.table2.datasourceType,
       columns: meta.columns
     }]);
     var newMeta = store.metaList[groupIndex].list.slice();
@@ -263,7 +257,6 @@ var JoinData = function JoinData(props) {
         name_zh: prevGroupBy.alias,
         datasourceId: '',
         datasourceName: '',
-        datasourceType: '',
         columns: []
       };
       if (prevGroupBy !== null && prevGroupBy !== void 0 && (_prevGroupBy$group2 = prevGroupBy.group) !== null && _prevGroupBy$group2 !== void 0 && _prevGroupBy$group2.length) {
@@ -308,7 +301,6 @@ var JoinData = function JoinData(props) {
             tableUuid: v.table2.tableUuid || (0, _helper.uuidv4)('table'),
             datasourceId: v.table2.datasourceId,
             datasourceName: v.table2.datasourceName,
-            datasourceType: v.table2.datasourceType,
             columns: v.columns || []
           };
         }));
@@ -324,8 +316,7 @@ var JoinData = function JoinData(props) {
             tableUuid: v.table.tableUuid || (0, _helper.uuidv4)('table'),
             columns: v.columns,
             datasourceId: v.table.datasourceId,
-            datasourceName: v.table.datasourceName,
-            datasourceType: v.table.datasourceType
+            datasourceName: v.table.datasourceName
           }));
         } else if (v.type === _enum.TypeEnum.joinData) {
           mo.push({
@@ -336,8 +327,7 @@ var JoinData = function JoinData(props) {
             tableUuid: v.table2.tableUuid || (0, _helper.uuidv4)('table'),
             columns: v.columns,
             datasourceId: v.table2.datasourceId,
-            datasourceName: v.table2.datasourceName,
-            datasourceType: v.table2.datasourceType
+            datasourceName: v.table2.datasourceName
           });
         }
         return mo;
@@ -351,7 +341,6 @@ var JoinData = function JoinData(props) {
       tableUuid: meta.table2.tableUuid || (0, _helper.uuidv4)('table'),
       datasourceId: meta.table2.datasourceId,
       datasourceName: meta.table2.datasourceName,
-      datasourceType: meta.table2.datasourceType,
       columns: meta.columns
     }]);
     return data;
@@ -396,8 +385,7 @@ var JoinData = function JoinData(props) {
         name: prevGroupBy.alias,
         name_zh: prevGroupBy.alias,
         datasourceId: '',
-        datasourceName: '',
-        datasourceType: ''
+        datasourceName: ''
       };
       if (prevGroupBy !== null && prevGroupBy !== void 0 && (_prevGroupBy$group3 = prevGroupBy.group) !== null && _prevGroupBy$group3 !== void 0 && _prevGroupBy$group3.length) {}
       if (prevGroupBy !== null && prevGroupBy !== void 0 && (_prevGroupBy$by3 = prevGroupBy.by) !== null && _prevGroupBy$by3 !== void 0 && _prevGroupBy$by3.length) {}
@@ -417,7 +405,6 @@ var JoinData = function JoinData(props) {
             tableUuid: v.table2.tableUuid || (0, _helper.uuidv4)('table'),
             datasourceId: v.table2.datasourceId,
             datasourceName: v.table2.datasourceName,
-            datasourceType: v.table2.datasourceType,
             columns: []
           };
         }));
@@ -433,8 +420,7 @@ var JoinData = function JoinData(props) {
             tableUuid: v.table.tableUuid || (0, _helper.uuidv4)('table'),
             columns: [],
             datasourceId: v.table.datasourceId,
-            datasourceName: v.table.datasourceName,
-            datasourceType: v.table.datasourceType
+            datasourceName: v.table.datasourceName
           });
         } else if (v.type === _enum.TypeEnum.joinData) {
           mo.push({
@@ -445,8 +431,7 @@ var JoinData = function JoinData(props) {
             tableUuid: v.table2.tableUuid || (0, _helper.uuidv4)('table'),
             columns: [],
             datasourceId: v.table2.datasourceId,
-            datasourceName: v.table2.datasourceName,
-            datasourceType: v.table2.datasourceType
+            datasourceName: v.table2.datasourceName
           });
         }
         return mo;
@@ -482,7 +467,6 @@ var JoinData = function JoinData(props) {
       alias: meta.table2.alias,
       datasourceId: meta.table2.datasourceId,
       datasourceName: meta.table2.datasourceName,
-      datasourceType: meta.table2.datasourceType,
       tableUuid: meta.table2.tableUuid || ''
     };
     !meta.readonly && store.setPopup({
@@ -493,28 +477,15 @@ var JoinData = function JoinData(props) {
         tableFlat: store.tableFlat,
         data: store.sourceList,
         value: value,
-        onDatasourceTypeChange: function onDatasourceTypeChange(data) {
-          var newMeta = (0, _cloneDeep["default"])(store.metaList[groupIndex].list);
-          var joinMeta = newMeta[index];
-          joinMeta.table2 = (0, _objectSpread2["default"])((0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, joinMeta.table2), data), {}, {
-            datasourceType: data.datasourceType
-          });
-          joinMeta.columns = joinMeta.columns.map(function (column) {
-            return (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, column), {}, {
-              datasourceType: data.datasourceType
-            });
-          });
-          store.setMeta(newMeta, groupIndex, {
-            obj: data,
-            type: _types.ChangeType.table2
-          });
-        },
         onChange: function onChange(data) {
           var tableName = data.name;
-          if (meta.table2.name !== tableName || meta.table2.datasourceId !== data.datasourceId || meta.table2.datasourceType !== data.datasourceType) {
+          if (!(0, _helper.isSameTableByIdFirst)(meta.table2, data)) {
             var _store$preProps;
             var newMeta = (0, _cloneDeep["default"])(store.metaList[groupIndex].list);
-            var alias = (0, _helper.getAlias)(tableName, newMeta, ((_store$preProps = store.preProps) === null || _store$preProps === void 0 ? void 0 : _store$preProps.notExistsColumns) || []);
+            var aliasMetaList = newMeta.filter(function (_, i) {
+              return i !== index;
+            });
+            var alias = (0, _helper.getAlias)(tableName, aliasMetaList, ((_store$preProps = store.preProps) === null || _store$preProps === void 0 ? void 0 : _store$preProps.notExistsColumns) || []);
             var _table2 = (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, data), {}, {
               name: tableName,
               tableUuid: data.tableUuid || (0, _helper.uuidv4)('table'),
@@ -523,8 +494,7 @@ var JoinData = function JoinData(props) {
               fieldUuid: '',
               quotes: '',
               datasourceId: data.datasourceId,
-              datasourceName: data.datasourceName,
-              datasourceType: data.datasourceType
+              datasourceName: data.datasourceName
             });
             newMeta[index].table2 = _table2;
             initExpressions(newMeta);
@@ -562,7 +532,6 @@ var JoinData = function JoinData(props) {
         tableUuid: '',
         datasourceName: '',
         datasourceId: '',
-        datasourceType: '',
         type: _types.AtomsTypeEnum.FIELD
       }],
       condition: '',
@@ -579,7 +548,6 @@ var JoinData = function JoinData(props) {
         tableUuid: '',
         datasourceName: '',
         datasourceId: '',
-        datasourceType: '',
         type: _types.AtomsTypeEnum.FIELD
       }],
       type: _types.AtomsTypeEnum.JOIN_DEFAULT
@@ -624,7 +592,6 @@ var JoinData = function JoinData(props) {
           alias: prevGroupBy.alias,
           datasourceId: '',
           datasourceName: '',
-          datasourceType: '',
           columns: []
         };
         if (prevGroupBy !== null && prevGroupBy !== void 0 && (_prevGroupBy$group4 = prevGroupBy.group) !== null && _prevGroupBy$group4 !== void 0 && _prevGroupBy$group4.length) {
@@ -669,7 +636,6 @@ var JoinData = function JoinData(props) {
               tableUuid: v.table2.tableUuid || (0, _helper.uuidv4)('table'),
               datasourceId: v.table2.datasourceId,
               datasourceName: v.table2.datasourceName,
-              datasourceType: v.table2.datasourceType,
               columns: v.columns
             };
           }));
@@ -685,8 +651,7 @@ var JoinData = function JoinData(props) {
               tableUuid: v.table.tableUuid || (0, _helper.uuidv4)('table'),
               columns: v.columns,
               datasourceId: v.table.datasourceId,
-              datasourceName: v.table.datasourceName,
-              datasourceType: v.table.datasourceType
+              datasourceName: v.table.datasourceName
             });
           } else if (v.type === _enum.TypeEnum.joinData) {
             mo.push({
@@ -697,8 +662,7 @@ var JoinData = function JoinData(props) {
               tableUuid: v.table2.tableUuid || (0, _helper.uuidv4)('table'),
               columns: v.columns,
               datasourceId: v.table2.datasourceId,
-              datasourceName: v.table2.datasourceName,
-              datasourceType: v.table2.datasourceType
+              datasourceName: v.table2.datasourceName
             });
           }
           return mo;
@@ -719,7 +683,6 @@ var JoinData = function JoinData(props) {
         tableUuid: meta.table2.tableUuid || (0, _helper.uuidv4)('table'),
         datasourceId: meta.table2.datasourceId,
         datasourceName: meta.table2.datasourceName,
-        datasourceType: meta.table2.datasourceType,
         columns: meta.columns
       }];
     }
@@ -748,7 +711,6 @@ var JoinData = function JoinData(props) {
           alias: prevGroupBy.alias,
           datasourceId: '',
           datasourceName: '',
-          datasourceType: '',
           columns: []
         };
         if (prevGroupBy !== null && prevGroupBy !== void 0 && (_prevGroupBy$group5 = prevGroupBy.group) !== null && _prevGroupBy$group5 !== void 0 && _prevGroupBy$group5.length) {
@@ -793,7 +755,6 @@ var JoinData = function JoinData(props) {
               tableUuid: v.table2.tableUuid || (0, _helper.uuidv4)('table'),
               datasourceId: v.table2.datasourceId,
               datasourceName: v.table2.datasourceName,
-              datasourceType: v.table2.datasourceType,
               columns: v.columns
             };
           }));
@@ -809,8 +770,7 @@ var JoinData = function JoinData(props) {
               tableUuid: v.table.tableUuid || (0, _helper.uuidv4)('table'),
               columns: v.columns,
               datasourceId: v.table.datasourceId,
-              datasourceName: v.table.datasourceName,
-              datasourceType: v.table.datasourceType
+              datasourceName: v.table.datasourceName
             });
           } else if (v.type === _enum.TypeEnum.joinData) {
             mo.push({
@@ -821,8 +781,7 @@ var JoinData = function JoinData(props) {
               tableUuid: v.table2.tableUuid || (0, _helper.uuidv4)('table'),
               columns: v.columns,
               datasourceId: v.table2.datasourceId,
-              datasourceName: v.table2.datasourceName,
-              datasourceType: v.table2.datasourceType
+              datasourceName: v.table2.datasourceName
             });
           }
           return mo;
@@ -843,7 +802,6 @@ var JoinData = function JoinData(props) {
         tableUuid: meta.table2.tableUuid || (0, _helper.uuidv4)('table'),
         datasourceId: meta.table2.datasourceId,
         datasourceName: meta.table2.datasourceName,
-        datasourceType: meta.table2.datasourceType,
         columns: meta.columns
       }];
     }
@@ -872,7 +830,6 @@ var JoinData = function JoinData(props) {
             tableUuid: '',
             datasourceName: '',
             datasourceId: '',
-            datasourceType: '',
             type: _types.AtomsTypeEnum.FIELD
           }];
           store.setMeta(newMeta, groupIndex, {
@@ -969,7 +926,6 @@ var JoinData = function JoinData(props) {
               tableUuid: '',
               datasourceName: '',
               datasourceId: '',
-              datasourceType: '',
               type: _types.AtomsTypeEnum.FIELD
             }];
           }
@@ -1027,20 +983,23 @@ var JoinData = function JoinData(props) {
               });
               var items = (0, _utils2.getSubColumns)(newList);
               var newColumns = items.flatMap(function (item) {
-                return item.columns;
+                return item.columns.map(function (column) {
+                  return (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, column), {}, {
+                    tableId: column.tableId || column.id || item.id,
+                    tableUuid: column.tableUuid || item.tableUuid,
+                    datasourceId: column.datasourceId || item.datasourceId || ''
+                  });
+                });
               }).map(function (v) {
                 return (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, v), {}, {
                   select: false
                 });
               });
               newMeta[index].columns = newColumns.map(function (newCol) {
-                var _existingCol$select;
                 var existingCol = newMeta[index].columns.find(function (oldCol) {
-                  return newCol.fieldUuid && oldCol.fieldUuid === newCol.fieldUuid || newCol.fieldAlias && oldCol.fieldAlias === newCol.fieldAlias || oldCol.name === newCol.name;
-                });
-                var _column = (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, newCol), {}, {
-                  select: (_existingCol$select = existingCol === null || existingCol === void 0 ? void 0 : existingCol.select) !== null && _existingCol$select !== void 0 ? _existingCol$select : newCol.select
+                  return (0, _helper.isSameColumnByIdFirst)(oldCol, newCol);
                 });
+                var _column = existingCol ? existingCol : newCol;
                 _column.select = store.isSelectFields || _column.select;
                 return _column;
               });
@@ -1160,7 +1119,6 @@ var JoinData = function JoinData(props) {
           tableUuid: '',
           datasourceName: '',
           datasourceId: '',
-          datasourceType: '',
           type: _types.AtomsTypeEnum.FIELD
         }],
         condition: '',
@@ -1177,7 +1135,6 @@ var JoinData = function JoinData(props) {
           tableUuid: '',
           datasourceName: '',
           datasourceId: '',
-          datasourceType: '',
           type: _types.AtomsTypeEnum.FIELD
         }],
         type: type
@@ -1301,11 +1258,11 @@ var JoinData = function JoinData(props) {
     }
   };
   var tableIsError = function tableIsError() {
-    var _store$preProps4, _meta$table3;
+    var _store$preProps4, _meta$table2;
     var aliass = ((_store$preProps4 = store.preProps) === null || _store$preProps4 === void 0 || (_store$preProps4 = _store$preProps4.notExistsColumns) === null || _store$preProps4 === void 0 ? void 0 : _store$preProps4.map(function (v) {
       return v.alias;
     })) || [];
-    var tableAlias = (_meta$table3 = meta.table2) === null || _meta$table3 === void 0 ? void 0 : _meta$table3.alias;
+    var tableAlias = (_meta$table2 = meta.table2) === null || _meta$table2 === void 0 ? void 0 : _meta$table2.alias;
     if (tableAlias && aliass.includes(tableAlias) || isDel) {
       return true;
     }
@@ -1388,15 +1345,15 @@ var JoinData = function JoinData(props) {
                       size: 'small',
                       onClick: function onClick(e) {
                         if (store.tableEnableAlias) {
-                          var _meta$table4;
+                          var _meta$table3;
                           e.stopPropagation();
-                          onChangeTableAlias(((_meta$table4 = meta.table2) === null || _meta$table4 === void 0 ? void 0 : _meta$table4.alias) || '');
+                          onChangeTableAlias(((_meta$table3 = meta.table2) === null || _meta$table3 === void 0 ? void 0 : _meta$table3.alias) || '');
                         }
                       }
                     })
                   }) : null;
                 }()
-              }), subQuerySelected ? "".concat(((_meta$subquery2 = meta.subquery) === null || _meta$subquery2 === void 0 ? void 0 : _meta$subquery2[0]).table.datasourceName, ".").concat(((_meta$subquery3 = meta.subquery) === null || _meta$subquery3 === void 0 ? void 0 : _meta$subquery3[0]).table.name, " ").concat((_meta$table5 = meta.table2) !== null && _meta$table5 !== void 0 && _meta$table5.alias && store.tableEnableAlias ? "as ".concat((_meta$table6 = meta.table2) === null || _meta$table6 === void 0 ? void 0 : _meta$table6.alias) : '', " ") : (0, _locale.__)('SqlQueryBuilder.setSubQuery')]
+              }), subQuerySelected ? "".concat(((_meta$subquery2 = meta.subquery) === null || _meta$subquery2 === void 0 ? void 0 : _meta$subquery2[0]).table.datasourceName, ".").concat(((_meta$subquery3 = meta.subquery) === null || _meta$subquery3 === void 0 ? void 0 : _meta$subquery3[0]).table.name, " ").concat((_meta$table4 = meta.table2) !== null && _meta$table4 !== void 0 && _meta$table4.alias && store.tableEnableAlias ? "as ".concat((_meta$table5 = meta.table2) === null || _meta$table5 === void 0 ? void 0 : _meta$table5.alias) : '', " ") : (0, _locale.__)('SqlQueryBuilder.setSubQuery')]
             }) : (0, _jsxRuntime.jsxs)("div", {
               className: (0, _classnames["default"])("Sqb-TableName", {
                 notSelected: !table2Selected
@@ -1426,15 +1383,15 @@ var JoinData = function JoinData(props) {
                       size: 'small',
                       onClick: function onClick(e) {
                         if (store.tableEnableAlias) {
-                          var _meta$table7;
+                          var _meta$table6;
                           e.stopPropagation();
-                          onChangeTableAlias(((_meta$table7 = meta.table2) === null || _meta$table7 === void 0 ? void 0 : _meta$table7.alias) || '');
+                          onChangeTableAlias(((_meta$table6 = meta.table2) === null || _meta$table6 === void 0 ? void 0 : _meta$table6.alias) || '');
                         }
                       }
                     })
                   }) : null;
                 }()
-              }), table2Selected ? "".concat(meta.table2.datasourceName, ".").concat(meta.table2.name, " ").concat((_meta$table8 = meta.table2) !== null && _meta$table8 !== void 0 && _meta$table8.alias && store.tableEnableAlias ? "as ".concat((_meta$table9 = meta.table2) === null || _meta$table9 === void 0 ? void 0 : _meta$table9.alias) : '') : (0, _locale.__)('SqlQueryBuilder.pickTable')]
+              }), table2Selected ? "".concat(meta.table2.datasourceName, ".").concat(meta.table2.name, " ").concat((_meta$table7 = meta.table2) !== null && _meta$table7 !== void 0 && _meta$table7.alias && store.tableEnableAlias ? "as ".concat((_meta$table8 = meta.table2) === null || _meta$table8 === void 0 ? void 0 : _meta$table8.alias) : '') : (0, _locale.__)('SqlQueryBuilder.pickTable')]
             }), store.showSubquery && (0, _jsxRuntime.jsx)(_pandora.Tooltip, {
               title: (0, _locale.__)('SqlQueryBuilder.switchSubQuery'),
               children: (0, _jsxRuntime.jsx)(_pandora.Button, {
@@ -1445,7 +1402,7 @@ var JoinData = function JoinData(props) {
                 icon: (0, _jsxRuntime.jsx)(_pandoraIcons.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$table9 = meta.table2) === null || _meta$table9 === void 0 ? void 0 : _meta$table9.name) && ((_meta$table0 = meta.table1) === null || _meta$table0 === void 0 ? void 0 : _meta$table0.name) && ((_meta$expressions = meta.expressions) === null || _meta$expressions === void 0 ? void 0 : _meta$expressions.map(function (v, i) {
               if (v.type === _types.AtomsTypeEnum.JOIN_DEFAULT) {
                 return (0, _jsxRuntime.jsxs)("div", {
                   className: (0, _classnames["default"])("Sqb-where block"),
@@ -1672,7 +1629,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 && (0, _jsxRuntime.jsx)(_pandora.Tooltip, {
+            })), ((_meta$table1 = meta.table2) === null || _meta$table1 === void 0 ? void 0 : _meta$table1.name) && ((_meta$table10 = meta.table1) === null || _meta$table10 === void 0 ? void 0 : _meta$table10.name) && (((_meta$expressions2 = meta.expressions) === null || _meta$expressions2 === void 0 ? void 0 : _meta$expressions2.length) || 0) < 1 && (0, _jsxRuntime.jsx)(_pandora.Tooltip, {
               title: (0, _locale.__)('SqlQueryBuilder.add'),
               children: (0, _jsxRuntime.jsx)(_pandora.Dropdown, {
                 trigger: ['click'],

package/lib/cjs/components/modules/permission-table.js

@@ -41,8 +41,7 @@ var PermissionTable = function PermissionTable(props) {
         tableUuid: (0, _helper.uuidv4)('table'),
         alias: prevGroupBy.alias,
         datasourceId: '',
-        datasourceName: '',
-        datasourceType: ''
+        datasourceName: ''
       };
       data = [_data];
       var joinData = prevList.filter(function (v) {
@@ -59,8 +58,7 @@ var PermissionTable = function PermissionTable(props) {
             tableUuid: v.table2.tableUuid,
             id: v.table2.id,
             datasourceId: v.table2.datasourceId,
-            datasourceName: v.table2.datasourceName,
-            datasourceType: v.table2.datasourceType
+            datasourceName: v.table2.datasourceName
           };
         }));
       }
@@ -74,8 +72,7 @@ var PermissionTable = function PermissionTable(props) {
             id: v.table.id,
             tableUuid: v.table.tableUuid,
             datasourceId: v.table.datasourceId,
-            datasourceName: v.table.datasourceName,
-            datasourceType: v.table.datasourceType
+            datasourceName: v.table.datasourceName
           });
         } else if (v.type === _enum.TypeEnum.joinData) {
           mo.push({
@@ -85,8 +82,7 @@ var PermissionTable = function PermissionTable(props) {
             id: v.table2.id,
             tableUuid: v.table2.tableUuid,
             datasourceId: v.table2.datasourceId,
-            datasourceName: v.table2.datasourceName,
-            datasourceType: v.table2.datasourceType
+            datasourceName: v.table2.datasourceName
           });
         }
         return mo;
@@ -100,7 +96,7 @@ var PermissionTable = function PermissionTable(props) {
         data: data,
         value: meta.table,
         onChange: function onChange(data) {
-          if (meta.table.datasourceId !== data.datasourceId || meta.table.name !== data.name) {
+          if (!(0, _helper.isSameTableByIdFirst)(meta.table, data)) {
             meta.table = data;
           }
           store.setPopup({

package/lib/cjs/components/modules/sort.js

@@ -90,8 +90,7 @@ var Sort = function Sort(props) {
             id: v.table2.id,
             columns: v.columns,
             datasourceId: v.table2.datasourceId,
-            datasourceName: v.table2.datasourceName,
-            datasourceType: v.table2.datasourceType
+            datasourceName: v.table2.datasourceName
           };
         } else {
           return {

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

@@ -108,7 +108,6 @@ var GroupByEditor = function GroupByEditor(_ref) {
           tableUuid: value.tableUuid || '',
           datasourceName: value.datasourceName || '',
           datasourceId: value.datasourceId || '',
-          datasourceType: value.datasourceType || '',
           type: _types.AtomsTypeEnum.FIELD
         };
         return [fieldAtom];
@@ -228,7 +227,6 @@ var GroupBy = function GroupBy(props) {
             tableUuid: v.table2.tableUuid,
             datasourceId: v.table2.datasourceId,
             datasourceName: v.table2.datasourceName,
-            datasourceType: v.table2.datasourceType,
             columns: v.columns
           };
         }));
@@ -244,7 +242,6 @@ var GroupBy = function GroupBy(props) {
             tableUuid: v.table.tableUuid,
             datasourceId: v.table.datasourceId,
             datasourceName: v.table.datasourceName,
-            datasourceType: v.table.datasourceType,
             columns: v.columns
           };
         } else if (v.type === _enum.TypeEnum.joinData) {
@@ -256,7 +253,6 @@ var GroupBy = function GroupBy(props) {
             tableUuid: v.table2.tableUuid,
             datasourceId: v.table2.datasourceId,
             datasourceName: v.table2.datasourceName,
-            datasourceType: v.table2.datasourceType,
             columns: v.columns
           };
         } else {
@@ -315,7 +311,6 @@ var GroupBy = function GroupBy(props) {
       quotes: '',
       datasourceId: '',
       datasourceName: '',
-      datasourceType: '',
       atoms: [],
       summarizeType: _types.MetaSummarize_Enum.BY
     };
@@ -402,8 +397,7 @@ var GroupBy = function GroupBy(props) {
         tableUuid: v.tableUuid,
         alias: v.alias,
         datasourceName: '',
-        datasourceId: '',
-        datasourceType: ''
+        datasourceId: ''
       });
     });
   };
@@ -422,7 +416,6 @@ var GroupBy = function GroupBy(props) {
       tableUuid: v.tableUuid,
       datasourceName: '',
       datasourceId: '',
-      datasourceType: '',
       type: _types.AtomsTypeEnum.FIELD
     });
   };

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

@@ -204,7 +204,6 @@ var SelectIndex = function SelectIndex(props) {
       quotes: '',
       datasourceId: '',
       datasourceName: '',
-      datasourceType: '',
       summarizeType: _types.MetaSummarize_Enum.GROUP
     };
     store.setPopup2({
@@ -308,8 +307,7 @@ var SelectIndex = function SelectIndex(props) {
         tableUuid: v.tableUuid,
         alias: v.alias,
         datasourceName: '',
-        datasourceId: '',
-        datasourceType: ''
+        datasourceId: ''
       });
     });
   };
@@ -328,7 +326,6 @@ var SelectIndex = function SelectIndex(props) {
       tableUuid: v.tableUuid,
       datasourceName: '',
       datasourceId: '',
-      datasourceType: '',
       type: _types.AtomsTypeEnum.FIELD
     });
   };