@gingkoo/pandora-metabase 1.0.130 → 1.0.131

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

@@ -13,7 +13,7 @@ import { FfPlus, FfLine, Repeat, RelatedWork } from '@gingkoo/pandora-icons';
 import Metabase from '../../index';
 import isEqual from 'lodash/isEqual';
 import cloneDeep from 'lodash/cloneDeep';
-import { uuidv4, getAlias, mergeNameAlias } from '../../utils/helper';
+import { uuidv4, getAlias, mergeNameAlias, isSameColumnByIdFirst, isSameTableByIdFirst } from '../../utils/helper';
 import { getTopLayerZIndex } from '../../utils/helper-dom';
 import { getConstantLabel } from '../dialog/formula-list/utils';
 import { __ } from '../../locale';
@@ -67,7 +67,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 = useStore();
@@ -87,13 +87,13 @@ var JoinData = function JoinData(props) {
     setIsDel = _useState2[1];
   var tableIsDel = function () {
     var _ref = _asyncToGenerator(_regeneratorRuntime.mark(function _callee() {
-      var _meta$table, _meta$table2;
-      var tableId, tables, ids;
+      var _meta$table;
+      var tableInfo, tables;
       return _regeneratorRuntime.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;
             }
@@ -101,13 +101,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 isSameTableByIdFirst(tableInfo, v);
+            }))) {
               setIsDel(true);
             } else {
               setIsDel(false);
@@ -143,7 +142,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) {
@@ -188,7 +186,6 @@ var JoinData = function JoinData(props) {
             tableUuid: v.table2.tableUuid || uuidv4('table'),
             datasourceId: v.table2.datasourceId,
             datasourceName: v.table2.datasourceName,
-            datasourceType: v.table2.datasourceType,
             columns: v.columns || []
           };
         }));
@@ -204,8 +201,7 @@ var JoinData = function JoinData(props) {
             tableUuid: v.table.tableUuid || 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 === TypeEnum.joinData) {
           mo.push({
@@ -216,8 +212,7 @@ var JoinData = function JoinData(props) {
             tableUuid: v.table2.tableUuid || uuidv4('table'),
             columns: v.columns,
             datasourceId: v.table2.datasourceId,
-            datasourceName: v.table2.datasourceName,
-            datasourceType: v.table2.datasourceType
+            datasourceName: v.table2.datasourceName
           });
         }
         return mo;
@@ -233,7 +228,6 @@ var JoinData = function JoinData(props) {
       tableUuid: meta.table2.tableUuid || uuidv4('table'),
       datasourceId: meta.table2.datasourceId,
       datasourceName: meta.table2.datasourceName,
-      datasourceType: meta.table2.datasourceType,
       columns: meta.columns
     }]);
     var newMeta = store.metaList[groupIndex].list.slice();
@@ -258,7 +252,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) {
@@ -303,7 +296,6 @@ var JoinData = function JoinData(props) {
             tableUuid: v.table2.tableUuid || uuidv4('table'),
             datasourceId: v.table2.datasourceId,
             datasourceName: v.table2.datasourceName,
-            datasourceType: v.table2.datasourceType,
             columns: v.columns || []
           };
         }));
@@ -319,8 +311,7 @@ var JoinData = function JoinData(props) {
             tableUuid: v.table.tableUuid || 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 === TypeEnum.joinData) {
           mo.push({
@@ -331,8 +322,7 @@ var JoinData = function JoinData(props) {
             tableUuid: v.table2.tableUuid || uuidv4('table'),
             columns: v.columns,
             datasourceId: v.table2.datasourceId,
-            datasourceName: v.table2.datasourceName,
-            datasourceType: v.table2.datasourceType
+            datasourceName: v.table2.datasourceName
           });
         }
         return mo;
@@ -346,7 +336,6 @@ var JoinData = function JoinData(props) {
       tableUuid: meta.table2.tableUuid || uuidv4('table'),
       datasourceId: meta.table2.datasourceId,
       datasourceName: meta.table2.datasourceName,
-      datasourceType: meta.table2.datasourceType,
       columns: meta.columns
     }]);
     return data;
@@ -391,8 +380,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) {}
@@ -412,7 +400,6 @@ var JoinData = function JoinData(props) {
             tableUuid: v.table2.tableUuid || uuidv4('table'),
             datasourceId: v.table2.datasourceId,
             datasourceName: v.table2.datasourceName,
-            datasourceType: v.table2.datasourceType,
             columns: []
           };
         }));
@@ -428,8 +415,7 @@ var JoinData = function JoinData(props) {
             tableUuid: v.table.tableUuid || uuidv4('table'),
             columns: [],
             datasourceId: v.table.datasourceId,
-            datasourceName: v.table.datasourceName,
-            datasourceType: v.table.datasourceType
+            datasourceName: v.table.datasourceName
           });
         } else if (v.type === TypeEnum.joinData) {
           mo.push({
@@ -440,8 +426,7 @@ var JoinData = function JoinData(props) {
             tableUuid: v.table2.tableUuid || uuidv4('table'),
             columns: [],
             datasourceId: v.table2.datasourceId,
-            datasourceName: v.table2.datasourceName,
-            datasourceType: v.table2.datasourceType
+            datasourceName: v.table2.datasourceName
           });
         }
         return mo;
@@ -477,7 +462,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({
@@ -488,25 +472,9 @@ var JoinData = function JoinData(props) {
         tableFlat: store.tableFlat,
         data: store.sourceList,
         value: value,
-        onDatasourceTypeChange: function onDatasourceTypeChange(data) {
-          var newMeta = cloneDeep(store.metaList[groupIndex].list);
-          var joinMeta = newMeta[index];
-          joinMeta.table2 = _objectSpread(_objectSpread(_objectSpread({}, joinMeta.table2), data), {}, {
-            datasourceType: data.datasourceType
-          });
-          joinMeta.columns = joinMeta.columns.map(function (column) {
-            return _objectSpread(_objectSpread({}, column), {}, {
-              datasourceType: data.datasourceType
-            });
-          });
-          store.setMeta(newMeta, groupIndex, {
-            obj: data,
-            type: 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 (!isSameTableByIdFirst(meta.table2, data)) {
             var _store$preProps;
             var newMeta = cloneDeep(store.metaList[groupIndex].list);
             var alias = getAlias(tableName, newMeta, ((_store$preProps = store.preProps) === null || _store$preProps === void 0 ? void 0 : _store$preProps.notExistsColumns) || []);
@@ -518,8 +486,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);
@@ -557,7 +524,6 @@ var JoinData = function JoinData(props) {
         tableUuid: '',
         datasourceName: '',
         datasourceId: '',
-        datasourceType: '',
         type: AtomsTypeEnum.FIELD
       }],
       condition: '',
@@ -574,7 +540,6 @@ var JoinData = function JoinData(props) {
         tableUuid: '',
         datasourceName: '',
         datasourceId: '',
-        datasourceType: '',
         type: AtomsTypeEnum.FIELD
       }],
       type: AtomsTypeEnum.JOIN_DEFAULT
@@ -619,7 +584,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) {
@@ -664,7 +628,6 @@ var JoinData = function JoinData(props) {
               tableUuid: v.table2.tableUuid || uuidv4('table'),
               datasourceId: v.table2.datasourceId,
               datasourceName: v.table2.datasourceName,
-              datasourceType: v.table2.datasourceType,
               columns: v.columns
             };
           }));
@@ -680,8 +643,7 @@ var JoinData = function JoinData(props) {
               tableUuid: v.table.tableUuid || 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 === TypeEnum.joinData) {
             mo.push({
@@ -692,8 +654,7 @@ var JoinData = function JoinData(props) {
               tableUuid: v.table2.tableUuid || uuidv4('table'),
               columns: v.columns,
               datasourceId: v.table2.datasourceId,
-              datasourceName: v.table2.datasourceName,
-              datasourceType: v.table2.datasourceType
+              datasourceName: v.table2.datasourceName
             });
           }
           return mo;
@@ -714,7 +675,6 @@ var JoinData = function JoinData(props) {
         tableUuid: meta.table2.tableUuid || uuidv4('table'),
         datasourceId: meta.table2.datasourceId,
         datasourceName: meta.table2.datasourceName,
-        datasourceType: meta.table2.datasourceType,
         columns: meta.columns
       }];
     }
@@ -743,7 +703,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) {
@@ -788,7 +747,6 @@ var JoinData = function JoinData(props) {
               tableUuid: v.table2.tableUuid || uuidv4('table'),
               datasourceId: v.table2.datasourceId,
               datasourceName: v.table2.datasourceName,
-              datasourceType: v.table2.datasourceType,
               columns: v.columns
             };
           }));
@@ -804,8 +762,7 @@ var JoinData = function JoinData(props) {
               tableUuid: v.table.tableUuid || 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 === TypeEnum.joinData) {
             mo.push({
@@ -816,8 +773,7 @@ var JoinData = function JoinData(props) {
               tableUuid: v.table2.tableUuid || uuidv4('table'),
               columns: v.columns,
               datasourceId: v.table2.datasourceId,
-              datasourceName: v.table2.datasourceName,
-              datasourceType: v.table2.datasourceType
+              datasourceName: v.table2.datasourceName
             });
           }
           return mo;
@@ -838,7 +794,6 @@ var JoinData = function JoinData(props) {
         tableUuid: meta.table2.tableUuid || uuidv4('table'),
         datasourceId: meta.table2.datasourceId,
         datasourceName: meta.table2.datasourceName,
-        datasourceType: meta.table2.datasourceType,
         columns: meta.columns
       }];
     }
@@ -867,7 +822,6 @@ var JoinData = function JoinData(props) {
             tableUuid: '',
             datasourceName: '',
             datasourceId: '',
-            datasourceType: '',
             type: AtomsTypeEnum.FIELD
           }];
           store.setMeta(newMeta, groupIndex, {
@@ -964,7 +918,6 @@ var JoinData = function JoinData(props) {
               tableUuid: '',
               datasourceName: '',
               datasourceId: '',
-              datasourceType: '',
               type: AtomsTypeEnum.FIELD
             }];
           }
@@ -1022,20 +975,23 @@ var JoinData = function JoinData(props) {
               });
               var items = getSubColumns(newList);
               var newColumns = items.flatMap(function (item) {
-                return item.columns;
+                return item.columns.map(function (column) {
+                  return _objectSpread(_objectSpread({}, column), {}, {
+                    tableId: column.tableId || column.id || item.id,
+                    tableUuid: column.tableUuid || item.tableUuid,
+                    datasourceId: column.datasourceId || item.datasourceId || ''
+                  });
+                });
               }).map(function (v) {
                 return _objectSpread(_objectSpread({}, 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 = _objectSpread(_objectSpread({}, newCol), {}, {
-                  select: (_existingCol$select = existingCol === null || existingCol === void 0 ? void 0 : existingCol.select) !== null && _existingCol$select !== void 0 ? _existingCol$select : newCol.select
+                  return isSameColumnByIdFirst(oldCol, newCol);
                 });
+                var _column = existingCol ? existingCol : newCol;
                 _column.select = store.isSelectFields || _column.select;
                 return _column;
               });
@@ -1155,7 +1111,6 @@ var JoinData = function JoinData(props) {
           tableUuid: '',
           datasourceName: '',
           datasourceId: '',
-          datasourceType: '',
           type: AtomsTypeEnum.FIELD
         }],
         condition: '',
@@ -1172,7 +1127,6 @@ var JoinData = function JoinData(props) {
           tableUuid: '',
           datasourceName: '',
           datasourceId: '',
-          datasourceType: '',
           type: AtomsTypeEnum.FIELD
         }],
         type: type
@@ -1296,11 +1250,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;
     }
@@ -1383,15 +1337,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) : '', " ") : __('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) : '', " ") : __('SqlQueryBuilder.setSubQuery')]
             }) : _jsxs("div", {
               className: cx("Sqb-TableName", {
                 notSelected: !table2Selected
@@ -1421,15 +1375,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) : '') : __('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) : '') : __('SqlQueryBuilder.pickTable')]
             }), store.showSubquery && _jsx(Tooltip, {
               title: __('SqlQueryBuilder.switchSubQuery'),
               children: _jsx(Button, {
@@ -1440,7 +1394,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$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 === AtomsTypeEnum.JOIN_DEFAULT) {
                 return _jsxs("div", {
                   className: cx("Sqb-where block"),
@@ -1667,7 +1621,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$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 && _jsx(Tooltip, {
               title: __('SqlQueryBuilder.add'),
               children: _jsx(Dropdown, {
                 trigger: ['click'],

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

@@ -10,7 +10,7 @@ import NextDom from './components/meta-icon';
 import Header from './components/header';
 import ItemWrapper from './components/item-wrapper';
 import { useStore } from '../../hooks/use-provider';
-import { uuidv4 } from '../../utils/helper';
+import { isSameTableByIdFirst, uuidv4 } from '../../utils/helper';
 import ItemName from './components/item-name';
 import { SummarizeAlias } from '../../store/helper';
 var PrevResult = 'Previous results';
@@ -35,8 +35,7 @@ var PermissionTable = function PermissionTable(props) {
         tableUuid: uuidv4('table'),
         alias: prevGroupBy.alias,
         datasourceId: '',
-        datasourceName: '',
-        datasourceType: ''
+        datasourceName: ''
       };
       data = [_data];
       var joinData = prevList.filter(function (v) {
@@ -53,8 +52,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
           };
         }));
       }
@@ -68,8 +66,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 === TypeEnum.joinData) {
           mo.push({
@@ -79,8 +76,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;
@@ -94,7 +90,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 (!isSameTableByIdFirst(meta.table, data)) {
             meta.table = data;
           }
           store.setPopup({

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

@@ -83,8 +83,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/es/components/modules/summarize/group-by.js

@@ -102,7 +102,6 @@ var GroupByEditor = function GroupByEditor(_ref) {
           tableUuid: value.tableUuid || '',
           datasourceName: value.datasourceName || '',
           datasourceId: value.datasourceId || '',
-          datasourceType: value.datasourceType || '',
           type: AtomsTypeEnum.FIELD
         };
         return [fieldAtom];
@@ -222,7 +221,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
           };
         }));
@@ -238,7 +236,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 === TypeEnum.joinData) {
@@ -250,7 +247,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 {
@@ -309,7 +305,6 @@ var GroupBy = function GroupBy(props) {
       quotes: '',
       datasourceId: '',
       datasourceName: '',
-      datasourceType: '',
       atoms: [],
       summarizeType: MetaSummarize_Enum.BY
     };
@@ -396,8 +391,7 @@ var GroupBy = function GroupBy(props) {
         tableUuid: v.tableUuid,
         alias: v.alias,
         datasourceName: '',
-        datasourceId: '',
-        datasourceType: ''
+        datasourceId: ''
       });
     });
   };
@@ -416,7 +410,6 @@ var GroupBy = function GroupBy(props) {
       tableUuid: v.tableUuid,
       datasourceName: '',
       datasourceId: '',
-      datasourceType: '',
       type: AtomsTypeEnum.FIELD
     });
   };

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

@@ -198,7 +198,6 @@ var SelectIndex = function SelectIndex(props) {
       quotes: '',
       datasourceId: '',
       datasourceName: '',
-      datasourceType: '',
       summarizeType: MetaSummarize_Enum.GROUP
     };
     store.setPopup2({
@@ -302,8 +301,7 @@ var SelectIndex = function SelectIndex(props) {
         tableUuid: v.tableUuid,
         alias: v.alias,
         datasourceName: '',
-        datasourceId: '',
-        datasourceType: ''
+        datasourceId: ''
       });
     });
   };
@@ -322,7 +320,6 @@ var SelectIndex = function SelectIndex(props) {
       tableUuid: v.tableUuid,
       datasourceName: '',
       datasourceId: '',
-      datasourceType: '',
       type: AtomsTypeEnum.FIELD
     });
   };