From f7d861878e9aaf642427ebc24d7b2c03cf7a5682 Mon Sep 17 00:00:00 2001 From: wkj <278599135@qq.com> Date: Thu, 22 Dec 2022 13:35:57 +0800 Subject: [PATCH 1/2] =?UTF-8?q?my/message=20=E5=A2=9E=E5=8A=A0=20=E8=87=AA?= =?UTF-8?q?=E5=AE=9A=E4=B9=89=E4=BA=8B=E4=BB=B6=E5=8F=8Astyle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/components/my/message/web.d.ts | 4 ++++ lib/components/my/message/web.js | 13 ++++++---- lib/components/my/message/web.pc.d.ts | 6 +++++ lib/components/my/message/web.pc.js | 9 +++++-- lib/pages/message/list/mobile.module.less | 2 +- src/components/my/message/web.pc.tsx | 25 +++++++++++++++---- src/components/my/message/web.tsx | 29 ++++++++++++++--------- src/pages/message/list/mobile.module.less | 2 +- 8 files changed, 67 insertions(+), 23 deletions(-) diff --git a/lib/components/my/message/web.d.ts b/lib/components/my/message/web.d.ts index 6be12245f..82f518e1c 100644 --- a/lib/components/my/message/web.d.ts +++ b/lib/components/my/message/web.d.ts @@ -1,7 +1,11 @@ +import React from 'react'; import { WebComponentProps } from 'oak-frontend-base'; import { EntityDict } from '../../../general-app-domain'; export default function Render(props: WebComponentProps) => void; + className?: string; + style?: React.CSSProperties; }, { goMessageList: () => void; }>): JSX.Element; diff --git a/lib/components/my/message/web.js b/lib/components/my/message/web.js index 13733ff45..1dc517746 100644 --- a/lib/components/my/message/web.js +++ b/lib/components/my/message/web.js @@ -3,14 +3,19 @@ Object.defineProperty(exports, "__esModule", { value: true }); var tslib_1 = require("tslib"); var jsx_runtime_1 = require("react/jsx-runtime"); var antd_mobile_1 = require("antd-mobile"); +var classnames_1 = tslib_1.__importDefault(require("classnames")); var icons_1 = require("@ant-design/icons"); var mobile_module_less_1 = tslib_1.__importDefault(require("./mobile.module.less")); function Render(props) { var data = props.data, methods = props.methods; - var count = data.count; + var count = data.count, className = data.className, onClick = data.onClick, style = data.style; var goMessageList = methods.goMessageList; - return ((0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: (0, jsx_runtime_1.jsx)(antd_mobile_1.Badge, tslib_1.__assign({ content: count || '' }, { children: (0, jsx_runtime_1.jsx)(icons_1.BellOutlined, { className: mobile_module_less_1.default.icon, onClick: function () { - goMessageList(); - } }) })) })); + return ((0, jsx_runtime_1.jsx)(antd_mobile_1.Badge, tslib_1.__assign({ content: count || '' }, { children: (0, jsx_runtime_1.jsx)(icons_1.BellOutlined, { className: (0, classnames_1.default)(mobile_module_less_1.default.icon, className), style: style, onClick: function (e) { + if (typeof onClick === 'function') { + onClick(e); + return; + } + goMessageList(); + } }) }))); } exports.default = Render; diff --git a/lib/components/my/message/web.pc.d.ts b/lib/components/my/message/web.pc.d.ts index 6be12245f..fe4bf0750 100644 --- a/lib/components/my/message/web.pc.d.ts +++ b/lib/components/my/message/web.pc.d.ts @@ -1,7 +1,13 @@ +import React from 'react'; import { WebComponentProps } from 'oak-frontend-base'; import { EntityDict } from '../../../general-app-domain'; export default function Render(props: WebComponentProps) => void; + className?: string; + style?: React.CSSProperties; + buttonStyle?: React.CSSProperties; + buttonClassName?: string; }, { goMessageList: () => void; }>): JSX.Element; diff --git a/lib/components/my/message/web.pc.js b/lib/components/my/message/web.pc.js index 14f86f4e8..ea9a66ec9 100644 --- a/lib/components/my/message/web.pc.js +++ b/lib/components/my/message/web.pc.js @@ -4,14 +4,19 @@ var tslib_1 = require("tslib"); var jsx_runtime_1 = require("react/jsx-runtime"); var react_1 = require("react"); var antd_1 = require("antd"); +var classnames_1 = tslib_1.__importDefault(require("classnames")); var icons_1 = require("@ant-design/icons"); var drawerList_1 = tslib_1.__importDefault(require("../../../pages/message/drawerList")); var web_module_less_1 = tslib_1.__importDefault(require("./web.module.less")); function Render(props) { var data = props.data; - var count = data.count; + var count = data.count, className = data.className, onClick = data.onClick, style = data.style, buttonStyle = data.buttonStyle, buttonClassName = data.buttonClassName; var _a = tslib_1.__read((0, react_1.useState)(false), 2), open = _a[0], setOpen = _a[1]; - return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(antd_1.Badge, tslib_1.__assign({ count: count }, { children: (0, jsx_runtime_1.jsx)(antd_1.Button, { className: web_module_less_1.default.btn, type: "text", shape: "circle", icon: (0, jsx_runtime_1.jsx)(icons_1.BellOutlined, {}), onClick: function () { + return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(antd_1.Badge, tslib_1.__assign({ count: count }, { children: (0, jsx_runtime_1.jsx)(antd_1.Button, { className: (0, classnames_1.default)(web_module_less_1.default.btn, buttonClassName), style: buttonStyle, type: "text", shape: "circle", icon: (0, jsx_runtime_1.jsx)(icons_1.BellOutlined, { className: (0, classnames_1.default)(web_module_less_1.default.icon, className), style: style }), onClick: function (e) { + if (typeof onClick === 'function') { + onClick(e); + return; + } setOpen(true); } }) })), (0, jsx_runtime_1.jsx)(drawerList_1.default, { open: open, onClose: function () { setOpen(false); diff --git a/lib/pages/message/list/mobile.module.less b/lib/pages/message/list/mobile.module.less index ea50e8b2c..8c654001b 100644 --- a/lib/pages/message/list/mobile.module.less +++ b/lib/pages/message/list/mobile.module.less @@ -1,6 +1,6 @@ -/** index.wxss **/ .container { display: flex; flex-direction: column; + flex: 1; background-color: var(--oak-bg-color-page); } \ No newline at end of file diff --git a/src/components/my/message/web.pc.tsx b/src/components/my/message/web.pc.tsx index ed857947a..94cef29c0 100644 --- a/src/components/my/message/web.pc.tsx +++ b/src/components/my/message/web.pc.tsx @@ -1,5 +1,6 @@ import React, { useState } from 'react'; import { Button, Badge } from 'antd'; +import classNames from 'classnames'; import { BellOutlined } from '@ant-design/icons'; import { WebComponentProps } from 'oak-frontend-base'; import { EntityDict } from '../../../general-app-domain'; @@ -14,6 +15,11 @@ export default function Render( false, { count?: number; + onClick: (e: React.MouseEvent) => void; + className?: string; + style?: React.CSSProperties; + buttonStyle?: React.CSSProperties; + buttonClassName?: string; }, { goMessageList: () => void; @@ -21,18 +27,29 @@ export default function Render( > ) { const { data } = props; - const { count } = data; + const { count, className, onClick, style, buttonStyle, buttonClassName } = + data; const [open, setOpen] = useState(false); return ( <>