Skip to content

E
ETL-admin
Commit ab6029de by 李耀琨
Options

修复bug

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