@lemon-fe/components 1.4.14 → 1.4.15-alpha.1

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

@@ -14,10 +14,10 @@ declare const SummaryFlag: unique symbol;
 declare const IndexColId = "$$index";
 declare const EmptyCol: ColType<any>;
 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"> & {
+    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" | "allowClear" | "mode" | "showSearch" | "virtual" | "optionFilterProp" | "options" | "listHeight"> & {
         fieldNames?: {
             label: string;
             value: string;

package/es/data-grid/index.js

@@ -36,6 +36,7 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { Spin, Pagination } from 'antd';
 import React, { Component, createRef, forwardRef, Fragment } from 'react';
+import { RequestErrorMessage } from '..';
 import { useComponentDefaultProps } from "../component-configure";
 import { useLocaleReceiver } from "../locale-receiver";
 import { parseLocalTemplate } from "../locale/locale";
@@ -111,10 +112,13 @@ function EmptyOverlay(props) {
     return state.fetchError;
   });
   var _props$desc = props.desc,
-    desc = _props$desc === void 0 ? noDataText : _props$desc;
+    desc = _props$desc === void 0 ? noDataText : _props$desc,
+    renderFetchError = props.renderFetchError;
   return /*#__PURE__*/React.createElement("div", {
     className: prefix('empty-overlay')
-  }, err ? err.message : desc, "~");
+  }, err ? renderFetchError ? renderFetchError(err) : /*#__PURE__*/React.createElement(RequestErrorMessage, {
+    error: err
+  }) : desc);
 }
 var defaultProps = {
   stopEditingWhenCellsLoseFocus: true,
@@ -330,7 +334,8 @@ var InternalDataGrid = /*#__PURE__*/function (_Component) {
     }());
     _defineProperty(_assertThisInitialized(_this), "NoRowsOverlay", function () {
       return /*#__PURE__*/React.createElement(EmptyOverlay, {
-        desc: _this.props.emptyText
+        desc: _this.props.emptyText,
+        renderFetchError: _this.props.renderFetchError
       });
     });
     _defineProperty(_assertThisInitialized(_this), "getMainMenuItems", function (params) {

package/es/data-grid/index.less

@@ -18,6 +18,7 @@
   &-empty-overlay {
     color: fade(#333333, 50);
     font-size: 14px;
+    pointer-events: all;
   }
 
   &-cell-flex {

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

@@ -240,4 +240,8 @@ export interface DataGridProps<TData> extends Omit<AgGridReactProps<TData>, 'row
      * @description 表格底部左侧额外的元素
      */
     extraFooterLeft?: ReactElement;
+    /**
+     * @description 自定义数据获取异常时渲染
+     */
+    renderFetchError?: (error: Error) => ReactNode;
 }

package/es/index.d.ts

@@ -37,6 +37,7 @@ export { default as State } from './state';
 export { default as GreyPanel } from './grey-panel';
 export { default as InputCompact } from './input-compact';
 export { default as SelectPanel } from './select-panel';
+export { default as RequestErrorMessage } from './request-error-message';
 export * from './component-configure';
 export type { Locale } from './locale/locale';
 export { useLocaleReceiver } from './locale-receiver';

package/es/index.js

@@ -31,6 +31,7 @@ export { default as State } from "./state";
 export { default as GreyPanel } from "./grey-panel";
 export { default as InputCompact } from "./input-compact";
 export { default as SelectPanel } from "./select-panel";
+export { default as RequestErrorMessage } from "./request-error-message";
 export * from "./component-configure";
 export { useLocaleReceiver } from "./locale-receiver";
 export { parseLocalTemplate } from "./locale/locale";

package/es/locale/en_US.js

@@ -10,6 +10,7 @@ import { default as ColorPickerLocale } from "../color-picker/locale/en_US";
 import { default as DataGridLocale } from "../data-grid/locale/en_US";
 import { default as DurationPickerLocale } from "../duration-picker/locale/en_US";
 import { default as Filter } from "../filter/locale/en_US";
+import { default as RequestErrorMessageLocale } from "../request-error-message/locale/en_US";
 import { default as SelectPanelLocale } from "../select-panel/locale/en_US";
 import { default as SelectViewLocale } from "../select-view/locale/en_US";
 import { default as SiderTreeLocale } from "../sider-tree/locale/en_US";
@@ -24,6 +25,7 @@ var enUS = _objectSpread(_objectSpread({}, antEnUS), {}, {
   SiderTree: SiderTreeLocale,
   SelectView: SelectViewLocale,
   SelectPanel: SelectPanelLocale,
-  DurationPicker: DurationPickerLocale
+  DurationPicker: DurationPickerLocale,
+  RequestErrorMessage: RequestErrorMessageLocale
 });
 export default enUS;

package/es/locale/locale.d.ts

@@ -4,6 +4,7 @@ import type { ColorPickerLocale } from '../color-picker/locale/locale';
 import type { DataGridLocale } from '../data-grid/locale/locale';
 import type { DurationPickerLocale } from '../duration-picker/locale/locale';
 import type { FilterLocale } from '../filter/locale/locale';
+import type { RequestErrorMessageLocale } from '../request-error-message/locale/locale';
 import type { SelectPanelLocale } from '../select-panel/locale/locale';
 import type { SelectViewLocale } from '../select-view/locale/locale';
 import type { SiderTreeLocale } from '../sider-tree/locale/locale';
@@ -16,5 +17,6 @@ export interface Locale extends AntLocale {
     SelectView: SelectViewLocale;
     SelectPanel: SelectPanelLocale;
     DurationPicker: DurationPickerLocale;
+    RequestErrorMessage: RequestErrorMessageLocale;
 }
 export declare function parseLocalTemplate(template: string, context: Record<string | number, any>): string;

package/es/locale/vi.js

@@ -10,6 +10,7 @@ import { default as ColorPickerLocale } from "../color-picker/locale/vi";
 import { default as DataGridLocale } from "../data-grid/locale/vi";
 import { default as DurationPickerLocale } from "../duration-picker/locale/vi";
 import { default as Filter } from "../filter/locale/vi";
+import { default as RequestErrorMessageLocale } from "../request-error-message/locale/vi";
 import { default as SelectPanelLocale } from "../select-panel/locale/vi";
 import { default as SelectViewLocale } from "../select-view/locale/vi";
 import { default as SiderTreeLocale } from "../sider-tree/locale/vi";
@@ -24,6 +25,7 @@ var vi = _objectSpread(_objectSpread({}, antVi), {}, {
   SiderTree: SiderTreeLocale,
   SelectView: SelectViewLocale,
   SelectPanel: SelectPanelLocale,
-  DurationPicker: DurationPickerLocale
+  DurationPicker: DurationPickerLocale,
+  RequestErrorMessage: RequestErrorMessageLocale
 });
 export default vi;

package/es/locale/zh_CN.js

@@ -10,6 +10,7 @@ import { default as ColorPickerLocale } from "../color-picker/locale/zh_CN";
 import { default as DataGridLocale } from "../data-grid/locale/zh_CN";
 import { default as DurationPickerLocale } from "../duration-picker/locale/zh_CN";
 import { default as Filter } from "../filter/locale/zh_CN";
+import { default as RequestErrorMessageLocale } from "../request-error-message/locale/zh_CN";
 import { default as SelectPanelLocale } from "../select-panel/locale/zh_CN";
 import { default as SelectViewLocale } from "../select-view/locale/zh_CN";
 import { default as SiderTreeLocale } from "../sider-tree/locale/zh_CN";
@@ -24,6 +25,7 @@ var zhCN = _objectSpread(_objectSpread({}, antZhCN), {}, {
   DurationPicker: DurationPickerLocale,
   SiderTree: SiderTreeLocale,
   SelectView: SelectViewLocale,
-  SelectPanel: SelectPanelLocale
+  SelectPanel: SelectPanelLocale,
+  RequestErrorMessage: RequestErrorMessageLocale
 });
 export default zhCN;

package/es/locale/zh_Hant_HK.js

@@ -10,6 +10,7 @@ import { default as ColorPickerLocale } from "../color-picker/locale/zh_Hant_HK"
 import { default as DataGridLocale } from "../data-grid/locale/zh_Hant_HK";
 import { default as DurationPickerLocale } from "../duration-picker/locale/zh_Hant_HK";
 import { default as Filter } from "../filter/locale/zh_Hant_HK";
+import { default as RequestErrorMessageLocale } from "../request-error-message/locale/zh_CN";
 import { default as SelectPanelLocale } from "../select-panel/locale/zh_Hant_HK";
 import { default as SelectViewLocale } from "../select-view/locale/zh_Hant_HK";
 import { default as SiderTreeLocale } from "../sider-tree/locale/zh_Hant_HK";
@@ -24,6 +25,7 @@ var zhHantHk = _objectSpread(_objectSpread({}, antZhHk), {}, {
   SiderTree: SiderTreeLocale,
   SelectView: SelectViewLocale,
   SelectPanel: SelectPanelLocale,
-  DurationPicker: DurationPickerLocale
+  DurationPicker: DurationPickerLocale,
+  RequestErrorMessage: RequestErrorMessageLocale
 });
 export default zhHantHk;

package/es/popup/index.js

@@ -62,6 +62,7 @@ function Popup(props) {
     open = _useState4[0],
     setOpen = _useState4[1];
   var inputRef = useRef(null);
+  var wrapperRef = useRef(null);
   var closeAction = useRef();
   var shouldModalOpen = openProp !== null && openProp !== void 0 ? openProp : open;
   useEffect(function () {
@@ -75,11 +76,14 @@ function Popup(props) {
   var _useContext = useContext(ConfigProvider.ConfigContext),
     getPrefixCls = _useContext.getPrefixCls;
   var handleCancel = function handleCancel() {
-    var _inputRef$current;
     setOpen(false);
     onOpenChange === null || onOpenChange === void 0 || onOpenChange(false);
     onCancel === null || onCancel === void 0 || onCancel();
-    (_inputRef$current = inputRef.current) === null || _inputRef$current === void 0 || _inputRef$current.focus();
+    if (inputRef.current !== null) {
+      inputRef.current.focus();
+    } else if (wrapperRef.current !== null) {
+      wrapperRef.current.focus();
+    }
   };
   var handleOpen = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
@@ -257,7 +261,9 @@ function Popup(props) {
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     className: prefix('wrapper'),
     onClick: handleOpen,
-    role: "button"
+    role: "button",
+    ref: wrapperRef,
+    tabIndex: -1
   }, trigger), modalElm);
 }
 export default Popup;

package/es/request-error-message/index.d.ts

@@ -0,0 +1,4 @@
+/// <reference types="react" />
+export default function ErrorMessage(props: {
+    error: Error;
+}): JSX.Element;

package/es/request-error-message/index.js

@@ -0,0 +1,45 @@
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+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 { ConfigProvider, Typography } from 'antd';
+import React, { useContext } from 'react';
+import { useLocaleReceiver } from "../locale-receiver";
+import { CheckOutlined, CopyOutlined } from '@ant-design/icons';
+import { isRequestError } from '@lemon-fe/utils';
+export default function ErrorMessage(props) {
+  var err = props.error;
+  var _useLocaleReceiver = useLocaleReceiver('RequestErrorMessage'),
+    _useLocaleReceiver2 = _slicedToArray(_useLocaleReceiver, 1),
+    locale = _useLocaleReceiver2[0];
+  var _useContext = useContext(ConfigProvider.ConfigContext),
+    getPrefixCls = _useContext.getPrefixCls;
+  var prefixCls = getPrefixCls();
+  if (isRequestError(err)) {
+    var traceID = err.request.otlpTraceID;
+    var errorCode = /*#__PURE__*/React.createElement(Typography.Text, {
+      style: {
+        color: 'rgba(51, 51, 51, 0.7)'
+      },
+      copyable: {
+        text: traceID,
+        // 解决message内的 anticon颜色不对的问题
+        icon: [/*#__PURE__*/React.createElement(CopyOutlined, {
+          style: {
+            color: "var(--".concat(prefixCls, "-primary-color)")
+          },
+          key: "copy-icon"
+        }), /*#__PURE__*/React.createElement(CheckOutlined, {
+          style: {
+            color: "var(--".concat(prefixCls, "-success-color)")
+          },
+          key: "copied-icon"
+        })]
+      }
+    }, "".concat(locale.errorCode, ": ").concat(traceID || ''));
+    return /*#__PURE__*/React.createElement(React.Fragment, null, traceID ? /*#__PURE__*/React.createElement("span", null, err.message, /*#__PURE__*/React.createElement("br", null), errorCode) : err.message);
+  }
+  return /*#__PURE__*/React.createElement(React.Fragment, null, err.message);
+}

package/es/request-error-message/locale/en_US.d.ts

@@ -0,0 +1,3 @@
+import type { RequestErrorMessageLocale } from './locale';
+declare const locale: RequestErrorMessageLocale;
+export default locale;

package/es/request-error-message/locale/en_US.js

@@ -0,0 +1,4 @@
+var locale = {
+  errorCode: 'Error Code'
+};
+export default locale;

package/es/request-error-message/locale/locale.d.ts

@@ -0,0 +1,3 @@
+export interface RequestErrorMessageLocale {
+    errorCode: string;
+}

package/es/request-error-message/locale/locale.js

@@ -0,0 +1 @@
+export {};

package/es/request-error-message/locale/vi.d.ts

@@ -0,0 +1,3 @@
+import type { RequestErrorMessageLocale } from './locale';
+declare const locale: RequestErrorMessageLocale;
+export default locale;

package/es/request-error-message/locale/vi.js

@@ -0,0 +1,4 @@
+var locale = {
+  errorCode: 'Mã lỗi'
+};
+export default locale;

package/es/request-error-message/locale/zh_CN.d.ts

@@ -0,0 +1,3 @@
+import type { RequestErrorMessageLocale } from './locale';
+declare const locale: RequestErrorMessageLocale;
+export default locale;

package/es/request-error-message/locale/zh_CN.js

@@ -0,0 +1,4 @@
+var locale = {
+  errorCode: '错误码'
+};
+export default locale;

package/es/request-error-message/locale/zh_Hant_HK.d.ts

@@ -0,0 +1,3 @@
+import type { RequestErrorMessageLocale } from './locale';
+declare const locale: RequestErrorMessageLocale;
+export default locale;

package/es/request-error-message/locale/zh_Hant_HK.js

@@ -0,0 +1,4 @@
+var locale = {
+  errorCode: '錯誤碼'
+};
+export default locale;

package/es/select-view/index.js

@@ -27,7 +27,7 @@ import { parseLocalTemplate } from "../locale/locale";
 import { mergeProp, prefixClassName } from "../utils";
 import classNames from 'classnames';
 import { get } from 'lodash';
-function SelectView(originalProps, _ref4) {
+function SelectView(originalProps, ref) {
   var emptyValue = useMemo(function () {
     return [];
   }, []);
@@ -204,6 +204,14 @@ function SelectView(originalProps, _ref4) {
     _useLocaleReceiver2 = _slicedToArray(_useLocaleReceiver, 1),
     SelectViewLocale = _useLocaleReceiver2[0];
   var content;
+  var initRef = function initRef(val) {
+    list.ref.current = val;
+    if (typeof ref === 'function') {
+      ref(val);
+    } else if (ref) {
+      ref.current = val;
+    }
+  };
   var renderList = function renderList() {
     return /*#__PURE__*/React.createElement("div", {
       className: prefix('layout')
@@ -233,11 +241,8 @@ function SelectView(originalProps, _ref4) {
       className: prefix('body')
     }, /*#__PURE__*/React.createElement(DataGrid, _extends({
       ref: function ref(val) {
-        list.ref.current = val;
-        if (typeof _ref4 === 'function') {
-          _ref4(val);
-        } else if (_ref4) {
-          _ref4.current = val;
+        if (!readOnly) {
+          initRef(val);
         }
       },
       rowKey: rowKey,
@@ -276,6 +281,11 @@ function SelectView(originalProps, _ref4) {
     }, /*#__PURE__*/React.createElement("div", {
       className: prefix('body')
     }, /*#__PURE__*/React.createElement(DataGrid, _extends({
+      ref: function ref(val) {
+        if (readOnly) {
+          initRef(val);
+        }
+      },
       dataSource: data,
       defaultColDef: defaultColDef,
       rowHeight: rowHeight,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lemon-fe/components",
-  "version": "1.4.14",
+  "version": "1.4.15-alpha.1",
   "description": "> TODO: description",
   "homepage": "",
   "license": "MIT",
@@ -21,8 +21,8 @@
   },
   "dependencies": {
     "@dnd-kit/core": ">=6.0.0",
-    "@lemon-fe/hooks": "^1.4.0",
-    "@lemon-fe/utils": "^1.3.0",
+    "@lemon-fe/hooks": "^1.4.14-alpha.1",
+    "@lemon-fe/utils": "^1.4.14-alpha.2",
     "ag-grid-community": "29.2.0",
     "ag-grid-enterprise": "29.2.0",
     "ag-grid-react": "29.2.0",
@@ -58,5 +58,5 @@
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
   },
-  "gitHead": "b2acd15b9728c17e93306c9f6c6ade2933b51dc7"
+  "gitHead": "94849c9a1bdeecf509dd8e072bebf6c9d7b56ca7"
 }