Merge branch 'master' of http://scjoyedu.eicp.net:9121/front-team/webPublic

one_stop_public/tableCompon/index.jsx

@@ -1498,7 +1498,7 @@ export default class tableCom extends Component {
         </>
       );
     }
-    if (json.comName == 'Label') {
+    if (json.comName == 'Label'||json.comName == 'Excel' ) {
       let uid;
       if (this.props.fatherCode != null) {
         uid = `${this.props.fatherCode}.[${this.props.index}].${this.props.uuid}`;
@@ -1516,6 +1516,7 @@ export default class tableCom extends Component {
               })(<Input type="hidden" />)}
               <span
                 style={{
+                  whiteSpace: json.comName == 'Excel' ?"nowrap":"normal",
                   fontWeight: get == 'mobile' ? 'bold' : '',
                   marginRight: get == 'mobile' ? 12 : '',
                 }}
@@ -1533,6 +1534,7 @@ export default class tableCom extends Component {
               })(<Input type="hidden" />)}
               <span
                 style={{
+                  whiteSpace: json.comName == 'Excel' ?"nowrap":"normal",
                   fontWeight: get == 'mobile' ? 'bold' : '',
                   marginRight: get == 'mobile' ? 12 : '',
                 }}