@gingkoo/pandora-metabase 1.0.136 → 1.0.137

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

@@ -43,9 +43,10 @@ var Filter = function Filter(props) {
       if (prevGroupBy !== null && prevGroupBy !== void 0 && (_prevGroupBy$group = prevGroupBy.group) !== null && _prevGroupBy$group !== void 0 && _prevGroupBy$group.length) {
         _data.columns = _data.columns.concat(prevGroupBy.group.map(function (v) {
           return _objectSpread(_objectSpread({}, v), {}, {
-            name: v.name || v.quotes,
+            name: v.fieldAlias || v.name || v.quotes,
             name_zh: v.name_zh || v.quotes,
             id: v.id || v.fieldId,
+            fieldAlias: '',
             database_type: (v === null || v === void 0 ? void 0 : v.database_type) || SQL_COLUMN_TYPE.FLOAT,
             sql: v.sql,
             special_type: '',
@@ -56,9 +57,10 @@ var Filter = function Filter(props) {
       if (prevGroupBy !== null && prevGroupBy !== void 0 && (_prevGroupBy$by = prevGroupBy.by) !== null && _prevGroupBy$by !== void 0 && _prevGroupBy$by.length) {
         _data.columns = _data.columns.concat(prevGroupBy.by.map(function (v) {
           return _objectSpread(_objectSpread({}, v), {}, {
-            name: v.name || v.quotes,
+            name: v.fieldAlias || v.name || v.quotes,
             name_zh: v.name_zh || v.quotes,
             id: v.id || v.fieldId,
+            fieldAlias: '',
             database_type: (v === null || v === void 0 ? void 0 : v.database_type) || SQL_COLUMN_TYPE.FLOAT,
             sql: v.sql,
             special_type: '',

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

@@ -11,13 +11,12 @@ import cx from 'classnames';
 import { Button, Tooltip, Input, Modal2, Modal, Toast, Dropdown, InputNumber } from '@gingkoo/pandora';
 import { FfPlus, FfLine, Repeat, RelatedWork } from '@gingkoo/pandora-icons';
 import Metabase from '../../index';
-import isEqual from 'lodash/isEqual';
 import cloneDeep from 'lodash/cloneDeep';
-import { uuidv4, getAlias, mergeNameAlias, isSameColumnByIdFirst, isSameTableByIdFirst } from '../../utils/helper';
+import { uuidv4, getAlias, mergeNameAlias, isSameTableByIdFirst } from '../../utils/helper';
 import { getTopLayerZIndex } from '../../utils/helper-dom';
 import { getConstantLabel } from '../dialog/formula-list/utils';
 import { __ } from '../../locale';
-import { findIndex, getSubColumns } from '../../utils';
+import { findIndex, getSubColumns, mergeSubQueryColumns, syncSubQueryFieldReferences } from '../../utils';
 import { TypeEnum, ColumnsPopupThemeEnum, JoinEnum, SQL_COLUMN_TYPE } from '../../store/enum';
 import { AtomsTypeEnum, ChangeType, FormulaTypeEnum } from '../../store/types';
 import { SummarizeAlias } from '../../store/helper';
@@ -952,7 +951,6 @@ var JoinData = function JoinData(props) {
     var childModalZIndex = getTopLayerZIndex() + 1;
     var newMeta = cloneDeep(store.metaList[groupIndex].list);
     var index = findIndex(store.metaList[groupIndex].list, meta);
-    var oldList = cloneDeep(newMeta[index].subquery);
     var _toolbar = subToolbar || toolbar;
     var o = Modal2.openModal({
       zIndex: childModalZIndex,
@@ -968,21 +966,22 @@ var JoinData = function JoinData(props) {
           onOk: function onOk(newList) {
             try {
               var _store$preProps3;
-              if (isEqual(newList, oldList)) {
-                o.close();
-                return;
-              }
               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) || [])
               });
               var items = getSubColumns(newList);
+              var subQueryTable = newMeta[index].table2;
               var newColumns = items.flatMap(function (item) {
                 return item.columns.map(function (column) {
+                  var columnMeta = column;
                   return _objectSpread(_objectSpread({}, column), {}, {
-                    tableId: column.tableId || column.id || item.id,
-                    tableUuid: column.tableUuid || item.tableUuid,
-                    datasourceId: column.datasourceId || item.datasourceId || ''
+                    tableId: subQueryTable.id || item.id || column.tableId || column.id,
+                    tableUuid: subQueryTable.tableUuid || item.tableUuid || column.tableUuid,
+                    tableName: subQueryTable.name || item.name || columnMeta.tableName || '',
+                    tableAlias: subQueryTable.alias || item.alias || columnMeta.tableAlias || '',
+                    datasourceId: subQueryTable.datasourceId || item.datasourceId || column.datasourceId || '',
+                    datasourceName: subQueryTable.datasourceName || item.datasourceName || column.datasourceName || ''
                   });
                 });
               }).map(function (v) {
@@ -990,15 +989,10 @@ var JoinData = function JoinData(props) {
                   select: false
                 });
               });
-              newMeta[index].columns = newColumns.map(function (newCol) {
-                var existingCol = newMeta[index].columns.find(function (oldCol) {
-                  return isSameColumnByIdFirst(oldCol, newCol);
-                });
-                var _column = existingCol ? existingCol : newCol;
-                _column.select = store.isSelectFields || _column.select;
-                return _column;
-              });
+              var oldColumns = newMeta[index].columns;
+              newMeta[index].columns = mergeSubQueryColumns(newColumns, oldColumns, store.isSelectFields);
               initExpressions(newMeta);
+              newMeta = syncSubQueryFieldReferences(newMeta, newMeta[index].table2, newMeta[index].columns, oldColumns);
               store.setMeta(newMeta, groupIndex, {
                 obj: newList,
                 type: ChangeType.subQuery

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

@@ -12,12 +12,11 @@ import { __ } from '../../locale';
 import { ChangeType } from '../../store/types';
 import { Tooltip, Button, Modal, Modal2, Input, Toast } from '@gingkoo/pandora';
 import Metabase from '../../index';
-import { uuidv4, getAlias, isSameColumnByIdFirst, isSameTableByIdFirst } from '../../utils/helper';
+import { uuidv4, getAlias, isSameTableByIdFirst } from '../../utils/helper';
 import { getTopLayerZIndex } from '../../utils/helper-dom';
-import { changeTableAlias, getSubColumns, isValidSQLAlias, isExistsError } from '../../utils';
+import { changeTableAlias, getSubColumns, mergeSubQueryColumns, isValidSQLAlias, isExistsError, syncSubQueryFieldReferences } from '../../utils';
 import { RelatedWork } from '@gingkoo/pandora-icons';
 import cloneDeep from 'lodash/cloneDeep';
-import isEqual from 'lodash/isEqual';
 import ItemName from './components/item-name';
 import { SelectTable, SelectColumn } from '../dialog';
 import Wrapper from './components/Wrapper';
@@ -189,7 +188,6 @@ var TableData = function TableData(props) {
     var childModalZIndex = getTopLayerZIndex() + 1;
     var newMetaList = store.metaList[groupIndex].list.slice()[0];
     var newMeta = store.metaList[groupIndex].list.slice();
-    var oldList = cloneDeep(newMetaList.subquery);
     var _toolbar = subToolbar || toolbar;
     var o = Modal2.openModal({
       zIndex: childModalZIndex,
@@ -204,22 +202,23 @@ var TableData = function TableData(props) {
           value: cloneDeep(val),
           onOk: function onOk(newList) {
             try {
-              if (isEqual(newList, oldList)) {
-                o.close();
-                return;
-              }
               newMetaList.subquery = newList;
               newMetaList.table = _objectSpread(_objectSpread({}, newList[0].table), {}, {
                 alias: newMetaList.table.alias || getAlias(newList[0].table.name, newMeta),
                 tableUuid: newMetaList.table.tableUuid || uuidv4('table')
               });
               var items = getSubColumns(newList);
+              var subQueryTable = newMetaList.table;
               var newColumns = items.flatMap(function (item) {
                 return item.columns.map(function (column) {
+                  var columnMeta = column;
                   return _objectSpread(_objectSpread({}, column), {}, {
-                    tableId: column.tableId || column.id || item.id,
-                    tableUuid: column.tableUuid || item.tableUuid,
-                    datasourceId: column.datasourceId || item.datasourceId || ''
+                    tableId: subQueryTable.id || item.id || column.tableId || column.id,
+                    tableUuid: subQueryTable.tableUuid || item.tableUuid || column.tableUuid,
+                    tableName: subQueryTable.name || item.name || columnMeta.tableName || '',
+                    tableAlias: subQueryTable.alias || item.alias || columnMeta.tableAlias || '',
+                    datasourceId: subQueryTable.datasourceId || item.datasourceId || column.datasourceId || '',
+                    datasourceName: subQueryTable.datasourceName || item.datasourceName || column.datasourceName || ''
                   });
                 });
               }).map(function (v) {
@@ -227,16 +226,11 @@ var TableData = function TableData(props) {
                   select: false
                 });
               });
-              newMetaList.columns = newColumns.map(function (newCol) {
-                var existingCol = newMetaList.columns.find(function (oldCol) {
-                  return isSameColumnByIdFirst(oldCol, newCol);
-                });
-                var _column = existingCol ? existingCol : newCol;
-                _column.select = store.isSelectFields || _column.select;
-                return _column;
-              });
+              var oldColumns = newMetaList.columns;
+              newMetaList.columns = mergeSubQueryColumns(newColumns, oldColumns, store.isSelectFields);
               var newMetas = store.metaList[groupIndex].list.slice();
               newMetas[0] = newMetaList;
+              newMetas = syncSubQueryFieldReferences(newMetas, newMetaList.table, newMetaList.columns, oldColumns);
               store.setMeta(newMetas, groupIndex, {
                 obj: newList,
                 type: ChangeType.subQuery

package/lib/es/utils.d.ts

@@ -21,6 +21,8 @@ interface HelperResultType {
     };
 }
 export declare const getHelper: (list: MetaListType[], item: MetaListType) => HelperResultType;
+export declare const mergeSubQueryColumns: (columns: MetaData_ColumnsType[], oldColumns?: MetaData_ColumnsType[], isSelectFields?: boolean) => MetaData_ColumnsType[];
+export declare const syncSubQueryFieldReferences: (list: MetaListType[], table: MetaData_TableType, columns: MetaData_ColumnsType[], oldColumns?: MetaData_ColumnsType[]) => MetaListType[];
 export declare const getSubColumns: (metaList: any) => DataType[];
 export declare function isValidSQLAlias(str: string): boolean;
 export declare const changeTableAlias: (list: MetaListType[] | [], curObj: Pick<MetaData_TableType, "tableUuid" | "alias">) => MetaListType[];
@@ -31,7 +33,7 @@ export declare const getObjTem: (arr: any[]) => any;
 export declare const patchData: (metas: MetaListType[], constantList?: any, formulaTemplates?: any) => MetaListType[];
 export declare function reassembleByUnion(target?: any[]): any[];
 export declare const buildSqlQuery: (data: MetaListType[] | undefined, type: string) => string;
-export declare const isError: (item: AtomsItem | AtomsItem[], data: DataType[]) => boolean;
+export declare const isError: (item: AtomsItem | AtomsItem[], data?: DataType[]) => boolean;
 export declare function containsSubset(root: unknown, target: Record<string, unknown>): boolean;
 export declare const isExistsError: (meta: any[], errorList: any[]) => boolean;
 export declare const changeCopyField: (items: AtomsItem[], data: any[]) => AtomsItem[];

package/lib/es/utils.js

@@ -8,7 +8,7 @@ var _excluded = ["list"];
 import { __, isEn } from './locale';
 import { TypeEnum, SQL_COLUMN_TYPE } from './store/enum';
 import { AtomsTypeEnum } from './store/types';
-import { summarizeByToSql, summarizeToSql } from './store/helper';
+import { SummarizeAlias, summarizeByToSql, summarizeToSql } from './store/helper';
 import { transformSql } from './utils/transformSql';
 import { isSameColumnByIdFirst, isSameTableByIdFirst, uuidv4 } from './utils/helper';
 import cloneDeep from 'lodash/cloneDeep';
@@ -36,19 +36,42 @@ export var getMetaTabels = function getMetaTabels(data) {
   });
   return obj;
 };
+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]));
+};
 export var getColumnsTables = function getColumnsTables(data) {
   var obj = {};
   data.map(function (v) {
     var _v$datasourceId = v.datasourceId,
       datasourceId = _v$datasourceId === void 0 ? 'source' : _v$datasourceId,
+      _v$datasourceName = v.datasourceName,
+      datasourceName = _v$datasourceName === void 0 ? '' : _v$datasourceName,
       _v$id = v.id,
       id = _v$id === void 0 ? '' : _v$id,
       _v$alias = v.alias,
       alias = _v$alias === void 0 ? '' : _v$alias,
+      _v$name = v.name,
+      name = _v$name === void 0 ? '' : _v$name,
+      _v$name_zh = v.name_zh,
+      name_zh = _v$name_zh === void 0 ? '' : _v$name_zh,
+      _v$tableUuid = v.tableUuid,
+      tableUuid = _v$tableUuid === void 0 ? '' : _v$tableUuid,
       _v$columns = v.columns,
       columns = _v$columns === void 0 ? [] : _v$columns;
     var _datasourceId = datasourceId || 'source';
-    obj[_datasourceId] = _objectSpread(_objectSpread({}, obj[_datasourceId]), {}, _defineProperty({}, id + alias, columns));
+    obj[_datasourceId] = _objectSpread(_objectSpread({}, obj[_datasourceId]), {}, _defineProperty({}, id + alias, columns.map(function (column) {
+      if (!isSubQueryOutputColumn(column)) return column;
+      return _objectSpread(_objectSpread({}, column), {}, {
+        datasourceId: _datasourceId,
+        datasourceName: datasourceName || column.datasourceName || '',
+        tableId: id || column.tableId || '',
+        tableName: name || column.tableName || column.table || '',
+        tableNameZh: name_zh || column.tableNameZh || '',
+        tableAlias: alias || column.tableAlias || '',
+        tableUuid: tableUuid || column.tableUuid || ''
+      });
+    })));
   });
   return obj;
 };
@@ -103,6 +126,240 @@ export var getHelper = function getHelper(list, item) {
     nextItem: nextItem
   };
 };
+var getSummarizeOutputName = function getSummarizeOutputName(record) {
+  return record.fieldAlias || record.name || record.quotes || '';
+};
+var normalizeSubQueryColumn = function normalizeSubQueryColumn(column) {
+  if (!(column !== null && column !== void 0 && column.summarizeType)) return column;
+  var outputName = getSummarizeOutputName(column);
+  return _objectSpread(_objectSpread({}, column), {}, {
+    name: outputName,
+    name_zh: column.name_zh || column.quotes || '',
+    id: column.id || column.fieldId || outputName,
+    realName: column.realName || column.name || '',
+    fieldAlias: ''
+  });
+};
+var getOuterSubQueryFieldAlias = function getOuterSubQueryFieldAlias(existingCol, newCol) {
+  var existingAlias = (existingCol === null || existingCol === void 0 ? void 0 : existingCol.fieldAlias) || '';
+  if (!existingAlias) return '';
+  var oldName = (existingCol === null || existingCol === void 0 ? void 0 : existingCol.name) || '';
+  var newName = (newCol === null || newCol === void 0 ? void 0 : newCol.name) || '';
+  if (existingAlias === oldName || existingAlias === newName) return '';
+  return existingAlias;
+};
+var getSyncedSubQueryFieldAlias = function getSyncedSubQueryFieldAlias(item, matchedColumn) {
+  var columnAlias = matchedColumn.fieldAlias || '';
+  if (columnAlias) return columnAlias;
+  var existingAlias = item.fieldAlias || '';
+  if (!existingAlias) return '';
+  var oldName = item.fieldName || '';
+  var newName = matchedColumn.name || '';
+  if (existingAlias === oldName || existingAlias === newName) return '';
+  return existingAlias;
+};
+var getSubQueryOutputIdentity = function getSubQueryOutputIdentity(column) {
+  var _column$sql$split;
+  if (!(column !== null && column !== void 0 && column.summarizeType)) return '';
+  var sqlBase = typeof column.sql === 'string' ? ((_column$sql$split = column.sql.split(/\s+AS\s+/i)) === null || _column$sql$split === void 0 || (_column$sql$split = _column$sql$split[0]) === null || _column$sql$split === void 0 ? void 0 : _column$sql$split.trim()) || '' : '';
+  var identityParts = [column.condition, column.fieldId, sqlBase || column.realName].filter(Boolean);
+  if (!identityParts.length) return '';
+  return [column.summarizeType].concat(_toConsumableArray(identityParts)).join('|');
+};
+var isSameSubQueryOutputColumn = function isSameSubQueryOutputColumn(oldCol, newCol) {
+  var oldIdentity = getSubQueryOutputIdentity(oldCol);
+  var newIdentity = getSubQueryOutputIdentity(newCol);
+  return Boolean(oldIdentity && newIdentity && oldIdentity === newIdentity);
+};
+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;
+  return columns.map(function (newCol) {
+    var newColumn = newCol;
+    var existingCol = oldColumns.find(function (oldCol) {
+      var oldColumn = oldCol;
+      if (oldColumn.fieldUuid && newColumn.fieldUuid) {
+        return oldColumn.fieldUuid === newColumn.fieldUuid;
+      }
+      var oldFieldId = oldColumn.fieldId || oldColumn.id;
+      var newFieldId = newColumn.fieldId || newColumn.id;
+      if (oldFieldId && newFieldId) {
+        return oldFieldId === newFieldId;
+      }
+      if (isSameSubQueryOutputColumn(oldCol, newCol)) {
+        return true;
+      }
+      return isSameColumnByIdFirst(oldCol, newCol);
+    });
+    var nextCol = _objectSpread(_objectSpread(_objectSpread({}, existingCol || {}), newCol), {}, {
+      name_zh: existingCol ? existingCol.name_zh || '' : newColumn.name_zh || '',
+      fieldAlias: getOuterSubQueryFieldAlias(existingCol, newCol),
+      fieldUuid: newCol.fieldUuid || (existingCol === null || existingCol === void 0 ? void 0 : existingCol.fieldUuid) || uuidv4('field'),
+      select: isSelectFields || Boolean(existingCol === null || existingCol === void 0 ? void 0 : existingCol.select) || Boolean(newCol.select)
+    }, newColumn.summarizeType ? _defineProperty({}, SUB_QUERY_OUTPUT_COLUMN_KEY, true) : {});
+    return nextCol;
+  });
+};
+var getSubQueryMatchedColumn = function getSubQueryMatchedColumn(field, table, columns) {
+  var oldColumns = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : [];
+  var fieldTable = {
+    datasourceId: field.datasourceId,
+    id: field.tableId,
+    name: field.tableName,
+    alias: field.tableAlias,
+    tableUuid: field.tableUuid
+  };
+  if (!isSameTableByIdFirst(table, fieldTable)) {
+    return null;
+  }
+  var normalizeColumnTable = function normalizeColumnTable(column) {
+    return _objectSpread(_objectSpread({}, column), {}, {
+      datasourceId: table.datasourceId || '',
+      tableId: table.id || '',
+      tableName: table.name || '',
+      tableAlias: table.alias || '',
+      tableUuid: table.tableUuid || ''
+    });
+  };
+  var matchedColumn = columns.find(function (column) {
+    return isSameColumnByIdFirst(normalizeColumnTable(column), field);
+  });
+  if (matchedColumn) return matchedColumn;
+  var oldMatchedColumn = oldColumns.find(function (column) {
+    return isSameColumnByIdFirst(normalizeColumnTable(column), field);
+  });
+  if (!oldMatchedColumn) return null;
+  return columns.find(function (column) {
+    return isSameSubQueryOutputColumn(oldMatchedColumn, column);
+  }) || columns[oldColumns.indexOf(oldMatchedColumn)] || null;
+};
+var _syncSubQueryFieldItems = function syncSubQueryFieldItems() {
+  var items = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+  var table = arguments.length > 1 ? arguments[1] : undefined;
+  var columns = arguments.length > 2 ? arguments[2] : undefined;
+  var oldColumns = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : [];
+  return items.map(function (item) {
+    var nextItem;
+    if (item.type === AtomsTypeEnum.FIELD) {
+      var matchedColumn = getSubQueryMatchedColumn(item, table, columns, oldColumns);
+      if (!matchedColumn) return item;
+      nextItem = _objectSpread(_objectSpread(_objectSpread({}, item), {}, {
+        tableName: table.name || item.tableName || '',
+        tableNameZh: table.name_zh || item.tableNameZh || '',
+        tableId: table.id || item.tableId || '',
+        tableAlias: table.alias || item.tableAlias || '',
+        tableUuid: table.tableUuid || item.tableUuid || '',
+        datasourceName: table.datasourceName || item.datasourceName || '',
+        datasourceId: table.datasourceId || item.datasourceId || ''
+      }, 'name' in item ? {
+        name: matchedColumn.name || item.name || ''
+      } : {}), {}, {
+        fieldName: matchedColumn.name || item.fieldName || '',
+        fieldNameZh: item.fieldNameZh || matchedColumn.name_zh || '',
+        fieldAlias: getSyncedSubQueryFieldAlias(item, matchedColumn),
+        fieldId: matchedColumn.id || matchedColumn.fieldId || item.fieldId || '',
+        fieldUuid: matchedColumn.fieldUuid || item.fieldUuid || ''
+      });
+    } else if (item.type === AtomsTypeEnum.JOIN_DEFAULT || item.type === AtomsTypeEnum.EXPRESSION) {
+      nextItem = _objectSpread(_objectSpread({}, item), {}, {
+        lhs: _syncSubQueryFieldItems(item.lhs, table, columns, oldColumns),
+        rhs: _syncSubQueryFieldItems(item.rhs, table, columns, oldColumns)
+      });
+    } else if (item.type === AtomsTypeEnum.FORMULA) {
+      nextItem = _objectSpread(_objectSpread({}, item), {}, {
+        args: _syncSubQueryFieldItems(item.args || [], table, columns, oldColumns)
+      });
+    } else if (item.type === AtomsTypeEnum.COLLECTION) {
+      nextItem = _objectSpread(_objectSpread({}, item), {}, {
+        list: _syncSubQueryFieldItems(item.list || [], table, columns, oldColumns)
+      });
+    } else if (item.type === AtomsTypeEnum.CASE_WHEN) {
+      nextItem = _objectSpread(_objectSpread({}, item), {}, {
+        caseAtoms: _syncSubQueryFieldItems(item.caseAtoms || [], table, columns, oldColumns),
+        whenClauses: (item.whenClauses || []).map(function (clause) {
+          return _objectSpread(_objectSpread({}, clause), {}, {
+            whenAtoms: _syncSubQueryFieldItems(clause.whenAtoms || [], table, columns, oldColumns),
+            thenAtoms: _syncSubQueryFieldItems(clause.thenAtoms || [], table, columns, oldColumns)
+          });
+        }),
+        elseAtoms: _syncSubQueryFieldItems(item.elseAtoms || [], table, columns, oldColumns)
+      });
+    } else if (item.type === AtomsTypeEnum.AND_OR) {
+      var hasBinarySides = Array.isArray(item.leftAtoms) || Array.isArray(item.rightAtoms);
+      nextItem = _objectSpread(_objectSpread({}, item), hasBinarySides ? {
+        atoms: undefined,
+        leftAtoms: _syncSubQueryFieldItems(item.leftAtoms || [], table, columns, oldColumns),
+        rightAtoms: _syncSubQueryFieldItems(item.rightAtoms || [], table, columns, oldColumns)
+      } : {
+        atoms: _syncSubQueryFieldItems(item.atoms || [], table, columns, oldColumns)
+      });
+    } else {
+      nextItem = item;
+    }
+    return syncAtomQuotes(nextItem);
+  });
+};
+export var syncSubQueryFieldReferences = function syncSubQueryFieldReferences(list, table, columns) {
+  var oldColumns = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : [];
+  return cloneDeep(list).map(function (meta) {
+    var _meta$expressions, _meta$filter, _meta$sort;
+    if (meta.type === TypeEnum.joinData && (_meta$expressions = meta.expressions) !== null && _meta$expressions !== void 0 && _meta$expressions.length) {
+      return _objectSpread(_objectSpread({}, meta), {}, {
+        expressions: _syncSubQueryFieldItems(meta.expressions, table, columns, oldColumns)
+      });
+    }
+    if (meta.type === TypeEnum.customColumn) {
+      return _objectSpread(_objectSpread({}, meta), {}, {
+        customColumn: meta.customColumn.map(function (item) {
+          var _item$formulaList;
+          return _objectSpread(_objectSpread({}, item), {}, {
+            formulaList: (_item$formulaList = item.formulaList) !== null && _item$formulaList !== void 0 && _item$formulaList.length ? _syncSubQueryFieldItems(item.formulaList, table, columns, oldColumns) : item.formulaList
+          });
+        })
+      });
+    }
+    if (meta.type === TypeEnum.summarize) {
+      var nextMeta = _objectSpread(_objectSpread({}, meta), {}, {
+        group: meta.group.map(function (group) {
+          var _group$atoms;
+          var atoms = (_group$atoms = group.atoms) !== null && _group$atoms !== void 0 && _group$atoms.length ? _syncSubQueryFieldItems(group.atoms, table, columns, oldColumns) : group.atoms;
+          var nextGroup = _objectSpread(_objectSpread({}, group), {}, {
+            atoms: atoms
+          });
+          return atoms !== null && atoms !== void 0 && atoms.length ? _objectSpread(_objectSpread({}, nextGroup), {}, {
+            sql: summarizeToSql(meta.group, nextGroup).sql
+          }) : nextGroup;
+        }),
+        by: meta.by.map(function (by) {
+          var _by$atoms;
+          var atoms = (_by$atoms = by.atoms) !== null && _by$atoms !== void 0 && _by$atoms.length ? _syncSubQueryFieldItems(by.atoms, table, columns, oldColumns) : by.atoms;
+          var nextBy = _objectSpread(_objectSpread({}, by), {}, {
+            atoms: atoms
+          });
+          return atoms !== null && atoms !== void 0 && atoms.length ? _objectSpread(_objectSpread({}, nextBy), {}, {
+            sql: summarizeByToSql(nextBy)
+          }) : nextBy;
+        })
+      });
+      return nextMeta;
+    }
+    if (meta.type === TypeEnum.filter && (_meta$filter = meta.filter) !== null && _meta$filter !== void 0 && _meta$filter.length) {
+      return _objectSpread(_objectSpread({}, meta), {}, {
+        filter: _syncSubQueryFieldItems(meta.filter, table, columns, oldColumns)
+      });
+    }
+    if (meta.type === TypeEnum.sort && (_meta$sort = meta.sort) !== null && _meta$sort !== void 0 && _meta$sort.length) {
+      return _objectSpread(_objectSpread({}, meta), {}, {
+        sort: meta.sort.map(function (sort) {
+          return _objectSpread(_objectSpread({}, sort), {}, {
+            expression: _syncSubQueryFieldItems(sort.expression, table, columns, oldColumns)
+          });
+        })
+      });
+    }
+    return meta;
+  });
+};
 export var getSubColumns = function getSubColumns(metaList) {
   var obj = {
     metaKey: -1,
@@ -130,29 +387,25 @@ export var getSubColumns = function getSubColumns(metaList) {
     if (prevGroupBy !== null && prevGroupBy !== void 0 && (_prevGroupBy$group = prevGroupBy.group) !== null && _prevGroupBy$group !== void 0 && _prevGroupBy$group.length) {
       _data.columns = _data.columns.concat(prevGroupBy.group.map(function (v) {
         var _v$sql;
-        return _objectSpread(_objectSpread({}, v), {}, {
-          name: v.name || v.quotes,
-          name_zh: v.name_zh || v.quotes,
+        return normalizeSubQueryColumn(_objectSpread(_objectSpread({}, v), {}, {
           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]) || '',
           database_type: (v === null || v === void 0 ? void 0 : v.database_type) || SQL_COLUMN_TYPE.FLOAT,
           special_type: '',
           select: true
-        });
+        }));
       }));
     }
     if (prevGroupBy !== null && prevGroupBy !== void 0 && (_prevGroupBy$by = prevGroupBy.by) !== null && _prevGroupBy$by !== void 0 && _prevGroupBy$by.length) {
       _data.columns = _data.columns.concat(prevGroupBy.by.map(function (v) {
         var _v$sql2;
-        return _objectSpread(_objectSpread({}, v), {}, {
-          name: v.name || v.quotes,
-          name_zh: v.name_zh || v.quotes,
+        return normalizeSubQueryColumn(_objectSpread(_objectSpread({}, v), {}, {
           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]) || '',
           database_type: (v === null || v === void 0 ? void 0 : v.database_type) || SQL_COLUMN_TYPE.FLOAT,
           special_type: '',
           select: true
-        });
+        }));
       }));
     }
     data = [_data];
@@ -286,12 +539,12 @@ var getExpressionConditionText = function getExpressionConditionText(condition)
 var getSelectAtomText = function getSelectAtomText(item) {
   var displayField = item.displayField || 'value';
   var getOptionText = function getOptionText(value) {
-    var _ref, _option$displayField;
+    var _ref2, _option$displayField;
     var option = (item.options || []).find(function (currentOption) {
       return currentOption.value === value;
     });
     if (!option) return value || '';
-    return String((_ref = (_option$displayField = option[displayField]) !== null && _option$displayField !== void 0 ? _option$displayField : option.value) !== null && _ref !== void 0 ? _ref : '');
+    return String((_ref2 = (_option$displayField = option[displayField]) !== null && _option$displayField !== void 0 ? _option$displayField : option.value) !== null && _ref2 !== void 0 ? _ref2 : '');
   };
   if (Array.isArray(item.val)) {
     return item.val.map(function (currentValue) {
@@ -303,7 +556,10 @@ var getSelectAtomText = function getSelectAtomText(item) {
 var _getAtomDisplayText = function getAtomDisplayText(item) {
   if (!item) return '';
   if (item.type === AtomsTypeEnum.FIELD) {
-    return item.fieldAlias || item.fieldName || '';
+    if (item.tableId === SummarizeAlias) {
+      return item.fieldAlias || item.fieldName || '';
+    }
+    return item.fieldName || item.fieldAlias || '';
   }
   if (item.type === AtomsTypeEnum.CASE_WHEN) {
     return buildCaseWhenQuotes(item);
@@ -533,7 +789,15 @@ var _changeAlias = function changeAlias(items, val, type) {
         nextItem.tableAlias = val.alias;
       }
       if (type === AliasType.field && isAliasTargetField(v, val)) {
-        nextItem.fieldAlias = val.alias;
+        if (val.aliasAsFieldName && !isSameAliasTargetTable(v, val)) {
+          nextItem.fieldName = val.alias;
+          nextItem.fieldAlias = '';
+          if ('name' in nextItem) {
+            nextItem.name = val.alias;
+          }
+        } else {
+          nextItem.fieldAlias = val.alias;
+        }
       }
     } else if (v.type === AtomsTypeEnum.EXISTS || v.type === AtomsTypeEnum.NOT_EXISTS) {
       nextItem = _objectSpread({}, v);
@@ -630,8 +894,8 @@ export var changeTableAlias = function changeTableAlias(list, curObj) {
     }
     if (v.type === TypeEnum.customColumn) {
       v.customColumn.map(function (item) {
-        var _item$formulaList;
-        if (item !== null && item !== void 0 && item.formulaList && ((_item$formulaList = item.formulaList) === null || _item$formulaList === void 0 ? void 0 : _item$formulaList.length) > 0) {
+        var _item$formulaList2;
+        if (item !== null && item !== void 0 && item.formulaList && ((_item$formulaList2 = item.formulaList) === null || _item$formulaList2 === void 0 ? void 0 : _item$formulaList2.length) > 0) {
           item.formulaList = _changeAlias(item.formulaList, {
             uuid: tableUuid,
             alias: alias
@@ -715,7 +979,8 @@ export var changeFieldAlias = function changeFieldAlias(list, curObj) {
     tableId: tableId || (firstData === null || firstData === void 0 || (_firstData$table = firstData.table) === null || _firstData$table === void 0 ? void 0 : _firstData$table.id),
     tableName: table || (firstData === null || firstData === void 0 || (_firstData$table2 = firstData.table) === null || _firstData$table2 === void 0 ? void 0 : _firstData$table2.name),
     tableUuid: tableUuid || (firstData === null || firstData === void 0 || (_firstData$table3 = firstData.table) === null || _firstData$table3 === void 0 ? void 0 : _firstData$table3.tableUuid),
-    datasourceId: datasourceId || (firstData === null || firstData === void 0 || (_firstData$table4 = firstData.table) === null || _firstData$table4 === void 0 ? void 0 : _firstData$table4.datasourceId)
+    datasourceId: datasourceId || (firstData === null || firstData === void 0 || (_firstData$table4 = firstData.table) === null || _firstData$table4 === void 0 ? void 0 : _firstData$table4.datasourceId),
+    aliasAsFieldName: Boolean(curObj.summarizeType)
   };
   var newList = cloneDeep(list);
   return (newList === null || newList === void 0 ? void 0 : newList.map(function (v) {
@@ -966,7 +1231,17 @@ export var buildSqlQuery = function buildSqlQuery() {
     sql = _transformSql.sql;
   return "".concat(typeName, "(").concat(sql, ") ");
 };
-var _isError = function isError(item, data) {
+var hasLoadedColumnData = function hasLoadedColumnData() {
+  var data = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+  return data.some(function (table) {
+    return Array.isArray(table === null || table === void 0 ? void 0 : table.columns) && table.columns.length > 0;
+  });
+};
+var _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;
@@ -993,11 +1268,12 @@ var _isError = function isError(item, data) {
     }
     if (_datasourceId === 'source') {
       var _tables$_datasourceId;
-      if (!(tables !== null && tables !== void 0 && (_tables$_datasourceId = tables[_datasourceId]) !== null && _tables$_datasourceId !== void 0 && _tables$_datasourceId[tableId + tableAlias])) {
+      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 {
-        var _tables$_datasourceId2;
-        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 !isSameColumnByIdFirst(_objectSpread(_objectSpread({}, field), {}, {
             datasourceId: _datasourceId,
@@ -1006,13 +1282,17 @@ var _isError = function isError(item, data) {
         });
       }
     } 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) {
+      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 isSameColumnByIdFirst(_objectSpread(_objectSpread({}, v), {}, {
           datasourceId: _datasourceId,
           tableId: tableId
         }), item);
-      })) !== null && _tables$_datasourceId3 !== void 0 ? _tables$_datasourceId3 : false;
+      })) !== null && _fields$some !== void 0 ? _fields$some : false;
       return !hasField;
     }
   }

package/package.json

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