@gingkoo/pandora-metabase 1.0.24 → 1.0.26

package/lib/cjs/common/SplitView/index.js

@@ -15,7 +15,8 @@ var _styledComponents = _interopRequireDefault(require("styled-components"));
 var _classnames = _interopRequireDefault(require("classnames"));
 var _winsize = require("../../hooks/winsize");
 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); }
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
 var StyledSashHorizontal = _styledComponents["default"].div.attrs({
   className: 'view-sash horizontal'
 })(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  top: ", ";\n"])), function (props) {
@@ -60,17 +61,17 @@ var SplitView = _react["default"].forwardRef(function (props, ref) {
     hMaximum = _useState8[0],
     setHMaximum = _useState8[1];
   var _useState9 = (0, _react.useState)(false),
-    _useState0 = (0, _slicedToArray2["default"])(_useState9, 2),
-    vMinimum = _useState0[0],
-    setVMinimum = _useState0[1];
-  var _useState1 = (0, _react.useState)(false),
-    _useState10 = (0, _slicedToArray2["default"])(_useState1, 2),
-    vMaximum = _useState10[0],
-    setVMaximum = _useState10[1];
-  var _useState11 = (0, _react.useState)(0),
+    _useState10 = (0, _slicedToArray2["default"])(_useState9, 2),
+    vMinimum = _useState10[0],
+    setVMinimum = _useState10[1];
+  var _useState11 = (0, _react.useState)(false),
     _useState12 = (0, _slicedToArray2["default"])(_useState11, 2),
-    bottomHeight = _useState12[0],
-    setBottomHeight = _useState12[1];
+    vMaximum = _useState12[0],
+    setVMaximum = _useState12[1];
+  var _useState13 = (0, _react.useState)(0),
+    _useState14 = (0, _slicedToArray2["default"])(_useState13, 2),
+    bottomHeight = _useState14[0],
+    setBottomHeight = _useState14[1];
   _react["default"].useImperativeHandle(ref, function () {
     return {
       open: function open() {

package/lib/cjs/components/dialog/custom-column/expression-editor.js

@@ -18,7 +18,8 @@ var _popup = _interopRequireDefault(require("../../popup"));
 var _selectList = _interopRequireDefault(require("./dialog/select-list"));
 var _functionTip = _interopRequireDefault(require("./dialog/function-tip"));
 var _useProvider = require("../../../hooks/use-provider");
-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); }
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
 var ErrorMessage = function ErrorMessage(_ref) {
   var msg = _ref.msg;
   if (!msg) return null;

package/lib/cjs/components/dialog/custom-column/tokenizedI-input.js

@@ -20,7 +20,8 @@ var _reactDom = _interopRequireDefault(require("react-dom"));
 var _server = _interopRequireDefault(require("react-dom/server"));
 var _selection = require("../../../utils/selection");
 var _tokenizedExpression = _interopRequireDefault(require("./tokenized-expression"));
-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); }
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
 function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2["default"])(o), (0, _possibleConstructorReturn2["default"])(t, (0, _isNativeReflectConstruct2["default"])() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2["default"])(t).constructor) : o.apply(t, e)); }
 var TokenizedInput = /*#__PURE__*/function (_React$Component) {
   function TokenizedInput() {

package/lib/cjs/components/dialog/custom-editor/index.js

@@ -79,6 +79,7 @@ var CaseEditor = function CaseEditor(props) {
               })
             })]
           }), (0, _jsxRuntime.jsx)(_formulaList["default"], {
+            isCustom: true,
             value: caseList,
             data: data,
             ref: ref,

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

@@ -25,7 +25,8 @@ var _selectColumnMultiple = _interopRequireDefault(require("../select-column-mul
 var _icons = require("../../icons");
 var _useProvider = require("../../../hooks/use-provider");
 var _cloneDeep = _interopRequireDefault(require("lodash/cloneDeep"));
-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); }
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
 /**
  * 关联模块 选择表字段
  */
@@ -88,18 +89,18 @@ var SelectFilterColumn = function SelectFilterColumn(_ref) {
     special_type = _useState8[0],
     setSpecial_type = _useState8[1];
   var _useState9 = (0, _react.useState)(value.formula || {}),
-    _useState0 = (0, _slicedToArray2["default"])(_useState9, 2),
-    formula = _useState0[0],
-    setFormula = _useState0[1];
+    _useState10 = (0, _slicedToArray2["default"])(_useState9, 2),
+    formula = _useState10[0],
+    setFormula = _useState10[1];
   var store = (0, _useProvider.useStore)();
-  var _useState1 = (0, _react.useState)(false),
-    _useState10 = (0, _slicedToArray2["default"])(_useState1, 2),
-    popupVisible = _useState10[0],
-    setPopupVisible = _useState10[1];
-  var _useState11 = (0, _react.useState)((value === null || value === void 0 || (_value$lhs = value.lhs) === null || _value$lhs === void 0 ? void 0 : _value$lhs.length) > 0 || false),
+  var _useState11 = (0, _react.useState)(false),
     _useState12 = (0, _slicedToArray2["default"])(_useState11, 2),
-    isNext = _useState12[0],
-    setIsNext = _useState12[1];
+    popupVisible = _useState12[0],
+    setPopupVisible = _useState12[1];
+  var _useState13 = (0, _react.useState)((value === null || value === void 0 || (_value$lhs = value.lhs) === null || _value$lhs === void 0 ? void 0 : _value$lhs.length) > 0 || false),
+    _useState14 = (0, _slicedToArray2["default"])(_useState13, 2),
+    isNext = _useState14[0],
+    setIsNext = _useState14[1];
   var table2Selected = Boolean(rhsVal && (rhsVal === null || rhsVal === void 0 ? void 0 : rhsVal.length) > 0);
   var disabled = (0, _react.useMemo)(function () {
     if (!condition) return true;

package/lib/cjs/components/dialog/formula-list/index.d.ts

@@ -6,8 +6,10 @@ interface PropsType {
     value: AtomsItem[];
     data: any;
     exitData?: any;
-    onChange?: (atoms: AtomsItem[], quotes?: string) => void;
+    onChange?: (atoms: AtomsItem[], quotes: string) => void;
     check?: string;
+    isCustom?: boolean;
+    showPreview?: boolean;
 }
 declare const FormulaList: React.ForwardRefExoticComponent<PropsType & React.RefAttributes<unknown>>;
 export default FormulaList;

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

@@ -37,6 +37,10 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
     _customTypes = _props$customTypes === void 0 ? _utils2.customTypes : _props$customTypes,
     _props$operatorList = props.operatorList,
     _operatorList = _props$operatorList === void 0 ? _utils2.operatorList : _props$operatorList,
+    _props$isCustom = props.isCustom,
+    isCustom = _props$isCustom === void 0 ? false : _props$isCustom,
+    _props$showPreview = props.showPreview,
+    showPreview = _props$showPreview === void 0 ? true : _props$showPreview,
     check = props.check;
   var caseList = value || [];
   var setCaseList = function setCaseList(data) {
@@ -97,6 +101,7 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
       node: e.currentTarget,
       container: ref === null || ref === void 0 ? void 0 : ref.current,
       content: (0, _jsxRuntime.jsx)(_dialog.Expression, {
+        isCustom: isCustom,
         filterCustomType: filterCustomType,
         data: data,
         container: ref === null || ref === void 0 ? void 0 : ref.current,
@@ -171,7 +176,7 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
                 type: caseList[i].type
               };
               caseList[i] = expression;
-              onChange === null || onChange === void 0 || onChange(caseList);
+              onChange === null || onChange === void 0 || onChange(caseList, '');
               setCaseList((0, _toConsumableArray2["default"])(caseList));
               o.close();
             } catch (e) {
@@ -434,8 +439,8 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
       });
     }
   };
-  return (0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
-    children: [(0, _jsxRuntime.jsxs)("div", {
+  return (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
+    children: (0, _jsxRuntime.jsxs)("div", {
       className: "Sqb-NotebookCell",
       children: [caseList === null || caseList === void 0 ? void 0 : caseList.map(function (v, i) {
         return (0, _jsxRuntime.jsxs)("div", {
@@ -540,23 +545,24 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
             children: option.label
           }, index + '' + ind);
         })
+      }), showPreview && (0, _jsxRuntime.jsxs)("p", {
+        className: "mb-2 font-bold uppercase tracking-wider",
+        style: {
+          fontSize: 12,
+          color: '#949aab',
+          width: '100%'
+        },
+        children: ["\u9884\u89C8\uFF1A", caseList.map(function (v, i) {
+          if (v !== null && v !== void 0 && v.quotes) {
+            return v === null || v === void 0 ? void 0 : v.quotes;
+          } else if (v !== null && v !== void 0 && v.fieldName) {
+            return v === null || v === void 0 ? void 0 : v.fieldName;
+          } else {
+            return v.val;
+          }
+        }).join(' ')]
       })]
-    }), (0, _jsxRuntime.jsxs)("p", {
-      className: "mb-2 font-bold uppercase tracking-wider",
-      style: {
-        fontSize: 12,
-        color: '#949aab'
-      },
-      children: ["\u9884\u89C8\uFF1A", caseList.map(function (v, i) {
-        if (v !== null && v !== void 0 && v.quotes) {
-          return v === null || v === void 0 ? void 0 : v.quotes;
-        } else if (v !== null && v !== void 0 && v.fieldName) {
-          return v === null || v === void 0 ? void 0 : v.fieldName;
-        } else {
-          return v.val;
-        }
-      }).join(' ')]
-    })]
+    })
   });
 });
 var _default = exports["default"] = FormulaList;

package/lib/cjs/components/dialog/index.d.ts

@@ -8,3 +8,4 @@ export { default as SelectTable } from './select-table/index';
 export { default as SelectPermissionTable } from './select-permission-table/index';
 export { default as FormulaList } from './formula-list/index';
 export { default as Expression } from './expression/index';
+export { getTemplateItem } from './formula-list/utils';

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

@@ -13,7 +13,7 @@ Object.defineProperty(exports, "CustomColumnPopup", {
 Object.defineProperty(exports, "Expression", {
   enumerable: true,
   get: function get() {
-    return _index0["default"];
+    return _index10["default"];
   }
 });
 Object.defineProperty(exports, "FormulaList", {
@@ -64,6 +64,12 @@ Object.defineProperty(exports, "SelectTable", {
     return _index7["default"];
   }
 });
+Object.defineProperty(exports, "getTemplateItem", {
+  enumerable: true,
+  get: function get() {
+    return _utils.getTemplateItem;
+  }
+});
 var _index = _interopRequireDefault(require("./custom-column/index"));
 var _index2 = _interopRequireDefault(require("./select-column/index"));
 var _index3 = _interopRequireDefault(require("./select-join-column/index"));
@@ -73,4 +79,5 @@ var _index6 = _interopRequireDefault(require("./select-join/index"));
 var _index7 = _interopRequireDefault(require("./select-table/index"));
 var _index8 = _interopRequireDefault(require("./select-permission-table/index"));
 var _index9 = _interopRequireDefault(require("./formula-list/index"));
-var _index0 = _interopRequireDefault(require("./expression/index"));
+var _index10 = _interopRequireDefault(require("./expression/index"));
+var _utils = require("./formula-list/utils");

package/lib/cjs/components/dialog/select-column/index.js

@@ -104,23 +104,16 @@ var SelectColumn = function SelectColumn(_ref) {
       onOk: function () {
         var _onOk = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
           var newColumns, newMetaList;
-          return _regenerator["default"].wrap(function (_context) {
+          return _regenerator["default"].wrap(function _callee$(_context) {
             while (1) switch (_context.prev = _context.next) {
               case 0:
-                if (fieldAlias) {
-                  _context.next = 1;
+                if ((0, _utils.isValidSQLAlias)(fieldAlias)) {
+                  _context.next = 3;
                   break;
                 }
-                _pandora.Toast.warning((0, _locale.__)('SqlQueryBuilder.aliasCannotEmpty'));
+                _pandora.Toast.warning((0, _locale.__)('SqlQueryBuilder.aliasForRules'));
                 return _context.abrupt("return", false);
-              case 1:
-                if (!(fieldAlias.length > 30)) {
-                  _context.next = 2;
-                  break;
-                }
-                _pandora.Toast.warning('别名长度不能超过30');
-                return _context.abrupt("return", false);
-              case 2:
+              case 3:
                 newColumns = (0, _cloneDeep["default"])(columns);
                 newMetaList = store.metaList[groupIndex].list.slice();
                 newColumns[i].fieldAlias = fieldAlias;
@@ -131,7 +124,7 @@ var SelectColumn = function SelectColumn(_ref) {
                 setTimeout(function () {
                   store.setClosable(true);
                 }, 0);
-              case 3:
+              case 11:
               case "end":
                 return _context.stop();
             }

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

@@ -275,7 +275,6 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
                       if (isSummarize) {
                         // console.log(v, 'v');
                       }
-                      console.log('🚀 ~ SelectJoinColumn ~ tableItem:', tableItem);
                       changeValue(tableUuid, {
                         tableName: tableItem.name,
                         tableId: tableItem.id,

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

@@ -50,9 +50,9 @@ var SelectTable = function SelectTable(_ref) {
     originList = _useState8[0],
     setOriginList = _useState8[1];
   var _useState9 = (0, _react.useState)(value),
-    _useState0 = (0, _slicedToArray2["default"])(_useState9, 2),
-    val = _useState0[0],
-    setVal = _useState0[1];
+    _useState10 = (0, _slicedToArray2["default"])(_useState9, 2),
+    val = _useState10[0],
+    setVal = _useState10[1];
   (0, _react.useEffect)(function () {
     if (value.datasourceId) {
       getTables(value.datasourceId);
@@ -64,18 +64,18 @@ var SelectTable = function SelectTable(_ref) {
   function _getTables() {
     _getTables = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(datasourceId) {
       var tables;
-      return _regenerator["default"].wrap(function (_context) {
+      return _regenerator["default"].wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             setLoading(true);
-            _context.next = 1;
+            _context.next = 3;
             return store.fetchDataset(datasourceId);
-          case 1:
+          case 3:
             tables = _context.sent;
             setLoading(false);
             setList(tables);
             setOriginList(tables);
-          case 2:
+          case 7:
           case "end":
             return _context.stop();
         }

package/lib/cjs/components/icons.js

@@ -176,12 +176,12 @@ var LeftJoinIcon = exports.LeftJoinIcon = function LeftJoinIcon(_ref9) {
     })
   });
 };
-var InnerJoinIcon = exports.InnerJoinIcon = function InnerJoinIcon(_ref0) {
-  var _ref0$width = _ref0.width,
-    width = _ref0$width === void 0 ? 32 : _ref0$width,
-    _ref0$height = _ref0.height,
-    height = _ref0$height === void 0 ? 32 : _ref0$height,
-    style = _ref0.style;
+var InnerJoinIcon = exports.InnerJoinIcon = function InnerJoinIcon(_ref10) {
+  var _ref10$width = _ref10.width,
+    width = _ref10$width === void 0 ? 32 : _ref10$width,
+    _ref10$height = _ref10.height,
+    height = _ref10$height === void 0 ? 32 : _ref10$height,
+    style = _ref10.style;
   return (0, _jsxRuntime.jsx)("svg", {
     viewBox: '0 0 32 32',
     width: width,
@@ -195,11 +195,11 @@ var InnerJoinIcon = exports.InnerJoinIcon = function InnerJoinIcon(_ref0) {
     })
   });
 };
-var UpArrowIcon = exports.UpArrowIcon = function UpArrowIcon(_ref1) {
-  var _ref1$width = _ref1.width,
-    width = _ref1$width === void 0 ? 16 : _ref1$width,
-    _ref1$height = _ref1.height,
-    height = _ref1$height === void 0 ? 17 : _ref1$height;
+var UpArrowIcon = exports.UpArrowIcon = function UpArrowIcon(_ref11) {
+  var _ref11$width = _ref11.width,
+    width = _ref11$width === void 0 ? 16 : _ref11$width,
+    _ref11$height = _ref11.height,
+    height = _ref11$height === void 0 ? 17 : _ref11$height;
   return (0, _jsxRuntime.jsx)("svg", {
     className: 'sort-arrow',
     viewBox: '0 0 32 34',
@@ -213,11 +213,11 @@ var UpArrowIcon = exports.UpArrowIcon = function UpArrowIcon(_ref1) {
     })
   });
 };
-var DownArrowIcon = exports.DownArrowIcon = function DownArrowIcon(_ref10) {
-  var _ref10$width = _ref10.width,
-    width = _ref10$width === void 0 ? 16 : _ref10$width,
-    _ref10$height = _ref10.height,
-    height = _ref10$height === void 0 ? 17 : _ref10$height;
+var DownArrowIcon = exports.DownArrowIcon = function DownArrowIcon(_ref12) {
+  var _ref12$width = _ref12.width,
+    width = _ref12$width === void 0 ? 16 : _ref12$width,
+    _ref12$height = _ref12.height,
+    height = _ref12$height === void 0 ? 17 : _ref12$height;
   return (0, _jsxRuntime.jsx)("svg", {
     className: 'sort-arrow',
     viewBox: '0 0 32 34',
@@ -231,11 +231,11 @@ var DownArrowIcon = exports.DownArrowIcon = function DownArrowIcon(_ref10) {
     })
   });
 };
-var CloseIcon = exports.CloseIcon = function CloseIcon(_ref11) {
-  var _ref11$width = _ref11.width,
-    width = _ref11$width === void 0 ? 16 : _ref11$width,
-    _ref11$height = _ref11.height,
-    height = _ref11$height === void 0 ? 16 : _ref11$height;
+var CloseIcon = exports.CloseIcon = function CloseIcon(_ref13) {
+  var _ref13$width = _ref13.width,
+    width = _ref13$width === void 0 ? 16 : _ref13$width,
+    _ref13$height = _ref13.height,
+    height = _ref13$height === void 0 ? 16 : _ref13$height;
   return (0, _jsxRuntime.jsx)("svg", {
     className: 'closeIcon',
     viewBox: '0 0 32 32',
@@ -249,11 +249,11 @@ var CloseIcon = exports.CloseIcon = function CloseIcon(_ref11) {
     })
   });
 };
-var AddIcon = exports.AddIcon = function AddIcon(_ref12) {
-  var _ref12$width = _ref12.width,
-    width = _ref12$width === void 0 ? 16 : _ref12$width,
-    _ref12$height = _ref12.height,
-    height = _ref12$height === void 0 ? 16 : _ref12$height;
+var AddIcon = exports.AddIcon = function AddIcon(_ref14) {
+  var _ref14$width = _ref14.width,
+    width = _ref14$width === void 0 ? 16 : _ref14$width,
+    _ref14$height = _ref14.height,
+    height = _ref14$height === void 0 ? 16 : _ref14$height;
   return (0, _jsxRuntime.jsx)("svg", {
     viewBox: '0 0 32 32',
     width: width,
@@ -266,11 +266,11 @@ var AddIcon = exports.AddIcon = function AddIcon(_ref12) {
     })
   });
 };
-var TableIcon = exports.TableIcon = function TableIcon(_ref13) {
-  var _ref13$width = _ref13.width,
-    width = _ref13$width === void 0 ? 18 : _ref13$width,
-    _ref13$height = _ref13.height,
-    height = _ref13$height === void 0 ? 18 : _ref13$height;
+var TableIcon = exports.TableIcon = function TableIcon(_ref15) {
+  var _ref15$width = _ref15.width,
+    width = _ref15$width === void 0 ? 18 : _ref15$width,
+    _ref15$height = _ref15.height,
+    height = _ref15$height === void 0 ? 18 : _ref15$height;
   return (0, _jsxRuntime.jsx)("svg", {
     viewBox: '0 0 32 32',
     width: width,
@@ -283,11 +283,11 @@ var TableIcon = exports.TableIcon = function TableIcon(_ref13) {
     })
   });
 };
-var SearchIcon = exports.SearchIcon = function SearchIcon(_ref14) {
-  var _ref14$width = _ref14.width,
-    width = _ref14$width === void 0 ? 16 : _ref14$width,
-    _ref14$height = _ref14.height,
-    height = _ref14$height === void 0 ? 16 : _ref14$height;
+var SearchIcon = exports.SearchIcon = function SearchIcon(_ref16) {
+  var _ref16$width = _ref16.width,
+    width = _ref16$width === void 0 ? 16 : _ref16$width,
+    _ref16$height = _ref16.height,
+    height = _ref16$height === void 0 ? 16 : _ref16$height;
   return (0, _jsxRuntime.jsx)("svg", {
     viewBox: '0 0 32 32',
     width: width,

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

@@ -55,7 +55,7 @@ var Metabase = function Metabase(props) {
   var onSave = /*#__PURE__*/function () {
     var _ref = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
       var intercept, _metaList;
-      return _regenerator["default"].wrap(function (_context) {
+      return _regenerator["default"].wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             intercept = false; // 是否返回
@@ -69,17 +69,17 @@ var Metabase = function Metabase(props) {
               }
             });
             if (!(saveLoading || intercept)) {
-              _context.next = 1;
+              _context.next = 6;
               break;
             }
             return _context.abrupt("return", null);
-          case 1:
+          case 6:
             setSaveLoading(true);
-            _context.next = 2;
+            _context.next = 9;
             return onOk === null || onOk === void 0 ? void 0 : onOk(_metaList);
-          case 2:
+          case 9:
             setSaveLoading(false);
-          case 3:
+          case 10:
           case "end":
             return _context.stop();
         }

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

@@ -278,6 +278,15 @@
             width: 100%;
           }
         }
+        .Sqb-collection-box {
+          display: flex;
+          align-items: center;
+          margin-bottom: 8px;
+          .Sqb-NotebookCell {
+            padding-bottom: 0;
+            padding-top: 8px;
+          }
+        }
         .operator-icon,
         .operator-icon button {
           font-size: 18px !important;

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

@@ -32,19 +32,19 @@ var Wrapper = function Wrapper(_ref) {
   function _animation() {
     _animation = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
       var _couterRef$current;
-      return _regenerator["default"].wrap(function (_context) {
+      return _regenerator["default"].wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            _context.next = 1;
+            _context.next = 2;
             return (0, _helper.sleep)(10);
-          case 1:
+          case 2:
             setOpacity(1);
             ((_couterRef$current = couterRef.current) === null || _couterRef$current === void 0 || (_couterRef$current = _couterRef$current.childNodes) === null || _couterRef$current === void 0 ? void 0 : _couterRef$current.length) && setMaxHeight(couterRef.current.childNodes[0].clientHeight + 16);
-            _context.next = 2;
+            _context.next = 6;
             return (0, _helper.sleep)(500);
-          case 2:
+          case 6:
             setMaxHeight('auto');
-          case 3:
+          case 7:
           case "end":
             return _context.stop();
         }

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

@@ -73,14 +73,14 @@ var CustomColumn = function CustomColumn(props) {
   function _handleUpdate() {
     _handleUpdate = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(e, i) {
       var node, newMeta, value, columns;
-      return _regenerator["default"].wrap(function (_context) {
+      return _regenerator["default"].wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             node = e.currentTarget;
             closePopup();
-            _context.next = 1;
+            _context.next = 4;
             return (0, _helper.sleep)(100);
-          case 1:
+          case 4:
             newMeta = store.metaList[groupIndex].list.slice();
             value = customColumn[i];
             columns = getAvailableColumns();
@@ -102,7 +102,7 @@ var CustomColumn = function CustomColumn(props) {
                 onClose: closePopup
               })
             });
-          case 2:
+          case 8:
           case "end":
             return _context.stop();
         }