@gingkoo/pandora-metabase 1.0.141 → 1.0.143

package/lib/cjs/utils.js

@@ -8,13 +8,13 @@ exports.changeTableAlias = exports.changeFieldAlias = exports.changeExistsCopyFi
 exports.containsSubset = containsSubset;
 exports.isExistsError = exports.isError = exports.isCanPaste = exports.getSubQueryColumnInstanceUuid = exports.getSubColumns = exports.getObjTem = exports.getMetaTabels = exports.getHelper = exports.getColumnsTables = exports.findMetaKey = exports.findIndex = void 0;
 exports.isValidSQLAlias = isValidSQLAlias;
-exports.patchData = exports.normalizeLegacySummarizeForSave = exports.metaIsCheck = exports.mergeSubQueryColumns = void 0;
+exports.patchData = exports.normalizeLegacySummarizeForSave = exports.normalizeAndOrStructure = exports.metaIsCheck = exports.mergeSubQueryColumns = void 0;
 exports.reassembleByUnion = reassembleByUnion;
 exports.splitByUnion = splitByUnion;
 exports.syncSubQueryFieldReferences = void 0;
+var _createForOfIteratorHelper2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/createForOfIteratorHelper"));
 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"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/toConsumableArray"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/defineProperty"));
 var _objectSpread6 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
@@ -26,7 +26,10 @@ var _transformSql2 = require("./utils/transformSql");
 var _helper2 = require("./utils/helper");
 var _cloneDeep3 = _interopRequireDefault(require("lodash/cloneDeep"));
 var _patch = require("./hooks/patch");
-var _excluded = ["list"];
+var _excluded = ["operator", "leftAtoms", "rightAtoms", "atoms"],
+  _excluded2 = ["operator", "leftAtoms", "rightAtoms", "atoms"],
+  _excluded3 = ["operator", "leftAtoms", "rightAtoms", "atoms", "items"],
+  _excluded4 = ["list"];
 var findIndex = exports.findIndex = function findIndex(arr, item) {
   return arr.indexOf(item);
 };
@@ -326,14 +329,13 @@ var _syncSubQueryFieldItems = function syncSubQueryFieldItems() {
         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)
-      });
+      nextItem = syncAndOrBinaryFields((0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, item), {}, {
+        items: normalizeAndOrItems(item).map(function (logicItem) {
+          return (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, logicItem), {}, {
+            atoms: _syncSubQueryFieldItems(logicItem.atoms || [], table, columns, oldColumns)
+          });
+        })
+      }));
     } else {
       nextItem = item;
     }
@@ -633,15 +635,250 @@ var buildFormulaQuotes = function buildFormulaQuotes(item) {
   var argsText = (item.args || []).map(_getAtomDisplayText).join(' , ');
   return normalizeAtomQuotes("".concat(item.name || '', " ( ").concat(argsText, " )"));
 };
+var normalizeAndOrItems = function normalizeAndOrItems(item) {
+  if (Array.isArray(item.items) && item.items.length > 0) {
+    return item.items.map(function (logicItem, index) {
+      var operator = logicItem.operator,
+        leftAtoms = logicItem.leftAtoms,
+        rightAtoms = logicItem.rightAtoms,
+        atoms = logicItem.atoms,
+        nextLogicItem = (0, _objectWithoutProperties2["default"])(logicItem, _excluded);
+      return (0, _objectSpread6["default"])((0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, nextLogicItem), index > 0 ? {
+        operator: operator || item.operator || 'and'
+      } : {}), {}, {
+        atoms: Array.isArray(atoms) && atoms.length > 0 ? atoms : []
+      });
+    });
+  }
+  if (Array.isArray(item.leftAtoms) || Array.isArray(item.rightAtoms)) {
+    return [{
+      atoms: Array.isArray(item.leftAtoms) ? item.leftAtoms : []
+    }, {
+      operator: item.operator || 'and',
+      atoms: Array.isArray(item.rightAtoms) ? item.rightAtoms : []
+    }];
+  }
+  return [{
+    atoms: Array.isArray(item.atoms) ? item.atoms : []
+  }];
+};
 var buildAndOrQuotes = function buildAndOrQuotes(item) {
-  var hasBinarySides = Array.isArray(item.leftAtoms) || Array.isArray(item.rightAtoms);
-  if (hasBinarySides) {
-    var leftText = (item.leftAtoms || []).map(_getAtomDisplayText).join(' ');
-    var rightText = (item.rightAtoms || []).map(_getAtomDisplayText).join(' ');
-    return normalizeAtomQuotes("( ".concat(leftText, " ").concat(item.operator || 'and', " ").concat(rightText, " )"));
-  }
-  var atomsText = (item.atoms || []).map(_getAtomDisplayText).join(' ');
-  return normalizeAtomQuotes("".concat(item.operator || 'and', " ( ").concat(atomsText, " )"));
+  var itemsText = normalizeAndOrItems(item).map(function (logicItem, index) {
+    var atomsText = (logicItem.atoms || []).map(_getAtomDisplayText).join(' ');
+    return index === 0 ? atomsText : "".concat(logicItem.operator || 'and', " ").concat(atomsText);
+  }).join(' ');
+  return normalizeAtomQuotes("( ".concat(itemsText, " )"));
+};
+var syncAndOrBinaryFields = function syncAndOrBinaryFields(item) {
+  var operator = item.operator,
+    leftAtoms = item.leftAtoms,
+    rightAtoms = item.rightAtoms,
+    atoms = item.atoms,
+    nextItem = (0, _objectWithoutProperties2["default"])(item, _excluded2);
+  return (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, nextItem), {}, {
+    items: normalizeAndOrItems(item)
+  });
+};
+var _normalizeAndOrStructureInner = function normalizeAndOrStructureInner(data, cache) {
+  if (!data || (0, _typeof2["default"])(data) !== 'object') return data;
+  if (cache.has(data)) return cache.get(data);
+  if (Array.isArray(data)) {
+    var nextList = [];
+    cache.set(data, nextList);
+    data.forEach(function (item) {
+      nextList.push(_normalizeAndOrStructureInner(item, cache));
+    });
+    return nextList;
+  }
+  var item = data;
+  if (item.type === _types.AtomsTypeEnum.AND_OR) {
+    var operator = item.operator,
+      leftAtoms = item.leftAtoms,
+      rightAtoms = item.rightAtoms,
+      atoms = item.atoms,
+      items = item.items,
+      nextItem = (0, _objectWithoutProperties2["default"])(item, _excluded3);
+    var normalizedItem = (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, nextItem), {}, {
+      items: []
+    });
+    cache.set(item, normalizedItem);
+    normalizedItem.items = normalizeAndOrItems(item).map(function (logicItem) {
+      return (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, logicItem.operator ? {
+        operator: logicItem.operator
+      } : {}), {}, {
+        atoms: _normalizeAndOrStructureInner(logicItem.atoms || [], cache)
+      });
+    });
+    normalizedItem.quotes = buildAndOrQuotes(normalizedItem);
+    return normalizedItem;
+  }
+  if (item.type === _types.AtomsTypeEnum.JOIN_DEFAULT || item.type === _types.AtomsTypeEnum.EXPRESSION) {
+    var _nextItem = (0, _objectSpread6["default"])({}, item);
+    cache.set(item, _nextItem);
+    if (Array.isArray(item.lhs)) {
+      _nextItem.lhs = _normalizeAndOrStructureInner(item.lhs, cache);
+    }
+    if (Array.isArray(item.rhs)) {
+      _nextItem.rhs = _normalizeAndOrStructureInner(item.rhs, cache);
+    }
+    return _nextItem;
+  }
+  if (item.type === _types.AtomsTypeEnum.FORMULA) {
+    var _nextItem2 = (0, _objectSpread6["default"])({}, item);
+    cache.set(item, _nextItem2);
+    if (Array.isArray(item.args)) {
+      _nextItem2.args = _normalizeAndOrStructureInner(item.args, cache);
+    }
+    return _nextItem2;
+  }
+  if (item.type === _types.AtomsTypeEnum.COLLECTION) {
+    var _nextItem3 = (0, _objectSpread6["default"])({}, item);
+    cache.set(item, _nextItem3);
+    if (Array.isArray(item.list)) {
+      _nextItem3.list = _normalizeAndOrStructureInner(item.list, cache);
+    }
+    return _nextItem3;
+  }
+  if (item.type === _types.AtomsTypeEnum.CASE_WHEN) {
+    var _nextItem4 = (0, _objectSpread6["default"])({}, item);
+    cache.set(item, _nextItem4);
+    if (Array.isArray(item.caseAtoms)) {
+      _nextItem4.caseAtoms = _normalizeAndOrStructureInner(item.caseAtoms, cache);
+    }
+    if (Array.isArray(item.whenClauses)) {
+      _nextItem4.whenClauses = item.whenClauses.map(function (clause) {
+        if (!clause || (0, _typeof2["default"])(clause) !== 'object') return clause;
+        if (cache.has(clause)) return cache.get(clause);
+        var nextClause = (0, _objectSpread6["default"])({}, clause);
+        cache.set(clause, nextClause);
+        if (Array.isArray(clause.whenAtoms)) {
+          nextClause.whenAtoms = _normalizeAndOrStructureInner(clause.whenAtoms, cache);
+        }
+        if (Array.isArray(clause.thenAtoms)) {
+          nextClause.thenAtoms = _normalizeAndOrStructureInner(clause.thenAtoms, cache);
+        }
+        return nextClause;
+      });
+    }
+    if (Array.isArray(item.elseAtoms)) {
+      _nextItem4.elseAtoms = _normalizeAndOrStructureInner(item.elseAtoms, cache);
+    }
+    return _nextItem4;
+  }
+  if (item.type === _types.AtomsTypeEnum.EXISTS || item.type === _types.AtomsTypeEnum.NOT_EXISTS || item.type === _types.AtomsTypeEnum.SUB_QUERY) {
+    var _nextItem5 = (0, _objectSpread6["default"])({}, item);
+    cache.set(item, _nextItem5);
+    if (Array.isArray(item.notExists)) {
+      _nextItem5.notExists = _normalizeAndOrStructureInner(item.notExists, cache);
+    }
+    if (Array.isArray(item.subQuery)) {
+      _nextItem5.subQuery = _normalizeAndOrStructureInner(item.subQuery, cache);
+    }
+    return _nextItem5;
+  }
+  if (item.type === _enum.TypeEnum.data) {
+    var _nextItem6 = (0, _objectSpread6["default"])({}, item);
+    cache.set(item, _nextItem6);
+    if (Array.isArray(item.subquery)) {
+      _nextItem6.subquery = _normalizeAndOrStructureInner(item.subquery, cache);
+    }
+    return _nextItem6;
+  }
+  if (item.type === _enum.TypeEnum.joinData) {
+    var _nextItem7 = (0, _objectSpread6["default"])({}, item);
+    cache.set(item, _nextItem7);
+    if (Array.isArray(item.expressions)) {
+      _nextItem7.expressions = _normalizeAndOrStructureInner(item.expressions, cache);
+    }
+    if (Array.isArray(item.subquery)) {
+      _nextItem7.subquery = _normalizeAndOrStructureInner(item.subquery, cache);
+    }
+    return _nextItem7;
+  }
+  if (item.type === _enum.TypeEnum.customColumn) {
+    var _nextItem8 = (0, _objectSpread6["default"])({}, item);
+    cache.set(item, _nextItem8);
+    if (Array.isArray(item.customColumn)) {
+      _nextItem8.customColumn = item.customColumn.map(function (column) {
+        if (!column || (0, _typeof2["default"])(column) !== 'object') return column;
+        if (cache.has(column)) return cache.get(column);
+        var nextColumn = (0, _objectSpread6["default"])({}, column);
+        cache.set(column, nextColumn);
+        if (Array.isArray(column.formulaList)) {
+          nextColumn.formulaList = _normalizeAndOrStructureInner(column.formulaList, cache);
+        }
+        return nextColumn;
+      });
+    }
+    return _nextItem8;
+  }
+  if (item.type === _enum.TypeEnum.filter) {
+    var _nextItem9 = (0, _objectSpread6["default"])({}, item);
+    cache.set(item, _nextItem9);
+    if (Array.isArray(item.filter)) {
+      _nextItem9.filter = _normalizeAndOrStructureInner(item.filter, cache);
+    }
+    return _nextItem9;
+  }
+  if (item.type === _enum.TypeEnum.summarize) {
+    var _nextItem0 = (0, _objectSpread6["default"])({}, item);
+    cache.set(item, _nextItem0);
+    if (Array.isArray(item.group)) {
+      _nextItem0.group = item.group.map(function (record) {
+        if (!record || (0, _typeof2["default"])(record) !== 'object') return record;
+        if (cache.has(record)) return cache.get(record);
+        var nextRecord = (0, _objectSpread6["default"])({}, record);
+        cache.set(record, nextRecord);
+        if (Array.isArray(record.atoms)) {
+          nextRecord.atoms = _normalizeAndOrStructureInner(record.atoms, cache);
+        }
+        return nextRecord;
+      });
+    }
+    if (Array.isArray(item.by)) {
+      _nextItem0.by = item.by.map(function (record) {
+        if (!record || (0, _typeof2["default"])(record) !== 'object') return record;
+        if (cache.has(record)) return cache.get(record);
+        var nextRecord = (0, _objectSpread6["default"])({}, record);
+        cache.set(record, nextRecord);
+        if (Array.isArray(record.atoms)) {
+          nextRecord.atoms = _normalizeAndOrStructureInner(record.atoms, cache);
+        }
+        return nextRecord;
+      });
+    }
+    return _nextItem0;
+  }
+  if (item.type === _enum.TypeEnum.sort) {
+    var _nextItem1 = (0, _objectSpread6["default"])({}, item);
+    cache.set(item, _nextItem1);
+    if (Array.isArray(item.sort)) {
+      _nextItem1.sort = item.sort.map(function (record) {
+        if (!record || (0, _typeof2["default"])(record) !== 'object') return record;
+        if (cache.has(record)) return cache.get(record);
+        var nextRecord = (0, _objectSpread6["default"])({}, record);
+        cache.set(record, nextRecord);
+        if (Array.isArray(record.expression)) {
+          nextRecord.expression = _normalizeAndOrStructureInner(record.expression, cache);
+        }
+        return nextRecord;
+      });
+    }
+    return _nextItem1;
+  }
+  if (item.type === _enum.TypeEnum.union) {
+    var _nextItem10 = (0, _objectSpread6["default"])({}, item);
+    cache.set(item, _nextItem10);
+    if (Array.isArray(item.subquery)) {
+      _nextItem10.subquery = _normalizeAndOrStructureInner(item.subquery, cache);
+    }
+    return _nextItem10;
+  }
+  cache.set(item, item);
+  return item;
+};
+var normalizeAndOrStructure = exports.normalizeAndOrStructure = function normalizeAndOrStructure(data) {
+  return _normalizeAndOrStructureInner(data, new WeakMap());
 };
 var buildCaseWhenQuotes = function buildCaseWhenQuotes(item) {
   var caseAtomsText = (item.caseAtoms || []).map(_getAtomDisplayText).join(' ');
@@ -748,23 +985,23 @@ var syncAtomQuotes = function syncAtomQuotes(item) {
     });
   }
   if (item.type === _types.AtomsTypeEnum.FORMULA) {
-    var _nextItem = (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, item), {}, {
+    var _nextItem11 = (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, item), {}, {
       args: syncAtomQuotesList(item.args || [])
     });
-    return (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, _nextItem), {}, {
-      quotes: buildFormulaQuotes(_nextItem)
+    return (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, _nextItem11), {}, {
+      quotes: buildFormulaQuotes(_nextItem11)
     });
   }
   if (item.type === _types.AtomsTypeEnum.COLLECTION) {
-    var _nextItem2 = (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, item), {}, {
+    var _nextItem12 = (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, item), {}, {
       list: syncAtomQuotesList(item.list || [])
     });
-    return (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, _nextItem2), {}, {
-      quotes: (_nextItem2.list || []).map(_getAtomDisplayText).join(' ')
+    return (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, _nextItem12), {}, {
+      quotes: (_nextItem12.list || []).map(_getAtomDisplayText).join(' ')
     });
   }
   if (item.type === _types.AtomsTypeEnum.CASE_WHEN) {
-    var _nextItem3 = (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, item), {}, {
+    var _nextItem13 = (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, item), {}, {
       caseAtoms: syncAtomQuotesList(item.caseAtoms || []),
       whenClauses: (item.whenClauses || []).map(function (clause) {
         return (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, clause), {}, {
@@ -774,21 +1011,20 @@ var syncAtomQuotes = function syncAtomQuotes(item) {
       }),
       elseAtoms: syncAtomQuotesList(item.elseAtoms || [])
     });
-    return (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, _nextItem3), {}, {
-      quotes: buildCaseWhenQuotes(_nextItem3)
+    return (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, _nextItem13), {}, {
+      quotes: buildCaseWhenQuotes(_nextItem13)
     });
   }
   if (item.type === _types.AtomsTypeEnum.AND_OR) {
-    var hasBinarySides = Array.isArray(item.leftAtoms) || Array.isArray(item.rightAtoms);
-    var _nextItem4 = (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, item), hasBinarySides ? {
-      atoms: undefined,
-      leftAtoms: syncAtomQuotesList(item.leftAtoms || []),
-      rightAtoms: syncAtomQuotesList(item.rightAtoms || [])
-    } : {
-      atoms: syncAtomQuotesList(item.atoms || [])
-    });
-    return (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, _nextItem4), {}, {
-      quotes: buildAndOrQuotes(_nextItem4)
+    var _nextItem14 = syncAndOrBinaryFields((0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, item), {}, {
+      items: normalizeAndOrItems(item).map(function (logicItem) {
+        return (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, logicItem), {}, {
+          atoms: syncAtomQuotesList(logicItem.atoms || [])
+        });
+      })
+    }));
+    return (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, _nextItem14), {}, {
+      quotes: buildAndOrQuotes(_nextItem14)
     });
   }
   return item;
@@ -835,6 +1071,34 @@ var isAliasTargetSummarizeRecord = function isAliasTargetSummarizeRecord(record,
     type: _types.AtomsTypeEnum.FIELD
   }, target);
 };
+var isAliasTargetColumn = function isAliasTargetColumn(column, target, table) {
+  return isAliasTargetField({
+    fieldName: column.name || '',
+    fieldNameZh: column.name_zh || '',
+    fieldAlias: column.fieldAlias || '',
+    fieldUuid: column.fieldUuid || '',
+    fieldId: column.fieldId || column.id || '',
+    tableName: (table === null || table === void 0 ? void 0 : table.name) || column.tableName || '',
+    tableNameZh: (table === null || table === void 0 ? void 0 : table.name_zh) || column.tableNameZh || '',
+    tableId: (table === null || table === void 0 ? void 0 : table.id) || column.tableId || '',
+    tableAlias: (table === null || table === void 0 ? void 0 : table.alias) || column.tableAlias || '',
+    tableUuid: (table === null || table === void 0 ? void 0 : table.tableUuid) || column.tableUuid || '',
+    datasourceName: (table === null || table === void 0 ? void 0 : table.datasourceName) || column.datasourceName || '',
+    datasourceId: (table === null || table === void 0 ? void 0 : table.datasourceId) || column.datasourceId || '',
+    type: _types.AtomsTypeEnum.FIELD
+  }, target);
+};
+var changeColumnAlias = function changeColumnAlias() {
+  var columns = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+  var target = arguments.length > 1 ? arguments[1] : undefined;
+  var table = arguments.length > 2 ? arguments[2] : undefined;
+  return columns.map(function (column) {
+    return isAliasTargetColumn(column, target, table) ? (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, column), {}, {
+      fieldAlias: target.alias,
+      fieldUuid: column.fieldUuid || target.uuid || ''
+    }) : column;
+  });
+};
 var _changeAlias = function changeAlias(items, val, type) {
   return items.map(function (v) {
     var nextItem;
@@ -907,14 +1171,13 @@ var _changeAlias = function changeAlias(items, val, type) {
         elseAtoms: _changeAlias(v.elseAtoms || [], val, type)
       });
     } else if (v.type === _types.AtomsTypeEnum.AND_OR) {
-      var hasBinarySides = Array.isArray(v.leftAtoms) || Array.isArray(v.rightAtoms);
-      nextItem = (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, v), hasBinarySides ? {
-        atoms: undefined,
-        leftAtoms: _changeAlias(v.leftAtoms || [], val, type),
-        rightAtoms: _changeAlias(v.rightAtoms || [], val, type)
-      } : {
-        atoms: _changeAlias(v.atoms || [], val, type)
-      });
+      nextItem = syncAndOrBinaryFields((0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, v), {}, {
+        items: normalizeAndOrItems(v).map(function (logicItem) {
+          return (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, logicItem), {}, {
+            atoms: _changeAlias(logicItem.atoms || [], val, type)
+          });
+        })
+      }));
     } else {
       nextItem = v;
     }
@@ -1044,8 +1307,15 @@ var changeFieldAlias = exports.changeFieldAlias = function changeFieldAlias(list
   };
   var newList = (0, _cloneDeep3["default"])(list);
   return (newList === null || newList === void 0 ? void 0 : newList.map(function (v) {
-    if (v.type === _enum.TypeEnum.data) {}
+    if (v.type === _enum.TypeEnum.data) {
+      if (v.columns && v.columns.length > 0) {
+        v.columns = changeColumnAlias(v.columns, aliasTarget, v.table);
+      }
+    }
     if (v.type === _enum.TypeEnum.joinData) {
+      if (v.columns && v.columns.length > 0) {
+        v.columns = changeColumnAlias(v.columns, aliasTarget, v.table2);
+      }
       if (v.expressions && v.expressions.length > 0) {
         v.expressions = _changeAlias(v.expressions, aliasTarget, AliasType.field);
       }
@@ -1119,7 +1389,7 @@ function splitByUnion(data) {
       i++;
     } else if (item.type === 'union') {
       var list = item.list,
-        otehr = (0, _objectWithoutProperties2["default"])(item, _excluded);
+        otehr = (0, _objectWithoutProperties2["default"])(item, _excluded4);
       var nextItem = original[i + 1];
       if (nextItem && nextItem.type === 'group') {
         result.push((0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, otehr), {}, {
@@ -1190,7 +1460,7 @@ var normalizeSummarizeByForSave = function normalizeSummarizeByForSave(record) {
 };
 var _normalizeLegacySummarizeForSave = exports.normalizeLegacySummarizeForSave = function normalizeLegacySummarizeForSave() {
   var metas = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
-  return metas.map(function (meta) {
+  var normalizedMetas = metas.map(function (meta) {
     if (meta.type === _enum.TypeEnum.summarize) {
       return (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, meta), {}, {
         group: meta.group.map(function (item) {
@@ -1208,6 +1478,7 @@ var _normalizeLegacySummarizeForSave = exports.normalizeLegacySummarizeForSave =
     }
     return meta;
   });
+  return normalizeAndOrStructure(normalizedMetas);
 };
 var getObjTem = exports.getObjTem = function getObjTem(arr) {
   var obj = {};
@@ -1509,14 +1780,13 @@ var _changeCopyField = exports.changeCopyField = function changeCopyField(items,
       v.args = _changeCopyField(v.args, data);
       return v;
     } else if (v.type === _types.AtomsTypeEnum.AND_OR) {
-      var hasBinarySides = Array.isArray(v.leftAtoms) || Array.isArray(v.rightAtoms);
-      return (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, v), hasBinarySides ? {
-        atoms: undefined,
-        leftAtoms: _changeCopyField(v.leftAtoms || [], data),
-        rightAtoms: _changeCopyField(v.rightAtoms || [], data)
-      } : {
-        atoms: _changeCopyField(v.atoms || [], data)
-      });
+      return syncAndOrBinaryFields((0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, v), {}, {
+        items: normalizeAndOrItems(v).map(function (logicItem) {
+          return (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, logicItem), {}, {
+            atoms: _changeCopyField(logicItem.atoms || [], data)
+          });
+        })
+      }));
     } else if (v.type === _types.AtomsTypeEnum.COLLECTION) {
       v.list = _changeCopyField(v.list, data);
       return v;

package/lib/es/components/dialog/formula-list/LogicGroup.d.ts

@@ -1,10 +1,13 @@
 import React from 'react';
 type Props = {
-    operator: 'and' | 'or';
-    onToggleOperator: () => void;
-    leftContent: React.ReactNode;
-    rightContent: React.ReactNode;
+    items: {
+        operator?: 'and' | 'or';
+        content: React.ReactNode;
+    }[];
+    onChangeOperator: (index: number, operator: 'and' | 'or') => void;
+    onAddItem: () => void;
+    onDeleteItem: (operatorIndex: number, side: 'left' | 'right') => void;
     onDelete: (e: any) => void;
 };
-declare const LogicGroup: ({ operator, onToggleOperator, leftContent, rightContent, onDelete, }: Props) => import("react/jsx-runtime").JSX.Element;
+declare const LogicGroup: ({ items, onChangeOperator, onAddItem, onDeleteItem, onDelete, }: Props) => import("react/jsx-runtime").JSX.Element;
 export default LogicGroup;

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

@@ -1,32 +1,78 @@
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import React from 'react';
 import cx from 'classnames';
-import { Tooltip } from '@gingkoo/pandora';
+import { Dropdown, Tooltip } from '@gingkoo/pandora';
 import { CloseIcon } from '../../icons';
+var operatorMenuItems = [{
+  key: 'add',
+  label: '添加连接符'
+}, {
+  key: 'delete-left',
+  label: '删除左侧和当前连接符'
+}, {
+  key: 'delete-right',
+  label: '删除右侧和当前连接符'
+}];
 var LogicGroup = function LogicGroup(_ref) {
-  var operator = _ref.operator,
-    onToggleOperator = _ref.onToggleOperator,
-    leftContent = _ref.leftContent,
-    rightContent = _ref.rightContent,
+  var items = _ref.items,
+    onChangeOperator = _ref.onChangeOperator,
+    onAddItem = _ref.onAddItem,
+    onDeleteItem = _ref.onDeleteItem,
     onDelete = _ref.onDelete;
+  var canDeleteItem = items.length > 2;
+  var handleOperatorMenuChange = function handleOperatorMenuChange(operatorIndex, action) {
+    if (action === 'add') {
+      onAddItem();
+      return;
+    }
+    if (action === 'delete-left' || action === 'delete-right') {
+      var side = action === 'delete-left' ? 'left' : 'right';
+      onDeleteItem(operatorIndex, side);
+    }
+  };
+  var renderOperator = function renderOperator(operator, index) {
+    return _jsx(Dropdown, {
+      trigger: 'contextMenu',
+      droplist: operatorMenuItems.map(function (item) {
+        return _objectSpread(_objectSpread({}, item), {}, {
+          disabled: item.key !== 'add' && !canDeleteItem
+        });
+      }),
+      triggerProps: {
+        clickToClose: true,
+        style: {
+          zIndex: 9999
+        }
+      },
+      onChange: function onChange(action) {
+        handleOperatorMenuChange(index, action);
+      },
+      children: _jsx("button", {
+        type: 'button',
+        className: cx(':Sqb-TableName', 'operator-trigger', 'logic-operator', {
+          'logic-and': operator === 'and',
+          'logic-or': operator === 'or'
+        }),
+        onClick: function onClick() {
+          return onChangeOperator(index, operator === 'or' ? 'and' : 'or');
+        },
+        children: operator
+      })
+    });
+  };
   return _jsxs("div", {
     className: cx('Sqb-FormulaGroup', 'logic-group', 'formula-node-group'),
     children: [_jsx("span", {
       className: 'Sqb-CaseKeyword',
       children: "("
-    }), _jsx("div", {
-      className: 'Sqb-LogicGroup-content',
-      children: leftContent
-    }), _jsx("button", {
-      type: 'button',
-      className: cx('Sqb-TableName', 'operator-trigger', 'logic-operator', {
-        'logic-and': operator === 'and',
-        'logic-or': operator === 'or'
-      }),
-      onClick: onToggleOperator,
-      children: operator
-    }), _jsx("div", {
-      className: 'Sqb-LogicGroup-content',
-      children: rightContent
+    }), items.map(function (item, index) {
+      return _jsxs(React.Fragment, {
+        children: [index > 0 && renderOperator(item.operator || 'and', index), _jsx("div", {
+          className: 'Sqb-LogicGroup-content',
+          children: item.content
+        })]
+      }, index);
     }), _jsx("span", {
       className: 'Sqb-CaseKeyword',
       children: ")"