@gingkoo/pandora-metabase 1.0.33 → 1.0.35

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

@@ -20,7 +20,7 @@ import NextDom from './components/meta-icon';
 import Header from './components/header';
 import { useStore } from '../../hooks/use-provider';
 var TableData = function TableData(props) {
-  var _meta$subquery, _meta$subquery2, _meta$subquery3, _meta$table2, _meta$table3, _meta$table5, _meta$table6, _store$showMainColumn;
+  var _meta$subquery, _meta$subquery2, _meta$subquery3, _meta$table3, _meta$table4, _meta$table6, _meta$table7, _store$showMainColumn;
   var meta = props.meta,
     groupIndex = props.groupIndex;
   var store = useStore();
@@ -35,10 +35,11 @@ var TableData = function TableData(props) {
         value: meta.table,
         onChange: function onChange(data) {
           if (meta.table.datasourceId !== data.datasourceId || meta.table.name !== data.name) {
+            var _store$preProps;
             var newMetaList = store.metaList[groupIndex].list.slice()[0];
             newMetaList.table = _objectSpread(_objectSpread({}, data), {}, {
               tableUuid: uuidv4('table'),
-              alias: getAlias(data.name, store.metaList[groupIndex].list.slice())
+              alias: getAlias(data.name, store.metaList[groupIndex].list.slice(), ((_store$preProps = store.preProps) === null || _store$preProps === void 0 ? void 0 : _store$preProps.notExistsColumns) || [])
             });
             store.fetchColumns(data, data.datasourceId, [], function (columns) {
               newMetaList.columns = columns;
@@ -118,10 +119,10 @@ var TableData = function TableData(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 newMetaList = store.metaList[groupIndex].list.slice()[0];
     var newMeta = store.metaList[groupIndex].list.slice();
     var oldList = cloneDeep(newMetaList.subquery);
@@ -205,6 +206,17 @@ var TableData = function TableData(props) {
     };
     store.setMeta(newMetaList, groupIndex);
   };
+  var tableIsError = function tableIsError() {
+    var _store$preProps3, _meta$table;
+    var aliass = ((_store$preProps3 = store.preProps) === null || _store$preProps3 === void 0 || (_store$preProps3 = _store$preProps3.notExistsColumns) === null || _store$preProps3 === void 0 ? void 0 : _store$preProps3.map(function (v) {
+      return v.alias;
+    })) || [];
+    var tableAlias = (_meta$table = meta.table) === null || _meta$table === void 0 ? void 0 : _meta$table.alias;
+    if (tableAlias && aliass.includes(tableAlias)) {
+      return true;
+    }
+    return false;
+  };
   return _jsx(Wrapper, {
     className: "Sqb-item",
     children: _jsxs("div", {
@@ -223,42 +235,48 @@ var TableData = function TableData(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.table) === null || _meta$table === void 0 ? void 0 : _meta$table.alias) || '');
+                  onChangeTableAlias(((_meta$table2 = meta.table) === 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.table) !== null && _meta$table2 !== void 0 && _meta$table2.alias ? "as ".concat((_meta$table3 = meta.table) === 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.table) !== null && _meta$table3 !== void 0 && _meta$table3.alias ? "as ".concat((_meta$table4 = meta.table) === null || _meta$table4 === void 0 ? void 0 : _meta$table4.alias) : '', " ") : __('SqlQueryBuilder.setSubQuery')]
           }) : _jsxs("div", {
             className: cx("Sqb-TableName", {
               notSelected: !selected
             }),
             onClick: selectTable,
             children: [selected && _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.table) === null || _meta$table4 === void 0 ? void 0 : _meta$table4.alias) || '');
+                  onChangeTableAlias(((_meta$table5 = meta.table) === null || _meta$table5 === void 0 ? void 0 : _meta$table5.alias) || '');
                 }
               })
-            }), selected ? "".concat(meta.table.datasourceName, ".").concat(meta.table.name, " ").concat((_meta$table5 = meta.table) !== null && _meta$table5 !== void 0 && _meta$table5.alias ? "as ".concat((_meta$table6 = meta.table) === null || _meta$table6 === void 0 ? void 0 : _meta$table6.alias) : '') : __('SqlQueryBuilder.pickTable')]
+            }), selected ? "".concat(meta.table.datasourceName, ".").concat(meta.table.name, " ").concat((_meta$table6 = meta.table) !== null && _meta$table6 !== void 0 && _meta$table6.alias ? "as ".concat((_meta$table7 = meta.table) === null || _meta$table7 === void 0 ? void 0 : _meta$table7.alias) : '') : __('SqlQueryBuilder.pickTable')]
           }), store.showSubquery && _jsx(Tooltip, {
             title: __('SqlQueryBuilder.switchSubQuery'),
             children: _jsx(Button, {

package/lib/es/hooks/use-state.js

@@ -271,9 +271,12 @@ var useStore = function useStore() {
     };
   }();
   var setMeta = function setMeta(curData, groupInd) {
-    var newMeta = metaList.slice();
-    newMeta[groupInd].list = curData;
-    _setMeta(newMeta);
+    var _metaList = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : metaList;
+    var newMeta = _metaList.slice();
+    if (newMeta[groupInd]) {
+      newMeta[groupInd].list = curData;
+      _setMeta(newMeta);
+    }
   };
   // 回显
   var setPreData = function setPreData(data) {
@@ -287,27 +290,6 @@ var useStore = function useStore() {
           if (v.table) {
             v.table.tableUuid = v.table.tableUuid || uuidv4('table');
           }
-          // // 兼容
-          // if (patchVersion != '1.0.0') {
-          //   if (v.type === TypeEnum.joinData) {
-          //     v = joinDataPatch(v);
-          //   }
-          //   if (v.type === TypeEnum.filter) {
-          //     v = filterPatch(v);
-          //   }
-          //   if (v.type === TypeEnum.sort) {
-          //     v = sortPatch(v);
-          //   }
-          //   if (v.type === TypeEnum.customColumn) {
-          //     v = customColumnPatch(v);
-          //   }
-          //   if (v.type === TypeEnum.data) {
-          //     v = dataPatch(v);
-          //   }
-          // }
-          // if (v.type === TypeEnum.filter) {
-          //   newMeta[i] = setFilterQuotes(newMeta[i]);
-          // }
           // 设置右侧column
           if ((_v$table = v.table2) !== null && _v$table !== void 0 && _v$table.datasourceId) {
             fetchColumns(newMeta[i].table2, newMeta[i].table2.datasourceId, v.columns, function () {
@@ -322,7 +304,7 @@ var useStore = function useStore() {
               } else {
                 newMeta[i].columns = columns || [];
               }
-              setMeta(newMeta, groupIndex);
+              setMeta(newMeta, groupIndex, data);
             });
             return _objectSpread({}, v);
           }
@@ -343,7 +325,7 @@ var useStore = function useStore() {
               // if (v.type === TypeEnum.joinData) {
               //   newMeta[i] = setQuotes(newMeta[i]);
               // }
-              setMeta(newMeta, groupIndex);
+              setMeta(newMeta, groupIndex, data);
             });
             return _objectSpread({}, v);
           }

package/lib/es/locale/en.js

@@ -50,6 +50,8 @@ export default register('en', {
   'SqlQueryBuilder.selectColumnAll': 'select all',
   'SqlQueryBuilder.alias': 'alias',
   'SqlQueryBuilder.aliasForRules': 'The alias only supports a combination of letters, numbers, and underscores. It must start with a letter and cannot exceed 30 bytes',
+  'SqlQueryBuilder.pleaseSelectTable': 'The currently dependent table is empty or has been deleted',
+  'SqlQueryBuilder.repeatAlias': 'If there are duplicate names, please modify them',
   'customColumn.operator': 'operator',
   'customColumn.collection': 'collection',
   'customColumn.field': 'field',

package/lib/es/locale/zh.js

@@ -46,6 +46,8 @@ export default register('zh', {
   'SqlQueryBuilder.selectColumnAll': '全选',
   'SqlQueryBuilder.alias': '别名',
   'SqlQueryBuilder.aliasForRules': '别名只支持字母 + 数字 + 下划线组合，必须是字母开头，且不能超过30个字节',
+  'SqlQueryBuilder.pleaseSelectTable': '当前依赖的表为空或被删除',
+  'SqlQueryBuilder.repeatAlias': '有重名请修改',
   'customColumn.operator': '操作符',
   'customColumn.collection': '自定义组合',
   'customColumn.field': '字段',

package/lib/es/utils/helper.d.ts

@@ -16,4 +16,4 @@ export declare const replaceTpl: (inputString: string, values: {
     [key: string]: any;
 }) => string;
 export declare const uuidv4: (prefix?: string) => string;
-export declare const getAlias: (name: string | undefined, list: MetaListType[]) => string;
+export declare const getAlias: (name: string | undefined, list: MetaListType[], columns?: any[]) => string;

package/lib/es/utils/helper.js

@@ -134,6 +134,7 @@ export var uuidv4 = function uuidv4() {
 export var getAlias = function getAlias() {
   var name = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
   var list = arguments.length > 1 ? arguments[1] : undefined;
+  var columns = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
   // 提取所有有效的 alias
   if (!list || list.length < 1) return name;
   // const baseOld = oldName?.split('_')[0] ?? '';
@@ -151,9 +152,12 @@ export var getAlias = function getAlias() {
       return (_v$table2 = v.table2) === null || _v$table2 === void 0 ? void 0 : _v$table2.alias;
     }
     return undefined;
-  }).filter(function (alias) {
+  }).concat(columns.map(function (v) {
+    return v.alias;
+  })).filter(function (alias) {
     return Boolean(alias);
   });
+  console.log('🚀 ~ getAlias ~ aliass:', aliass);
   // 收集所有 name_x 中的数字
   var regex = new RegExp("^".concat(name, "_(\\d+)$"));
   var indexes = aliass.map(function (alias) {

package/lib/es/utils/transformSql.d.ts

@@ -1,6 +1,5 @@
-import { MetaListType } from '../store/types';
-export declare const transformSql: (metas: MetaListType[], db?: string) => {
+export declare const transformSql: (metas: any, db?: string) => {
     sql: string;
-    fields: any[];
-    union_fields: any[][];
+    fields: any;
+    union_fields: any[];
 };

package/lib/es/utils/transformSql.js

@@ -2,6 +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";
 var _excluded = ["children"];
+// @ts-nocheck
 var procEnum = {
   mysql: 'mysql',
   oracle: 'oracle',
@@ -76,7 +77,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 = [];
@@ -143,11 +144,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;
@@ -187,11 +188,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;
@@ -462,40 +463,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, _toConsumableArray(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, _toConsumableArray(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, _toConsumableArray(collectionConstants));
     }
@@ -519,9 +505,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 {
@@ -611,9 +597,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, _toConsumableArray(constants));
         return {
           field_sql: "".concat(field_sql, " as ").concat(it.name),
@@ -628,9 +614,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;
   }
@@ -675,8 +661,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(', '));
   }
@@ -747,6 +733,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;
   });
@@ -754,7 +741,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];
@@ -785,6 +772,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,
@@ -804,51 +792,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 ';
@@ -901,7 +893,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,
@@ -949,7 +941,7 @@ var _sqlStruct2text3 = function sqlStruct2text(data) {
 export var 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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gingkoo/pandora-metabase",
-  "version": "1.0.33",
+  "version": "1.0.35",
   "description": "",
   "main": "lib/es/index.js",
   "module": "lib/es/index.js",