修改bug

one_stop_public/Table/index.jsx

@@ -9,6 +9,7 @@ import { Form, Row, Col, Input, message } from 'antd';
 import { Toast } from 'antd-mobile';
 import router from 'umi/router';
 import moment from 'moment';
+import { HyperFormula } from 'hyperformula';
 import TableCom from '../tableCompon';
 import IsNewTable from './isNewMobileTable';
 import maintain from '../assets/maintain.png';
@@ -29,6 +30,7 @@ export default class ZdyTable extends Component {
       sqlData: {},
       defaultValues: {},
       currentFormKey: null,
+      currentFormTitle:null,
       items: [],
       init: this.props.init || {},
       datas: {},
@@ -56,6 +58,8 @@ export default class ZdyTable extends Component {
         isReady: true,
         formConfig: { ...this.state.formConfig, style: this.props.style },
       });
+     
+      this.initExcel({datas:this.props.datas,trees:this.props.trees})
       return;
     }
 
@@ -86,13 +90,15 @@ export default class ZdyTable extends Component {
         }
         const obj = JSON.parse(val.form.content);
         const xxx = obj.datas[obj.init];
+        const fk= this.props.table ? val.formKey : obj.init;
         this.setState({
           datas: obj.datas,
           width: this.props.table ? obj.datas[val.formKey].width : xxx.width,
           isBorder: this.props.table ? obj.datas[val.formKey].isBorder : xxx.isBorder,
           isRowCol: this.props.table ? obj.datas[val.formKey].isRowCol : xxx.isRowCol,
           mapData,
-          currentFormKey: this.props.table ? val.formKey : obj.init,
+          currentFormKey: fk,
+          currentFormTitle:getCurrentFormTitle(obj,fk),
           sqlData,
           isEdit: !this.props.formKey,
           items: this.props.table ? obj.datas[val.formKey].items : xxx.items,
@@ -100,7 +106,7 @@ export default class ZdyTable extends Component {
           appId: val.appId,
           isReady: true,
           formConfig: xxx,
-        });
+        },()=> this.initExcel(obj));
         return;
       }
       if (isCg === 'yes') {
@@ -144,6 +150,7 @@ export default class ZdyTable extends Component {
           datas: obj.datas,
           isEdit: !this.props.formKey,
           currentFormKey: obj.init,
+          currentFormTitle:getCurrentFormTitle(obj,obj.init),
           width: xxx.width,
           isBorder: xxx.isBorder,
           isRowCol: xxx.isRowCol,
@@ -156,7 +163,7 @@ export default class ZdyTable extends Component {
           defaultBinds: this.props.table
             ? obj.datas[val.taskFormKey].defaultBinds
             : xxx.defaultBinds,
-        });
+        },()=> this.initExcel(obj));
         return;
       }
       if (
@@ -192,6 +199,11 @@ export default class ZdyTable extends Component {
       }
       const obj = JSON.parse(val.unifiedServicePatternModel.content);
       const xxx = obj.datas[this.props.formKey ? this.props.formKey : obj.init]; // 是否是存在历史表单传入值
+      const fk=this.props.formKey
+      ? this.props.formKey
+      : val.taskFormKey
+      ? val.taskFormKey
+      : obj.init
       this.setState(
         {
           appId: val.id,
@@ -202,11 +214,8 @@ export default class ZdyTable extends Component {
           sqlData,
           defaultValues: val.unifiedServicePatternModel.defaultValues,
           isEdit: !this.props.formKey,
-          currentFormKey: this.props.formKey
-            ? this.props.formKey
-            : val.taskFormKey
-            ? val.taskFormKey
-            : obj.init,
+          currentFormKey: fk,
+          currentFormTitle:getCurrentFormTitle(obj,fk),
           defaultBinds: this.props.table
             ? obj.datas[val.taskFormKey].defaultBinds
             : xxx.defaultBinds,
@@ -226,13 +235,57 @@ export default class ZdyTable extends Component {
           if (isQRCode) {
             this.props.form.setFieldsValue(formDeafault);
           }
+          this.initExcel(obj)
         },
       );
     } catch (e) {
       console.log('公式配置有误', e);
     }
+   
   }
-
+  hfInstance;
+  initExcel=(configs)=>{
+     if(configs==null) return
+    const sheetData = {}
+    for(var key in configs.trees){
+    
+      const tr=configs.trees[key]
+     
+      const data= configs.datas[tr.key]
+      const all = []
+      for(var i=0;i<data.items.length;i++){
+        const row=data.items[i]
+        const r=[]
+        for(var j=0;j<row.length;j++){
+          const col=row[j]
+          if(col.content?.comName=="Excel"){
+            r.push(col.content.initialValue)
+          }else{
+            r.push('')
+          }
+        
+        }
+        all.push(r)
+      }
+   
+      sheetData[tr.title]=all
+    }
+   
+          const hfInstance = HyperFormula.buildFromSheets(sheetData, {});
+          
+          this.hfInstance=hfInstance
+  }
+  getCellValue=(i,j,currentTitle)=>{
+   
+    if(this.hfInstance&&currentTitle){
+      let x =   this.hfInstance.getCellValue({ col: j, row: i, sheet: this.hfInstance.getSheetId(currentTitle) })
+     if(x&&x.value!=null){
+       x=x.value
+     }
+     
+     return x;
+   } 
+}
   componentWillReceiveProps(nextProps) {
     const {
       postData, // 数据源
@@ -405,8 +458,17 @@ export default class ZdyTable extends Component {
     });
     return max;
   };
-
+   getCurrentFormTitle=(obj,key)=>{
+   
+    const {trees}=obj
+    for(var i=0;i<trees.length;i++){
+      if(trees[i].key==key){
+        return trees[i].title
+      }
+    }
+   }
   render() {
+    
     const {
       width,
       isRowCol,
@@ -419,6 +481,7 @@ export default class ZdyTable extends Component {
       init,
       modalTitle,
       currentFormKey,
+     currentFormTitle,
       isEdit,
       datas,
       isReady,
@@ -620,6 +683,7 @@ export default class ZdyTable extends Component {
                                         }}
                                       >
                                         <TableCom
+                                            getCellValue={this.getCellValue}
                                           isWebPrintEnd={isWebPrintEnd}
                                           isWebPrint={isWebPrint}
                                           isPrint={this.props.isPrint}
@@ -638,6 +702,7 @@ export default class ZdyTable extends Component {
                                           uuid={cell.uuid}
                                           isEdit={isEdit}
                                           formKey={currentFormKey}
+                                          currentFormTitle={currentFormTitle}
                                           init={init}
                                           get={get} // 区分移动端或wen端
                                           json={cell.content}
@@ -722,6 +787,7 @@ export default class ZdyTable extends Component {
                     })
                   : ''}
                 <IsNewTable
+                  getCellValue={this.getCellValue}
                   taskAssignee={taskAssignee} // 提交人
                   userId={userId}
                   isPreview={isPreview}
@@ -736,6 +802,7 @@ export default class ZdyTable extends Component {
                   datas={datas}
                   isEdit={isEdit}
                   currentFormKey={currentFormKey}
+                  currentFormTitle={currentFormTitle}
                   init={init}
                   get={get}
                   obj={obj}

one_stop_public/Table/isNewMobileTable.jsx

@@ -38,6 +38,8 @@ export default class isNewTable extends Component {
       modalInit,
       concealModel,
       taskAssignee,
+      currentFormTitle,
+      getCellValue
     } = this.props;
     if (!isEdit) {
       // 展示栏 暂不做处理
@@ -94,6 +96,8 @@ export default class isNewTable extends Component {
                         isEdit={isEdit}
                         fatherObj={this.props.fatherObj}
                         formKey={currentFormKey}
+                        currentFormTitle
+                        getCellValue
                         init={init}
                         get={get}
                         key={j}
@@ -166,6 +170,8 @@ export default class isNewTable extends Component {
                           isEdit={isEdit}
                           fatherObj={this.props.fatherObj}
                           formKey={currentFormKey}
+                          currentFormTitle
+                          getCellValue
                           init={init}
                           get={get}
                           key={j}
@@ -210,6 +216,8 @@ export default class isNewTable extends Component {
                         isEdit={isEdit}
                         fatherObj={this.props.fatherObj}
                         formKey={currentFormKey}
+                        currentFormTitle
+                        getCellValue
                         init={init}
                         get={get}
                         key={j}

one_stop_public/tableCompon/index.jsx

@@ -1421,9 +1421,11 @@ export default class tableCom extends Component {
       isEdit,
       datas,
       taskAssignee,
-      userId,
+      userId,i,
       j,
       isPreview,
+      currentFormTitle,
+      getCellValue
     } = this.props;
 
     const { options, labels, selectDis, modalCode, modalTitle, modalInit, modalProps } = this.state;
@@ -1498,7 +1500,12 @@ export default class tableCom extends Component {
         </>
       );
     }
-    if (json.comName == 'Label' || json.comName == 'Excel') {
+    if(json.comName=='Excel'){
+      const value= getCellValue(i,j,currentFormTitle)
+      const xx=<div style={{textAlign:"center",height:value==null?20:null}}>{value}</div>
+      return xx;
+    }
+    if (json.comName == 'Label') {
       let uid;
       if (this.props.fatherCode != null) {
         uid = `${this.props.fatherCode}.[${this.props.index}].${this.props.uuid}`;
@@ -1516,7 +1523,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 : '',
                 }}
@@ -1534,7 +1541,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 : '',
                 }}