@lemon-fe/components 1.4.9 → 1.4.10

package/es/data-grid/components/custom-panel/index.js

@@ -120,22 +120,24 @@ export default function CustomColumnPanel(params) {
         path.unshift(node);
         parent = parent.getOriginalParent();
       }
-      for (var i = 0; i < path.length; i++) {
+      var mergeFlag = false;
+      for (var i = path.length - 1; i >= 0; i--) {
         var node1 = prevPath[i];
         var node2 = path[i];
         if (node1 !== undefined && node2 !== undefined && node1.id === node2.id) {
-          node1.children = [].concat(_toConsumableArray(node1.children), _toConsumableArray(node2.children));
+          if (!mergeFlag) {
+            node1.children = [].concat(_toConsumableArray(node1.children), _toConsumableArray(node2.children));
+            mergeFlag = true;
+          }
           node1.leaf = [].concat(_toConsumableArray(node1.leaf), _toConsumableArray(node2.leaf));
           node1.disabled = node1.disabled && node2.disabled;
           node1.visible = node1.visible === 1 && node2.visible === 1 ? 1 : node1.visible === 1 || node2.visible === 1 ? 2 : 0;
           path[i] = node1;
-          continue;
-        }
-        if (i === 0) {
-          items.push(path[0]);
-          break;
         }
       }
+      if (!mergeFlag) {
+        items.push(path[0]);
+      }
       prevPath = path;
     });
     return items;

package/es/popup/index.less

@@ -20,14 +20,9 @@
     padding: 1px;
     background-color: #fff;
     transform: translateY(-50%);
-    opacity: 0;
     transition: opacity 0.3s, color 0.3s !important;
   }
 
-  &-wrapper:hover &-input-clear {
-    opacity: 1;
-  }
-
   &-input input {
     cursor: pointer;
   }

package/es/styles/overrides.less

@@ -222,6 +222,10 @@ a[title='站长统计'] {
     align-items: center;
     line-height: 1 !important;
   }
+
+  &-clear {
+    opacity: 1;
+  }
 }
 
 /** tree */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lemon-fe/components",
-  "version": "1.4.9",
+  "version": "1.4.10",
   "description": "> TODO: description",
   "homepage": "",
   "license": "MIT",
@@ -58,5 +58,5 @@
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
   },
-  "gitHead": "cdb79845cb423e932516831f73a9f77ebbc95d30"
+  "gitHead": "caf104b75fecab8a24a2a193ab1f4c088aa688ae"
 }