解决冲突

be023217 · 李耀锟 · 41c2c8c5 · be023217 · be023217 · be023217
Commit be023217 authored Mar 15, 2021 by 李耀锟
Show whitespace changes
Inline Side-by-side

Showing with 85 additions and 66 deletions

src/api/kettle/link.js
+17 -0

src/views/dashboard-kettle/components/designer/FlowDesigner.vue
+68 -39

src/views/kettle/home.vue
+0 -27

No files found.
--- a/src/api/kettle/link.js
+++ b/src/api/kettle/link.js
@@ -137,7 +137,24 @@ export function excelSheetType(data){
 }
+//从哪个步骤读文件名
+export function previousSteps(data){
+  return request({
+    url: 'etlweb/trans/previousSteps',
+    data,
+    method: 'post'
+  })
+}
+//保存文件名的字段
+export function inputOutputFields(data){
+  return request({
+    url: 'etlweb/trans/inputOutputFields',
+    data,
+    method: 'post'
+  })
+}

--- a/src/views/dashboard-kettle/components/designer/FlowDesigner.vue
+++ b/src/views/dashboard-kettle/components/designer/FlowDesigner.vue
@@ -165,7 +165,6 @@
              </el-select>
            </el-form-item>
            <el-form-item label="选中的文件:">
              <!-- <input type="file" placeholder="上传" @change="fileChnageInput" /> -->
              <el-upload
                class="upload-demo"
@@ -175,10 +174,8 @@
                :auto-upload="false"
              >
                <el-button size="small" type="primary">点击上传</el-button>
              </el-upload>
              <el-card class="box-card">
                <el-table :data="tableData" style="width: 100%">
                  <el-table-column prop="name" label="文件/目录" width="120">
@@ -203,7 +200,12 @@
                        size="small"
                        >编辑</el-button
                      >
-                      <el-button type="text" size="small" @click="deleteRow(scope.$index, tableData)">删除</el-button>
+                      <el-button
+                        type="text"
+                        size="small"
+                        @click="deleteRow(scope.$index, tableData)"
+                        >删除</el-button
+                      >
                    </template>
                  </el-table-column>
                </el-table>
@@ -242,9 +244,40 @@
        </el-tab-pane>
        <el-tab-pane label="工作表" name="worksheet">
+          <el-button type="primary" @click="addSheet">添加工作表</el-button>
          <el-form ref="form" :model="form" label-width="160px">
            <el-form-item label="要读取的工作表列表:">
-              <el-card class="box-card"> </el-card>
+              <el-card class="box-card">
+                 <el-table :data="tableData" style="width: 100%">
+                  <el-table-column prop="name" label="工作表名称" width="120">
+                  </el-table-column>
+                  <el-table-column prop="filemask" label="起始行">
+                  </el-table-column>
+                  <el-table-column
+                    prop="exclude_filemask"
+                    label="起始列"
+                  >
+                  </el-table-column>
+                  <el-table-column label="操作">
+                    <template slot-scope="scope">
+                      <el-button
+                        @click="handleClick(scope.row)"
+                        type="text"
+                        size="small"
+                        >编辑</el-button
+                      >
+                      <el-button
+                        type="text"
+                        size="small"
+                        @click="deleteRow(scope.$index, tableData)"
+                        >删除</el-button
+                      >
+                    </template>
+                  </el-table-column>
+                </el-table>
+              </el-card>
            </el-form-item>
          </el-form>
        </el-tab-pane>
@@ -413,10 +446,10 @@
      title="编辑"
      :visible.sync="edit"
      width="500px"
-  :before-close="handleClose">
+      :before-close="handleClose"
+    >
      <el-form ref="form" :model="form" label-width="150px">
-      <el-form-item label="文件/目录:" >
+        <el-form-item label="文件/目录:">
          <el-input v-model="form.name" :disabled="true"></el-input>
        </el-form-item>
@@ -429,35 +462,25 @@
        </el-form-item>
        <el-form-item label="要求:">
-              <el-select
+          <el-select v-model="form.file_required" style="width: 100%">
-                  v-model="form.file_required"
-                  style="width: 100%"
-                >
            <el-option label="是" value="1"></el-option>
            <el-option label="否" value="0"></el-option>
          </el-select>
        </el-form-item>
        <el-form-item label="包含子目录:">
-              <el-select
+          <el-select v-model="form.include_subfolders" style="width: 100%">
-                  v-model="form.include_subfolders"
-                  style="width: 100%"
-                >
            <el-option label="是" value="1"></el-option>
            <el-option label="否" value="0"></el-option>
          </el-select>
        </el-form-item>
      </el-form>
      <span slot="footer" class="dialog-footer">
        <el-button @click="edit = false">取 消</el-button>
        <el-button type="primary" @click="edit = false">确 定</el-button>
      </span>
-</el-dialog>
+    </el-dialog>
  </div>
 </template>
@@ -471,7 +494,11 @@ import flowNode from "./modules/node"; //流程图内节点框的编辑
 import nodeMenu from "./modules/node_menu"; //左边tab
 // import FlowNodeForm from './modules/node_form'//右边tab
 import lodash from "lodash"; //JavaScript 实用工具库
-import { excelSheetType } from "@/api/kettle/link";
+import {
+  excelSheetType,
+  previousSteps,
+  inputOutputFields,
+} from "@/api/kettle/link";
 export default {
  data() {
    return {
@@ -509,7 +536,7 @@ export default {
      zoom: 0.5,
      excelLnput: false,
-      edit:false,
+      edit: false,
      form: {
        checked: true,
      },
@@ -630,43 +657,38 @@ export default {
    });
  },
  methods: {
+    fileChnageInput(e) {
+      console.log(e);
-    fileChnageInput(e){
-      console.log(e)
    },
    // 上传
    handleChange(file, fileList) {
      // console.log(file);
      this.fileList = fileList.slice(-3);
-        this.tableData.push({name:file.name})
+      this.tableData.push({ name: file.name });
-//  console.log(this.tableData);
+      //  console.log(this.tableData);
      // this.getObjectURL(file.raw)
      // console.log(this.getObjectURL(file.raw));
    },
    getObjectURL(file) {
      let url = null;
      if (window.createObjcectURL != undefined) {
        url = window.createOjcectURL(file);
-            }else if (window.URL != undefined) {
+      } else if (window.URL != undefined) {
        url = window.URL.createObjectURL(file);
      } else if (window.webkitURL != undefined) {
        url = window.webkitURL.createObjectURL(file);
      }
      return url;
    },
-deleteRow(index, rows){
+    deleteRow(index, rows) {
      rows.splice(index, 1);
-},
+    },
-tapClick(){}, 
+    tapClick() {},
    handleClick(val) {
-      this.edit = !this.edit
+      this.edit = !this.edit;
-      this.form = val
+      this.form = val;
    },
    // 关闭弹框
    handleClose(done) {
@@ -1065,8 +1087,15 @@ tapClick(){},
      pamer.append("query", "");
      excelSheetType(pamer).then((res) => {
        this.engine = res;
-        console.log(res, "+++++++++++++");
      });
+      previousSteps().then(res=>{
+      })
+      inputOutputFields().then(res=>{
+      })
    },
    // 是否具有该线
    hasLine(from, to) {

--- a/src/views/kettle/home.vue
+++ b/src/views/kettle/home.vue
@@ -559,15 +559,11 @@ export default {
    },
    data() {
      return {
-<<<<<<< HEAD
-          prefix:'http://192.168.0.44:9700/etlweb/',
-=======
          inputValue:'',// 密码
          dropFunction,//删除数据库表
          deleteLink,//删除资源库模块的方法
          dialogVisibleRemind:false,//资源库信息删除提示弹窗
          testDialogueFlag:false,//测试弹弹窗
->>>>>>> 2bf9da3cc4c394dfd74392d098aa9b3619082cd2
            tabShowFlag:true,//控制选项卡的显示和隐藏
            picName:'',//画板的标签明名称
            accessDataList:[],//连接类型
@@ -1216,30 +1212,7 @@ export default {
        // var origName = nodeMenu.name
        var origName = nodeMenu.path
        var nodeName = origName
-<<<<<<< HEAD
-        // var index = 1
-        // while (index < 10000) {
-        //   var repeat = false
-        // //   for (var i = 0; i < this.flowData.nodeList.length; i++) {
-        // //     let node = this.flowData.nodeList[i]
-        // for (var i = 0; i < this.$refs['pic'].flowData.nodeList.length; i++) {
-        //     let node =this.$refs['pic'].flowData.nodeList[i]
-        //     if (node.name === nodeName) {
-        //       nodeName = origName + index
-        //       repeat = true
-        //     }
-        //   }
-        //   if (repeat) {
-        //     index++
-        //     continue
-        //   }
-        //   break
-        // }
-        console.log('-------003',nodeMenu);
-=======
        console.log('-------003',nodeMenu.type);
->>>>>>> 2bf9da3cc4c394dfd74392d098aa9b3619082cd2
        var node = {
          id: nodeId, //节点id--前端唯一的
          name: nodeMenu.text, //节点名称