@lemon-fe/components 1.2.14 → 1.2.16

package/es/data-grid/cell-editors/number.js

@@ -98,11 +98,8 @@ export default /*#__PURE__*/forwardRef(function NumberEditor(props, ref) {
     } else {
       val = value;
     }
-    if (precision !== undefined) {
-      return Math.round(val * Math.pow(10, precision)) / Math.pow(10, precision);
-    }
     return val;
-  }, [value, precision]);
+  }, [value]);
   return /*#__PURE__*/React.createElement(EditorWrapper, null, /*#__PURE__*/React.createElement("input", {
     type: "number",
     onKeyDown: function onKeyDown(e) {

package/es/data-grid/cell-editors/select.d.ts

@@ -16,7 +16,7 @@ export declare type SelectEditorParams = Pick<SelectProps<any, BaseOptionType>,
      */
     action?: 'next' | 'stop' | 'none';
 };
-declare const _default: React.ForwardRefExoticComponent<ICellEditorParams<any, any, any> & Pick<SelectProps<any, BaseOptionType>, "disabled" | "mode" | "showSearch" | "allowClear" | "optionFilterProp" | "options" | "virtual" | "listHeight"> & {
+declare const _default: React.ForwardRefExoticComponent<ICellEditorParams<any, any, any> & Pick<SelectProps<any, BaseOptionType>, "disabled" | "allowClear" | "mode" | "showSearch" | "optionFilterProp" | "options" | "virtual" | "listHeight"> & {
     fieldNames?: {
         label: string;
         value: string;

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

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

package/es/data-grid/index.js

@@ -73,9 +73,10 @@ import { Parser } from 'expr-eval';
 import { get, set } from 'lodash';
 import memoizeOne from 'memoize-one';
 import shallowEqual from 'shallowequal';
+var fieldSuffix = /(%)$/;
 function toNumber(a) {
   if (typeof a === 'string') {
-    return a.replace(/,/g, '');
+    return a.replace(/,/g, '').replace(fieldSuffix, '');
   }
   return a;
 }
@@ -188,7 +189,7 @@ var InternalDataGrid = /*#__PURE__*/function (_Component) {
     _defineProperty(_assertThisInitialized(_this), "searchRef", /*#__PURE__*/createRef());
     _defineProperty(_assertThisInitialized(_this), "prevFocusedCell", null);
     _defineProperty(_assertThisInitialized(_this), "fields", []);
-    _defineProperty(_assertThisInitialized(_this), "fieldSuffix", /(%)$/);
+    _defineProperty(_assertThisInitialized(_this), "fieldSuffix", fieldSuffix);
     _defineProperty(_assertThisInitialized(_this), "customColumnData", null);
     _defineProperty(_assertThisInitialized(_this), "getFieldsSummary", memoizeOne(function (dataSource, fields) {
       var summaryField = fields.filter(function (field) {
@@ -333,6 +334,39 @@ var InternalDataGrid = /*#__PURE__*/function (_Component) {
         desc: _this.props.emptyText
       });
     });
+    _defineProperty(_assertThisInitialized(_this), "getMainMenuItems", function (params) {
+      var def = params.column.getColDef();
+      if (def.sortable) {
+        var sort = params.column.getSort();
+        var colId = params.column.getColId();
+        return [{
+          name: _this.props.locale.localeText.sortAscending,
+          disabled: sort === 'asc',
+          icon: '<span class="ag-icon ag-icon-asc" unselectable="on" role="presentation"></span>',
+          action: function action() {
+            params.columnApi.applyColumnState({
+              state: [{
+                colId: colId,
+                sort: 'asc'
+              }]
+            });
+          }
+        }, {
+          name: _this.props.locale.localeText.sortDescending,
+          disabled: sort === 'desc',
+          icon: '<span class="ag-icon ag-icon-desc" unselectable="on" role="presentation"></span>',
+          action: function action() {
+            params.columnApi.applyColumnState({
+              state: [{
+                colId: colId,
+                sort: 'desc'
+              }]
+            });
+          }
+        }, 'separator'].concat(_toConsumableArray(params.defaultItems));
+      }
+      return params.defaultItems;
+    });
     _defineProperty(_assertThisInitialized(_this), "getRowId", function (params) {
       var rowKey = _this.props.rowKey;
       var result = typeof rowKey === 'function' ? rowKey(params.data) : get(params.data, rowKey);
@@ -1390,14 +1424,6 @@ var InternalDataGrid = /*#__PURE__*/function (_Component) {
         }
       });
     }
-  }, {
-    key: "getMainMenuItems",
-    value: function getMainMenuItems(params) {
-      if (params.defaultItems.includes('pinSubMenu')) {
-        return params.defaultItems;
-      }
-      return ['pinSubMenu', 'separator'].concat(_toConsumableArray(params.defaultItems));
-    }
   }, {
     key: "getFieldErrMessage",
     value: function getFieldErrMessage(err, field) {

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

@@ -16,7 +16,9 @@ var locale = {
     noPin: 'No Pin',
     expandAll: 'Expand All Row Groups',
     collapseAll: 'Close All Row Groups',
-    columns: 'Columns'
+    columns: 'Columns',
+    sortAscending: 'Sort Ascending',
+    sortDescending: 'Sort Descending'
   },
   pagination: {
     totalText: 'Total ${total} items'

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

@@ -16,7 +16,9 @@ var locale = {
     noPin: '不固定',
     expandAll: '展开所有',
     collapseAll: '折叠所有',
-    columns: '列'
+    columns: '列',
+    sortAscending: '正序',
+    sortDescending: '逆序'
   },
   pagination: {
     totalText: '共${total}条'

package/es/data-grid/renderer/header-renderer.js

@@ -21,7 +21,6 @@ var UpIcon = function UpIcon(props) {
     width: 8,
     height: 5
   }), /*#__PURE__*/React.createElement("path", {
-    fill: "currentColor",
     fillRule: "nonzero",
     d: "M.641 3.227a.75.75 0 0 0 1.06 1.06L4 1.99l2.298 2.298a.75.75 0 0 0 .984.067l.077-.067a.75.75 0 0 0 0-1.061L4.53.399a.75.75 0 0 0-1.06 0L.64 3.227Z",
     opacity: "1"

package/es/select-view/index.d.ts

@@ -77,5 +77,13 @@ export interface SelectViewProps<RecordType, ParamsType> extends Pick<DataGridPr
      * @default null
      */
     header?: ReactElement | null;
+    /**
+     * @description 自定义已选择datagrid
+     */
+    customSelectedGridProps?: DataGridProps<RecordType>;
+    /**
+     * @description 自定义主datagrid
+     */
+    customDataGridProps?: DataGridProps<RecordType>;
 }
 export default function SelectView<RecordType extends Record<string | number, any>, ParamsType extends Record<string, any>>(originalProps: SelectViewProps<RecordType, ParamsType>): JSX.Element;

package/es/select-view/index.js

@@ -59,7 +59,9 @@ export default function SelectView(originalProps) {
     _props$suppressRowCli = props.suppressRowClickSelection,
     suppressRowClickSelection = _props$suppressRowCli === void 0 ? false : _props$suppressRowCli,
     _props$rowMultiSelect = props.rowMultiSelectWithClick,
-    rowMultiSelectWithClick = _props$rowMultiSelect === void 0 ? true : _props$rowMultiSelect;
+    rowMultiSelectWithClick = _props$rowMultiSelect === void 0 ? true : _props$rowMultiSelect,
+    customSelectedGridProps = props.customSelectedGridProps,
+    customDataGridProps = props.customDataGridProps;
   var prefix = prefixClassName("select-view");
   var _useState = useState(value || emptyValue),
     _useState2 = _slicedToArray(_useState, 2),
@@ -229,7 +231,7 @@ export default function SelectView(originalProps) {
       className: prefix('head')
     }, headerNode), /*#__PURE__*/React.createElement("div", {
       className: prefix('body')
-    }, /*#__PURE__*/React.createElement(DataGrid, {
+    }, /*#__PURE__*/React.createElement(DataGrid, _extends({
       ref: list,
       rowKey: rowKey,
       rowSelection: {
@@ -257,7 +259,7 @@ export default function SelectView(originalProps) {
       fetch: request,
       pagination: pagination,
       customColumnPanelStorage: customColumnPanelStorage
-    }))));
+    }, customDataGridProps)))));
   };
   var renderSelected = function renderSelected() {
     return /*#__PURE__*/React.createElement("div", {
@@ -266,7 +268,7 @@ export default function SelectView(originalProps) {
       className: prefix('main')
     }, /*#__PURE__*/React.createElement("div", {
       className: prefix('body')
-    }, /*#__PURE__*/React.createElement(DataGrid, {
+    }, /*#__PURE__*/React.createElement(DataGrid, _extends({
       dataSource: data,
       defaultColDef: defaultColDef,
       rowHeight: rowHeight,
@@ -282,13 +284,14 @@ export default function SelectView(originalProps) {
         data: data,
         dataKeys: dataKeys
       }
-    }))));
+    }, customSelectedGridProps)))));
   };
   if (readOnly) {
     content = renderSelected();
   } else if (!multiple) {
     content = renderList();
   } else {
+    var _customSelectedGridPr, _customSelectedGridPr2;
     content = /*#__PURE__*/React.createElement(Tabs, {
       items: [{
         key: 'list',
@@ -297,7 +300,7 @@ export default function SelectView(originalProps) {
       }, {
         key: 'selected',
         label: parseLocalTemplate(SelectViewLocale.selectedDataText, {
-          length: data.length
+          length: (_customSelectedGridPr = customSelectedGridProps === null || customSelectedGridProps === void 0 || (_customSelectedGridPr2 = customSelectedGridProps.dataSource) === null || _customSelectedGridPr2 === void 0 ? void 0 : _customSelectedGridPr2.length) !== null && _customSelectedGridPr !== void 0 ? _customSelectedGridPr : data.length
         }),
         children: renderSelected()
       }],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lemon-fe/components",
-  "version": "1.2.14",
+  "version": "1.2.16",
   "description": "> TODO: description",
   "homepage": "",
   "license": "ISC",
@@ -67,5 +67,5 @@
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
   },
-  "gitHead": "3ed306d1094065aa0788bb39e4db7d617eddea5b"
+  "gitHead": "37caaf402464a0549212f7f485de34103b53694f"
 }