23626 H5--签约申请/另行签约申请，选择单位时，字有重叠，优化

one_stop_public/libs/TableSelect.js

@@ -169,7 +169,9 @@ export default class TableSelect extends React.Component {
 			dataSource,
 			disabled,
 		} = this.props;
-		let { valueName, labelName } = this.props.json;
+    // console.log(JSON.stringify(columns?.map((g) => g.width) ));
+
+    let { valueName, labelName } = this.props.json;
 		if (optionType == 'reference' && referenceObjId) {
 			valueName = this.props.dataColumn.referenceCodeName;
 			labelName = this.props.dataColumn.referenceNameName;
@@ -329,7 +331,7 @@ export default class TableSelect extends React.Component {
 									size="small"
 									dataSource={dataSource.list}
 									columns={columns3}
-									scroll={{ x: allWidth }}
+									scroll={{ x: this.props.get === 'mobile' ? 'max-content' : allWidth }}
 								/>
 							</>
 						)}

one_stop_public/libs/UploadCom.js

@@ -24,6 +24,19 @@ export default function index(props) {
   }
 }
 
+/**
+ *
+ * otherProps: {
+ *   limitImageSize: {
+ *     width:  number// 限制上传的图片的最小宽度
+ *     height: number// 限制上传的图片的最小高度
+ *     widthMinusHeight: number// 限制必须宽度大于高度 且 宽度 - 高度 >= widthMinusHeight
+ *   }
+ *   limitWarnningMessage: string// 当图片不满足限制条件时 提示语句
+ *   limitImageInfo: string// 在上传按钮旁展示的提示语句
+ * }
+ * */
+
 class UploadCom extends React.Component {
   constructor(props) {
     super(props);
@@ -65,11 +78,17 @@ class UploadCom extends React.Component {
   isSize = file => {
     const {limitWarnningMessage} = this.otherProps;
     return new Promise((resolve, reject) => {
-      let {width, height} = this.otherProps.limitImageSize;
+      let {width, height, widthMinusHeight} = this.otherProps.limitImageSize;
       let _URL = window.URL || window.webkitURL;
       let img = new Image();
       img.onload = function () {
         let valid = img.width >= width && img.height >= height;
+        if(!!widthMinusHeight && valid){
+          if((img.width - img.height) < widthMinusHeight){
+            // widthMinusHeight: number// 限制必须宽度大于高度 且 宽度 - 高度 >= widthMinusHeight
+            valid = false;
+          }
+        }
         valid ? resolve() : reject();
       };
       img.src = _URL.createObjectURL(file);