Skip to content

E
ETL-admin
Commit 1fa2926e by 李耀锟
Options

解决冲突

parents bd337c98 ed06c877
Showing with 390 additions and 121 deletions
src/views/dashboard-kettle/components/designer/mxgraphDesigner.vue
......@@ -821,12 +821,14 @@
:doubleClickCell="doubleClickCell"
:getXmlVal="getXmlVal"
@fathertrans="fathertrans"
:saveOutputDialog="saveOutputDialog"
:tableOutForm="outPutFormData"
></outDialog>
<insertOrUpdate
ref="insertOrdate"
:InsertOrUpdateVisible.sync="InsertOrUpdateVisible"
:saveOutputDialog="saveOutputDialog"
:doubleClickCell="doubleClickCell"
:getXmlVal="getXmlVal"
......@@ -835,6 +837,7 @@
<excelOutPutDialog
ref="excelOut"
:excelOutPutVisible.sync="excelOutPutVisible"
:saveOutputDialog="saveOutputDialog"
:doubleClickCell="doubleClickCell"
:excelForm="outPutFormData"
......@@ -842,6 +845,7 @@
<updateDialog
ref="update"
:updateVisible.sync="updateVisible"
:saveOutputDialog="saveOutputDialog"
:doubleClickCell="doubleClickCell"
:updateForm="outPutFormData"
......@@ -870,6 +874,7 @@
<textFileDialog
ref="textFile"
:fileVisible.sync="fileVisible"
:saveOutputDialog="saveOutputDialog"
:textFileForm="outPutFormData"
></textFileDialog>
......@@ -881,6 +886,7 @@
></microDialog>
<!-- 输出弹窗end================== -->
<trans-graph
:transGraphVisible.sync="transGraphVisible"
:getXmlVal="getXmlVal"
......@@ -953,9 +959,19 @@ export default {
data() {
return {
outPutFormData: {}, //输出弹窗组件的表单值
doubleClickCell: {},
transGraphVisible: false, //执行转换弹窗
outPutFormData1:{},
outPutFormData2:{},
outPutFormData3:{},
outPutFormData4:{},
outPutFormData5:{},
outPutFormData6:{},
outPutFormData7:{},
outPutFormData8:{},
outPutFormData9:{},
outPutFormData:{},//输出弹窗组件的表单值
doubleClickCell:{},
transGraphVisible:false,//执行转换弹窗
monitorCanvas: "", //监听画布
getXmlVal: "", //获取上一个xml
keyHandler: null,
......@@ -963,6 +979,7 @@ export default {
graphXml: "",
xmlDocuments: "", //获取解码的xml
boxInformation: "", //弹框信息
toolItemData: {}, //新增节点时的值
doubleClickCell: {}, //双击节点
......@@ -1002,6 +1019,7 @@ export default {
activeName: "file",
fieldType: [],
fieldFormat: [],
fields: [],
engine: [],
......@@ -1305,11 +1323,13 @@ export default {
this.graph.setAllowDanglingEdges(false);
this.graph.setDisconnectOnMove(false);
this.graph.setMultigraph(false);
this.graph.convertValueToString = (cell) => {
var label = cell.getAttribute("label");
// var icon = cell.getAttribute(cell.style.split("image="))
return label;
// console.log(cell.value.attributes,99999999999999);
......@@ -1402,11 +1422,13 @@ export default {
inputOutputFields().then((res) => {});
if (
cell.ids == "step1" ||
cell.value.attributes.ctype.value == "ExcelInput"
) {
this.excelLnput = !this.excelLnput;
this.form = {};
let q = {};
let obj = cell.value.attributes;
......@@ -1436,7 +1458,7 @@ export default {
this.graphXml = mxUtils.getPrettyXml(node);
this.form = {};
let q = {};
let obj = cell.value.attributes;
for (let vel in obj) {
let key = obj[vel];
......@@ -1531,48 +1553,52 @@ export default {
// let key = obj[vel];
// q[key.name] = key.value;
// }
this.outPutFormData = this.showDataFunc();
this.outPutFormData1 = this.showDataFunc();
return;
} else if (cell.ids == "step16") {
} else if (cell.ids == "step16" || cell.value.attributes.ctype.value == "Update" ) {
//更新
this.updateVisible = !this.updateVisible;
<<<<<<< .mine
this.outPutFormData = this.showDataFunc();
=======
this.outPutFormData2 = this.showDataFunc();
>>>>>>> .theirs
return;
} else if (cell.ids == "step15") {
} else if (cell.ids == "step15" || cell.value.attributes.ctype.value == "TextFileOutput" ) {
//文本文件输出
this.fileVisible = !this.fileVisible;
this.outPutFormData = this.showDataFunc();
this.outPutFormData3 = this.showDataFunc();
return;
} else if (cell.ids == "step14") {
} else if (cell.ids == "step14" || cell.value.attributes.ctype.value == "SynchronizeAfterMerge" ) {
//数据同步
this.synVisible = !this.synVisible;
this.outPutFormData = this.showDataFunc();
this.outPutFormData4 = this.showDataFunc();
return;
} else if (cell.ids == "step13") {
} else if (cell.ids == "step13" || cell.value.attributes.ctype.value == "InsertUpdate" ) {
//插入、更新
this.InsertOrUpdateVisible = !this.InsertOrUpdateVisible;
this.outPutFormData = this.showDataFunc();
this.outPutFormData5 = this.showDataFunc();
return;
} else if (cell.ids == "step12") {
} else if (cell.ids == "step12" || cell.value.attributes.ctype.value == "Delete" ) {
//删除
this.deleteVisible = !this.deleteVisible;
this.outPutFormData = this.showDataFunc();
this.outPutFormData6 = this.showDataFunc();
return;
} else if (cell.ids == "step11") {
} else if (cell.ids == "step11" || cell.value.attributes.ctype.value == "SQLFileOutput" ) {
//SQL文件输出
this.sqlVisible = !this.sqlVisible;
this.outPutFormData = this.showDataFunc();
this.outPutFormData7 = this.showDataFunc();
return;
} else if (cell.ids == "step10") {
//mico-Excel输出
this.microVisible = !this.microVisible;
// this.outPutFormData = this.showDataFunc();
this.outPutFormData9 = this.showDataFunc();
return;
} else if (cell.ids == "step9") {
} else if (cell.ids == "step9" || cell.value.attributes.ctype.value == "ExcelOutput" ) {
//Excel输出
this.excelOutPutVisible = !this.excelOutPutVisible;
this.outPutFormData = this.showDataFunc();
this.outPutFormData8 = this.showDataFunc();
return;
}
});
......@@ -1588,11 +1614,19 @@ export default {
// 回显数据封装的方法
showDataFunc() {
let q = {};
<<<<<<< .mine
let obj = cell.value.attributes;
for (let vel in obj) {
let key = obj[vel];
q[key.name] = key.value;
}
=======
let obj = this.doubleClickCell.value.attributes;
for (let vel in obj) {
let key = obj[vel];
q[key.name] = key.value;
}
>>>>>>> .theirs
return q;
},
......@@ -1911,8 +1945,13 @@ export default {
console.log(res);
if (res.success) {
this.$message.success("保存流程成功！暂时请查先看控制台。");
<<<<<<< .mine
=======
// this.createGraph();
>>>>>>> .theirs
} else {
this.$message.error(res.errMsg);
this.$message.error(res.errMsg);
}
});
},
......
src/views/dialogs-components/global/database-choose/main.vue
......@@ -65,7 +65,7 @@ export default {
curNode:[],
chooseFlag:false,//选择模式
newForm:{},
chooseType:'模式'
chooseType:''
}
},
......@@ -147,13 +147,15 @@ export default {
},
//浏览
scanTree(type){
this.chooseType=type;
if(this.selectName){
this.$refs.establishDia.database(this.selectName);
console.log('当前选中数据库***************',this.dataBaseName);
if(this.dataBaseName){
this.$refs.establishDia.scanDialogOpen();
this.chooseFlag=true;
this.chooseType=type;
console.log("浏览弹窗传过去的类型=====",type);
// this.chooseType=type;
}
}else{
this.$message.error('请选择数据库')
......
src/views/dialogs-components/global/establish/main.vue
......@@ -812,8 +812,8 @@ export default {
if (res.length > 0) {
resolve(res);
} else if (!res.success) {
// let data = [];
let data=null;
let data = [];
// let data=null;
resolve(data);
}
} else {
......@@ -846,7 +846,7 @@ export default {
this.nodeId = "";
this.text = "root";
this.node = "xnode-4528";
this.$emit("getSonValue", this.curChooseNode);
// this.$emit("getSonValue", this.curChooseNode);
this.$emit("update:chooseFlag", false);
},
......
src/views/output-dialog/Excel-output.vue
......@@ -368,11 +368,48 @@
</el-tab-pane>
<el-tab-pane label="字段" name="word ">
<el-table style="width: 100%" border :data="tableData">
<!-- <el-table style="width: 100%" border :data="tableData">
<template v-for="(item,index) in tableHead">
<el-table-column :prop="item.column_name" :label="item.column_comment" :key="index" v-if="item.column_name != 'id'"></el-table-column>
</template>
</el-table>
</el-table> -->
<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>
</div>
<table-list ref="tableDia" :tableHead="tableHead" :tableData="tableData" :field.sync="editDia" :fieldClick="fieldClick"></table-list>
<!-- 编辑弹窗开始=========== -->
<el-dialog
title="编辑"
:visible.sync="field"
width="500px"
:before-close="handleCloseEdit"
append-to-body>
<el-form ref="form1" :model="fieldForm" label-width="80px">
<el-form-item label="名称:">
<el-input v-model="fieldForm.name"></el-input>
</el-form-item>
<el-form-item label="类型:">
<!-- <el-select v-model="fieldForm.condition" style="width: 100%">
<el-option v-for="(item,index) in keyConditionList" :key="index" :label="item.text" :value="item.value"></el-option>
</el-select> -->
<el-input v-model="fieldForm.type"></el-input>
</el-form-item>
<el-form-item label="格式:">
<el-input v-model="fieldForm.format"></el-input>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="field = false">取 消</el-button>
<el-button type="primary" @click="addField">确 定</el-button>
</span>
</el-dialog>
<!-- 编辑弹窗结束============ -->
</el-card>
</el-tab-pane>
</el-tabs>
</el-form>
......@@ -400,6 +437,9 @@ import {
export default ({
data(){
return{
field:false,//编辑弹窗
editDia:false,//编辑表字段
fieldForm:{},//编辑弹窗
fileDialogVisible:false,//选择文件夹弹窗
formName:'',
// excelForm:{
......@@ -462,31 +502,33 @@ export default ({
// 表头数据
tableHead:[
{
column_name: "column_name",column_comment:"姓名"
column_name: "name",column_comment:"名称"
},
{
column_name: "column_age",column_comment:"年龄"
column_name: "type",column_comment:"类型"
},
{
column_name: "column_sex",column_comment:"性别"
column_name: "format",column_comment:"格式"
}
],
// 表格数据
tableData: [{
column_age: '3',
column_name: '鞠婧祎',
column_sex: '女'
},
tableData: [
{
column_age: '25',
column_name: '魏大勋',
column_sex: '男'
name: '31',
type: '鞠婧祎',
format: '女'
},
{
name: '32',
type: '鞠婧祎',
format: '女'
},
{
column_age: '18',
column_name: '关晓彤',
column_sex: '女'
}],
name: '33',
type: '鞠婧祎',
format: '女'
},
],
formatTimeList:[],//时间日期格式
codeList:[],//编码
headFontList:[],//表头字体
......@@ -503,15 +545,23 @@ export default ({
},
watch:{
deleteForm:{
deep:true,
handler:function(n,o){
console.log("回显的表单数据===",n);
var ny=JSON.parse(n.fields);
this.tableData=ny;
// deleteForm:{
// deep:true,
// handler:function(n,o){
// console.log("回显的表单数据===",n);
// var ny=JSON.parse(n.fields);
// this.tableData=ny;
}
}
// }
// }
deleteForm(n, o) {
console.log("回显的表单数据===",n);
if(n){
var ny=JSON.parse(n.fields);
this.tableData=ny;
}
},
},
props:{
......@@ -524,6 +574,7 @@ export default ({
type: Boolean,
default:false
},
saveOutputDialog:Function,
},
// mounted(){
......@@ -647,7 +698,33 @@ export default ({
confirm(){
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);
this.handleClose();//关闭弹窗
},
//新增或者编辑弹窗
fieldClick(state, val) {
this.field = !this.field;
this.dataState = state;
if (state) {
this.fieldForm = {};
} else {
this.fieldForm = val;
}
},
//关闭编辑的弹窗
handleCloseEdit(){
this.field = !this.field;
},
// 字段
addField() {
this.field = !this.field;
console.log('添加的字段===',this.fieldForm);
if (this.dataState) {
this.tableData.push(this.fieldForm);
}
},
}
......
src/views/output-dialog/delete.vue
......@@ -31,12 +31,57 @@
<el-card class="box-card">
<div slot="header" class="clearfix">
<span>查询值所需的关键字</span>
<el-button style="padding: 3px 0;margin-left:50px;" type="text" @click="fieldClick(true)">新增字段</el-button>
</div>
<el-table style="width: 100%" border :data="tableData">
<!-- <el-table style="width: 100%" border :data="tableData">
<template v-for="(item,index) in tableHead">
<el-table-column :prop="item.column_name" :label="item.column_comment" :key="index" v-if="item.column_name != 'id'"></el-table-column>
</template>
</el-table>
</el-table> -->
<table-list ref="tableDia" :tableHead="tableHead" :tableData="tableData" :field.sync="editDia" :fieldClick="fieldClick"></table-list>
<!-- 编辑弹窗开始=========== -->
<el-dialog
title="编辑"
:visible.sync="field"
width="500px"
:before-close="handleCloseEdit"
append-to-body>
<el-form ref="form1" :model="fieldForm" label-width="80px">
<el-form-item label="表字段:">
<!-- <el-select v-model="fieldForm.field" style="width: 100%">
<el-option v-for="(item,index) in fieldsList" :key="index" :label="item.name" :value="item.name"></el-option>
</el-select> -->
<el-input v-model="fieldForm.field"></el-input>
</el-form-item>
<el-form-item label="比较符:">
<el-select v-model="fieldForm.condition" style="width: 100%">
<el-option v-for="(item,index) in keyConditionList" :key="index" :label="item.text" :value="item.value"></el-option>
</el-select>
</el-form-item>
<el-form-item label="流里的字段1:">
<!-- <el-select v-model="fieldForm.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-input v-model="fieldForm.name"></el-input>
</el-form-item>
<el-form-item label="流里的字段2:">
<!-- <el-select v-model="fieldForm.name2" style="width: 100%">
<el-option v-for="(item,index) in fieldsList" :key="index" :label="item.name" :value="item.name"></el-option>
</el-select> -->
<el-input v-model="fieldForm.name2"></el-input>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="field = false">取 消</el-button>
<el-button type="primary" @click="addField">确 定</el-button>
</span>
</el-dialog>
<!-- 编辑弹窗结束============ -->
</el-card>
</el-form>
......@@ -53,6 +98,9 @@
export default ({
data(){
return{
field:false,//编辑弹窗
editDia:false,//编辑表字段
fieldForm:{},//编辑弹窗
stepName:{name:'删除'},
activeName:'content',
// deleteForm:{
......@@ -73,51 +121,73 @@ export default ({
// table: "",
// },
// 查询字段--start------------
fieldsList:[],//字段获取
keyConditionList:[{value: '=', text: '='},
{value: '<>', text: '<>'},
{value: '<', text: '<'},
{value: '<=', text: '<='},
{value: '>', text: '>'},
{value: '>=', text: '>='},
{value: 'LIKE', text: 'LIKE'},
{value: 'BETWEEN', text: 'BETWEEN'},
{value: 'IS NULL', text: 'IS NULL'},
{value: 'IS NOT NULL', text: 'IS NOT NULL'}],
// 表头数据
tableHead:[
{
column_name: "column_name",column_comment:"表字段"
column_name: "field",column_comment:"表字段"
},
{
column_name: "column_age",column_comment:"比较符"
column_name: "condition",column_comment:"比较符"
},
{
column_name: "column_sex",column_comment:"流里的字段1"
column_name: "name",column_comment:"流里的字段1"
},
{
column_name: "column_col",column_comment:"流里的字段2"
},
column_name: "name2",column_comment:"流里的字段2"
}
],
// 表格数据
tableData: [{
column_age: '3',
column_name: '鞠婧祎',
column_sex: '女',
column_col:'0'
},
{
column_age: '25',
column_name: '魏大勋',
column_sex: '男',
column_col:'1'
},
{
column_age: '18',
column_name: '关晓彤',
column_sex: '女',
column_col:'2'
}],
tableData: [
// {
// field: '3',
// condition: '鞠婧祎',
// name: '女',
// name2:'1',
// },
// {
// field: '31',
// condition: '鞠婧祎',
// name: '女',
// name2:'1',
// },
// {
// field: '32',
// condition: '鞠婧祎',
// name: '女',
// name2:'1',
// },
],
// 查询字段--end------------
}
},
watch:{
deleteForm:{
deep:true,
// deep:true,
// immediate:true,
handler:function(n,o){
console.log("回显的表单数据===",n);
var ny=JSON.parse(n.key);
if(n){
var ny=JSON.parse(n.key);
this.tableData=ny;
}
}
}
......@@ -152,6 +222,28 @@ export default ({
this.saveOutputDialog(this.deleteForm);
this.handleClose();//关闭弹窗
},
//新增或者编辑弹窗
fieldClick(state, val) {
this.field = !this.field;
this.dataState = state;
if (state) {
this.fieldForm = {};
} else {
this.fieldForm = val;
}
},
//关闭编辑的弹窗
handleCloseEdit(){
this.field = !this.field;
},
// 字段
addField() {
this.field = !this.field;
console.log('添加的字段===',this.fieldForm);
if (this.dataState) {
this.tableData.push(this.fieldForm);
}
},
......
src/views/output-dialog/insertOrUpdate.vue
......@@ -258,16 +258,29 @@ export default ({
}
},
watch:{
insertOrUpdateForm:{
deep:true,
handler:function(n,o){
console.log("回显的表单数据===",n);
var ny=JSON.parse(n.searchFields);
var na=JSON.parse(n.updateFields);
// insertOrUpdateForm:{
// // deep:true,
// // immediate:true,
// handler:function(n,o){
// console.log("回显的表单数据===",n);
// if(n){
// var ny=JSON.parse(n.searchFields);
// var na=JSON.parse(n.updateFields);
// this.tableData=ny;
// this.tableDataUpdate=na;
// }
// }
// }
insertOrUpdateForm(n, o) {
console.log("回显的表单数据===",n);
if(n){
var ny=JSON.parse(n.searchFields);
var na=JSON.parse(n.updateFields);
this.tableData=ny;
this.tableDataUpdate=na;
}
}
}
},
},
props:["insertOrUpdateForm","InsertOrUpdateVisible","doubleClickCell","getXmlVal","saveOutputDialog"],
......@@ -287,10 +300,10 @@ export default ({
},
confirm(){
this.insertOrUdateForm.searchFields=JSON.stringify(this.tableData);//查询字段
this.insertOrUdateForm.updateFields=JSON.stringify(this.tableDataUpdate);//更新字段
console.log('弹窗数据：===',this.insertOrUdateForm);
this.saveOutputDialog(this.insertOrUdateForm);
this.insertOrUpdateForm.searchFields=JSON.stringify(this.tableData);//查询字段
this.insertOrUpdateForm.updateFields=JSON.stringify(this.tableDataUpdate);//更新字段
console.log('弹窗数据：===',this.insertOrUpdateForm);
this.saveOutputDialog(this.insertOrUpdateForm);
this.handleClose();//关闭弹窗
......
src/views/output-dialog/micro-excel.vue
......@@ -317,7 +317,7 @@
<span slot="footer" class="dialog-footer">
<el-button @click="microVisible = false">取 消</el-button>
<el-button type="primary" @click="microVisible = false">确 定</el-button>
<el-button type="primary" @click="confirm">确 定</el-button>
</span>
</el-dialog>
</div>
......@@ -420,8 +420,12 @@ export default ({
},
confirm(){
this.updateForm.searchFields=JSON.stringify(this.tableData);//查询字段
this.updateForm.updateFields=JSON.stringify(this.tableDataUpdate);//更新字段
console.log('弹窗数据===',this.updateForm);
this.saveOutputDialog(this.updateForm);
this.handleClose();//关闭弹窗
},
//新建转换
createTrans(){
......
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="数据同步"></el-input>
<el-input v-model="synForm.name" placeholder="数据同步" value="数据同步"></el-input>
</el-form-item>
<el-tabs v-model="activeName" type="border-card">
<el-tab-pane label="一般" name="content">
......@@ -377,16 +377,30 @@ export default ({
}
},
watch:{
synForm:{
deep:true,
handler:function(n,o){
console.log("回显的表单数据===",n);
var ny=JSON.parse(n.searchFields);
var na=JSON.parse(n.updateFields);
// synForm:{
// // deep:true,
// // immediate:true,
// handler:function(n,o){
// console.log("回显的表单数据===",n);
// if(n){
// var ny=JSON.parse(n.searchFields);
// var na=JSON.parse(n.updateFields);
// this.tableData=ny;
// this.tableDataUpdate=na;
// }
// }
// }
synForm(n, o) {
console.log("回显的表单数据===",n);
if(n){
var ny=JSON.parse(n.searchFields);
var na=JSON.parse(n.updateFields);
this.tableData=ny;
this.tableDataUpdate=na;
}
}
}
},
},
props:{
......
src/views/output-dialog/table-out.vue
......@@ -328,11 +328,15 @@ export default ({
watch:{
tableOutForm:{
deep:true,
// deep:true,
// immediate:true,
handler:function(n,o){
console.log("回显的表单数据===",n);
var ny=JSON.parse(n.fields);
if(n){
var ny=JSON.parse(n.fields);
this.tableData=ny;
}
}
}
......
src/views/output-dialog/text-file-output.vue
......@@ -509,15 +509,26 @@ export default ({
}
},
watch:{
textFileForm:{
deep:true,
handler:function(n,o){
console.log("回显的表单数据===",n);
textFileForm(n, o) {
console.log("回显的表单数据===",n);
if(n){
var ny=JSON.parse(n.fields);
this.tableData=ny;
this.tableData=ny;
}
}
},
// textFileForm:{
// // deep:true,
// // immediate:true,
// handler:function(n,o){
// console.log("回显的表单数据===",n);
// if(n){
// var ny=JSON.parse(n.fields);
// this.tableData=ny;
// }
// }
// }
},
props:{
textFileForm:Object,
......
src/views/output-dialog/update.vue
......@@ -275,16 +275,29 @@ export default ({
},
watch:{
synForm:{
deep:true,
handler:function(n,o){
console.log("回显的表单数据===",n);
var ny=JSON.parse(n.searchFields);
var na=JSON.parse(n.updateFields);
// synForm:{
// deep:true,
// immediate:true,
// handler:function(n,o){
// console.log("回显的表单数据===",n);
// if(n){
// var ny=JSON.parse(n.searchFields);
// var na=JSON.parse(n.updateFields);
// this.tableData=ny;
// this.tableDataUpdate=na;
// }
// }
// }
updateForm(n, o) {
console.log("回显的表单数据===",n);
if(n){
var ny=JSON.parse(n.searchFields);
var na=JSON.parse(n.updateFields);
this.tableData=ny;
this.tableDataUpdate=na;
}
}
}
},
},
props:{
updateForm:Object,
......@@ -314,10 +327,10 @@ export default ({
},
confirm(){
this.insertOrUdateForm.searchFields=JSON.stringify(this.tableData);//查询字段
this.insertOrUdateForm.updateFields=JSON.stringify(this.tableDataUpdate);//更新字段
this.updateForm.searchFields=JSON.stringify(this.tableData);//查询字段
this.updateForm.updateFields=JSON.stringify(this.tableDataUpdate);//更新字段
console.log('弹窗数据===',this.updateForm);
this.saveOutputDialog(this.insertOrUdateForm);
this.saveOutputDialog(this.updateForm);
this.handleClose();//关闭弹窗
},
......
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