解决冲突

098e6cda · 莫晓莉 · 844e6e00 · 098e6cda
Commit 098e6cda authored Apr 08, 2021 by 莫晓莉
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 13 deletions

src/views/dashboard-kettle/components/designer/mxgraphDesigner.vue
+0 -13

No files found.
--- a/src/views/dashboard-kettle/components/designer/mxgraphDesigner.vue
+++ b/src/views/dashboard-kettle/components/designer/mxgraphDesigner.vue
@@ -877,21 +877,8 @@
    <textFileDialog
      ref="textFile"
      :fileVisible.sync="fileVisible"
-<<<<<<< HEAD
    :saveOutputDialog="saveOutputDialog" :textFileForm="outPutFormData8"></textFileDialog>
    <microDialog ref="mic" :microVisible.sync="microVisible" :saveOutputDialog="saveOutputDialog" :microForm="outPutFormData9" :doubleClickCell="doubleClickCell"></microDialog>
-=======
-
-      :saveOutputDialog="saveOutputDialog"
-      :textFileForm="outPutFormData"
-    ></textFileDialog>
-    <microDialog
-      ref="mic"
-      :microVisible.sync="microVisible"
-      :saveOutputDialog="saveOutputDialog"
-      :tableOutForm="outPutFormData"
-    ></microDialog>
->>>>>>> 1fa2926e2a1381ccd4e65928c6d2a0eb28fd4f78

    <!-- 输出弹窗end================== -->