@gingkoo/pandora-metabase 1.0.118 → 1.0.120

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

@@ -1,4 +1,6 @@
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
+import _createForOfIteratorHelper from "@babel/runtime/helpers/esm/createForOfIteratorHelper";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
@@ -24,6 +26,7 @@ var SelectIndex = function SelectIndex(props) {
   var group = meta.group;
   var index = findIndex(store.metaList[groupIndex].list, meta);
   var notGroupSelected = !group.length;
+  var summarizeWithoutArgument = ['总行数', '累积行数'];
   function getColumns() {
     var _getHelper = getHelper(store.metaList[groupIndex].list, meta),
       ExistAboveGroupBy = _getHelper.ExistAboveGroupBy,
@@ -33,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: []
@@ -49,7 +53,6 @@ var SelectIndex = function SelectIndex(props) {
             fieldUuid: uuidv4('field'),
             fieldAlias: v.fieldAlias || '',
             realName: ((_v$sql = v.sql) === null || _v$sql === void 0 || (_v$sql = _v$sql.split(' AS ')) === null || _v$sql === void 0 ? void 0 : _v$sql[1]) || '',
-            // name_zh: '',
             database_type: (v === null || v === void 0 ? void 0 : v.database_type) || SQL_COLUMN_TYPE.FLOAT,
             special_type: '',
             select: true
@@ -64,7 +67,6 @@ var SelectIndex = function SelectIndex(props) {
             name_zh: v.name_zh || v.quotes,
             id: v.id || v.fieldId,
             realName: ((_v$sql2 = v.sql) === null || _v$sql2 === void 0 || (_v$sql2 = _v$sql2.split(' AS ')) === null || _v$sql2 === void 0 ? void 0 : _v$sql2[1]) || '',
-            // name_zh: '',
             database_type: (v === null || v === void 0 ? void 0 : v.database_type) || SQL_COLUMN_TYPE.FLOAT,
             special_type: '',
             fieldUuid: uuidv4('field'),
@@ -76,50 +78,53 @@ var SelectIndex = function SelectIndex(props) {
       data = [_data];
       var joinData = prevList.filter(function (v) {
         return v.type === TypeEnum.joinData;
-      })
-      // @ts-ignore
-      .filter(function (v) {
+      }).filter(function (v) {
         return v && v.table2.name;
       });
       if (joinData.length) {
-        data = data.concat(
-        // @ts-ignore
-        joinData.map(function (v) {
+        data = data.concat(joinData.map(function (v) {
           return {
+            name: v.table2.name,
+            id: v.table2.id,
+            name_zh: v.table2.name_zh || v.table2.name,
             alias: v.table2.alias,
-            table: v.table2.name,
             tableUuid: v.table2.tableUuid,
-            tableId: v.table2.id,
             columns: v.columns
           };
         }));
       }
     } else {
-      // @ts-ignore
       data = store.metaList[groupIndex].list.slice(0, index).map(function (v) {
         if (v.type === TypeEnum.data) {
           return {
+            name: v.table.name,
+            id: v.table.id,
+            name_zh: v.table.name_zh || v.table.name,
             alias: v.table.alias,
-            table: v.table.name,
             tableUuid: v.table.tableUuid,
-            tableId: v.table.id,
             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;
@@ -128,7 +133,7 @@ var SelectIndex = function SelectIndex(props) {
     var newMeta = store.metaList[groupIndex].list.slice();
     var data = getColumns();
     var value = group[i];
-    store.setPopup({
+    store.setPopup2({
       visible: true,
       node: e.currentTarget,
       content: _jsx(SelectSummarize, {
@@ -136,23 +141,17 @@ var SelectIndex = function SelectIndex(props) {
         value: value,
         ignoreGroupByType: store.ignoreGroupByType,
         onChange: function onChange(data) {
-          //@ts-ignore
-          newMeta[index].group.splice(i, 1, data);
-          //@ts-ignore
+          newMeta[index].group.splice(i, 1, normalizeGroupRecord(data));
           newMeta[index].group = newMeta[index].group.map(function (v) {
             var _summarizeToSql = summarizeToSql(newMeta[index].group, v),
               sql = _summarizeToSql.sql,
               fieldAlias = _summarizeToSql.fieldAlias;
             return _objectSpread(_objectSpread({}, v), {}, {
               name: v.name || v.quotes,
-              //@ts-ignore
               sql: sql,
               fieldAlias: fieldAlias
             });
           });
-          // if (value.quotes !== data.quotes) {
-          //   newMeta = newMeta.filter((_: MetaListType, _i: number) => _i <= index);
-          // }
           store.setMeta(newMeta, groupIndex, {
             obj: newMeta[index].group,
             type: ChangeType.group
@@ -180,11 +179,9 @@ var SelectIndex = function SelectIndex(props) {
       quotes: '',
       datasourceId: '',
       datasourceName: '',
-      // column: '',
-      // column_id: '',
       summarizeType: MetaSummarize_Enum.GROUP
     };
-    store.setPopup({
+    store.setPopup2({
       visible: true,
       node: e.currentTarget,
       content: _jsx(SelectSummarize, {
@@ -192,9 +189,7 @@ var SelectIndex = function SelectIndex(props) {
         value: value,
         ignoreGroupByType: store.ignoreGroupByType,
         onChange: function onChange(data) {
-          // @ts-ignore
-          newMeta[index].group.push(data);
-          // @ts-ignore
+          newMeta[index].group.push(normalizeGroupRecord(data));
           newMeta[index].group = newMeta[index].group.map(function (v) {
             var _summarizeToSql2 = summarizeToSql(newMeta[index].group, v),
               sql = _summarizeToSql2.sql,
@@ -220,15 +215,13 @@ var SelectIndex = function SelectIndex(props) {
     e.stopPropagation();
     closePopup();
     var newMeta = store.metaList[groupIndex].list.slice();
-    // @ts-ignore
     newMeta[index].group = group.filter(function (_, i) {
       return i !== itemId;
     });
-    // newMeta = newMeta.filter((_: MetaListType, _i: number) => _i <= index);
     store.setMeta(newMeta, groupIndex);
   }
   function closePopup() {
-    store.setPopup({
+    store.setPopup2({
       visible: false
     });
   }
@@ -236,7 +229,6 @@ var SelectIndex = function SelectIndex(props) {
     var fieldAlias = val || '';
     Modal.confirm({
       title: __('SqlQueryBuilder.alias'),
-      // 设置别名
       content: _jsx(Input, {
         defaultValue: fieldAlias,
         onChange: function onChange(val) {
@@ -245,7 +237,7 @@ var SelectIndex = function SelectIndex(props) {
       }),
       icon: false,
       onOk: function () {
-        var _onOk = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+        var _onOk = _asyncToGenerator(_regeneratorRuntime.mark(function _callee() {
           var newMeta;
           return _regeneratorRuntime.wrap(function (_context) {
             while (1) switch (_context.prev = _context.next) {
@@ -257,9 +249,9 @@ var SelectIndex = function SelectIndex(props) {
                 Toast.warning(__('SqlQueryBuilder.aliasForRules'));
                 return _context.abrupt("return", false);
               case 1:
-                newMeta = store.metaList[groupIndex].list.slice(); // @ts-ignore
+                newMeta = store.metaList[groupIndex].list.slice();
                 newMeta[index].group[i].fieldAlias = fieldAlias;
-                newMeta[index].group[i].sql = newMeta[index].group[i].sql.split('AS ')[0] + "AS ".concat(fieldAlias); //修改sql
+                newMeta[index].group[i].sql = newMeta[index].group[i].sql.split('AS ')[0] + "AS ".concat(fieldAlias);
                 newMeta = changeFieldAlias(newMeta, newMeta[index].group[i]);
                 store.setMeta(newMeta, groupIndex, {
                   obj: newMeta[index].group,
@@ -282,15 +274,11 @@ 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: '',
-        // 数据源名
-        datasourceId: '' // 数据源id
+        datasourceId: ''
       });
     });
   };
@@ -298,36 +286,105 @@ var SelectIndex = function SelectIndex(props) {
     var _v = cloneDeep(v);
     return _objectSpread(_objectSpread({}, _v), {}, {
       fieldName: v.name,
-      // 字段名
       fieldNameZh: v.name_zh,
-      // 字段中文名
       fieldAlias: v.fieldAlias,
-      // 别名
       fieldUuid: v.fieldUuid,
-      // uuid
       fieldId: v.fieldId,
-      // 字段id
       tableName: v.table,
-      // 表名
       tableNameZh: '',
       tableId: v.tableId,
-      // 表名
       tableAlias: v.alias,
-      // 别名
       tableUuid: v.tableUuid,
-      // 表唯一标识
-      // 线上的都为空，默认会标红。 等统一格式后可隐藏
       datasourceName: '',
-      // 数据源名
       datasourceId: '',
-      // 数据源id
       type: AtomsTypeEnum.FIELD
     });
   };
+  var isFormulaMetric = function isFormulaMetric(record) {
+    return !!record.condition && !summarizeWithoutArgument.includes(record.condition);
+  };
+  var _getFirstField = function getFirstField() {
+    var list = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+    var _iterator = _createForOfIteratorHelper(list),
+      _step;
+    try {
+      for (_iterator.s(); !(_step = _iterator.n()).done;) {
+        var item = _step.value;
+        if (!item) continue;
+        if (item.type === AtomsTypeEnum.FIELD) return item;
+        if (item.type === AtomsTypeEnum.EXPRESSION) {
+          var found = _getFirstField([].concat(_toConsumableArray(item.lhs || []), _toConsumableArray(item.rhs || [])));
+          if (found) return found;
+        }
+        if (item.type === AtomsTypeEnum.FORMULA) {
+          var _found = (item.args || []).map(function (arg) {
+            return _getFirstField((arg === null || arg === void 0 ? void 0 : arg.list) || []);
+          }).find(Boolean);
+          if (_found) return _found;
+        }
+        if (item.type === AtomsTypeEnum.AND_OR) {
+          var _found2 = _getFirstField(item.list || []);
+          if (_found2) return _found2;
+        }
+        if (item.type === AtomsTypeEnum.CASE_WHEN) {
+          var _found3 = _getFirstField(item.caseValue || []) || (item.branches || []).map(function (branch) {
+            return _getFirstField([].concat(_toConsumableArray(branch.when || []), _toConsumableArray(branch.then || [])));
+          }).find(Boolean) || _getFirstField(item.elseValue || []);
+          if (_found3) return _found3;
+        }
+        if (item.type === AtomsTypeEnum.EXISTS || item.type === AtomsTypeEnum.NOT_EXISTS) {
+          var _found4 = _getFirstField(item.notExists || []);
+          if (_found4) return _found4;
+        }
+        if (item.type === AtomsTypeEnum.COLLECTION) {
+          var _found5 = _getFirstField(item.list || []);
+          if (_found5) return _found5;
+        }
+      }
+    } catch (err) {
+      _iterator.e(err);
+    } finally {
+      _iterator.f();
+    }
+    return null;
+  };
+  var getAtomsValue = function getAtomsValue(record) {
+    var _record$atoms;
+    if (!isFormulaMetric(record)) return [];
+    if ((_record$atoms = record.atoms) !== null && _record$atoms !== void 0 && _record$atoms.length) return record.atoms;
+    var field = getField(record);
+    return field.fieldName ? [field] : [];
+  };
+  var normalizeGroupRecord = function normalizeGroupRecord(record) {
+    var atoms = getAtomsValue(record);
+    var firstField = _getFirstField(atoms);
+    var nextRecord = _objectSpread(_objectSpread({}, record), {}, {
+      atoms: atoms.length ? atoms : undefined
+    });
+    if (firstField) {
+      nextRecord.table = firstField.tableName || nextRecord.table;
+      nextRecord.tableId = firstField.tableId || nextRecord.tableId;
+      nextRecord.tableUuid = firstField.tableUuid || nextRecord.tableUuid;
+      nextRecord.alias = firstField.tableAlias || nextRecord.alias;
+      nextRecord.name = firstField.fieldName || nextRecord.name;
+      nextRecord.id = firstField.fieldId || nextRecord.id;
+      nextRecord.realName = firstField.fieldName || nextRecord.realName;
+      nextRecord.fieldUuid = firstField.fieldUuid || nextRecord.fieldUuid;
+      nextRecord.datasourceId = firstField.datasourceId || nextRecord.datasourceId;
+      nextRecord.datasourceName = firstField.datasourceName || nextRecord.datasourceName;
+      nextRecord.database_type = firstField.database_type || nextRecord.database_type;
+      if (!nextRecord.quotes || nextRecord.quotes === nextRecord.condition) {
+        nextRecord.quotes = "".concat(nextRecord.condition, " ").concat(firstField.fieldAlias || firstField.fieldName || '').trim();
+      }
+    }
+    return nextRecord;
+  };
   return _jsxs(_Fragment, {
     children: [meta.group.map(function (v, i) {
+      var atomsValue = getAtomsValue(v);
+      var showAtoms = isFormulaMetric(v);
       return _jsx(ItemName, {
-        isError: isError(getField(v), _getColumns()),
+        isError: isError(showAtoms ? atomsValue : getField(v), _getColumns()),
         children: _jsxs("div", {
           className: "Sqb-TableName green-name",
           onClick: function onClick(e) {

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

@@ -13,6 +13,7 @@ import { ChangeType } from '../../store/types';
 import { Tooltip, Button, Modal, Modal2, Input, Toast } from '@gingkoo/pandora';
 import Metabase from '../../index';
 import { uuidv4, getAlias } from '../../utils/helper';
+import { getTopLayerZIndex } from '../../utils/helper-dom';
 import { changeTableAlias, getSubColumns, isValidSQLAlias, isExistsError } from '../../utils';
 import { RelatedWork } from '@gingkoo/pandora-icons';
 import cloneDeep from 'lodash/cloneDeep';
@@ -36,8 +37,8 @@ var TableData = function TableData(props) {
     _useState2 = _slicedToArray(_useState, 2),
     isDel = _useState2[0],
     setIsDel = _useState2[1];
-  var tableIsDel = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+  var tableIsDel = function () {
+    var _ref = _asyncToGenerator(_regeneratorRuntime.mark(function _callee() {
       var _meta$table, _meta$table2;
       var tableName, tables, names;
       return _regeneratorRuntime.wrap(function (_context) {
@@ -97,14 +98,12 @@ var TableData = function TableData(props) {
             });
             store.fetchColumns(data, data.datasourceId, [], function (columns) {
               newMetaList.columns = columns;
-              // ① 主表动了 其他都得重新选
               var newMetas = store.metaList[groupIndex].list.slice();
               newMetas[0] = newMetaList;
               store.setMeta(newMetas, groupIndex, {
                 obj: data,
                 type: ChangeType.datasource
               });
-              // store.setMeta([newMetaList], groupIndex);
             });
           }
           store.setPopup({
@@ -124,9 +123,7 @@ var TableData = function TableData(props) {
         groupIndex: groupIndex,
         data: columns,
         onChange: function onChange(data, newMetaList) {
-          // 当前值已改变。必须以传入的数组为准，改变别名
           var _newMetaList = newMetaList || store.metaList[groupIndex].list.slice();
-          // @ts-ignore
           _newMetaList[0].columns = data;
           if (!newMetaList) {
             store.setMeta(_newMetaList, groupIndex, {
@@ -142,7 +139,6 @@ var TableData = function TableData(props) {
     var alias = val || '';
     Modal.confirm({
       title: __('SqlQueryBuilder.alias'),
-      // 设置别名
       content: _jsx(Input, {
         defaultValue: alias,
         onChange: function onChange(val) {
@@ -150,7 +146,7 @@ var TableData = function TableData(props) {
         }
       }),
       onOk: function () {
-        var _onOk = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
+        var _onOk = _asyncToGenerator(_regeneratorRuntime.mark(function _callee2() {
           var newMetaList;
           return _regeneratorRuntime.wrap(function (_context2) {
             while (1) switch (_context2.prev = _context2.next) {
@@ -162,7 +158,7 @@ var TableData = function TableData(props) {
                 Toast.warning(__('SqlQueryBuilder.aliasForRules'));
                 return _context2.abrupt("return", false);
               case 1:
-                newMetaList = store.metaList[groupIndex].list.slice(); // @ts-ignore
+                newMetaList = store.metaList[groupIndex].list.slice();
                 newMetaList[0].table.alias = alias;
                 newMetaList = changeTableAlias(newMetaList, newMetaList[0].table);
                 store.setMeta(newMetaList, groupIndex, {
@@ -183,7 +179,6 @@ var TableData = function TableData(props) {
       onCancel: function onCancel() {}
     });
   };
-  // 子查询弹窗
   var showSubQuery = function showSubQuery() {
     var val = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
     var _store$preProps2 = store.preProps,
@@ -192,23 +187,24 @@ var TableData = function TableData(props) {
       isExit = _store$preProps2.isExit,
       toolbar = _store$preProps2.toolbar,
       other = _objectWithoutProperties(_store$preProps2, _excluded);
+    var childModalZIndex = getTopLayerZIndex() + 1;
     var newMetaList = store.metaList[groupIndex].list.slice()[0];
     var newMeta = store.metaList[groupIndex].list.slice();
     var oldList = cloneDeep(newMetaList.subquery);
     var _toolbar = subToolbar || toolbar;
-    // _toolbar = _toolbar.filter((v: string) => v !== 'group'); // 子查询不需要分组
     var o = Modal2.openModal({
+      zIndex: childModalZIndex,
       title: __('SqlQueryBuilder.subquery'),
       transparentMask: true,
       content: _jsx(_Fragment, {
         children: _jsx(Metabase, _objectSpread(_objectSpread({}, other), {}, {
+          popupZIndex: childModalZIndex + 1,
           showSubquery: store._showSubquery,
           toolbar: _toolbar,
           btnText: __('SqlQueryBuilder.confirm'),
           value: cloneDeep(val),
           onOk: function onOk(newList) {
             try {
-              // 子查询未改变不做操作
               if (isEqual(newList, oldList)) {
                 o.close();
                 return;
@@ -226,18 +222,14 @@ var TableData = function TableData(props) {
                   select: false
                 });
               });
-              // newMetaList.columns = newColumns;
               newMetaList.columns = newColumns.map(function (newCol) {
-                // 查找旧列中是否有相同 name 的列
                 var existingCol = newMetaList.columns.find(function (oldCol) {
                   return oldCol.name === newCol.name;
                 });
                 var _column = existingCol ? existingCol : newCol;
                 _column.select = store.isSelectFields || _column.select;
-                // 如果存在，返回旧列；否则返回新列
                 return _column;
               });
-              // (newMeta[index] as MetaJoin).expressions = [];
               var newMetas = store.metaList[groupIndex].list.slice();
               newMetas[0] = newMetaList;
               store.setMeta(newMetas, groupIndex, {
@@ -246,9 +238,7 @@ var TableData = function TableData(props) {
               });
               tableIsDel();
               o.close();
-            } catch (e) {
-              console.warn(e);
-            } finally {
+            } catch (e) {} finally {
               o.close();
             }
           }
@@ -257,25 +247,18 @@ var TableData = function TableData(props) {
       onClose: function onClose() {}
     });
   };
-  // 切换子查询
   var switchSubQuery = function switchSubQuery() {
     var newMetaList = store.metaList[groupIndex].list.slice();
     newMetaList[0].isSubquery = !newMetaList[0].isSubquery;
-    //重置表数据
     newMetaList[0].subquery = [];
     newMetaList[0].table = {
       name: '',
-      // 表名
       name_zh: '',
-      // 表名
       tableUuid: '',
       id: '',
-      // 表名
       alias: '',
-      // 表别名
       datasourceName: '',
-      // 数据源名
-      datasourceId: '' // 数据源id
+      datasourceId: ''
     };
     store.setMeta(newMetaList, groupIndex);
   };
@@ -386,43 +369,7 @@ var TableData = function TableData(props) {
                     })
                   }) : null;
                 }()
-              })
-              // <Tooltip
-              //   title={__(
-              //     tableIsError()
-              //       ? isDel
-              //         ? 'metabase.verify'
-              //         : 'SqlQueryBuilder.repeatAlias'
-              //       : 'SqlQueryBuilder.alias',
-              //   )}
-              // >
-              //   <Button
-              //     danger={tableIsError()}
-              //     className={cx(':Sqb-TableName-as', {
-              //       isError: tableIsError(),
-              //     })}
-              //     shape='circle'
-              //     style={
-              //       isDel
-              //         ? {
-              //             fontSize: 18,
-              //             backgroundColor: '#fff',
-              //             width: 'auto',
-              //             height: 'auto',
-              //           }
-              //         : {}
-              //     }
-              //     iconOnly
-              //     primary={!isDel}
-              //     icon={isDel ? <ExclamationCircleFill /> : 'As'}
-              //     size='small'
-              //     onClick={(e) => {
-              //       e.stopPropagation();
-              //       onChangeTableAlias(meta.table?.alias || '');
-              //     }}
-              //   ></Button>
-              // </Tooltip>
-              , selected ? "".concat(meta.table.datasourceName, ".").concat(meta.table.name, " ").concat((_meta$table8 = meta.table) !== null && _meta$table8 !== void 0 && _meta$table8.alias && store.tableEnableAlias ? "as ".concat((_meta$table9 = meta.table) === null || _meta$table9 === void 0 ? void 0 : _meta$table9.alias) : '') : __('SqlQueryBuilder.pickTable')]
+              }), selected ? "".concat(meta.table.datasourceName, ".").concat(meta.table.name, " ").concat((_meta$table8 = meta.table) !== null && _meta$table8 !== void 0 && _meta$table8.alias && store.tableEnableAlias ? "as ".concat((_meta$table9 = meta.table) === null || _meta$table9 === void 0 ? void 0 : _meta$table9.alias) : '') : __('SqlQueryBuilder.pickTable')]
             }), store.showSubquery && _jsx(Tooltip, {
               title: __('SqlQueryBuilder.switchSubQuery'),
               children: _jsx(Button, {