Commit 393836df by 莫晓莉

传入stepName

parent 5230c886
...@@ -162,12 +162,13 @@ import { ...@@ -162,12 +162,13 @@ import {
} from "@/api/kettle/link"; } from "@/api/kettle/link";
export default { export default {
props: ["connectionNode", "stepName", "form", "graphXml","getXmlVal","graph"], //从父组件传过来的值 props: ["connectionNode", "stepName", "form", "graphXml","getXmlVal",], //从父组件传过来的值
components: { components: {
main, main,
}, },
data() { data() {
return { return {
graph:{},
tableDetails:{}, tableDetails:{},
connectionName: "", connectionName: "",
browsing: false, browsing: false,
......
...@@ -20,7 +20,8 @@ ...@@ -20,7 +20,8 @@
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="日志" name="second" :disabled="!finished"> <el-tab-pane label="日志" name="second" :disabled="!finished">
<div style="height:50vh;overflow-y:auto;">{{mylog}}</div> <!-- <div style="height:50vh;overflow-y:auto;">{{mylog}}</div> -->
<div style="height:50vh;overflow-y:auto;white-space:pre-line;" v-html="mylog"></div>
</el-tab-pane> </el-tab-pane>
......
...@@ -376,6 +376,7 @@ ...@@ -376,6 +376,7 @@
<el-card class="box-card" style="margin-top:15px;"> <el-card class="box-card" style="margin-top:15px;">
<div slot="header" class="clearfix"> <div slot="header" class="clearfix">
<el-button style="padding: 3px 0" type="text" @click="fieldClick(true)">新增字段</el-button> <el-button style="padding: 3px 0" type="text" @click="fieldClick(true)">新增字段</el-button>
<el-button style="padding: 3px 0" type="text" @click="inputOutputFields">获取字段</el-button>
</div> </div>
<table-list ref="tableDia" :tableHead="tableHead" :tableData="tableData" :field.sync="editDia" :fieldClick="fieldClick"></table-list> <table-list ref="tableDia" :tableHead="tableHead" :tableData="tableData" :field.sync="editDia" :fieldClick="fieldClick"></table-list>
...@@ -454,11 +455,13 @@ import { ...@@ -454,11 +455,13 @@ import {
getFontalignment,//表头对齐方式 getFontalignment,//表头对齐方式
// getFontname,//数据字体 // getFontname,//数据字体
getValueMetaStore, getValueMetaStore,
getValueFormatStore getValueFormatStore,
inputOutputFields,
} from "@/api/kettle/file"; } from "@/api/kettle/file";
export default ({ export default ({
data(){ data(){
return{ return{
newGraph:{},
metaStoreList:[],//类型 metaStoreList:[],//类型
formatStoreList:[],//字段格式 formatStoreList:[],//字段格式
field:false,//编辑弹窗 field:false,//编辑弹窗
...@@ -537,21 +540,21 @@ export default ({ ...@@ -537,21 +540,21 @@ export default ({
], ],
// 表格数据 // 表格数据
tableData: [ tableData: [
{ // {
name: '31', // name: '31',
type: '鞠婧祎', // type: '鞠婧祎',
format: '女' // format: '女'
}, // },
{ // {
name: '32', // name: '32',
type: '鞠婧祎', // type: '鞠婧祎',
format: '女' // format: '女'
}, // },
{ // {
name: '33', // name: '33',
type: '鞠婧祎', // type: '鞠婧祎',
format: '女' // format: '女'
}, // },
], ],
formatTimeList:[],//时间日期格式 formatTimeList:[],//时间日期格式
codeList:[],//编码 codeList:[],//编码
...@@ -615,6 +618,13 @@ export default ({ ...@@ -615,6 +618,13 @@ export default ({
}, },
methods:{ methods:{
clickFun(graph){
console.log(graph,1)
this.newGraph = graph
// setTimeout(() => {
// this.$refs.databaseChoose.clickFun(graph,121331);
// }, 500);
},
handleClose(){ handleClose(){
this.$emit("update:excelOutPutVisible", false); this.$emit("update:excelOutPutVisible", false);
}, },
...@@ -776,6 +786,30 @@ export default ({ ...@@ -776,6 +786,30 @@ export default ({
} }
}) })
}, },
// 获取字段
inputOutputFields(){
if(this.doubleClickCell){
var title=this.doubleClickCell.value.attributes.label.value
}
console.log('获取cell888888===',this.doubleClickCell);
let pamer = new FormData(); // 创建form对象
pamer.append("stepName", encodeURIComponent(title));
// pamer.append("graphXml", this.getXmlVal);
// 画布xml转码
const codec = new mxCodec();
const encodedModel = codec.encode(this.newGraph.getModel());//xml对象
console.log("获取字段的画布详情:", encodedModel);
// var myXmlVal = mxUtils.getXml(encodedModel);//xml字符串
var myXmlVal = mxUtils.getPrettyXml(encodedModel);//xml字符串
pamer.append("graphXml", myXmlVal);
pamer.append("before", true);
pamer.append("query", '');
inputOutputFields(pamer).then(res=>{
console.log('字段',res);
// this.fieldsList2=res;
})
},
} }
}) })
......
...@@ -288,7 +288,8 @@ export default ({ ...@@ -288,7 +288,8 @@ export default ({
}, },
tableFields(){ tableFields(){
if(this.doubleClickCell){ if(this.doubleClickCell){
var title=this.doubleClickCell.title // var title=this.doubleClickCell.title;
var title=this.doubleClickCell.value.attributes.label.value
} }
console.log('获取cell888888===',this.doubleClickCell); console.log('获取cell888888===',this.doubleClickCell);
let pamer = new FormData(); // 创建form对象 let pamer = new FormData(); // 创建form对象
...@@ -320,7 +321,8 @@ export default ({ ...@@ -320,7 +321,8 @@ export default ({
//获取表输出 //获取表输出
inputOutputFields(){ inputOutputFields(){
if(this.doubleClickCell){ if(this.doubleClickCell){
var title=this.doubleClickCell.title // var title=this.doubleClickCell.title;
var title=this.doubleClickCell.value.attributes.label.value
} }
console.log('获取cell888888===',this.doubleClickCell); console.log('获取cell888888===',this.doubleClickCell);
let pamer = new FormData(); // 创建form对象 let pamer = new FormData(); // 创建form对象
......
...@@ -400,7 +400,8 @@ export default ({ ...@@ -400,7 +400,8 @@ export default ({
//获取字段 //获取字段
getFields(num){ getFields(num){
if(this.doubleClickCell){ if(this.doubleClickCell){
var title=this.doubleClickCell.title // var title=this.doubleClickCell.title;
var title=this.doubleClickCell.value.attributes.label.value;
} }
console.log('获取cell888888===',this.doubleClickCell); console.log('获取cell888888===',this.doubleClickCell);
let pamer = new FormData(); // 创建form对象 let pamer = new FormData(); // 创建form对象
......
...@@ -401,6 +401,7 @@ getValueFormatStore ...@@ -401,6 +401,7 @@ getValueFormatStore
export default ({ export default ({
data(){ data(){
return{ return{
newGraph:{},
formName:'',//当前那个属性选择文件夹 formName:'',//当前那个属性选择文件夹
metaStoreList:[],//类型 metaStoreList:[],//类型
formatStoreList:[],//字段格式 formatStoreList:[],//字段格式
...@@ -567,6 +568,13 @@ export default ({ ...@@ -567,6 +568,13 @@ export default ({
this.excelwritemethod();//如果输出文件中已存在工作表 this.excelwritemethod();//如果输出文件中已存在工作表
}, },
methods:{ methods:{
clickFun(graph){
console.log(graph,1)
this.newGraph = graph
setTimeout(() => {
this.$refs.databaseChoose.clickFun(graph,121331);
}, 500);
},
handleClose(){ handleClose(){
this.$emit("update:microVisible", false); this.$emit("update:microVisible", false);
}, },
...@@ -645,7 +653,8 @@ export default ({ ...@@ -645,7 +653,8 @@ export default ({
//超链接 //超链接
inputOutputFields(){ inputOutputFields(){
if(this.doubleClickCell){ if(this.doubleClickCell){
var title=this.doubleClickCell.title // var title=this.doubleClickCell.title
var title=this.doubleClickCell.value.attributes.label.value
} }
console.log('获取cell888888===',this.doubleClickCell); console.log('获取cell888888===',this.doubleClickCell);
let pamer = new FormData(); // 创建form对象 let pamer = new FormData(); // 创建form对象
......
...@@ -532,7 +532,9 @@ export default ({ ...@@ -532,7 +532,9 @@ export default ({
// -----更新end------------------ // -----更新end------------------
tableFields(){ tableFields(){
if(this.doubleClickCell){ if(this.doubleClickCell){
var title=this.doubleClickCell.title // var title=this.doubleClickCell.title;
var title=this.doubleClickCell.value.attributes.label.value;
} }
console.log('获取cell888888===',this.doubleClickCell); console.log('获取cell888888===',this.doubleClickCell);
let pamer = new FormData(); // 创建form对象 let pamer = new FormData(); // 创建form对象
...@@ -562,7 +564,9 @@ export default ({ ...@@ -562,7 +564,9 @@ export default ({
//获取表输出 //获取表输出
inputOutputFields(){ inputOutputFields(){
if(this.doubleClickCell){ if(this.doubleClickCell){
var title=this.doubleClickCell.title // var title=this.doubleClickCell.title
var title=this.doubleClickCell.value.attributes.label.value;
} }
console.log('获取cell888888===',this.doubleClickCell); console.log('获取cell888888===',this.doubleClickCell);
let pamer = new FormData(); // 创建form对象 let pamer = new FormData(); // 创建form对象
......
...@@ -351,9 +351,10 @@ export default ({ ...@@ -351,9 +351,10 @@ export default ({
}, },
tableFields(){ tableFields(){
// if(this.doubleClickCell){ if(this.doubleClickCell){
// var title=this.doubleClickCell.title // var title=this.doubleClickCell.title
// } var title=this.doubleClickCell.value.attributes.label.value
}
console.log('获取cell888888===',this.doubleClickCell); console.log('获取cell888888===',this.doubleClickCell);
let pamer = new FormData(); // 创建form对象 let pamer = new FormData(); // 创建form对象
// pamer.append("stepName", encodeURIComponent(title)); // pamer.append("stepName", encodeURIComponent(title));
...@@ -384,13 +385,14 @@ export default ({ ...@@ -384,13 +385,14 @@ export default ({
}, },
//获取表输出 //获取表输出
inputOutputFields(){ inputOutputFields(){
// if(this.doubleClickCell){ if(this.doubleClickCell){
// var title=this.doubleClickCell.title // var title=this.doubleClickCell.title
// } var title=this.doubleClickCell.value.attributes.label.value
}
console.log('获取cell888888===',this.doubleClickCell); console.log('获取cell888888===',this.doubleClickCell);
let pamer = new FormData(); // 创建form对象 let pamer = new FormData(); // 创建form对象
// pamer.append("stepName", encodeURIComponent(title)); pamer.append("stepName", encodeURIComponent(title));
pamer.append("stepName", encodeURIComponent(this.tableOutForm.label)); // pamer.append("stepName", encodeURIComponent(this.tableOutForm.label));
// pamer.append("graphXml", this.getXmlVal); // pamer.append("graphXml", this.getXmlVal);
// 画布xml转码 // 画布xml转码
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<div id="ExcelInputDialog"></div> <div id="ExcelInputDialog"></div>
<el-form ref="textFileForm" :model="textFileForm" label-width="200px"> <el-form ref="textFileForm" :model="textFileForm" label-width="200px">
<el-form-item label="步骤名称:" label-width="120px"> <el-form-item label="步骤名称:" label-width="120px">
<el-input v-model="textFileForm.name"></el-input> <el-input v-model="textFileForm.label" value="文件文本输出"></el-input>
</el-form-item> </el-form-item>
<el-tabs v-model="activeName" type="border-card"> <el-tabs v-model="activeName" type="border-card">
<el-tab-pane label="文件" name="content"> <el-tab-pane label="文件" name="content">
...@@ -689,11 +689,14 @@ export default ({ ...@@ -689,11 +689,14 @@ export default ({
//获取表输出 //获取表输出
inputOutputFields(){ inputOutputFields(){
if(this.doubleClickCell){ if(this.doubleClickCell){
var title=this.doubleClickCell.title // var title=this.doubleClickCell.title;
var title=this.doubleClickCell.value.attributes.label.value
} }
console.log('获取cell888888===',this.doubleClickCell); console.log('获取cell888888===',this.doubleClickCell);
let pamer = new FormData(); // 创建form对象 let pamer = new FormData(); // 创建form对象
pamer.append("stepName", encodeURIComponent(title)); pamer.append("stepName", encodeURIComponent(title));
// pamer.append("stepName", encodeURIComponent(this.textFileForm.label));
// pamer.append("graphXml", this.getXmlVal); // pamer.append("graphXml", this.getXmlVal);
// 画布xml转码 // 画布xml转码
const codec = new mxCodec(); const codec = new mxCodec();
......
...@@ -426,7 +426,9 @@ export default ({ ...@@ -426,7 +426,9 @@ export default ({
tableFields(){ tableFields(){
if(this.doubleClickCell){ if(this.doubleClickCell){
var title=this.doubleClickCell.title // var title=this.doubleClickCell.title;
var title=this.doubleClickCell.value.attributes.label.value;
} }
console.log('获取cell888888===',this.doubleClickCell); console.log('获取cell888888===',this.doubleClickCell);
let pamer = new FormData(); // 创建form对象 let pamer = new FormData(); // 创建form对象
...@@ -456,7 +458,8 @@ export default ({ ...@@ -456,7 +458,8 @@ export default ({
//获取表输出 //获取表输出
inputOutputFields(){ inputOutputFields(){
if(this.doubleClickCell){ if(this.doubleClickCell){
var title=this.doubleClickCell.title // var title=this.doubleClickCell.title;
var title=this.doubleClickCell.value.attributes.label.value;
} }
console.log('获取cell888888===',this.doubleClickCell); console.log('获取cell888888===',this.doubleClickCell);
let pamer = new FormData(); // 创建form对象 let pamer = new FormData(); // 创建form对象
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment