@gingkoo/pandora-metabase 1.0.117 → 1.0.119

package/lib/cjs/utils.js

@@ -8,7 +8,7 @@ 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.metaIsCheck = void 0;
+exports.patchData = exports.normalizeLegacySummarizeForSave = exports.metaIsCheck = void 0;
 exports.reassembleByUnion = reassembleByUnion;
 exports.splitByUnion = splitByUnion;
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/typeof"));
@@ -52,7 +52,6 @@ var getMetaTabels = exports.getMetaTabels = function getMetaTabels(data) {
 var getColumnsTables = exports.getColumnsTables = function getColumnsTables(data) {
   var obj = {};
   data.map(function (v) {
-    // data也可直接是下拉框
     var _v$datasourceId = v.datasourceId,
       datasourceId = _v$datasourceId === void 0 ? 'source' : _v$datasourceId,
       _v$id = v.id,
@@ -71,13 +70,11 @@ var getHelper = exports.getHelper = function getHelper(list, item) {
     return v.type;
   });
   var curIndex = list.indexOf(item);
-  var leftTypes = types.slice(0, curIndex); // 当前元素上面的所有元素 （不包含自己）
-  var rightTypes = types.slice(curIndex + 1); // 当前元素下面的所有元素 （不包含自己）
+  var leftTypes = types.slice(0, curIndex);
+  var rightTypes = types.slice(curIndex + 1);
   var leftList = list.slice(0, curIndex);
   var rightList = list.slice(curIndex + 1);
-  var topList = leftList; // 包含自己
-  // let prevType = list[curIndex - 1]?.type || '';
-  // let nextType = list[curIndex + 1]?.type || '';
+  var topList = leftList;
   var prevItem = list[curIndex - 1] || {};
   var nextItem = list[curIndex + 1] || {};
   var ExistAboveGroupBy = false;
@@ -119,16 +116,13 @@ var getHelper = exports.getHelper = function getHelper(list, item) {
     nextItem: nextItem
   };
 };
-// 获取子查询的字段
 var getSubColumns = exports.getSubColumns = function getSubColumns(metaList) {
   var obj = {
     metaKey: -1,
     type: _enum.TypeEnum.customColumn,
     customColumn: [{
       name: '',
-      // 用户起的别名
       fieldUuid: ''
-      // formula: '', // 公式}];
     }]
   };
   var _getHelper = getHelper([].concat((0, _toConsumableArray2["default"])(metaList), [obj]), obj),
@@ -153,9 +147,7 @@ var getSubColumns = exports.getSubColumns = function getSubColumns(metaList) {
           name: v.name || v.quotes,
           name_zh: v.name_zh || v.quotes,
           id: v.id || v.fieldId,
-          // fieldUuid: uuidv4('field'),
           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]) || '',
-          // name_zh: '',
           database_type: (v === null || v === void 0 ? void 0 : v.database_type) || _enum.SQL_COLUMN_TYPE.FLOAT,
           special_type: '',
           select: true
@@ -170,7 +162,6 @@ var getSubColumns = exports.getSubColumns = function getSubColumns(metaList) {
           name_zh: v.name_zh || v.quotes,
           id: v.id || v.fieldId,
           realName: ((_v$sql2 = v.sql) === null || _v$sql2 === void 0 || (_v$sql2 = _v$sql2.split(' AS ')) === null || _v$sql2 === void 0 ? void 0 : _v$sql2[1]) || '',
-          // name_zh: '',
           database_type: (v === null || v === void 0 ? void 0 : v.database_type) || _enum.SQL_COLUMN_TYPE.FLOAT,
           special_type: '',
           select: true
@@ -180,20 +171,15 @@ var getSubColumns = exports.getSubColumns = function getSubColumns(metaList) {
     data = [_data];
     var joinData = prevList.filter(function (v) {
       return v.type === _enum.TypeEnum.joinData;
-    })
-    // @ts-ignore
-    .filter(function (v) {
+    }).filter(function (v) {
       return v && v.table2.name;
     });
     if (joinData.length) {
-      data = data.concat(
-      // @ts-ignore
-      joinData.map(function (v) {
+      data = data.concat(joinData.map(function (v) {
         var columns = v.columns.map(function (column) {
           return (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, column), {}, {
             name: column.fieldAlias || column.name,
             fieldAlias: ''
-            // fieldUuid: uuidv4('field'),
           });
         });
         return {
@@ -204,14 +190,12 @@ var getSubColumns = exports.getSubColumns = function getSubColumns(metaList) {
       }));
     }
   } else {
-    // @ts-ignore
     data = metaList.slice().map(function (v) {
       if (v.type === _enum.TypeEnum.data) {
         var columns = v.columns.map(function (column) {
           return (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, column), {}, {
             name: column.fieldAlias || column.name,
             fieldAlias: ''
-            // fieldUuid: uuidv4('field'),
           });
         }).filter(function (item) {
           return item.select;
@@ -226,7 +210,6 @@ var getSubColumns = exports.getSubColumns = function getSubColumns(metaList) {
           return (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, column), {}, {
             name: column.fieldAlias || column.name,
             fieldAlias: ''
-            // fieldUuid: uuidv4('field'),
           });
         }).filter(function (item) {
           return item.select;
@@ -265,20 +248,11 @@ var getSubColumns = exports.getSubColumns = function getSubColumns(metaList) {
   }
   return data;
 };
-// data = 'data',
-// joinData = 'joinData',
-// permissionTable = 'permissionTable', // 权限表
-// customColumn = 'customColumn',
-// filter = 'filter',
-// summarize = 'summarize',
-// sort = 'sort',
-// rowLimit = 'rowLimit',
 var AliasType;
 (function (AliasType) {
   AliasType["table"] = "table";
   AliasType["field"] = "field";
 })(AliasType || (AliasType = {}));
-// 修改别名
 var _changeAlias = function changeAlias(items, val, type) {
   return items.map(function (v) {
     if (v.type === _types.AtomsTypeEnum.JOIN_DEFAULT || v.type === _types.AtomsTypeEnum.EXPRESSION) {
@@ -381,13 +355,26 @@ var changeTableAlias = exports.changeTableAlias = function changeTableAlias(list
       v.group.map(function (group) {
         if (group.tableUuid === tableUuid) {
           group.alias = alias;
+          var groupAtoms = group.atoms;
+          if (groupAtoms && groupAtoms.length > 0) {
+            group.atoms = _changeAlias(groupAtoms, {
+              uuid: tableUuid,
+              alias: alias
+            }, AliasType.table);
+          }
           group.sql = (0, _helper.summarizeToSql)(v.group, group).sql;
         }
       });
       v.by.map(function (by) {
         if (by.tableUuid === tableUuid) {
           by.alias = alias;
-          by.sql = "".concat(by.alias, ".").concat(by.realName || by.name);
+          if (by.atoms && by.atoms.length > 0) {
+            by.atoms = _changeAlias(by.atoms, {
+              uuid: tableUuid,
+              alias: alias
+            }, AliasType.table);
+          }
+          by.sql = (0, _helper.summarizeByToSql)(by);
         }
       });
     }
@@ -399,12 +386,6 @@ var changeTableAlias = exports.changeTableAlias = function changeTableAlias(list
         }, AliasType.table);
       }
     }
-    // if ((v as MetaData | MetaJoin).subquery) {
-    //   (v as MetaData | MetaJoin).subquery = changeTableAlias(
-    //     (v as MetaData | MetaJoin).subquery || [],
-    //     curObj,
-    //   );
-    // }
     return v;
   })) || [];
 };
@@ -438,13 +419,26 @@ var changeFieldAlias = exports.changeFieldAlias = function changeFieldAlias(list
       v.group.map(function (group) {
         if (group.fieldUuid === uuid) {
           group.fieldAlias = alias;
+          var groupAtoms = group.atoms;
+          if (groupAtoms && groupAtoms.length > 0) {
+            group.atoms = _changeAlias(groupAtoms, {
+              uuid: uuid,
+              alias: alias
+            }, AliasType.field);
+          }
           group.sql = (0, _helper.summarizeToSql)(v.group, group).sql;
         }
       });
       v.by.map(function (by) {
         if (by.fieldUuid === uuid) {
           by.fieldAlias = alias;
-          by.sql = "".concat(by.alias, ".").concat(by.realName || by.name);
+          if (by.atoms && by.atoms.length > 0) {
+            by.atoms = _changeAlias(by.atoms, {
+              uuid: uuid,
+              alias: alias
+            }, AliasType.field);
+          }
+          by.sql = (0, _helper.summarizeByToSql)(by);
         }
       });
     }
@@ -479,7 +473,6 @@ function splitByUnion(data) {
   while (i < original.length) {
     var item = original[i];
     if (item.type === 'group') {
-      // group.list 中每一项原样推入结果
       var _iterator = (0, _createForOfIteratorHelper2["default"])(item.list),
         _step;
       try {
@@ -496,7 +489,6 @@ function splitByUnion(data) {
     } else if (item.type === 'union') {
       var list = item.list,
         otehr = (0, _objectWithoutProperties2["default"])(item, _excluded);
-      // 查找下一个 group，并将其 list 转成 subquery
       var nextItem = original[i + 1];
       if (nextItem && nextItem.type === 'group') {
         result.push((0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, otehr), {}, {
@@ -515,6 +507,66 @@ function splitByUnion(data) {
   }
   return result;
 }
+var summarizeNoArgumentConditions = ['总行数', '累积行数'];
+var createSummarizeFieldAtom = function createSummarizeFieldAtom(record) {
+  if (!record.name) return null;
+  return {
+    fieldName: record.name,
+    fieldNameZh: record.name_zh || '',
+    fieldAlias: '',
+    fieldUuid: (0, _helper2.uuidv4)('field'),
+    fieldId: record.id || record.fieldId || '',
+    tableName: record.table || '',
+    tableNameZh: '',
+    tableId: record.tableId || '',
+    tableAlias: record.alias || '',
+    tableUuid: record.tableUuid || '',
+    datasourceName: record.datasourceName || '',
+    datasourceId: record.datasourceId || '',
+    type: _types.AtomsTypeEnum.FIELD
+  };
+};
+var normalizeSummarizeItemForSave = function normalizeSummarizeItemForSave(record) {
+  var _record$atoms;
+  if ((_record$atoms = record.atoms) !== null && _record$atoms !== void 0 && _record$atoms.length || summarizeNoArgumentConditions.includes(record.condition)) {
+    return record;
+  }
+  var fieldAtom = createSummarizeFieldAtom(record);
+  if (!fieldAtom) return record;
+  return (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, record), {}, {
+    atoms: [fieldAtom]
+  });
+};
+var normalizeSummarizeByForSave = function normalizeSummarizeByForSave(record) {
+  var _record$atoms2;
+  if ((_record$atoms2 = record.atoms) !== null && _record$atoms2 !== void 0 && _record$atoms2.length) return record;
+  var fieldAtom = createSummarizeFieldAtom(record);
+  if (!fieldAtom) return record;
+  return (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, record), {}, {
+    atoms: [fieldAtom]
+  });
+};
+var _normalizeLegacySummarizeForSave = exports.normalizeLegacySummarizeForSave = function normalizeLegacySummarizeForSave() {
+  var metas = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+  return metas.map(function (meta) {
+    if (meta.type === _enum.TypeEnum.summarize) {
+      return (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, meta), {}, {
+        group: meta.group.map(function (item) {
+          return normalizeSummarizeItemForSave(item);
+        }),
+        by: meta.by.map(function (item) {
+          return normalizeSummarizeByForSave(item);
+        })
+      });
+    }
+    if (meta.type === _enum.TypeEnum.union) {
+      return (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, meta), {}, {
+        subquery: _normalizeLegacySummarizeForSave(meta.subquery || [])
+      });
+    }
+    return meta;
+  });
+};
 var getObjTem = exports.getObjTem = function getObjTem(arr) {
   var obj = {};
   arr === null || arr === void 0 || arr.map(function (v) {
@@ -529,12 +581,8 @@ var getObjTem = exports.getObjTem = function getObjTem(arr) {
 var patchData = exports.patchData = function patchData(metas) {
   var constantList = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
   var formulaTemplates = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
-  // return metas;
   var mainTable = metas[0] || {};
   var version = (mainTable === null || mainTable === void 0 ? void 0 : mainTable.patchVersion) || '';
-  // if (version != '1.0.0') {
-  //   return patchMetas(metas);
-  // }
   if (version != '1.1.0') {
     return (0, _patch.patchMetas)(metas, constantList, getObjTem(formulaTemplates));
   }
@@ -546,7 +594,6 @@ function reassembleByUnion() {
   var result = [];
   var i = 0;
   var len = target.length;
-  // 如果没有任何 union，直接放入一个 group.list
   var hasUnion = target.some(function (item) {
     return item.type === 'union';
   });
@@ -557,11 +604,9 @@ function reassembleByUnion() {
       list: (0, _toConsumableArray2["default"])(target)
     }];
   }
-  // 否则正常处理
   while (i < len) {
     var item = target[i];
     if (item.type !== 'union') {
-      // 收集连续非 union 的 item，统一放入一个 group.list
       var groupList = [];
       while (i < len && target[i].type !== 'union') {
         groupList.push(target[i]);
@@ -574,7 +619,6 @@ function reassembleByUnion() {
       });
     } else {
       var _item$union;
-      // 处理 union
       result.push({
         type: 'union',
         name: 'union',
@@ -584,39 +628,11 @@ function reassembleByUnion() {
       var subquery = item.subquery || [];
       var convertedSubquery = reassembleByUnion(subquery);
       result.push.apply(result, (0, _toConsumableArray2["default"])(convertedSubquery));
-      i++; // 跳过当前 union
+      i++;
     }
   }
   return result;
 }
-// export const buildSqlQuery = (data?: MetaListType[]): string => {
-//   if (!data || data.length === 0) return '';
-//   let sqlClauses: string[] = ['not exitis ( '];
-//   data.forEach((item) => {
-//     if (item.type === TypeEnum.data) {
-//       const meta = item as MetaData;
-//       const tableName = meta.table.name;
-//       const alias = meta.table.alias ? `AS ${meta.table.alias}` : '';
-//       const dataSource = meta.table.datasourceName;
-//       sqlClauses.push(`SELECT 1 FROM ${dataSource}.${tableName} ${alias}`);
-//     }
-//        if (item.type === TypeEnum.joinData) {
-//       const meta = item as MetaJoin;
-//       const table1 = meta.table1.alias ? meta.table1.alias : meta.table1.name;
-//       const table2 = `${meta.table2.datasourceName}.${meta.table2.name}`;
-//       const alias2 = meta.table2.alias ? meta.table2.alias : '';
-//       joins.push(`LEFT JOIN ${table2} ${alias2} ON ${table1}.${meta.columns[0]?.name} = ${alias2}.${meta.columns[0]?.name}`);
-//        }
-//     if (item.type === TypeEnum.filter) {
-//       const filterStrings = (item as MetaFilter).filter.map((f) => f.quotes).filter(Boolean); // 排除空条件
-//       if (filterStrings.length > 0) {
-//         sqlClauses.push(`WHERE ${filterStrings.join(' AND ')}`);
-//       }
-//     }
-//   });
-//   // 简单拼接 SQL 片段
-//   return sqlClauses.join(' ') + ' )' + ';';
-// };
 var buildSqlQuery = exports.buildSqlQuery = function buildSqlQuery() {
   var data = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
   var type = arguments.length > 1 ? arguments[1] : undefined;
@@ -631,124 +647,17 @@ var buildSqlQuery = exports.buildSqlQuery = function buildSqlQuery() {
   var _transformSql = (0, _transformSql2.transformSql)(data),
     sql = _transformSql.sql;
   return "".concat(typeName, "(").concat(sql, ") ");
-  // if (!data || data.length === 0) return '';
-  // const name = type === AtomsTypeEnum.EXISTS ? 'EXISTS' : 'NOT EXISTS';
-  // let sqlClauses: string[] = [`${name} (`];
-  // let tables: string[] = [];
-  // let joins: string[] = [];
-  // let wheres: string[] = [];
-  // data?.forEach((item) => {
-  //   if (item.type === TypeEnum.data) {
-  //     const meta = item as MetaData;
-  //     const tableName = `${meta.table.name}`;
-  //     const alias = meta.table.alias ? ` AS ${meta.table.alias}` : '';
-  //     tables.push(`${tableName}${alias}`);
-  //   }
-  //   if (item.type === TypeEnum.joinData) {
-  //     const meta = item as MetaJoin;
-  //     const table2Name = `${meta.table2.name}`;
-  //     const alias2 = meta.table2.alias ? ` AS ${meta.table2.alias}` : '';
-  //     const table2 = `${meta.table2.alias || meta.table2.name}`;
-  //     const table1 = `${meta.table1.alias || meta.table1.name}`;
-  //     joins.push(`LEFT JOIN ${table2Name}${alias2} ON `);
-  //     if (Array.isArray(item.expressions) && item.expressions?.length > 0) {
-  //       item.expressions?.forEach((expression) => {
-  //         let left = '',
-  //           right = '';
-  //         if (expression.type === AtomsTypeEnum.JOIN_DEFAULT) {
-  //           if (expression.lhs[0].type === AtomsTypeEnum.FIELD) {
-  //             left = expression.lhs
-  //               .map((v) => {
-  //                 if (v.type === AtomsTypeEnum.FIELD) {
-  //                   return v.fieldName;
-  //                 } else {
-  //                   return '';
-  //                 }
-  //               })
-  //               .join(' || ');
-  //           } else if (
-  //             expression.lhs[0].type === AtomsTypeEnum.CONSTANT ||
-  //             expression.lhs[0].type === AtomsTypeEnum.INPUT_STRING
-  //           ) {
-  //             left = expression.lhs[0].val;
-  //           }
-  //           if (expression.rhs[0].type === AtomsTypeEnum.FIELD) {
-  //             right = expression.rhs
-  //               .map((v) => {
-  //                 if (v.type === AtomsTypeEnum.FIELD) {
-  //                   return v.fieldName;
-  //                 } else {
-  //                   return '';
-  //                 }
-  //               })
-  //               .join(' || ');
-  //           } else if (
-  //             expression.rhs[0].type === AtomsTypeEnum.CONSTANT ||
-  //             expression.rhs[0].type === AtomsTypeEnum.INPUT_STRING
-  //           ) {
-  //             right = expression.rhs[0].val;
-  //           }
-  //         }
-  //         joins.push(`${left} = ${right}`);
-  //       });
-  //     }
-  //   }
-  //   if (item.type === TypeEnum.filter) {
-  //     const filterStrings = (item as MetaFilter).filter
-  //       .map((f) => {
-  //         if (f.type === AtomsTypeEnum.FIELD) {
-  //           return f.fieldName;
-  //         } else if (
-  //           f.type === AtomsTypeEnum.EXPRESSION ||
-  //           f.type === AtomsTypeEnum.EXISTS ||
-  //           f.type === AtomsTypeEnum.NOT_EXISTS ||
-  //           f.type === AtomsTypeEnum.FORMULA ||
-  //           f.type === AtomsTypeEnum.COLLECTION
-  //         ) {
-  //           return f.quotes;
-  //         } else if (f.type === AtomsTypeEnum.JOIN_DEFAULT) {
-  //           return '';
-  //         } else if (
-  //           f.type === AtomsTypeEnum.INPUT_NUMBER ||
-  //           f.type === AtomsTypeEnum.INPUT_NUMBER_LIST ||
-  //           f.type === AtomsTypeEnum.INPUT_STRING_LIST
-  //         ) {
-  //           return '';
-  //         } else {
-  //           return f.val;
-  //         }
-  //       })
-  //       .filter(Boolean);
-  //     if (filterStrings.length > 0) {
-  //       wheres.push(...filterStrings);
-  //     }
-  //   }
-  // });
-  // // 构建子查询
-  // if (tables.length > 0) {
-  //   sqlClauses.push(`SELECT 1 FROM ${tables[0]}`);
-  //   if (joins.length > 0) {
-  //     sqlClauses.push(joins.join(' '));
-  //   }
-  //   if (wheres.length > 0) {
-  //     sqlClauses.push(`WHERE ${wheres.join(' ')}`);
-  //   }
-  // }
-  // sqlClauses.push(')');
-  // return sqlClauses.join(' ');
 };
 var _isError = exports.isError = function isError(item, data) {
   var tables = getColumnsTables(data);
-  // 不存在
   if (!item) {
     return false;
   }
   if (Array.isArray(item)) {
     return item.some(function (v) {
       return _isError(v, data);
-    }); // item可能为数组关联的时候有多选情况，只要有一个错，整体就错
+    });
   }
-  // 字段类型
   if (item.type === _types.AtomsTypeEnum.FIELD) {
     var datasourceId = item.datasourceId,
       _item$tableId = item.tableId,
@@ -757,16 +666,15 @@ var _isError = exports.isError = function isError(item, data) {
       tableAlias = _item$tableAlias === void 0 ? '' : _item$tableAlias,
       fieldName = item.fieldName,
       fieldId = item.fieldId;
-    var _datasourceId = datasourceId || 'source'; // 默认为source
+    var _datasourceId = datasourceId || 'source';
     if (tableId === 'source') {
       _datasourceId = 'source';
     }
     if (!tableId) {
-      return false; // 未选不报错
+      return false;
     }
     if (_datasourceId === 'source') {
       var _tables$_datasourceId;
-      // 检查是否所有字段的 name 都不等于 fieldName
       if (!(tables !== null && tables !== void 0 && (_tables$_datasourceId = tables[_datasourceId]) !== null && _tables$_datasourceId !== void 0 && _tables$_datasourceId[tableId + tableAlias])) {
         return true;
       } else {
@@ -783,44 +691,31 @@ var _isError = exports.isError = function isError(item, data) {
       var hasField = (_tables$_datasourceId3 = tables === null || tables === void 0 || (_tables$_datasourceId4 = tables[_datasourceId]) === null || _tables$_datasourceId4 === void 0 || (_tables$_datasourceId4 = _tables$_datasourceId4[tableId + tableAlias]) === null || _tables$_datasourceId4 === void 0 ? void 0 : _tables$_datasourceId4.some(function (v) {
         return v.name === fieldName && (v.id === undefined || v.id === fieldId);
       })) !== null && _tables$_datasourceId3 !== void 0 ? _tables$_datasourceId3 : false;
-      return !hasField; // 注意：返回 true 表示“有错误”
+      return !hasField;
     }
   }
-  // 表达式类型
   if (item.type === _types.AtomsTypeEnum.EXPRESSION) {
     var lhsHasError = _isError(item.lhs, data);
     var rhsHasError = _isError(item.rhs, data);
     return lhsHasError || rhsHasError;
   }
-  // 公式
   if (item.type === _types.AtomsTypeEnum.FORMULA) {
     return _isError(item.args, data);
   }
-  // 公式
   if (item.type === _types.AtomsTypeEnum.COLLECTION) {
     return _isError(item.list, data);
   }
-  return false; // 其他类型默认无错误
+  return false;
 };
-/**
- * 深度判断 sub 是否是 obj 的子集（递归比较所有可枚举自有属性）
- * @param sub 可能包含部分属性的对象
- * @param obj 待比较的对象
- * @param visited 用于处理循环引用的 WeakSet
- */
 function isSubset(sub, obj) {
   var visited = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : new WeakSet();
-  // 基本类型或引用相同
   if (sub === obj) return true;
-  // 如果任一不是对象/数组，或者为 null，则不相等（sub 为基本类型时，上面已经比较过，这里只处理对象不等的情况）
   if ((0, _typeof2["default"])(sub) !== 'object' || sub === null || (0, _typeof2["default"])(obj) !== 'object' || obj === null) {
     return false;
   }
-  // 避免循环引用
   if (visited.has(sub) || visited.has(obj)) return false;
   visited.add(sub);
   visited.add(obj);
-  // 处理数组
   if (Array.isArray(sub)) {
     if (!Array.isArray(obj) || sub.length !== obj.length) return false;
     for (var i = 0; i < sub.length; i++) {
@@ -828,35 +723,23 @@ function isSubset(sub, obj) {
     }
     return true;
   }
-  // 普通对象：遍历 sub 的每个键
   for (var key in sub) {
     if (Object.prototype.hasOwnProperty.call(sub, key)) {
-      // obj 必须包含该键
       if (!Object.prototype.hasOwnProperty.call(obj, key)) return false;
-      // 递归比较值
       if (!isSubset(sub[key], obj[key], visited)) return false;
     }
   }
   return true;
 }
-/**
- * 在嵌套结构 root 中查找是否存在一个对象，使得 target 是该对象的子集
- * @param root 可能包含任意层数组/对象的根数据
- * @param target 目标对象（可能只包含部分字段）
- * @returns 是否存在
- */
 function containsSubset(root, target) {
   var visited = new WeakSet();
   function search(current) {
     if (current && (0, _typeof2["default"])(current) === 'object') {
-      // 避免循环引用
       if (visited.has(current)) return false;
       visited.add(current);
-      // 如果是普通对象（非数组），先检查是否包含 target 子集
       if (!Array.isArray(current) && isSubset(target, current)) {
         return true;
       }
-      // 继续深入遍历子元素
       if (Array.isArray(current)) {
         var _iterator2 = (0, _createForOfIteratorHelper2["default"])(current),
           _step2;
@@ -882,45 +765,37 @@ function containsSubset(root, target) {
   }
   return search(root);
 }
-// 判断当前meta中是否含有errorList
 var isExistsError = exports.isExistsError = function isExistsError(meta, errorList) {
   var _meta = (0, _cloneDeep3["default"])(meta);
   return errorList.some(function (error) {
     return containsSubset(_meta, error);
   });
 };
-// 设置新字段信息
 function setNewField(field, data) {
-  console.log('🚀 ~ setNewField ~ field:', field);
   var _iterator3 = (0, _createForOfIteratorHelper2["default"])(data),
     _step3;
   try {
     for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
       var table = _step3.value;
-      // 第一步：判断表名是否一致
       if (table.name !== field.tableName) {
         continue;
       }
-      // 第二步：✅ 表名一致，立即更新所有表相关信息（不管字段是否存在）
       field.datasourceId = table.datasourceId || '';
       field.datasourceName = table.datasourceName || '';
       field.tableId = table.id || '';
-      field.tableName = table.name || ''; // 虽然相同，但确保标准化
+      field.tableName = table.name || '';
       field.tableAlias = table.alias || '';
       field.tableUuid = table.tableUuid || '';
       field.tableNameZh = table.name_zh || '';
-      // 第三步：尝试找字段，更新字段相关信息（仅当字段存在时）
       var matchedColumn = table.columns.find(function (col) {
         return col.name === field.fieldName;
       });
-      console.log('🚀 ~ setNewField ~ matchedColumn:', matchedColumn);
       if (matchedColumn) {
         field.fieldId = matchedColumn.id || '';
         field.fieldNameZh = matchedColumn.name_zh || '';
         field.fieldUuid = matchedColumn.fieldUuid || '';
         field.fieldAlias = matchedColumn.fieldAlias || '';
       }
-      // 找到同名表就停止（假设表名唯一）
       break;
     }
   } catch (err) {
@@ -928,10 +803,8 @@ function setNewField(field, data) {
   } finally {
     _iterator3.f();
   }
-  console.log('🚀 ~ setNewField ~ field:', field);
   return field;
 }
-// 复制字段别名后修改对应的表id或字段id的别名
 var _changeCopyField = exports.changeCopyField = function changeCopyField(items, data) {
   return items.map(function (v) {
     if (v.type === _types.AtomsTypeEnum.JOIN_DEFAULT || v.type === _types.AtomsTypeEnum.EXPRESSION) {
@@ -940,22 +813,10 @@ var _changeCopyField = exports.changeCopyField = function changeCopyField(items,
         rhs: _changeCopyField(v.rhs, data)
       });
     } else if (v.type === _types.AtomsTypeEnum.FIELD) {
-      // if (type === AliasType.table && v.tableUuid === val.uuid) {
-      //   v.tableAlias = val.alias;
-      // }
-      // if (type === AliasType.field && v.fieldUuid === val.uuid) {
-      //   v.fieldAlias = val.alias;
-      // }
-      // 需要处理复制的字段别名
       v = setNewField(v, data);
       return v;
     } else if (v.type === _types.AtomsTypeEnum.EXISTS || v.type === _types.AtomsTypeEnum.NOT_EXISTS) {
       v.notExists = changeExistsCopyField(v.notExists || [], data);
-      // if (type === AliasType.table) {
-      //   v.notExists = changeExistsCopyTable(v.notExists || [], data);
-      // }
-      // if (type === AliasType.field) {
-      // }
       return v;
     } else if (v.type === _types.AtomsTypeEnum.FORMULA) {
       v.args = _changeCopyField(v.args, data);
@@ -986,23 +847,22 @@ var changeExistsCopyField = exports.changeExistsCopyField = function changeExist
       });
     }
     if (v.type === _enum.TypeEnum.rowLimit) {}
-    // if (v.type === TypeEnum.summarize) {
-    //   v.group.map((group) => {
-    //     if (group.fieldUuid === uuid) {
-    //       group.fieldAlias = alias;
-    //       group.sql = summarizeToSql(v.group, group).sql;
-    //     }
-    //   });
-    //   v.by.map((by) => {
-    //     if (by.fieldUuid === uuid) {
-    //       by.fieldAlias = alias;
-    //       by.sql = `${by.alias}.${by.realName || by.name}`;
-    //     }
-    //   });
-    // }
+    if (v.type === _enum.TypeEnum.summarize) {
+      v.group.map(function (group) {
+        if (group.atoms && group.atoms.length > 0) {
+          group.atoms = _changeCopyField(group.atoms, _data);
+          group.sql = (0, _helper.summarizeToSql)(v.group, group).sql;
+        }
+      });
+      v.by.map(function (by) {
+        if (by.atoms && by.atoms.length > 0) {
+          by.atoms = _changeCopyField(by.atoms, _data);
+          by.sql = (0, _helper.summarizeByToSql)(by);
+        }
+      });
+    }
     if (v.type === _enum.TypeEnum.filter) {
       if (v.filter && v.filter.length > 0) {
-        console.log(v.filter);
         v.filter = _changeCopyField(v.filter, _data);
       }
     }