@gingkoo/pandora-metabase 1.0.130 → 1.0.131

package/lib/cjs/utils/helper.js

@@ -4,9 +4,110 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.uuidv4 = exports.throttle = exports.sleep = exports.replaceTpl = exports.mobx2Object = exports.mergeNameAlias = exports.getUrlParams = exports.getScreenInfo = exports.getAlias = exports.fullScreen = exports.flatArray = exports.exitFullscreen = exports.debounce = void 0;
+exports.uuidv4 = exports.throttle = exports.sleep = exports.replaceTpl = exports.mobx2Object = exports.mergeNameAlias = exports.isSameTableByIdFirst = exports.isSameColumnByIdFirst = exports.getUrlParams = exports.getTableIdFirstKey = exports.getScreenInfo = exports.getColumnIdFirstKey = exports.getAlias = exports.fullScreen = exports.flatArray = exports.exitFullscreen = exports.debounce = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/toConsumableArray"));
 var _enum = require("../store/enum");
+var normalizeId = function normalizeId(val) {
+  if (val === undefined || val === null) return '';
+  return "".concat(val);
+};
+var hasBoth = function hasBoth(left, right) {
+  return Boolean(left && right);
+};
+var getTableIdFirstKey = exports.getTableIdFirstKey = function getTableIdFirstKey() {
+  var table = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  var datasourceId = normalizeId(table.datasourceId);
+  var tableId = normalizeId(table.id || table.tableId);
+  if (tableId) return "".concat(datasourceId, "|id:").concat(tableId);
+  var tableUuid = normalizeId(table.tableUuid);
+  if (tableUuid) return "".concat(datasourceId, "|uuid:").concat(tableUuid);
+  var tableName = normalizeId(table.name || table.tableName);
+  var tableAlias = normalizeId(table.alias || table.tableAlias);
+  return tableName ? "".concat(datasourceId, "|name:").concat(tableName, "|alias:").concat(tableAlias) : datasourceId;
+};
+var isSameTableByIdFirst = exports.isSameTableByIdFirst = function isSameTableByIdFirst() {
+  var left = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  var right = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var leftDatasourceId = normalizeId(left.datasourceId);
+  var rightDatasourceId = normalizeId(right.datasourceId);
+  if (hasBoth(leftDatasourceId, rightDatasourceId) && leftDatasourceId !== rightDatasourceId) {
+    return false;
+  }
+  var leftTableId = normalizeId(left.id || left.tableId);
+  var rightTableId = normalizeId(right.id || right.tableId);
+  if (hasBoth(leftTableId, rightTableId)) {
+    return leftTableId === rightTableId;
+  }
+  var leftTableName = normalizeId(left.name || left.tableName);
+  var rightTableName = normalizeId(right.name || right.tableName);
+  if (hasBoth(leftTableName, rightTableName)) {
+    if (leftTableName !== rightTableName) {
+      return false;
+    }
+    var leftTableAlias = normalizeId(left.alias || left.tableAlias);
+    var rightTableAlias = normalizeId(right.alias || right.tableAlias);
+    if (hasBoth(leftTableAlias, rightTableAlias)) {
+      return leftTableAlias === rightTableAlias;
+    }
+    return true;
+  }
+  var leftTableUuid = normalizeId(left.tableUuid);
+  var rightTableUuid = normalizeId(right.tableUuid);
+  if (hasBoth(leftTableUuid, rightTableUuid)) {
+    return leftTableUuid === rightTableUuid;
+  }
+  return false;
+};
+var getColumnIdFirstKey = exports.getColumnIdFirstKey = function getColumnIdFirstKey() {
+  var column = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  var tableKey = getTableIdFirstKey(column);
+  var fieldId = normalizeId(column.fieldId || column.id);
+  if (fieldId) return "".concat(tableKey, "|fieldId:").concat(fieldId);
+  var fieldUuid = normalizeId(column.fieldUuid);
+  if (fieldUuid) return "".concat(tableKey, "|fieldUuid:").concat(fieldUuid);
+  var fieldName = normalizeId(column.fieldName || column.name);
+  var fieldAlias = normalizeId(column.fieldAlias);
+  return fieldName ? "".concat(tableKey, "|fieldName:").concat(fieldName, "|alias:").concat(fieldAlias) : tableKey;
+};
+var isSameColumnByIdFirst = exports.isSameColumnByIdFirst = function isSameColumnByIdFirst() {
+  var left = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  var right = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var leftDatasourceId = normalizeId(left.datasourceId);
+  var rightDatasourceId = normalizeId(right.datasourceId);
+  if (hasBoth(leftDatasourceId, rightDatasourceId) && leftDatasourceId !== rightDatasourceId) {
+    return false;
+  }
+  var leftTableId = normalizeId(left.tableId);
+  var rightTableId = normalizeId(right.tableId);
+  if (hasBoth(leftTableId, rightTableId) && leftTableId !== rightTableId) {
+    return false;
+  }
+  var leftTableUuid = normalizeId(left.tableUuid);
+  var rightTableUuid = normalizeId(right.tableUuid);
+  if (hasBoth(leftTableUuid, rightTableUuid) && leftTableUuid !== rightTableUuid) {
+    var leftTableName = normalizeId(left.tableName || left.table);
+    var rightTableName = normalizeId(right.tableName || right.table);
+    if (!hasBoth(leftTableName, rightTableName) || leftTableName !== rightTableName) {
+      return false;
+    }
+  }
+  var leftFieldId = normalizeId(left.fieldId || left.id);
+  var rightFieldId = normalizeId(right.fieldId || right.id);
+  if (hasBoth(leftFieldId, rightFieldId)) {
+    return leftFieldId === rightFieldId;
+  }
+  var leftFieldUuid = normalizeId(left.fieldUuid);
+  var rightFieldUuid = normalizeId(right.fieldUuid);
+  if (hasBoth(leftFieldUuid, rightFieldUuid)) {
+    return leftFieldUuid === rightFieldUuid;
+  }
+  var leftFieldName = normalizeId(left.fieldName || left.name);
+  var rightFieldName = normalizeId(right.fieldName || right.name);
+  if (hasBoth(leftFieldName, rightFieldName)) {
+    return leftFieldName === rightFieldName;
+  }
+  return false;
+};
 var throttle = exports.throttle = function throttle(fn) {
   var wait = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 200;
   if (typeof fn !== 'function') return function () {

package/lib/cjs/utils/transformSql.js

@@ -525,7 +525,6 @@ var _handleJoinData = function _handleJoinData(joinData) {
       tableName_zh: v.table2.name_zh,
       datasourceId: v.table2.datasourceId || '',
       datasourceName: v.table2.datasourceName || '',
-      datasourceType: v.table2.datasourceType || '',
       joinCondition: joinCondition,
       joinType: v.joinType,
       subQuery: subQuery,
@@ -569,7 +568,6 @@ var _handleNesting = function handleNesting(data) {
     obj.tableId = tableData.table.id;
     obj.datasourceId = tableData.table.datasourceId;
     obj.datasourceName = tableData.table.datasourceName;
-    obj.datasourceType = tableData.table.datasourceType;
     if (tableData.isSubquery && Array.isArray(tableData.subquery)) {
       obj.tableSubQuery = tableData.subquery;
     }

package/lib/cjs/utils.js

@@ -144,7 +144,7 @@ var getSubColumns = exports.getSubColumns = function getSubColumns(metaList) {
       _data.columns = _data.columns.concat(prevGroupBy.group.map(function (v) {
         var _v$sql;
         return (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, v), {}, {
-          name: v.fieldAlias || v.name || v.quotes,
+          name: v.name || v.quotes,
           name_zh: v.name_zh || v.quotes,
           id: v.id || v.fieldId,
           realName: ((_v$sql = v.sql) === null || _v$sql === void 0 || (_v$sql = _v$sql.split(' AS ')) === null || _v$sql === void 0 ? void 0 : _v$sql[1]) || '',
@@ -158,7 +158,7 @@ var getSubColumns = exports.getSubColumns = function getSubColumns(metaList) {
       _data.columns = _data.columns.concat(prevGroupBy.by.map(function (v) {
         var _v$sql2;
         return (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, v), {}, {
-          name: v.fieldAlias || v.name || v.quotes,
+          name: v.name || v.quotes,
           name_zh: v.name_zh || v.quotes,
           id: v.id || v.fieldId,
           realName: ((_v$sql2 = v.sql) === null || _v$sql2 === void 0 || (_v$sql2 = _v$sql2.split(' AS ')) === null || _v$sql2 === void 0 ? void 0 : _v$sql2[1]) || '',
@@ -184,7 +184,11 @@ var getSubColumns = exports.getSubColumns = function getSubColumns(metaList) {
         });
         return {
           alias: v.table2.alias,
-          table: v.table2.name,
+          name: v.table2.name,
+          id: v.table2.id,
+          tableUuid: v.table2.tableUuid,
+          datasourceId: v.table2.datasourceId,
+          datasourceName: v.table2.datasourceName,
           columns: columns
         };
       }));
@@ -202,7 +206,11 @@ var getSubColumns = exports.getSubColumns = function getSubColumns(metaList) {
         });
         return {
           alias: v.table.alias,
-          table: v.table.name,
+          name: v.table.name,
+          id: v.table.id,
+          tableUuid: v.table.tableUuid,
+          datasourceId: v.table.datasourceId,
+          datasourceName: v.table.datasourceName,
           columns: columns
         };
       } else if (v.type === _enum.TypeEnum.joinData) {
@@ -216,7 +224,11 @@ var getSubColumns = exports.getSubColumns = function getSubColumns(metaList) {
         });
         return {
           alias: v.table2.alias,
-          table: v.table2.name,
+          name: v.table2.name,
+          id: v.table2.id,
+          tableUuid: v.table2.tableUuid,
+          datasourceId: v.table2.datasourceId,
+          datasourceName: v.table2.datasourceName,
           columns: _columns
         };
       } else if (v.type === _enum.TypeEnum.customColumn) {
@@ -235,7 +247,8 @@ var getSubColumns = exports.getSubColumns = function getSubColumns(metaList) {
         return {
           columns: _columns2,
           alias: '',
-          table: (0, _locale.__)('SqlQueryBuilder.customColumn')
+          name: (0, _locale.__)('SqlQueryBuilder.customColumn'),
+          id: (0, _locale.__)('SqlQueryBuilder.customColumn')
         };
       } else {
         return {
@@ -821,8 +834,7 @@ var stripSummarizeTableFields = function stripSummarizeTableFields(record) {
     tableUuid: '',
     alias: '',
     datasourceId: '',
-    datasourceName: '',
-    datasourceType: ''
+    datasourceName: ''
   });
 };
 var createSummarizeFieldAtom = function createSummarizeFieldAtom(record) {
@@ -840,7 +852,6 @@ var createSummarizeFieldAtom = function createSummarizeFieldAtom(record) {
     tableUuid: record.tableUuid || '',
     datasourceName: record.datasourceName || '',
     datasourceId: record.datasourceId || '',
-    datasourceType: record.datasourceType || '',
     type: _types.AtomsTypeEnum.FIELD
   };
 };
@@ -998,17 +1009,21 @@ var _isError = exports.isError = function isError(item, data) {
         return true;
       } else {
         var _tables$_datasourceId2;
-        return tables === null || tables === void 0 || (_tables$_datasourceId2 = tables[_datasourceId]) === null || _tables$_datasourceId2 === void 0 || (_tables$_datasourceId2 = _tables$_datasourceId2[tableId]) === null || _tables$_datasourceId2 === void 0 ? void 0 : _tables$_datasourceId2.every(function (field) {
-          if (field.id === undefined) {
-            return field.name !== fieldName;
-          }
-          return field.name !== fieldName || field.id !== fieldId;
+        var fields = (tables === null || tables === void 0 || (_tables$_datasourceId2 = tables[_datasourceId]) === null || _tables$_datasourceId2 === void 0 ? void 0 : _tables$_datasourceId2[tableId + tableAlias]) || [];
+        return fields.every(function (field) {
+          return !(0, _helper2.isSameColumnByIdFirst)((0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, field), {}, {
+            datasourceId: _datasourceId,
+            tableId: tableId
+          }), item);
         });
       }
     } else {
       var _tables$_datasourceId3, _tables$_datasourceId4;
       var hasField = (_tables$_datasourceId3 = tables === null || tables === void 0 || (_tables$_datasourceId4 = tables[_datasourceId]) === null || _tables$_datasourceId4 === void 0 || (_tables$_datasourceId4 = _tables$_datasourceId4[tableId + tableAlias]) === null || _tables$_datasourceId4 === void 0 ? void 0 : _tables$_datasourceId4.some(function (v) {
-        return v.name === fieldName && (v.id === undefined || v.id === fieldId);
+        return (0, _helper2.isSameColumnByIdFirst)((0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, v), {}, {
+          datasourceId: _datasourceId,
+          tableId: tableId
+        }), item);
       })) !== null && _tables$_datasourceId3 !== void 0 ? _tables$_datasourceId3 : false;
       return !hasField;
     }
@@ -1096,19 +1111,24 @@ function setNewField(field, data) {
   try {
     for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
       var table = _step3.value;
-      if (table.name !== field.tableName) {
+      if (!(0, _helper2.isSameTableByIdFirst)(table, {
+        datasourceId: field.datasourceId,
+        id: field.tableId,
+        name: field.tableName,
+        alias: field.tableAlias,
+        tableUuid: field.tableUuid
+      })) {
         continue;
       }
       field.datasourceId = table.datasourceId || '';
       field.datasourceName = table.datasourceName || '';
-      field.datasourceType = table.datasourceType || '';
       field.tableId = table.id || '';
       field.tableName = table.name || '';
       field.tableAlias = table.alias || '';
       field.tableUuid = table.tableUuid || '';
       field.tableNameZh = table.name_zh || '';
       var matchedColumn = table.columns.find(function (col) {
-        return col.name === field.fieldName;
+        return (0, _helper2.isSameColumnByIdFirst)(col, field);
       });
       if (matchedColumn) {
         field.fieldId = matchedColumn.id || '';

package/lib/es/components/dialog/expression/index.js

@@ -636,7 +636,6 @@ var SelectFilterColumn = function SelectFilterColumn(_ref) {
               tableUuid: '',
               datasourceName: '',
               datasourceId: '',
-              datasourceType: '',
               type: AtomsTypeEnum.FIELD
             }]);
           }

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

@@ -67,7 +67,6 @@ export var insertTemplateAt = function insertTemplateAt(oldType, type, list, ind
       tableUuid: '',
       datasourceName: '',
       datasourceId: '',
-      datasourceType: '',
       type: AtomsTypeEnum.FIELD
     }, {
       val: 'ORDER BY',
@@ -85,7 +84,6 @@ export var insertTemplateAt = function insertTemplateAt(oldType, type, list, ind
       tableUuid: '',
       datasourceName: '',
       datasourceId: '',
-      datasourceType: '',
       type: AtomsTypeEnum.FIELD
     }, {
       val: ')',
@@ -145,7 +143,6 @@ export var getTemplateItem = function getTemplateItem(type, item) {
       tableUuid: '',
       datasourceName: '',
       datasourceId: '',
-      datasourceType: '',
       type: AtomsTypeEnum.FIELD
     };
   } else if (type === AtomsTypeEnum.EXPRESSION || type === AtomsTypeEnum.JOIN_DEFAULT) {

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

@@ -12,7 +12,7 @@ import { ChangeType } from '../../../store/types';
 import { __ } from '../../../locale';
 import { NotSelectIcon, SelectIcon } from '../../icons';
 import { useStore } from '../../../hooks/use-provider';
-import { uuidv4 } from '../../../utils/helper';
+import { getColumnIdFirstKey, isSameColumnByIdFirst, uuidv4 } from '../../../utils/helper';
 import { changeFieldAlias, isValidSQLAlias } from '../../../utils';
 import { SearchIcon } from '../../icons';
 var SelectColumn = function SelectColumn(_ref) {
@@ -73,7 +73,7 @@ var SelectColumn = function SelectColumn(_ref) {
     var originalData = cloneDeep(originList);
     var mergedColumns = originalData.map(function (item) {
       var match = columns.find(function (col) {
-        return col.fieldUuid === item.fieldUuid;
+        return isSameColumnByIdFirst(col, item);
       });
       return match ? cloneDeep(match) : item;
     });
@@ -197,7 +197,7 @@ var SelectColumn = function SelectColumn(_ref) {
                 }
               })
             })]
-          }, v.name);
+          }, getColumnIdFirstKey(v));
         })
       })]
     })

package/lib/es/components/dialog/select-column-multiple/index.d.ts

@@ -14,7 +14,6 @@ export interface ColumnType {
     id: string;
     datasourceId: string;
     datasourceName: string;
-    datasourceType?: string;
     table2?: Omit<MetaJoin_TalbeType, 'column' | 'column_id'> | null;
 }
 export interface ColumnGroupType {

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

@@ -13,8 +13,7 @@ import { AtomsTypeEnum } from '../../../store/types';
 import { __ } from '../../../locale';
 import { NUMBER_GROUP, DATE_GROUP } from '../const';
 import { useStore } from '../../../hooks/use-provider';
-import { replaceTpl, mergeNameAlias } from '../../../utils/helper';
-import { uuidv4 } from '../../../utils/helper';
+import { isSameColumnByIdFirst, replaceTpl, mergeNameAlias, uuidv4 } from '../../../utils/helper';
 import { SearchIcon, TableIcon, CircleIcon, LetterAaIcon, CalendarIcon, WellIcon, ForeignKeyIcon, UpArrowIcon2, DownArrowIcon2 } from '../../icons';
 export var DATE_GROUP_MAP = new Map([['分', '分'], ['时', '时'], ['天', '天'], ['周', '周'], ['月', '月'], ['季度', '季度'], ['一小时内的分钟数', '一小时内的分钟数'], ['一天内的小时数', '一天内的小时数'], ['一周内的天数', '一周内的天数'], ['一月内的天数', '一月内的天数'], ['一年内的天数', '一年内的天数'], ['一年的星期数', '一年的星期数'], ['一年的月数', '一年的月数']]);
 export var NUMBER_GROUP_MAP = new Map([['自动间隔', '自动分组'], ['10个刻度间隔', '10 刻度间隔'], ['间隔50', '50 刻度间隔'], ['间隔100', '100 刻度间隔'], ['无间隔', '']]);
@@ -80,22 +79,34 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
   useEffect(function () {
     setValue(_value);
   }, [_value]);
+  var getFieldTableKey = function getFieldTableKey(tableId, tableUuid) {
+    return tableId || tableUuid || '';
+  };
+  var isSameSelectedTable = function isSameSelectedTable(field, tableId, tableUuid) {
+    if (field.tableId && tableId) {
+      return field.tableId === tableId;
+    }
+    if (field.tableUuid && tableUuid) {
+      return field.tableUuid === tableUuid;
+    }
+    return false;
+  };
   var getSelectedFieldKey = function getSelectedFieldKey(field) {
     if (!field) return '';
-    if (field.tableId === SummarizeAlias) {
-      return field.fieldAlias || '';
-    }
-    return "".concat(field.fieldId).concat(field.fieldAlias || '');
+    var tableKey = getFieldTableKey(field.tableId, field.tableUuid);
+    var fieldKey = field.tableId === SummarizeAlias ? field.fieldAlias || '' : "".concat(field.fieldId).concat(field.fieldAlias || '');
+    return "".concat(tableKey, "|").concat(fieldKey);
   };
-  var getColumnKey = function getColumnKey(column, isSummarizeColumn) {
+  var getColumnKey = function getColumnKey(column, isSummarizeColumn, tableId, tableUuid) {
+    var tableKey = getFieldTableKey(tableId, tableUuid);
     if (isSummarizeColumn) {
-      return column.fieldAlias || column.name || '';
+      return "".concat(tableKey, "|").concat(column.fieldAlias || column.name || '');
     }
-    return "".concat(column.id || column.name).concat(column.fieldAlias || '');
+    return "".concat(tableKey, "|").concat(column.id || column.name).concat(column.fieldAlias || '');
   };
-  var isActive = function isActive(id_alias) {
+  var isActive = function isActive(id_alias, tableId, tableUuid) {
     return (value === null || value === void 0 ? void 0 : value.filter(function (v) {
-      return getSelectedFieldKey(v) === id_alias;
+      return isSameSelectedTable(v, tableId, tableUuid) && getSelectedFieldKey(v) === id_alias;
     }).length) > 0;
   };
   useEffect(function () {
@@ -149,30 +160,39 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
     }
     var selectedKey = getSelectedFieldKey(val);
     var isHas = (value === null || value === void 0 ? void 0 : value.filter(function (v) {
-      return getSelectedFieldKey(v) === selectedKey;
+      return val && isSameSelectedTable(v, val.tableId, val.tableUuid) && getSelectedFieldKey(v) === selectedKey;
     }).length) > 0;
     var _value = value.slice();
     if (tableUuid != curTable) {
       _value = [];
     }
     if (!isHas && val) {
+      _value = _value.filter(function (v) {
+        var hasTableKey = getFieldTableKey(v.tableId, v.tableUuid);
+        var isLegacySameField = !hasTableKey && (v.fieldId && v.fieldId === val.fieldId || v.fieldName && v.fieldName === val.fieldName);
+        return !isLegacySameField;
+      });
       _value.push(val);
     } else {
       _value = _value.filter(function (v) {
-        return getSelectedFieldKey(v) !== selectedKey;
+        return !(val && isSameSelectedTable(v, val.tableId, val.tableUuid) && getSelectedFieldKey(v) === selectedKey);
       });
     }
-    var curTableColumn = data.filter(function (v) {
+    var curTableItem = data.find(function (v) {
       return v.tableUuid === tableUuid;
-    }).flatMap(function (v) {
-      return v.columns;
     });
+    var curTableId = (curTableItem === null || curTableItem === void 0 ? void 0 : curTableItem.id) || '';
+    var curTableColumn = (curTableItem === null || curTableItem === void 0 ? void 0 : curTableItem.columns) || [];
     _value = _value.filter(function (item2) {
-      return curTableColumn.some(function (item1) {
+      return isSameSelectedTable(item2, curTableId, tableUuid) && curTableColumn.some(function (item1) {
         if (item2.tableId === SummarizeAlias) {
           return (item1.fieldAlias || item1.name) === item2.fieldAlias;
         }
-        return item1.name === item2.fieldName;
+        return isSameColumnByIdFirst(_objectSpread(_objectSpread({}, item1), {}, {
+          tableId: curTableId,
+          tableUuid: tableUuid,
+          datasourceId: (curTableItem === null || curTableItem === void 0 ? void 0 : curTableItem.datasourceId) || ''
+        }), item2);
       });
     });
     setValue(_value);
@@ -261,6 +281,11 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
                   if (isGroup) {
                     changeValue(tableUuid);
                   }
+                  if (tableUuid !== curTable) {
+                    setCurTable(tableUuid);
+                    setValue([]);
+                    onSelect === null || onSelect === void 0 || onSelect([], '');
+                  }
                   if (!isMultiple) return void 0;
                   var newTables = cloneDeep(tableList);
                   if (open) {
@@ -321,7 +346,7 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
                   _v$database_type = v.database_type,
                   database_type = _v$database_type === void 0 ? '' : _v$database_type,
                   name = v.name;
-                var columnKey = getColumnKey(v, isSummarize);
+                var columnKey = getColumnKey(v, isSummarize, tableId || '', tableUuid);
                 var fieldAlias = isSummarize ? v.fieldAlias || name || '' : v.fieldAlias || '';
                 var fieldName = isSummarize ? '' : name || '';
                 var fieldId = isSummarize ? '' : v.id || name || '';
@@ -337,7 +362,7 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
                   className: cx("Sqb-List-section"),
                   children: _jsx("div", {
                     className: cx("Sqb-List-item mx-2", {
-                      active: isActive(columnKey)
+                      active: isActive(columnKey, tableId || '', tableUuid)
                     }),
                     onClick: function onClick() {
                       changeValue(tableUuid, {
@@ -348,7 +373,6 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
                         tableUuid: tableItem.tableUuid || '',
                         datasourceName: tableItem.datasourceName || '',
                         datasourceId: tableItem.datasourceId || '',
-                        datasourceType: tableItem.datasourceType || '',
                         fieldName: fieldName,
                         fieldId: fieldId,
                         fieldNameZh: fieldNameZh,

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

@@ -11,7 +11,7 @@ import { SummarizeAlias } from '../../../store/helper';
 import { __ } from '../../../locale';
 import { NUMBER_GROUP, DATE_GROUP } from '../const';
 import { useStore } from '../../../hooks/use-provider';
-import { replaceTpl, mergeNameAlias } from '../../../utils/helper';
+import { getColumnIdFirstKey, isSameColumnByIdFirst, replaceTpl, mergeNameAlias } from '../../../utils/helper';
 import { SearchIcon, TableIcon, CircleIcon, LetterAaIcon, CalendarIcon, WellIcon, ForeignKeyIcon, UpArrowIcon2, DownArrowIcon2, RightArrowIcon } from '../../icons';
 export var DATE_GROUP_MAP = new Map([['分', '分'], ['时', '时'], ['天', '天'], ['周', '周'], ['月', '月'], ['季度', '季度'], ['一小时内的分钟数', '一小时内的分钟数'], ['一天内的小时数', '一天内的小时数'], ['一周内的天数', '一周内的天数'], ['一月内的天数', '一月内的天数'], ['一年内的天数', '一年内的天数'], ['一年的星期数', '一年的星期数'], ['一年的月数', '一年的月数']]);
 export var NUMBER_GROUP_MAP = new Map([['自动间隔', '自动分组'], ['10个刻度间隔', '10 刻度间隔'], ['间隔50', '50 刻度间隔'], ['间隔100', '100 刻度间隔'], ['无间隔', '']]);
@@ -49,7 +49,7 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
     _useState4 = _slicedToArray(_useState3, 2),
     curTable = _useState4[0],
     setCurTable = _useState4[1];
-  var _useState5 = useState(_value.name),
+  var _useState5 = useState(_value),
     _useState6 = _slicedToArray(_useState5, 2),
     curColumn = _useState6[0],
     setCurColumn = _useState6[1];
@@ -70,7 +70,7 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
     setTableList = _useState0[1];
   useEffect(function () {
     setValue(_value);
-    setCurColumn(_value.name);
+    setCurColumn(_value);
   }, [_value]);
   useEffect(function () {
     var tableUuid = _value === null || _value === void 0 ? void 0 : _value.tableUuid;
@@ -244,12 +244,20 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
               if (~DATE_GROUP.indexOf(database_type)) {
                 groupe = SQL_GROUP_TYPE.DATE;
               }
-              var showCondition = curColumn === name && curTable === tableUuid && _condition;
+              var showCondition = isSameColumnByIdFirst(curColumn, _objectSpread(_objectSpread({}, v), {}, {
+                tableId: tableId,
+                tableUuid: tableUuid,
+                datasourceId: datasourceId
+              })) && curTable === tableUuid && _condition;
               return _jsx("div", {
                 className: cx("Sqb-List-section"),
                 children: _jsxs("div", {
                   className: cx("Sqb-List-item mx-2", {
-                    active: curColumn === name && curTable === tableUuid
+                    active: curTable === tableUuid && isSameColumnByIdFirst(value, _objectSpread(_objectSpread({}, v), {}, {
+                      tableId: tableId,
+                      tableUuid: tableUuid,
+                      datasourceId: datasourceId
+                    }))
                   }),
                   onClick: function onClick() {
                     if (isGroup && typeof onGroup === 'function') {
@@ -311,11 +319,15 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
                     onVisibleChange: function onVisibleChange(visible) {
                       if (visible) {
                         setCurTable(tableUuid);
-                        setCurColumn(name);
+                        setCurColumn(_objectSpread(_objectSpread(_objectSpread({}, value), v), {}, {
+                          tableId: tableId,
+                          tableUuid: tableUuid,
+                          datasourceId: datasourceId
+                        }));
                         store.setClosable(false);
                       } else {
                         setCurTable(tableUuid);
-                        setCurColumn(value.name);
+                        setCurColumn(value);
                         setTimeout(function () {
                           return store.setClosable(true);
                         }, 300);
@@ -372,7 +384,11 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
                     })
                   })]
                 })
-              }, name);
+              }, getColumnIdFirstKey(_objectSpread(_objectSpread({}, v), {}, {
+                tableId: tableId,
+                tableUuid: tableUuid,
+                datasourceId: datasourceId
+              })));
             })]
           })]
         }, tableUuid || tableAlias);

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

@@ -11,7 +11,7 @@ import { SummarizeAlias } from '../../../store/helper';
 import { __ } from '../../../locale';
 import { NUMBER_GROUP, DATE_GROUP } from '../const';
 import { useStore } from '../../../hooks/use-provider';
-import { replaceTpl, mergeNameAlias } from '../../../utils/helper';
+import { getColumnIdFirstKey, isSameColumnByIdFirst, replaceTpl, mergeNameAlias } from '../../../utils/helper';
 import { SearchIcon, TableIcon, CircleIcon, LetterAaIcon, CalendarIcon, WellIcon, ForeignKeyIcon, UpArrowIcon2, DownArrowIcon2 } from '../../icons';
 export var DATE_GROUP_MAP = new Map([['分', '分'], ['时', '时'], ['天', '天'], ['周', '周'], ['月', '月'], ['季度', '季度'], ['一小时内的分钟数', '一小时内的分钟数'], ['一天内的小时数', '一天内的小时数'], ['一周内的天数', '一周内的天数'], ['一月内的天数', '一月内的天数'], ['一年内的天数', '一年内的天数'], ['一年的星期数', '一年的星期数'], ['一年的月数', '一年的月数']]);
 export var NUMBER_GROUP_MAP = new Map([['自动间隔', '自动分组'], ['10个刻度间隔', '10 刻度间隔'], ['间隔50', '50 刻度间隔'], ['间隔100', '100 刻度间隔'], ['无间隔', '']]);
@@ -67,9 +67,9 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
   useEffect(function () {
     setValue(_value);
   }, [_value]);
-  var isActive = function isActive(fieldUuid) {
+  var isActive = function isActive(field) {
     return value.filter(function (v) {
-      return v.fieldUuid === fieldUuid;
+      return isSameColumnByIdFirst(v, field);
     }).length > 0;
   };
   useEffect(function () {
@@ -102,7 +102,7 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
   }
   var changeValue = function changeValue(table, val) {
     var isHas = value.filter(function (v) {
-      return v.fieldUuid === val.fieldUuid;
+      return isSameColumnByIdFirst(v, val);
     }).length > 0;
     var _value = _toConsumableArray(value);
     if (table.tableUuid != curTable.tableUuid) {
@@ -112,7 +112,7 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
       _value.push(val);
     } else {
       _value = _value.filter(function (v) {
-        return v.fieldUuid != val.fieldUuid;
+        return !isSameColumnByIdFirst(v, val);
       });
     }
     setValue(_value);
@@ -223,7 +223,12 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
                 className: cx("Sqb-List-section"),
                 children: _jsx("div", {
                   className: cx("Sqb-List-item mx-2", {
-                    active: isActive(v.fieldUuid)
+                    active: isActive(_objectSpread(_objectSpread({}, v), {}, {
+                      fieldId: fieldId || v.id,
+                      tableId: tableId,
+                      tableUuid: tableUuid,
+                      datasourceId: datasourceId
+                    }))
                   }),
                   onClick: function onClick() {
                     changeValue(tableItem, {
@@ -246,7 +251,11 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
                     })]
                   })
                 })
-              }, name);
+              }, getColumnIdFirstKey(_objectSpread(_objectSpread({}, v), {}, {
+                tableId: tableId,
+                tableUuid: tableUuid,
+                datasourceId: datasourceId
+              })));
             })]
           })]
         }, tableUuid || tableAlias);

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

@@ -6,7 +6,7 @@ import cx from 'classnames';
 import cloneDeep from 'lodash/cloneDeep';
 import { __ } from '../../../locale';
 import { TableIcon, SearchIcon } from '../../icons';
-import { mergeNameAlias } from '../../../utils/helper';
+import { getTableIdFirstKey, isSameTableByIdFirst, mergeNameAlias } from '../../../utils/helper';
 var PrevResult = 'Previous results';
 var SelectPermissionTable = function SelectPermissionTable(_ref) {
   var _ref$data = _ref.data,
@@ -60,7 +60,7 @@ var SelectPermissionTable = function SelectPermissionTable(_ref) {
             className: cx("Sqb-List-section"),
             children: _jsx("div", {
               className: cx("Sqb-List-item mx-2", {
-                active: value.alias + '' + value.id === v.alias + '' + v.id
+                active: isSameTableByIdFirst(value, v)
               }),
               onClick: function onClick() {
                 onChange(v);
@@ -78,7 +78,7 @@ var SelectPermissionTable = function SelectPermissionTable(_ref) {
                 })]
               })
             })
-          }, v.alias || v.name);
+          }, getTableIdFirstKey(v));
         })]
       })
     })