@gingkoo/pandora-metabase 1.0.119 → 1.0.120

package/lib/cjs/components/dialog/formula/index.js

@@ -25,6 +25,7 @@ var _types = require("../../../store/types");
 var _pandora = require("@gingkoo/pandora");
 var _cloneDeep = _interopRequireDefault(require("lodash/cloneDeep"));
 var _useProvider = require("../../../hooks/use-provider");
+var _helperDom = require("../../../utils/helper-dom");
 var _templateObject;
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 var VisualBox = _styledComponents["default"].div.attrs({
@@ -147,7 +148,10 @@ var CaseEditor = _react["default"].forwardRef(function (props, ref) {
                 message: '公式丢失',
                 children: (0, _jsxRuntime.jsx)(_pandora.Select, {
                   triggerProps: {
-                    clickToClose: true
+                    clickToClose: true,
+                    style: {
+                      zIndex: (0, _helperDom.getTopLayerZIndex)() + 1
+                    }
                   },
                   value: fun.id || fun.name,
                   triggerElement: function triggerElement(value) {

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

@@ -1101,7 +1101,9 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
   }
   var showFunction = function showFunction(e, i) {
     var _value = caseList[i];
-    var o = _pandora.Modal2.openModal({
+    var childModalZIndex = (0, _helperDom.getTopLayerZIndex)() + 1;
+    var o = openChildModal({
+      zIndex: childModalZIndex,
       title: (0, _locale.__)('customColumn.formula'),
       transparentMask: true,
       content: (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {

package/lib/cjs/components/dialog/select-summarize/index.d.ts

@@ -1,8 +1,11 @@
 import './index.less';
-import { DataType, ColumnType } from '../select-join-column';
+import { DataType, ColumnType } from '../select-column-multiple';
 import { AtomsItem } from '../../../store/types';
 export type ValueType = Partial<ColumnType> & {
     name_zh?: string;
+    table?: string;
+    tableId?: string;
+    tableUuid?: string;
     condition: string;
     quotes: string;
     atoms?: AtomsItem[];

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

@@ -170,8 +170,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 || (0, _helper.uuidv4)('table'),
         alias: prevGroupBy.alias,
         columns: []
@@ -213,10 +214,11 @@ var GroupBy = function GroupBy(props) {
       if (joinData.length) {
         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
@@ -227,19 +229,21 @@ var GroupBy = function GroupBy(props) {
       data = store.metaList[groupIndex].list.slice(0, index).map(function (v) {
         if (v.type === _enum.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 === _enum.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,
@@ -247,11 +251,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;
@@ -378,9 +387,7 @@ var GroupBy = function GroupBy(props) {
   var _getColumns = function _getColumns() {
     return getColumns().map(function (v) {
       return (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, v), {}, {
-        name: v.table,
-        id: v.tableId,
-        name_zh: '',
+        name_zh: v.name_zh || '',
         tableUuid: v.tableUuid,
         alias: v.alias,
         datasourceName: '',

package/lib/cjs/components/modules/summarize/select-index.js

@@ -42,8 +42,9 @@ var SelectIndex = function SelectIndex(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 || (0, _helper2.uuidv4)('table'),
         alias: prevGroupBy.alias,
         columns: []
@@ -89,10 +90,11 @@ var SelectIndex = function SelectIndex(props) {
       if (joinData.length) {
         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,
-            table: v.table2.name,
             tableUuid: v.table2.tableUuid,
-            tableId: v.table2.id,
             columns: v.columns
           };
         }));
@@ -101,27 +103,34 @@ var SelectIndex = function SelectIndex(props) {
       data = store.metaList[groupIndex].list.slice(0, index).map(function (v) {
         if (v.type === _enum.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,
             columns: v.columns
           };
         } else if (v.type === _enum.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,
             tableUuid: v.table2.tableUuid,
-            tableId: v.table2.id,
             columns: v.columns
           };
         } else {
           return {
-            table: null
+            name: '',
+            id: '',
+            name_zh: '',
+            alias: '',
+            tableUuid: '',
+            columns: []
           };
         }
       }).filter(function (v) {
-        return v.table;
+        return Boolean(v.name);
       });
     }
     return data;
@@ -271,9 +280,7 @@ var SelectIndex = function SelectIndex(props) {
   var _getColumns = function _getColumns() {
     return getColumns().map(function (v) {
       return (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, v), {}, {
-        name: v.table,
-        id: v.tableId,
-        name_zh: '',
+        name_zh: v.name_zh || '',
         tableUuid: v.tableUuid,
         alias: v.alias,
         datasourceName: '',

package/lib/cjs/utils/transformSql.js

@@ -72,7 +72,7 @@ var _recursionArr2 = function _recursionArr(arr) {
   }
   return obj;
 };
-var _handleBaseType2Sql7 = exports.handleBaseType2Sql = function handleBaseType2Sql(list) {
+var _handleBaseType2Sql8 = exports.handleBaseType2Sql = function handleBaseType2Sql(list) {
   var db = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : procEnum.mysql;
   var sql = '';
   var constants = [];
@@ -134,11 +134,11 @@ var _handleBaseType2Sql7 = exports.handleBaseType2Sql = function handleBaseType2
     if (type === BlockTypeEnum.joinDefault) {
       var lhs = item.lhs,
         rhs = item.rhs;
-      var _handleBaseType2Sql = _handleBaseType2Sql7(lhs, db),
+      var _handleBaseType2Sql = _handleBaseType2Sql8(lhs, db),
         leftSql = _handleBaseType2Sql.sql,
         leftSqlItems = _handleBaseType2Sql.sql_items,
         joinDefaultLeftConstants = _handleBaseType2Sql.constants;
-      var _handleBaseType2Sql2 = _handleBaseType2Sql7(rhs, db),
+      var _handleBaseType2Sql2 = _handleBaseType2Sql8(rhs, db),
         rightSql = _handleBaseType2Sql2.sql,
         rightSqlItems = _handleBaseType2Sql2.sql_items,
         joinDefaultRightConstants = _handleBaseType2Sql2.constants;
@@ -176,11 +176,11 @@ var _handleBaseType2Sql7 = exports.handleBaseType2Sql = function handleBaseType2
         condition = item.condition,
         database_type = item.database_type,
         formula = item.formula;
-      var _handleBaseType2Sql3 = _handleBaseType2Sql7(_lhs, db),
+      var _handleBaseType2Sql3 = _handleBaseType2Sql8(_lhs, db),
         _leftSql = _handleBaseType2Sql3.sql,
         _leftSqlItems = _handleBaseType2Sql3.sql_items,
         _joinDefaultLeftConstants = _handleBaseType2Sql3.constants;
-      var _handleBaseType2Sql4 = _handleBaseType2Sql7(_rhs, db),
+      var _handleBaseType2Sql4 = _handleBaseType2Sql8(_rhs, db),
         _rightSql = _handleBaseType2Sql4.sql,
         _rightSqlItems = _handleBaseType2Sql4.sql_items,
         _joinDefaultRightConstants = _handleBaseType2Sql4.constants;
@@ -450,16 +450,26 @@ var _handleBaseType2Sql7 = exports.handleBaseType2Sql = function handleBaseType2
       }
     }
     if (type === BlockTypeEnum.FORMULA) {
-      var _handleBaseType2Sql5 = _handleBaseType2Sql7(item.args, db),
-        argSql = _handleBaseType2Sql5.sql,
-        formulaConstants = _handleBaseType2Sql5.constants;
-      sql += " ".concat(item.name, "(").concat(argSql, ")");
-      constants.push.apply(constants, (0, _toConsumableArray2["default"])(formulaConstants));
+      var argSqlList = (Array.isArray(item.args) ? item.args : []).map(function (arg) {
+        if ((arg === null || arg === void 0 ? void 0 : arg.type) === BlockTypeEnum.collection) {
+          var _handleBaseType2Sql5 = _handleBaseType2Sql8(arg.list, db),
+            collectionSql = _handleBaseType2Sql5.sql,
+            collectionConstants = _handleBaseType2Sql5.constants;
+          constants.push.apply(constants, (0, _toConsumableArray2["default"])(collectionConstants));
+          return collectionSql.trim();
+        }
+        var _handleBaseType2Sql6 = _handleBaseType2Sql8([arg], db),
+          nestedSql = _handleBaseType2Sql6.sql,
+          nestedConstants = _handleBaseType2Sql6.constants;
+        constants.push.apply(constants, (0, _toConsumableArray2["default"])(nestedConstants));
+        return nestedSql.trim();
+      }).filter(Boolean);
+      sql += " ".concat(item.name, "(").concat(argSqlList.join(', '), ")");
     }
     if (type === BlockTypeEnum.collection) {
-      var _handleBaseType2Sql6 = _handleBaseType2Sql7(item.list, db),
-        collectionSql = _handleBaseType2Sql6.sql,
-        collectionConstants = _handleBaseType2Sql6.constants;
+      var _handleBaseType2Sql7 = _handleBaseType2Sql8(item.list, db),
+        collectionSql = _handleBaseType2Sql7.sql,
+        collectionConstants = _handleBaseType2Sql7.constants;
       sql += " ".concat(collectionSql);
       constants.push.apply(constants, (0, _toConsumableArray2["default"])(collectionConstants));
     }
@@ -483,9 +493,9 @@ var _handleJoinData = function _handleJoinData(joinData) {
     if (isSubquery) {
       subQuery = subquery;
     }
-    var _handleBaseType2Sql8 = _handleBaseType2Sql7(expressions, db),
-      sql = _handleBaseType2Sql8.sql,
-      joinConstants = _handleBaseType2Sql8.constants;
+    var _handleBaseType2Sql9 = _handleBaseType2Sql8(expressions, db),
+      sql = _handleBaseType2Sql9.sql,
+      joinConstants = _handleBaseType2Sql9.constants;
     var joinCondition = "on ".concat(sql);
     constants = joinConstants;
     return {
@@ -568,9 +578,9 @@ var _handleNesting = function handleNesting(data) {
     var customColumnsConstants = [];
     var handleCustomColumn = function handleCustomColumn(data) {
       return data.map(function (it) {
-        var _handleBaseType2Sql9 = _handleBaseType2Sql7(it.formulaList, db),
-          field_sql = _handleBaseType2Sql9.sql,
-          constants = _handleBaseType2Sql9.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),
@@ -585,9 +595,9 @@ var _handleNesting = function handleNesting(data) {
     obj.customColumnsConstants = customColumnsConstants;
   }
   if (filterData && filterData.filter.length) {
-    var _handleBaseType2Sql0 = _handleBaseType2Sql7(filterData.filter, db),
-      sql = _handleBaseType2Sql0.sql,
-      constants = _handleBaseType2Sql0.constants;
+    var _handleBaseType2Sql1 = _handleBaseType2Sql8(filterData.filter, db),
+      sql = _handleBaseType2Sql1.sql,
+      constants = _handleBaseType2Sql1.constants;
     obj.filters = 'WHERE ' + sql;
     obj.filtersConstants = constants;
   }
@@ -612,7 +622,7 @@ var _handleNesting = function handleNesting(data) {
     if (summarize.by.length) {
       obj.groupBy.groupColumns = summarize.by.map(function (v) {
         var _v$atoms;
-        var fieldSql = (_v$atoms = v.atoms) !== null && _v$atoms !== void 0 && _v$atoms.length ? _handleBaseType2Sql7(v.atoms, db).sql.trim() || v.sql : v.sql || "".concat(v.alias, ".").concat(v.realName || v.name);
+        var fieldSql = (_v$atoms = v.atoms) !== null && _v$atoms !== void 0 && _v$atoms.length ? _handleBaseType2Sql8(v.atoms, db).sql.trim() || v.sql : v.sql || "".concat(v.alias, ".").concat(v.realName || v.name);
         queryColumns.push({
           field_sql: "".concat(fieldSql, " as ").concat(v.fieldAlias),
           read_name: '',
@@ -630,8 +640,8 @@ var _handleNesting = function handleNesting(data) {
   }
   if (sortData && sortData.sort.length) {
     obj.orderInfos = "ORDER BY ".concat(sortData.sort.map(function (v) {
-      var _handleBaseType2Sql1 = _handleBaseType2Sql7(v.expression, db),
-        sql = _handleBaseType2Sql1.sql;
+      var _handleBaseType2Sql10 = _handleBaseType2Sql8(v.expression, db),
+        sql = _handleBaseType2Sql10.sql;
       return "".concat(sql, " ").concat(v.sort);
     }).join(', '));
   }

package/lib/cjs/utils.js

@@ -508,6 +508,16 @@ function splitByUnion(data) {
   return result;
 }
 var summarizeNoArgumentConditions = ['总行数', '累积行数'];
+var stripSummarizeTableFields = function stripSummarizeTableFields(record) {
+  return (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, record), {}, {
+    table: '',
+    tableId: '',
+    tableUuid: '',
+    alias: '',
+    datasourceId: '',
+    datasourceName: ''
+  });
+};
 var createSummarizeFieldAtom = function createSummarizeFieldAtom(record) {
   if (!record.name) return null;
   return {
@@ -529,20 +539,21 @@ var createSummarizeFieldAtom = function createSummarizeFieldAtom(record) {
 var normalizeSummarizeItemForSave = function normalizeSummarizeItemForSave(record) {
   var _record$atoms;
   if ((_record$atoms = record.atoms) !== null && _record$atoms !== void 0 && _record$atoms.length || summarizeNoArgumentConditions.includes(record.condition)) {
-    return record;
+    var _record$atoms2;
+    return (_record$atoms2 = record.atoms) !== null && _record$atoms2 !== void 0 && _record$atoms2.length ? stripSummarizeTableFields(record) : record;
   }
   var fieldAtom = createSummarizeFieldAtom(record);
   if (!fieldAtom) return record;
-  return (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, record), {}, {
+  return (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, stripSummarizeTableFields(record)), {}, {
     atoms: [fieldAtom]
   });
 };
 var normalizeSummarizeByForSave = function normalizeSummarizeByForSave(record) {
-  var _record$atoms2;
-  if ((_record$atoms2 = record.atoms) !== null && _record$atoms2 !== void 0 && _record$atoms2.length) return record;
+  var _record$atoms3;
+  if ((_record$atoms3 = record.atoms) !== null && _record$atoms3 !== void 0 && _record$atoms3.length) return stripSummarizeTableFields(record);
   var fieldAtom = createSummarizeFieldAtom(record);
   if (!fieldAtom) return record;
-  return (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, record), {}, {
+  return (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, stripSummarizeTableFields(record)), {}, {
     atoms: [fieldAtom]
   });
 };

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

@@ -18,6 +18,7 @@ import { AtomsTypeEnum, FormulaTypeEnum } from '../../../store/types';
 import { Select, Button } from '@gingkoo/pandora';
 import cloneDeep from 'lodash/cloneDeep';
 import { useStore } from '../../../hooks/use-provider';
+import { getTopLayerZIndex } from '../../../utils/helper-dom';
 var VisualBox = Styled.div.attrs({
   className: 'visual-box'
 })(_templateObject || (_templateObject = _taggedTemplateLiteral([""])));
@@ -138,7 +139,10 @@ var CaseEditor = React.forwardRef(function (props, ref) {
                 message: '公式丢失',
                 children: _jsx(Select, {
                   triggerProps: {
-                    clickToClose: true
+                    clickToClose: true,
+                    style: {
+                      zIndex: getTopLayerZIndex() + 1
+                    }
                   },
                   value: fun.id || fun.name,
                   triggerElement: function triggerElement(value) {

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

@@ -1092,7 +1092,9 @@ var FormulaList = forwardRef(function (props, ref) {
   }
   var showFunction = function showFunction(e, i) {
     var _value = caseList[i];
-    var o = Modal2.openModal({
+    var childModalZIndex = getTopLayerZIndex() + 1;
+    var o = openChildModal({
+      zIndex: childModalZIndex,
       title: __('customColumn.formula'),
       transparentMask: true,
       content: _jsx(_Fragment, {

package/lib/es/components/dialog/select-summarize/index.d.ts

@@ -1,8 +1,11 @@
 import './index.less';
-import { DataType, ColumnType } from '../select-join-column';
+import { DataType, ColumnType } from '../select-column-multiple';
 import { AtomsItem } from '../../../store/types';
 export type ValueType = Partial<ColumnType> & {
     name_zh?: string;
+    table?: string;
+    tableId?: string;
+    tableUuid?: string;
     condition: string;
     quotes: string;
     atoms?: AtomsItem[];

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

@@ -164,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: []
@@ -207,10 +208,11 @@ var GroupBy = function GroupBy(props) {
       if (joinData.length) {
         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
@@ -221,19 +223,21 @@ var GroupBy = function GroupBy(props) {
       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,
@@ -241,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;
@@ -372,9 +381,7 @@ 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: '',

package/lib/es/components/modules/summarize/select-index.js

@@ -36,8 +36,9 @@ var SelectIndex = function SelectIndex(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: []
@@ -83,10 +84,11 @@ var SelectIndex = function SelectIndex(props) {
       if (joinData.length) {
         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,
-            table: v.table2.name,
             tableUuid: v.table2.tableUuid,
-            tableId: v.table2.id,
             columns: v.columns
           };
         }));
@@ -95,27 +97,34 @@ var SelectIndex = function SelectIndex(props) {
       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,
             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,
             tableUuid: v.table2.tableUuid,
-            tableId: v.table2.id,
             columns: v.columns
           };
         } else {
           return {
-            table: null
+            name: '',
+            id: '',
+            name_zh: '',
+            alias: '',
+            tableUuid: '',
+            columns: []
           };
         }
       }).filter(function (v) {
-        return v.table;
+        return Boolean(v.name);
       });
     }
     return data;
@@ -265,9 +274,7 @@ var SelectIndex = function SelectIndex(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: '',

package/lib/es/utils/transformSql.js

@@ -65,7 +65,7 @@ var _recursionArr2 = function _recursionArr(arr) {
   }
   return obj;
 };
-var _handleBaseType2Sql7 = function handleBaseType2Sql(list) {
+var _handleBaseType2Sql8 = function handleBaseType2Sql(list) {
   var db = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : procEnum.mysql;
   var sql = '';
   var constants = [];
@@ -127,11 +127,11 @@ var _handleBaseType2Sql7 = function handleBaseType2Sql(list) {
     if (type === BlockTypeEnum.joinDefault) {
       var lhs = item.lhs,
         rhs = item.rhs;
-      var _handleBaseType2Sql = _handleBaseType2Sql7(lhs, db),
+      var _handleBaseType2Sql = _handleBaseType2Sql8(lhs, db),
         leftSql = _handleBaseType2Sql.sql,
         leftSqlItems = _handleBaseType2Sql.sql_items,
         joinDefaultLeftConstants = _handleBaseType2Sql.constants;
-      var _handleBaseType2Sql2 = _handleBaseType2Sql7(rhs, db),
+      var _handleBaseType2Sql2 = _handleBaseType2Sql8(rhs, db),
         rightSql = _handleBaseType2Sql2.sql,
         rightSqlItems = _handleBaseType2Sql2.sql_items,
         joinDefaultRightConstants = _handleBaseType2Sql2.constants;
@@ -169,11 +169,11 @@ var _handleBaseType2Sql7 = function handleBaseType2Sql(list) {
         condition = item.condition,
         database_type = item.database_type,
         formula = item.formula;
-      var _handleBaseType2Sql3 = _handleBaseType2Sql7(_lhs, db),
+      var _handleBaseType2Sql3 = _handleBaseType2Sql8(_lhs, db),
         _leftSql = _handleBaseType2Sql3.sql,
         _leftSqlItems = _handleBaseType2Sql3.sql_items,
         _joinDefaultLeftConstants = _handleBaseType2Sql3.constants;
-      var _handleBaseType2Sql4 = _handleBaseType2Sql7(_rhs, db),
+      var _handleBaseType2Sql4 = _handleBaseType2Sql8(_rhs, db),
         _rightSql = _handleBaseType2Sql4.sql,
         _rightSqlItems = _handleBaseType2Sql4.sql_items,
         _joinDefaultRightConstants = _handleBaseType2Sql4.constants;
@@ -443,16 +443,26 @@ var _handleBaseType2Sql7 = function handleBaseType2Sql(list) {
       }
     }
     if (type === BlockTypeEnum.FORMULA) {
-      var _handleBaseType2Sql5 = _handleBaseType2Sql7(item.args, db),
-        argSql = _handleBaseType2Sql5.sql,
-        formulaConstants = _handleBaseType2Sql5.constants;
-      sql += " ".concat(item.name, "(").concat(argSql, ")");
-      constants.push.apply(constants, _toConsumableArray(formulaConstants));
+      var argSqlList = (Array.isArray(item.args) ? item.args : []).map(function (arg) {
+        if ((arg === null || arg === void 0 ? void 0 : arg.type) === BlockTypeEnum.collection) {
+          var _handleBaseType2Sql5 = _handleBaseType2Sql8(arg.list, db),
+            collectionSql = _handleBaseType2Sql5.sql,
+            collectionConstants = _handleBaseType2Sql5.constants;
+          constants.push.apply(constants, _toConsumableArray(collectionConstants));
+          return collectionSql.trim();
+        }
+        var _handleBaseType2Sql6 = _handleBaseType2Sql8([arg], db),
+          nestedSql = _handleBaseType2Sql6.sql,
+          nestedConstants = _handleBaseType2Sql6.constants;
+        constants.push.apply(constants, _toConsumableArray(nestedConstants));
+        return nestedSql.trim();
+      }).filter(Boolean);
+      sql += " ".concat(item.name, "(").concat(argSqlList.join(', '), ")");
     }
     if (type === BlockTypeEnum.collection) {
-      var _handleBaseType2Sql6 = _handleBaseType2Sql7(item.list, db),
-        collectionSql = _handleBaseType2Sql6.sql,
-        collectionConstants = _handleBaseType2Sql6.constants;
+      var _handleBaseType2Sql7 = _handleBaseType2Sql8(item.list, db),
+        collectionSql = _handleBaseType2Sql7.sql,
+        collectionConstants = _handleBaseType2Sql7.constants;
       sql += " ".concat(collectionSql);
       constants.push.apply(constants, _toConsumableArray(collectionConstants));
     }
@@ -463,7 +473,7 @@ var _handleBaseType2Sql7 = function handleBaseType2Sql(list) {
     constants: constants
   };
 };
-export { _handleBaseType2Sql7 as handleBaseType2Sql };
+export { _handleBaseType2Sql8 as handleBaseType2Sql };
 var _handleJoinData = function _handleJoinData(joinData) {
   var db = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : procEnum.mysql;
   var constants = [];
@@ -477,9 +487,9 @@ var _handleJoinData = function _handleJoinData(joinData) {
     if (isSubquery) {
       subQuery = subquery;
     }
-    var _handleBaseType2Sql8 = _handleBaseType2Sql7(expressions, db),
-      sql = _handleBaseType2Sql8.sql,
-      joinConstants = _handleBaseType2Sql8.constants;
+    var _handleBaseType2Sql9 = _handleBaseType2Sql8(expressions, db),
+      sql = _handleBaseType2Sql9.sql,
+      joinConstants = _handleBaseType2Sql9.constants;
     var joinCondition = "on ".concat(sql);
     constants = joinConstants;
     return {
@@ -562,9 +572,9 @@ var _handleNesting = function handleNesting(data) {
     var customColumnsConstants = [];
     var handleCustomColumn = function handleCustomColumn(data) {
       return data.map(function (it) {
-        var _handleBaseType2Sql9 = _handleBaseType2Sql7(it.formulaList, db),
-          field_sql = _handleBaseType2Sql9.sql,
-          constants = _handleBaseType2Sql9.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),
@@ -579,9 +589,9 @@ var _handleNesting = function handleNesting(data) {
     obj.customColumnsConstants = customColumnsConstants;
   }
   if (filterData && filterData.filter.length) {
-    var _handleBaseType2Sql0 = _handleBaseType2Sql7(filterData.filter, db),
-      sql = _handleBaseType2Sql0.sql,
-      constants = _handleBaseType2Sql0.constants;
+    var _handleBaseType2Sql1 = _handleBaseType2Sql8(filterData.filter, db),
+      sql = _handleBaseType2Sql1.sql,
+      constants = _handleBaseType2Sql1.constants;
     obj.filters = 'WHERE ' + sql;
     obj.filtersConstants = constants;
   }
@@ -606,7 +616,7 @@ var _handleNesting = function handleNesting(data) {
     if (summarize.by.length) {
       obj.groupBy.groupColumns = summarize.by.map(function (v) {
         var _v$atoms;
-        var fieldSql = (_v$atoms = v.atoms) !== null && _v$atoms !== void 0 && _v$atoms.length ? _handleBaseType2Sql7(v.atoms, db).sql.trim() || v.sql : v.sql || "".concat(v.alias, ".").concat(v.realName || v.name);
+        var fieldSql = (_v$atoms = v.atoms) !== null && _v$atoms !== void 0 && _v$atoms.length ? _handleBaseType2Sql8(v.atoms, db).sql.trim() || v.sql : v.sql || "".concat(v.alias, ".").concat(v.realName || v.name);
         queryColumns.push({
           field_sql: "".concat(fieldSql, " as ").concat(v.fieldAlias),
           read_name: '',
@@ -624,8 +634,8 @@ var _handleNesting = function handleNesting(data) {
   }
   if (sortData && sortData.sort.length) {
     obj.orderInfos = "ORDER BY ".concat(sortData.sort.map(function (v) {
-      var _handleBaseType2Sql1 = _handleBaseType2Sql7(v.expression, db),
-        sql = _handleBaseType2Sql1.sql;
+      var _handleBaseType2Sql10 = _handleBaseType2Sql8(v.expression, db),
+        sql = _handleBaseType2Sql10.sql;
       return "".concat(sql, " ").concat(v.sort);
     }).join(', '));
   }

package/lib/es/utils.js

@@ -495,6 +495,16 @@ export function splitByUnion(data) {
   return result;
 }
 var summarizeNoArgumentConditions = ['总行数', '累积行数'];
+var stripSummarizeTableFields = function stripSummarizeTableFields(record) {
+  return _objectSpread(_objectSpread({}, record), {}, {
+    table: '',
+    tableId: '',
+    tableUuid: '',
+    alias: '',
+    datasourceId: '',
+    datasourceName: ''
+  });
+};
 var createSummarizeFieldAtom = function createSummarizeFieldAtom(record) {
   if (!record.name) return null;
   return {
@@ -516,20 +526,21 @@ var createSummarizeFieldAtom = function createSummarizeFieldAtom(record) {
 var normalizeSummarizeItemForSave = function normalizeSummarizeItemForSave(record) {
   var _record$atoms;
   if ((_record$atoms = record.atoms) !== null && _record$atoms !== void 0 && _record$atoms.length || summarizeNoArgumentConditions.includes(record.condition)) {
-    return record;
+    var _record$atoms2;
+    return (_record$atoms2 = record.atoms) !== null && _record$atoms2 !== void 0 && _record$atoms2.length ? stripSummarizeTableFields(record) : record;
   }
   var fieldAtom = createSummarizeFieldAtom(record);
   if (!fieldAtom) return record;
-  return _objectSpread(_objectSpread({}, record), {}, {
+  return _objectSpread(_objectSpread({}, stripSummarizeTableFields(record)), {}, {
     atoms: [fieldAtom]
   });
 };
 var normalizeSummarizeByForSave = function normalizeSummarizeByForSave(record) {
-  var _record$atoms2;
-  if ((_record$atoms2 = record.atoms) !== null && _record$atoms2 !== void 0 && _record$atoms2.length) return record;
+  var _record$atoms3;
+  if ((_record$atoms3 = record.atoms) !== null && _record$atoms3 !== void 0 && _record$atoms3.length) return stripSummarizeTableFields(record);
   var fieldAtom = createSummarizeFieldAtom(record);
   if (!fieldAtom) return record;
-  return _objectSpread(_objectSpread({}, record), {}, {
+  return _objectSpread(_objectSpread({}, stripSummarizeTableFields(record)), {}, {
     atoms: [fieldAtom]
   });
 };

package/package.json

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