Commit 86ed29b806a6f4708354d3279e46193f4f518292
1 parent
e602b032
1.五彩:工艺作业指导书,参数显示问题
Showing
1 changed file
with
6 additions
and
1 deletions
src/components/Common/CommonViewDragable/index.js
| @@ -369,6 +369,9 @@ const handleGetShowTypeProps = params => { | @@ -369,6 +369,9 @@ const handleGetShowTypeProps = params => { | ||
| 369 | ? "slave0" | 369 | ? "slave0" |
| 370 | : "process"; | 370 | : "process"; |
| 371 | 371 | ||
| 372 | + const regHan = /[\u4e00-\u9fa5]/; /* 检测是否汉字 */ | ||
| 373 | + | ||
| 374 | + | ||
| 372 | return { | 375 | return { |
| 373 | ...props, | 376 | ...props, |
| 374 | className: h > 1 ? "multiLine" : "", | 377 | className: h > 1 ? "multiLine" : "", |
| @@ -417,7 +420,9 @@ const handleGetShowTypeProps = params => { | @@ -417,7 +420,9 @@ const handleGetShowTypeProps = params => { | ||
| 417 | getFloatNum: props.getFloatNum, | 420 | getFloatNum: props.getFloatNum, |
| 418 | showConfig: { | 421 | showConfig: { |
| 419 | ...showConfig, | 422 | ...showConfig, |
| 420 | - sName: showConfig.sNameParam ? showConfig.sNameParam : showConfig.sName | 423 | + sName: showConfig.sNameParam && regHan.test(showConfig.sNameParam) |
| 424 | + ? showConfig.sName | ||
| 425 | + : showConfig.sNameParam ?? showConfig.sName | ||
| 421 | }, | 426 | }, |
| 422 | textArea: h > 2, | 427 | textArea: h > 2, |
| 423 | formRoute: props.formRoute, | 428 | formRoute: props.formRoute, |