Skip to content

E
ETL-admin
Commit ab6029de by 李耀琨
Options

修复bug

parent 74cbec0a
Showing with 391 additions and 93 deletions
.env.development
...@@ -2,13 +2,15 @@ ENV = 'development' ...@@ -2,13 +2,15 @@ ENV = 'development'
VUE_APP_BASE_API = 'http://192.168.0.44:9888/'
VUE_APP_WS_API = 'ws://192.168.0.44:9888/'
# 接口地址 # 接口地址
# VUE_APP_BASE_API = 'http://192.168.0.200' #V1UE_APP_BASE_API = 'http://192.168.0.44'
# VUE_APP_WS_API = 'ws://192.168.0.200' #VUE_APP_WS_API = 'ws://192.168.0.44'
VUE_APP_FILE_API = '' VUE_APP_FILE_API = ''
......
src/views/dashboard-kettle/components/appBulletFrame/browseFiles.vue
...@@ -85,6 +85,8 @@ export default { ...@@ -85,6 +85,8 @@ export default {
// if (node.level > this.PopupFrom.length) return resolve([]); // if (node.level > this.PopupFrom.length) return resolve([]);
}, },
handleNodeClick(data, node) { handleNodeClick(data, node) {
console.log("点击当前节点node===", node); console.log("点击当前节点node===", node);
console.log("点击当前节点data===", data); console.log("点击当前节点data===", data);
......
src/views/dashboard-kettle/components/appBulletFrame/customConstant.vue
...@@ -6,6 +6,12 @@ ...@@ -6,6 +6,12 @@
width="800px" width="800px"
:before-close="handleClose" :before-close="handleClose"
> --> > -->
<el-dialog
title="自定义常量数据"
:visible.sync="ConstantDialog"
width="800px"
:before-close="handleCloseFun"
>
<el-form ref="form" :model="form" label-width="120px"> <el-form ref="form" :model="form" label-width="120px">
...@@ -90,13 +96,20 @@ ...@@ -90,13 +96,20 @@
</el-table> </el-table>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
<span slot="footer" class="dialog-footer">
<el-button @click="handleCloseFun">取 消</el-button>
<el-button type="primary" @click="ConstantDialogFun">确 定</el-button>
</span>
</el-dialog>
<el-dialog <el-dialog
title="添加元数据" title="添加元数据"
:visible.sync="metadata" :visible.sync="metadata"
width="500px" width="500px"
:before-close="handleClose" :before-close="handleClose"
:modal="false"
> >
<el-form ref="form" :model="metadataForm" label-width="160px"> <el-form ref="form" :model="metadataForm" label-width="160px">
<el-form-item label="名称:"> <el-form-item label="名称:">
...@@ -187,13 +200,7 @@ ...@@ -187,13 +200,7 @@
</el-dialog> </el-dialog>
<!-- <span slot="footer" class="dialog-footer">
<el-button @click="ConstantDialog = false">取 消</el-button>
<el-button type="primary" @click="myConfirm"
>确 定</el-button
>
</span> -->
<!-- </el-dialog> -->
</div> </div>
</template> </template>
...@@ -202,27 +209,31 @@ ...@@ -202,27 +209,31 @@
import { valueFormat, valueMeta } from "@/api/kettle/link"; import { valueFormat, valueMeta } from "@/api/kettle/link";
export default { export default {
props: ["form"], props: ["form","ConstantDialog","saveOutputDialog"],
data() { data() {
return { return {
metadataForm: { metadataForm: {},
},
metadata: false, metadata: false,
addValue: false, addValue: false,
ValueForm: {}, ValueForm: {},
activeName: "first", activeName: "first",
data: this.form.data, data:[],
fields: this.form.fields, fields:[],
fieldFormat: {}, fieldFormat: {},
fieldType: {}, fieldType: {},
dataStatus:false, dataStatus:false,
newGraph:[],
}; };
}, },
watch:{ watch:{
// from(n,o){
// console.log(n.fields,'fileds');
// this.fields=n.fields
// }
// myForm(n, o) { // myForm(n, o) {
// console.log("回显的表单数据===",n); // console.log("回显的表单数据===",n);
// if(n){ // if(n){
...@@ -233,27 +244,39 @@ export default { ...@@ -233,27 +244,39 @@ export default {
// } // }
// }, // },
}, },
// props:["ConstantDialog","saveOutputDialog","doubleClickCell","myForm"],
created() { created() {
this.valueFormatFun(); this.valueFormatFun();
this.valueMetaFun(); this.valueMetaFun();
}, },
methods: { methods: {
clickFun(graph,val){
console.log(graph,'双击获取值')
this.newGraph = graph;
console.log(val,"拿到form");
this.fields = JSON.parse(val.fields)
this.data = JSON.parse(val.data)
},
addDetermine(){ addDetermine(){
this.metadata = !this.metadata this.metadata = !this.metadata
console.log(this.metadataForm,787987987987987);
console.log(this.form,"form");
console.log(this.fields)
if (this.dataStatus) { if (this.dataStatus) {
this.fields.push(this.metadataForm) this.fields.push(this.metadataForm)
console.log(this.fields,12345)
// this.fields.push(this.metadataForm)
// //
}else{ }else{
} }
}, },
...@@ -261,7 +284,6 @@ export default { ...@@ -261,7 +284,6 @@ export default {
this.addValue = !this.addValue this.addValue = !this.addValue
if (this.dataStatus) { if (this.dataStatus) {
this.data.push(this.ValueForm); this.data.push(this.ValueForm);
//
}else{ }else{
} }
...@@ -293,6 +315,8 @@ this.addValue = !this.addValue ...@@ -293,6 +315,8 @@ this.addValue = !this.addValue
}, },
// 关闭弹框 // 关闭弹框
handleClose(done) { handleClose(done) {
this.$confirm("确认关闭？") this.$confirm("确认关闭？")
...@@ -325,22 +349,19 @@ this.addValue = !this.addValue ...@@ -325,22 +349,19 @@ this.addValue = !this.addValue
this.fieldType = res; this.fieldType = res;
}); });
}, },
handleCloseFun(){
this.$emit("update:ConstantDialog", false);
},
ConstantDialogFun() {
this.handleCloseFun()
this.form.data = JSON.stringify(this.data);
this.form.fields = JSON.stringify(this.fields);
this.saveOutputDialog(this.form)
},
// mxl=========================
// myConfirm(){
// this.myForm.fields=JSON.stringify(this.tableData);//查询字段
// this.myForm.data=JSON.stringify(this.data);//更新字段
// this.myForm.label=this.form.name;
// console.log('弹窗数据===',this.myForm);
// this.saveOutputDialog(this.myForm);
// this.handleClose();//关闭弹窗
// },
// handleClose(){
// this.$emit("update:ConstantDialog", false);
// },
// mxl=========================
}, },
}; };
</script> </script>
......
src/views/dashboard-kettle/components/appBulletFrame/generatingRecords.vue
<template> <template>
<div class="customConstant"> <div class="customConstant">
<el-dialog
title="生成记录"
:visible.sync="RowGeneratorDialog"
width="800px"
:before-close="handleCloseFun"
>
<el-form ref="form" :model="form" label-width="120px"> <el-form ref="form" :model="form" label-width="120px">
<el-form-item label="步骤名称:"> <el-form-item label="步骤名称:">
<el-input v-model="form.label"></el-input> <el-input v-model="form.label"></el-input>
...@@ -78,6 +85,14 @@ ...@@ -78,6 +85,14 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
</el-card> </el-card>
<span slot="footer" class="dialog-footer">
<el-button @click="handleCloseFun">取 消</el-button>
<el-button type="primary" @click="RowGeneratorDialogFun"
>确 定</el-button
>
</span>
</el-dialog>
<el-dialog <el-dialog
title="添加字段" title="添加字段"
...@@ -157,17 +172,19 @@ ...@@ -157,17 +172,19 @@
import { valueFormat, valueMeta } from "@/api/kettle/link"; import { valueFormat, valueMeta } from "@/api/kettle/link";
export default { export default {
props: ["custom","form"], props: ["custom","form","RowGeneratorDialog","saveOutputDialog"],
data() { data() {
return { return {
metadataForm: {}, metadataForm: {},
metadata: false, metadata: false,
activeName: "first", activeName: "first",
data: [], data: [],
fields: this.form.fields, fields: [],
fieldFormat: {}, fieldFormat: {},
fieldType: {}, fieldType: {},
dataState: false, dataState: false,
newGraph:[],
}; };
}, },
...@@ -178,6 +195,16 @@ export default { ...@@ -178,6 +195,16 @@ export default {
methods: { methods: {
clickFun(graph,val){
console.log(graph,'双击获取值')
this.newGraph = graph;
console.log(val,"拿到form");
this.fields = JSON.parse(val.fields)
},
addMetadata(){ addMetadata(){
this.metadata = !this.metadata this.metadata = !this.metadata
if (this.dataState) { if (this.dataState) {
...@@ -189,6 +216,16 @@ this.metadata = !this.metadata ...@@ -189,6 +216,16 @@ this.metadata = !this.metadata
} }
}, },
handleCloseFun(){
this.$emit("update:RowGeneratorDialog", false);
},
RowGeneratorDialogFun() {
this.handleCloseFun()
this.form.fields = JSON.stringify(this.fields);
this.saveOutputDialog(this.form)
},
addField(state, val) { addField(state, val) {
......
src/views/dashboard-kettle/components/appBulletFrame/getSystemInformation.vue
<template> <template>
<div class="getSystemInformation"> <div class="getSystemInformation">
<el-dialog
title="获取系统信息"
:visible.sync="SystemInfoDialog"
width="800px"
:before-close="handleCloseFun"
>
<el-form ref="form" :model="form" label-width="120px"> <el-form ref="form" :model="form" label-width="120px">
<el-form-item label="步骤名称:"> <el-form-item label="步骤名称:">
...@@ -38,6 +43,11 @@ ...@@ -38,6 +43,11 @@
</el-table> </el-table>
</el-form-item> </el-form-item>
</el-form> </el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="handleCloseFun">取 消</el-button>
<el-button type="primary" @click="SystemInfoDialogFun">确 定</el-button>
</span>
</el-dialog>
<el-dialog <el-dialog
title="添加字段" title="添加字段"
...@@ -75,11 +85,11 @@ ...@@ -75,11 +85,11 @@
import { systemDataTypes } from "@/api/kettle/link"; import { systemDataTypes } from "@/api/kettle/link";
export default { export default {
props: ["form"], props: ["form","SystemInfoDialog","saveOutputDialog","nodeData"],
data() { data() {
return { return {
addField: false, addField: false,
fields: this.form.fields, fields: [],
type: {}, type: {},
dataStatus:false, dataStatus:false,
fiel:{}, fiel:{},
...@@ -95,6 +105,25 @@ export default { ...@@ -95,6 +105,25 @@ export default {
methods: { methods: {
clickFun(graph,val){
console.log(graph,'双击获取值')
this.newGraph = graph;
console.log(val,"拿到form");
this.fields = JSON.parse(val.fields)
},
handleCloseFun(){
this.$emit("update:SystemInfoDialog", false);
},
SystemInfoDialogFun() {
this.handleCloseFun()
this.form.fields = JSON.stringify(this.fields);
this.saveOutputDialog(this.form)
},
addFieldDetermine(){ addFieldDetermine(){
this.addField = !this.addField this.addField = !this.addField
if (this.dataStatus) { if (this.dataStatus) {
......
src/views/dashboard-kettle/components/appBulletFrame/getVariable.vue
<template> <template>
<div class="customConstant"> <div class="customConstant">
<el-dialog
title="获取变量"
:visible.sync="getVariableDialog"
width="800px"
:before-close="handleCloseFun"
>
<el-form ref="from" :model="form" label-width="120px"> <el-form ref="from" :model="form" label-width="120px">
<el-form-item label="步骤名称:"> <el-form-item label="步骤名称:">
<el-input v-model="form.label"></el-input> <el-input v-model="form.label"></el-input>
...@@ -37,6 +44,15 @@ ...@@ -37,6 +44,15 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<span slot="footer" class="dialog-footer">
<el-button @click="handleCloseFun">取 消</el-button>
<el-button type="primary" @click="getVariableDialogFun"
>确 定</el-button
>
</span>
</el-dialog>
<el-dialog <el-dialog
title="添加字段" title="添加字段"
:visible.sync="fieldBox" :visible.sync="fieldBox"
...@@ -118,7 +134,7 @@ import { ...@@ -118,7 +134,7 @@ import {
variableType variableType
} from "@/api/kettle/link"; } from "@/api/kettle/link";
export default { export default {
props: ["connectionNode", "form", "nodeData"], //从父组件传过来的值 props: ["connectionNode", "form", "nodeData","getVariableDialog","saveOutputDialog"], //从父组件传过来的值
components: { components: {
browseFiles, browseFiles,
...@@ -127,7 +143,7 @@ export default { ...@@ -127,7 +143,7 @@ export default {
return { return {
newGraph: [], newGraph: [],
fieldBox: false, fieldBox: false,
fields: this.form.fields, fields: [],
metadataForm: {}, metadataForm: {},
fieldFormat: {}, fieldFormat: {},
fieldCompress: {}, fieldCompress: {},
...@@ -152,9 +168,20 @@ export default { ...@@ -152,9 +168,20 @@ export default {
}, },
methods: { methods: {
clickFun(graph) { clickFun(graph,val) {
console.log(graph, 1); console.log(graph, 1);
this.newGraph = graph; this.newGraph = graph;
this.fields = JSON.parse(val.fields)
},
handleCloseFun(){
this.$emit("update:getVariableDialog", false);
},
getVariableDialogFun() {
this.form.fields = JSON.stringify(this.fields);
this.saveOutputDialog(this.form)
this.handleCloseFun()
}, },
getTheField() { getTheField() {
......
src/views/dashboard-kettle/components/appBulletFrame/mergeRecords.vue
<template> <template>
<div class="customConstant"> <div class="customConstant">
<el-dialog
title="合并行（比较）"
:visible.sync="mergeRecordsDialog"
width="800px"
:before-close="handleCloseFun"
>
<el-form ref="from" :model="form" label-width="120px"> <el-form ref="from" :model="form" label-width="120px">
<el-form-item label="步骤名称:"> <el-form-item label="步骤名称:">
<el-input v-model="form.label"></el-input> <el-input v-model="form.label"></el-input>
...@@ -97,6 +105,16 @@ ...@@ -97,6 +105,16 @@
</el-card> </el-card>
</el-col> </el-col>
</el-row> </el-row>
<span slot="footer" class="dialog-footer">
<el-button @click="handleCloseFun">取 消</el-button>
<el-button type="primary" @click="mergeRecordsDialogFun"
>确 定</el-button
>
</span>
</el-dialog>
<el-dialog <el-dialog
...@@ -169,7 +187,7 @@ import { ...@@ -169,7 +187,7 @@ import {
previousSteps, previousSteps,
} from "@/api/kettle/link"; } from "@/api/kettle/link";
export default { export default {
props: ["connectionNode", "form", "nodeData"], //从父组件传过来的值 props: ["connectionNode", "form", "nodeData","saveOutputDialog","mergeRecordsDialog"], //从父组件传过来的值
components: { components: {
browseFiles, browseFiles,
...@@ -179,8 +197,8 @@ export default { ...@@ -179,8 +197,8 @@ export default {
newGraph: [], newGraph: [],
fieldBox: false, fieldBox: false,
matchingFieldBox:false, matchingFieldBox:false,
values:this.form.values, values:[],
keys:this.form.keys, keys:[],
metadataForm: {}, metadataForm: {},
matchingFieldForm:{}, matchingFieldForm:{},
filterForm: {}, filterForm: {},
...@@ -206,9 +224,25 @@ export default { ...@@ -206,9 +224,25 @@ export default {
}, },
methods: { methods: {
clickFun(graph) { clickFun(graph,val) {
console.log(graph, 1); console.log(graph, 1);
this.newGraph = graph; this.newGraph = graph;
this.values = JSON.parse(val.values)
this.keys = JSON.parse(val.keys)
},
handleCloseFun(){
this.$emit("update:mergeRecordsDialog", false);
},
mergeRecordsDialogFun() {
this.handleCloseFun()
this.form.keys = JSON.stringify(this.keys);
this.form.values = JSON.stringify(this.values);
this.saveOutputDialog(this.form)
}, },
route(flowData) { route(flowData) {
......
src/views/dashboard-kettle/components/appBulletFrame/randomNumber.vue
<template> <template>
<div class="randomNumber"> <div class="randomNumber">
<el-dialog
title="生成随机数"
:visible.sync="RandomValueDialog"
width="800px"
:before-close="handleCloseFun"
>
<el-form ref="from" :model="form" label-width="120px"> <el-form ref="from" :model="form" label-width="120px">
<el-form-item label="步骤名称:"> <el-form-item label="步骤名称:">
<el-input v-model="form.label"></el-input> <el-input v-model="form.label"></el-input>
...@@ -41,7 +46,13 @@ ...@@ -41,7 +46,13 @@
</el-table> </el-table>
</el-form-item> </el-form-item>
</el-form> </el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="handleCloseFun">取 消</el-button>
<el-button type="primary" @click="RandomValueDialogFun"
>确 定</el-button
>
</span>
</el-dialog>
<el-dialog <el-dialog
...@@ -80,10 +91,10 @@ ...@@ -80,10 +91,10 @@
import { randomValueFunc } from "@/api/kettle/link"; import { randomValueFunc } from "@/api/kettle/link";
export default { export default {
props: ["form"], props: ["form","saveOutputDialog","RandomValueDialog"],
data() { data() {
return { return {
fields: this.form.fields, fields: [],
fiel:{}, fiel:{},
random:{}, random:{},
dataState:false, dataState:false,
...@@ -97,6 +108,26 @@ export default { ...@@ -97,6 +108,26 @@ export default {
methods: { methods: {
clickFun(graph,val){
console.log(graph,'双击获取值')
this.newGraph = graph;
console.log(val,"拿到form");
this.fields = JSON.parse(val.fields)
},
handleCloseFun(){
this.$emit("update:RandomValueDialog", false);
},
RandomValueDialogFun() {
this.handleCloseFun()
this.form.fields = JSON.stringify(this.fields);
this.saveOutputDialog(this.form)
},
addSheet(state,val) { addSheet(state,val) {
this.addField = !this.addField; this.addField = !this.addField;
this.dataState = state this.dataState = state
......
src/views/dashboard-kettle/components/appBulletFrame/selectField.vue
<template> <template>
<div class="customConstant"> <div class="customConstant">
<el-dialog
title="选择/改名值"
:visible.sync="selectFieldDialog"
width="800px"
:before-close="handleCloseFun"
>
<el-form ref="from" :model="form" label-width="120px"> <el-form ref="from" :model="form" label-width="120px">
<el-form-item label="步骤名称:"> <el-form-item label="步骤名称:">
<el-input v-model="form.label"></el-input> <el-input v-model="form.label"></el-input>
...@@ -112,6 +118,15 @@ ...@@ -112,6 +118,15 @@
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
<span slot="footer" class="dialog-footer">
<el-button @click="handleCloseFun">取 消</el-button>
<el-button type="primary" @click="selectFieldDialogFun"
>确 定</el-button
>
</span>
</el-dialog>
<el-dialog <el-dialog
title="选择和修改" title="选择和修改"
...@@ -333,7 +348,7 @@ import { ...@@ -333,7 +348,7 @@ import {
inputOutputFields, inputOutputFields,
} from "@/api/kettle/link"; } from "@/api/kettle/link";
export default { export default {
props: ["connectionNode", "form", "nodeData"], //从父组件传过来的值 props: ["connectionNode", "form", "nodeData","saveOutputDialog","selectFieldDialog"], //从父组件传过来的值
components: { components: {
browseFiles, browseFiles,
...@@ -346,12 +361,10 @@ export default { ...@@ -346,12 +361,10 @@ export default {
metadataBox: false, metadataBox: false,
selectModifyBox:false, selectModifyBox:false,
removeFieldBox:false, removeFieldBox:false,
filter: this.form.filter,
inputFields: this.form.inputFields,
fields:this.form.fields, fields:[],
remove:this.form.remove, remove:[],
meta:this.form.meta, meta:[],
metadataForm:{}, metadataForm:{},
selectModifyForm:{}, selectModifyForm:{},
removeFieldForm:{}, removeFieldForm:{},
...@@ -379,9 +392,27 @@ export default { ...@@ -379,9 +392,27 @@ export default {
}, },
methods: { methods: {
clickFun(graph) { clickFun(graph,val) {
console.log(graph, 1); console.log(graph);
this.newGraph = graph; this.newGraph = graph;
this.fields= JSON.parse(val.fields)
this.remove= JSON.parse(val.remove)
this.meta= JSON.parse(val.meta)
},
handleCloseFun(){
this.$emit("update:selectFieldDialog", false);
},
selectFieldDialogFun(){
this.form.fields = JSON.stringify(this.fields);
this.form.remove = JSON.stringify(this.remove);
this.form.meta = JSON.stringify(this.meta);
this.saveOutputDialog(this.form)
this.handleCloseFun()
}, },
selectModifyGetTheField() { selectModifyGetTheField() {
...@@ -467,15 +498,6 @@ export default { ...@@ -467,15 +498,6 @@ export default {
}, },
addFilterBox() {
this.filterBox = !this.filterBox;
if (this.dataState) {
this.filter.push(this.filterForm);
this.$emit("filter", this.filter);
} else {
}
},
deleteField(index, rows) { deleteField(index, rows) {
......
src/views/dashboard-kettle/components/appBulletFrame/setVariable.vue
<template> <template>
<div class="customConstant"> <div class="customConstant">
<el-dialog
title="设置变量"
:visible.sync="setVariableDialog"
width="800px"
:before-close="handleCloseFun"
>
<el-form ref="from" :model="form" label-width="120px"> <el-form ref="from" :model="form" label-width="120px">
<el-form-item label="步骤名称:"> <el-form-item label="步骤名称:">
<el-input v-model="form.label"></el-input> <el-input v-model="form.label"></el-input>
...@@ -37,6 +43,16 @@ ...@@ -37,6 +43,16 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<span slot="footer" class="dialog-footer">
<el-button @click="handleCloseFun">取 消</el-button>
<el-button type="primary" @click="setVariableDialogFun"
>确 定</el-button
>
</span>
</el-dialog>
<el-dialog <el-dialog
title="添加字段" title="添加字段"
:visible.sync="fieldBox" :visible.sync="fieldBox"
...@@ -118,7 +134,7 @@ import { ...@@ -118,7 +134,7 @@ import {
variableType variableType
} from "@/api/kettle/link"; } from "@/api/kettle/link";
export default { export default {
props: ["connectionNode", "form", "nodeData"], //从父组件传过来的值 props: ["connectionNode", "form", "nodeData","saveOutputDialog","setVariableDialog"], //从父组件传过来的值
components: { components: {
browseFiles, browseFiles,
...@@ -127,7 +143,7 @@ export default { ...@@ -127,7 +143,7 @@ export default {
return { return {
newGraph: [], newGraph: [],
fieldBox: false, fieldBox: false,
fields: this.form.fields, fields: [],
metadataForm: {}, metadataForm: {},
fieldFormat: {}, fieldFormat: {},
fieldCompress: {}, fieldCompress: {},
...@@ -152,9 +168,20 @@ export default { ...@@ -152,9 +168,20 @@ export default {
}, },
methods: { methods: {
clickFun(graph) { clickFun(graph,val) {
console.log(graph, 1); console.log(graph, 1);
this.newGraph = graph; this.newGraph = graph;
this.fields = JSON.parse(val.fields)
},
handleCloseFun(){
this.$emit("update:setVariableDialog", false);
},
setVariableDialogFun() {
this.form.fields = JSON.stringify(this.fields);
this.saveOutputDialog(this.form)
this.handleCloseFun()
}, },
getTheField() { getTheField() {
......
src/views/dashboard-kettle/components/appBulletFrame/sortRecord.vue
<template> <template>
<div class="customConstant"> <div class="customConstant">
<el-dialog
title="排序记录"
:visible.sync="sortRecordDialog"
width="800px"
:before-close="handleCloseFun"
>
<el-form ref="from" :model="form" label-width="120px"> <el-form ref="from" :model="form" label-width="120px">
<el-form-item label="步骤名称:"> <el-form-item label="步骤名称:">
<el-input v-model="form.label"></el-input> <el-input v-model="form.label"></el-input>
...@@ -77,6 +83,12 @@ ...@@ -77,6 +83,12 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
</el-card> </el-card>
<span slot="footer" class="dialog-footer">
<el-button @click="handleCloseFun">取 消</el-button>
<el-button type="primary" @click="sortRecordDialogFun">确 定</el-button>
</span>
</el-dialog>
<el-dialog <el-dialog
title="添加字段" title="添加字段"
...@@ -182,7 +194,7 @@ import { ...@@ -182,7 +194,7 @@ import {
inputOutputFields, inputOutputFields,
} from "@/api/kettle/link"; } from "@/api/kettle/link";
export default { export default {
props: ["connectionNode", "form", "nodeData"], //从父组件传过来的值 props: ["connectionNode", "form", "nodeData","sortRecordDialog","saveOutputDialog"], //从父组件传过来的值
components: { components: {
browseFiles, browseFiles,
...@@ -193,7 +205,7 @@ export default { ...@@ -193,7 +205,7 @@ export default {
fileBox: false, fileBox: false,
filterBox: false, filterBox: false,
fieldBox: false, fieldBox: false,
fields: this.form.fields, fields: [],
metadataForm: {}, metadataForm: {},
filterForm: {}, filterForm: {},
fieldFormat: {}, fieldFormat: {},
...@@ -205,7 +217,7 @@ export default { ...@@ -205,7 +217,7 @@ export default {
routeState: 0, routeState: 0,
filePathSelection: false, filePathSelection: false,
localPath: {}, localPath: {},
fileSelection: this.form, fileSelection: {},
fielForm: {}, fielForm: {},
fieldsName:[], fieldsName:[],
}; };
...@@ -217,7 +229,6 @@ export default { ...@@ -217,7 +229,6 @@ export default {
this.formatMapperLineTerminatorFun(); this.formatMapperLineTerminatorFun();
this.availableCharsetsFun(); this.availableCharsetsFun();
this.compressionProviderNamesFun(); this.compressionProviderNamesFun();
console.log(this.form,79879798798);
}, },
methods: { methods: {
...@@ -225,9 +236,21 @@ export default { ...@@ -225,9 +236,21 @@ export default {
this.filePathSelection = !this.filePathSelection; this.filePathSelection = !this.filePathSelection;
}, },
clickFun(graph) { clickFun(graph,val) {
console.log(graph, 1); console.log(graph, 1);
this.newGraph = graph; this.newGraph = graph;
this.fields = JSON.parse(val.fields)
this.fileSelection = val
},
handleCloseFun(){
this.$emit("update:sortRecordDialog", false);
},
sortRecordDialogFun() {
this.handleCloseFun()
this.form.fields = JSON.stringify(this.fields);
this.saveOutputDialog(this.form)
}, },
getTheField() { getTheField() {
......
src/views/dashboard-kettle/components/appBulletFrame/textFileInput.vue
<template> <template>
<div class="customConstant"> <div class="customConstant">
<el-dialog
title="文本文件输入"
:visible.sync="TextFileInputDialog"
width="800px"
:before-close="handleCloseFun"
>
<el-form ref="from" :model="form" label-width="120px"> <el-form ref="from" :model="form" label-width="120px">
<el-form-item label="步骤名称:"> <el-form-item label="步骤名称:">
<el-input v-model="form.label"></el-input> <el-input v-model="form.label"></el-input>
...@@ -555,6 +561,17 @@ ...@@ -555,6 +561,17 @@
</el-tabs> </el-tabs>
<span slot="footer" class="dialog-footer">
<el-button @click="handleCloseFun">取 消</el-button>
<el-button type="primary" @click="TextFileInputDialogFun"
>确 定</el-button
>
</span>
</el-dialog>
<el-dialog <el-dialog
title="修改文件内容" title="修改文件内容"
:visible.sync="fileBox" :visible.sync="fileBox"
...@@ -770,7 +787,7 @@ const { ...@@ -770,7 +787,7 @@ const {
import { valueFormat, valueMeta,formatMapperLineTerminator,availableCharsets,compressionProviderNames,inputOutputFields } from "@/api/kettle/link"; import { valueFormat, valueMeta,formatMapperLineTerminator,availableCharsets,compressionProviderNames,inputOutputFields } from "@/api/kettle/link";
export default { export default {
props: ["connectionNode","form","nodeData"], //从父组件传过来的值 props: ["connectionNode","form","nodeData","TextFileInputDialog","saveOutputDialog"], //从父组件传过来的值
components: { components: {
browseFiles, browseFiles,
...@@ -781,9 +798,9 @@ export default { ...@@ -781,9 +798,9 @@ export default {
fileBox:false, fileBox:false,
filterBox: false, filterBox: false,
fieldBox: false, fieldBox: false,
fileNameStore: this.form.fileNameStore, fileNameStore:[],
filter: this.form.filter, filter: [],
inputFields: this.form.inputFields, inputFields: [],
metadataForm: {}, metadataForm: {},
filterForm: {}, filterForm: {},
fieldFormat: {}, fieldFormat: {},
...@@ -813,9 +830,31 @@ export default { ...@@ -813,9 +830,31 @@ export default {
methods: { methods: {
clickFun(graph) { clickFun(graph,val) {
console.log(graph, 1); console.log(graph, 1);
this.newGraph = graph; this.newGraph = graph;
this.fileNameStore=JSON.parse(val.fileNameStore)
this.filter=JSON.parse(val.filter)
this.inputFields=JSON.parse(val.inputFields)
},
handleCloseFun(){
this.$emit("update:TextFileInputDialog", false);
},
TextFileInputDialogFun() {
this.handleCloseFun()
this.form.filter = JSON.stringify(this.filter);
this.form.inputFields = JSON.stringify(
this.inputFields
);
this.form.fileNameStore = JSON.stringify(
this.fileNameStore
);
this.saveOutputDialog(this.form)
}, },
getTheField(){ getTheField(){
......
src/views/kettle/home2.vue
...@@ -1209,17 +1209,22 @@ props: ["dragItem"], ...@@ -1209,17 +1209,22 @@ props: ["dragItem"],
}, },
// 新建任务 // 新建任务
createJob(){ createJob(){
if(this.curNodeIconCls =='imageFolder'){
this.estabDialogVisible=true; this.estabDialogVisible=true;
this.estabTitle='任务'; this.estabTitle='任务';
}else{
this.$message.error('请选择资源库中的一个目录');
}
}, },
// 新建目录 // 新建目录
createFile(){ createFile(){
if(this.curNodeIconCls =='imageFolder'){
this.estabDialogVisible=true; this.estabDialogVisible=true;
this.estabTitle='目录'; this.estabTitle='目录';
}else{
this.$message.error('请选择资源库中的一个目录');
}
}, },
// 删除资源库文件 // 删除资源库文件
...@@ -1252,7 +1257,6 @@ props: ["dragItem"], ...@@ -1252,7 +1257,6 @@ props: ["dragItem"],
this.curNode=node;//当前选中节点 this.curNode=node;//当前选中节点
this.nodePath=data.path;//当前选择数 this.nodePath=data.path;//当前选择数
this.curNodeIconCls=node.data.iconCls; this.curNodeIconCls=node.data.iconCls;
console.log('当前节点的文件夹路径:',this.nodePath); console.log('当前节点的文件夹路径:',this.nodePath);
if(node.data.leaf){ if(node.data.leaf){
this.curNodeText=node.data.text;//当前节点 this.curNodeText=node.data.text;//当前节点
...@@ -1266,12 +1270,12 @@ props: ["dragItem"], ...@@ -1266,12 +1270,12 @@ props: ["dragItem"],
// this.tabShowFlag=true;//核心对象显项卡显示 // this.tabShowFlag=true;//核心对象显项卡显示
//mxl判断作业和转换---------------------- //mxl判断作业和转换----------------------
if(node.data.type=="transformation"){
this.$refs.nodeMenu2.stepsFun(); this.$refs.nodeMenu2.stepsFun();
let that=this; let that=this;
setTimeout(function(){ setTimeout(function(){
that.$refs.graphContainer.initGraphClick("transformation"); that.$refs.graphContainer.initGraphClick("transformation");
},500) },500)
})
}else if(node.data.type=="job"){ }else if(node.data.type=="job"){
this.$refs.nodeMenu2.jobentrysFun(); this.$refs.nodeMenu2.jobentrysFun();
let that=this; let that=this;
...@@ -1293,16 +1297,16 @@ props: ["dragItem"], ...@@ -1293,16 +1297,16 @@ props: ["dragItem"],
})
}
// else{ // else{
// this.$message.error('请选择一个资源库！'); // this.$message.error('请选择一个资源库！');
// return; // return;
// } // }
// console.log(data,'当前节点的父节点:',node.parent.data); // console.log(data,'当前节点的父节点:',node.parent.data);
}, },
//修改资源库 //修改资源库
...@@ -1337,7 +1341,7 @@ props: ["dragItem"], ...@@ -1337,7 +1341,7 @@ props: ["dragItem"],
console.log('导出资源库===='); console.log('导出资源库====');
this.exportDialogVisible=true; this.exportDialogVisible=true;
}, },
// 导入资源库弹窗 // 导入资源库弹窗
importTreeDialog(){ importTreeDialog(){
console.log('导入资源库===='); console.log('导入资源库====');
......
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