|
@@ -1324,7 +1324,7 @@ export default {
|
|
|
//把公式文本还原数组
|
|
|
async formulaStringToArray(){
|
|
|
let detail = (await formulaDetail({elementId:this.eleid,scope:this.globaltype,nodeId:this.nodeid,projectId:this.curProjiect.id||this.pid})).data.data;
|
|
|
- console.log(detail);
|
|
|
+ console.log(detail,'detail');
|
|
|
if(detail.id){
|
|
|
this.formulaid = detail.id;
|
|
|
//let formula = formulaStringToArray('FC.sum(FC.repeat(E[测试测试_222]))+FC.ifelse(3<E[测试测试_333]&&E[测试测试_333]<10,E[测试测试_222]+E[测试测试_333],E[测试测试_333])',detail.map,this.formulaMap);
|
|
@@ -1490,7 +1490,8 @@ export default {
|
|
|
if(res.data.data.tabData.length){
|
|
|
this.eleTableListComp = res.data.data.tabData;
|
|
|
|
|
|
- this.eleTableIdComp = this.eleTableListComp[0].initTableId;
|
|
|
+ // this.eleTableIdComp = this.eleTableListComp[0].initTableId;
|
|
|
+ this.eleTableIdComp = this.eleTableListComp[0].pkeyId;
|
|
|
this.getTableEleComp(this.eleTableIdComp);
|
|
|
}else{
|
|
|
this.eleTableListComp = [];
|