Skip to content

E
ETL-admin
Commit 28a8f55f by 莫晓莉
Options

解决冲突

parents 972d8a7e 82a2bb03
Showing with 30 additions and 7 deletions
public/index.html
...@@ -11,5 +11,6 @@ ...@@ -11,5 +11,6 @@
<body> <body>
<div id="app"></div> <div id="app"></div>
<!-- built files will be auto injected --> <!-- built files will be auto injected -->
<script src="./js/mxClient.js"></script>
</body> </body>
</html> </html>
public/js/mxClient.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
src/views/dashboard-kettle/components/designer/mxgraphDesigner.vue
...@@ -884,7 +884,6 @@ import microDialog from "../../../output-dialog/micro-excel"; ...@@ -884,7 +884,6 @@ import microDialog from "../../../output-dialog/micro-excel";
import mxgraph from "@/utils/mxgraph"; import mxgraph from "@/utils/mxgraph";
const { const {
mxGraph, mxGraph,
...@@ -898,6 +897,7 @@ const { ...@@ -898,6 +897,7 @@ const {
mxCodec, mxCodec,
mxGraphModel, mxGraphModel,
mxGeometry, mxGeometry,
mxCell
} = mxgraph; } = mxgraph;
...@@ -923,6 +923,7 @@ export default { ...@@ -923,6 +923,7 @@ export default {
graphXml: "", graphXml: "",
xmlDocuments: "", //获取解码的xml xmlDocuments: "", //获取解码的xml
boxInformation: "", //弹框信息 boxInformation: "", //弹框信息
nodeData:{},//节点数据
// mxl================================= // mxl=================================
InsertOrUpdateVisible: false, InsertOrUpdateVisible: false,
...@@ -1088,11 +1089,17 @@ export default { ...@@ -1088,11 +1089,17 @@ export default {
} }
}, },
excelLnputDetermine() { excelLnputDetermine() {
this.excelLnput = !this.excelLnput; this.excelLnput = !this.excelLnput;
let val = this.form; for(let name in this.form) {
console.log(this.form,4654564);
console.log(val); 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) {
...@@ -1298,6 +1305,7 @@ export default { ...@@ -1298,6 +1305,7 @@ export default {
const cell = this.R.pathOr([], ["properties", "cell"], evt); const cell = this.R.pathOr([], ["properties", "cell"], evt);
console.info(cell); // 在控制台输出双击的cell console.info(cell); // 在控制台输出双击的cell
this.nodeData = cell
// this.setXml(); // this.setXml();
this.doubleClickCell=cell; this.doubleClickCell=cell;
...@@ -1337,6 +1345,22 @@ export default { ...@@ -1337,6 +1345,22 @@ export default {
inputOutputFields().then((res) => {}); inputOutputFields().then((res) => {});
if (cell.ids == "step1" || cell.ctype == "ExcelInput") { if (cell.ids == "step1" || cell.ctype == "ExcelInput") {
this.excelLnput = !this.excelLnput; this.excelLnput = !this.excelLnput;
// console.log(cell.value.attributes,1111111);
// this.form = cell.value.attributes["name"].value
console.log(cell.value.attributes);
console.log(cell.value.attributes.uriNameFieldName.value);
let obj = cell.value.attributes
for(let vel in obj){
let key = obj[vel]
this.form = {
[key.name] : `${key.value}`
}
console.log(this.form,4564676354676);
}
return; return;
} else if (cell.ids == "step7" || cell.ctype == "TableInput") { } else if (cell.ids == "step7" || cell.ctype == "TableInput") {
this.TableInputDialog = !this.TableInputDialog; this.TableInputDialog = !this.TableInputDialog;
......
src/views/kettle/home2.vue
...@@ -1205,6 +1205,7 @@ props: ["dragItem"], ...@@ -1205,6 +1205,7 @@ props: ["dragItem"],
}, },
handleNodeClick(data,node){ handleNodeClick(data,node){
console.log('点击当前节点===',node); console.log('点击当前节点===',node);
this.nodePath=data.path;//当前选择数
this.curNodeIconCls=data.iconCls;//当前选中节点 this.curNodeIconCls=data.iconCls;//当前选中节点
this.nodePath=data.path; this.nodePath=data.path;
console.log('当前节点的文件夹路径:',this.nodePath); console.log('当前节点的文件夹路径:',this.nodePath);
...@@ -1219,9 +1220,6 @@ props: ["dragItem"], ...@@ -1219,9 +1220,6 @@ props: ["dragItem"],
// this.tabShowFlag=true;//核心对象显项卡显示 // this.tabShowFlag=true;//核心对象显项卡显示
this.activeName="second"; this.activeName="second";
// var xmlDocument = mxUtils.parseXml(res); // var xmlDocument = mxUtils.parseXml(res);
// var decoder = new mxCodec(xmlDocument); // var decoder = new mxCodec(xmlDocument);
// var node = xmlDocument.documentElement; // var node = xmlDocument.documentElement;
......
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