@lemon-fe/components 1.4.22 → 1.4.23

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

@@ -245,7 +245,9 @@ export default function FieldModal(props) {
     label: " ",
     name: "summary",
     valuePropName: "checked"
-  }, /*#__PURE__*/React.createElement(Checkbox, null, fieldModal.summaryText)), /*#__PURE__*/React.createElement(Form.Item, {
+  }, /*#__PURE__*/React.createElement(Checkbox, null, fieldModal.summaryText, /*#__PURE__*/React.createElement(TipMark, {
+    infoContent: fieldModal.summaryTextTooltip
+  }))), /*#__PURE__*/React.createElement(Form.Item, {
     name: "summaryType",
     label: /*#__PURE__*/React.createElement("span", null, fieldModal.summaryTypeText, /*#__PURE__*/React.createElement(TipMark, {
       infoContent: /*#__PURE__*/React.createElement("div", {

package/es/data-grid/components/search.d.ts

@@ -1,4 +1,6 @@
 import React from 'react';
 import type { DataGridSearch, DataGridSearchRef } from '../typings';
-declare const _default: React.MemoExoticComponent<React.ForwardRefExoticComponent<DataGridSearch & React.RefAttributes<DataGridSearchRef>>>;
+declare const _default: <TData>(props: DataGridSearch<TData> & {
+    ref: React.RefObject<DataGridSearchRef>;
+}) => React.ReactElement;
 export default _default;

package/es/data-grid/components/search.js

@@ -15,10 +15,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 { Button, Input, Space } from 'antd';
+import { Button, Input, Select, Space } from 'antd';
 import React, { forwardRef, memo, useState, useImperativeHandle, useMemo, useRef } from 'react';
+import InputCompact from "../../input-compact";
 import { useLocaleReceiver } from "../../locale-receiver";
 import { useGridStore } from "../hooks";
+import { prefix } from "../utils";
 import { useDebounce } from '@lemon-fe/hooks';
 export default /*#__PURE__*/memo( /*#__PURE__*/forwardRef(function Search(props, ref) {
   var placeholder = props.placeholder,
@@ -27,7 +29,8 @@ export default /*#__PURE__*/memo( /*#__PURE__*/forwardRef(function Search(props,
     _props$clearSelection = props.clearSelection,
     clearSelection = _props$clearSelection === void 0 ? true : _props$clearSelection,
     defaultValue = props.defaultValue,
-    onValueChange = props.onValueChange;
+    onValueChange = props.onValueChange,
+    dropdownConfig = props.dropdownConfig;
   // 单行搜索大致耗时
   var duration = useRef(0);
   var defaultState = useMemo(function () {
@@ -64,15 +67,33 @@ export default /*#__PURE__*/memo( /*#__PURE__*/forwardRef(function Search(props,
     }
     return cols;
   };
+  var getLabel = function getLabel(node) {
+    var defaultVal = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
+    if (dropdownConfig && node.data) {
+      var label = dropdownConfig.label;
+      if (typeof label === 'function') {
+        return label(node.data);
+      } else {
+        return grid.api.getValue(label, node);
+      }
+    }
+    return defaultVal;
+  };
   var checkNodes = function checkNodes(keywords, node, cols) {
+    var result = {
+      label: '',
+      matched: false
+    };
     for (var i = 0; i < cols.length; i++) {
       var col = cols[i];
       var value = grid.api.getValue(col, node);
       if (value !== undefined && value !== null && typeof value === 'string' && value.toUpperCase().includes(keywords.toUpperCase())) {
-        return true;
+        result.label = getLabel(node, value);
+        result.matched = true;
+        return result;
       }
     }
-    return false;
+    return result;
   };
   var handleSearch = useDebounce(function (str, prevState) {
     var keywords = str.trim();
@@ -107,9 +128,11 @@ export default /*#__PURE__*/memo( /*#__PURE__*/forwardRef(function Search(props,
       if (id === undefined) {
         return;
       }
-      if (checkNodes(keywords, node, cols)) {
+      var checkResult = checkNodes(keywords, node, cols);
+      if (checkResult.matched) {
         nodes.push({
-          id: id
+          id: id,
+          label: checkResult.label
         });
         if (prevNodes.has(id)) {
           prevNodes.set(id, nodes.length - 1);
@@ -186,6 +209,23 @@ export default /*#__PURE__*/memo( /*#__PURE__*/forwardRef(function Search(props,
       });
     });
   };
+  var jumpToItem = function jumpToItem(id) {
+    if (state.nodes.length <= 0) {
+      return;
+    }
+    var idx = state.nodes.findIndex(function (item) {
+      return item.id === id;
+    });
+    if (idx < 0) {
+      return;
+    }
+    focusCell(id);
+    setState(function (prev) {
+      return _objectSpread(_objectSpread({}, prev), {}, {
+        index: idx
+      });
+    });
+  };
   useImperativeHandle(ref, function () {
     return {
       reset: function reset() {
@@ -233,8 +273,10 @@ export default /*#__PURE__*/memo( /*#__PURE__*/forwardRef(function Search(props,
                 break;
               }
             }
+            var label = getLabel(node);
             _newNodes.splice(idx, 0, {
-              id: id
+              id: id,
+              label: label
             });
             setState(function (prev) {
               return _objectSpread(_objectSpread({}, prev), {}, {
@@ -253,7 +295,12 @@ export default /*#__PURE__*/memo( /*#__PURE__*/forwardRef(function Search(props,
       }
     };
   });
-  return /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Input, {
+  return /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(InputCompact, {
+    className: "".concat(prefix('bottom-search')),
+    style: {
+      width: 264
+    }
+  }, /*#__PURE__*/React.createElement(Input, {
     placeholder: placeholder || dataGridLocale.searchPlaceholderText,
     value: state.keywords,
     defaultValue: defaultValue,
@@ -272,8 +319,24 @@ export default /*#__PURE__*/memo( /*#__PURE__*/forwardRef(function Search(props,
       if (e.key === 'Enter') {
         handleNext(searching.current ? handleSearch.flush() : state);
       }
+    },
+    bordered: false
+  }), /*#__PURE__*/React.createElement(Select, {
+    options: state.nodes,
+    bordered: false,
+    notFoundContent: null,
+    className: "".concat(prefix('bottom-search-select')),
+    fieldNames: {
+      label: 'label',
+      value: 'id'
+    },
+    placement: "topRight",
+    dropdownMatchSelectWidth: 264,
+    listHeight: 280,
+    onChange: function onChange(val) {
+      jumpToItem(val);
     }
-  }), /*#__PURE__*/React.createElement(Button, {
+  })), /*#__PURE__*/React.createElement(Button, {
     size: "small",
     onClick: handlePrev
   }, dataGridLocale.searchPrevText), /*#__PURE__*/React.createElement(Button, {

package/es/data-grid/index.d.ts

@@ -17,7 +17,7 @@ declare const Editors: {
     Text: React.ForwardRefExoticComponent<import("ag-grid-community").ICellEditorParams<any, any, any> & import("..").TextEditorParams<any> & React.RefAttributes<import("ag-grid-react").ICellEditorReactComp>>;
     Date: React.ForwardRefExoticComponent<import("ag-grid-community").ICellEditorParams<any, any, any> & import("..").DateEditorParams<any> & React.RefAttributes<import("ag-grid-react").ICellEditorReactComp>>;
     Number: React.ForwardRefExoticComponent<import("ag-grid-community").ICellEditorParams<any, any, any> & import("..").NumberEditorParams<any> & React.RefAttributes<import("ag-grid-react").ICellEditorReactComp>>;
-    Select: React.ForwardRefExoticComponent<import("ag-grid-community").ICellEditorParams<any, any, any> & Pick<import("antd").SelectProps<any, import("antd/lib/select").BaseOptionType>, "disabled" | "mode" | "virtual" | "allowClear" | "showSearch" | "optionFilterProp" | "options" | "listHeight"> & {
+    Select: React.ForwardRefExoticComponent<import("ag-grid-community").ICellEditorParams<any, any, any> & Pick<import("antd").SelectProps<any, import("antd/lib/select").BaseOptionType>, "disabled" | "mode" | "allowClear" | "showSearch" | "optionFilterProp" | "options" | "virtual" | "listHeight"> & {
         fieldNames?: {
             label: string;
             value: string;

package/es/data-grid/index.less

@@ -538,6 +538,17 @@
     justify-content: center;
     background-color: rgba(255, 255, 255, 0.6);
   }
+
+  &-bottom-search {
+    &-select {
+      width: 32px;
+      overflow: hidden;
+
+      .@{ant-prefix}-select-selector {
+        opacity: 0;
+      }
+    }
+  }
 }
 
 .ag-theme-@{prefixCls} {

package/es/data-grid/locale/en_US.js

@@ -34,6 +34,7 @@ var locale = {
     customColumnDecimalPlacesText: 'Decimal places',
     customColumnParentHeaderText: 'The corresponding superior header',
     summaryText: 'Summary or not',
+    summaryTextTooltip: 'Fields used in custom formulas must display aggregated values; otherwise, the calculation of totals will not be possible',
     summaryTypeText: 'Rule',
     summaryTypeContentText: "\n      <div>\n        <p>1. The sum of custom column data values to get the total value</p>\n        <p>\n          2. The total value is calculated based on a formula from the data source (this total value is not available for export)\n          <br />\n          The total value of the field columns added to the formula is calculated based on the formula to derive the custom column total. This is typically used when the custom column represents a percentage, such as gross margin percentage\n        </p>\n      </div>\n      ",
     customSummaryDataText: 'Sum of custom column data values to get the total value',

package/es/data-grid/locale/locale.d.ts

@@ -13,6 +13,7 @@ export interface DataGridLocale {
         customColumnDecimalPlacesText: string;
         customColumnParentHeaderText: string;
         summaryText: string;
+        summaryTextTooltip: string;
         summaryTypeText: string;
         summaryTypeContentText: string;
         customSummaryDataText: string;

package/es/data-grid/locale/vi.js

@@ -31,6 +31,7 @@ var locale = {
     customColumnDecimalPlacesText: 'Số chữ số thập phân',
     customColumnParentHeaderText: 'Tiêu đề bảng cấp trên mà nó thuộc về',
     summaryText: 'Có thống kê tổng cộng không?',
+    summaryTextTooltip: 'Các trường trong công thức tùy chỉnh cần hiển thị giá trị tổng hợp, nếu không sẽ không thể tính tổng (hoặc tổng hợp) giá trị',
     summaryTypeText: 'Quy tắc tính tổng cộng',
     summaryTypeContentText: "\n    <div>\n      <p>1. T\xEDnh t\u1ED5ng gi\xE1 tr\u1ECB d\u1EEF li\u1EC7u c\u1EE7a c\u1ED9t t\xF9y ch\u1EC9nh \u0111\u1EC3 c\xF3 \u0111\u01B0\u1EE3c gi\xE1 tr\u1ECB t\u1ED5ng c\u1ED9ng.</p>\n      <p>\n        2. Gi\xE1 tr\u1ECB t\u1ED5ng \u0111\u01B0\u1EE3c t\xEDnh to\xE1n t\u1EEB ngu\u1ED3n d\u1EEF li\u1EC7u d\u1EF1a tr\xEAn c\xF4ng th\u1EE9c t\xEDnh (gi\xE1 tr\u1ECB t\u1ED5ng n\xE0y kh\xF4ng h\u1ED7 tr\u1EE3 xu\u1EA5t).\n        <br />\n        Gi\xE1 tr\u1ECB t\u1ED5ng c\u1EE7a c\xE1c c\u1ED9t d\u1EEF li\u1EC7u \u0111\u01B0\u1EE3c th\xEAm v\xE0o c\xF4ng th\u1EE9c \u0111\u01B0\u1EE3c t\xEDnh to\xE1n theo c\xF4ng th\u1EE9c \u0111\u1EC3 ra gi\xE1 tr\u1ECB t\u1ED5ng c\u1EE7a c\u1ED9t t\xF9y ch\u1EC9nh, th\u01B0\u1EDDng \u0111\u01B0\u1EE3c \xE1p d\u1EE5ng khi c\u1ED9t t\xF9y ch\u1EC9nh l\xE0 t\u1EF7 l\u1EC7 ph\u1EA7n tr\u0103m, ch\u1EB3ng h\u1EA1n nh\u01B0 t\u1EF7 su\u1EA5t l\u1EE3i nhu\u1EADn g\u1ED9p.\n      </p>\n    </div>\n    ",
     customSummaryDataText: 'Tính tổng giá trị dữ liệu của cột tùy chỉnh để có được giá trị tổng cộng',

package/es/data-grid/locale/zh_CN.js

@@ -31,6 +31,7 @@ var locale = {
     customColumnDecimalPlacesText: '小数位数',
     customColumnParentHeaderText: '所属上级表头',
     summaryText: '是否统计合计',
+    summaryTextTooltip: '自定义公式内的字段需要显示合计值，否则无法合计值合计',
     summaryTypeText: '合计规则',
     summaryTypeContentText: "\n    <div>\n      <p>1\u3001\u81EA\u5B9A\u4E49\u5217\u6570\u636E\u503C\u6C42\u548C\u5F97\u51FA\u5408\u8BA1\u503C</p>\n      <p>\n        2\u3001\u6570\u636E\u6E90\u6839\u636E\u8BA1\u7B97\u516C\u5F0F\u5F97\u51FA\u5408\u8BA1\u503C(\u8BE5\u5408\u8BA1\u503C\u4E0D\u652F\u6301\u5BFC\u51FA)\n        <br />\n        \u516C\u5F0F\u4E2D\u6DFB\u52A0\u7684\u5B57\u6BB5\u5217\u6570\u636E\u5408\u8BA1\u503C\u6309\u8BA1\u7B97\u516C\u5F0F\u7B97\u51FA\u81EA\u5B9A\u4E49\u5217\u5408\u8BA1\u503C\uFF0C\u4E00\u822C\u7528\u4E8E\u81EA\u5B9A\u4E49\u5217\u662F\u767E\u5206\u6BD4\u7684\u60C5\u51B5\uFF0C\u6BD4\u5982\u6BDB\u5229\u7387\n      </p>\n    </div>\n    ",
     customSummaryDataText: '自定义列数据值求和得出合计值',

package/es/data-grid/locale/zh_Hant_HK.js

@@ -31,6 +31,7 @@ var locale = {
     customColumnDecimalPlacesText: '小數位數',
     customColumnParentHeaderText: '所屬上級表頭',
     summaryText: '是否統計合計',
+    summaryTextTooltip: '自定義公式內的字段需要顯示合計值，否則無法合計值合計',
     summaryTypeText: '合計規則',
     summaryTypeContentText: "\n    <div>\n      <p>1\u3001\u81EA\u5B9A\u7FA9\u5217\u6578\u64DA\u503C\u6C42\u548C\u5F97\u51FA\u5408\u8A08\u503C</p>\n      <p>\n        2\u3001\u6578\u64DA\u6E90\u6839\u64DA\u8A08\u7B97\u516C\u5F0F\u5F97\u51FA\u7E3D\u8A08\u503C(\u8A72\u7E3D\u8A08\u503C\u4E0D\u652F\u63F4\u5C0E\u51FA)\n        <br />\n        \u516C\u5F0F\u4E2D\u6DFB\u52A0\u7684\u5B57\u6BB5\u5217\u6578\u64DA\u7E3D\u8A08\u503C\u6703\u6309\u8A08\u7B97\u516C\u5F0F\u5F97\u51FA\u81EA\u5B9A\u7FA9\u5217\u7684\u7E3D\u8A08\u503C\uFF0C\u6B64\u65B9\u6CD5\u901A\u5E38\u7528\u65BC\u81EA\u5B9A\u7FA9\u5217\u70BA\u767E\u5206\u6BD4\u7684\u60C5\u6CC1\uFF0C\u4F8B\u5982\u6BDB\u5229\u7387\n      </p>\n    </div>\n    ",
     customSummaryDataText: '自定義列數據值求和得出合計值',

package/es/data-grid/typings.d.ts

@@ -133,7 +133,7 @@ export declare type DetailCell<TData, Params = Record<string, never>> = {
     /** 这是一个render函数不是组件 */
     render: (params: ICellRendererParams<TData> & Params) => ReactNode;
 };
-export interface DataGridSearch {
+export interface DataGridSearch<TData> {
     /**
      * @description
      * 不传入就根据所有字符类型的列数据搜索
@@ -156,6 +156,16 @@ export interface DataGridSearch {
      */
     defaultValue?: string;
     onValueChange?: (value: string) => void;
+    /**
+     * @description
+     * 是否显示搜索结果 上下键快速定位
+     */
+    dropdownConfig?: {
+        /**
+         * label字段
+         */
+        label: string | ((item: TData) => ReactNode | string);
+    };
 }
 export interface DataGridSearchRef {
     reset: () => void;
@@ -235,7 +245,7 @@ export interface DataGridProps<TData> extends Omit<AgGridReactProps<TData>, 'row
     /**
      * @description 显示底部搜索栏，只支持非远程模式
      */
-    showSearch?: boolean | DataGridSearch;
+    showSearch?: boolean | DataGridSearch<TData>;
     /**
      * @description 单元格是否表现成弹性盒子，从而便于垂直，此时也会导致文本ellipsis失效
      */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lemon-fe/components",
-  "version": "1.4.22",
+  "version": "1.4.23",
   "description": "> TODO: description",
   "homepage": "",
   "license": "MIT",
@@ -58,5 +58,5 @@
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
   },
-  "gitHead": "028b91754f651ef860b0e57a2a8e538087334e17"
+  "gitHead": "c3d8070a21dfdb8b63295e76dd0b8484a94d372a"
 }