@gingkoo/pandora-metabase 1.0.33 → 1.0.35

package/lib/cjs/utils/transformSql.js

@@ -9,6 +9,7 @@ var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectWithoutProperties"));
 var _excluded = ["children"];
+// @ts-nocheck
 var procEnum = {
   mysql: 'mysql',
   oracle: 'oracle',
@@ -83,7 +84,7 @@ var _recursionArr2 = function _recursionArr(arr) {
   }
   return obj;
 };
-var _handleBaseType2Sql9 = function _handleBaseType2Sql(list) {
+var _handleBaseType2Sql8 = function _handleBaseType2Sql(list) {
   var db = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : procEnum.mysql;
   var sql = '';
   var constants = [];
@@ -150,11 +151,11 @@ var _handleBaseType2Sql9 = function _handleBaseType2Sql(list) {
       var lhs = item.lhs,
         rhs = item.rhs;
       // 他很特殊 左边里面只有一种类型 右边面只有一种类型
-      var _handleBaseType2Sql2 = _handleBaseType2Sql9(lhs, db),
+      var _handleBaseType2Sql2 = _handleBaseType2Sql8(lhs, db),
         leftSql = _handleBaseType2Sql2.sql,
         leftSqlItems = _handleBaseType2Sql2.sql_items,
         joinDefaultLeftConstants = _handleBaseType2Sql2.constants;
-      var _handleBaseType2Sql3 = _handleBaseType2Sql9(rhs, db),
+      var _handleBaseType2Sql3 = _handleBaseType2Sql8(rhs, db),
         rightSql = _handleBaseType2Sql3.sql,
         rightSqlItems = _handleBaseType2Sql3.sql_items,
         joinDefaultRightConstants = _handleBaseType2Sql3.constants;
@@ -194,11 +195,11 @@ var _handleBaseType2Sql9 = function _handleBaseType2Sql(list) {
         condition = item.condition,
         database_type = item.database_type,
         formula = item.formula;
-      var _handleBaseType2Sql4 = _handleBaseType2Sql9(_lhs, db),
+      var _handleBaseType2Sql4 = _handleBaseType2Sql8(_lhs, db),
         _leftSql = _handleBaseType2Sql4.sql,
         _leftSqlItems = _handleBaseType2Sql4.sql_items,
         _joinDefaultLeftConstants = _handleBaseType2Sql4.constants;
-      var _handleBaseType2Sql5 = _handleBaseType2Sql9(_rhs, db),
+      var _handleBaseType2Sql5 = _handleBaseType2Sql8(_rhs, db),
         _rightSql = _handleBaseType2Sql5.sql,
         _rightSqlItems = _handleBaseType2Sql5.sql_items,
         _joinDefaultRightConstants = _handleBaseType2Sql5.constants;
@@ -469,40 +470,25 @@ var _handleBaseType2Sql9 = function _handleBaseType2Sql(list) {
     if ([BlockTypeEnum.notExists, BlockTypeEnum.exists].includes(type)) {
       var notExists = item.notExists;
       if (notExists && notExists !== null && notExists !== void 0 && notExists.length) {
-        var _mainTable$table, _mainTable$table2;
-        var mainTable = notExists.find(function (v) {
-          return v.type === MetabaseTypeEnum.data;
-        });
-        var filterMeta = notExists.find(function (v) {
-          return v.type === MetabaseTypeEnum.filter;
-        });
-        var where = '';
-        if (filterMeta && filterMeta.filter && Array.isArray(filterMeta.filter) && filterMeta.filter.length) {
-          var _handleBaseType2Sql6 = _handleBaseType2Sql9(filterMeta.filter, db),
-            notExistsSql = _handleBaseType2Sql6.sql,
-            constInNotExistsFilter = _handleBaseType2Sql6.constants;
-          constants.push.apply(constants, (0, _toConsumableArray2["default"])(constInNotExistsFilter));
-          where = "WHERE ".concat(notExistsSql);
-        }
         if (type === BlockTypeEnum.notExists) {
           sql += ' NOT EXISTS';
         } else {
           sql += ' EXISTS';
         }
-        sql += " (SELECT 1 FROM ".concat(mainTable === null || mainTable === void 0 || (_mainTable$table = mainTable.table) === null || _mainTable$table === void 0 ? void 0 : _mainTable$table.name, " AS ").concat(mainTable === null || mainTable === void 0 || (_mainTable$table2 = mainTable.table) === null || _mainTable$table2 === void 0 ? void 0 : _mainTable$table2.alias, " ").concat(where, ")");
+        sql += " (".concat(handleSqlUnion(notExists, db, true).sql, ")");
       }
     }
     if (type === BlockTypeEnum.FORMULA) {
-      var _handleBaseType2Sql7 = _handleBaseType2Sql9(item.args, db),
-        argSql = _handleBaseType2Sql7.sql,
-        formulaConstants = _handleBaseType2Sql7.constants;
+      var _handleBaseType2Sql6 = _handleBaseType2Sql8(item.args, db),
+        argSql = _handleBaseType2Sql6.sql,
+        formulaConstants = _handleBaseType2Sql6.constants;
       sql += " ".concat(item.name, "(").concat(argSql, ")");
       constants.push.apply(constants, (0, _toConsumableArray2["default"])(formulaConstants));
     }
     if (type === BlockTypeEnum.collection) {
-      var _handleBaseType2Sql8 = _handleBaseType2Sql9(item.list, db),
-        collectionSql = _handleBaseType2Sql8.sql,
-        collectionConstants = _handleBaseType2Sql8.constants;
+      var _handleBaseType2Sql7 = _handleBaseType2Sql8(item.list, db),
+        collectionSql = _handleBaseType2Sql7.sql,
+        collectionConstants = _handleBaseType2Sql7.constants;
       sql += " ".concat(collectionSql);
       constants.push.apply(constants, (0, _toConsumableArray2["default"])(collectionConstants));
     }
@@ -526,9 +512,9 @@ var _handleJoinData = function _handleJoinData(joinData) {
     if (isSubquery) {
       subQuery = subquery;
     }
-    var _handleBaseType2Sql0 = _handleBaseType2Sql9(expressions, db),
-      sql = _handleBaseType2Sql0.sql,
-      joinConstants = _handleBaseType2Sql0.constants;
+    var _handleBaseType2Sql9 = _handleBaseType2Sql8(expressions, db),
+      sql = _handleBaseType2Sql9.sql,
+      joinConstants = _handleBaseType2Sql9.constants;
     var joinCondition = "on ".concat(sql);
     constants = joinConstants;
     return {
@@ -618,9 +604,9 @@ var _handleNesting = function handleNesting(data) {
     var customColumnsConstants = [];
     var handleCustomColumn = function handleCustomColumn(data) {
       return data.map(function (it) {
-        var _handleBaseType2Sql1 = _handleBaseType2Sql9(it.formulaList, db),
-          field_sql = _handleBaseType2Sql1.sql,
-          constants = _handleBaseType2Sql1.constants;
+        var _handleBaseType2Sql0 = _handleBaseType2Sql8(it.formulaList, db),
+          field_sql = _handleBaseType2Sql0.sql,
+          constants = _handleBaseType2Sql0.constants;
         customColumnsConstants.push.apply(customColumnsConstants, (0, _toConsumableArray2["default"])(constants));
         return {
           field_sql: "".concat(field_sql, " as ").concat(it.name),
@@ -635,9 +621,9 @@ var _handleNesting = function handleNesting(data) {
     obj.customColumnsConstants = customColumnsConstants;
   }
   if (filterData && filterData.filter.length) {
-    var _handleBaseType2Sql10 = _handleBaseType2Sql9(filterData.filter, db),
-      sql = _handleBaseType2Sql10.sql,
-      constants = _handleBaseType2Sql10.constants;
+    var _handleBaseType2Sql1 = _handleBaseType2Sql8(filterData.filter, db),
+      sql = _handleBaseType2Sql1.sql,
+      constants = _handleBaseType2Sql1.constants;
     obj.filters = 'WHERE ' + sql;
     obj.filtersConstants = constants;
   }
@@ -682,8 +668,8 @@ var _handleNesting = function handleNesting(data) {
   }
   if (sortData && sortData.sort.length) {
     obj.orderInfos = "ORDER BY ".concat(sortData.sort.map(function (v) {
-      var _handleBaseType2Sql11 = _handleBaseType2Sql9(v.expression, db),
-        sql = _handleBaseType2Sql11.sql;
+      var _handleBaseType2Sql10 = _handleBaseType2Sql8(v.expression, db),
+        sql = _handleBaseType2Sql10.sql;
       return "".concat(sql, " ").concat(v.sort);
     }).join(', '));
   }
@@ -754,6 +740,7 @@ var handleSqlStruct = function handleSqlStruct(list) {
 // 处理 union
 var handleSqlUnion = function handleSqlUnion(metas) {
   var db = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : procEnum.mysql;
+  var noFields = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
   var unionMetas = metas.filter(function (it) {
     return it.type === MetabaseTypeEnum.union;
   });
@@ -761,7 +748,7 @@ var handleSqlUnion = function handleSqlUnion(metas) {
     return it.type !== MetabaseTypeEnum.union;
   });
   var data = handleSqlStruct(baseMetas, db);
-  var _sqlStruct2text = _sqlStruct2text3(data, 0, db),
+  var _sqlStruct2text = _sqlStruct2text3(data, 0, db, noFields),
     sql = _sqlStruct2text.sql,
     fields = _sqlStruct2text.fields;
   var union_fields = [fields];
@@ -792,6 +779,7 @@ var handleSqlUnion = function handleSqlUnion(metas) {
 var _sqlStruct2text3 = function sqlStruct2text(data) {
   var indent = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
   var db = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : procEnum.mysql;
+  var noFields = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
   var sql = '';
   var hasInnerSql = data.hasInnerSql,
     innerSqlStruct = data.innerSqlStruct,
@@ -811,51 +799,55 @@ var _sqlStruct2text3 = function sqlStruct2text(data) {
   // 情况一、一层 带聚合  字段是 聚合字段
   // 情况二、一层 不带聚合  字段是 主表和关联表的字段
   // 情况三、二层 带聚合 第一层 聚合字段 + 关联表字段 第二层 聚合字段  第三层 聚合字段
-  var flag = false; // 是否加逗号
-  if (limit && db === procEnum.sqlserver) {
-    sql += "TOP(".concat(limit, ") ");
-  }
-  if (hasInnerSql) {
-    // 情况三  innerSqlStruct.queryColumns 是内层 聚合输出的字段,这种字段虽说是内层的，但是其实外层也需要
-    if (innerSqlStruct.queryColumns && innerSqlStruct.queryColumns.length) {
-      sql += innerSqlStruct.queryColumns.map(function (v) {
-        return "".concat(alias, ".").concat(v.name, " as ").concat(v.name);
-      }).join(', ') + ' ';
-      flag = true;
-    }
+  if (noFields) {
+    sql += '1 ';
   } else {
-    if (Array.isArray(queryColumns) && queryColumns.length) {
-      // 情况一  queryColumns 是聚合字段
-      // 情况二  queryColumns 是主表字段
-      // 情况三  queryColumns 是聚合字段
-      flag = true;
-      sql += queryColumns.map(function (v) {
-        return v.field_sql;
-      }).join(', ') + ' ';
+    var flag = false; // 是否加逗号
+    if (limit && db === procEnum.sqlserver) {
+      sql += "TOP(".concat(limit, ") ");
     }
-  }
-  if (firstEntry && joinTables && !groupBy) {
-    // 情况二  joinTables 是关联表字段
-    // 情况三  joinTables 是关联表字段
-    joinTables.forEach(function (it) {
-      if (Array.isArray(it.queryColumns) && it.queryColumns.length) {
-        if (flag) {
-          sql += ', ';
-        }
-        sql += it.queryColumns.map(function (v) {
-          return v.field_sql;
+    if (hasInnerSql) {
+      // 情况三  innerSqlStruct.queryColumns 是内层 聚合输出的字段,这种字段虽说是内层的，但是其实外层也需要
+      if (innerSqlStruct.queryColumns && innerSqlStruct.queryColumns.length) {
+        sql += innerSqlStruct.queryColumns.map(function (v) {
+          return "".concat(alias, ".").concat(v.name, " as ").concat(v.name);
         }).join(', ') + ' ';
         flag = true;
       }
-    });
-  }
-  if (customColumns && customColumns.length) {
-    if (flag) {
-      sql += ', ';
+    } else {
+      if (Array.isArray(queryColumns) && queryColumns.length) {
+        // 情况一  queryColumns 是聚合字段
+        // 情况二  queryColumns 是主表字段
+        // 情况三  queryColumns 是聚合字段
+        flag = true;
+        sql += queryColumns.map(function (v) {
+          return v.field_sql;
+        }).join(', ') + ' ';
+      }
+    }
+    if (firstEntry && joinTables && !groupBy) {
+      // 情况二  joinTables 是关联表字段
+      // 情况三  joinTables 是关联表字段
+      joinTables.forEach(function (it) {
+        if (Array.isArray(it.queryColumns) && it.queryColumns.length) {
+          if (flag) {
+            sql += ', ';
+          }
+          sql += it.queryColumns.map(function (v) {
+            return v.field_sql;
+          }).join(', ') + ' ';
+          flag = true;
+        }
+      });
+    }
+    if (customColumns && customColumns.length) {
+      if (flag) {
+        sql += ', ';
+      }
+      sql += customColumns.map(function (v) {
+        return v.field_sql;
+      }).join(', ') + ' ';
     }
-    sql += customColumns.map(function (v) {
-      return v.field_sql;
-    }).join(', ') + ' ';
   }
   // -------- 处理 main table --------
   sql += 'FROM ';
@@ -908,7 +900,7 @@ var _sqlStruct2text3 = function sqlStruct2text(data) {
   }
   // -------- 获取 字段列表 --------
   var fields = [];
-  if (firstEntry) {
+  if (firstEntry && !noFields) {
     function addFields(data) {
       var name = data.name,
         name_zh = data.name_zh,
@@ -956,7 +948,7 @@ var _sqlStruct2text3 = function sqlStruct2text(data) {
 var transformSql = exports.transformSql = function transformSql(metas) {
   var db = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : procEnum.mysql;
   // let new_metas = upgradeLegacyData(metas);
-  var _handleSqlUnion = handleSqlUnion(metas, db),
+  var _handleSqlUnion = handleSqlUnion(metas, db, true),
     sql = _handleSqlUnion.sql,
     fields = _handleSqlUnion.fields,
     union_fields = _handleSqlUnion.union_fields;

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

@@ -2,7 +2,7 @@ import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-var _excluded = ["notExistsToolbar", "toolbar"];
+var _excluded = ["notExistsToolbar", "subShowSubquery", "toolbar"];
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import { useState, forwardRef } from 'react';
 import cx from 'classnames';
@@ -139,6 +139,8 @@ var FormulaList = forwardRef(function (props, ref) {
     var _caseList$i, _caseList$i2;
     var _store$preProps = store.preProps,
       notExistsToolbar = _store$preProps.notExistsToolbar,
+      _store$preProps$subSh = _store$preProps.subShowSubquery,
+      subShowSubquery = _store$preProps$subSh === void 0 ? false : _store$preProps$subSh,
       toolbar = _store$preProps.toolbar,
       other = _objectWithoutProperties(_store$preProps, _excluded);
     var _value = ((_caseList$i = caseList[i]) === null || _caseList$i === void 0 ? void 0 : _caseList$i.notExists) || [];
@@ -154,7 +156,7 @@ var FormulaList = forwardRef(function (props, ref) {
         children: _jsx(Metabase, _objectSpread(_objectSpread({}, other), {}, {
           notExistsColumns: exitData,
           showFields: false,
-          showSubquery: false,
+          // showSubquery={subShowSubquery}
           toolbar: _toolbar,
           btnText: __('SqlQueryBuilder.confirm'),
           value: cloneDeep(_value),

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

@@ -157,6 +157,14 @@ export var customTypes = [
   value: AtomsTypeEnum.FORMULA,
   label: __('customColumn.formula'),
   children: operatorList
+},
+// EXISTS
+{
+  value: AtomsTypeEnum.NOT_EXISTS,
+  label: 'NOT_EXISTS'
+}, {
+  value: AtomsTypeEnum.EXISTS,
+  label: 'EXISTS'
 }];
 export var getTemplateItem = function getTemplateItem(type) {
   var temItem;

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

@@ -65,7 +65,8 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
   var _useState3 = useState((_value === null || _value === void 0 || (_value$ = _value[0]) === null || _value$ === void 0 ? void 0 : _value$.tableId) === SummarizeAlias ? '' : _value === null || _value === void 0 || (_value$2 = _value[0]) === null || _value$2 === void 0 ? void 0 : _value$2.tableUuid),
     _useState4 = _slicedToArray(_useState3, 2),
     curTable = _useState4[0],
-    setCurTable = _useState4[1]; // 当前选择的表
+    setCurTable = _useState4[1];
+  // 当前选择的表
   // const [curColumn, setCurColumn] = useState(_value); // 当前选择的字段
   var _useState5 = useState(data.map(function (v, i) {
       var open = !i && !curTable ? true : v.tableUuid === curTable; // TODO.这里只判断表名相等 没有用了 因为表上面加了一层数据源 先这样吧
@@ -93,9 +94,10 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
       return v.tableUuid === tableUuid;
     });
     if (isHas.length < 1 && tableUuid !== SummarizeAlias) {
-      tableUuid = data[0].tableUuid;
+      var _data$;
+      tableUuid = (data === null || data === void 0 || (_data$ = data[0]) === null || _data$ === void 0 ? void 0 : _data$.tableUuid) || '';
     }
-    setTableList(data.map(function (v, i) {
+    setTableList(data === null || data === void 0 ? void 0 : data.map(function (v, i) {
       var open = !i && !tableUuid ? true : v.tableUuid === tableUuid; // TODO.这里只判断表名相等 没有用了 因为表上面加了一层数据源 先这样吧
       return _objectSpread(_objectSpread({}, v), {}, {
         open: open,
@@ -162,7 +164,7 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
         style: {
           width: 300
         },
-        children: tableList.map(function (tableItem) {
+        children: tableList.map(function (tableItem, i) {
           var tableAlias = tableItem.alias,
             tableName = tableItem.name,
             columns = tableItem.columns,
@@ -267,7 +269,7 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
                   className: cx("Sqb-List-section"),
                   children: _jsx("div", {
                     className: cx("Sqb-List-item mx-2", {
-                      active: isActive(v.id)
+                      active: isActive(v.id || v.name)
                     }),
                     onClick: function onClick() {
                       if (isSummarize) {
@@ -282,7 +284,7 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
                         datasourceName: tableItem.datasourceName || '',
                         datasourceId: tableItem.datasourceId || '',
                         fieldName: v.name,
-                        fieldId: v.id,
+                        fieldId: v.id || v.name,
                         fieldNameZh: v.name_zh || '',
                         fieldAlias: v.fieldAlias,
                         fieldUuid: v.fieldUuid,
@@ -310,9 +312,9 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
                         className: 'List-item-icon',
                         children: IconMap[special_type || database_type] || _jsx(LetterAaIcon, {})
                       }), _jsx("div", {
-                        children: _jsx("h4", {
+                        children: _jsxs("h4", {
                           className: 'List-item-title ml-2',
-                          children: replaceTpl(store.fieldNameTpl, v)
+                          children: [replaceTpl(store.fieldNameTpl, v), v.fieldAlias ? " as ".concat(v.fieldAlias) : '']
                         })
                       })]
                     })
@@ -320,7 +322,7 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
                 }, i);
               })]
             })]
-          }, tableUuid || tableAlias);
+          }, (tableUuid || tableAlias) + '' + i);
         })
       })
     }), showNextBtn && multiple && _jsx(Button, {

package/lib/es/components/dialog/select-permission-table/index.js

@@ -34,7 +34,6 @@ var SelectPermissionTable = function SelectPermissionTable(_ref) {
           width: '100%'
         },
         children: Array.isArray(datasource) && datasource.map(function (v) {
-          console.log('🚀 ~ SelectPermissionTable ~ v:', v);
           return _jsx("div", {
             className: cx("Sqb-List-section"),
             children: _jsx("div", {

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

@@ -142,6 +142,19 @@ var Filter = function Filter(props) {
     newMeta[index].filter = val;
     store.setMeta(newMeta, groupIndex);
   };
+  var getPreColumns = function getPreColumns() {
+    var data = [].concat(_toConsumableArray(getColumns()), _toConsumableArray(cloneDeep(notExistsColumns || [])));
+    // 将source 拍到最前面
+    var priorityNames = ['source'];
+    var sorted = data.sort(function (a, b) {
+      var aPriority = priorityNames.includes(a.name);
+      var bPriority = priorityNames.includes(b.name);
+      if (aPriority && !bPriority) return -1;
+      if (!aPriority && bPriority) return 1;
+      return 0;
+    });
+    return sorted;
+  };
   return _jsx(Wrapper, {
     className: "Sqb-item",
     children: _jsxs("div", {
@@ -159,7 +172,7 @@ var Filter = function Filter(props) {
           customTypes: customTypes,
           operatorList: operatorList,
           value: filter,
-          data: [].concat(_toConsumableArray(getColumns()), _toConsumableArray(cloneDeep(notExistsColumns || []))),
+          data: getPreColumns(),
           exitData: getColumns(),
           onChange: function onChange(val) {
             selectFilter(val);

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

@@ -61,7 +61,7 @@ var menuOperator = operators.map(function (v) {
   };
 });
 var JoinData = function JoinData(props) {
-  var _meta$subquery, _meta$subquery2, _meta$subquery3, _meta$table2, _meta$table3, _meta$table5, _meta$table6, _meta$table7, _meta$table8, _meta$expressions, _meta$table9, _meta$table0, _meta$expressions2, _store$showMainColumn, _store$showMainColumn2;
+  var _meta$subquery, _meta$subquery2, _meta$subquery3, _meta$table3, _meta$table4, _meta$table6, _meta$table7, _meta$table8, _meta$table9, _meta$expressions, _meta$table0, _meta$table1, _meta$expressions2, _store$showMainColumn, _store$showMainColumn2;
   var meta = props.meta,
     groupIndex = props.groupIndex;
   var store = useStore();
@@ -73,7 +73,8 @@ var JoinData = function JoinData(props) {
   var subQuerySelected = Boolean((_meta$subquery = meta.subquery) === null || _meta$subquery === void 0 || (_meta$subquery = _meta$subquery[0]) === null || _meta$subquery === void 0 || (_meta$subquery = _meta$subquery.table) === null || _meta$subquery === void 0 ? void 0 : _meta$subquery.name);
   var columnsSelected = meta.table1.name && meta.table2.name;
   var _getHelper = getHelper(store.metaList[groupIndex].list, meta),
-    prevTables = _getHelper.prevTables;
+    prevTables = _getHelper.prevTables,
+    prevGroupBy = _getHelper.prevGroupBy;
   // const ref = useRef(null);
   // useEffect(() => {
   //   let newMetaList = store.metaList[groupIndex].list.slice();
@@ -365,8 +366,9 @@ var JoinData = function JoinData(props) {
         onChange: function onChange(data) {
           var tableName = data.name;
           if (meta.table2.name !== tableName || meta.table2.datasourceId !== data.datasourceId) {
+            var _store$preProps;
             var newMeta = store.metaList[groupIndex].list.slice();
-            var alias = getAlias(tableName, newMeta);
+            var alias = getAlias(tableName, newMeta, ((_store$preProps = store.preProps) === null || _store$preProps === void 0 ? void 0 : _store$preProps.notExistsColumns) || []);
             var _table2 = _objectSpread(_objectSpread({}, data), {}, {
               name: tableName,
               tableUuid: data.tableUuid || uuidv4('table'),
@@ -600,6 +602,7 @@ var JoinData = function JoinData(props) {
     return data;
   }
   function selectMoreJoinColumn(e) {
+    var _data2, _data3, _data4;
     var node = e.currentTarget;
     var _position = node.getAttribute('v-position');
     var _ind = Number(node.getAttribute('v-index'));
@@ -716,6 +719,10 @@ var JoinData = function JoinData(props) {
         columns: meta.columns
       }];
     }
+    // 字段为空，或只存在聚合且聚合为空时
+    if (data.length < 1 || Array.isArray(data) && ((_data2 = data) === null || _data2 === void 0 ? void 0 : _data2.length) === 1 && ((_data3 = data) === null || _data3 === void 0 || (_data3 = _data3[0]) === null || _data3 === void 0 ? void 0 : _data3.name) === SummarizeAlias && ((_data4 = data) === null || _data4 === void 0 || (_data4 = _data4[0]) === null || _data4 === void 0 || (_data4 = _data4.columns) === null || _data4 === void 0 ? void 0 : _data4.length) < 1) {
+      Toast.warning(__('SqlQueryBuilder.pleaseSelectTable'));
+    }
     !meta.readonly && store.setPopup({
       visible: true,
       node: node,
@@ -883,10 +890,10 @@ var JoinData = function JoinData(props) {
   // 子查询弹窗
   var showSubQuery = function showSubQuery() {
     var val = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
-    var _store$preProps = store.preProps,
-      subToolbar = _store$preProps.subToolbar,
-      toolbar = _store$preProps.toolbar,
-      other = _objectWithoutProperties(_store$preProps, _excluded);
+    var _store$preProps2 = store.preProps,
+      subToolbar = _store$preProps2.subToolbar,
+      toolbar = _store$preProps2.toolbar,
+      other = _objectWithoutProperties(_store$preProps2, _excluded);
     var newMeta = store.metaList[groupIndex].list.slice();
     var index = findIndex(store.metaList[groupIndex].list, meta);
     var oldList = cloneDeep(newMeta[index].subquery);
@@ -905,6 +912,7 @@ var JoinData = function JoinData(props) {
           value: cloneDeep(val),
           onOk: function onOk(newList) {
             try {
+              var _store$preProps3;
               // 子查询未改变不做操作
               if (isEqual(newList, oldList)) {
                 o.close();
@@ -912,7 +920,7 @@ var JoinData = function JoinData(props) {
               }
               newMeta[index].subquery = newList;
               newMeta[index].table2 = _objectSpread(_objectSpread({}, newList[0].table), {}, {
-                alias: newMeta[index].table2.alias || getAlias(newList[0].table.name, newMeta)
+                alias: newMeta[index].table2.alias || getAlias(newList[0].table.name, newMeta, ((_store$preProps3 = store.preProps) === null || _store$preProps3 === void 0 ? void 0 : _store$preProps3.notExistsColumns) || [])
                 // fields: [],
               });
               var items = getSubColumns(newList);
@@ -1137,6 +1145,9 @@ var JoinData = function JoinData(props) {
   var leftTableIsError = function leftTableIsError() {
     var _prevTables$meta$tabl;
     if (!meta.table1.datasourceId || !meta.table1.id || meta.table1.datasourceId === SummarizeAlias) {
+      if (!prevGroupBy && meta.table1.id === SummarizeAlias) {
+        return true;
+      }
       return false;
     }
     return !(prevTables !== null && prevTables !== void 0 && (_prevTables$meta$tabl = prevTables[meta.table1.datasourceId]) !== null && _prevTables$meta$tabl !== void 0 && _prevTables$meta$tabl[meta.table1.alias || meta.table1.id]);
@@ -1216,6 +1227,17 @@ var JoinData = function JoinData(props) {
       });
     }
   };
+  var tableIsError = function tableIsError() {
+    var _store$preProps4, _meta$table;
+    var aliass = ((_store$preProps4 = store.preProps) === null || _store$preProps4 === void 0 || (_store$preProps4 = _store$preProps4.notExistsColumns) === null || _store$preProps4 === void 0 ? void 0 : _store$preProps4.map(function (v) {
+      return v.alias;
+    })) || [];
+    var tableAlias = (_meta$table = meta.table2) === null || _meta$table === void 0 ? void 0 : _meta$table.alias;
+    if (tableAlias && aliass.includes(tableAlias)) {
+      return true;
+    }
+    return false;
+  };
   return _jsx(Wrapper, {
     className: cx("Sqb-item"),
     children: _jsxs("div", {
@@ -1265,42 +1287,48 @@ var JoinData = function JoinData(props) {
               showSubQuery(meta.subquery);
             },
             children: [subQuerySelected && _jsx(Tooltip, {
-              title: __('SqlQueryBuilder.alias'),
+              title: __(tableIsError() ? 'SqlQueryBuilder.repeatAlias' : 'SqlQueryBuilder.alias'),
               children: _jsx(Button, {
-                className: ':Sqb-TableName-as',
+                danger: tableIsError(),
+                className: cx(':Sqb-TableName-as', {
+                  isError: tableIsError()
+                }),
                 shape: 'circle',
                 iconOnly: true,
                 primary: true,
                 icon: 'As',
                 size: 'small',
                 onClick: function onClick(e) {
-                  var _meta$table;
+                  var _meta$table2;
                   e.stopPropagation();
-                  onChangeTableAlias(((_meta$table = meta.table2) === null || _meta$table === void 0 ? void 0 : _meta$table.alias) || '');
+                  onChangeTableAlias(((_meta$table2 = meta.table2) === null || _meta$table2 === void 0 ? void 0 : _meta$table2.alias) || '');
                 }
               })
-            }), subQuerySelected ? "".concat(((_meta$subquery2 = meta.subquery) === null || _meta$subquery2 === void 0 ? void 0 : _meta$subquery2[0]).table.datasourceName, ".").concat(((_meta$subquery3 = meta.subquery) === null || _meta$subquery3 === void 0 ? void 0 : _meta$subquery3[0]).table.name, " ").concat((_meta$table2 = meta.table2) !== null && _meta$table2 !== void 0 && _meta$table2.alias ? "as ".concat((_meta$table3 = meta.table2) === null || _meta$table3 === void 0 ? void 0 : _meta$table3.alias) : '', " ") : __('SqlQueryBuilder.setSubQuery')]
+            }), subQuerySelected ? "".concat(((_meta$subquery2 = meta.subquery) === null || _meta$subquery2 === void 0 ? void 0 : _meta$subquery2[0]).table.datasourceName, ".").concat(((_meta$subquery3 = meta.subquery) === null || _meta$subquery3 === void 0 ? void 0 : _meta$subquery3[0]).table.name, " ").concat((_meta$table3 = meta.table2) !== null && _meta$table3 !== void 0 && _meta$table3.alias ? "as ".concat((_meta$table4 = meta.table2) === null || _meta$table4 === void 0 ? void 0 : _meta$table4.alias) : '', " ") : __('SqlQueryBuilder.setSubQuery')]
           }) : _jsxs("div", {
             className: cx("Sqb-TableName", {
               notSelected: !table2Selected
             }),
             onClick: selectTable,
             children: [table2Selected && _jsx(Tooltip, {
-              title: __('SqlQueryBuilder.alias'),
+              title: __(tableIsError() ? 'SqlQueryBuilder.repeatAlias' : 'SqlQueryBuilder.alias'),
               children: _jsx(Button, {
-                className: ':Sqb-TableName-as',
+                danger: tableIsError(),
+                className: cx(':Sqb-TableName-as', {
+                  isError: tableIsError()
+                }),
                 shape: 'circle',
                 iconOnly: true,
                 primary: true,
                 icon: 'As',
                 size: 'small',
                 onClick: function onClick(e) {
-                  var _meta$table4;
+                  var _meta$table5;
                   e.stopPropagation();
-                  onChangeTableAlias(((_meta$table4 = meta.table2) === null || _meta$table4 === void 0 ? void 0 : _meta$table4.alias) || '');
+                  onChangeTableAlias(((_meta$table5 = meta.table2) === null || _meta$table5 === void 0 ? void 0 : _meta$table5.alias) || '');
                 }
               })
-            }), table2Selected ? "".concat(meta.table2.datasourceName, ".").concat(meta.table2.name, " ").concat((_meta$table5 = meta.table2) !== null && _meta$table5 !== void 0 && _meta$table5.alias ? "as ".concat((_meta$table6 = meta.table2) === null || _meta$table6 === void 0 ? void 0 : _meta$table6.alias) : '') : __('SqlQueryBuilder.pickTable')]
+            }), table2Selected ? "".concat(meta.table2.datasourceName, ".").concat(meta.table2.name, " ").concat((_meta$table6 = meta.table2) !== null && _meta$table6 !== void 0 && _meta$table6.alias ? "as ".concat((_meta$table7 = meta.table2) === null || _meta$table7 === void 0 ? void 0 : _meta$table7.alias) : '') : __('SqlQueryBuilder.pickTable')]
           }), store.showSubquery && _jsx(Tooltip, {
             title: __('SqlQueryBuilder.switchSubQuery'),
             children: _jsx(Button, {
@@ -1311,7 +1339,7 @@ var JoinData = function JoinData(props) {
               icon: _jsx(RelatedWork, {}),
               onClick: switchSubQuery
             })
-          }), ((_meta$table7 = meta.table2) === null || _meta$table7 === void 0 ? void 0 : _meta$table7.name) && ((_meta$table8 = meta.table1) === null || _meta$table8 === void 0 ? void 0 : _meta$table8.name) && ((_meta$expressions = meta.expressions) === null || _meta$expressions === void 0 ? void 0 : _meta$expressions.map(function (v, i) {
+          }), ((_meta$table8 = meta.table2) === null || _meta$table8 === void 0 ? void 0 : _meta$table8.name) && ((_meta$table9 = meta.table1) === null || _meta$table9 === void 0 ? void 0 : _meta$table9.name) && ((_meta$expressions = meta.expressions) === null || _meta$expressions === void 0 ? void 0 : _meta$expressions.map(function (v, i) {
             if (v.type === AtomsTypeEnum.JOIN_DEFAULT) {
               return _jsxs("div", {
                 className: cx("Sqb-where block"),
@@ -1538,7 +1566,7 @@ var JoinData = function JoinData(props) {
                 })]
               }, i);
             }
-          })), ((_meta$table9 = meta.table2) === null || _meta$table9 === void 0 ? void 0 : _meta$table9.name) && ((_meta$table0 = meta.table1) === null || _meta$table0 === void 0 ? void 0 : _meta$table0.name) && (((_meta$expressions2 = meta.expressions) === null || _meta$expressions2 === void 0 ? void 0 : _meta$expressions2.length) || 0) < 1 && _jsx(Tooltip, {
+          })), ((_meta$table0 = meta.table2) === null || _meta$table0 === void 0 ? void 0 : _meta$table0.name) && ((_meta$table1 = meta.table1) === null || _meta$table1 === void 0 ? void 0 : _meta$table1.name) && (((_meta$expressions2 = meta.expressions) === null || _meta$expressions2 === void 0 ? void 0 : _meta$expressions2.length) || 0) < 1 && _jsx(Tooltip, {
             title: __('SqlQueryBuilder.add'),
             children: _jsx(Dropdown, {
               trigger: ['click'],

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

@@ -9,7 +9,7 @@ import { TypeEnum, ColumnsPopupThemeEnum, SQL_COLUMN_TYPE } from '../../../store
 import { MetaSummarize_Enum, AtomsTypeEnum } from '../../../store/types';
 import SelectJoinColumn from '../../dialog/select-join-column';
 import { Tooltip, Button, Modal, Input, Toast } from '@gingkoo/pandora';
-import { uuidv4 } from '../../../utils/helper';
+import { uuidv4, getAlias } from '../../../utils/helper';
 import { changeFieldAlias, isValidSQLAlias, isError } from '../../../utils';
 import ItemName from '../components/item-name';
 import { AddIcon, CloseIcon } from '../../icons';
@@ -194,7 +194,8 @@ var GroupBy = function GroupBy(props) {
           newMeta[index].by.push(data);
           // @ts-ignore
           newMeta[index].by = newMeta[index].by.map(function (v) {
-            var fieldAlias = "".concat(v.alias, "__").concat(v.name);
+            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);
             return _objectSpread(_objectSpread({}, v), {}, {
               sql: "".concat(v.alias, ".").concat(v.realName || v.name),
               fieldAlias: fieldAlias,