@gingkoo/pandora-metabase 1.0.116 → 1.0.118

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

@@ -100,7 +100,6 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
   var caseList = value || [];
   // const [caseList, setCaseListState] = useState<AtomsItem[]>(cloneDeep(value));
   var caseListRef = (0, _react.useRef)(caseList);
-  var isSettingCaseList = (0, _react.useRef)(false);
   var operatorList = (0, _react.useMemo)(function () {
     if (store.operatorList.length > 0) {
       return store.operatorList;
@@ -147,7 +146,6 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
         return v.val;
       }
     }).join(' ');
-    isSettingCaseList.current = true;
     // setCaseListState(data);
     caseList = data;
     caseListRef.current = data;
@@ -182,12 +180,11 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
     _useState20 = (0, _slicedToArray2["default"])(_useState19, 2),
     selectedIndices = _useState20[0],
     setSelectedIndices = _useState20[1];
+  var _useState21 = (0, _react.useState)(null),
+    _useState22 = (0, _slicedToArray2["default"])(_useState21, 2),
+    hoveredCopyIndex = _useState22[0],
+    setHoveredCopyIndex = _useState22[1];
   (0, _react.useEffect)(function () {
-    // Skip if this update came from setCaseList (to avoid infinite loop)
-    if (isSettingCaseList.current) {
-      isSettingCaseList.current = false;
-      return;
-    }
     var _errorInfo = (0, _utils3.validateExpressionIntegrity)(caseList);
     setErrorInfo(_errorInfo);
   }, [caseList]);
@@ -428,13 +425,13 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
       // 确认删除吗
       onOk: function () {
         var _onOk = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
-          var _caseList;
+          var selectedIndexSet, _caseList;
           return _regenerator["default"].wrap(function (_context) {
             while (1) switch (_context.prev = _context.next) {
               case 0:
-                _caseList = caseList.slice(); // 删除选中项，selectedIndices 已经是排序好的了
-                selectedIndices.forEach(function (i) {
-                  _caseList.splice(i, 1);
+                selectedIndexSet = new Set(selectedIndices);
+                _caseList = caseList.filter(function (_, index) {
+                  return !selectedIndexSet.has(index);
                 });
                 setCaseList(_caseList);
                 initPaste();
@@ -670,6 +667,7 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
             return showNotExists(index);
           },
           children: [v.type, " ( * )", (0, _jsxRuntime.jsx)("span", {
+            className: 'item-del',
             style: {
               fontSize: 0
             },
@@ -689,6 +687,7 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
             return showSubQuery(index);
           },
           children: [v.label || (0, _locale.__)('SqlQueryBuilder.subquery'), (0, _jsxRuntime.jsx)("span", {
+            className: 'item-del',
             style: {
               fontSize: 0
             },
@@ -711,6 +710,7 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
             return handleField(e, index, v);
           },
           children: [!(v !== null && v !== void 0 && v.fieldName) && (0, _locale.__)('customColumn.selectField'), v.fieldName, (0, _jsxRuntime.jsx)("span", {
+            className: 'item-del',
             style: {
               fontSize: 0
             },
@@ -734,6 +734,7 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
             handleConstant(val, index);
           }
         }), (0, _jsxRuntime.jsx)("span", {
+          className: 'item-del',
           style: {
             fontSize: 0
           },
@@ -756,6 +757,7 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
             handleConstant(val, index);
           }
         }), (0, _jsxRuntime.jsx)("span", {
+          className: 'item-del',
           style: {
             fontSize: 0
           },
@@ -778,6 +780,7 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
               notSelected: !v.val
             }),
             children: [!v.val && (0, _locale.__)('customColumn.selectOperator'), v.val, (0, _jsxRuntime.jsx)("span", {
+              className: 'item-del',
               style: {
                 fontSize: 0
               },
@@ -811,6 +814,7 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
           "v-val": v.id || v.val,
           onClick: selectConstant,
           children: [(0, _utils3.getConstantLabel)(store.constantList, v.id || v.val, v.val) || (0, _locale.__)('SqlQueryBuilder.pickConstant'), (0, _jsxRuntime.jsx)("span", {
+            className: 'item-del',
             style: {
               fontSize: 0
             },
@@ -837,6 +841,7 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
           "v-type": type,
           onClick: selectConstant,
           children: [(0, _utils3.getConstantLabel)(listSource, v.id || v.val, v.val) || "\u8BF7\u9009\u62E9".concat(currentOtherType.label), (0, _jsxRuntime.jsx)("span", {
+            className: 'item-del',
             style: {
               fontSize: 0
             },
@@ -866,6 +871,7 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
             return handleExpression(e, index, v);
           },
           children: [v.quotes ? v.quotes : (0, _locale.__)('customColumn.selectExpression'), (0, _jsxRuntime.jsx)("span", {
+            className: 'item-del',
             style: {
               fontSize: 0
             },
@@ -887,6 +893,7 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
             return showFunction(e, index);
           },
           children: [v.name ? (0, _utils.getQuotes)(v, v.args, formulaList) : (0, _locale.__)('customColumn.selectFormula'), (0, _jsxRuntime.jsx)("span", {
+            className: 'item-del',
             style: {
               fontSize: 0
             },
@@ -911,6 +918,7 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
               notSelected: !v.val
             }),
             children: [!v.val && (0, _locale.__)('customColumn.selectOperator'), v.val, !v.fixed && (0, _jsxRuntime.jsx)("span", {
+              className: 'item-del',
               style: {
                 fontSize: 0
               },
@@ -939,6 +947,7 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
               notSelected: true
             }),
             children: [(0, _locale.__)('customColumn.selectCustomInput'), (0, _jsxRuntime.jsx)("span", {
+              className: 'item-del',
               style: {
                 fontSize: 0
               },
@@ -956,16 +965,31 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
   };
   var copyDom = function copyDom() {
     var index = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : -1;
+    var positioned = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
     if (!isCopy || selectedIndices.length === 0 && checkedItemsCount === 0) return null;
-    return (0, _jsxRuntime.jsx)(_pandora.Tooltip, {
-      title: "\u5728\u6B64\u5904\u7C98\u8D34(".concat(selectedIndices.length || checkedItemsCount, ")\u9879"),
-      children: (0, _jsxRuntime.jsx)(_pandora.Button, {
-        className: (0, _classnames["default"])(':Sqb-Filter-item-copy'),
-        onClick: function onClick() {
-          return handlePaste(index);
-        },
-        iconOnly: true,
-        icon: (0, _jsxRuntime.jsx)(_pandoraIcons.FfPlus, {})
+    return (0, _jsxRuntime.jsx)("div", {
+      className: (0, _classnames["default"])('Sqb-Filter-item-copy', {
+        'Sqb-Filter-item-copy-static': !positioned
+      }),
+      onMouseEnter: function onMouseEnter() {
+        if (!positioned) return;
+        setHoveredCopyIndex(index);
+      },
+      onMouseLeave: function onMouseLeave() {
+        if (!positioned) return;
+        setHoveredCopyIndex(function (current) {
+          return current === index ? null : current;
+        });
+      },
+      children: (0, _jsxRuntime.jsx)(_pandora.Tooltip, {
+        title: "\u5728\u6B64\u5904\u7C98\u8D34(".concat(selectedIndices.length || checkedItemsCount, ")\u9879"),
+        children: (0, _jsxRuntime.jsx)(_pandora.Button, {
+          onClick: function onClick() {
+            return handlePaste(index);
+          },
+          iconOnly: true,
+          icon: (0, _jsxRuntime.jsx)(_pandoraIcons.FfPlus, {})
+        })
       })
     });
   };
@@ -1012,10 +1036,10 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
           children: "\u6E05\u9664\u590D\u5236"
         })]
       }), (_caseList2 = caseList) === null || _caseList2 === void 0 ? void 0 : _caseList2.map(function (v, i) {
-        return (0, _jsxRuntime.jsxs)(_react["default"].Fragment, {
-          children: [copyDom(i), (0, _jsxRuntime.jsxs)("div", {
+        return (0, _jsxRuntime.jsx)(_react["default"].Fragment, {
+          children: (0, _jsxRuntime.jsxs)("div", {
             className: (0, _classnames["default"])('Sqb-Filter-item', {
-              hover: ind === i,
+              hover: ind === i && hoveredCopyIndex !== i,
               'item-fixed': v.fixed || false,
               'item-selected': isCheck
             }),
@@ -1027,7 +1051,7 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
               if (isCheck) return;
               setInd(-1);
             },
-            children: [selectOperator({
+            children: [copyDom(i), selectOperator({
               triggerElement: function triggerElement() {
                 return (0, _jsxRuntime.jsx)("div", {
                   className: 'left-arrow',
@@ -1056,7 +1080,7 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
               style: {
                 pointerEvents: isCheck || store.isMetabaseCopy ? 'none' : 'auto'
               },
-              className: (0, _classnames["default"])({
+              className: (0, _classnames["default"])('Sqb-Filter-item-content', {
                 openCheck: isCheck
               }),
               children: itemDom(v, i)
@@ -1078,7 +1102,7 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
               position: 'after',
               trigger: 'hover'
             })]
-          }, i)]
+          }, i)
         }, i);
       }), Array.from(caseList).length < 1 && selectOperator({
         triggerElement: function triggerElement() {
@@ -1090,7 +1114,7 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
         ind: -1,
         position: 'add',
         trigger: 'click'
-      }), copyDom(), showPreview && (0, _jsxRuntime.jsx)("div", {
+      }), copyDom(-1, false), showPreview && (0, _jsxRuntime.jsx)("div", {
         className: (0, _classnames["default"])("mb-2 font-bold uppercase tracking-wider preview-box"),
         style: {
           fontSize: 12,

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

@@ -22,22 +22,32 @@
 }
 .Sqb-Filter-item {
   position: relative;
-  // &-copy {
-  //   position: absolute;
-  //   left: 0;
-  //   top: 50%;
-  //   z-index: 1;
-  //   transform: translate(-100%, -50%);
-  //   &.isEndCopy {
-  //     position: relative;
-  //     left: auto;
-  //     top: auto;
-  //     transform: none;
-  //   }
-  // }
+  &-content {
+    position: relative;
+    display: inline-flex;
+    align-items: center;
+  }
+  &-copy {
+    position: absolute;
+    left: -14px;
+    top: 50%;
+    transform: translate(-50%, -50%);
+
+    &-static {
+      position: static;
+      display: inline-flex;
+      align-items: center;
+      margin-bottom: 8px;
+      transform: none;
+    }
+  }
   .openCheck {
     .Sqb-TableName {
-      padding-left: 20px;
+      padding-left: 28px;
+
+      .item-del {
+        display: none;
+      }
     }
   }
   &.item-selected {
@@ -48,16 +58,21 @@
   .item-check {
     display: none;
     position: absolute;
-    // right: 0;
-    // top: -10px;
-    z-index: 1;
+    left: 0;
+    top: 0;
+    z-index: 2;
     margin: 0;
     padding: 0;
     width: 100%;
-    height: 36px;
+    height: calc(100% - 8px);
     .pd-Checkbox-mask-wrapper {
-      margin-top: 10px;
-      margin-left: 5px;
+      margin: 0;
+      width: 100%;
+      height: 100%;
+      display: flex;
+      align-items: center;
+      justify-content: flex-start;
+      padding-left: 8px;
     }
   }
 }

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

@@ -319,6 +319,7 @@ var _isOk = exports.isOk = function isOk(rhsVal) {
 // 校验表达式完整性
 // 括号不匹配
 function validateParentheses(list) {
+  console.log('🚀 ~ validateParentheses ~ list:', list);
   var depth = 0;
   var _iterator = (0, _createForOfIteratorHelper2["default"])(list),
     _step;

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

@@ -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/dialog/formula-list/index.js

@@ -92,7 +92,6 @@ var FormulaList = forwardRef(function (props, ref) {
   var caseList = value || [];
   // const [caseList, setCaseListState] = useState<AtomsItem[]>(cloneDeep(value));
   var caseListRef = useRef(caseList);
-  var isSettingCaseList = useRef(false);
   var operatorList = useMemo(function () {
     if (store.operatorList.length > 0) {
       return store.operatorList;
@@ -139,7 +138,6 @@ var FormulaList = forwardRef(function (props, ref) {
         return v.val;
       }
     }).join(' ');
-    isSettingCaseList.current = true;
     // setCaseListState(data);
     caseList = data;
     caseListRef.current = data;
@@ -174,12 +172,11 @@ var FormulaList = forwardRef(function (props, ref) {
     _useState20 = _slicedToArray(_useState19, 2),
     selectedIndices = _useState20[0],
     setSelectedIndices = _useState20[1];
+  var _useState21 = useState(null),
+    _useState22 = _slicedToArray(_useState21, 2),
+    hoveredCopyIndex = _useState22[0],
+    setHoveredCopyIndex = _useState22[1];
   useEffect(function () {
-    // Skip if this update came from setCaseList (to avoid infinite loop)
-    if (isSettingCaseList.current) {
-      isSettingCaseList.current = false;
-      return;
-    }
     var _errorInfo = validateExpressionIntegrity(caseList);
     setErrorInfo(_errorInfo);
   }, [caseList]);
@@ -420,13 +417,13 @@ var FormulaList = forwardRef(function (props, ref) {
       // 确认删除吗
       onOk: function () {
         var _onOk = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-          var _caseList;
+          var selectedIndexSet, _caseList;
           return _regeneratorRuntime.wrap(function (_context) {
             while (1) switch (_context.prev = _context.next) {
               case 0:
-                _caseList = caseList.slice(); // 删除选中项，selectedIndices 已经是排序好的了
-                selectedIndices.forEach(function (i) {
-                  _caseList.splice(i, 1);
+                selectedIndexSet = new Set(selectedIndices);
+                _caseList = caseList.filter(function (_, index) {
+                  return !selectedIndexSet.has(index);
                 });
                 setCaseList(_caseList);
                 initPaste();
@@ -662,6 +659,7 @@ var FormulaList = forwardRef(function (props, ref) {
             return showNotExists(index);
           },
           children: [v.type, " ( * )", _jsx("span", {
+            className: 'item-del',
             style: {
               fontSize: 0
             },
@@ -681,6 +679,7 @@ var FormulaList = forwardRef(function (props, ref) {
             return showSubQuery(index);
           },
           children: [v.label || __('SqlQueryBuilder.subquery'), _jsx("span", {
+            className: 'item-del',
             style: {
               fontSize: 0
             },
@@ -703,6 +702,7 @@ var FormulaList = forwardRef(function (props, ref) {
             return handleField(e, index, v);
           },
           children: [!(v !== null && v !== void 0 && v.fieldName) && __('customColumn.selectField'), v.fieldName, _jsx("span", {
+            className: 'item-del',
             style: {
               fontSize: 0
             },
@@ -726,6 +726,7 @@ var FormulaList = forwardRef(function (props, ref) {
             handleConstant(val, index);
           }
         }), _jsx("span", {
+          className: 'item-del',
           style: {
             fontSize: 0
           },
@@ -748,6 +749,7 @@ var FormulaList = forwardRef(function (props, ref) {
             handleConstant(val, index);
           }
         }), _jsx("span", {
+          className: 'item-del',
           style: {
             fontSize: 0
           },
@@ -770,6 +772,7 @@ var FormulaList = forwardRef(function (props, ref) {
               notSelected: !v.val
             }),
             children: [!v.val && __('customColumn.selectOperator'), v.val, _jsx("span", {
+              className: 'item-del',
               style: {
                 fontSize: 0
               },
@@ -803,6 +806,7 @@ var FormulaList = forwardRef(function (props, ref) {
           "v-val": v.id || v.val,
           onClick: selectConstant,
           children: [getConstantLabel(store.constantList, v.id || v.val, v.val) || __('SqlQueryBuilder.pickConstant'), _jsx("span", {
+            className: 'item-del',
             style: {
               fontSize: 0
             },
@@ -829,6 +833,7 @@ var FormulaList = forwardRef(function (props, ref) {
           "v-type": type,
           onClick: selectConstant,
           children: [getConstantLabel(listSource, v.id || v.val, v.val) || "\u8BF7\u9009\u62E9".concat(currentOtherType.label), _jsx("span", {
+            className: 'item-del',
             style: {
               fontSize: 0
             },
@@ -858,6 +863,7 @@ var FormulaList = forwardRef(function (props, ref) {
             return handleExpression(e, index, v);
           },
           children: [v.quotes ? v.quotes : __('customColumn.selectExpression'), _jsx("span", {
+            className: 'item-del',
             style: {
               fontSize: 0
             },
@@ -879,6 +885,7 @@ var FormulaList = forwardRef(function (props, ref) {
             return showFunction(e, index);
           },
           children: [v.name ? getQuotes(v, v.args, formulaList) : __('customColumn.selectFormula'), _jsx("span", {
+            className: 'item-del',
             style: {
               fontSize: 0
             },
@@ -903,6 +910,7 @@ var FormulaList = forwardRef(function (props, ref) {
               notSelected: !v.val
             }),
             children: [!v.val && __('customColumn.selectOperator'), v.val, !v.fixed && _jsx("span", {
+              className: 'item-del',
               style: {
                 fontSize: 0
               },
@@ -931,6 +939,7 @@ var FormulaList = forwardRef(function (props, ref) {
               notSelected: true
             }),
             children: [__('customColumn.selectCustomInput'), _jsx("span", {
+              className: 'item-del',
               style: {
                 fontSize: 0
               },
@@ -948,16 +957,31 @@ var FormulaList = forwardRef(function (props, ref) {
   };
   var copyDom = function copyDom() {
     var index = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : -1;
+    var positioned = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
     if (!isCopy || selectedIndices.length === 0 && checkedItemsCount === 0) return null;
-    return _jsx(Tooltip, {
-      title: "\u5728\u6B64\u5904\u7C98\u8D34(".concat(selectedIndices.length || checkedItemsCount, ")\u9879"),
-      children: _jsx(Button, {
-        className: cx(':Sqb-Filter-item-copy'),
-        onClick: function onClick() {
-          return handlePaste(index);
-        },
-        iconOnly: true,
-        icon: _jsx(FfPlus, {})
+    return _jsx("div", {
+      className: cx('Sqb-Filter-item-copy', {
+        'Sqb-Filter-item-copy-static': !positioned
+      }),
+      onMouseEnter: function onMouseEnter() {
+        if (!positioned) return;
+        setHoveredCopyIndex(index);
+      },
+      onMouseLeave: function onMouseLeave() {
+        if (!positioned) return;
+        setHoveredCopyIndex(function (current) {
+          return current === index ? null : current;
+        });
+      },
+      children: _jsx(Tooltip, {
+        title: "\u5728\u6B64\u5904\u7C98\u8D34(".concat(selectedIndices.length || checkedItemsCount, ")\u9879"),
+        children: _jsx(Button, {
+          onClick: function onClick() {
+            return handlePaste(index);
+          },
+          iconOnly: true,
+          icon: _jsx(FfPlus, {})
+        })
       })
     });
   };
@@ -1004,10 +1028,10 @@ var FormulaList = forwardRef(function (props, ref) {
           children: "\u6E05\u9664\u590D\u5236"
         })]
       }), (_caseList2 = caseList) === null || _caseList2 === void 0 ? void 0 : _caseList2.map(function (v, i) {
-        return _jsxs(React.Fragment, {
-          children: [copyDom(i), _jsxs("div", {
+        return _jsx(React.Fragment, {
+          children: _jsxs("div", {
             className: cx('Sqb-Filter-item', {
-              hover: ind === i,
+              hover: ind === i && hoveredCopyIndex !== i,
               'item-fixed': v.fixed || false,
               'item-selected': isCheck
             }),
@@ -1019,7 +1043,7 @@ var FormulaList = forwardRef(function (props, ref) {
               if (isCheck) return;
               setInd(-1);
             },
-            children: [selectOperator({
+            children: [copyDom(i), selectOperator({
               triggerElement: function triggerElement() {
                 return _jsx("div", {
                   className: 'left-arrow',
@@ -1048,7 +1072,7 @@ var FormulaList = forwardRef(function (props, ref) {
               style: {
                 pointerEvents: isCheck || store.isMetabaseCopy ? 'none' : 'auto'
               },
-              className: cx({
+              className: cx('Sqb-Filter-item-content', {
                 openCheck: isCheck
               }),
               children: itemDom(v, i)
@@ -1070,7 +1094,7 @@ var FormulaList = forwardRef(function (props, ref) {
               position: 'after',
               trigger: 'hover'
             })]
-          }, i)]
+          }, i)
         }, i);
       }), Array.from(caseList).length < 1 && selectOperator({
         triggerElement: function triggerElement() {
@@ -1082,7 +1106,7 @@ var FormulaList = forwardRef(function (props, ref) {
         ind: -1,
         position: 'add',
         trigger: 'click'
-      }), copyDom(), showPreview && _jsx("div", {
+      }), copyDom(-1, false), showPreview && _jsx("div", {
         className: cx("mb-2 font-bold uppercase tracking-wider preview-box"),
         style: {
           fontSize: 12,

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

@@ -22,22 +22,32 @@
 }
 .Sqb-Filter-item {
   position: relative;
-  // &-copy {
-  //   position: absolute;
-  //   left: 0;
-  //   top: 50%;
-  //   z-index: 1;
-  //   transform: translate(-100%, -50%);
-  //   &.isEndCopy {
-  //     position: relative;
-  //     left: auto;
-  //     top: auto;
-  //     transform: none;
-  //   }
-  // }
+  &-content {
+    position: relative;
+    display: inline-flex;
+    align-items: center;
+  }
+  &-copy {
+    position: absolute;
+    left: -14px;
+    top: 50%;
+    transform: translate(-50%, -50%);
+
+    &-static {
+      position: static;
+      display: inline-flex;
+      align-items: center;
+      margin-bottom: 8px;
+      transform: none;
+    }
+  }
   .openCheck {
     .Sqb-TableName {
-      padding-left: 20px;
+      padding-left: 28px;
+
+      .item-del {
+        display: none;
+      }
     }
   }
   &.item-selected {
@@ -48,16 +58,21 @@
   .item-check {
     display: none;
     position: absolute;
-    // right: 0;
-    // top: -10px;
-    z-index: 1;
+    left: 0;
+    top: 0;
+    z-index: 2;
     margin: 0;
     padding: 0;
     width: 100%;
-    height: 36px;
+    height: calc(100% - 8px);
     .pd-Checkbox-mask-wrapper {
-      margin-top: 10px;
-      margin-left: 5px;
+      margin: 0;
+      width: 100%;
+      height: 100%;
+      display: flex;
+      align-items: center;
+      justify-content: flex-start;
+      padding-left: 8px;
     }
   }
 }

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

@@ -312,6 +312,7 @@ var _isOk = function isOk(rhsVal) {
 // 括号不匹配
 export { _isOk as isOk };
 function validateParentheses(list) {
+  console.log('🚀 ~ validateParentheses ~ list:', list);
   var depth = 0;
   var _iterator = _createForOfIteratorHelper(list),
     _step;

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

@@ -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/package.json

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