diff --git a/jjb.config.js b/jjb.config.js index 9743d71..8206c43 100644 --- a/jjb.config.js +++ b/jjb.config.js @@ -46,7 +46,7 @@ module.exports = { // 开发服务 server: { // 监听端口号 - port: "8086", + port: "8036", // 服务地址 host: "127.0.0.1", // 是否自动打开浏览器 diff --git a/package.json b/package.json index 0ac65de..fae475f 100644 --- a/package.json +++ b/package.json @@ -6,8 +6,8 @@ "license": "MIT", "main": "index.js", "scripts": { - "serve": "node node_modules/@cqsjjb/scripts/webpack.dev.server.js", - "build": "node node_modules/@cqsjjb/scripts/webpack.build.js", + "serve": "node node_modules/@cqsjjb/scripts/rspack.dev.server.js", + "build": "node node_modules/@cqsjjb/scripts/rspack.build.js", "push": "jjb-cmd push java production", "clean-cache": "rimraf node_modules/.cache/webpack", "serve:development": "cross-env NODE_ENV=development npm run serve", diff --git a/src/pages/Container/Notice/Add/index.js b/src/pages/Container/Notice/Add/index.js index 396f511..49adae7 100644 --- a/src/pages/Container/Notice/Add/index.js +++ b/src/pages/Container/Notice/Add/index.js @@ -8,6 +8,22 @@ import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender"; import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery"; import { NS_CORPINFO, NS_NOTICE } from "~/enumerate/namespace"; +const NOTICE_CONTENT_MAX_LENGTH = 2000; + +const getEditorTextLength = (html = "") => { + if (!html) { + return 0; + } + + if (typeof window === "undefined") { + return html.replace(/<[^>]+>/g, "").length; + } + + const container = document.createElement("div"); + container.innerHTML = html; + return (container.innerText || container.textContent || "").length; +}; + function Add(props) { const queryParams = useGetUrlQuery(); const [form] = Form.useForm(); @@ -188,7 +204,24 @@ function Add(props) { required: true, customizeRender: true, render: ( - + { + if (getEditorTextLength(value) > NOTICE_CONTENT_MAX_LENGTH) { + return Promise.reject(new Error(`公告内容不能超过${NOTICE_CONTENT_MAX_LENGTH}字`)); + } + + return Promise.resolve(); + }, + }, + ]} + > { diff --git a/src/pages/Container/NoticeReadRecord/View/index.js b/src/pages/Container/NoticeReadRecord/View/index.js index bfabf0f..e6e3e25 100644 --- a/src/pages/Container/NoticeReadRecord/View/index.js +++ b/src/pages/Container/NoticeReadRecord/View/index.js @@ -72,13 +72,16 @@ function NoticeReadRecordView(props) { ) } > -
- + <div style={{ maxWidth: 1200, margin: "0 auto", padding: "20px", overflowWrap: "anywhere" }}> + <Title + level={2} + style={{ textAlign: "center", marginBottom: "24px", wordBreak: "break-all" }} + > {noticeReadRecordInfo.title}
- + 发布时间: {noticeReadRecordInfo.publishTime} @@ -89,9 +92,14 @@ function NoticeReadRecordView(props) { minHeight: "200px", padding: "20px", marginBottom: "24px", + overflowWrap: "anywhere", + wordBreak: "break-all", }} > -
+
@@ -128,4 +136,4 @@ function NoticeReadRecordView(props) { ); } -export default Connect([NS_NoticeReadRecord], true)(NoticeReadRecordView); \ No newline at end of file +export default Connect([NS_NoticeReadRecord], true)(NoticeReadRecordView);