zcloud_gbs
/
zcloud_gbs_promise-react
15
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

改BUG 修改安全承诺数字过长不自动折行问题

master
853931625@qq.com 2026-06-05 16:01:46 +08:00
parent fd8bc46b61
commit 059155bf69
8 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jjb.config.js
View File

@ -10,7 +10,7 @@ module.exports = {
javaGitBranch: "<branch-name>", javaGitBranch: "<branch-name>",
// 接口服务地址 // 接口服务地址
// API_HOST: "http://192.168.20.100:30140", // API_HOST: "http://192.168.20.100:30140",
API_HOST: "http://localhost:80", API_HOST: "https://gbs-gateway.qhdsafety.com",
}, },
production: { production: {
// 应用后端分支名称，部署上线需要 // 应用后端分支名称，部署上线需要
@ -46,7 +46,7 @@ module.exports = {
// 开发服务 // 开发服务
server: { server: {
// 监听端口号 // 监听端口号
port: "8085", port: "8065",
// 服务地址 // 服务地址
host: "127.0.0.1", host: "127.0.0.1",
// 是否自动打开浏览器 // 是否自动打开浏览器

6
package.json
View File

@ -6,8 +6,8 @@
"license": "MIT", "license": "MIT",
"main": "index.js", "main": "index.js",
"scripts": { "scripts": {
"serve": "node node_modules/@cqsjjb/scripts/webpack.dev.server.js", "serve": "node node_modules/@cqsjjb/scripts/rspack.dev.server.js",
"build": "node node_modules/@cqsjjb/scripts/webpack.build.js", "build": "node node_modules/@cqsjjb/scripts/rspack.build.js",
"push": "jjb-cmd push java production", "push": "jjb-cmd push java production",
"clean-cache": "rimraf node_modules/.cache/webpack", "clean-cache": "rimraf node_modules/.cache/webpack",
"serve:development": "cross-env NODE_ENV=development npm run serve", "serve:development": "cross-env NODE_ENV=development npm run serve",
@ -32,7 +32,7 @@
"react": "^18.2.0", "react": "^18.2.0",
"react-dom": "^18.2.0", "react-dom": "^18.2.0",
"react-to-print": "^3.2.0", "react-to-print": "^3.2.0",
"zy-react-library": "^1.2.35" "zy-react-library": "^1.3.15"
}, },
"devDependencies": { "devDependencies": {
"@antfu/eslint-config": "^5.4.1", "@antfu/eslint-config": "^5.4.1",

1
src/pages/Container/Enterprise/BusPromiseTemplate/List/index.js
View File

@ -13,6 +13,7 @@ function List(props) {
const [form] = Form.useForm(); const [form] = Form.useForm();
const { tableProps, getData } = useTable(props["busPromiseTemplateList"], { const { tableProps, getData } = useTable(props["busPromiseTemplateList"], {
form, form,
}); });
const updateState = (id, state) => { const updateState = (id, state) => {
const stateValue = state === 0 ? 1 : 0; const stateValue = state === 0 ? 1 : 0;

9
src/pages/Container/Enterprise/Management/Add/index.js
View File

@ -213,7 +213,7 @@ function Add(props) {
/> />
), ),
}, },
{ name: [field.name, "departmentName"], label: `部门${index + 1}名称`, onlyForLabel: true }, // { name: [field.name, "departmentName"], label: `部门${index + 1}名称`, onlyForLabel: true },
{ {
name: [field.name, "postId"], name: [field.name, "postId"],
span: 8, span: 8,
@ -235,8 +235,8 @@ function Add(props) {
}, },
}, },
}, },
{ name: [field.name, "postName"], label: `岗位${index + 1}名称`, onlyForLabel: true }, // { name: [field.name, "postName"], label: `岗位${index + 1}名称`, onlyForLabel: true },
{ name: [field.name, "userName"], label: `人员${index + 1}名称`, onlyForLabel: true }, // { name: [field.name, "userName"], label: `人员${index + 1}名称`, onlyForLabel: true },
{ {
name: [field.name, "userId"], name: [field.name, "userId"],
span: 8, span: 8,
@ -358,6 +358,9 @@ const ChoiceTemplateModalComponent = (props) => {
const [form] = Form.useForm(); const [form] = Form.useForm();
const { tableProps, getData } = useTable(props["busPromiseTemplateList"], { const { tableProps, getData } = useTable(props["busPromiseTemplateList"], {
form, form,
params:{
state:0,
},
}); });
return ( return (

1
src/pages/Container/Supervise/BusPromiseTemplate/List/index.js
View File

@ -15,6 +15,7 @@ function List(props) {
const [form] = Form.useForm(); const [form] = Form.useForm();
const { tableProps, getData } = useTable(props["busPromiseTemplateList"], { const { tableProps, getData } = useTable(props["busPromiseTemplateList"], {
form, form,
}); });
const onDelete = (id) => { const onDelete = (id) => {
Modal.confirm({ Modal.confirm({

11
src/pages/Container/Supervise/Management/Add/index.js
View File

@ -235,7 +235,7 @@ function Add(props) {
}, },
}, },
}, },
{ name: [field.name, "corpName"], label: `签订单位${index + 1}名称`, onlyForLabel: true }, // { name: [field.name, "corpName"], label: `签订单位${index + 1}名称`, onlyForLabel: true },
] ]
: []), : []),
{ {
@ -262,7 +262,7 @@ function Add(props) {
/> />
), ),
}, },
{ name: [field.name, "departmentName"], label: `部门${index + 1}名称`, onlyForLabel: true }, // { name: [field.name, "departmentName"], label: `部门${index + 1}名称`, onlyForLabel: true },
{ {
name: [field.name, "postId"], name: [field.name, "postId"],
label: `岗位${index + 1}`, label: `岗位${index + 1}`,
@ -284,8 +284,8 @@ function Add(props) {
}, },
}, },
}, },
{ name: [field.name, "postName"], label: `岗位${index + 1}名称`, onlyForLabel: true }, // { name: [field.name, "postName"], label: `岗位${index + 1}名称`, onlyForLabel: true },
{ name: [field.name, "userName"], label: `人员${index + 1}名称`, onlyForLabel: true }, // { name: [field.name, "userName"], label: `人员${index + 1}名称`, onlyForLabel: true },
{ {
name: [field.name, "userId"], name: [field.name, "userId"],
label: `人员${index + 1}`, label: `人员${index + 1}`,
@ -413,6 +413,9 @@ const ChoiceTemplateModalComponent = (props) => {
const [form] = Form.useForm(); const [form] = Form.useForm();
const { tableProps, getData } = useTable(props["busPromiseTemplateList"], { const { tableProps, getData } = useTable(props["busPromiseTemplateList"], {
form, form,
params:{
state:0,
},
useStorageQueryCriteria: false, useStorageQueryCriteria: false,
}); });

2
src/pages/Container/Supervise/components/DetailModal/index.js
View File

@ -59,7 +59,7 @@ const DetailModal = (props) => {
{`${(form.promisePeople && form.promisePeoplePost) ? `${form.promisePeople + form.promisePeoplePost}:` : ""}` || ""} {`${(form.promisePeople && form.promisePeoplePost) ? `${form.promisePeople + form.promisePeoplePost}:` : ""}` || ""}
</div> </div>
)} )}
<div dangerouslySetInnerHTML={{ __html: form.promiseText }} /> <div className="promise-rich-text" dangerouslySetInnerHTML={{ __html: form.promiseText }} />
<div className="text"> <div className="text">
{ {

5
src/pages/Container/Supervise/components/DetailModal/index.less
View File

@ -32,6 +32,11 @@
text-align: justify; text-align: justify;
} }
.promise-rich-text {
overflow-wrap: anywhere;
word-break: break-all;
}
.footer { .footer {
margin-top: 30px; margin-top: 30px;
display: flex; display: flex;