@lemon-fe/components 1.4.0-alpha.1 → 1.4.1

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

@@ -5,10 +5,11 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 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 { DatePicker } from 'antd';
-import React, { useEffect, useRef } from 'react';
+import React, { useEffect, useMemo, useRef } from 'react';
 import { forwardRef, useImperativeHandle, useState } from 'react';
 import { editorPrefixClass, navigateCell } from "./utils";
 import EditorWrapper from "./wrapper";
+import { uniq } from 'lodash';
 import moment from 'moment';
 export default /*#__PURE__*/forwardRef(function DateEditor(props, ref) {
   var _props$format = props.format,
@@ -27,6 +28,9 @@ export default /*#__PURE__*/forwardRef(function DateEditor(props, ref) {
   var elm = useRef(null);
   var isEdited = useRef(false);
   var dirty = useRef(false);
+  var inputFormat = useMemo(function () {
+    return uniq([format, 'YYYY-MM-DD', 'YYYYMMDD']);
+  }, []);
   useEffect(function () {
     var _elm$current;
     (_elm$current = elm.current) === null || _elm$current === void 0 || _elm$current.focus();
@@ -65,6 +69,7 @@ export default /*#__PURE__*/forwardRef(function DateEditor(props, ref) {
     className: editorPrefixClass('date'),
     value: value,
     placeholder: format,
+    format: inputFormat,
     onOpenChange: function onOpenChange(val) {
       if (!val) {
         isEdited.current = true;

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("./typings").TextEditorParams<any> & React.RefAttributes<import("ag-grid-react").ICellEditorReactComp>>;
     Date: React.ForwardRefExoticComponent<import("ag-grid-community").ICellEditorParams<any, any, any> & import("./typings").DateEditorParams<any> & React.RefAttributes<import("ag-grid-react").ICellEditorReactComp>>;
     Number: React.ForwardRefExoticComponent<import("ag-grid-community").ICellEditorParams<any, any, any> & import("./typings").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" | "allowClear" | "showSearch" | "optionFilterProp" | "options" | "virtual" | "listHeight"> & {
+    Select: React.ForwardRefExoticComponent<import("ag-grid-community").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;
@@ -39,6 +39,7 @@ declare class InternalDataGrid<TData extends Record<string, any>> extends Compon
     private validator;
     private requestId;
     private isReady;
+    private mounted;
     private readyQueue;
     private emptyRowData;
     private sideBarDef;

package/es/data-grid/index.js

@@ -1,7 +1,7 @@
 var _excluded = ["validator"],
   _excluded2 = ["title", "dataIndex", "render", "ellipsis", "sorter", "editable", "className"],
   _excluded3 = ["title", "children"],
-  _excluded4 = ["rowKey", "fetch", "dataSource", "rowActions", "columns", "autoLoad", "loading", "summary", "detailCell", "pagination", "rowSelection", "columnTypes", "defaultColDef", "components", "sideBar", "detailCellRendererParams", "context", "showSearch", "cellDisplayFlex", "locale"];
+  _excluded4 = ["rowKey", "fetch", "dataSource", "rowActions", "columns", "autoLoad", "loading", "summary", "detailCell", "pagination", "rowSelection", "columnTypes", "defaultColDef", "components", "sideBar", "detailCellRendererParams", "context", "showSearch", "cellDisplayFlex", "locale", "extraFooterLeft"];
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
@@ -35,7 +35,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 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 { Spin, Pagination } from 'antd';
-import React, { Component, createRef, forwardRef } from 'react';
+import React, { Component, createRef, forwardRef, Fragment } from 'react';
 import { useComponentDefaultProps } from "../component-configure";
 import { useLocaleReceiver } from "../locale-receiver";
 import { parseLocalTemplate } from "../locale/locale";
@@ -163,6 +163,7 @@ var InternalDataGrid = /*#__PURE__*/function (_Component) {
     _defineProperty(_assertThisInitialized(_this), "validator", null);
     _defineProperty(_assertThisInitialized(_this), "requestId", 0);
     _defineProperty(_assertThisInitialized(_this), "isReady", false);
+    _defineProperty(_assertThisInitialized(_this), "mounted", false);
     _defineProperty(_assertThisInitialized(_this), "readyQueue", []);
     _defineProperty(_assertThisInitialized(_this), "emptyRowData", []);
     _defineProperty(_assertThisInitialized(_this), "sideBarDef", {
@@ -248,6 +249,12 @@ var InternalDataGrid = /*#__PURE__*/function (_Component) {
               return _this.customColumnData;
             case 7:
               customColumnData = _context.sent;
+              if (_this.mounted) {
+                _context.next = 10;
+                break;
+              }
+              return _context.abrupt("return");
+            case 10:
               if (customColumnData) {
                 try {
                   data = customColumnData;
@@ -311,7 +318,7 @@ var InternalDataGrid = /*#__PURE__*/function (_Component) {
                 }
               });
               _this.clearReadyQueue();
-            case 18:
+            case 20:
             case "end":
               return _context.stop();
           }
@@ -536,11 +543,15 @@ var InternalDataGrid = /*#__PURE__*/function (_Component) {
       if (!suppressRowClickSelection && evt.node.selectable && evt.eventPath) {
         var enableSelectionWithoutKeys = rowMultiSelectWithClick !== null && rowMultiSelectWithClick !== void 0 ? rowMultiSelectWithClick : rowSelection !== undefined && rowSelection.type !== 'radio';
         for (var i = 0; i < evt.eventPath.length; i++) {
+          if (evt.eventPath[i] === document.documentElement) {
+            break;
+          }
           var elm = evt.eventPath[i];
-          if (elm.nodeName === 'A' || elm.nodeName === 'BUTTON' || elm.nodeName === 'INPUT' || elm.role === 'button' || elm.role === 'input') {
+          var role = elm.role || elm.getAttribute('role');
+          if (elm.nodeName === 'A' || elm.nodeName === 'BUTTON' || elm.nodeName === 'INPUT' || role === 'button' || role === 'input') {
             break;
           }
-          if (elm.role === 'gridcell') {
+          if (role === 'gridcell') {
             if (elm.classList.contains(prefix('editor-cell'))) {
               break;
             }
@@ -716,6 +727,7 @@ var InternalDataGrid = /*#__PURE__*/function (_Component) {
   }, {
     key: "componentWillUnmount",
     value: function componentWillUnmount() {
+      this.mounted = false;
       this.isReady = false;
       window.removeEventListener('blur', this.handleFocus);
     }
@@ -726,15 +738,16 @@ var InternalDataGrid = /*#__PURE__*/function (_Component) {
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
+              this.mounted = true;
               window.addEventListener('blur', this.handleFocus);
               this.loadingChange(true, true);
 
               // 放在componentDidMount 执行时间比onGridReady早
-              _context3.next = 4;
+              _context3.next = 5;
               return this.customColumnData;
-            case 4:
-              this.loadingChange(false, true);
             case 5:
+              this.loadingChange(false, true);
+            case 6:
             case "end":
               return _context3.stop();
           }
@@ -1651,6 +1664,7 @@ var InternalDataGrid = /*#__PURE__*/function (_Component) {
         showSearch = _this$props10.showSearch,
         cellDisplayFlex = _this$props10.cellDisplayFlex,
         locale = _this$props10.locale,
+        extraFooterLeft = _this$props10.extraFooterLeft,
         restProps = _objectWithoutProperties(_this$props10, _excluded4);
       var _this$state3 = this.state,
         enablePagination = _this$state3.pagination,
@@ -1660,6 +1674,11 @@ var InternalDataGrid = /*#__PURE__*/function (_Component) {
         loading = _this$state3.loading;
       var mPage = _typeof(pagination) === 'object' ? pagination : {};
       var footer = [];
+      if (extraFooterLeft) {
+        footer.push( /*#__PURE__*/React.createElement(Fragment, {
+          key: "data-grid-extra-footer-left"
+        }, extraFooterLeft));
+      }
       var gridRowSelection;
       if (rowSelection !== undefined) {
         if (rowSelection.type === 'radio') {

package/es/data-grid/index.less

@@ -599,7 +599,7 @@
   }
 
   .ag-cell-label-container {
-    font-weight: 500;
+    font-weight: 700;
   }
 
   .ag-header-cell-menu-button {

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

@@ -236,4 +236,8 @@ export interface DataGridProps<TData> extends Omit<AgGridReactProps<TData>, 'row
      * @descriptioin 列定制启用汇总
      */
     enableCustomColumnSummary?: boolean;
+    /**
+     * @description 表格底部左侧额外的元素
+     */
+    extraFooterLeft?: ReactElement;
 }

package/es/section/index.less

@@ -34,7 +34,7 @@
 
   &-title {
     flex: 1;
-    font-weight: 500;
+    font-weight: 700;
     font-size: 14px;
     line-height: 22px;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lemon-fe/components",
-  "version": "1.4.0-alpha.1",
+  "version": "1.4.1",
   "description": "> TODO: description",
   "homepage": "",
   "license": "MIT",
@@ -21,7 +21,7 @@
   },
   "dependencies": {
     "@dnd-kit/core": ">=6.0.0",
-    "@lemon-fe/hooks": "^1.4.0-alpha.0",
+    "@lemon-fe/hooks": "^1.4.0",
     "@lemon-fe/utils": "^1.3.0",
     "ag-grid-community": "29.2.0",
     "ag-grid-enterprise": "29.2.0",
@@ -58,5 +58,5 @@
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
   },
-  "gitHead": "ee975709e5aefc046fa159cbc14235bad5557189"
+  "gitHead": "4a0de8d6cf3909a13c3f7f1b8ff1e9354697275a"
 }