@gingkoo/pandora-metabase 1.0.118 → 1.0.120

package/lib/es/components/modules/row-limit.js

@@ -15,7 +15,6 @@ var RowLimit = function RowLimit(props) {
   var index = findIndex(store.metaList[groupIndex].list, meta);
   function handleChange(inputValue) {
     var newMeta = store.metaList[groupIndex].list.slice();
-    // @ts-ignore
     newMeta[index].limit = inputValue;
     store.setMeta(newMeta, groupIndex);
   }

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

@@ -34,7 +34,6 @@ var Sort = function Sort(props) {
         name: prevGroupBy.alias,
         id: prevGroupBy.alias,
         tableUuid: prevGroupBy.tableUuid || uuidv4('table'),
-        // alias: (prevGroupBy as MetaSummarize).alias,
         columns: []
       };
       if (prevGroupBy !== null && prevGroupBy !== void 0 && (_prevGroupBy$group = prevGroupBy.group) !== null && _prevGroupBy$group !== void 0 && _prevGroupBy$group.length) {
@@ -43,7 +42,6 @@ var Sort = function Sort(props) {
             name: v.name || v.quotes,
             name_zh: v.name_zh || v.quotes,
             id: v.id || v.fieldId,
-            // name_zh: '',
             database_type: (v === null || v === void 0 ? void 0 : v.database_type) || SQL_COLUMN_TYPE.FLOAT,
             special_type: '',
             sql: v.sql,
@@ -66,7 +64,6 @@ var Sort = function Sort(props) {
       }
       data = [_data];
     } else {
-      //@ts-ignore
       data = store.metaList[groupIndex].list.slice(0, index).map(function (v) {
         if (v.type === TypeEnum.data) {
           return {
@@ -103,9 +100,7 @@ var Sort = function Sort(props) {
     var node = e.currentTarget || e.target;
     var newMeta = store.metaList[groupIndex].list.slice();
     var data = getColumns();
-    // ② 过滤掉已经选择的 排序参数
-    var selectedSort = {}; // {tableAlias: [columnName, columnName]}
-    //@ts-ignore
+    var selectedSort = {};
     newMeta[index].sort.forEach(function (v) {
       v.expression.forEach(function (vv) {
         if (vv.type === AtomsTypeEnum.FIELD) {
@@ -141,59 +136,6 @@ var Sort = function Sort(props) {
             expression: fields,
             sort: SortEnum.asc
           }]);
-          // let { table, name, tableId, tableUuid, id, alias, sql } = record;
-          // if (alias === SummarizeAlias) {
-          //   let aliasColumns = (sql as string)?.split(' AS ')?.[1] || '';
-          //   if (store.metaList[groupIndex].list[index - 1].type === TypeEnum.summarize) {
-          //     //@ts-ignore
-          //     newMeta[index].sort = [
-          //       //@ts-ignore
-          //       ...newMeta[index].sort,
-          //       {
-          //         table,
-          //         tableId,
-          //         tableUuid,
-          //         id,
-          //         alias,
-          //         name,
-          //         sort: SortEnum.asc,
-          //         sql: aliasColumns,
-          //       },
-          //     ];
-          //   } else {
-          //     //@ts-ignore
-          //     newMeta[index].sort = [
-          //       //@ts-ignore
-          //       ...newMeta[index].sort,
-          //       {
-          //         table,
-          //         id,
-          //         tableId,
-          //         tableUuid,
-          //         alias,
-          //         name,
-          //         sort: SortEnum.asc,
-          //         sql: `${SummarizeAlias}.${aliasColumns}`,
-          //       },
-          //     ];
-          //   }
-          // } else {
-          //   //@ts-ignore
-          //   newMeta[index].sort = [
-          //     //@ts-ignore
-          //     ...newMeta[index].sort,
-          //     {
-          //       table,
-          //       tableId,
-          //       tableUuid,
-          //       id,
-          //       alias,
-          //       name,
-          //       sort: SortEnum.asc,
-          //       sql: `${alias}.${name}`,
-          //     },
-          //   ];
-          // }
           store.setMeta(newMeta, groupIndex);
           store.setPopup({
             visible: false
@@ -204,7 +146,6 @@ var Sort = function Sort(props) {
   }
   function handleSort(itemIndex) {
     var newMeta = store.metaList[groupIndex].list.slice();
-    //@ts-ignore
     newMeta[index].sort = sort.map(function (v, i) {
       if (i === itemIndex) {
         return _objectSpread(_objectSpread({}, v), {}, {
@@ -218,7 +159,6 @@ var Sort = function Sort(props) {
   function delSortColumn(e, itemIndex) {
     e.stopPropagation();
     var newMeta = store.metaList[groupIndex].list.slice();
-    //@ts-ignore
     newMeta[index].sort = sort.filter(function (_, i) {
       return i !== itemIndex;
     });

package/lib/es/components/modules/summarize/group-by.d.ts

@@ -1,9 +1,4 @@
 import { MetaSummarize } from '../../../store/types';
-import { ColumnType } from '../../dialog/select-join-column';
-export type ValueType = ColumnType & {
-    condition: string;
-    quotes: string;
-};
 interface PropsType {
     meta: MetaSummarize;
     groupIndex: number;

package/lib/es/components/modules/summarize/group-by.js

@@ -1,21 +1,153 @@
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
+import _createForOfIteratorHelper from "@babel/runtime/helpers/esm/createForOfIteratorHelper";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+import { useState } from 'react';
 import cx from 'classnames';
 import { __ } from '../../../locale';
 import { findIndex, getHelper } from '../../../utils';
-import { TypeEnum, ColumnsPopupThemeEnum, SQL_COLUMN_TYPE } from '../../../store/enum';
+import { TypeEnum, SQL_COLUMN_TYPE } from '../../../store/enum';
 import { MetaSummarize_Enum, AtomsTypeEnum, ChangeType } from '../../../store/types';
-import SelectJoinColumn from '../../dialog/select-join-column';
 import { Tooltip, Button, Modal, Input, Toast } from '@gingkoo/pandora';
 import { uuidv4, getAlias } from '../../../utils/helper';
 import { changeFieldAlias, isValidSQLAlias, isError } from '../../../utils';
 import ItemName from '../components/item-name';
 import { AddIcon, CloseIcon } from '../../icons';
+import FormulaList from '../../dialog/formula-list';
 import { useStore } from '../../../hooks/use-provider';
 import cloneDeep from 'lodash/cloneDeep';
+import { summarizeByToSql } from '../../../store/helper';
+var _getSummaryText = function getSummaryText() {
+  var list = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+  var itemToText = function itemToText(item) {
+    if (!item) return '';
+    if (item.quotes) return item.quotes;
+    if (item.fieldName) return item.fieldAlias || item.fieldName;
+    if (item.type === AtomsTypeEnum.FORMULA) {
+      var argsText = (item.args || []).map(function (arg) {
+        return _getSummaryText((arg === null || arg === void 0 ? void 0 : arg.list) || []);
+      }).filter(Boolean).join(', ');
+      return "".concat(item.name || '').concat(argsText ? "(".concat(argsText, ")") : '').trim();
+    }
+    if (item.type === AtomsTypeEnum.EXPRESSION) {
+      var lhs = _getSummaryText(item.lhs || []);
+      var rhs = _getSummaryText(item.rhs || []);
+      return [lhs, item.condition, rhs].filter(Boolean).join(' ').trim();
+    }
+    if (item.type === AtomsTypeEnum.AND_OR) {
+      return "".concat(item.operator || 'and', " ( ").concat(_getSummaryText(item.list || []), " )").replace(/\s+/g, ' ').trim();
+    }
+    if (item.type === AtomsTypeEnum.CASE_WHEN) {
+      return item.quotes || 'case when';
+    }
+    if (Array.isArray(item.val)) return item.val.join(', ');
+    return item.val || '';
+  };
+  return list.map(function (item) {
+    return itemToText(item);
+  }).filter(Boolean).join(' ').replace(/\s+/g, ' ').trim();
+};
+var SQL_ALIAS_MAX_LENGTH = 30;
+var sanitizeAliasPart = function sanitizeAliasPart() {
+  var value = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
+  return value.replace(/[^a-zA-Z0-9_]/g, '_').replace(/_+/g, '_').replace(/^_+|_+$/g, '');
+};
+var buildAutoGroupByAlias = function buildAutoGroupByAlias(tableAlias, fieldName, itemIndex) {
+  var fallbackAlias = "group_by_".concat(itemIndex + 1);
+  var aliasPrefix = sanitizeAliasPart(tableAlias);
+  var aliasField = sanitizeAliasPart(fieldName);
+  var autoAlias = (aliasPrefix && aliasField ? "".concat(aliasPrefix, "__").concat(aliasField) : aliasField || aliasPrefix) || fallbackAlias;
+  if (!/^[a-zA-Z]/.test(autoAlias)) {
+    autoAlias = "a_".concat(autoAlias.replace(/^[^a-zA-Z]+/, ''));
+  }
+  if (!/^[a-zA-Z]/.test(autoAlias)) {
+    autoAlias = fallbackAlias;
+  }
+  if (autoAlias.length > SQL_ALIAS_MAX_LENGTH) {
+    var uniqueSuffix = "_".concat(itemIndex + 1);
+    var maxBaseLength = Math.max(1, SQL_ALIAS_MAX_LENGTH - uniqueSuffix.length);
+    autoAlias = "".concat(autoAlias.slice(0, maxBaseLength)).concat(uniqueSuffix);
+  }
+  return autoAlias.slice(0, SQL_ALIAS_MAX_LENGTH);
+};
+var GroupByEditor = function GroupByEditor(_ref) {
+  var data = _ref.data,
+    value = _ref.value,
+    onChange = _ref.onChange;
+  var _useState = useState(function () {
+      if (Array.isArray(value.atoms) && value.atoms.length) {
+        return value.atoms;
+      }
+      if (value.name) {
+        var fieldAtom = {
+          fieldName: value.name,
+          fieldNameZh: value.name_zh || '',
+          fieldAlias: '',
+          fieldUuid: uuidv4('field'),
+          fieldId: value.id || value.fieldId || '',
+          tableName: value.table || '',
+          tableNameZh: '',
+          tableId: value.tableId || '',
+          tableAlias: value.alias || '',
+          tableUuid: value.tableUuid || '',
+          datasourceName: value.datasourceName || '',
+          datasourceId: value.datasourceId || '',
+          type: AtomsTypeEnum.FIELD
+        };
+        return [fieldAtom];
+      }
+      return [];
+    }),
+    _useState2 = _slicedToArray(_useState, 2),
+    atoms = _useState2[0],
+    setAtoms = _useState2[1];
+  return _jsxs("div", {
+    className: 'Sqb-SelectSummarize-formula',
+    children: [_jsx("div", {
+      className: 'back-title',
+      children: _jsx("div", {
+        children: _jsx("h3", {
+          children: __('SqlQueryBuilder.by')
+        })
+      })
+    }), _jsx("div", {
+      className: 'Sqb-SelectSummarize-formula-body',
+      children: _jsx("div", {
+        className: 'Sqb-item',
+        children: _jsx("div", {
+          className: 'Sqb-item--content',
+          children: _jsx(FormulaList, {
+            value: atoms,
+            data: data,
+            exitData: data,
+            enableCopy: false,
+            parentPopupChannel: 'secondary',
+            onChange: function onChange(nextValue) {
+              setAtoms(nextValue);
+            }
+          })
+        })
+      })
+    }), _jsx("div", {
+      className: 'Sqb-SelectSummarize-formula-footer',
+      children: _jsx(Button, {
+        primary: true,
+        disabled: !atoms.length,
+        onClick: function onClick() {
+          onChange(_objectSpread(_objectSpread({}, value), {}, {
+            atoms: atoms,
+            quotes: _getSummaryText(atoms)
+          }));
+        },
+        children: "\u786E\u5B9A"
+      })
+    })]
+  });
+};
 var GroupBy = function GroupBy(props) {
   var meta = props.meta,
     groupIndex = props.groupIndex;
@@ -32,8 +164,9 @@ var GroupBy = function GroupBy(props) {
     if (ExistAboveGroupBy) {
       var _prevGroupBy$group, _prevGroupBy$by;
       var _data = {
-        table: prevGroupBy.alias,
-        tableId: prevGroupBy.alias,
+        name: prevGroupBy.alias,
+        id: prevGroupBy.alias,
+        name_zh: prevGroupBy.alias,
         tableUuid: prevGroupBy.tableUuid || uuidv4('table'),
         alias: prevGroupBy.alias,
         columns: []
@@ -46,7 +179,6 @@ var GroupBy = function GroupBy(props) {
             name_zh: v.name_zh || v.quotes,
             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]) || '',
-            // name_zh: '',
             database_type: (v === null || v === void 0 ? void 0 : v.database_type) || SQL_COLUMN_TYPE.FLOAT,
             special_type: '',
             select: true
@@ -61,7 +193,6 @@ var GroupBy = function GroupBy(props) {
             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) || SQL_COLUMN_TYPE.FLOAT,
             special_type: '',
             select: true
@@ -71,20 +202,17 @@ var GroupBy = function GroupBy(props) {
       data = [_data];
       var joinData = prevList.filter(function (v) {
         return v.type === 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) {
           return {
+            name: v.table2.name,
+            id: v.table2.id,
+            name_zh: v.table2.name_zh || v.table2.name,
             alias: v.table2.alias,
             tableUuid: v.table2.tableUuid,
-            tableId: v.table2.id,
-            table: v.table2.name,
             datasourceId: v.table2.datasourceId,
             datasourceName: v.table2.datasourceName,
             columns: v.columns
@@ -92,23 +220,24 @@ var GroupBy = function GroupBy(props) {
         }));
       }
     } else {
-      // @ts-ignore
       data = store.metaList[groupIndex].list.slice(0, index).map(function (v) {
         if (v.type === TypeEnum.data) {
           return {
+            name: v.table.name,
+            id: v.table.id,
+            name_zh: v.table.name_zh || v.table.name,
             alias: v.table.alias,
-            table: v.table.name,
             tableUuid: v.table.tableUuid,
-            tableId: v.table.id,
             datasourceId: v.table.datasourceId,
             datasourceName: v.table.datasourceName,
             columns: v.columns
           };
         } else if (v.type === TypeEnum.joinData) {
           return {
+            name: v.table2.name,
+            id: v.table2.id,
+            name_zh: v.table2.name_zh || v.table2.name,
             alias: v.table2.alias,
-            table: v.table2.name,
-            tableId: v.table2.id,
             tableUuid: v.table2.tableUuid,
             datasourceId: v.table2.datasourceId,
             datasourceName: v.table2.datasourceName,
@@ -116,11 +245,16 @@ var GroupBy = function GroupBy(props) {
           };
         } else {
           return {
-            table: null
+            name: '',
+            id: '',
+            name_zh: '',
+            alias: '',
+            tableUuid: '',
+            columns: []
           };
         }
       }).filter(function (v) {
-        return v.table;
+        return Boolean(v.name);
       });
     }
     return data;
@@ -129,29 +263,14 @@ var GroupBy = function GroupBy(props) {
     var newMeta = store.metaList[groupIndex].list.slice();
     var data = getColumns();
     var value = by[i];
-    store.setPopup({
+    store.setPopup2({
       visible: true,
       node: e.currentTarget,
-      content: _jsx(SelectJoinColumn, {
+      content: _jsx(GroupByEditor, {
         data: data,
         value: value,
-        theme: ColumnsPopupThemeEnum.greenGrass,
-        isGroup: true,
-        // @ts-ignore
-        onGroup: function onGroup(data) {
-          // @ts-ignore
-          newMeta[index].by.splice(i, 1, data);
-          // @ts-ignore
-          newMeta[index].by = newMeta[index].by.map(function (v) {
-            var fieldAlias = "".concat(v.alias, "__").concat(v.name);
-            return _objectSpread(_objectSpread({}, v), {}, {
-              sql: "".concat(v.alias, ".").concat(v.realName || v.name),
-              fieldAlias: fieldAlias
-            });
-          });
-          // if (value.quotes !== data.quotes) {
-          //   newMeta = newMeta.filter((_: MetaListType, _i: number) => _i <= index);
-          // }
+        onChange: function onChange(nextValue) {
+          newMeta[index].by.splice(i, 1, normalizeByRecord(nextValue, i, newMeta));
           store.setMeta(newMeta, groupIndex, {
             obj: newMeta[index].by,
             type: ChangeType.by
@@ -180,36 +299,17 @@ var GroupBy = function GroupBy(props) {
       quotes: '',
       datasourceId: '',
       datasourceName: '',
-      // column: '',
-      // column_id: '',
+      atoms: [],
       summarizeType: MetaSummarize_Enum.BY
     };
-    store.setPopup({
+    store.setPopup2({
       visible: true,
       node: e.currentTarget,
-      content: _jsx(SelectJoinColumn, {
+      content: _jsx(GroupByEditor, {
         data: data,
         value: value,
-        theme: ColumnsPopupThemeEnum.greenGrass,
-        isGroup: true,
-        // @ts-ignore
-        onGroup: function onGroup(data) {
-          // @ts-ignore
-          newMeta[index].by.push(data);
-          // @ts-ignore
-          newMeta[index].by = newMeta[index].by.map(function (v) {
-            var _store$preProps;
-            var fieldAlias = "".concat(getAlias(v.alias, newMeta, ((_store$preProps = store.preProps) === null || _store$preProps === void 0 ? void 0 : _store$preProps.notExistsColumns) || []), "__").concat(v.name);
-            if (!isValidSQLAlias(fieldAlias)) {
-              Toast.warning(__('SqlQueryBuilder.aliasForRules'));
-            }
-            return _objectSpread(_objectSpread({}, v), {}, {
-              sql: "".concat(v.alias, ".").concat(v.realName || v.name),
-              fieldAlias: v.fieldAlias || fieldAlias,
-              fieldUuid: uuidv4('field'),
-              summarizeType: MetaSummarize_Enum.BY
-            });
-          });
+        onChange: function onChange(nextValue) {
+          newMeta[index].by.push(normalizeByRecord(nextValue, newMeta[index].by.length, newMeta));
           store.setMeta(newMeta, groupIndex, {
             obj: newMeta[index].by,
             type: ChangeType.by
@@ -223,15 +323,13 @@ var GroupBy = function GroupBy(props) {
     e.stopPropagation();
     closePopup();
     var newMeta = store.metaList[groupIndex].list.slice();
-    // @ts-ignore
     newMeta[index].by = by.filter(function (_, i) {
       return i !== itemId;
     });
-    // newMeta = newMeta.filter((_: MetaListType, _i: number) => _i <= index);
     store.setMeta(newMeta, groupIndex);
   }
   function closePopup() {
-    store.setPopup({
+    store.setPopup2({
       visible: false
     });
   }
@@ -239,7 +337,6 @@ var GroupBy = function GroupBy(props) {
     var fieldAlias = val || '';
     Modal.confirm({
       title: __('SqlQueryBuilder.alias'),
-      // 设置别名
       content: _jsx(Input, {
         defaultValue: fieldAlias,
         onChange: function onChange(val) {
@@ -247,7 +344,7 @@ var GroupBy = function GroupBy(props) {
         }
       }),
       onOk: function () {
-        var _onOk = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+        var _onOk = _asyncToGenerator(_regeneratorRuntime.mark(function _callee() {
           var newMeta;
           return _regeneratorRuntime.wrap(function (_context) {
             while (1) switch (_context.prev = _context.next) {
@@ -259,9 +356,9 @@ var GroupBy = function GroupBy(props) {
                 Toast.warning(__('SqlQueryBuilder.aliasForRules'));
                 return _context.abrupt("return", false);
               case 1:
-                newMeta = store.metaList[groupIndex].list.slice(); // @ts-ignore
-                newMeta[index].by[i].sql = newMeta[index].by[i].sql.split('AS ')[0] + "AS ".concat(fieldAlias); //修改sql
+                newMeta = store.metaList[groupIndex].list.slice();
                 newMeta[index].by[i].fieldAlias = fieldAlias;
+                newMeta[index].by[i].sql = summarizeByToSql(newMeta[index].by[i]);
                 newMeta = changeFieldAlias(newMeta, newMeta[index].by[i]);
                 store.setMeta(newMeta, groupIndex, {
                   obj: newMeta[index].by,
@@ -284,15 +381,11 @@ var GroupBy = function GroupBy(props) {
   var _getColumns = function _getColumns() {
     return getColumns().map(function (v) {
       return _objectSpread(_objectSpread({}, v), {}, {
-        name: v.table,
-        id: v.tableId,
-        name_zh: '',
+        name_zh: v.name_zh || '',
         tableUuid: v.tableUuid,
         alias: v.alias,
-        // 线上的都为空，默认会标红。 等统一格式后可隐藏
         datasourceName: '',
-        // 数据源名
-        datasourceId: '' // 数据源id
+        datasourceId: ''
       });
     });
   };
@@ -300,36 +393,105 @@ var GroupBy = function GroupBy(props) {
     var _v = cloneDeep(v);
     return _objectSpread(_objectSpread({}, _v), {}, {
       fieldName: v.name,
-      // 字段名
       fieldNameZh: v.name_zh,
-      // 字段中文名
       fieldAlias: v.fieldAlias,
-      // 别名
       fieldUuid: v.fieldUuid,
-      // uuid
       fieldId: v.fieldId,
-      // 字段id
       tableName: v.table,
-      // 表名
       tableNameZh: '',
       tableId: v.tableId,
-      // 表名
       tableAlias: v.alias,
-      // 别名
       tableUuid: v.tableUuid,
-      // 表唯一标识
-      // 线上的都为空，默认会标红。 等统一格式后可隐藏
       datasourceName: '',
-      // 数据源名
       datasourceId: '',
-      // 数据源id
       type: AtomsTypeEnum.FIELD
     });
   };
+  var _getFirstField = function getFirstField() {
+    var list = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+    var _iterator = _createForOfIteratorHelper(list),
+      _step;
+    try {
+      for (_iterator.s(); !(_step = _iterator.n()).done;) {
+        var item = _step.value;
+        if (!item) continue;
+        if (item.type === AtomsTypeEnum.FIELD) return item;
+        if (item.type === AtomsTypeEnum.EXPRESSION) {
+          var found = _getFirstField([].concat(_toConsumableArray(item.lhs || []), _toConsumableArray(item.rhs || [])));
+          if (found) return found;
+        }
+        if (item.type === AtomsTypeEnum.FORMULA) {
+          var _found = (item.args || []).map(function (arg) {
+            return _getFirstField((arg === null || arg === void 0 ? void 0 : arg.list) || []);
+          }).find(Boolean);
+          if (_found) return _found;
+        }
+        if (item.type === AtomsTypeEnum.AND_OR) {
+          var _found2 = _getFirstField(item.list || []);
+          if (_found2) return _found2;
+        }
+        if (item.type === AtomsTypeEnum.CASE_WHEN) {
+          var _found3 = _getFirstField(item.caseValue || []) || (item.branches || []).map(function (branch) {
+            return _getFirstField([].concat(_toConsumableArray(branch.when || []), _toConsumableArray(branch.then || [])));
+          }).find(Boolean) || _getFirstField(item.elseValue || []);
+          if (_found3) return _found3;
+        }
+        if (item.type === AtomsTypeEnum.EXISTS || item.type === AtomsTypeEnum.NOT_EXISTS) {
+          var _found4 = _getFirstField(item.notExists || []);
+          if (_found4) return _found4;
+        }
+      }
+    } catch (err) {
+      _iterator.e(err);
+    } finally {
+      _iterator.f();
+    }
+    return null;
+  };
+  var getAtomsValue = function getAtomsValue(record) {
+    var _record$atoms;
+    if ((_record$atoms = record.atoms) !== null && _record$atoms !== void 0 && _record$atoms.length) return record.atoms;
+    var field = getField(record);
+    return field.fieldName ? [field] : [];
+  };
+  var normalizeByRecord = function normalizeByRecord(record, itemIndex, metaList) {
+    var _store$preProps;
+    var atoms = getAtomsValue(record);
+    var firstField = _getFirstField(atoms);
+    var nextRecord = _objectSpread(_objectSpread({}, record), {}, {
+      atoms: atoms.length ? atoms : undefined,
+      quotes: _getSummaryText(atoms) || record.quotes || record.name || '',
+      summarizeType: MetaSummarize_Enum.BY
+    });
+    if (firstField) {
+      nextRecord.table = firstField.tableName || nextRecord.table;
+      nextRecord.tableId = firstField.tableId || nextRecord.tableId;
+      nextRecord.tableUuid = firstField.tableUuid || nextRecord.tableUuid;
+      nextRecord.alias = firstField.tableAlias || nextRecord.alias;
+      nextRecord.name = firstField.fieldName || nextRecord.name;
+      nextRecord.name_zh = firstField.fieldNameZh || nextRecord.name_zh;
+      nextRecord.id = firstField.fieldId || nextRecord.id;
+      nextRecord.fieldId = firstField.fieldId || nextRecord.fieldId;
+      nextRecord.realName = firstField.fieldName || nextRecord.realName;
+      nextRecord.fieldUuid = firstField.fieldUuid || nextRecord.fieldUuid;
+      nextRecord.datasourceId = firstField.datasourceId || nextRecord.datasourceId;
+      nextRecord.datasourceName = firstField.datasourceName || nextRecord.datasourceName;
+      nextRecord.database_type = firstField.database_type || nextRecord.database_type;
+    }
+    var defaultFieldAlias = firstField !== null && firstField !== void 0 && firstField.fieldName ? buildAutoGroupByAlias(getAlias(firstField.tableAlias || nextRecord.alias, metaList, ((_store$preProps = store.preProps) === null || _store$preProps === void 0 ? void 0 : _store$preProps.notExistsColumns) || []), firstField.fieldName, itemIndex) : "group_by_".concat(itemIndex + 1);
+    nextRecord.fieldAlias = nextRecord.fieldAlias || defaultFieldAlias;
+    nextRecord.fieldUuid = nextRecord.fieldUuid || uuidv4('field');
+    nextRecord.sql = summarizeByToSql(nextRecord);
+    if (!isValidSQLAlias(nextRecord.fieldAlias)) {
+      Toast.warning(__('SqlQueryBuilder.aliasForRules'));
+    }
+    return nextRecord;
+  };
   return _jsxs(_Fragment, {
     children: [meta.by.map(function (v, i) {
+      var atomsValue = getAtomsValue(v);
       return _jsx(ItemName, {
-        isError: isError(getField(v), _getColumns()),
+        isError: isError(atomsValue.length ? atomsValue : getField(v), _getColumns()),
         children: _jsxs("div", {
           className: "Sqb-TableName green-name",
           onClick: function onClick(e) {