|
|
@@ -395,13 +395,26 @@
|
|
|
</el-select>
|
|
|
</div>
|
|
|
<div class="mg-t-10 mg-b-10 no-mb-col">
|
|
|
+ <el-scrollbar style="height: 460px;">
|
|
|
+ <el-row >
|
|
|
+ <el-col :span="6" v-for="item in eleList" :key="item.id">
|
|
|
+ <div class="ele-box">
|
|
|
+ <span v-if="item.k">{{item.name}}</span>
|
|
|
+ <span v-else>{{item.eName}}</span>
|
|
|
+ <el-checkbox v-model="item.checked" @change="value => eleCheckHandle(value,item)"></el-checkbox>
|
|
|
+ </div>
|
|
|
+ </el-col>
|
|
|
+ </el-row>
|
|
|
+ </el-scrollbar>
|
|
|
+ </div>
|
|
|
+ <!-- <div class="mg-t-10 mg-b-10 no-mb-col">
|
|
|
<el-scrollbar style="height: 460px">
|
|
|
<tableFormWrite :pkeyId="eleTableId" :multiple-select="true"
|
|
|
@element-selected="(obj, val, list) => handleElementSelectedList(obj, val, list)"
|
|
|
:initTableName="initTableName" :key="tableKey" :container-id="'excel-container-' + tableKey"
|
|
|
:selectedTableKey="selectedTableKeyList"></tableFormWrite>
|
|
|
</el-scrollbar>
|
|
|
- </div>
|
|
|
+ </div> -->
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
<div class="text-align-c">
|
|
|
@@ -1154,19 +1167,28 @@ export default {
|
|
|
// item.checked = true;
|
|
|
// }
|
|
|
// },
|
|
|
- //勾选元素多选
|
|
|
- eleCheckHandle(checked, item) {
|
|
|
- if (checked) {
|
|
|
- this.eleChecks.push(item);
|
|
|
- } else {
|
|
|
- for (let i = 0; i < this.eleChecks.length; i++) {
|
|
|
- if (this.eleChecks[i].id == item.id) {
|
|
|
- this.eleChecks.splice(i, 1);
|
|
|
- break;
|
|
|
- }
|
|
|
- }
|
|
|
+ eleCheckHandle(checked,item){
|
|
|
+ if(checked){
|
|
|
+ this.eleList.forEach((ele)=>{
|
|
|
+ this.$set(ele,'checked',false);
|
|
|
+ //ele.checked = false;
|
|
|
+ })
|
|
|
+ item.checked = true;
|
|
|
}
|
|
|
},
|
|
|
+ //勾选元素多选
|
|
|
+ // eleCheckHandle(checked, item) {
|
|
|
+ // if (checked) {
|
|
|
+ // this.eleChecks.push(item);
|
|
|
+ // } else {
|
|
|
+ // for (let i = 0; i < this.eleChecks.length; i++) {
|
|
|
+ // if (this.eleChecks[i].id == item.id) {
|
|
|
+ // this.eleChecks.splice(i, 1);
|
|
|
+ // break;
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ // },
|
|
|
|
|
|
//点选公式中的元素
|
|
|
// eleFormulaClick({selected,item},index){
|
|
|
@@ -1445,15 +1467,48 @@ export default {
|
|
|
},
|
|
|
|
|
|
//选择元素多选
|
|
|
- chooseEleHandle() {
|
|
|
- this.seleList.forEach((element, index) => {
|
|
|
- this.setEleToArgumen(element, index + this.argumenObj.index);
|
|
|
- });
|
|
|
+ // chooseEleHandle() {
|
|
|
+ // this.seleList.forEach((element, index) => {
|
|
|
+ // this.setEleToArgumen(element, index + this.argumenObj.index);
|
|
|
+ // });
|
|
|
+
|
|
|
+ // this.chooseEleVisible = false;
|
|
|
+ // this.tableKey = Date.now();
|
|
|
|
|
|
- this.chooseEleVisible = false;
|
|
|
- this.tableKey = Date.now();
|
|
|
|
|
|
+ // },
|
|
|
+ chooseEleHandle(){
|
|
|
+ for (let i = 0; i < this.eleList.length; i++) {
|
|
|
+ if (this.eleList[i].checked) {
|
|
|
+ let ele = this.eleList[i];
|
|
|
+ let obj = {};
|
|
|
+ if(ele.k){
|
|
|
+ obj = {
|
|
|
+ type:'ParamData',
|
|
|
+ name:ele.name,
|
|
|
+ id:ele.id,
|
|
|
+ selected:false,
|
|
|
+ v:ele.v,
|
|
|
+ k:ele.k,
|
|
|
+ children:[],
|
|
|
+ }
|
|
|
+ }else{
|
|
|
+ obj = {
|
|
|
+ type:'Element',
|
|
|
+ name:ele.eName,
|
|
|
+ id:ele.id,
|
|
|
+ selected:false,
|
|
|
+ tableElementKey:ele.tableElementKey,
|
|
|
+ children:[],
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
+
|
|
|
+ this.$set(this.argumenObj.arguments,this.argumenObj.index,obj);
|
|
|
+ this.chooseEleVisible = false;
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ }
|
|
|
},
|
|
|
//设置元素到指定位置参数
|
|
|
setEleToArgumen(ele, index) {
|
|
|
@@ -1491,17 +1546,32 @@ export default {
|
|
|
},
|
|
|
|
|
|
//显示选择元素弹窗
|
|
|
- showChooseEle(argumenObj) {
|
|
|
- const { item } = argumenObj;
|
|
|
-
|
|
|
- if (item) {
|
|
|
- const keyParts = item.tableElementKey.split('key');
|
|
|
- this.selectedTableKeyList = keyParts.length > 1 ? 'key' + keyParts[1] : null;
|
|
|
- } else {
|
|
|
- this.selectedTableKeyList = null;
|
|
|
- }
|
|
|
+ // showChooseEle(argumenObj) {
|
|
|
+ // const { item } = argumenObj;
|
|
|
+
|
|
|
+ // if (item) {
|
|
|
+ // const keyParts = item.tableElementKey.split('key');
|
|
|
+ // this.selectedTableKeyList = keyParts.length > 1 ? 'key' + keyParts[1] : null;
|
|
|
+ // } else {
|
|
|
+ // this.selectedTableKeyList = null;
|
|
|
+ // }
|
|
|
+ // this.argumenObj = argumenObj;
|
|
|
+ // this.chooseEleVisible = true;
|
|
|
+ // },
|
|
|
+ showChooseEle(argumenObj){
|
|
|
this.argumenObj = argumenObj;
|
|
|
this.chooseEleVisible = true;
|
|
|
+ // this.eleList=[];
|
|
|
+ // this.eleTableList=[];
|
|
|
+ this.eleTableId='';
|
|
|
+ this.allTreeShow=false;
|
|
|
+ this.filterText=''
|
|
|
+ this.eleList.forEach((ele)=>{
|
|
|
+ this.$set(ele,'checked',false);
|
|
|
+ //ele.checked = false;
|
|
|
+ })
|
|
|
+ // this.treeId=''
|
|
|
+
|
|
|
},
|
|
|
|
|
|
//移除挂载的函数
|
|
|
@@ -1553,14 +1623,8 @@ export default {
|
|
|
});
|
|
|
return false;
|
|
|
}
|
|
|
-
|
|
|
return true;
|
|
|
},
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
//保存公式
|
|
|
saveFormula() {
|
|
|
console.log('保存-edit', this.pid);
|
|
|
@@ -2340,11 +2404,6 @@ export default {
|
|
|
//console.log(this.$refs.dynamiccomponent[index])
|
|
|
this.$refs.dynamiccomponent[index].setELe(item);
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
},
|
|
|
handleElementSelectedList(item, value, list) {
|
|
|
|
