@gingkoo/pandora-metabase 1.0.136 → 1.0.137

package/lib/cjs/utils.js

@@ -8,9 +8,10 @@ exports.changeTableAlias = exports.changeFieldAlias = exports.changeExistsCopyFi
 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.isValidSQLAlias = isValidSQLAlias;
-exports.patchData = exports.normalizeLegacySummarizeForSave = exports.metaIsCheck = void 0;
+exports.patchData = exports.normalizeLegacySummarizeForSave = exports.metaIsCheck = exports.mergeSubQueryColumns = void 0;
 exports.reassembleByUnion = reassembleByUnion;
 exports.splitByUnion = splitByUnion;
+exports.syncSubQueryFieldReferences = void 0;
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/typeof"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectWithoutProperties"));
 var _createForOfIteratorHelper2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/createForOfIteratorHelper"));
@@ -49,19 +50,42 @@ var getMetaTabels = exports.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]));
+};
 var getColumnsTables = exports.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] = (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, obj[_datasourceId]), {}, (0, _defineProperty2["default"])({}, id + alias, columns));
+    obj[_datasourceId] = (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, obj[_datasourceId]), {}, (0, _defineProperty2["default"])({}, id + alias, columns.map(function (column) {
+      if (!isSubQueryOutputColumn(column)) return column;
+      return (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, 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;
 };
@@ -116,6 +140,240 @@ var getHelper = exports.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 (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, 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((0, _toConsumableArray2["default"])(identityParts)).join('|');
+};
+var isSameSubQueryOutputColumn = function isSameSubQueryOutputColumn(oldCol, newCol) {
+  var oldIdentity = getSubQueryOutputIdentity(oldCol);
+  var newIdentity = getSubQueryOutputIdentity(newCol);
+  return Boolean(oldIdentity && newIdentity && oldIdentity === newIdentity);
+};
+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;
+  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 (0, _helper2.isSameColumnByIdFirst)(oldCol, newCol);
+    });
+    var nextCol = (0, _objectSpread6["default"])((0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, 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) || (0, _helper2.uuidv4)('field'),
+      select: isSelectFields || Boolean(existingCol === null || existingCol === void 0 ? void 0 : existingCol.select) || Boolean(newCol.select)
+    }, newColumn.summarizeType ? (0, _defineProperty2["default"])({}, 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 (!(0, _helper2.isSameTableByIdFirst)(table, fieldTable)) {
+    return null;
+  }
+  var normalizeColumnTable = function normalizeColumnTable(column) {
+    return (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, column), {}, {
+      datasourceId: table.datasourceId || '',
+      tableId: table.id || '',
+      tableName: table.name || '',
+      tableAlias: table.alias || '',
+      tableUuid: table.tableUuid || ''
+    });
+  };
+  var matchedColumn = columns.find(function (column) {
+    return (0, _helper2.isSameColumnByIdFirst)(normalizeColumnTable(column), field);
+  });
+  if (matchedColumn) return matchedColumn;
+  var oldMatchedColumn = oldColumns.find(function (column) {
+    return (0, _helper2.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 === _types.AtomsTypeEnum.FIELD) {
+      var matchedColumn = getSubQueryMatchedColumn(item, table, columns, oldColumns);
+      if (!matchedColumn) return item;
+      nextItem = (0, _objectSpread6["default"])((0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, 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 === _types.AtomsTypeEnum.JOIN_DEFAULT || item.type === _types.AtomsTypeEnum.EXPRESSION) {
+      nextItem = (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, item), {}, {
+        lhs: _syncSubQueryFieldItems(item.lhs, table, columns, oldColumns),
+        rhs: _syncSubQueryFieldItems(item.rhs, table, columns, oldColumns)
+      });
+    } else if (item.type === _types.AtomsTypeEnum.FORMULA) {
+      nextItem = (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, item), {}, {
+        args: _syncSubQueryFieldItems(item.args || [], table, columns, oldColumns)
+      });
+    } else if (item.type === _types.AtomsTypeEnum.COLLECTION) {
+      nextItem = (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, item), {}, {
+        list: _syncSubQueryFieldItems(item.list || [], table, columns, oldColumns)
+      });
+    } else if (item.type === _types.AtomsTypeEnum.CASE_WHEN) {
+      nextItem = (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, item), {}, {
+        caseAtoms: _syncSubQueryFieldItems(item.caseAtoms || [], table, columns, oldColumns),
+        whenClauses: (item.whenClauses || []).map(function (clause) {
+          return (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, 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 === _types.AtomsTypeEnum.AND_OR) {
+      var hasBinarySides = Array.isArray(item.leftAtoms) || Array.isArray(item.rightAtoms);
+      nextItem = (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, 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);
+  });
+};
+var syncSubQueryFieldReferences = exports.syncSubQueryFieldReferences = function syncSubQueryFieldReferences(list, table, columns) {
+  var oldColumns = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : [];
+  return (0, _cloneDeep3["default"])(list).map(function (meta) {
+    var _meta$expressions, _meta$filter, _meta$sort;
+    if (meta.type === _enum.TypeEnum.joinData && (_meta$expressions = meta.expressions) !== null && _meta$expressions !== void 0 && _meta$expressions.length) {
+      return (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, meta), {}, {
+        expressions: _syncSubQueryFieldItems(meta.expressions, table, columns, oldColumns)
+      });
+    }
+    if (meta.type === _enum.TypeEnum.customColumn) {
+      return (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, meta), {}, {
+        customColumn: meta.customColumn.map(function (item) {
+          var _item$formulaList;
+          return (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, 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 === _enum.TypeEnum.summarize) {
+      var nextMeta = (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, 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 = (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, group), {}, {
+            atoms: atoms
+          });
+          return atoms !== null && atoms !== void 0 && atoms.length ? (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, nextGroup), {}, {
+            sql: (0, _helper.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 = (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, by), {}, {
+            atoms: atoms
+          });
+          return atoms !== null && atoms !== void 0 && atoms.length ? (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, nextBy), {}, {
+            sql: (0, _helper.summarizeByToSql)(nextBy)
+          }) : nextBy;
+        })
+      });
+      return nextMeta;
+    }
+    if (meta.type === _enum.TypeEnum.filter && (_meta$filter = meta.filter) !== null && _meta$filter !== void 0 && _meta$filter.length) {
+      return (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, meta), {}, {
+        filter: _syncSubQueryFieldItems(meta.filter, table, columns, oldColumns)
+      });
+    }
+    if (meta.type === _enum.TypeEnum.sort && (_meta$sort = meta.sort) !== null && _meta$sort !== void 0 && _meta$sort.length) {
+      return (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, meta), {}, {
+        sort: meta.sort.map(function (sort) {
+          return (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, sort), {}, {
+            expression: _syncSubQueryFieldItems(sort.expression, table, columns, oldColumns)
+          });
+        })
+      });
+    }
+    return meta;
+  });
+};
 var getSubColumns = exports.getSubColumns = function getSubColumns(metaList) {
   var obj = {
     metaKey: -1,
@@ -143,29 +401,25 @@ var getSubColumns = exports.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 (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, v), {}, {
-          name: v.name || v.quotes,
-          name_zh: v.name_zh || v.quotes,
+        return normalizeSubQueryColumn((0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, 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) || _enum.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 (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, v), {}, {
-          name: v.name || v.quotes,
-          name_zh: v.name_zh || v.quotes,
+        return normalizeSubQueryColumn((0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, 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) || _enum.SQL_COLUMN_TYPE.FLOAT,
           special_type: '',
           select: true
-        });
+        }));
       }));
     }
     data = [_data];
@@ -299,12 +553,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) {
@@ -316,7 +570,10 @@ var getSelectAtomText = function getSelectAtomText(item) {
 var _getAtomDisplayText = function getAtomDisplayText(item) {
   if (!item) return '';
   if (item.type === _types.AtomsTypeEnum.FIELD) {
-    return item.fieldAlias || item.fieldName || '';
+    if (item.tableId === _helper.SummarizeAlias) {
+      return item.fieldAlias || item.fieldName || '';
+    }
+    return item.fieldName || item.fieldAlias || '';
   }
   if (item.type === _types.AtomsTypeEnum.CASE_WHEN) {
     return buildCaseWhenQuotes(item);
@@ -546,7 +803,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 === _types.AtomsTypeEnum.EXISTS || v.type === _types.AtomsTypeEnum.NOT_EXISTS) {
       nextItem = (0, _objectSpread6["default"])({}, v);
@@ -643,8 +908,8 @@ var changeTableAlias = exports.changeTableAlias = function changeTableAlias(list
     }
     if (v.type === _enum.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
@@ -728,7 +993,8 @@ var changeFieldAlias = exports.changeFieldAlias = function changeFieldAlias(list
     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 = (0, _cloneDeep3["default"])(list);
   return (newList === null || newList === void 0 ? void 0 : newList.map(function (v) {
@@ -978,7 +1244,17 @@ var buildSqlQuery = exports.buildSqlQuery = function buildSqlQuery() {
     sql = _transformSql.sql;
   return "".concat(typeName, "(").concat(sql, ") ");
 };
-var _isError = exports.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 = 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;
@@ -1005,11 +1281,12 @@ var _isError = exports.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 !(0, _helper2.isSameColumnByIdFirst)((0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, field), {}, {
             datasourceId: _datasourceId,
@@ -1018,13 +1295,17 @@ var _isError = exports.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 (0, _helper2.isSameColumnByIdFirst)((0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, 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/lib/es/components/dialog/select-column/index.js

@@ -12,7 +12,7 @@ import { ChangeType } from '../../../store/types';
 import { __ } from '../../../locale';
 import { NotSelectIcon, SelectIcon } from '../../icons';
 import { useStore } from '../../../hooks/use-provider';
-import { getColumnIdFirstKey, isSameColumnByIdName, uuidv4 } from '../../../utils/helper';
+import { getColumnIdFirstKey, isSameColumnByIdFirst, uuidv4 } from '../../../utils/helper';
 import { changeFieldAlias, isValidSQLAlias } from '../../../utils';
 import { SearchIcon } from '../../icons';
 var SelectColumn = function SelectColumn(_ref) {
@@ -37,6 +37,18 @@ var SelectColumn = function SelectColumn(_ref) {
     _useState6 = _slicedToArray(_useState5, 2),
     filterVal = _useState6[0],
     setFilterVal = _useState6[1];
+  useEffect(function () {
+    setOriginList(function (currentList) {
+      return data.map(function (item) {
+        var existingItem = currentList.find(function (current) {
+          return isSameColumnByIdFirst(current, item);
+        });
+        return _objectSpread(_objectSpread(_objectSpread({}, existingItem || {}), item), {}, {
+          fieldUuid: item.fieldUuid || (existingItem === null || existingItem === void 0 ? void 0 : existingItem.fieldUuid) || uuidv4('field')
+        });
+      });
+    });
+  }, [data]);
   useEffect(function () {
     var newList = cloneDeep(originList.slice());
     setColumns(newList.filter(function (v) {
@@ -73,7 +85,7 @@ var SelectColumn = function SelectColumn(_ref) {
     var originalData = cloneDeep(originList);
     var mergedColumns = originalData.map(function (item) {
       var match = columns.find(function (col) {
-        return isSameColumnByIdName(col, item);
+        return isSameColumnByIdFirst(col, item);
       });
       return match ? cloneDeep(match) : item;
     });

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

@@ -6,6 +6,7 @@ import { useEffect, useState } from 'react';
 import { Empty } from '@gingkoo/pandora';
 import { Button } from '@gingkoo/pandora';
 import cloneDeep from 'lodash/cloneDeep';
+import isEqual from 'lodash/isEqual';
 import cx from 'classnames';
 import { ColumnsPopupThemeEnum, SQL_GROUP_TYPE } from '../../../store/enum';
 import { SummarizeAlias } from '../../../store/helper';
@@ -13,7 +14,7 @@ import { AtomsTypeEnum } from '../../../store/types';
 import { __ } from '../../../locale';
 import { NUMBER_GROUP, DATE_GROUP } from '../const';
 import { useStore } from '../../../hooks/use-provider';
-import { isSameColumnByIdFirst, isSameColumnByIdName, replaceTpl, mergeNameAlias, uuidv4 } from '../../../utils/helper';
+import { isSameColumnByIdFirst, replaceTpl, mergeNameAlias, uuidv4 } from '../../../utils/helper';
 import { SearchIcon, TableIcon, CircleIcon, LetterAaIcon, CalendarIcon, WellIcon, ForeignKeyIcon, UpArrowIcon2, DownArrowIcon2 } from '../../icons';
 export var DATE_GROUP_MAP = new Map([['分', '分'], ['时', '时'], ['天', '天'], ['周', '周'], ['月', '月'], ['季度', '季度'], ['一小时内的分钟数', '一小时内的分钟数'], ['一天内的小时数', '一天内的小时数'], ['一周内的天数', '一周内的天数'], ['一月内的天数', '一月内的天数'], ['一年内的天数', '一年内的天数'], ['一年的星期数', '一年的星期数'], ['一年的月数', '一年的月数']]);
 export var NUMBER_GROUP_MAP = new Map([['自动间隔', '自动分组'], ['10个刻度间隔', '10 刻度间隔'], ['间隔50', '50 刻度间隔'], ['间隔100', '100 刻度间隔'], ['无间隔', '']]);
@@ -103,12 +104,12 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
   var getSelectedFieldKey = function getSelectedFieldKey(field) {
     if (!field) return '';
     var tableKey = getFieldTableKey(field.tableId, field.tableUuid);
-    var fieldKey = "".concat(field.fieldId || '', "|").concat(field.fieldName || '');
+    var fieldKey = field.fieldId || field.fieldUuid || field.fieldName || '';
     return "".concat(tableKey, "|").concat(fieldKey);
   };
   var getColumnKey = function getColumnKey(column, isSummarizeColumn, tableId, tableUuid) {
     var tableKey = getFieldTableKey(tableId, tableUuid);
-    var fieldKey = "".concat(column.id || '', "|").concat(column.name || '');
+    var fieldKey = column.id || column.fieldId || column.fieldUuid || column.name || '';
     return "".concat(tableKey, "|").concat(fieldKey);
   };
   var isActive = function isActive(id_alias, tableId, tableUuid) {
@@ -157,6 +158,58 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
       return v.tableId === SummarizeAlias ? v.fieldAlias : v.fieldName;
     }).join(' || ');
   };
+  var getFieldAliasByColumn = function getFieldAliasByColumn(field, column) {
+    if (field.tableId === SummarizeAlias) {
+      return column.fieldAlias || column.name || '';
+    }
+    if (column.fieldAlias) return column.fieldAlias;
+    if (field.fieldAlias === field.fieldName || field.fieldAlias === column.name) return '';
+    return field.fieldAlias || '';
+  };
+  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);
+    }) || null;
+  };
+  var syncSelectedFieldByColumn = function syncSelectedFieldByColumn(field, column, tableItem) {
+    return _objectSpread(_objectSpread(_objectSpread({}, field), {}, {
+      tableName: (tableItem === null || tableItem === void 0 ? void 0 : tableItem.name) || field.tableName || '',
+      tableId: (tableItem === null || tableItem === void 0 ? void 0 : tableItem.id) || field.tableId || '',
+      tableNameZh: (tableItem === null || tableItem === void 0 ? void 0 : tableItem.name_zh) || field.tableNameZh || '',
+      tableAlias: (tableItem === null || tableItem === void 0 ? void 0 : tableItem.alias) || field.tableAlias || '',
+      tableUuid: (tableItem === null || tableItem === void 0 ? void 0 : tableItem.tableUuid) || field.tableUuid || '',
+      datasourceName: (tableItem === null || tableItem === void 0 ? void 0 : tableItem.datasourceName) || field.datasourceName || '',
+      datasourceId: (tableItem === null || tableItem === void 0 ? void 0 : tableItem.datasourceId) || field.datasourceId || ''
+    }, 'name' in field ? {
+      name: column.name || field.name || ''
+    } : {}), {}, {
+      fieldName: column.name || field.fieldName || '',
+      fieldId: column.id || column.fieldId || field.fieldId || '',
+      fieldNameZh: field.fieldNameZh || column.name_zh || '',
+      fieldAlias: getFieldAliasByColumn(field, column),
+      fieldUuid: column.fieldUuid || field.fieldUuid || ''
+    });
+  };
+  useEffect(function () {
+    var syncedValue = (_value || []).map(function (field) {
+      var tableItem = data.find(function (item) {
+        return isSameSelectedTable(field, item.id || '', item.tableUuid || '');
+      });
+      var matchedColumn = getMatchedColumnByField(field, tableItem);
+      return matchedColumn ? syncSelectedFieldByColumn(field, matchedColumn, tableItem) : field;
+    });
+    setValue(syncedValue);
+    if (!isEqual(syncedValue, _value || [])) {
+      onSelect === null || onSelect === void 0 || onSelect(syncedValue, getQuotes(syncedValue));
+    }
+  }, [data, _value]);
   var changeValue = function changeValue(tableUuid, val) {
     if (!multiple) {
       var _data = val ? [val] : [];
@@ -167,7 +220,7 @@ 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) && isSameColumnByIdName(v, val);
+      return val && isSameSelectedTable(v, val.tableId, val.tableUuid) && isSameColumnByIdFirst(v, val);
     }).length) > 0;
     var _value = value.slice();
     if (tableUuid != selectedTable) {
@@ -182,26 +235,18 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
       _value.push(val);
     } else {
       _value = _value.filter(function (v) {
-        return !(val && isSameSelectedTable(v, val.tableId, val.tableUuid) && isSameColumnByIdName(v, val));
+        return !(val && isSameSelectedTable(v, val.tableId, val.tableUuid) && isSameColumnByIdFirst(v, val));
       });
     }
     var curTableItem = data.find(function (v) {
       return v.tableUuid === tableUuid;
     });
     var curTableId = (curTableItem === null || curTableItem === void 0 ? void 0 : curTableItem.id) || '';
-    var curTableColumn = (curTableItem === null || curTableItem === void 0 ? void 0 : curTableItem.columns) || [];
-    _value = _value.filter(function (item2) {
-      return isSameSelectedTable(item2, curTableId, tableUuid) && curTableColumn.some(function (item1) {
-        if (item2.tableId === SummarizeAlias) {
-          return isSameColumnByIdName(item2, item1);
-        }
-        return isSameColumnByIdFirst(_objectSpread(_objectSpread({}, item1), {}, {
-          tableId: curTableId,
-          tableUuid: tableUuid,
-          datasourceId: (curTableItem === null || curTableItem === void 0 ? void 0 : curTableItem.datasourceId) || ''
-        }), item2);
-      });
-    });
+    _value = _value.map(function (item2) {
+      if (!isSameSelectedTable(item2, curTableId, tableUuid)) return null;
+      var matchedColumn = getMatchedColumnByField(item2, curTableItem);
+      return matchedColumn ? syncSelectedFieldByColumn(item2, matchedColumn, curTableItem) : null;
+    }).filter(Boolean);
     setValue(_value);
     setSelectedTable(tableUuid);
     setCurTable(tableUuid);

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

@@ -8,6 +8,7 @@ import { __ } from '../../../locale';
 import { useStore } from '../../../hooks/use-provider';
 import { splitByUnion } from '../../../utils';
 import DiffViewer from '../../dialog/diff-viewer';
+import { getTopLayerZIndex } from '../../../utils/helper-dom';
 var Header = function Header(props) {
   var meta = props.meta,
     groupIndex = props.groupIndex,
@@ -28,6 +29,7 @@ var Header = function Header(props) {
             oldCode = _yield$store$getModul.oldCode;
             newCode = _yield$store$getModul.newCode;
             o = Modal2.openModal({
+              zIndex: getTopLayerZIndex() + 1,
               title: '差异对比',
               transparentMask: true,
               content: _jsx(DiffViewer, {