@gingkoo/pandora-metabase 1.0.137 → 1.0.138

package/lib/cjs/utils.d.ts

@@ -4,6 +4,7 @@ import { DataType } from './components/dialog/select-column-multiple';
 export declare const findIndex: <T>(arr: T[], item: T) => number;
 export declare const findMetaKey: <T>(arr: T[], item: T) => number;
 export declare const getMetaTabels: (data: MetaListType[]) => any;
+export declare const getSubQueryColumnInstanceUuid: (column: any, tableUuid?: string) => string;
 export declare const getColumnsTables: (data: DataType[]) => any;
 interface HelperResultType {
     ExistAboveGroupBy: boolean;

package/lib/cjs/utils.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.changeTableAlias = exports.changeFieldAlias = exports.changeExistsCopyField = exports.changeCopyField = exports.buildSqlQuery = void 0;
 exports.containsSubset = containsSubset;
-exports.isExistsError = exports.isError = exports.isCanPaste = exports.getSubColumns = exports.getObjTem = exports.getMetaTabels = exports.getHelper = exports.getColumnsTables = exports.findMetaKey = exports.findIndex = void 0;
+exports.isExistsError = exports.isError = exports.isCanPaste = exports.getSubQueryColumnInstanceUuid = exports.getSubColumns = exports.getObjTem = exports.getMetaTabels = exports.getHelper = exports.getColumnsTables = exports.findMetaKey = exports.findIndex = void 0;
 exports.isValidSQLAlias = isValidSQLAlias;
 exports.patchData = exports.normalizeLegacySummarizeForSave = exports.metaIsCheck = exports.mergeSubQueryColumns = void 0;
 exports.reassembleByUnion = reassembleByUnion;
@@ -54,6 +54,15 @@ var SUB_QUERY_OUTPUT_COLUMN_KEY = '__subQueryOutputColumn';
 var isSubQueryOutputColumn = function isSubQueryOutputColumn(column) {
   return Boolean((column === null || column === void 0 ? void 0 : column.summarizeType) && (column === null || column === void 0 ? void 0 : column[SUB_QUERY_OUTPUT_COLUMN_KEY]));
 };
+var getSubQueryColumnSourceKey = function getSubQueryColumnSourceKey(column) {
+  var columnMeta = column;
+  return [column.datasourceId || '', column.tableUuid || '', column.tableId || '', column.table || columnMeta.tableName || '', columnMeta.fieldId || column.id || '', column.name || '', column.realName || ''].join('|');
+};
+var getSubQueryColumnInstanceUuid = exports.getSubQueryColumnInstanceUuid = function getSubQueryColumnInstanceUuid(column) {
+  var tableUuid = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
+  var sourceKey = getSubQueryColumnSourceKey(column);
+  return [tableUuid || column.tableUuid || '', column.summarizeType || '', sourceKey].join('|');
+};
 var getColumnsTables = exports.getColumnsTables = function getColumnsTables(data) {
   var obj = {};
   data.map(function (v) {
@@ -151,7 +160,8 @@ var normalizeSubQueryColumn = function normalizeSubQueryColumn(column) {
     name_zh: column.name_zh || column.quotes || '',
     id: column.id || column.fieldId || outputName,
     realName: column.realName || column.name || '',
-    fieldAlias: ''
+    fieldAlias: '',
+    fieldUuid: column.fieldUuid || getSubQueryColumnInstanceUuid(column)
   });
 };
 var getOuterSubQueryFieldAlias = function getOuterSubQueryFieldAlias(existingCol, newCol) {
@@ -185,6 +195,20 @@ var isSameSubQueryOutputColumn = function isSameSubQueryOutputColumn(oldCol, new
   var newIdentity = getSubQueryOutputIdentity(newCol);
   return Boolean(oldIdentity && newIdentity && oldIdentity === newIdentity);
 };
+var isSameColumnTableInstance = function isSameColumnTableInstance(oldCol, newCol) {
+  var oldColumn = oldCol;
+  var newColumn = newCol;
+  if (oldColumn.tableUuid && newColumn.tableUuid) {
+    return oldColumn.tableUuid === newColumn.tableUuid;
+  }
+  if (oldColumn.datasourceId && newColumn.datasourceId && oldColumn.datasourceId !== newColumn.datasourceId) {
+    return false;
+  }
+  if (oldColumn.tableId && newColumn.tableId && oldColumn.tableId !== newColumn.tableId) {
+    return false;
+  }
+  return true;
+};
 var mergeSubQueryColumns = exports.mergeSubQueryColumns = function mergeSubQueryColumns(columns) {
   var oldColumns = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
   var isSelectFields = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
@@ -192,6 +216,9 @@ var mergeSubQueryColumns = exports.mergeSubQueryColumns = function mergeSubQuery
     var newColumn = newCol;
     var existingCol = oldColumns.find(function (oldCol) {
       var oldColumn = oldCol;
+      if (!isSameColumnTableInstance(oldCol, newCol)) {
+        return false;
+      }
       if (oldColumn.fieldUuid && newColumn.fieldUuid) {
         return oldColumn.fieldUuid === newColumn.fieldUuid;
       }
@@ -768,8 +795,8 @@ var syncAtomQuotesList = function syncAtomQuotesList(items) {
   return items.map(syncAtomQuotes);
 };
 var isSameAliasTargetTable = function isSameAliasTargetTable(item, target) {
-  if (target.tableUuid && item.tableUuid && item.tableUuid === target.tableUuid) {
-    return true;
+  if (target.tableUuid && item.tableUuid) {
+    return item.tableUuid === target.tableUuid;
   }
   if (target.datasourceId && item.datasourceId && item.datasourceId !== target.datasourceId) {
     return false;
@@ -780,15 +807,32 @@ var isSameAliasTargetTable = function isSameAliasTargetTable(item, target) {
   return Boolean(target.tableName && item.tableName && item.tableName === target.tableName);
 };
 var isAliasTargetField = function isAliasTargetField(item, target) {
+  var sameTable = isSameAliasTargetTable(item, target);
   if (target.uuid && item.fieldUuid && item.fieldUuid === target.uuid) {
-    return true;
+    return sameTable || !(target.tableUuid || target.tableId || target.tableName);
   }
-  var sameTable = isSameAliasTargetTable(item, target);
   if (target.fieldId && item.fieldId && item.fieldId === target.fieldId) {
     return sameTable || !target.tableId;
   }
   return Boolean(target.fieldName && item.fieldName && item.fieldName === target.fieldName && sameTable);
 };
+var isAliasTargetSummarizeRecord = function isAliasTargetSummarizeRecord(record, target) {
+  return isAliasTargetField({
+    fieldName: record.name || '',
+    fieldNameZh: record.name_zh || '',
+    fieldAlias: record.fieldAlias || '',
+    fieldUuid: record.fieldUuid || '',
+    fieldId: record.fieldId || record.id || '',
+    tableName: record.table || '',
+    tableNameZh: '',
+    tableId: record.tableId || '',
+    tableAlias: record.alias || '',
+    tableUuid: record.tableUuid || '',
+    datasourceName: record.datasourceName || '',
+    datasourceId: record.datasourceId || '',
+    type: _types.AtomsTypeEnum.FIELD
+  }, target);
+};
 var _changeAlias = function changeAlias(items, val, type) {
   return items.map(function (v) {
     var nextItem;
@@ -1018,7 +1062,7 @@ var changeFieldAlias = exports.changeFieldAlias = function changeFieldAlias(list
         if (groupAtoms && groupAtoms.length > 0) {
           group.atoms = _changeAlias(groupAtoms, aliasTarget, AliasType.field);
           group.sql = (0, _helper.summarizeToSql)(v.group, group).sql;
-        } else if (group.fieldUuid === uuid) {
+        } else if (isAliasTargetSummarizeRecord(group, aliasTarget)) {
           group.fieldAlias = alias;
           group.sql = (0, _helper.summarizeToSql)(v.group, group).sql;
         }
@@ -1027,7 +1071,7 @@ var changeFieldAlias = exports.changeFieldAlias = function changeFieldAlias(list
         if (by.atoms && by.atoms.length > 0) {
           by.atoms = _changeAlias(by.atoms, aliasTarget, AliasType.field);
           by.sql = (0, _helper.summarizeByToSql)(by);
-        } else if (by.fieldUuid === uuid) {
+        } else if (isAliasTargetSummarizeRecord(by, aliasTarget)) {
           by.fieldAlias = alias;
           by.sql = (0, _helper.summarizeByToSql)(by);
         }
@@ -1250,12 +1294,60 @@ var hasLoadedColumnData = function hasLoadedColumnData() {
     return Array.isArray(table === null || table === void 0 ? void 0 : table.columns) && table.columns.length > 0;
   });
 };
+var normalizeIdentityValue = function normalizeIdentityValue(val) {
+  if (val === undefined || val === null) return '';
+  return "".concat(val);
+};
+var isSourceLikeDatasource = function isSourceLikeDatasource(datasourceId) {
+  return !datasourceId || datasourceId === 'source';
+};
+var isSameErrorCheckTable = function isSameErrorCheckTable(table, item) {
+  var itemDatasourceId = normalizeIdentityValue(item.datasourceId);
+  var tableDatasourceId = normalizeIdentityValue(table.datasourceId);
+  if (!isSourceLikeDatasource(itemDatasourceId) && !isSourceLikeDatasource(tableDatasourceId) && itemDatasourceId !== tableDatasourceId) {
+    return false;
+  }
+  var itemTableId = normalizeIdentityValue(item.tableId);
+  var tableId = normalizeIdentityValue(table.id);
+  if (itemTableId && tableId && itemTableId !== tableId) {
+    return false;
+  }
+  var itemTableAlias = normalizeIdentityValue(item.tableAlias);
+  var tableAlias = normalizeIdentityValue(table.alias);
+  if (itemTableAlias && tableAlias && itemTableAlias !== tableAlias) {
+    return false;
+  }
+  var itemTableName = normalizeIdentityValue(item.tableName);
+  var tableName = normalizeIdentityValue(table.name);
+  return Boolean(itemTableId && tableId && itemTableId === tableId || itemTableAlias && tableAlias && itemTableAlias === tableAlias || item.tableUuid && table.tableUuid && item.tableUuid === table.tableUuid || itemTableName && tableName && itemTableName === tableName);
+};
+var isSameErrorCheckColumn = function isSameErrorCheckColumn(field, item) {
+  if ((0, _helper2.isSameColumnByIdFirst)(field, item)) {
+    return true;
+  }
+  if (!(field !== null && field !== void 0 && field.summarizeType)) {
+    return false;
+  }
+  var itemValues = [item.fieldId, item.id, item.fieldUuid, item.fieldName, item.fieldAlias].map(normalizeIdentityValue).filter(Boolean);
+  var fieldValues = [field.fieldId, field.id, field.fieldUuid, field.fieldName, field.name, field.fieldAlias, field.realName].map(normalizeIdentityValue).filter(Boolean);
+  return itemValues.some(function (value) {
+    return fieldValues.includes(value);
+  });
+};
+var getErrorCheckFields = function getErrorCheckFields(item, data) {
+  var tables = data.filter(function (table) {
+    return isSameErrorCheckTable(table, item);
+  });
+  if (!tables.length) return null;
+  return tables.flatMap(function (table) {
+    return table.columns || [];
+  });
+};
 var _isError = exports.isError = function isError(item) {
   var data = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
   if (!hasLoadedColumnData(data)) {
     return false;
   }
-  var tables = getColumnsTables(data);
   if (!item) {
     return false;
   }
@@ -1265,49 +1357,21 @@ var _isError = exports.isError = function isError(item) {
     });
   }
   if (item.type === _types.AtomsTypeEnum.FIELD) {
-    var datasourceId = item.datasourceId,
-      _item$tableId = item.tableId,
-      tableId = _item$tableId === void 0 ? '' : _item$tableId,
-      _item$tableAlias = item.tableAlias,
-      tableAlias = _item$tableAlias === void 0 ? '' : _item$tableAlias,
-      fieldName = item.fieldName,
-      fieldId = item.fieldId;
-    var _datasourceId = datasourceId || 'source';
-    if (tableId === 'source') {
-      _datasourceId = 'source';
-    }
+    var _item$tableId = item.tableId,
+      tableId = _item$tableId === void 0 ? '' : _item$tableId;
     if (!tableId) {
       return false;
     }
-    if (_datasourceId === 'source') {
-      var _tables$_datasourceId;
-      var fields = tables === null || tables === void 0 || (_tables$_datasourceId = tables[_datasourceId]) === null || _tables$_datasourceId === void 0 ? void 0 : _tables$_datasourceId[tableId + tableAlias];
-      if (!fields) {
-        return true;
-      } else if (!fields.length) {
-        return false;
-      } else {
-        return fields.every(function (field) {
-          return !(0, _helper2.isSameColumnByIdFirst)((0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, field), {}, {
-            datasourceId: _datasourceId,
-            tableId: tableId
-          }), item);
-        });
-      }
-    } else {
-      var _tables$_datasourceId2, _fields$some;
-      var _fields = tables === null || tables === void 0 || (_tables$_datasourceId2 = tables[_datasourceId]) === null || _tables$_datasourceId2 === void 0 ? void 0 : _tables$_datasourceId2[tableId + tableAlias];
-      if (_fields && !_fields.length) {
-        return false;
-      }
-      var hasField = (_fields$some = _fields === null || _fields === void 0 ? void 0 : _fields.some(function (v) {
-        return (0, _helper2.isSameColumnByIdFirst)((0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, v), {}, {
-          datasourceId: _datasourceId,
-          tableId: tableId
-        }), item);
-      })) !== null && _fields$some !== void 0 ? _fields$some : false;
-      return !hasField;
+    var fields = getErrorCheckFields(item, data);
+    if (!fields) {
+      return true;
     }
+    if (!fields.length) {
+      return false;
+    }
+    return !fields.some(function (field) {
+      return isSameErrorCheckColumn(field, item);
+    });
   }
   if (item.type === _types.AtomsTypeEnum.EXPRESSION) {
     var lhsHasError = _isError(item.lhs, data);

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

@@ -20,7 +20,7 @@ import cloneDeep from 'lodash/cloneDeep';
 import { useStore } from '../../../hooks/use-provider';
 import { getTopLayerZIndex } from '../../../utils/helper-dom';
 var VisualBox = Styled.div.attrs({
-  className: 'visual-box'
+  className: 'visual-box scroller'
 })(_templateObject || (_templateObject = _taggedTemplateLiteral([""])));
 var CaseEditor = React.forwardRef(function (props, ref) {
   var _store$formulaTemplat, _fun$args;

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

@@ -155,7 +155,7 @@ var CaseWhenGroup = function CaseWhenGroup(_ref) {
           className: 'Sqb-CaseBranchIndex',
           children: branchIndex + 1
         }), _jsx("div", {
-          className: 'Sqb-CaseBranch-body',
+          className: 'Sqb-CaseBranch-body scroller-x',
           children: renderBranchContent(_jsxs(_Fragment, {
             children: [_jsxs("div", {
               className: 'Sqb-CaseSection Sqb-CaseSection-condition',
@@ -226,7 +226,7 @@ var CaseWhenGroup = function CaseWhenGroup(_ref) {
         className: 'Sqb-CaseBranchIndex Sqb-CaseBranchIndex--else',
         "aria-hidden": 'true'
       }), _jsx("div", {
-        className: 'Sqb-CaseBranch-body',
+        className: 'Sqb-CaseBranch-body scroller-x',
         children: renderBranchContent(_jsxs("div", {
           className: 'Sqb-CaseSection Sqb-CaseSection-result Sqb-CaseSection-else',
           children: [_jsx("span", {

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

@@ -487,7 +487,7 @@ var FormulaList = forwardRef(function (props, ref) {
         children: _jsxs("div", {
           className: 'Sqb-FormulaListZoomEditor',
           children: [_jsx("div", {
-            className: 'Sqb-FormulaListZoomEditor-body',
+            className: 'Sqb-FormulaListZoomEditor-body scroller scroller-x',
             children: _jsx("div", {
               className: 'Sqb-NotebookCell Sqb-FormulaListZoomEditor-cell',
               children: _jsx(CaseWhenGroup, {
@@ -649,7 +649,7 @@ var FormulaList = forwardRef(function (props, ref) {
         children: _jsxs("div", {
           className: 'Sqb-FormulaListZoomEditor',
           children: [_jsx("div", {
-            className: 'Sqb-FormulaListZoomEditor-body Sqb-FormulaListZoomEditor-body--formulaList',
+            className: 'Sqb-FormulaListZoomEditor-body Sqb-FormulaListZoomEditor-body--formulaList scroller scroller-x',
             children: _jsx(FormulaList, {
               ref: ref,
               value: draftList,

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

@@ -1649,8 +1649,8 @@
   width: 100%;
   min-width: 100%;
   box-sizing: border-box;
-  padding-left: var(--sqb-item-shell-margin-x, 14px);
-  padding-right: var(--sqb-item-shell-margin-x, 14px);
+  padding: var(--sqb-item-shell-margin-x, 14px);
+  // padding: var(--sqb-item-shell-margin-x, 14px);
 }
 
 .Sqb-FormulaListZoomEditor-body .Sqb-FormulaListZoomEditor-cell {
@@ -1736,6 +1736,14 @@
   padding-bottom: 4px;
 }
 
+.Sqb-FormulaListZoomEditor-body
+  .Sqb-CaseWhenGroup:not(.Sqb-CaseWhenGroup--nested)
+  > .Sqb-FormulaGroup-row
+  > .Sqb-CaseBranch-body:has(.Sqb-CaseWhenGroup--nested) {
+  overflow: visible;
+  padding-bottom: 0;
+}
+
 .Sqb-FormulaListZoomEditor-body
   .Sqb-CaseWhenGroup:not(.Sqb-CaseWhenGroup--nested)
   > .Sqb-FormulaGroup-row
@@ -2162,3 +2170,101 @@
   background: rgba(80, 158, 227, 0.88);
   border-color: rgba(80, 158, 227, 0.88);
 }
+
+.Sqb-FormulaGroup.logic-group > .Sqb-LogicGroup-content:has(.Sqb-CaseWhenGroup--nested),
+.Sqb-FormulaGroup.logic-group
+  > .Sqb-LogicGroup-content:has(.Sqb-CaseWhenGroup--nested)
+  > .Sqb-NestedFormulaList,
+.Sqb-FormulaGroup.logic-group
+  > .Sqb-LogicGroup-content:has(.Sqb-CaseWhenGroup--nested)
+  > .Sqb-NestedFormulaList
+  > .Sqb-NotebookCell,
+.Sqb-FormulaGroup.logic-group
+  > .Sqb-LogicGroup-content:has(.Sqb-CaseWhenGroup--nested)
+  > .Sqb-NestedFormulaList
+  > .Sqb-NotebookCell.Sqb-NotebookCell--embedded,
+.Sqb-FormulaGroup.logic-group
+  > .Sqb-LogicGroup-content:has(.Sqb-CaseWhenGroup--nested)
+  > .Sqb-NestedFormulaList
+  > .Sqb-NotebookCell.Sqb-NotebookCell--embedded
+  > .Sqb-Filter-item.item-composite,
+.Sqb-FormulaGroup.logic-group
+  > .Sqb-LogicGroup-content:has(.Sqb-CaseWhenGroup--nested)
+  > .Sqb-NestedFormulaList
+  > .Sqb-NotebookCell.Sqb-NotebookCell--embedded
+  > .Sqb-Filter-item.item-composite
+  > .Sqb-Filter-item-node,
+.Sqb-FormulaGroup.logic-group
+  > .Sqb-LogicGroup-content:has(.Sqb-CaseWhenGroup--nested)
+  .Sqb-CaseWhenGroup.Sqb-CaseWhenGroup--nested {
+  min-width: 0;
+  max-width: 100%;
+  box-sizing: border-box;
+}
+
+.Sqb-FormulaGroup.logic-group > .Sqb-LogicGroup-content:has(.Sqb-CaseWhenGroup--nested) {
+  flex: 1 1 auto;
+}
+
+.Sqb-FormulaGroup.logic-group
+  > .Sqb-LogicGroup-content:has(.Sqb-CaseWhenGroup--nested)
+  > .Sqb-NestedFormulaList,
+.Sqb-FormulaGroup.logic-group
+  > .Sqb-LogicGroup-content:has(.Sqb-CaseWhenGroup--nested)
+  > .Sqb-NestedFormulaList
+  > .Sqb-NotebookCell,
+.Sqb-FormulaGroup.logic-group
+  > .Sqb-LogicGroup-content:has(.Sqb-CaseWhenGroup--nested)
+  > .Sqb-NestedFormulaList
+  > .Sqb-NotebookCell.Sqb-NotebookCell--embedded,
+.Sqb-FormulaGroup.logic-group
+  > .Sqb-LogicGroup-content:has(.Sqb-CaseWhenGroup--nested)
+  > .Sqb-NestedFormulaList
+  > .Sqb-NotebookCell.Sqb-NotebookCell--embedded
+  > .Sqb-Filter-item.item-composite,
+.Sqb-FormulaGroup.logic-group
+  > .Sqb-LogicGroup-content:has(.Sqb-CaseWhenGroup--nested)
+  > .Sqb-NestedFormulaList
+  > .Sqb-NotebookCell.Sqb-NotebookCell--embedded
+  > .Sqb-Filter-item.item-composite
+  > .Sqb-Filter-item-node,
+.Sqb-FormulaGroup.logic-group
+  > .Sqb-LogicGroup-content:has(.Sqb-CaseWhenGroup--nested)
+  .Sqb-CaseWhenGroup.Sqb-CaseWhenGroup--nested {
+  flex: 1 1 auto;
+  width: 100%;
+}
+
+.Sqb-FormulaGroup.logic-group
+  > .Sqb-LogicGroup-content:has(.Sqb-CaseWhenGroup--nested)
+  .Sqb-CaseWhenGroup.Sqb-CaseWhenGroup--nested
+  > .Sqb-FormulaGroup-row.row-when,
+.Sqb-FormulaGroup.logic-group
+  > .Sqb-LogicGroup-content:has(.Sqb-CaseWhenGroup--nested)
+  .Sqb-CaseWhenGroup.Sqb-CaseWhenGroup--nested
+  > .Sqb-FormulaGroup-row.row-else {
+  grid-template-columns:
+    var(--sqb-case-index-column) minmax(0, 1fr)
+    var(--sqb-case-action-column);
+  width: 100%;
+  min-width: 0;
+  max-width: 100%;
+}
+
+.Sqb-FormulaGroup.logic-group
+  > .Sqb-LogicGroup-content:has(.Sqb-CaseWhenGroup--nested)
+  .Sqb-CaseWhenGroup.Sqb-CaseWhenGroup--nested
+  > .Sqb-FormulaGroup-row.row-when
+  > .Sqb-CaseBranch-body,
+.Sqb-FormulaGroup.logic-group
+  > .Sqb-LogicGroup-content:has(.Sqb-CaseWhenGroup--nested)
+  .Sqb-CaseWhenGroup.Sqb-CaseWhenGroup--nested
+  > .Sqb-FormulaGroup-row.row-else
+  > .Sqb-CaseBranch-body {
+  width: 100%;
+  min-width: 0;
+  max-width: 100%;
+  overflow-x: auto;
+  overflow-y: hidden;
+  padding-bottom: 4px;
+}

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

@@ -100,6 +100,12 @@ export var customTypes = [{
 }, {
   value: AtomsTypeEnum.EXPRESSION,
   label: __('customColumn.expression')
+}, {
+  value: AtomsTypeEnum.CASE_WHEN,
+  label: __('customColumn.caseWhen')
+}, {
+  value: AtomsTypeEnum.AND_OR,
+  label: __('customColumn.andOr')
 }, {
   value: AtomsTypeEnum.INPUT_STRING,
   label: __('customColumn.input')

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

@@ -1,3 +1,4 @@
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
@@ -14,7 +15,7 @@ import { AtomsTypeEnum } from '../../../store/types';
 import { __ } from '../../../locale';
 import { NUMBER_GROUP, DATE_GROUP } from '../const';
 import { useStore } from '../../../hooks/use-provider';
-import { isSameColumnByIdFirst, replaceTpl, mergeNameAlias, uuidv4 } from '../../../utils/helper';
+import { 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 刻度间隔'], ['无间隔', '']]);
@@ -89,32 +90,74 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
       setCurTable(selectedTableUuid);
     }
   }, [_value]);
-  var getFieldTableKey = function getFieldTableKey(tableId, tableUuid) {
-    return tableId || tableUuid || '';
+  var normalizeIdentityValue = function normalizeIdentityValue(val) {
+    if (val === undefined || val === null) return '';
+    return "".concat(val);
   };
-  var isSameSelectedTable = function isSameSelectedTable(field, tableId, tableUuid) {
-    if (field.tableId && tableId) {
-      return field.tableId === tableId;
+  var isSourceLikeDatasource = function isSourceLikeDatasource(datasourceId) {
+    var normalizedDatasourceId = normalizeIdentityValue(datasourceId);
+    return !normalizedDatasourceId || normalizedDatasourceId === SummarizeAlias;
+  };
+  var getFieldTableKey = function getFieldTableKey(tableId, tableUuid, tableAlias, datasourceId) {
+    var normalizedTableId = normalizeIdentityValue(tableId);
+    var normalizedTableAlias = normalizeIdentityValue(tableAlias);
+    var normalizedTableUuid = normalizeIdentityValue(tableUuid);
+    var normalizedDatasourceId = normalizeIdentityValue(datasourceId);
+    var datasourceKey = isSourceLikeDatasource(normalizedDatasourceId) ? '' : normalizedDatasourceId;
+    if (normalizedTableId) {
+      return "".concat(datasourceKey, "|id:").concat(normalizedTableId, "|alias:").concat(normalizedTableAlias);
     }
-    if (field.tableUuid && tableUuid) {
-      return field.tableUuid === tableUuid;
+    if (normalizedTableUuid) {
+      return "".concat(datasourceKey, "|uuid:").concat(normalizedTableUuid);
     }
-    return false;
+    return datasourceKey;
   };
-  var getSelectedFieldKey = function getSelectedFieldKey(field) {
-    if (!field) return '';
-    var tableKey = getFieldTableKey(field.tableId, field.tableUuid);
-    var fieldKey = field.fieldId || field.fieldUuid || field.fieldName || '';
-    return "".concat(tableKey, "|").concat(fieldKey);
+  var isSameSelectedTable = function isSameSelectedTable(field, tableItem) {
+    if (!tableItem) return false;
+    var fieldDatasourceId = normalizeIdentityValue(field.datasourceId);
+    var tableDatasourceId = normalizeIdentityValue(tableItem.datasourceId);
+    if (fieldDatasourceId && tableDatasourceId && !isSourceLikeDatasource(fieldDatasourceId) && !isSourceLikeDatasource(tableDatasourceId) && fieldDatasourceId !== tableDatasourceId) {
+      return false;
+    }
+    var fieldTableId = normalizeIdentityValue(field.tableId);
+    var tableId = normalizeIdentityValue(tableItem.id);
+    if (fieldTableId && tableId) {
+      if (fieldTableId !== tableId) return false;
+      var fieldTableAlias = normalizeIdentityValue(field.tableAlias);
+      var tableAlias = normalizeIdentityValue(tableItem.alias);
+      if (fieldTableAlias && tableAlias) {
+        return fieldTableAlias === tableAlias;
+      }
+      return true;
+    }
+    var fieldTableUuid = normalizeIdentityValue(field.tableUuid);
+    var tableUuid = normalizeIdentityValue(tableItem.tableUuid);
+    return Boolean(fieldTableUuid && tableUuid && fieldTableUuid === tableUuid);
   };
-  var getColumnKey = function getColumnKey(column, isSummarizeColumn, tableId, tableUuid) {
-    var tableKey = getFieldTableKey(tableId, tableUuid);
-    var fieldKey = column.id || column.fieldId || column.fieldUuid || column.name || '';
-    return "".concat(tableKey, "|").concat(fieldKey);
+  var getFieldStableValues = function getFieldStableValues(field) {
+    var includeAlias = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+    if (!field) return [];
+    return [field.fieldId, field.id, field.fieldName].concat(_toConsumableArray(includeAlias ? [field.fieldAlias] : [])).map(normalizeIdentityValue).filter(Boolean);
+  };
+  var getColumnStableValues = function getColumnStableValues(column) {
+    var includeAlias = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+    if (!column) return [];
+    return [column.id, column.fieldId, column.fieldName, column.name, column.realName].concat(_toConsumableArray(includeAlias ? [column.fieldAlias] : [])).map(normalizeIdentityValue).filter(Boolean);
+  };
+  var isSameSelectedField = function isSameSelectedField(field, column) {
+    var includeAlias = Boolean(column.summarizeType);
+    var fieldValues = getFieldStableValues(field, includeAlias);
+    var columnValues = getColumnStableValues(column, includeAlias);
+    if (fieldValues.some(function (value) {
+      return columnValues.includes(value);
+    })) {
+      return true;
+    }
+    return Boolean(field.fieldUuid && column.fieldUuid && field.fieldUuid === column.fieldUuid);
   };
-  var isActive = function isActive(id_alias, tableId, tableUuid) {
+  var isActive = function isActive(column, tableItem) {
     return (value === null || value === void 0 ? void 0 : value.filter(function (v) {
-      return isSameSelectedTable(v, tableId, tableUuid) && getSelectedFieldKey(v) === id_alias;
+      return isSameSelectedTable(v, tableItem) && isSameSelectedField(v, column);
     }).length) > 0;
   };
   useEffect(function () {
@@ -168,14 +211,8 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
   };
   var getMatchedColumnByField = function getMatchedColumnByField(field, tableItem) {
     if (!tableItem) return null;
-    var tableId = tableItem.id || '';
-    var tableUuid = tableItem.tableUuid || '';
     return (tableItem.columns || []).find(function (column) {
-      return isSameColumnByIdFirst(_objectSpread(_objectSpread({}, column), {}, {
-        tableId: tableId,
-        tableUuid: tableUuid,
-        datasourceId: tableItem.datasourceId || ''
-      }), field);
+      return isSameSelectedField(field, column);
     }) || null;
   };
   var syncSelectedFieldByColumn = function syncSelectedFieldByColumn(field, column, tableItem) {
@@ -200,7 +237,7 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
   useEffect(function () {
     var syncedValue = (_value || []).map(function (field) {
       var tableItem = data.find(function (item) {
-        return isSameSelectedTable(field, item.id || '', item.tableUuid || '');
+        return isSameSelectedTable(field, item);
       });
       var matchedColumn = getMatchedColumnByField(field, tableItem);
       return matchedColumn ? syncSelectedFieldByColumn(field, matchedColumn, tableItem) : field;
@@ -220,7 +257,12 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
       return;
     }
     var isHas = (value === null || value === void 0 ? void 0 : value.filter(function (v) {
-      return val && isSameSelectedTable(v, val.tableId, val.tableUuid) && isSameColumnByIdFirst(v, val);
+      return val && isSameSelectedTable(v, {
+        id: val.tableId,
+        tableUuid: val.tableUuid,
+        alias: val.tableAlias,
+        datasourceId: val.datasourceId
+      }) && isSameSelectedField(v, val);
     }).length) > 0;
     var _value = value.slice();
     if (tableUuid != selectedTable) {
@@ -228,22 +270,26 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
     }
     if (!isHas && val) {
       _value = _value.filter(function (v) {
-        var hasTableKey = getFieldTableKey(v.tableId, v.tableUuid);
+        var hasTableKey = getFieldTableKey(v.tableId, v.tableUuid, v.tableAlias, v.datasourceId);
         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 !(val && isSameSelectedTable(v, val.tableId, val.tableUuid) && isSameColumnByIdFirst(v, val));
+        return !(val && isSameSelectedTable(v, {
+          id: val.tableId,
+          tableUuid: val.tableUuid,
+          alias: val.tableAlias,
+          datasourceId: val.datasourceId
+        }) && isSameSelectedField(v, val));
       });
     }
     var curTableItem = data.find(function (v) {
       return v.tableUuid === tableUuid;
     });
-    var curTableId = (curTableItem === null || curTableItem === void 0 ? void 0 : curTableItem.id) || '';
     _value = _value.map(function (item2) {
-      if (!isSameSelectedTable(item2, curTableId, tableUuid)) return null;
+      if (!isSameSelectedTable(item2, curTableItem)) return null;
       var matchedColumn = getMatchedColumnByField(item2, curTableItem);
       return matchedColumn ? syncSelectedFieldByColumn(item2, matchedColumn, curTableItem) : null;
     }).filter(Boolean);
@@ -394,7 +440,6 @@ 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, tableId || '', tableUuid);
                 var fieldAlias = isSummarize ? v.fieldAlias || name || '' : v.fieldAlias || '';
                 var fieldName = name || '';
                 var fieldId = v.id || '';
@@ -410,7 +455,7 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
                   className: cx("Sqb-List-section"),
                   children: _jsx("div", {
                     className: cx("Sqb-List-item mx-2", {
-                      active: isActive(columnKey, tableId || '', tableUuid)
+                      active: isActive(v, tableItem)
                     }),
                     onClick: function onClick() {
                       changeValue(tableUuid, {