@lemon-fe/components 1.4.9-alpha.2 → 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/data-grid/index.js

@@ -1146,9 +1146,14 @@ var InternalDataGrid = /*#__PURE__*/function (_Component) {
             if (node !== null && node.data !== undefined) {
               if (isSummaryRow({
                 node: node
-              }) && field.summaryType === 1) {
-                var summary = _this3.getFieldsSummary(_this3.dataSource, _this3.fields);
-                return get(summary, field.id);
+              })) {
+                if (!field.summary) {
+                  return get(node.data, field.id);
+                }
+                if (field.summaryType === 1) {
+                  var summary = _this3.getFieldsSummary(_this3.dataSource, _this3.fields);
+                  return get(summary, field.id);
+                }
               }
               var getValue = function getValue(colId) {
                 var col = columnApi.getColumn(colId);

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/select/index.js

@@ -15,6 +15,17 @@ import Dropdown from "../dropdown";
 import Empty from "../empty";
 import Icons from "../icons";
 import { useLocaleReceiver } from "../locale-receiver";
+import { mergeDefaultProps } from "../utils";
+
+// 这个必须加，否则部分select的样式会有问题
+mergeDefaultProps(AntdSelect, {
+  clearIcon: Icons.Clear,
+  notFoundContent: /*#__PURE__*/React.createElement(Empty, {
+    imageStyle: {
+      height: 60
+    }
+  })
+});
 function InternalSelect(props, ref) {
   var wrapper = useRef(null);
   var _useContext = useContext(ConfigProvider.ConfigContext),
@@ -23,17 +34,11 @@ function InternalSelect(props, ref) {
     _useLocaleReceiver2 = _slicedToArray(_useLocaleReceiver, 1),
     locale = _useLocaleReceiver2[0];
   var selector = /*#__PURE__*/React.createElement(AntdSelect, _extends({
-    notFoundContent: /*#__PURE__*/React.createElement(Empty, {
-      imageStyle: {
-        height: 60
-      }
-    }),
     suffixIcon: !props.loading ? /*#__PURE__*/React.createElement(Icons.Down, {
       style: {
         pointerEvents: 'none'
       }
-    }) : undefined,
-    clearIcon: Icons.Clear
+    }) : undefined
   }, props, {
     ref: ref
   }));

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-alpha.2",
+  "version": "1.4.10",
   "description": "> TODO: description",
   "homepage": "",
   "license": "MIT",
@@ -58,5 +58,5 @@
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
   },
-  "gitHead": "3bbd7b346f4c9eac222ee956581f1fd428ee01f8"
+  "gitHead": "caf104b75fecab8a24a2a193ab1f4c088aa688ae"
 }