Merge branch 'master' of http://139.159.239.83:9093/mxl/ETL-admin into master

src/views/output-dialog/Excel-output.vue

@@ -430,6 +430,20 @@
 </template>
 
 <script>
+import mxgraph from "@/utils/mxgraph";
+const {
+  mxGraph,
+  mxUtils,
+  mxEvent,
+  mxKeyHandler,
+  mxRubberband,
+  mxConstants,
+  mxStencilRegistry,
+  mxStencil,
+  mxCodec,
+  mxGraphModel,
+  mxGeometry,
+} = mxgraph
 import {
   formatFunc,//获取已经创建的数据库列表
   getCodeList,//获取编码列表

src/views/output-dialog/delete.vue

@@ -104,6 +104,20 @@
 </template>
 
 <script>
+import mxgraph from "@/utils/mxgraph";
+const {
+  mxGraph,
+  mxUtils,
+  mxEvent,
+  mxKeyHandler,
+  mxRubberband,
+  mxConstants,
+  mxStencilRegistry,
+  mxStencil,
+  mxCodec,
+  mxGraphModel,
+  mxGeometry,
+} = mxgraph
 import {
 tableFields,
 inputOutputFields,//获取表输出

src/views/output-dialog/insertOrUpdate.vue

@@ -165,6 +165,20 @@
 </template>
 
 <script>
+import mxgraph from "@/utils/mxgraph";
+const {
+  mxGraph,
+  mxUtils,
+  mxEvent,
+  mxKeyHandler,
+  mxRubberband,
+  mxConstants,
+  mxStencilRegistry,
+  mxStencil,
+  mxCodec,
+  mxGraphModel,
+  mxGeometry,
+} = mxgraph
 import {
   tableFields,
   inputOutputFields

src/views/output-dialog/micro-excel.vue

@@ -376,6 +376,20 @@
 </template>
 
 <script>
+import mxgraph from "@/utils/mxgraph";
+const {
+  mxGraph,
+  mxUtils,
+  mxEvent,
+  mxKeyHandler,
+  mxRubberband,
+  mxConstants,
+  mxStencilRegistry,
+  mxStencil,
+  mxCodec,
+  mxGraphModel,
+  mxGeometry,
+} = mxgraph
 import {
 excelType,//获取扩展名
 formatFunc,//获取已经创建的数据库列表

src/views/output-dialog/sqlFileOutput.vue

@@ -168,6 +168,20 @@
 </template>
 
 <script>
+import mxgraph from "@/utils/mxgraph";
+const {
+  mxGraph,
+  mxUtils,
+  mxEvent,
+  mxKeyHandler,
+  mxRubberband,
+  mxConstants,
+  mxStencilRegistry,
+  mxStencil,
+  mxCodec,
+  mxGraphModel,
+  mxGeometry,
+} = mxgraph
 import {
   formatFunc,//获取已经创建的数据库列表
   getAvailableCharsets,//获取编码

src/views/output-dialog/synchronize.vue

@@ -221,6 +221,20 @@
 </template>
 
 <script>
+import mxgraph from "@/utils/mxgraph";
+const {
+  mxGraph,
+  mxUtils,
+  mxEvent,
+  mxKeyHandler,
+  mxRubberband,
+  mxConstants,
+  mxStencilRegistry,
+  mxStencil,
+  mxCodec,
+  mxGraphModel,
+  mxGeometry,
+} = mxgraph
 import {
 tableFields,
 inputOutputFields,//获取表输出

src/views/output-dialog/table-out.vue

@@ -10,7 +10,7 @@
 
       <el-form ref="tableOutForm" :model="tableOutForm" label-width="200px">
           <el-form-item label="步骤名称:">
-              <el-input v-model="tableOutForm.label" value="表输出"></el-input>
+              <el-input v-model="tableOutForm.label" value="表输出" placeholder="表输出"></el-input>
           </el-form-item>
     
 
@@ -335,7 +335,7 @@ export default ({
           }, 500);
        },
         confirm(){
-          this.tableOutForm.label=this.doubleClickCell.title;
+          // this.tableOutForm.label=this.doubleClickCell.title;
           this.tableOutForm.fields=JSON.stringify(this.tableData);//字段复值
           console.log('表输出表单数据=====',this.tableOutForm)
           this.saveOutputDialog(this.tableOutForm);
@@ -351,9 +351,9 @@ export default ({
         },
        
         tableFields(){
-          if(this.doubleClickCell){
-            var title=this.doubleClickCell.title
-          }
+          // if(this.doubleClickCell){
+          //   var title=this.doubleClickCell.title
+          // }
           console.log('获取cell888888===',this.doubleClickCell);
           let  pamer = new FormData(); // 创建form对象
                 // pamer.append("stepName", encodeURIComponent(title));
@@ -384,12 +384,13 @@ export default ({
         },
          //获取表输出
         inputOutputFields(){
-          if(this.doubleClickCell){
-            var title=this.doubleClickCell.title
-          }
+          // if(this.doubleClickCell){
+          //   var title=this.doubleClickCell.title
+          // }
           console.log('获取cell888888===',this.doubleClickCell);
           let  pamer = new FormData(); // 创建form对象
-                pamer.append("stepName", encodeURIComponent(title));
+                // 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

@@ -378,6 +378,20 @@
 </template>
 
 <script>
+import mxgraph from "@/utils/mxgraph";
+const {
+  mxGraph,
+  mxUtils,
+  mxEvent,
+  mxKeyHandler,
+  mxRubberband,
+  mxConstants,
+  mxStencilRegistry,
+  mxStencil,
+  mxCodec,
+  mxGraphModel,
+  mxGeometry,
+} = mxgraph
 import {
   formatFunc,//获取已经创建的数据库列表
   getFormatMapperLineTerminator,//获取格式

src/views/output-dialog/update.vue

@@ -187,6 +187,20 @@
 </template>
 
 <script>
+import mxgraph from "@/utils/mxgraph";
+const {
+  mxGraph,
+  mxUtils,
+  mxEvent,
+  mxKeyHandler,
+  mxRubberband,
+  mxConstants,
+  mxStencilRegistry,
+  mxStencil,
+  mxCodec,
+  mxGraphModel,
+  mxGeometry,
+} = mxgraph
 import {
 tableFields,
 inputOutputFields,//获取表输出