Skip to content

E
ETL-admin
Commit b83d37e5 by 李耀琨
Options

解决冲突

parents 4fab0b48 48437588
Showing with 273 additions and 132 deletions
src/views/dashboard-kettle/components/appBulletFrame/tableInput.vue
......@@ -191,6 +191,7 @@ import {
} from "@/api/kettle/link";
export default {
props: [ "stepName", "form", "graphXml", "getXmlVal","nodeData","graph"], //从父组件传过来的值
components: {
main,
......@@ -228,6 +229,7 @@ export default {
created() {
this.listDatabasesFun();
}, // 监听编号好后获取选择的数据库的树形里列表
// watch: {
// formDataBaseName: {
// handler(newValue, oldValue) {
......@@ -249,6 +251,7 @@ export default {
}, 500);
},
tableInputName() {
this.stepName;
},
......@@ -256,6 +259,7 @@ export default {
//  //获取新建弹窗返回来的值
getSonValue(res) {
if (typeof res == "string") {
this.formDataBaseName = res;
console.log("接收子组件的值1111111----", this.formDataBaseName);
} else if (typeof res == "object") {
......@@ -296,8 +300,10 @@ export default {
// },
//获取新建弹窗返回来的值
getGraphDataBases() {
// var graph = this.getGraph();
var root = this.newGraph.getDefaultParent(),
data = [];
if (root.getAttribute("databases") != null)
......@@ -321,6 +327,7 @@ export default {
this.dialogVisibleFourth = true;
// this.$refs.establishDia.database();
// this.$refs.establishDia.accessMethod(); //获取连接方式
this.$refs.establishDia.clickFun(this.newGraph); //先把画布传过去
this.$refs.establishDia.getTransDatabase();
this.$refs.establishDia.accessMethod(); //获取连接方式
......@@ -331,6 +338,7 @@ export default {
dialogVisibleFourthFun() {
this.dialogVisibleFourth = true;
// this.$refs.establishDia.database(this.connectionName);
this.$refs.establishDia.clickFun(this.newGraph); //先把画布传过去
if (this.form.connection) {
this.dialogVisibleFourth = true;
......@@ -338,6 +346,7 @@ export default {
this.$refs.establishDia.accessMethod(); //获取连接方式
}
// this.$refs.establishDia.database(this.selectName);
},
......@@ -356,9 +365,11 @@ export default {
},
getField(val) {
this.library = this.namesList.find((e) => {
return e.name == val;
});
console.log(this.library, "////////////////////////");
this.connectionName = val;
},
......@@ -371,12 +382,15 @@ export default {
var grXml = mxUtils.getPrettyXml(node);
let mps = new FormData(); // 创建form对象
mps.append("graphXml", grXml);
mps.append("databaseName", this.library.name);
mps.append("schema", this.tableDetails.nodeId);
mps.append("table", this.tableDetails.text);
tableFields(mps).then((res) => {
// console.log(res);
for (let i = 0; i < res.length; i++) {
......@@ -400,6 +414,7 @@ export default {
if (this.form.connection) {
this.browsing = !this.browsing;
this.scanFlag = true;
} else {
this.$message.error("请选择数据库");
console.log(this.stepName);
......@@ -448,6 +463,7 @@ export default {
handleNodeClick(data, node) {
console.log("点击当前节点node===", node);
console.log("点击当前节点data===", data);
this.tableDetails = data;
},
......
src/views/dashboard-kettle/components/designer/mxgraphDesigner.vue
......@@ -886,12 +886,13 @@
<textFileDialog
ref="textFile"
:fileVisible.sync="fileVisible"
:getXmlVal="getXmlVal" :saveOutputDialog="saveOutputDialog" :textFileForm="outPutFormData8"></textFileDialog>
:getXmlVal="getXmlVal" :saveOutputDialog="saveOutputDialog" :textFileForm="outPutFormData8" :doubleClickCell="doubleClickCell"></textFileDialog>
<microDialog ref="mic" :microVisible.sync="microVisible" :saveOutputDialog="saveOutputDialog" :microForm="outPutFormData9" :doubleClickCell="doubleClickCell"></microDialog>
<!-- 输出弹窗end================== -->
<trans-graph
ref="transRef"
:transGraphVisible.sync="transGraphVisible"
:getXmlVal="getXmlVal"
></trans-graph>
......@@ -1794,11 +1795,15 @@ previousField(){
//mico-Excel输出
this.microVisible = !this.microVisible;
this.outPutFormData9 = this.showDataFunc();
this.$refs.mic.clickFun(this.graph);//向子组件传递画布
return;
} else if (cell.ids == "step9" || cell.value.attributes.ctype.value == "ExcelOutput" ) {
//Excel输出
this.excelOutPutVisible = !this.excelOutPutVisible;
this.outPutFormData3 = this.showDataFunc();
setTimeout(() => {
this.$refs.excelOut.clickFun(this.graph);//向子组件传递画布
}, 500);
return;
}
......@@ -2155,6 +2160,8 @@ previousField(){
// 执行转换
doTrans() {
this.transGraphVisible = !this.transGraphVisible;
this.$refs.transRef.clickFun(this.graph);
},
// //重绘流程图
......
src/views/dialogs-components/global/database-choose/main.vue
......@@ -4,17 +4,11 @@
<el-row :gutter="10">
<el-col :span="14">
<!-- <el-select style="width: 100%" v-model="selectName" placeholder="请选择选择数据库连接" @focus="clickFunc" @change="selectNameFunc">
<el-option v-for="(item,index) in namesList" :key="index" :label="item.name" :value="item.name"></el-option>
</el-select> -->
<el-select style="width: 100%" v-model="selectName" placeholder="请选择选择数据库连接" @focus="getGraphDataBases">
<el-select style="width: 100%" v-model="form.connection" placeholder="请选择选择数据库连接" @focus="getGraphDataBases">
<el-option v-for="(item,index) in namesList" :key="index" :label="item.name" :value="item.name"></el-option>
</el-select>
<!-- <el-select style="width: 100%" v-model="selectName" placeholder="请选择选择数据库连接" @focus="getGraphDataBases" @change="selectNameFunc">
<el-option v-for="(item,index) in namesList" :key="index" :label="item.name" :value="item"></el-option>
</el-select> -->
</el-col>
<el-col class="line" :span="3">
<el-button size="mini" @click.native="editDataBaseModal()">编辑</el-button></el-col
......@@ -30,7 +24,7 @@
<el-form-item label="目的模式:" >
<el-row :gutter="10">
<el-col :span="20">
<el-input v-model="newForm.schema"></el-input>
<el-input v-model="form.schema"></el-input>
</el-col>
<el-col class="line" :span="3">
......@@ -41,7 +35,7 @@
<el-form-item label="目标表:" prop="text">
<el-row :gutter="10">
<el-col :span="20">
<el-input ref="goal" v-model="newForm.table"></el-input>
<el-input ref="goal" v-model="form.table"></el-input>
</el-col>
<el-col class="line" :span="3">
......@@ -50,7 +44,7 @@
</el-row>
</el-form-item>
<estab-dialog ref="establishDia" :noneRespository="noneRespository" :graph.sync="newGraph" :getXmlVal="getXmlVal" :form="newForm" :dialogVisibleFourth.sync='dialogVisibleFourth' @getSonValue="getSonValue" :listNames="listNames" :chooseFlag.sync="chooseFlag" :chooseType="chooseType"></estab-dialog>
<estab-dialog ref="establishDia" :noneRespository="noneRespository" :graph.sync="newGraph" :getXmlVal="getXmlVal" :form="form" :dialogVisibleFourth.sync='dialogVisibleFourth' @getSonValue="getSonValue" :listNames="listNames" :chooseFlag.sync="chooseFlag" :chooseType="chooseType"></estab-dialog>
</div>
</template>
......@@ -83,11 +77,11 @@ export default {
noneRespository:1,//判断是保存画布还是传后台
dialogVisibleFourth:false,
namesList:[],
selectName:'',//当前选中的下拉框的数据
// selectName:'',//当前选中的下拉框的数据
connectionName:'',
curNode:[],
chooseFlag:false,//选择模式
newForm:{},
// newForm:{},
chooseType:'',
newGraph:{}
}
......@@ -102,7 +96,7 @@ export default {
props:["form","getXmlVal","graph"],
created() {
this.listNames();
this.newForm = this.form
// this.newForm = this.form
},
methods: {
clickFun(graph){
......@@ -120,21 +114,21 @@ export default {
// this.$refs.goal.refreshData(this.from)
if(this.chooseType=='表'){
console.log('进入表----',res);
this.$set(this.newForm,'table',this.curNode.data.text);
this.$set(this.form,'table',this.curNode.data.text);
this.$forceUpdate()
}
console.log('this.curNode.data.leaf=====:',this.curNode.data.leaf);
if(this.chooseType=='模式'&& this.curNode.data.leaf && this.curNode.parent.data.text ==this.chooseType){
console.log('进入模式----',res);
this.$set(this.newForm,'schema',this.curNode.data.text);
this.$set(this.form,'schema',this.curNode.data.text);
this.$forceUpdate()
}
// this.$forceUpdate()
console.log('chuanhuo=====', this.newForm);
console.log('chuanhuo=====', this.form);
// 发射回父组件
this.newForm.connection=this.selectName;
this.$emit("update:form", this.newForm);
this.form.connection=this.form.connection;
this.$emit("update:form", this.form);
}else if(typeof(res)=='boolean'){
this.dialogVisibleFourth=res;
......@@ -168,9 +162,9 @@ export default {
//选择数据库编辑
selectNameFunc(e){
console.log('当前选中的数',e);
console.log('当前选中的数-===',this.selectName);
this.selectName=this.se
this.newForm.connection=this.selectName;
console.log('当前选中的数-===',this.form.connection);
// this.selectName=this.se
// this.form.connection=this.form.connection;
},
//点击选择获取已经创建的数据库列表
clickFunc(){
......@@ -180,20 +174,20 @@ export default {
editDataBaseModal(){
// this.$refs.establishDia.clickFun(this.newGraph);//先传画布
this.$refs.establishDia.clickFun(this.graph);//先把画布传过去
if(this.selectName){
if(this.form.connection){
this.dialogVisibleFourth=true;
}
// this.$refs.establishDia.database(this.selectName);
this.$refs.establishDia.getTransDatabase(this.selectName);
this.$refs.establishDia.getTransDatabase(this.form.connection);
this.$refs.establishDia.accessMethod();//获取连接方式
},
//浏览
scanTree(type){
console.log('当前选中链接***************',this.selectName);
console.log('当前选中链接***************',this.form.selectName);
this.chooseType=type;
if(this.selectName){
if(this.form.connection){
// this.$refs.establishDia.database(this.selectName);
this.$refs.establishDia.getTransDatabase(this.selectName);
this.$refs.establishDia.getTransDatabase(this.form.connection);
console.log('当前选中数据库***************',this.connectionName);
if(this.connectionName){//判断后台有数据发射回来后再调用弹窗不然不显示树数据或者加载数据延迟
this.$refs.establishDia.scanDialogOpen();
......
src/views/dialogs-components/global/establish/main.vue
......@@ -256,9 +256,10 @@
:close-on-click-modal="false"
:before-close="handleCloseTest"
>
<div class="table-container table-container-repos" style="height: 42vh">
<!-- <div class="table-container table-container-repos" style="height: 42vh">
{{ linkInfo }}
</div>
</div> -->
<div style="height:50vh;overflow-y:auto;white-space:pre-line;" v-html="linkInfo"></div>
<span slot="footer" class="dialog-footer">
<!-- <el-button @click="handleClose">取 消</el-button> -->
<el-button type="primary" @click="handleCloseTest">确 定</el-button>
......
src/views/dialogs-components/global/trans-graph/main.vue
......@@ -20,7 +20,8 @@
</el-tab-pane>
<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>
......@@ -39,7 +40,7 @@
</el-tabs>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="transGraphVisible = false">取 消</el-button>
<el-button @click="handleClose">确定</el-button>
<!-- <el-button type="primary" @click.native="confirm()">确 定</el-button> -->
</span>
</el-dialog>
......@@ -47,6 +48,20 @@
</template>
<script>
import mxgraph from "@/utils/mxgraph";
const {
mxGraph,
mxUtils,
mxEvent,
mxKeyHandler,
mxRubberband,
mxConstants,
mxStencilRegistry,
mxStencil,
mxCodec,
mxGraphModel,
mxGeometry,
} = mxgraph
import {
doTrans,//获取表输出
doRun,//启动
......@@ -55,6 +70,7 @@ export default ({
name: "trans-graph",
data(){
return{
newGraph:{},
finished:false,//只有执行成功才显示日志
executionId:null,//执行转换返回id
mylog:'',//日志
......@@ -151,8 +167,8 @@ export default ({
],
tableData: [{
name: '3',
num: '鞠婧祎',
name: '',
num: '',
r:'',
x:'',
i:'',
......@@ -194,6 +210,10 @@ export default ({
},
methods:{
clickFun(graph){
console.log(graph,1)
this.newGraph = graph
},
handleClose(){
this.$emit("update:transGraphVisible", false);
},
......@@ -216,7 +236,8 @@ export default ({
doTrans(pamer).then((res) => {
if(res){
console.log('返回执行的数据====',res);
// this.tableData=res;
if(res.finished){
// this.tableData=res;
this.stepMeasure=res.stepMeasure
this.mylog=res.log;
this.finished=res.finished;//执行转换以后
......@@ -233,14 +254,28 @@ export default ({
})
this.tableData = tableData
}else{
setTimeout(() => {
this.doTrans();
}, 100);
}
}
})
},
// 启动
doRun(){
// 画布xml转码
const codec = new mxCodec();
const encodedModel = codec.encode(this.newGraph.getModel());
console.log(encodedModel,46546465456);
var myXmlVal = mxUtils.getXml(encodedModel);
let pamer = new FormData(); // 创建form对象
pamer.append("graphXml", this.getXmlVal);
pamer.append("graphXml", myXmlVal);
var executParam={
"exec_local":"Y",
......
src/views/output-dialog/Excel-output.vue
......@@ -7,13 +7,14 @@
:before-close="handleClose"
top="10%"
>
<el-form ref="stepName" :model="stepName" label-width="120px">
<!-- <el-form ref="stepName" :model="stepName" label-width="120px"> -->
<el-form ref="excelForm" :model="excelForm" label-width="200px">
<el-form-item label="步骤名称:">
<el-input v-model="stepName.name"></el-input>
<el-input v-model="excelForm.label"></el-input>
</el-form-item>
</el-form>
<!-- </el-form> -->
<el-form ref="excelForm" :model="excelForm" label-width="200px">
<!-- <el-form ref="excelForm" :model="excelForm" label-width="200px"> -->
<el-tabs v-model="activeName" type="border-card">
<el-tab-pane label="文件" name="content">
<el-form-item label="文件名:">
......@@ -376,6 +377,7 @@
<el-card class="box-card" style="margin-top:15px;">
<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="inputOutputFields">获取字段</el-button>
</div>
<table-list ref="tableDia" :tableHead="tableHead" :tableData="tableData" :field.sync="editDia" :fieldClick="fieldClick"></table-list>
......@@ -454,11 +456,13 @@ import {
getFontalignment,//表头对齐方式
// getFontname,//数据字体
getValueMetaStore,
getValueFormatStore
getValueFormatStore,
inputOutputFields,
} from "@/api/kettle/file";
export default ({
data(){
return{
newGraph:{},
metaStoreList:[],//类型
formatStoreList:[],//字段格式
field:false,//编辑弹窗
......@@ -537,21 +541,21 @@ export default ({
],
// 表格数据
tableData: [
{
name: '31',
type: '鞠婧祎',
format: '女'
},
{
name: '32',
type: '鞠婧祎',
format: '女'
},
{
name: '33',
type: '鞠婧祎',
format: '女'
},
// {
// name: '31',
// type: '鞠婧祎',
// format: '女'
// },
// {
// name: '32',
// type: '鞠婧祎',
// format: '女'
// },
// {
// name: '33',
// type: '鞠婧祎',
// format: '女'
// },
],
formatTimeList:[],//时间日期格式
codeList:[],//编码
......@@ -599,6 +603,7 @@ export default ({
default:false
},
saveOutputDialog:Function,
doubleClickCell:Object
},
// mounted(){
......@@ -615,6 +620,10 @@ export default ({
},
methods:{
clickFun(graph){
console.log(graph,1)
this.newGraph = graph
},
handleClose(){
this.$emit("update:excelOutPutVisible", false);
},
......@@ -720,8 +729,8 @@ export default ({
confirm(){
console.log('步骤名称==：',this.stepName);
this.excelForm.label=this.stepName.name;
// console.log('步骤名称==：',this.stepName);
// this.excelForm.label=this.stepName.name;
this.excelForm.fields=JSON.stringify(this.tableData);//更新字段
console.log('弹窗数据:',this.excelForm);
this.saveOutputDialog(this.excelForm);
......@@ -776,6 +785,31 @@ 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;
this.tableData=res;
})
},
}
})
......
src/views/output-dialog/delete.vue
......@@ -252,7 +252,9 @@ export default ({
clickFun(graph){
console.log(graph,'双击获取值')
this.newGraph = graph;
this.$refs.databaseChoose.clickFun(this.newGraph);
setTimeout(() => {
this.$refs.databaseChoose.clickFun(this.newGraph);
}, 500);
},
handleClose(){
this.$emit("update:deleteVisible", false);
......@@ -288,7 +290,8 @@ export default ({
},
tableFields(){
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);
let pamer = new FormData(); // 创建form对象
......@@ -320,7 +323,8 @@ export default ({
//获取表输出
inputOutputFields(){
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);
let pamer = new FormData(); // 创建form对象
......
src/views/output-dialog/insertOrUpdate.vue
......@@ -8,13 +8,14 @@
top="10%"
>
<div id="ExcelInputDialog"></div>
<el-form ref="stepName" :model="stepName" label-width="120px">
<!-- <el-form ref="stepName" :model="stepName" label-width="120px"> -->
<el-form :model="insertOrUpdateForm" label-width="200px">
<el-form-item label="步骤名称:">
<el-input v-model="stepName.name"></el-input>
<el-input v-model="insertOrUpdateForm.label"></el-input>
</el-form-item>
</el-form>
<!-- </el-form> -->
<el-form :model="insertOrUpdateForm" label-width="200px">
<!-- <el-form :model="insertOrUpdateForm" label-width="200px"> -->
<el-tabs v-model="activeName" type="border-card">
<el-tab-pane label="基本配置" name="content">
<database-choose ref="databaseChoose" :form.sync="insertOrUpdateForm" :getXmlVal="getXmlVal" :graph="newGraph"></database-choose>
......@@ -195,7 +196,7 @@ export default ({
fieldUpdate:false,//更新弹窗
editDiaUpdate:false,//更新字段
fieldFormUpdate:{},//更新弹窗
stepName:{name:'删除'},
stepName:{name:'插入/更新'},
// insertOrUpdateForm:{
// commit: "100",
// connection: "",
......@@ -333,7 +334,10 @@ export default ({
clickFun(graph){
console.log(graph,'双击获取值')
this.newGraph = graph;
this.$refs.databaseChoose.clickFun(this.newGraph);
setTimeout(() => {
this.$refs.databaseChoose.clickFun(this.newGraph);
}, 500);
},
handleClose(){
this.$emit("update:InsertOrUpdateVisible", false);
......@@ -400,12 +404,20 @@ export default ({
//获取字段
getFields(num){
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);
let pamer = new FormData(); // 创建form对象
pamer.append("stepName", encodeURIComponent(title));
pamer.append("graphXml", this.getXmlVal);
// 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字符串
pamer.append("graphXml", myXmlVal);
// pamer.append("graphXml", this.getXmlVal);
pamer.append("before", true);
pamer.append("query", '');
inputOutputFields(pamer).then(res=>{
......@@ -442,7 +454,8 @@ export default ({
},
tableFields(){
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);
let pamer = new FormData(); // 创建form对象
......@@ -472,7 +485,8 @@ export default ({
//获取表输出
inputOutputFields(){
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);
let pamer = new FormData(); // 创建form对象
......
src/views/output-dialog/micro-excel.vue
......@@ -401,6 +401,7 @@ getValueFormatStore
export default ({
data(){
return{
newGraph:{},
formName:'',//当前那个属性选择文件夹
metaStoreList:[],//类型
formatStoreList:[],//字段格式
......@@ -567,6 +568,13 @@ export default ({
this.excelwritemethod();//如果输出文件中已存在工作表
},
methods:{
clickFun(graph){
console.log(graph,1)
this.newGraph = graph
setTimeout(() => {
this.$refs.databaseChoose.clickFun(graph,121331);
}, 500);
},
handleClose(){
this.$emit("update:microVisible", false);
},
......@@ -645,7 +653,8 @@ export default ({
//超链接
inputOutputFields(){
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);
let pamer = new FormData(); // 创建form对象
......
src/views/output-dialog/synchronize.vue
......@@ -9,7 +9,7 @@
>
<el-form ref="synForm" :model="synForm" label-width="200px">
<el-form-item label="步骤名称:" label-width="120px">
<el-input v-model="synForm.name" placeholder="数据同步" value="数据同步"></el-input>
<el-input v-model="synForm.label" placeholder="数据同步" value="数据同步"></el-input>
</el-form-item>
<el-tabs v-model="activeName" type="border-card">
<el-tab-pane label="一般" name="content">
......@@ -123,12 +123,12 @@
width="500px"
:before-close="handleCloseEditUpdate"
append-to-body>
<el-form ref="form" :model="fieldFormUpdate" label-width="80px">
<el-form ref="formUpdate" :model="fieldFormUpdate" label-width="80px">
<el-form-item label="表字段:">
<!-- <el-select v-model="fieldFormUpdate.name" style="width: 100%">
<el-option v-for="(item,index) in fieldsList" :key="index" :label="item.name" :value="item.name"></el-option>
</el-select> -->
<el-select v-model="fieldForm.field" style="width: 100%" @focus="tableFields">
<el-select v-model="fieldFormUpdate.name" style="width: 100%" @focus="tableFields">
<el-option v-for="(item,index) in fieldsList1" :key="index" :label="item.name" :value="item.name"></el-option>
</el-select>
</el-form-item>
......@@ -137,7 +137,7 @@
<!-- <el-select v-model="fieldFormUpdate.rename" style="width: 100%">
<el-option v-for="(item,index) in fieldsList" :key="index" :label="item.name" :value="item.name"></el-option>
</el-select> -->
<el-select v-model="fieldForm.name" style="width: 100%" @focus="inputOutputFields">
<el-select v-model="fieldFormUpdate.rename" style="width: 100%" @focus="inputOutputFields">
<el-option v-for="(item,index) in fieldsList2" :key="index" :label="item.name" :value="item.name"></el-option>
</el-select>
</el-form-item>
......@@ -301,24 +301,25 @@ export default ({
],
// 表格数据
tableData: [{
field: '3',
condition: '鞠婧祎',
name: '女',
name2:'1',
},
{
field: '4',
condition: '鞠婧祎',
name: '女',
name2:'1',
},
{
field: '5',
condition: '鞠婧祎',
name: '女',
name2:'1',
},
tableData: [
// {
// field: '3',
// condition: '鞠婧祎',
// name: '女',
// name2:'1',
// },
// {
// field: '4',
// condition: '鞠婧祎',
// name: '女',
// name2:'1',
// },
// {
// field: '5',
// condition: '鞠婧祎',
// name: '女',
// name2:'1',
// },
],
// 查询字段--end------------
// 更新字段start------------
......@@ -336,16 +337,18 @@ export default ({
],
// 表格数据
tableDataUpdate: [{
name: '1',
rename: '鞠婧祎1',
update: '女',
},
{
name: '2',
rename: '鞠婧祎2',
update: '女2',
},],
tableDataUpdate: [
// {
// name: '1',
// rename: '鞠婧祎1',
// update: '女',
// },
// {
// name: '2',
// rename: '鞠婧祎2',
// update: '女2',
// },
],
yesOrNoList:[{value: 'Y', text: '是'},
{value: 'N', text: '否'}]
// 更新字段end-------------------
......@@ -469,7 +472,9 @@ export default ({
clickFun(graph){
console.log(graph,'双击获取值')
this.newGraph = graph;
this.$refs.databaseChoose.clickFun(this.newGraph);
setTimeout(() => {
this.$refs.databaseChoose.clickFun(this.newGraph);
}, 500);
},
handleClose(){
this.$emit("update:synVisible", false);
......@@ -532,7 +537,9 @@ export default ({
// -----更新end------------------
tableFields(){
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);
let pamer = new FormData(); // 创建form对象
......@@ -562,7 +569,9 @@ export default ({
//获取表输出
inputOutputFields(){
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);
let pamer = new FormData(); // 创建form对象
......
src/views/output-dialog/table-out.vue
......@@ -58,7 +58,7 @@
<el-form-item label="分区字段:" >
<el-row :gutter="10">
<el-col :span="23">
<el-select v-model="tableOutForm.partitioning_field" style="width: 100%" :disabled="tableOutForm.partitioning_enabled=='Y'? false :true">
<el-select v-model="tableOutForm.partitioning_field" style="width: 100%" :disabled="tableOutForm.partitioning_enabled=='Y'? false :true" @focus="inputOutputFields">
<!-- <el-option label="区域一" value="shanghai"></el-option>
<el-option label="区域二" value="beijing"></el-option> -->
<el-option v-for="(item,index) in fieldsList2" :key="index" :label="item.name" :value="item.name"></el-option>
......@@ -99,7 +99,7 @@
<el-form-item label="包含表名的字段:">
<el-row :gutter="10">
<el-col :span="23">
<el-select v-model="tableOutForm.tablename_field" :disabled="tableOutForm.tablename_in_field=='Y'? false :true" style="width: 100%">
<el-select @focus="inputOutputFields" v-model="tableOutForm.tablename_field" :disabled="tableOutForm.tablename_in_field=='Y'? false :true" style="width: 100%">
<!-- <el-option label="区域一" value="shanghai"></el-option>
<el-option label="区域二" value="beijing"></el-option> -->
<el-option v-for="(item,index) in fieldsList2" :key="index" :label="item.name" :value="item.name"></el-option>
......@@ -309,19 +309,27 @@ export default ({
},
watch:{
tableOutForm:{
// deep:true,
// immediate:true,
handler:function(n,o){
console.log("回显的表单数据===",n);
// tableOutForm:{
// // deep:true,
// // immediate:true,
// handler:function(n,o){
// console.log("回显的表单数据===",n);
// if(n){
// var ny=JSON.parse(n.fields);
// this.tableData=ny;
// }
// }
// },
tableOutForm(n,o){
console.log("回显的表单数据===",n);
if(n){
var ny=JSON.parse(n.fields);
this.tableData=ny;
}
}
},
},
graph(n,o){
console.log("表输出拿到的画布1111===",n);
}
......@@ -351,9 +359,10 @@ export default ({
},
tableFields(){
// if(this.doubleClickCell){
// var title=this.doubleClickCell.title
// }
if(this.doubleClickCell){
// var title=this.doubleClickCell.title
var title=this.doubleClickCell.value.attributes.label.value
}
console.log('获取cell888888===',this.doubleClickCell);
let pamer = new FormData(); // 创建form对象
// pamer.append("stepName", encodeURIComponent(title));
......@@ -384,13 +393,14 @@ export default ({
},
//获取表输出
inputOutputFields(){
// if(this.doubleClickCell){
// var title=this.doubleClickCell.title
// }
if(this.doubleClickCell){
// var title=this.doubleClickCell.title
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("stepName", encodeURIComponent(this.tableOutForm.label));
pamer.append("stepName", encodeURIComponent(title));
// pamer.append("stepName", encodeURIComponent(this.tableOutForm.label));
// pamer.append("graphXml", this.getXmlVal);
// 画布xml转码
......
src/views/output-dialog/text-file-output.vue
......@@ -10,7 +10,7 @@
<div id="ExcelInputDialog"></div>
<el-form ref="textFileForm" :model="textFileForm" label-width="200px">
<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-tabs v-model="activeName" type="border-card">
<el-tab-pane label="文件" name="content">
......@@ -689,11 +689,14 @@ export default ({
//获取表输出
inputOutputFields(){
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);
let pamer = new FormData(); // 创建form对象
pamer.append("stepName", encodeURIComponent(title));
// pamer.append("stepName", encodeURIComponent(this.textFileForm.label));
// pamer.append("graphXml", this.getXmlVal);
// 画布xml转码
const codec = new mxCodec();
......
src/views/output-dialog/update.vue
......@@ -9,7 +9,7 @@
>
<el-form ref="updateForm" :model="updateForm" label-width="200px">
<el-form-item label="步骤名称:" label-width="120px">
<el-input v-model="updateForm.name"></el-input>
<el-input v-model="updateForm.label"></el-input>
</el-form-item>
......@@ -362,7 +362,9 @@ export default ({
clickFun(graph){
console.log(graph,'双击获取值')
this.newGraph = graph;
this.$refs.databaseChoose.clickFun(this.newGraph);
setTimeout(() => {
this.$refs.databaseChoose.clickFun(this.newGraph);
}, 500);
},
handleClose(){
this.$emit("update:updateVisible", false);
......@@ -426,7 +428,9 @@ export default ({
tableFields(){
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);
let pamer = new FormData(); // 创建form对象
......@@ -456,7 +460,8 @@ export default ({
//获取表输出
inputOutputFields(){
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);
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