Commit bbf9f4169a0ab822afcc0afef1149ee1ea18fadc
Merge branch 'main' of http://git.xlyprint.cn/zhangz/xlyUmi into main
Showing
4 changed files
with
16 additions
and
4 deletions
src/components/Common/CommonCheckBill/index.js
| ... | ... | @@ -1985,6 +1985,12 @@ const BillComponent = Form.create({ |
| 1985 | 1985 | // 匹配数字 |
| 1986 | 1986 | // eslint-disable-next-line no-unused-vars |
| 1987 | 1987 | const num = item.replace(/[^\d]/g, ' '); |
| 1988 | + let tabName = item.replace(/\d+/g,''); | |
| 1989 | + /* 从主表配置 找到控件名=tabName,否则取他的showName */ | |
| 1990 | + const tableConfigArr = masterConfig?.gdsconfigformslave.filter(row => row.sControlName === item.trim()); | |
| 1991 | + if(commonUtils.isNotEmptyArr(tableConfigArr)) { | |
| 1992 | + tabName=tableConfigArr[0].showName; | |
| 1993 | + } | |
| 1988 | 1994 | return ( |
| 1989 | 1995 | <div className="flexArea"> |
| 1990 | 1996 | <Divider orientation="left">{item}</Divider> |
| ... | ... | @@ -1992,7 +1998,7 @@ const BillComponent = Form.create({ |
| 1992 | 1998 | {...props} |
| 1993 | 1999 | // 使高度和从表高度一直 |
| 1994 | 2000 | isAutoHeight="ture" |
| 1995 | - tableConfigType={item} | |
| 2001 | + tableConfigType={tabName} | |
| 1996 | 2002 | tableConfigTypeArr={diliverConfigTypeArr} |
| 1997 | 2003 | /> |
| 1998 | 2004 | </div> | ... | ... |
src/components/CommonElementEvent/ElemachineInfo.js
| ... | ... | @@ -171,8 +171,14 @@ const EleMachineInfoComponent = Form.create({ |
| 171 | 171 | tableConfigTypeArr.map((item) => { |
| 172 | 172 | // 匹配数字 |
| 173 | 173 | const num = item.replace(/[^\d]/g, ' '); |
| 174 | + let tabName = item.replace(/\d+/g,''); | |
| 175 | + /* 从主表配置 找到控件名=tabName,否则取他的showName */ | |
| 176 | + const tableConfigArr = masterConfig?.gdsconfigformslave.filter(row => row.sControlName === item.trim()); | |
| 177 | + if(commonUtils.isNotEmptyArr(tableConfigArr)) { | |
| 178 | + tabName=tableConfigArr[0].showName; | |
| 179 | + } | |
| 174 | 180 | return ( |
| 175 | - <TabPane tab={item} key={num} className="xly-bill-list" style={{ height: AutoTableHeight }}> | |
| 181 | + <TabPane tab={tabName} key={num} className="xly-bill-list" style={{ height: AutoTableHeight }}> | |
| 176 | 182 | <div> |
| 177 | 183 | <CommonView |
| 178 | 184 | {...props} | ... | ... |
src/components/CommonElementEvent/SisformulaInfo.js
| ... | ... | @@ -168,7 +168,7 @@ const SisformulaComponent = Form.create({ |
| 168 | 168 | const selfParamPropsType = { |
| 169 | 169 | ...commonBusiness.getTableTypes('selfParam', props), |
| 170 | 170 | tableProps: { |
| 171 | - AutoTableHeight: 255, | |
| 171 | + AutoTableHeight: 150, | |
| 172 | 172 | }, |
| 173 | 173 | // bNaturalWidth: true, /* 原始宽度 不进行最后一列计算 */ |
| 174 | 174 | rowSelection: null, | ... | ... |
src/components/FaceDetect/index.js
| ... | ... | @@ -408,7 +408,7 @@ class FaceDetect extends Component { |
| 408 | 408 | |
| 409 | 409 | render() { |
| 410 | 410 | const enable = ((this.props.enabled && this.user_id !== '' )|| this.props.actionType === 'identifyFace'); |
| 411 | - const faceCollection = commonFunc.showMessage(this.props.app.commonConst, 'faceCollection') || '人脸采集';/* 人脸采集 */ | |
| 411 | + const faceCollection = commonFunc.showLocalMessage(this.props, 'faceCollection', '人脸采集'); | |
| 412 | 412 | return ( |
| 413 | 413 | <> |
| 414 | 414 | <div className="face-recognition-container"> | ... | ... |