@gingkoo/pandora-metabase 1.0.137-alpha.3 → 1.0.137-alpha.4

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

@@ -29,7 +29,7 @@ var _helperDom = require("../../../utils/helper-dom");
 var _templateObject;
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 var VisualBox = _styledComponents["default"].div.attrs({
-  className: 'visual-box'
+  className: 'visual-box scroller'
 })(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])([""])));
 var CaseEditor = _react["default"].forwardRef(function (props, ref) {
   var _store$formulaTemplat, _fun$args;

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

@@ -162,7 +162,7 @@ var CaseWhenGroup = function CaseWhenGroup(_ref) {
           className: 'Sqb-CaseBranchIndex',
           children: branchIndex + 1
         }), (0, _jsxRuntime.jsx)("div", {
-          className: 'Sqb-CaseBranch-body',
+          className: 'Sqb-CaseBranch-body scroller-x',
           children: renderBranchContent((0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
             children: [(0, _jsxRuntime.jsxs)("div", {
               className: 'Sqb-CaseSection Sqb-CaseSection-condition',
@@ -233,7 +233,7 @@ var CaseWhenGroup = function CaseWhenGroup(_ref) {
         className: 'Sqb-CaseBranchIndex Sqb-CaseBranchIndex--else',
         "aria-hidden": 'true'
       }), (0, _jsxRuntime.jsx)("div", {
-        className: 'Sqb-CaseBranch-body',
+        className: 'Sqb-CaseBranch-body scroller-x',
         children: renderBranchContent((0, _jsxRuntime.jsxs)("div", {
           className: 'Sqb-CaseSection Sqb-CaseSection-result Sqb-CaseSection-else',
           children: [(0, _jsxRuntime.jsx)("span", {

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

@@ -496,7 +496,7 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
         children: (0, _jsxRuntime.jsxs)("div", {
           className: 'Sqb-FormulaListZoomEditor',
           children: [(0, _jsxRuntime.jsx)("div", {
-            className: 'Sqb-FormulaListZoomEditor-body',
+            className: 'Sqb-FormulaListZoomEditor-body scroller scroller-x',
             children: (0, _jsxRuntime.jsx)("div", {
               className: 'Sqb-NotebookCell Sqb-FormulaListZoomEditor-cell',
               children: (0, _jsxRuntime.jsx)(_CaseWhenGroup["default"], {
@@ -658,7 +658,7 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
         children: (0, _jsxRuntime.jsxs)("div", {
           className: 'Sqb-FormulaListZoomEditor',
           children: [(0, _jsxRuntime.jsx)("div", {
-            className: 'Sqb-FormulaListZoomEditor-body Sqb-FormulaListZoomEditor-body--formulaList',
+            className: 'Sqb-FormulaListZoomEditor-body Sqb-FormulaListZoomEditor-body--formulaList scroller scroller-x',
             children: (0, _jsxRuntime.jsx)(FormulaList, {
               ref: ref,
               value: draftList,

package/lib/cjs/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
@@ -2163,8 +2171,7 @@
   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-FormulaGroup.logic-group
   > .Sqb-LogicGroup-content:has(.Sqb-CaseWhenGroup--nested)
   > .Sqb-NestedFormulaList,
@@ -2195,8 +2202,7 @@
   box-sizing: border-box;
 }
 
-.Sqb-FormulaGroup.logic-group
-  > .Sqb-LogicGroup-content:has(.Sqb-CaseWhenGroup--nested) {
+.Sqb-FormulaGroup.logic-group > .Sqb-LogicGroup-content:has(.Sqb-CaseWhenGroup--nested) {
   flex: 1 1 auto;
 }
 

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

@@ -96,15 +96,15 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
     }
   }, [_value]);
   var getFieldTableKey = function getFieldTableKey(tableId, tableUuid) {
-    return tableId || tableUuid || '';
+    return tableUuid || tableId || '';
   };
   var isSameSelectedTable = function isSameSelectedTable(field, tableId, tableUuid) {
-    if (field.tableId && tableId) {
-      return field.tableId === tableId;
-    }
     if (field.tableUuid && tableUuid) {
       return field.tableUuid === tableUuid;
     }
+    if (field.tableId && tableId) {
+      return field.tableId === tableId;
+    }
     return false;
   };
   var getSelectedFieldKey = function getSelectedFieldKey(field) {

package/lib/cjs/components/metabase/helper.less

@@ -1,3 +1,39 @@
+.scroller::-webkit-scrollbar {
+  width: 4px;
+  height: 100%;
+  background: transparent;
+}
+
+.scroller::-webkit-scrollbar-thumb {
+  background: rgba(100, 100, 100, 0.4);
+  border-radius: 2px;
+
+  &:hover {
+    background: rgba(100, 100, 100, 0.7);
+  }
+}
+
+.scroller-x::-webkit-scrollbar {
+  width: 100%;
+  height: 8px;
+  background: transparent;
+}
+
+.scroller.scroller-x::-webkit-scrollbar {
+  width: 4px;
+  height: 8px;
+  background: transparent;
+}
+
+.scroller-x::-webkit-scrollbar-thumb {
+  background: rgba(100, 100, 100, 0.4);
+  border-radius: 2px;
+
+  &:hover {
+    background: rgba(100, 100, 100, 0.7);
+  }
+}
+
 .mx-4 {
   margin-left: 1rem;
   margin-right: 1rem;

package/lib/cjs/components/metabase/index.js

@@ -24,7 +24,7 @@ var _useProvider = require("../../hooks/use-provider");
 var _storage = _interopRequireDefault(require("../../utils/storage"));
 var _templateObject;
 var VisualBox = _styledComponents["default"].div.attrs({
-  className: 'visual-box'
+  className: 'visual-box scroller'
 })(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])([""])));
 var Metabase = function Metabase(props) {
   var _props$btnText = props.btnText,

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

@@ -996,7 +996,8 @@ var JoinData = function JoinData(props) {
               var _store$preProps3;
               newMeta[index].subquery = newList;
               newMeta[index].table2 = (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, newList[0].table), {}, {
-                alias: newMeta[index].table2.alias || (0, _helper.getAlias)(newList[0].table.name, newMeta, ((_store$preProps3 = store.preProps) === null || _store$preProps3 === void 0 ? void 0 : _store$preProps3.notExistsColumns) || [])
+                alias: newMeta[index].table2.alias || (0, _helper.getAlias)(newList[0].table.name, newMeta, ((_store$preProps3 = store.preProps) === null || _store$preProps3 === void 0 ? void 0 : _store$preProps3.notExistsColumns) || []),
+                tableUuid: newMeta[index].table2.tableUuid || (0, _helper.uuidv4)('table')
               });
               var items = (0, _utils2.getSubColumns)(newList);
               var subQueryTable = newMeta[index].table2;

package/lib/cjs/utils/helper.js

@@ -119,11 +119,7 @@ var isSameColumnByIdFirst = exports.isSameColumnByIdFirst = function isSameColum
   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;
-    }
+    return false;
   }
   var leftFieldId = normalizeId(left.fieldId || left.id);
   var rightFieldId = normalizeId(right.fieldId || right.id);

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);
         }

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
@@ -2163,8 +2171,7 @@
   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-FormulaGroup.logic-group
   > .Sqb-LogicGroup-content:has(.Sqb-CaseWhenGroup--nested)
   > .Sqb-NestedFormulaList,
@@ -2195,8 +2202,7 @@
   box-sizing: border-box;
 }
 
-.Sqb-FormulaGroup.logic-group
-  > .Sqb-LogicGroup-content:has(.Sqb-CaseWhenGroup--nested) {
+.Sqb-FormulaGroup.logic-group > .Sqb-LogicGroup-content:has(.Sqb-CaseWhenGroup--nested) {
   flex: 1 1 auto;
 }
 

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

@@ -90,15 +90,15 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
     }
   }, [_value]);
   var getFieldTableKey = function getFieldTableKey(tableId, tableUuid) {
-    return tableId || tableUuid || '';
+    return tableUuid || tableId || '';
   };
   var isSameSelectedTable = function isSameSelectedTable(field, tableId, tableUuid) {
-    if (field.tableId && tableId) {
-      return field.tableId === tableId;
-    }
     if (field.tableUuid && tableUuid) {
       return field.tableUuid === tableUuid;
     }
+    if (field.tableId && tableId) {
+      return field.tableId === tableId;
+    }
     return false;
   };
   var getSelectedFieldKey = function getSelectedFieldKey(field) {

package/lib/es/components/metabase/helper.less

@@ -1,3 +1,39 @@
+.scroller::-webkit-scrollbar {
+  width: 4px;
+  height: 100%;
+  background: transparent;
+}
+
+.scroller::-webkit-scrollbar-thumb {
+  background: rgba(100, 100, 100, 0.4);
+  border-radius: 2px;
+
+  &:hover {
+    background: rgba(100, 100, 100, 0.7);
+  }
+}
+
+.scroller-x::-webkit-scrollbar {
+  width: 100%;
+  height: 8px;
+  background: transparent;
+}
+
+.scroller.scroller-x::-webkit-scrollbar {
+  width: 4px;
+  height: 8px;
+  background: transparent;
+}
+
+.scroller-x::-webkit-scrollbar-thumb {
+  background: rgba(100, 100, 100, 0.4);
+  border-radius: 2px;
+
+  &:hover {
+    background: rgba(100, 100, 100, 0.7);
+  }
+}
+
 .mx-4 {
   margin-left: 1rem;
   margin-right: 1rem;

package/lib/es/components/metabase/index.js

@@ -17,7 +17,7 @@ import Popup from '../popup';
 import { useStore } from '../../hooks/use-provider';
 import storage from '../../utils/storage';
 var VisualBox = Styled.div.attrs({
-  className: 'visual-box'
+  className: 'visual-box scroller'
 })(_templateObject || (_templateObject = _taggedTemplateLiteral([""])));
 var Metabase = function Metabase(props) {
   var _props$btnText = props.btnText,

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

@@ -991,7 +991,8 @@ var JoinData = function JoinData(props) {
               var _store$preProps3;
               newMeta[index].subquery = newList;
               newMeta[index].table2 = _objectSpread(_objectSpread({}, newList[0].table), {}, {
-                alias: newMeta[index].table2.alias || getAlias(newList[0].table.name, newMeta, ((_store$preProps3 = store.preProps) === null || _store$preProps3 === void 0 ? void 0 : _store$preProps3.notExistsColumns) || [])
+                alias: newMeta[index].table2.alias || getAlias(newList[0].table.name, newMeta, ((_store$preProps3 = store.preProps) === null || _store$preProps3 === void 0 ? void 0 : _store$preProps3.notExistsColumns) || []),
+                tableUuid: newMeta[index].table2.tableUuid || uuidv4('table')
               });
               var items = getSubColumns(newList);
               var subQueryTable = newMeta[index].table2;

package/lib/es/utils/helper.js

@@ -112,11 +112,7 @@ export var isSameColumnByIdFirst = function isSameColumnByIdFirst() {
   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;
-    }
+    return false;
   }
   var leftFieldId = normalizeId(left.fieldId || left.id);
   var rightFieldId = normalizeId(right.fieldId || right.id);

package/lib/es/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/es/utils.js

@@ -40,6 +40,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('|');
+};
+export var 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('|');
+};
 export var getColumnsTables = function getColumnsTables(data) {
   var obj = {};
   data.map(function (v) {
@@ -137,7 +146,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) {
@@ -171,6 +181,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;
+};
 export var 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;
@@ -178,6 +202,9 @@ export var mergeSubQueryColumns = function mergeSubQueryColumns(columns) {
     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;
       }
@@ -754,8 +781,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;
@@ -766,15 +793,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: AtomsTypeEnum.FIELD
+  }, target);
+};
 var _changeAlias = function changeAlias(items, val, type) {
   return items.map(function (v) {
     var nextItem;
@@ -1004,7 +1048,7 @@ export var changeFieldAlias = function changeFieldAlias(list, curObj) {
         if (groupAtoms && groupAtoms.length > 0) {
           group.atoms = _changeAlias(groupAtoms, aliasTarget, AliasType.field);
           group.sql = summarizeToSql(v.group, group).sql;
-        } else if (group.fieldUuid === uuid) {
+        } else if (isAliasTargetSummarizeRecord(group, aliasTarget)) {
           group.fieldAlias = alias;
           group.sql = summarizeToSql(v.group, group).sql;
         }
@@ -1013,7 +1057,7 @@ export var changeFieldAlias = function changeFieldAlias(list, curObj) {
         if (by.atoms && by.atoms.length > 0) {
           by.atoms = _changeAlias(by.atoms, aliasTarget, AliasType.field);
           by.sql = summarizeByToSql(by);
-        } else if (by.fieldUuid === uuid) {
+        } else if (isAliasTargetSummarizeRecord(by, aliasTarget)) {
           by.fieldAlias = alias;
           by.sql = summarizeByToSql(by);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gingkoo/pandora-metabase",
-  "version": "1.0.137-alpha.3",
+  "version": "1.0.137-alpha.4",
   "description": "",
   "main": "lib/es/index.js",
   "module": "lib/es/index.js",