@lemon-fe/components 1.1.4 → 1.1.5

package/es/data-grid/components/custom-panel/field-modal.js

@@ -13,12 +13,12 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+import { Checkbox, Form, Input, Modal, Select } from 'antd';
 import React, { useEffect, useMemo, useRef, useState } from 'react';
 import FormLayout from "../../../form-layout";
 import Icons from "../../../icons";
 import TipMark from "../../../tip-mark";
 import { isCustomField, prefix } from "../../utils";
-import { Checkbox, Form, Input, Modal, Select } from 'antd';
 export default function FieldModal(props) {
   var openProp = props.open,
     _onCancel = props.onCancel,
@@ -32,11 +32,6 @@ export default function FieldModal(props) {
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
   var ref = useRef(null);
-  var map = useMemo(function () {
-    return Object.fromEntries(nodes.map(function (item) {
-      return [item.title || '', item.id];
-    }));
-  }, [nodes]);
   var handleAddExp = function handleAddExp(data) {
     var _ref$current;
     var area = (_ref$current = ref.current) === null || _ref$current === void 0 || (_ref$current = _ref$current.resizableTextArea) === null || _ref$current === void 0 ? void 0 : _ref$current.textArea;
@@ -50,33 +45,40 @@ export default function FieldModal(props) {
       expression: prev.slice(0, pos) + "${".concat(data.title, "}") + prev.slice(pos)
     });
   };
-  var leaves = useMemo(function () {
-    var items = [];
-    nodes.forEach(function (item) {
-      if (item.column) {
-        items.push(item);
-      } else {
-        item.leaf.forEach(function (leaf) {
-          items.push(_objectSpread(_objectSpread({}, leaf), {}, {
-            title: "".concat(item.title, "-").concat(leaf.title)
-          }));
-        });
-      }
-    });
-    return items.filter(function (item) {
-      if (!item.column) {
-        return false;
-      }
-      if (isCustomField(item.id)) {
-        return false;
-      }
-      return true;
-    });
-  }, [nodes]);
+  var _useMemo = useMemo(function () {
+      var items = [];
+      nodes.forEach(function (item) {
+        if (item.column) {
+          items.push(item);
+        } else {
+          item.leaf.forEach(function (leaf) {
+            items.push(_objectSpread(_objectSpread({}, leaf), {}, {
+              title: "".concat(item.title, "-").concat(leaf.title)
+            }));
+          });
+        }
+      });
+      var showLeaves = items.filter(function (item) {
+        if (!item.column) {
+          return false;
+        }
+        if (isCustomField(item.id)) {
+          return false;
+        }
+        return true;
+      });
+      var nodeMap = Object.fromEntries(showLeaves.map(function (item) {
+        return [item.title || '', item.id];
+      }));
+      return [showLeaves, nodeMap];
+    }, [nodes]),
+    _useMemo2 = _slicedToArray(_useMemo, 2),
+    leaves = _useMemo2[0],
+    map = _useMemo2[1];
   var formatExpression = function formatExpression(expression) {
     return expression.replace(/\$\{([^{}]+)\}/g, function (match, p1) {
       if (p1) {
-        var node = nodes.find(function (item) {
+        var node = leaves.find(function (item) {
           return item.id === p1;
         });
         if (node !== undefined) {

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

@@ -10,6 +10,7 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { Button, Space, Tooltip, message } from 'antd';
 import React, { useEffect, useMemo, useState } from 'react';
+import { createPortal } from 'react-dom';
 import Icons from "../../../icons";
 import { useGridStore } from "../../hooks";
 import { prefix } from "../../utils";
@@ -18,6 +19,7 @@ import FieldModal from "./field-modal";
 import ItemWrapper from "./item";
 import { DndContext, DragOverlay, closestCenter } from '@dnd-kit/core';
 import { useDebounce, useRequest } from '@lemon-fe/hooks';
+import classNames from 'classnames';
 export default function CustomColumnPanel(params) {
   var columnApi = params.columnApi,
     api = params.api,
@@ -291,11 +293,11 @@ export default function CustomColumnPanel(params) {
       level: 0,
       key: node.key
     });
-  }))), /*#__PURE__*/React.createElement(DragOverlay, {
+  }))), /*#__PURE__*/createPortal( /*#__PURE__*/React.createElement(DragOverlay, {
     dropAnimation: null
   }, overlay ? /*#__PURE__*/React.createElement("div", {
-    className: prefix('column-panel-drag-overlay')
-  }, overlay) : null)), /*#__PURE__*/React.createElement("div", {
+    className: classNames('ag-theme-lemon', prefix('column-panel-drag-overlay'))
+  }, overlay) : null), document.body)), /*#__PURE__*/React.createElement("div", {
     className: prefix('column-panel-footer')
   }, /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Button, {
     size: "small",

package/es/data-grid/index.less

@@ -486,7 +486,7 @@
 
   &-cell-detail {
     height: 100%;
-    padding: 10px;
+    padding: 10px 26px 10px 10px;
 
     &-auto-height {
       height: auto;

package/es/filter/index.js

@@ -463,11 +463,8 @@ function Filter(props) {
     },
     className: prefix('tab-bar')
   }), /*#__PURE__*/React.createElement(FormLayout, {
-    direction: "row",
-    style: !width ? {
-      maxHeight: 72,
-      overflow: 'hidden'
-    } : undefined
+    className: classNames(_defineProperty({}, prefix('pending'), !width)),
+    direction: "row"
   }, data.map(function (item) {
     if (!preserveFields && isFieldHidden(item)) {
       return null;

package/es/filter/index.less

@@ -7,6 +7,11 @@
     }
   }
 
+  &-pending {
+    height: 64px;
+    overflow: hidden;
+  }
+
   &-form-item {
     display: block;
 

package/es/select-view/index.js

@@ -181,7 +181,6 @@ export default function SelectView(props) {
     return result;
   }, [selectedColumns, readOnly]);
   var content;
-  console.log(cParams);
   var renderList = function renderList() {
     return /*#__PURE__*/React.createElement("div", {
       className: prefix('layout')

package/es/state/index.less

@@ -101,6 +101,10 @@
     .orderShapeColor(@color-success);
   }
 
+  &-type-processing&-shape-order {
+    .orderShapeColor(@color-processing);
+  }
+
   &-type-warning&-shape-order {
     .orderShapeColor(@color-warning);
   }
@@ -117,6 +121,10 @@
     color: @color-success;
   }
 
+  &-type-processing&-shape-text {
+    color: @color-processing;
+  }
+
   &-type-warning&-shape-text {
     color: @color-warning;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lemon-fe/components",
-  "version": "1.1.4",
+  "version": "1.1.5",
   "description": "> TODO: description",
   "homepage": "",
   "license": "ISC",
@@ -62,5 +62,5 @@
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
   },
-  "gitHead": "03ab34dbecd7dc7d99e2006900d33e725681305f"
+  "gitHead": "08d435751a2453d4a8ed836ac9c37ee0aea5351f"
 }