@gingkoo/pandora-metabase 1.0.117 → 1.0.119

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

@@ -3,12 +3,6 @@ import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
-/**
- * 选择表弹框
- * 谁在用？
- * 1、数据模块
- * 2、关联模块
- */
 import './index.less';
 import React, { useState, useEffect } from 'react';
 import cloneDeep from 'lodash/cloneDeep';
@@ -63,7 +57,7 @@ var SelectTable = function SelectTable(_ref) {
     return _getTables.apply(this, arguments);
   }
   function _getTables() {
-    _getTables = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(datasourceId) {
+    _getTables = _asyncToGenerator(_regeneratorRuntime.mark(function _callee(datasourceId) {
       var tables;
       return _regeneratorRuntime.wrap(function (_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -193,7 +187,6 @@ var SelectTable = function SelectTable(_ref) {
     });
   }
   var nextPage = !val.datasourceId;
-  // 没有选 数据源 先选数据源
   if (nextPage) {
     return _jsx("div", {
       className: cx("Sqb-SelectDataSource--box pb-2 pt-2"),

package/lib/es/components/metabase/index.js

@@ -8,10 +8,9 @@ import './index.less';
 import { useMemo, useState } from 'react';
 import cx from 'classnames';
 import { Button, Modal, Toast, Space, Tooltip } from '@gingkoo/pandora';
-// import { toJS } from 'mobx';
 import Styled from 'styled-components';
 import Union from '../modules/union';
-import { splitByUnion, reassembleByUnion, patchData } from '../../utils';
+import { splitByUnion, reassembleByUnion, patchData, normalizeLegacySummarizeForSave } from '../../utils';
 import { __ } from '../../locale';
 import modulesMap from '../modules';
 import Popup from '../popup';
@@ -27,7 +26,8 @@ var Metabase = function Metabase(props) {
     readonly = _props$readonly === void 0 ? false : _props$readonly,
     onOk = props.onOk,
     metabaseCopy = props.metabaseCopy,
-    moduleCopy = props.moduleCopy;
+    moduleCopy = props.moduleCopy,
+    popupZIndex = props.popupZIndex;
   var store = useStore();
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
@@ -37,8 +37,6 @@ var Metabase = function Metabase(props) {
     _useState4 = _slicedToArray(_useState3, 2),
     isCopy = _useState4[0],
     setIsCopy = _useState4[1];
-  // const popupContainer = useRef();
-  // store.setPopupContainer(popupContainer);
   var popupContent = useMemo(function () {
     var _store$popupData = store.popupData,
       visible = _store$popupData.visible,
@@ -60,9 +58,6 @@ var Metabase = function Metabase(props) {
       Modal.error({
         title: __('metabase.prompt'),
         content: __('metabase.validationFilter')
-        // onOk: async () => {
-        //   // await onSave();
-        // },
       });
       return;
     }
@@ -71,7 +66,7 @@ var Metabase = function Metabase(props) {
         title: __('metabase.prompt'),
         content: __('metabase.validationFailed'),
         onOk: function () {
-          var _onOk = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+          var _onOk = _asyncToGenerator(_regeneratorRuntime.mark(function _callee() {
             return _regeneratorRuntime.wrap(function (_context) {
               while (1) switch (_context.prev = _context.next) {
                 case 0:
@@ -93,18 +88,19 @@ var Metabase = function Metabase(props) {
       onSave();
     }
   };
-  var onSave = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
+  var onSave = function () {
+    var _ref = _asyncToGenerator(_regeneratorRuntime.mark(function _callee2() {
       var intercept, _metaList;
       return _regeneratorRuntime.wrap(function (_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
-            intercept = false; // 是否返回
-            _metaList = splitByUnion(store.metaList);
+            intercept = false;
+            _metaList = normalizeLegacySummarizeForSave(splitByUnion(store.metaList));
             _metaList[0].patchVersion = '1.1.0';
             store.metaList.map(function (v) {
               var _v$list;
-              if (v.type !== 'union' && !((_v$list = v.list) === null || _v$list === void 0 ? void 0 : _v$list[0]).table.name) {
+              var firstTableName = (_v$list = v.list) === null || _v$list === void 0 || (_v$list = _v$list[0]) === null || _v$list === void 0 || (_v$list = _v$list.table) === null || _v$list === void 0 ? void 0 : _v$list.name;
+              if (v.type !== 'union' && !firstTableName) {
                 intercept = true;
                 return Toast.warning(__('data.pleaseSelectDataTable'));
               }
@@ -130,7 +126,6 @@ var Metabase = function Metabase(props) {
       return _ref.apply(this, arguments);
     };
   }();
-  // 复制功能
   var copy = function copy() {
     return _jsxs(Space, {
       children: [moduleCopy && _jsx(_Fragment, {
@@ -144,9 +139,6 @@ var Metabase = function Metabase(props) {
               'primary-color': !store.isMetabaseCopy
             }),
             onClick: function onClick() {
-              // if (store.isMetabaseCopy) {
-              //   storage._metabaseCopyModule = null;
-              // }
               store.setIsMetabaseCopy(!store.isMetabaseCopy);
               store.setMetabaseCopyModule([]);
               storage._metabaseCopyModule = [];
@@ -194,78 +186,71 @@ var Metabase = function Metabase(props) {
       })]
     });
   };
-  return (
-    // @ts-ignore
-    _jsx(VisualBox, {
-      ref: store.popupContainer,
-      children: _jsxs("div", {
-        className: 'Sqb',
-        children: [_jsx("div", {
-          className: 'Sqb-fun-btns',
-          children: copy()
-        }), store.metaList.map(function (v, index) {
-          var _v$list2;
-          if (v.type === 'union' && v.union) {
-            return _jsx("div", {
-              className: cx("Sqb-list"),
-              children: _jsx(Union, {
-                union: v.union,
-                meta: v,
-                groupIndex: index
-              })
-            }, 'union' + index);
-          }
+  return _jsx(VisualBox, {
+    ref: store.popupContainer,
+    children: _jsxs("div", {
+      className: 'Sqb',
+      children: [_jsx("div", {
+        className: 'Sqb-fun-btns',
+        children: copy()
+      }), store.metaList.map(function (v, index) {
+        var _v$list2;
+        if (v.type === 'union' && v.union) {
           return _jsx("div", {
             className: cx("Sqb-list"),
-            children: v === null || v === void 0 || (_v$list2 = v.list) === null || _v$list2 === void 0 ? void 0 : _v$list2.map(function (meta) {
-              var metaType = meta.type,
-                metaKey = meta.metaKey,
-                hidden = meta.hidden;
-              if (hidden) return null;
-              var Component = modulesMap.get(metaType);
-              return _jsx(Component, {
-                meta: meta,
-                groupIndex: index
-              }, metaKey);
+            children: _jsx(Union, {
+              union: v.union,
+              meta: v,
+              groupIndex: index
             })
-          }, 'group' + index);
-        }), !readonly && typeof onOk === 'function' ? _jsx(Button, {
-          type: 'primary',
-          className: ":Sqb-btn",
-          loading: saveLoading,
-          disabled: saveLoading,
-          onClick: onCheck,
-          children: btnText || __('SqlQueryBuilder.visualize')
-        }) : null, store.popupContainer.current && _jsx(Popup
-        // container={store.popupData.container || store.popupContainer.current}
-        , {
-          // container={store.popupData.container || store.popupContainer.current}
-          visible: store.popupData.visible,
-          node: store.popupData.node,
-          closable: store.popupClosable,
-          hideVisible: function hideVisible() {
-            store.setPopup({
-              visible: false
-            });
-          },
-          children: popupContent
-        }), store.popupContainer.current && _jsx(Popup
-        // container={store.popupData2.container || store.popupContainer.current}
-        , {
-          // container={store.popupData2.container || store.popupContainer.current}
-          visible: store.popupData2.visible,
-          node: store.popupData2.node,
-          closable: store.popupClosable2,
-          hideVisible: function hideVisible() {
-            store.setClosable(true);
-            store.setPopup2({
-              visible: false
-            });
-          },
-          children: popupContent2
-        })]
-      })
+          }, 'union' + index);
+        }
+        return _jsx("div", {
+          className: cx("Sqb-list"),
+          children: v === null || v === void 0 || (_v$list2 = v.list) === null || _v$list2 === void 0 ? void 0 : _v$list2.map(function (meta) {
+            var metaType = meta.type,
+              metaKey = meta.metaKey,
+              hidden = meta.hidden;
+            if (hidden) return null;
+            var Component = modulesMap.get(metaType);
+            return _jsx(Component, {
+              meta: meta,
+              groupIndex: index
+            }, metaKey);
+          })
+        }, 'group' + index);
+      }), !readonly && typeof onOk === 'function' ? _jsx(Button, {
+        type: 'primary',
+        className: ":Sqb-btn",
+        loading: saveLoading,
+        disabled: saveLoading,
+        onClick: onCheck,
+        children: btnText || __('SqlQueryBuilder.visualize')
+      }) : null, store.popupContainer.current && _jsx(Popup, {
+        visible: store.popupData.visible,
+        node: store.popupData.node,
+        zIndex: popupZIndex,
+        closable: store.popupClosable,
+        hideVisible: function hideVisible() {
+          store.setPopup({
+            visible: false
+          });
+        },
+        children: popupContent
+      }), store.popupContainer.current && _jsx(Popup, {
+        visible: store.popupData2.visible,
+        node: store.popupData2.node,
+        zIndex: popupZIndex,
+        closable: store.popupClosable2,
+        hideVisible: function hideVisible() {
+          store.setClosable(true);
+          store.setPopup2({
+            visible: false
+          });
+        },
+        children: popupContent2
+      })]
     })
-  );
+  });
 };
 export default Metabase;

package/lib/es/components/metabase/index.less

@@ -111,7 +111,7 @@
         .right-arrow,
         .left-arrow {
           position: absolute;
-          top: 0;
+          top: 50%;
           height: 40px;
           width: 30px;
           display: flex;
@@ -119,7 +119,7 @@
           justify-content: center;
           opacity: 0.4;
           cursor: pointer;
-          transform: scale(0);
+          transform: translateY(-50%) scale(0);
           transition: all 0.3s;
           img {
             transform: scale(0.8);
@@ -129,7 +129,7 @@
           }
         }
         .left-arrow {
-          transform: rotate(180deg) scale(0);
+          transform: translateY(-50%) rotate(180deg) scale(0);
           transform-origin: 50% 50%;
           // padding-top: 10px;
           left: -30px;
@@ -139,11 +139,11 @@
           // padding-bottom: 10px;
         }
         &:not(.item-fixed).hover {
-          .left-arrow {
-            transform: rotate(180deg) scale(1);
+          > .left-arrow {
+            transform: translateY(-50%) rotate(180deg) scale(1);
           }
-          .right-arrow {
-            transform: scale(1);
+          > .right-arrow {
+            transform: translateY(-50%) scale(1);
           }
         }
       }
@@ -208,11 +208,18 @@
             top: 0;
             transform: translate(50%, -50%);
             margin: 0;
+            padding: 0;
             border: none;
             border-radius: 50%;
             width: 20px;
             height: 20px;
+            min-height: 20px;
             font-size: 12px;
+            display: inline-flex;
+            align-items: center;
+            justify-content: center;
+            line-height: 1;
+            flex-shrink: 0;
           }
           &-input {
             //输入框样式，稍微小了一点

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

@@ -23,7 +23,7 @@ var Wrapper = function Wrapper(_ref) {
     return _animation.apply(this, arguments);
   }
   function _animation() {
-    _animation = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+    _animation = _asyncToGenerator(_regeneratorRuntime.mark(function _callee() {
       var _couterRef$current;
       return _regeneratorRuntime.wrap(function (_context) {
         while (1) switch (_context.prev = _context.next) {

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

@@ -13,8 +13,8 @@ var Header = function Header(props) {
     groupIndex = props.groupIndex,
     isDataModule = props.isDataModule;
   var store = useStore();
-  var diff = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+  var diff = function () {
+    var _ref = _asyncToGenerator(_regeneratorRuntime.mark(function _callee() {
       var _oldMeta, _newMeta, _yield$store$getModul, oldCode, newCode, o;
       return _regeneratorRuntime.wrap(function (_context) {
         while (1) switch (_context.prev = _context.next) {

package/lib/es/components/modules/components/meta-icon.d.ts

@@ -10,9 +10,6 @@ type IconInfoType = {
     className?: string;
 };
 export declare const IconTypeMap: Map<TypeEnum, IconInfoType>;
-/**
- * 查找模块下面能放哪些icon （参考来源：metabase.com）
- */
 export declare const findNextIcon: (store: any, props: PropsType) => TypeEnum[];
 declare const NextDom: (props: PropsType) => import("react/jsx-runtime").JSX.Element | null;
 export default NextDom;

package/lib/es/components/modules/components/meta-icon.js

@@ -9,7 +9,6 @@ import { Tooltip, Button, Toast } from '@gingkoo/pandora';
 import { FfPlus } from '@gingkoo/pandora-icons';
 import storage from '../../../utils/storage';
 import { getHelper, isCanPaste } from '../../../utils';
-// import { type SqlVisionStoreType } from '../../../store/helper';
 import { useStore } from '../../../hooks/use-provider';
 import { RowLimitIcon, SortIcon, CustomColumnIcon, JoinDataIcon, PermissionTableIcon, SummarizeIcon, FilterIcon, GroupIcon } from '../../icons';
 var IconSIzeEnum;
@@ -50,11 +49,8 @@ export var IconTypeMap = new Map([[TypeEnum.filter, {
   icon: _jsx(GroupIcon, {}),
   className: 'union'
 }]]);
-// 前端展示的icon顺序 随便改不影响逻辑
 var DisplayOrder = [TypeEnum.filter, TypeEnum.summarize, TypeEnum.joinData, TypeEnum.permissionTable, TypeEnum.customColumn, TypeEnum.sort, TypeEnum.rowLimit, TypeEnum.union];
-// js逻辑顺序 正常顺序
 var OrderType = [TypeEnum.data, TypeEnum.joinData, TypeEnum.permissionTable, TypeEnum.customColumn, TypeEnum.filter, TypeEnum.summarize, TypeEnum.sort, TypeEnum.rowLimit, TypeEnum.union];
-// js逻辑顺序 聚合下面的顺序是这个样子
 var OrderNewType = [TypeEnum.sort, TypeEnum.rowLimit, TypeEnum.joinData, TypeEnum.permissionTable, TypeEnum.customColumn, TypeEnum.filter, TypeEnum.summarize, TypeEnum.union];
 var metaIcon = function metaIcon(size, handleClick) {
   return function (_ref) {
@@ -80,25 +76,6 @@ var metaIcon = function metaIcon(size, handleClick) {
     });
   };
 };
-/**
- * 如果选择了聚合 数据的 字段就不能选了
- */
-/*
- **** 该文件 主要是判断 模块下面该放的icon ****
-
- 这一块逻辑比较复杂 主要分两个部分
- 一、模块下面应该放哪些icon
-  1）正常顺序是上面的 OrderType，然后各自根据各自情况找出自己下面能放的icon，但是有两个瘪犊子 （关联、聚合）
-  2）关联比较特殊 可以有多个关联，关联选择了关联表之后，下面还可以继续选关联
-  3）聚合 ... 情况太大了 不一一写了 后面的人自己看下面代码逻辑吧
-  5）
-  6）
- 二、模块下面的icon size是large 还是small
-  1）正常情况，除了最后一个模块下面的icon是 large 其他的都是small 但是也有特殊情况，
-  2）特殊情况一 如果最后一个是聚合，且聚合没有选指标和groupby 下面是small
-  3）特殊情况二 如果最后一个是排序，下面是small
-*/
-// 判断icon大小
 var judgeSize = function judgeSize(store, props, nextLen, groupIndex) {
   var meta = props.meta;
   var type = meta.type;
@@ -119,9 +96,6 @@ var judgeSize = function judgeSize(store, props, nextLen, groupIndex) {
   }
   return size;
 };
-/**
- * 查找模块下面能放哪些icon （参考来源：metabase.com）
- */
 export var findNextIcon = function findNextIcon(store, props) {
   var _store$metaList$group;
   var meta = props.meta,
@@ -138,10 +112,8 @@ export var findNextIcon = function findNextIcon(store, props) {
     prevGroupBy = _getHelper.prevGroupBy,
     nextGroupBy = _getHelper.nextGroupBy;
   var nextType = ((_store$metaList$group = store.metaList[groupIndex].list[index + 1]) === null || _store$metaList$group === void 0 ? void 0 : _store$metaList$group.type) || '';
-  // @ts-ignore
   var isLast = nextType === '';
   var available = [];
-  // 当前处在的位置
   var curLocation = OrderType.indexOf(type);
   var nextLocation = OrderType.indexOf(nextType);
   if (type === TypeEnum.data) {
@@ -156,7 +128,6 @@ export var findNextIcon = function findNextIcon(store, props) {
   }
   if (type === TypeEnum.joinData) {
     if (ExistAboveGroupBy && isLast) {
-      // 聚合在上面 且自己是最后一个
       if (meta.table2.name) {
         available = OrderType.slice(curLocation + 1);
       } else {
@@ -169,7 +140,6 @@ export var findNextIcon = function findNextIcon(store, props) {
         available = OrderType.slice(curLocation + 1, nextLocation);
       }
     }
-    // 关联比较特殊可以有多个
     if (nextType !== TypeEnum.joinData && meta.table2.name) {
       available.unshift(TypeEnum.joinData);
     }
@@ -179,9 +149,7 @@ export var findNextIcon = function findNextIcon(store, props) {
   }
   if (type === TypeEnum.customColumn) {
     if (ExistAboveGroupBy && isLast) {
-      // 聚合在上面 且自己是最后一个
       var joinIndex = prevTypes.indexOf(TypeEnum.joinData);
-      // 如果自定义已经选了 或者 自定义没选但是他上面有个关联且关联选了 则展示排序和行限制 否则不展示
       if (meta.customColumn.length || ~joinIndex && prevList[joinIndex].table2.name) {
         available = OrderType.slice(curLocation + 1);
       } else {
@@ -197,10 +165,8 @@ export var findNextIcon = function findNextIcon(store, props) {
   }
   if (type === TypeEnum.filter) {
     if (ExistAboveGroupBy && isLast) {
-      // 聚合在上面 且自己是最后一个
       var _joinIndex = prevTypes.indexOf(TypeEnum.joinData);
       var customIndex = prevTypes.indexOf(TypeEnum.customColumn);
-      // 如果自定义已经选了 或者 自定义没选但是他上面有个关联且关联选了 则展示排序和行限制 否则不展示
       if (meta.filter.length || ~_joinIndex && prevList[_joinIndex].table2.name || ~customIndex && prevList[customIndex].customColumn.length) {
         available = OrderType.slice(curLocation + 1);
       } else {
@@ -217,9 +183,7 @@ export var findNextIcon = function findNextIcon(store, props) {
   if (type === TypeEnum.summarize) {
     if (isLast) {
       if (!ExistAboveGroupBy) {
-        if (meta.group.length && !meta.by.length) {
-          // 一个不显示
-        } else if (!meta.group.length && !meta.by.length) {
+        if (meta.group.length && !meta.by.length) {} else if (!meta.group.length && !meta.by.length) {
           available = [TypeEnum.sort, TypeEnum.rowLimit, TypeEnum.union];
         } else {
           available = OrderNewType;
@@ -231,9 +195,7 @@ export var findNextIcon = function findNextIcon(store, props) {
           var filterIndex = prevTypes.indexOf(TypeEnum.filter);
           if (~_joinIndex2 && prevList[_joinIndex2].table2.name || ~_customIndex && prevList[_customIndex].customColumn.length || ~filterIndex && prevList[filterIndex].filter.length) {
             available = OrderType.slice(curLocation + 1);
-          } else {
-            // 一个不显示
-          }
+          } else {}
         } else {
           available = OrderNewType;
         }
@@ -308,7 +270,6 @@ var NextDom = function NextDom(props) {
   var meta = props.meta,
     groupIndex = props.groupIndex;
   var store = useStore();
-  // @ts-ignore
   if (!((_store$metaList = store.metaList) !== null && _store$metaList !== void 0 && (_store$metaList = _store$metaList[groupIndex]) !== null && _store$metaList !== void 0 && (_store$metaList = _store$metaList.list) !== null && _store$metaList !== void 0 && (_store$metaList = _store$metaList[0]) !== null && _store$metaList !== void 0 && (_store$metaList = _store$metaList.table) !== null && _store$metaList !== void 0 && _store$metaList.name)) return null;
   var available = findNextIcon(store, props);
   if (!store.showToolbar(TypeEnum.permissionTable)) {
@@ -329,7 +290,6 @@ var NextDom = function NextDom(props) {
     setIsShowAdd = _React$useState2[1];
   useEffect(function () {
     if (store.metabaseCopyModule) {
-      // let { prevItem, nextItem } = getHelper(store.metaList[groupIndex].list, meta);
       var nextTypes = findNextIcon(store, {
         meta: meta,
         groupIndex: groupIndex
@@ -346,10 +306,8 @@ var NextDom = function NextDom(props) {
     var _store$metaList3;
     var index = (_store$metaList3 = store.metaList) === null || _store$metaList3 === void 0 || (_store$metaList3 = _store$metaList3[groupIndex]) === null || _store$metaList3 === void 0 || (_store$metaList3 = _store$metaList3.list) === null || _store$metaList3 === void 0 ? void 0 : _store$metaList3.indexOf(meta);
     var success = store.addMeta('', index + 1, groupIndex, store.metabaseCopyModule, function (conflictingAlias) {
-      // 冲突提示
       Toast.warning("\u8BE5\u8868\u5DF2\u5B58\u5728\u5173\u8054\uFF0C\u4E0D\u80FD\u590D\u5236");
     });
-    // 仅在成功时重置
     if (success) {
       store.setMetabaseCopyModule([]);
       store.setIsMetabaseCopy(false);
@@ -362,8 +320,6 @@ var NextDom = function NextDom(props) {
       children: _jsxs(Button, {
         className: cx(':Sqb-item-copy'),
         onClick: handlePaste,
-        // iconOnly={false}
-        // icon={}
         dashed: true,
         ghost: true,
         children: [_jsx(FfPlus, {}), "\u5C06\u5185\u5BB9\u7C98\u8D34\u5230\u6B64\u5904"]

package/lib/es/components/modules/custom-column.js

@@ -35,14 +35,10 @@ var CustomColumn = function CustomColumn(props) {
     var _getHelper = getHelper(store.metaList[groupIndex].list, meta),
       ExistAboveGroupBy = _getHelper.ExistAboveGroupBy,
       prevList = _getHelper.prevList;
-    // TIPS metabase 将自定义列也放进去了 但是他们拼sql的时候又没有实现 这里我们也暂时不加进来
-    // TIPS metabase 将聚合的参数也弄进来了
     if (ExistAboveGroupBy) {
       columns = flatArray(prevList.filter(function (v) {
         return v.type === TypeEnum.joinData;
-      })
-      // @ts-ignore
-      .map(function (v) {
+      }).map(function (v) {
         return v.columns.map(function (o) {
           return _objectSpread(_objectSpread({}, o), {}, {
             name: "".concat(v.table2.alias, " -> ").concat(o.name)
@@ -72,7 +68,7 @@ var CustomColumn = function CustomColumn(props) {
     return _handleUpdate.apply(this, arguments);
   }
   function _handleUpdate() {
-    _handleUpdate = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(e, i) {
+    _handleUpdate = _asyncToGenerator(_regeneratorRuntime.mark(function _callee(e, i) {
       var node, newMeta, value, columns;
       return _regeneratorRuntime.wrap(function (_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -93,10 +89,6 @@ var CustomColumn = function CustomColumn(props) {
                 value: value,
                 onChange: function onChange(data) {
                   newMeta[index].customColumn[i] = data;
-                  // TIPS 修改了名字后面都得删除 暂时不删除 因为过滤器和组合都没用到自定义列
-                  // if(data.name !== value.name){
-                  //   newMeta = newMeta.filter((v: MetaListType, _i: number)=> _i<=index)
-                  // }
                   store.setMeta(newMeta, groupIndex, {
                     obj: data,
                     type: ChangeType.customColumn
@@ -214,20 +206,6 @@ var CustomColumn = function CustomColumn(props) {
     }
     return data;
   }
-  // const getPreColumns = () => {
-  //   let data = [...getColumns(), ...cloneDeep(notExistsColumns || [])];
-  //   // 将source 拍到最前面
-  //   const priorityNames = ['source'];
-  //   const sorted = data.sort((a, b) => {
-  //     const aPriority = priorityNames.includes(a.name);
-  //     const bPriority = priorityNames.includes(b.name);
-  //     if (aPriority && !bPriority) return -1;
-  //     if (!aPriority && bPriority) return 1;
-  //     return 0;
-  //   });
-  //   return sorted;
-  // };
-  // 自定义弹窗
   var showSubQuery = function showSubQuery(e, i) {
     var newMeta = store.metaList[groupIndex].list.slice();
     var _value = newMeta[index].customColumn[i] || [];
@@ -239,7 +217,6 @@ var CustomColumn = function CustomColumn(props) {
           value: store,
           children: _jsx(CustomEditor, {
             data: getColumns(),
-            // data={getPreColumns()}
             exitData: getColumns(),
             value: _value,
             onCancel: function onCancel() {
@@ -260,9 +237,7 @@ var CustomColumn = function CustomColumn(props) {
               });
               try {
                 o.close();
-              } catch (e) {
-                console.warn(e);
-              } finally {
+              } catch (e) {} finally {
                 o.close();
               }
             }
@@ -299,7 +274,6 @@ var CustomColumn = function CustomColumn(props) {
     e.stopPropagation();
     closePopup();
     var newMeta = store.metaList[groupIndex].list.slice();
-    // TIPS 删除了后面都得删除 暂时不删除 因为过滤器和组合都没用到自定义列
     newMeta[index].customColumn = customColumn.filter(function (_, i) {
       return i !== itemId;
     });