@gingkoo/pandora-metabase 1.0.117 → 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;
@@ -187,11 +185,6 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
     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]);

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;
@@ -179,11 +177,6 @@ var FormulaList = forwardRef(function (props, ref) {
     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]);

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.117",
+  "version": "1.0.118",
   "description": "",
   "main": "lib/es/index.js",
   "module": "lib/es/index.js",