Skip to content

E
ETL-admin
Commit c4277ba7 by 李耀琨
Options

解决冲突

parents 72bc21ce 75bf95a4
Showing with 68 additions and 38 deletions
src/views/dashboard-kettle/components/designer/mxgraphDesigner.vue
...@@ -820,32 +820,26 @@ ...@@ -820,32 +820,26 @@
<insertOrUpdate <insertOrUpdate
ref="insertOrdate" ref="insertOrdate"
:InsertOrUpdateVisible.sync="InsertOrUpdateVisible" :InsertOrUpdateVisible.sync="InsertOrUpdateVisible"
></insertOrUpdate> :saveOutputDialog="saveOutputDialog" :doubleClickCell="doubleClickCell"></insertOrUpdate>
<excelOutPutDialog <excelOutPutDialog
ref="excelOut" ref="excelOut"
:excelOutPutVisible.sync="excelOutPutVisible" :excelOutPutVisible.sync="excelOutPutVisible"
></excelOutPutDialog> :saveOutputDialog="saveOutputDialog" :doubleClickCell="doubleClickCell"></excelOutPutDialog>
<updateDialog <updateDialog
ref="update" ref="update"
:updateVisible.sync="updateVisible" :updateVisible.sync="updateVisible"
></updateDialog> :saveOutputDialog="saveOutputDialog" :doubleClickCell="doubleClickCell"></updateDialog>
<synDialog ref="syn" :synVisible.sync="synVisible"></synDialog> <synDialog ref="syn" :synVisible.sync="synVisible" :saveOutputDialog="saveOutputDialog" :doubleClickCell="doubleClickCell"></synDialog>
<delDialog ref="del" :deleteVisible.sync="deleteVisible"></delDialog> <delDialog ref="del" :deleteVisible.sync="deleteVisible" :saveOutputDialog="saveOutputDialog" :doubleClickCell="doubleClickCell"></delDialog>
<sqlDialog ref="sql" :sqlVisible.sync="sqlVisible"></sqlDialog> <sqlDialog ref="sql" :sqlVisible.sync="sqlVisible" :saveOutputDialog="saveOutputDialog" :doubleClickCell="doubleClickCell"></sqlDialog>
<textFileDialog <textFileDialog
ref="textFile" ref="textFile"
:fileVisible.sync="fileVisible" :fileVisible.sync="fileVisible"
></textFileDialog> :saveOutputDialog="saveOutputDialog"></textFileDialog>
<microDialog ref="mic" :microVisible.sync="microVisible"></microDialog> <microDialog ref="mic" :microVisible.sync="microVisible" :saveOutputDialog="saveOutputDialog"></microDialog>
<!-- 输出弹窗end================== --> <!-- 输出弹窗end================== -->
<!-- 转换弹窗开始 -->
<trans-graph
ref="transGraph"
:transGraphVisible.sync="transGraphVisible" :transGraphVisible.sync="transGraphVisible"
:getXmlVal.sync="getXmlVal"
></trans-graph>
<!-- 转换弹窗结束 -->
</div> </div>
</template> </template>
...@@ -899,9 +893,9 @@ const { ...@@ -899,9 +893,9 @@ const {
mxCodec, mxCodec,
mxGraphModel, mxGraphModel,
mxGeometry, mxGeometry,
mxCell,
} = mxgraph; } = mxgraph;
export default { export default {
// props: { // props: {
// dialogVisibleFourth: { // dialogVisibleFourth: {
...@@ -915,8 +909,6 @@ export default { ...@@ -915,8 +909,6 @@ export default {
data() { data() {
return { return {
transGraphVisible: false, //转换弹窗
doubleClickCell: {}, //双击的cell
monitorCanvas: "", //监听画布 monitorCanvas: "", //监听画布
getXmlVal: "", //获取上一个xml getXmlVal: "", //获取上一个xml
keyHandler: null, keyHandler: null,
...@@ -924,7 +916,6 @@ export default { ...@@ -924,7 +916,6 @@ export default {
graphXml: "", graphXml: "",
xmlDocuments: "", //获取解码的xml xmlDocuments: "", //获取解码的xml
boxInformation: "", //弹框信息 boxInformation: "", //弹框信息
nodeData: {}, //节点数据
toolItemData:{},//新增节点时的值 toolItemData:{},//新增节点时的值
// mxl================================= // mxl=================================
...@@ -1081,11 +1072,9 @@ export default { ...@@ -1081,11 +1072,9 @@ export default {
this.graph.getModel().beginUpdate(); this.graph.getModel().beginUpdate();
try { try {
var doc = mxUtils.parseXml(decodeURIComponent(this.blankCanvas)); var doc = mxUtils.parseXml(decodeURIComponent(this.blankCanvas));
console.log(doc, 77777777777777);
var codec = new mxCodec(doc); var codec = new mxCodec(doc);
codec.decode(doc.documentElement, this.graph.getModel()); codec.decode(doc.documentElement, this.graph.getModel());
console.log(codec.decode(doc.documentElement), 222222222222222222);
} finally { } finally {
this.graph.getModel().endUpdate(); this.graph.getModel().endUpdate();
} }
...@@ -1093,15 +1082,6 @@ export default { ...@@ -1093,15 +1082,6 @@ export default {
excelLnputDetermine() { excelLnputDetermine() {
this.excelLnput = !this.excelLnput; this.excelLnput = !this.excelLnput;
for (let name in this.form) {
var edit = new mxCellAttributeChange(
this.nodeData,
name,
this.form[name]
);
this.graph.getModel().execute(edit);
}
console.log(edit, 4564564564654);
}, },
// 子组件发射回来的弹窗变量变为true // 子组件发射回来的弹窗变量变为true
fathertrans(res) { fathertrans(res) {
...@@ -1343,6 +1323,7 @@ export default { ...@@ -1343,6 +1323,7 @@ export default {
pamerFields.append("valueType", "all"); pamerFields.append("valueType", "all");
inputOutputFields().then((res) => {}); inputOutputFields().then((res) => {});
if (cell.ids == "step1" || cell.value.attributes.ctype.value == "ExcelInput") { if (cell.ids == "step1" || cell.value.attributes.ctype.value == "ExcelInput") {
this.excelLnput = !this.excelLnput; this.excelLnput = !this.excelLnput;
...@@ -1355,6 +1336,7 @@ export default { ...@@ -1355,6 +1336,7 @@ export default {
this.form = q this.form = q
return; return;
} else if (cell.ids == "step7" || cell.value.attributes.ctype.value == "TableInput") { } else if (cell.ids == "step7" || cell.value.attributes.ctype.value == "TableInput") {
this.TableInputDialog = !this.TableInputDialog; this.TableInputDialog = !this.TableInputDialog;
let q = {}; let q = {};
...@@ -1365,6 +1347,7 @@ export default { ...@@ -1365,6 +1347,7 @@ export default {
} }
this.form = q this.form = q
return; return;
} else if (cell.ids == "step6" || cell.value.attributes.ctype.value == "SystemInfo") { } else if (cell.ids == "step6" || cell.value.attributes.ctype.value == "SystemInfo") {
this.SystemInfoDialog = !this.SystemInfoDialog; this.SystemInfoDialog = !this.SystemInfoDialog;
let q = {}; let q = {};
...@@ -1375,6 +1358,7 @@ export default { ...@@ -1375,6 +1358,7 @@ export default {
} }
this.form = q this.form = q
return; return;
} else if (cell.ids == "step5" || cell.value.attributes.ctype.value == "DataGrid") { } else if (cell.ids == "step5" || cell.value.attributes.ctype.value == "DataGrid") {
this.ConstantDialog = !this.ConstantDialog; this.ConstantDialog = !this.ConstantDialog;
let q = {}; let q = {};
...@@ -1385,6 +1369,7 @@ export default { ...@@ -1385,6 +1369,7 @@ export default {
} }
this.form = q this.form = q
return; return;
} else if (cell.ids == "step4" || cell.value.attributes.ctype.value == "RandomValue") { } else if (cell.ids == "step4" || cell.value.attributes.ctype.value == "RandomValue") {
this.RandomValueDialog = !this.RandomValueDialog; this.RandomValueDialog = !this.RandomValueDialog;
let q = {}; let q = {};
...@@ -1395,6 +1380,7 @@ export default { ...@@ -1395,6 +1380,7 @@ export default {
} }
this.form = q this.form = q
return; return;
} else if (cell.ids == "step3" || cell.value.attributes.ctype.value == "RowGenerator") { } else if (cell.ids == "step3" || cell.value.attributes.ctype.value == "RowGenerator") {
this.RowGeneratorDialog = !this.RowGeneratorDialog; this.RowGeneratorDialog = !this.RowGeneratorDialog;
let q = {}; let q = {};
...@@ -1405,6 +1391,7 @@ export default { ...@@ -1405,6 +1391,7 @@ export default {
} }
this.form = q this.form = q
return; return;
} else if (cell.ids == "step2" || cell.value.attributes.ctype.value == "TextFileInput") { } else if (cell.ids == "step2" || cell.value.attributes.ctype.value == "TextFileInput") {
this.TextFileInputDialog = !this.TextFileInputDialog; this.TextFileInputDialog = !this.TextFileInputDialog;
let q = {}; let q = {};
...@@ -1861,6 +1848,27 @@ export default { ...@@ -1861,6 +1848,27 @@ export default {
// }) // })
// .catch(() => {}); // .catch(() => {});
}, },
//输出组件保存************************
saveOutputDialog(params){
// var graph = getActiveGraph().getGraph();
var outPutForm=params;
this.graph.getModel().beginUpdate();
try
{
for(var name in outPutForm) {
var edit = new mxCellAttributeChange(this.doubleClickCell, name, outPutForm[name]);
this.graph.getModel().execute(edit);
}
} finally
{
this.graph.getModel().endUpdate();
}
}
//输出组件保存******************/
}, },
}; };
</script> </script>
......
src/views/dialogs-components/global/file-tree/main.vue
...@@ -94,13 +94,13 @@ export default { ...@@ -94,13 +94,13 @@ export default {
formData.append("node", node); formData.append("node", node);
getFileexplorer(formData).then((res) => { getFileexplorer(formData).then((res) => {
if (res) { if (res) {
if(path==''){ // if(path==''){
console.log('1111111111111111'); console.log('1111111111111111');
this.fileTreeList = res; this.fileTreeList = res;
}else{ // }else{
console.log('222222222222'); // console.log('222222222222');
this.fileTreeListResolve=res // this.fileTreeListResolve=res
} // }
} else { } else {
this.$message.error(res.errMsg); this.$message.error(res.errMsg);
...@@ -117,9 +117,28 @@ export default { ...@@ -117,9 +117,28 @@ export default {
return resolve(this.fileTreeList); return resolve(this.fileTreeList);
} else { } else {
var path = node.data.id; var path = node.data.id;
var node= node.data.id;; var node= node.data.id;
this.getFileTreeList(path,node);
resolve(this.fileTreeListResolve); var formData = new FormData();
formData.append("path",path);
formData.append("extension", 0);
formData.append("node", node);
getFileexplorer(formData).then((res) => {
if (res) {
console.log("获取列表-------", res);
if (res.length > 0) {
resolve(res);
} else if (!res.success) {
// let data = [];
let data=null;
resolve(data);
}
} else {
this.$message.error(res.errMsg);
}
});
// this.getFileTreeList(path,node);
// resolve(this.fileTreeListResolve);
} }
}, },
......
src/views/output-dialog/table-out.vue
...@@ -324,7 +324,8 @@ export default ({ ...@@ -324,7 +324,8 @@ export default ({
explorer:Function, explorer:Function,
graph:Object, graph:Object,
doubleClickCell:Object, doubleClickCell:Object,
getXmlVal:String getXmlVal:String,
saveOutputDialog:Function
}, },
mounted(){ mounted(){
...@@ -340,7 +341,9 @@ export default ({ ...@@ -340,7 +341,9 @@ export default ({
}, },
methods:{ methods:{
confirm(){ confirm(){
this.tableOutForm.label=this.doubleClickCell.title;
console.log('表输出表单数据=====',this.tableOutForm) console.log('表输出表单数据=====',this.tableOutForm)
this.saveOutputDialog(this.tableOutForm);
}, },
radioChoose(val){ radioChoose(val){
let that = this let that = this
......
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