查错

src/views/dashboard-kettle/components/appBulletFrame/tableInput.vue

@@ -14,12 +14,10 @@
               v-model="form.connection"
               style="width: 100%"
               @change="getField"
+              @focus="getGraphDataBases"
             >
               <el-option
-                v-for="item in ComboBox"
-                :key="item.id"
-                :label="item.name"
-                :value="item.name"
+              v-for="(item,index) in namesList" :key="index" :label="item.name" :value="item.name"
               />
             </el-select>
             <!-- <el-select v-model="form.connection" style="width: 100%" @change="getField()">
@@ -145,7 +143,12 @@
       :scanDialogVisible.sync="scanDialogVisible"
       :chooseType="chooseType"
       :chooseFlag.sync="chooseFlag"
+      :form.sync="form" 
+      :getXmlVal="getXmlVal"  
+      :graph="graph"
     ></estab-dialog>
+
+    <!-- <database-choose ref="databaseChoose" :form.sync="tableOutForm" :getXmlVal="getXmlVal"  :graph="newGraph"></database-choose> -->
   </div>
 </template>
 
@@ -159,7 +162,7 @@ import {
 } from "@/api/kettle/link";
 
 export default {
-  props: ["connectionNode", "stepName", "form", "graphXml"], //从父组件传过来的值
+  props: ["connectionNode", "stepName", "form", "graphXml","getXmlVal","graph"], //从父组件传过来的值
   components: {
     main,
   },
@@ -171,6 +174,7 @@ export default {
       dialogVisibleFourth: false,
       scanDialogVisible: false,
       newForm: {},
+      namesList:[],
 
       ComboBox: [],
       library: [],
@@ -205,6 +209,16 @@ export default {
     }, // form(newValue, oldValue){ //   this.form=newValue; // }
   },
   methods: {
+
+
+    clickFun(graph){
+          console.log(graph,1)
+          this.graph = graph
+          setTimeout(() => {
+             this.$refs.establishDia.clickFun(graph,121331);
+          }, 500);
+       },
+
     tableInputName() {
       this.stepName;
     },
@@ -252,7 +266,15 @@ export default {
     // },
 
     //获取新建弹窗返回来的值
+  getGraphDataBases(){
+      // var graph = this.getGraph();
+      var root = this.graph.getDefaultParent(), data = [];
+      if(root.getAttribute('databases') != null)
+        data=JSON.parse(root.getAttribute('databases'));
+        console.log('获取到画布上的databases====',data);
+        this.namesList=data;
 
+    },
     // 查询已经建立的所有数据库列表
     listNames() {
       listNames().then((res) => {
@@ -266,12 +288,22 @@ export default {
     },
     dialogVisibleFourthNew() {
       this.dialogVisibleFourth = true;
-      this.$refs.establishDia.database();
-      this.$refs.establishDia.accessMethod(); //获取连接方式
+      // this.$refs.establishDia.database();
+      // this.$refs.establishDia.accessMethod(); //获取连接方式
+      this.$refs.establishDia.clickFun(this.graph);//先把画布传过去
+        this.$refs.establishDia.getTransDatabase();
+        this.$refs.establishDia.accessMethod();//获取连接方式
     },
     dialogVisibleFourthFun() {
       this.dialogVisibleFourth = true;
-      this.$refs.establishDia.database(this.connectionName);
+      // this.$refs.establishDia.database(this.connectionName);
+      this.$refs.establishDia.clickFun(this.graph);//先把画布传过去
+      if(this.selectName){
+          this.dialogVisibleFourth=true;            
+      }
+      // this.$refs.establishDia.database(this.selectName);
+      this.$refs.establishDia.getTransDatabase(this.selectName);
+      this.$refs.establishDia.accessMethod();//获取连接方式        
     },
     getField(val) {
       this.library = this.ComboBox.find((e) => {

src/views/dashboard-kettle/components/designer/mxgraphDesigner.vue

@@ -702,6 +702,8 @@
         :connectionNode="connectionNode"
         :form="form" 
         :graphXml="graphXml"
+        ref="TableInputDialog2"
+        
       >
       </tableInput>
 
@@ -1569,6 +1571,7 @@ previousField(){
           this.form = q;
        this.form.sql = decodeURIComponent( this.form.sql)
        console.log(this.form,456465465);
+       this.$refs.TableInputDialog2.clickFun(this.graph);
           
           return;
         } else if (