Skip to content

E
ETL-admin
Commit d327393f by 李耀琨
Options

完成字符串替换，替换Null值，分组，发送邮件

parent e9433fa1
Showing with 721 additions and 117 deletions
.env.development
ENV = 'development' ENV = 'development'
#VUE_APP_BASE_API = 'http://147.1.3.180:9888/' #VUE_APP_BASE_API = 'http://147.1.3.180:9888/'
#VUE_APP_WS_API = 'ws://147.1.3.180:9888/' #VUE_APP_WS_API = 'ws://147.1.3.180:9888/'
#VUE_APP_BASE_API = 'http://192.168.0.24:9888' #VUE_APP_BASE_API = 'http://192.168.0.24:9888'
#VUE_APP_WS_API = 'ws://192.168.0.24:9888' #VUE_APP_WS_API = 'ws://192.168.0.24:9888'
#VUE_APP_FILE_API = 'http://192.168.0.24:9888' #VUE_APP_FILE_API = 'http://192.168.0.24:9888'
# 接口地址 # 接口地址
#VUE_APP_BASE_API = 'http://192.168.0.33:9889'
#VUE_APP_WS_API = 'ws://192.168.0.33:9889'
#VUE_APP_FILE_API = 'http://192.168.0.33:9889'
VUE_APP_BASE_API = 'http://192.168.0.71:9888' VUE_APP_BASE_API = 'http://192.168.0.71:9888'
VUE_APP_WS_API = 'ws://192.168.0.71:9888' VUE_APP_WS_API = 'ws://192.168.0.71:9888'
VUE_APP_FILE_API = 'http://192.168.0.71:9888' VUE_APP_FILE_API = 'http://192.168.0.71:9888'
# 是否启用 babel-plugin-dynamic-import-node插件 # 是否启用 babel-plugin-dynamic-import-node插件
VUE_CLI_BABEL_TRANSPILE_MODULES = true VUE_CLI_BABEL_TRANSPILE_MODULES = true
package.json
...@@ -64,6 +64,7 @@ ...@@ -64,6 +64,7 @@
"scss": "^0.2.4", "scss": "^0.2.4",
"scss-loader": "0.0.1", "scss-loader": "0.0.1",
"sortablejs": "1.8.4", "sortablejs": "1.8.4",
"uuid": "^8.3.2",
"vue": "2.6.10", "vue": "2.6.10",
"vue-count-to": "1.0.13", "vue-count-to": "1.0.13",
"vue-cropper": "0.4.9", "vue-cropper": "0.4.9",
......
src/assets/styles/index.scss
...@@ -584,7 +584,7 @@ aside { ...@@ -584,7 +584,7 @@ aside {
// $svgUrl:'http://147.1.3.180:9888/ETLWEB-SERVER/etlweb'; // $svgUrl:'http://147.1.3.180:9888/ETLWEB-SERVER/etlweb';
// $svgUrl:'http://192.168.0.24:9888/ETLWEB-SERVER/etlweb'; // $svgUrl:'http://192.168.0.24:9888/ETLWEB-SERVER/etlweb';
$svgUrl:'http://192.168.0.71:9888/ETLWEB-SERVER/etlweb'; $svgUrl:'http://192.168.0.71:9888/ETLWEB-SERVER/etlweb';
// $svgUrl:'http://192.168.0.33:9889/ETLWEB-SERVER/etlweb';
// $svgUrl:'http://192.168.0.44:9882/ETLWEB-SERVER/etlweb'; // $svgUrl:'http://192.168.0.44:9882/ETLWEB-SERVER/etlweb';
// .schema { background-image: url($svgUrl/ui/images/schema.svg?scale=16) !important;} // .schema { background-image: url($svgUrl/ui/images/schema.svg?scale=16) !important;}
......
src/main.js
...@@ -81,6 +81,7 @@ const baseUrl = process.env.VUE_APP_BASE_API === '/' ? '' : process.env.VUE_APP_ ...@@ -81,6 +81,7 @@ const baseUrl = process.env.VUE_APP_BASE_API === '/' ? '' : process.env.VUE_APP_
// Vue.prototype.etlWeb = "http://147.1.3.180:9888/ETLWEB-SERVER/etlweb/" // Vue.prototype.etlWeb = "http://147.1.3.180:9888/ETLWEB-SERVER/etlweb/"
// Vue.prototype.etlWeb = "http://192.168.0.24:9888/ETLWEB-SERVER/etlweb/" // Vue.prototype.etlWeb = "http://192.168.0.24:9888/ETLWEB-SERVER/etlweb/"
Vue.prototype.etlWeb = "http://192.168.0.71:9888/ETLWEB-SERVER/etlweb/" Vue.prototype.etlWeb = "http://192.168.0.71:9888/ETLWEB-SERVER/etlweb/"
// Vue.prototype.etlWeb = "http://192.168.0.33:9889/ETLWEB-SERVER/etlweb/"
new Vue({ new Vue({
......
src/views/dashboard-kettle/components/appBulletFrame/conversionSettings.vue
...@@ -458,6 +458,21 @@ ...@@ -458,6 +458,21 @@
</template> </template>
<script> <script>
import mxgraph from "@/utils/mxgraph";
const {
mxGraph,
mxUtils,
mxEvent,
mxKeyHandler,
mxRubberband,
mxConstants,
mxStencilRegistry,
mxStencil,
mxCodec,
mxGraphModel,
mxGeometry,
} = mxgraph;
import main from "../../../mykettle/main"; import main from "../../../mykettle/main";
export default { export default {
components: { components: {
......
src/views/dashboard-kettle/components/appBulletFrame/customConstant.vue
...@@ -206,6 +206,20 @@ ...@@ -206,6 +206,20 @@
</template> </template>
<script> <script>
import mxgraph from "@/utils/mxgraph";
const {
mxGraph,
mxUtils,
mxEvent,
mxKeyHandler,
mxRubberband,
mxConstants,
mxStencilRegistry,
mxStencil,
mxCodec,
mxGraphModel,
mxGeometry,
} = mxgraph;
import { valueFormat, valueMeta } from "@/api/kettle/link"; import { valueFormat, valueMeta } from "@/api/kettle/link";
export default { export default {
......
src/views/dashboard-kettle/components/appBulletFrame/generatingRecords.vue
...@@ -169,6 +169,20 @@ ...@@ -169,6 +169,20 @@
</template> </template>
<script> <script>
import mxgraph from "@/utils/mxgraph";
const {
mxGraph,
mxUtils,
mxEvent,
mxKeyHandler,
mxRubberband,
mxConstants,
mxStencilRegistry,
mxStencil,
mxCodec,
mxGraphModel,
mxGeometry,
} = mxgraph;
import { valueFormat, valueMeta } from "@/api/kettle/link"; import { valueFormat, valueMeta } from "@/api/kettle/link";
export default { export default {
......
src/views/dashboard-kettle/components/appBulletFrame/getSystemInformation.vue
...@@ -82,6 +82,20 @@ ...@@ -82,6 +82,20 @@
</template> </template>
<script> <script>
import mxgraph from "@/utils/mxgraph";
const {
mxGraph,
mxUtils,
mxEvent,
mxKeyHandler,
mxRubberband,
mxConstants,
mxStencilRegistry,
mxStencil,
mxCodec,
mxGraphModel,
mxGeometry,
} = mxgraph;
import { systemDataTypes } from "@/api/kettle/link"; import { systemDataTypes } from "@/api/kettle/link";
export default { export default {
......
src/views/dashboard-kettle/components/appBulletFrame/grouping.vue
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
</el-form> </el-form>
结构分组的字段： 结构分组的字段：
<br /> <br />
<el-button type="text" @click="selectModify(true)">添加字段</el-button> <el-button type="text" @click="structure(true)">添加字段</el-button>
<el-button type="text" @click="getTheGroup">获取字段</el-button> <el-button type="text" @click="getTheGroup">获取字段</el-button>
<el-table :data="groupFile" border style="width: 100%"> <el-table :data="groupFile" border style="width: 100%">
<el-table-column prop="name" label="分组字段"> </el-table-column> <el-table-column prop="name" label="分组字段"> </el-table-column>
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
<el-table-column label="操作"> <el-table-column label="操作">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
@click="selectModify(false, scope.row)" @click="structure(false, scope.row)"
type="text" type="text"
size="small" size="small"
>编辑</el-button >编辑</el-button
...@@ -96,7 +96,7 @@ ...@@ -96,7 +96,7 @@
<br /> <br />
聚合： 聚合：
<br /> <br />
<el-button type="text" @click="selectModify(true)">添加字段</el-button> <el-button type="text" @click="polymerization(true)">添加字段</el-button>
<el-button type="text" @click="getTheField">获取字段</el-button> <el-button type="text" @click="getTheField">获取字段</el-button>
<el-table :data="fields" border style="width: 100%"> <el-table :data="fields" border style="width: 100%">
<el-table-column prop="aggregate" label="分组字段"> </el-table-column> <el-table-column prop="aggregate" label="分组字段"> </el-table-column>
...@@ -106,7 +106,7 @@ ...@@ -106,7 +106,7 @@
<el-table-column label="操作"> <el-table-column label="操作">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
@click="selectModify(false, scope.row)" @click="polymerization(false, scope.row)"
type="text" type="text"
size="small" size="small"
>编辑</el-button >编辑</el-button
...@@ -127,8 +127,8 @@ ...@@ -127,8 +127,8 @@
</span> </span>
</el-dialog> </el-dialog>
<!-- <el-dialog <el-dialog
title="添加字段" title="添加结构分组的字段"
:visible.sync="addField" :visible.sync="addField"
width="500px" width="500px"
:before-close="handleClose" :before-close="handleClose"
...@@ -138,29 +138,76 @@ ...@@ -138,29 +138,76 @@
<el-form-item label="名称:"> <el-form-item label="名称:">
<el-input v-model="fiel.name"></el-input> <el-input v-model="fiel.name"></el-input>
</el-form-item> </el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="addField = false">取 消</el-button>
<el-button type="primary" @click="addFieldDetermine">确 定</el-button>
</span>
</el-dialog>
<el-dialog
title="添加聚合"
:visible.sync="gather"
width="500px"
:before-close="handleClose"
:modal="false"
>
<el-form ref="form" :model="fiel" label-width="160px">
<el-form-item label="分组字段:">
<el-input v-model="gatherLite.aggregate"></el-input>
</el-form-item>
<el-form-item label="subject:">
<el-select v-model="gatherLite.subject" placeholder="请选择">
<el-option
v-for="(item,index) in fields"
:key="index"
:label="item.aggregate"
:value="item.aggregate"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="类型:"> <el-form-item label="类型:">
<el-select v-model="fiel.type" style="width: 100%" clearable> <el-select v-model="gatherLite.type" placeholder="请选择">
<el-option <el-option
v-for="item in type" v-for="item in fields"
:key="item.code" :key="item.value"
:label="item.descrp" :label="item.label"
:value="item.code" :value="item.value"
/> >
</el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-form> </el-form>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button @click="addField = false">取 消</el-button> <el-button @click="gather = false">取 消</el-button>
<el-button type="primary" @click="addFieldDetermine">确 定</el-button> <el-button type="primary" @click="gatherDetermine">确 定</el-button>
</span> </span>
</el-dialog> --> </el-dialog>
</div> </div>
</template> </template>
<script> <script>
import { systemDataTypes, inputOutputFields } from "@/api/kettle/link"; import { systemDataTypes, inputOutputFields } from "@/api/kettle/link";
import mxgraph from "@/utils/mxgraph";
const {
mxGraph,
mxUtils,
mxEvent,
mxKeyHandler,
mxRubberband,
mxConstants,
mxStencilRegistry,
mxStencil,
mxCodec,
mxGraphModel,
mxGeometry,
} = mxgraph;
export default { export default {
props: ["form", "groupingDialog", "saveOutputDialog", "nodeData"], props: ["form", "groupingDialog", "saveOutputDialog", "nodeData"],
data() { data() {
...@@ -171,6 +218,8 @@ export default { ...@@ -171,6 +218,8 @@ export default {
type: {}, type: {},
dataStatus: false, dataStatus: false,
fiel: {}, fiel: {},
gatherLite: {},
gather: false,
}; };
}, },
...@@ -179,6 +228,30 @@ export default { ...@@ -179,6 +228,30 @@ export default {
}, },
methods: { methods: {
gatherDetermine(){},
structure(state, val) {
// this.addField = !this.addField
this.dataStatus = state;
if (state) {
this.fiel = {};
} else {
this.fiel = val;
}
this.addField = !this.addField;
},
polymerization(state, val) {
this.dataStatus = state;
if (state) {
this.gatherLite = {};
} else {
this.gatherLite = val;
this.systemDataTypesFun()
}
this.gather = !this.gather;
},
getTheGroup() { getTheGroup() {
var enc = new mxCodec(mxUtils.createXmlDocument()); var enc = new mxCodec(mxUtils.createXmlDocument());
var node = enc.encode(this.newGraph.getModel()); var node = enc.encode(this.newGraph.getModel());
...@@ -191,16 +264,13 @@ export default { ...@@ -191,16 +264,13 @@ export default {
pamerFields.append("graphXml", this.graphXml); pamerFields.append("graphXml", this.graphXml);
pamerFields.append("before", true); pamerFields.append("before", true);
inputOutputFields(pamerFields).then((res) => { inputOutputFields(pamerFields).then((res) => {
// this.parameters = res; this.groupFile = res;
res.forEach((item, index) => {
console.log(item, index);
this.groupFile.push({
variable: item.name,
});
});
console.log(res); console.log(res);
}); });
}, },
deleteField(index, rows) {
rows.splice(index, 1);
},
getTheField() { getTheField() {
console.log(this.nodeData); console.log(this.nodeData);
...@@ -219,10 +289,16 @@ export default { ...@@ -219,10 +289,16 @@ export default {
pamerFields.append("query", ""); pamerFields.append("query", "");
inputOutputFields(pamerFields).then((res) => { inputOutputFields(pamerFields).then((res) => {
console.log(res, "yuiyuiyui"); console.log(res, "yuiyuiyui");
for (let i of res) { this.fields = []
i.field_name = i.name; res.forEach((item) => {
} this.fields.push({
this.fields = res; aggregate: item.name,
subject: item.name,
type: item.type,
});
console.log(this.fields);
});
// this.fields.field_name = res.name // this.fields.field_name = res.name
}); });
}, },
...@@ -231,7 +307,8 @@ export default { ...@@ -231,7 +307,8 @@ export default {
console.log(graph, "双击获取值"); console.log(graph, "双击获取值");
this.newGraph = graph; this.newGraph = graph;
console.log(val, "拿到form"); console.log(val, "拿到form");
// this.fields = JSON.parse(val.fields) this.fields = JSON.parse(val.fields)
this.groupFile = JSON.parse(val.groupFile)
}, },
handleCloseFun() { handleCloseFun() {
...@@ -265,18 +342,9 @@ export default { ...@@ -265,18 +342,9 @@ export default {
rows.splice(index, 1); rows.splice(index, 1);
}, },
addSheet(state, val) {
this.addField = !this.addField;
this.dataStatus = state;
if (state) {
this.fiel = {};
} else {
this.fiel = val;
}
},
systemDataTypesFun() { systemDataTypesFun() {
systemDataTypes().then((res) => { systemDataTypes().then((res) => {
console.log(res);
this.type = res; this.type = res;
}); });
}, },
......
src/views/dashboard-kettle/components/appBulletFrame/importXmlFile.vue
...@@ -305,6 +305,21 @@ ...@@ -305,6 +305,21 @@
</template> </template>
<script> <script>
import mxgraph from "@/utils/mxgraph";
const {
mxGraph,
mxUtils,
mxEvent,
mxKeyHandler,
mxRubberband,
mxConstants,
mxStencilRegistry,
mxStencil,
mxCodec,
mxGraphModel,
mxGeometry,
} = mxgraph;
import main from "../../../mykettle/main"; import main from "../../../mykettle/main";
import browseFiles from "../appBulletFrame/browseFiles"; import browseFiles from "../appBulletFrame/browseFiles";
import { datetimeformat, getLinkList,exp,test } from "@/api/kettle/link"; import { datetimeformat, getLinkList,exp,test } from "@/api/kettle/link";
......
src/views/dashboard-kettle/components/appBulletFrame/jobSettings.vue
...@@ -195,6 +195,21 @@ ...@@ -195,6 +195,21 @@
</template> </template>
<script> <script>
import mxgraph from "@/utils/mxgraph";
const {
mxGraph,
mxUtils,
mxEvent,
mxKeyHandler,
mxRubberband,
mxConstants,
mxStencilRegistry,
mxStencil,
mxCodec,
mxGraphModel,
mxGeometry,
} = mxgraph;
export default { export default {
props: ["jobSettingsDialog"], props: ["jobSettingsDialog"],
data() { data() {
......
src/views/dashboard-kettle/components/appBulletFrame/mappingInput.vue
...@@ -104,6 +104,21 @@ ...@@ -104,6 +104,21 @@
</template> </template>
<script> <script>
import mxgraph from "@/utils/mxgraph";
const {
mxGraph,
mxUtils,
mxEvent,
mxKeyHandler,
mxRubberband,
mxConstants,
mxStencilRegistry,
mxStencil,
mxCodec,
mxGraphModel,
mxGeometry,
} = mxgraph;
import { valueMeta } from "@/api/kettle/link"; import { valueMeta } from "@/api/kettle/link";
export default { export default {
props: ["form", "mappingInputDialog", "saveOutputDialog", "nodeData"], props: ["form", "mappingInputDialog", "saveOutputDialog", "nodeData"],
......
src/views/dashboard-kettle/components/appBulletFrame/mappingOutput.vue
...@@ -25,6 +25,21 @@ ...@@ -25,6 +25,21 @@
</template> </template>
<script> <script>
import mxgraph from "@/utils/mxgraph";
const {
mxGraph,
mxUtils,
mxEvent,
mxKeyHandler,
mxRubberband,
mxConstants,
mxStencilRegistry,
mxStencil,
mxCodec,
mxGraphModel,
mxGeometry,
} = mxgraph;
import { systemDataTypes } from "@/api/kettle/link"; import { systemDataTypes } from "@/api/kettle/link";
export default { export default {
props: ["form", "mappingOutputDialog", "saveOutputDialog", "nodeData"], props: ["form", "mappingOutputDialog", "saveOutputDialog", "nodeData"],
......
src/views/dashboard-kettle/components/appBulletFrame/nullOperation.vue
...@@ -54,6 +54,21 @@ ...@@ -54,6 +54,21 @@
</template> </template>
<script> <script>
import mxgraph from "@/utils/mxgraph";
const {
mxGraph,
mxUtils,
mxEvent,
mxKeyHandler,
mxRubberband,
mxConstants,
mxStencilRegistry,
mxStencil,
mxCodec,
mxGraphModel,
mxGeometry,
} = mxgraph;
import { systemDataTypes } from "@/api/kettle/link"; import { systemDataTypes } from "@/api/kettle/link";
export default { export default {
props: ["form", "nullOperationDialog", "saveOutputDialog", "nodeData"], props: ["form", "nullOperationDialog", "saveOutputDialog", "nodeData"],
......
src/views/dashboard-kettle/components/appBulletFrame/randomNumber.vue
<template> <template>
<div class="randomNumber"> <div class="randomNumber">
<el-dialog <el-dialog
title="生成随机数" title="生成随机数"
:visible.sync="RandomValueDialog" :visible.sync="RandomValueDialog"
width="800px" width="800px"
:before-close="handleCloseFun" :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>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-form ref="form" :model="form" label-width="0px"> <el-form ref="form" :model="form" label-width="0px">
<el-button type="text" @click="addSheet(true)" style="margin: 10px" <el-button type="text" @click="addSheet(true)" style="margin: 10px"
>添加字段</el-button >添加字段</el-button
> >
<el-form-item> <el-form-item>
<el-table :data="fields" style="width: 100%"> <el-table :data="fields" style="width: 100%">
<el-table-column label="字段"> <el-table-column label="字段">
<el-table-column <el-table-column type="index" width="50"> </el-table-column>
type="index" <el-table-column prop="name" label="名称"> </el-table-column>
width="50">
</el-table-column> <el-table-column prop="type" label="类型"> </el-table-column>
<el-table-column prop="name" label="名称"> </el-table-column> <el-table-column label="操作">
<template slot-scope="scope">
<el-table-column prop="type" label="类型"> </el-table-column> <el-button
<el-table-column label="操作"> @click="addSheet(false, scope.row)"
<template slot-scope="scope"> type="text"
<el-button size="small"
@click="addSheet(false,scope.row)" >编辑</el-button
type="text" >
size="small" <el-button
>编辑</el-button type="text"
> size="small"
<el-button @click="deleteRow(scope.$index, fields)"
type="text" >删除</el-button
size="small" >
@click="deleteRow(scope.$index, fields)" </template>
>删除</el-button </el-table-column>
>
</template>
</el-table-column> </el-table-column>
</el-table-column> </el-table>
</el-table> </el-form-item>
</el-form-item> </el-form>
</el-form> <span slot="footer" class="dialog-footer">
<span slot="footer" class="dialog-footer">
<el-button @click="handleCloseFun">取 消</el-button> <el-button @click="handleCloseFun">取 消</el-button>
<el-button type="primary" @click="RandomValueDialogFun" <el-button type="primary" @click="RandomValueDialogFun"
>确 定</el-button >确 定</el-button
...@@ -54,7 +51,6 @@ ...@@ -54,7 +51,6 @@
</span> </span>
</el-dialog> </el-dialog>
<el-dialog <el-dialog
title="添加字段" title="添加字段"
:visible.sync="addField" :visible.sync="addField"
...@@ -88,17 +84,32 @@ ...@@ -88,17 +84,32 @@
</template> </template>
<script> <script>
import mxgraph from "@/utils/mxgraph";
const {
mxGraph,
mxUtils,
mxEvent,
mxKeyHandler,
mxRubberband,
mxConstants,
mxStencilRegistry,
mxStencil,
mxCodec,
mxGraphModel,
mxGeometry,
} = mxgraph;
import { randomValueFunc } from "@/api/kettle/link"; import { randomValueFunc } from "@/api/kettle/link";
export default { export default {
props: ["form","saveOutputDialog","RandomValueDialog"], props: ["form", "saveOutputDialog", "RandomValueDialog"],
data() { data() {
return { return {
fields: [], fields: [],
fiel:{}, fiel: {},
random:{}, random: {},
dataState:false, dataState: false,
addField:false, addField: false,
}; };
}, },
...@@ -107,54 +118,46 @@ export default { ...@@ -107,54 +118,46 @@ export default {
}, },
methods: { methods: {
clickFun(graph, val) {
console.log(graph, "双击获取值");
this.newGraph = graph;
console.log(val, "拿到form");
this.fields = JSON.parse(val.fields);
},
clickFun(graph,val){ handleCloseFun() {
console.log(graph,'双击获取值') this.$emit("update:RandomValueDialog", false);
this.newGraph = graph; },
console.log(val,"拿到form");
this.fields = JSON.parse(val.fields)
},
handleCloseFun(){
this.$emit("update:RandomValueDialog", false);
},
RandomValueDialogFun() { RandomValueDialogFun() {
this.handleCloseFun() this.handleCloseFun();
this.form.fields = JSON.stringify(this.fields); this.form.fields = JSON.stringify(this.fields);
this.saveOutputDialog(this.form) this.saveOutputDialog(this.form);
}, },
addSheet(state,val) { addSheet(state, val) {
this.addField = !this.addField; this.addField = !this.addField;
this.dataState = state this.dataState = state;
if (state) { if (state) {
this.fiel = {}; this.fiel = {};
}else{ } else {
this.fiel = val; this.fiel = val;
} }
}, },
addFieldState(){ addFieldState() {
this.addField = !this.addField this.addField = !this.addField;
if (this.dataState) { if (this.dataState) {
this.fields.push(this.fiel) this.fields.push(this.fiel);
} }
}, },
randomValueFuncFun() { randomValueFuncFun() {
randomValueFunc().then((res) => { randomValueFunc().then((res) => {
this.random = res; this.random = res;
}); });
}, },
deleteRow(index, rows) { deleteRow(index, rows) {
rows.splice(index, 1); rows.splice(index, 1);
}, },
...@@ -167,8 +170,6 @@ export default { ...@@ -167,8 +170,6 @@ export default {
}) })
.catch((_) => {}); .catch((_) => {});
}, },
}, },
}; };
</script> </script>
......
src/views/dashboard-kettle/components/appBulletFrame/streamQuery.vue
...@@ -137,6 +137,21 @@ ...@@ -137,6 +137,21 @@
</template> </template>
<script> <script>
import mxgraph from "@/utils/mxgraph";
const {
mxGraph,
mxUtils,
mxEvent,
mxKeyHandler,
mxRubberband,
mxConstants,
mxStencilRegistry,
mxStencil,
mxCodec,
mxGraphModel,
mxGeometry,
} = mxgraph;
import { systemDataTypes } from "@/api/kettle/link"; import { systemDataTypes } from "@/api/kettle/link";
export default { export default {
props: ["form", "streamQueryDialog", "saveOutputDialog"], props: ["form", "streamQueryDialog", "saveOutputDialog"],
......
src/views/dashboard-kettle/components/designer/modules/node_menu.vue
...@@ -90,7 +90,7 @@ export default { ...@@ -90,7 +90,7 @@ export default {
// prefix:`http://147.1.3.180:9888/ETLWEB-SERVER/etlweb/`, // prefix:`http://147.1.3.180:9888/ETLWEB-SERVER/etlweb/`,
// prefix:`http://192.168.0.24:9888/ETLWEB-SERVER/etlweb/`, // prefix:`http://192.168.0.24:9888/ETLWEB-SERVER/etlweb/`,
prefix:`http://192.168.0.71:9888/ETLWEB-SERVER/etlweb/`, prefix:`http://192.168.0.71:9888/ETLWEB-SERVER/etlweb/`,
// prefix:`http://192.168.0.33:9889/ETLWEB-SERVER/etlweb/`,
// 测试数据开始===== // 测试数据开始=====
jobTreeList: [ jobTreeList: [
{ {
......
src/views/dashboard-kettle/components/designer/mxgraphDesigner.vue
...@@ -742,6 +742,20 @@ ...@@ -742,6 +742,20 @@
> >
</getSystemInformation> </getSystemInformation>
<!-- 字符串替换-->
<stringSubstitution
ref="stringSubstitution"
:disabled="true"
:form="form"
:nodeData="nodeData"
:stringSubstitutionDialog.sync="stringSubstitutionDialog"
:saveOutputDialog="saveOutputDialog"
>
</stringSubstitution>
<!-- 自定义常量数据--> <!-- 自定义常量数据-->
<customConstant <customConstant
...@@ -984,13 +998,16 @@ ...@@ -984,13 +998,16 @@
:form="form" :form="form"
:streamQueryDialog.sync="streamQueryDialog" :streamQueryDialog.sync="streamQueryDialog"
:doubleClickCell="doubleClickCell" :doubleClickCell="doubleClickCell"
:saveOutputDialog="saveOutputDialog"
></streamQuery> ></streamQuery>
<!-- 替换NULL值 --> <!-- 替换NULL值 -->
<replaceNull <replaceNull
ref="replaceNull" ref="replaceNull"
:form="form" :form="form"
:nodeData="nodeData"
:replaceNullDialog.sync="replaceNullDialog" :replaceNullDialog.sync="replaceNullDialog"
:doubleClickCell="doubleClickCell"> :doubleClickCell="doubleClickCell"
:saveOutputDialog="saveOutputDialog">
</replaceNull> </replaceNull>
<!-- 发送邮件 --> <!-- 发送邮件 -->
...@@ -999,6 +1016,7 @@ ...@@ -999,6 +1016,7 @@
:form="form" :form="form"
:sendMailDialog.sync="sendMailDialog" :sendMailDialog.sync="sendMailDialog"
:doubleClickCell="doubleClickCell" :doubleClickCell="doubleClickCell"
:saveOutputDialog="saveOutputDialog"
></sendMail> ></sendMail>
<!-- 文件浏览器--> <!-- 文件浏览器-->
...@@ -1267,7 +1285,7 @@ import mappingInput from "../appBulletFrame/mappingInput"; //映射输入 ...@@ -1267,7 +1285,7 @@ import mappingInput from "../appBulletFrame/mappingInput"; //映射输入
import mappingOutput from "../appBulletFrame/mappingOutput"; //映射输出 import mappingOutput from "../appBulletFrame/mappingOutput"; //映射输出
import xmlFileInput from "../appBulletFrame/xmlFileInput"; //xml文件输入 import xmlFileInput from "../appBulletFrame/xmlFileInput"; //xml文件输入
import nullOperation from "../appBulletFrame/nullOperation"; //空操作 import nullOperation from "../appBulletFrame/nullOperation"; //空操作
import stringSubstitution from "../appBulletFrame/stringSubstitution"; //字符串替换
import conversionSettings from "../appBulletFrame/conversionSettings"; //转换设置 import conversionSettings from "../appBulletFrame/conversionSettings"; //转换设置
import jobSettings from "../appBulletFrame/jobSettings"; //作业设置 import jobSettings from "../appBulletFrame/jobSettings"; //作业设置
...@@ -1409,6 +1427,7 @@ export default { ...@@ -1409,6 +1427,7 @@ export default {
xmlFileInputDialog: false, //xml文件输入 xmlFileInputDialog: false, //xml文件输入
importXmlFileDialog: false, //导出资源库到XML文件 importXmlFileDialog: false, //导出资源库到XML文件
groupingDialog: false, //分组 groupingDialog: false, //分组
stringSubstitutionDialog:false,//字符串替换
streamQueryDialog: false, //流查询 streamQueryDialog: false, //流查询
replaceNullDialog:false, //替换Null值 replaceNullDialog:false, //替换Null值
sendMailDialog: false, //发送邮件 sendMailDialog: false, //发送邮件
...@@ -1506,6 +1525,7 @@ export default { ...@@ -1506,6 +1525,7 @@ export default {
successDialog, successDialog,
homeworkDialog, homeworkDialog,
// //
stringSubstitution,//字符串替换
sortRecord, //排序记录 sortRecord, //排序记录
setVariable, //设置变量 setVariable, //设置变量
getVariable, //获取变量 getVariable, //获取变量
...@@ -2215,7 +2235,14 @@ export default { ...@@ -2215,7 +2235,14 @@ export default {
valueFormat(pamer2).then((res) => { valueFormat(pamer2).then((res) => {
this.fieldFormat = res; this.fieldFormat = res;
}); });
if ((this.curFileType == "transformation" && cell.dis == "step84") || if ((this.curFileType == "transformation" && cell.dis == "step63") ||
cell.value.attributes.ctype.value == "ReplaceString") {
this.stringSubstitutionDialog = !this.stringSubstitutionDialog
this.form = this.showDataFunc();
setTimeout(() => {
this.$refs.stringSubstitution.clickFun(this.graph,this.form);
}, 500);
}else if ((this.curFileType == "transformation" && cell.dis == "step84") ||
cell.value.attributes.ctype.value == "IfNull") { cell.value.attributes.ctype.value == "IfNull") {
this.replaceNullDialog = !this.replaceNullDialog this.replaceNullDialog = !this.replaceNullDialog
this.form = this.showDataFunc(); this.form = this.showDataFunc();
......
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