Skip to content

E
ETL-admin
Commit cfec4426 by 李耀琨
Options

更新代码

parent 9bb6a7ec
Showing with 50 additions and 23 deletions
src/views/dashboard-kettle/components/appBulletFrame/browseFiles.vue
...@@ -51,7 +51,7 @@ export default { ...@@ -51,7 +51,7 @@ export default {
if (node.level === 0) { if (node.level === 0) {
let pamq = new FormData(); // 创建form对象 let pamq = new FormData(); // 创建form对象
pamq.append("path", ""); pamq.append("path", "");
pamq.append("extension", "32"); pamq.append("extension", "1");
pamq.append("node", "xnode-2092"); pamq.append("node", "xnode-2092");
fileexplorer(pamq).then((res) => { fileexplorer(pamq).then((res) => {
this.browsingData = res; this.browsingData = res;
...@@ -61,7 +61,7 @@ export default { ...@@ -61,7 +61,7 @@ export default {
} else { } else {
let pam = new FormData(); // 创建form对象 let pam = new FormData(); // 创建form对象
pam.append("path", node.data.id); pam.append("path", node.data.id);
pam.append("extension", "32"); pam.append("extension", "1");
pam.append("node", node.data.id); pam.append("node", node.data.id);
fileexplorer(pam).then((res) => { fileexplorer(pam).then((res) => {
if (res) { if (res) {
......
src/views/dashboard-kettle/components/appBulletFrame/generatingRecords.vue
...@@ -139,8 +139,8 @@ ...@@ -139,8 +139,8 @@
<el-form-item label="设为空？:"> <el-form-item label="设为空？:">
<el-select v-model="metadataForm.nullable" style="width: 100%"> <el-select v-model="metadataForm.nullable" style="width: 100%">
<el-option label="非空" value="0"></el-option> <el-option label="非空" value="N"></el-option>
<el-option label="空" value="1"></el-option> <el-option label="空" value="Y"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-form> </el-form>
......
src/views/dashboard-kettle/components/appBulletFrame/getSystemInformation.vue
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
v-for="item in type" v-for="item in type"
:key="item.code" :key="item.code"
:label="item.descrp" :label="item.descrp"
:value="item.descrp" :value="item.code"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
......
src/views/dashboard-kettle/components/designer/mxgraphDesigner.vue
...@@ -168,6 +168,7 @@ ...@@ -168,6 +168,7 @@
v-model="form.accept_filenames" v-model="form.accept_filenames"
true-label="Y" true-label="Y"
false-label="N" false-label="N"
></el-checkbox> ></el-checkbox>
</el-form-item> </el-form-item>
<el-form-item label="从哪个步骤读文件名:"> <el-form-item label="从哪个步骤读文件名:">
...@@ -175,10 +176,11 @@ ...@@ -175,10 +176,11 @@
v-model="form.accept_stepname" v-model="form.accept_stepname"
style="width: 100%" style="width: 100%"
:disabled=" :disabled="
!form.accept_filenames || form.accept_filenames == 'N' !form.accept_filenames || form.accept_filenames == 'N'"
" @click.native="lastStep"
> >
<el-option <el-option
v-for="item in connectionNode" v-for="item in connectionNode"
:key="item.id" :key="item.id"
:label="item.name" :label="item.name"
...@@ -194,9 +196,12 @@ ...@@ -194,9 +196,12 @@
:disabled=" :disabled="
!form.accept_filenames || form.accept_filenames == 'N' !form.accept_filenames || form.accept_filenames == 'N'
" "
@click.native="previousField"
> >
<el-option label="区域一" value="shanghai"></el-option> <el-option v-for="item in getField"
<el-option label="区域二" value="beijing"></el-option> :key="item.id"
:label="item.name"
:value="item"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-form> </el-form>
...@@ -968,6 +973,7 @@ export default { ...@@ -968,6 +973,7 @@ export default {
outPutFormData9:{}, outPutFormData9:{},
outPutFormData:{},//输出弹窗组件的表单值 outPutFormData:{},//输出弹窗组件的表单值
doubleClickCell:{}, doubleClickCell:{},
getField:[],
transGraphVisible:false,//执行转换弹窗 transGraphVisible:false,//执行转换弹窗
monitorCanvas: "", //监听画布 monitorCanvas: "", //监听画布
getXmlVal: "", //获取上一个xml getXmlVal: "", //获取上一个xml
...@@ -980,6 +986,7 @@ export default { ...@@ -980,6 +986,7 @@ export default {
doubleClickCell: {}, //双击节点 doubleClickCell: {}, //双击节点
filter:{}, filter:{},
// mxl================================= // mxl=================================
InsertOrUpdateVisible: false, InsertOrUpdateVisible: false,
tableOutPutVisible: false, tableOutPutVisible: false,
...@@ -996,7 +1003,7 @@ export default { ...@@ -996,7 +1003,7 @@ export default {
file: [], file: [],
sheets: [], sheets: [],
publicData: [], //全部连接 publicData: [], //全部连接
connectionNode: {}, connectionNode: [],
codingType: [], codingType: [],
routeState: 0, routeState: 0,
filePathSelection: false, filePathSelection: false,
...@@ -1382,6 +1389,39 @@ export default { ...@@ -1382,6 +1389,39 @@ export default {
return mxUtils.getPrettyXml(node); return mxUtils.getPrettyXml(node);
}, },
lastStep(){
var enc = new mxCodec(mxUtils.createXmlDocument());
var node = enc.encode(this.graph.getModel());
this.graphXml = mxUtils.getPrettyXml(node);
let pamerSteps = new FormData(); // 创建form对象
pamerSteps.append("stepName", this.nodeData.title);
pamerSteps.append("graphXml", this.getXmlVal);
pamerSteps.append("query", "");
previousSteps(pamerSteps).then((res) => {
this.connectionNode = res
});
},
previousField(){
var enc = new mxCodec(mxUtils.createXmlDocument());
var node = enc.encode(this.graph.getModel());
this.graphXml = mxUtils.getPrettyXml(node);
let pamerFields = new FormData(); // 创建form对象
pamerFields.append("stepName", this.nodeData.title)
pamerFields.append("graphXml", this.getXmlVal);
pamerFields.append("before", true);
pamerFields.append("query", "");
inputOutputFields(pamerFields).then((res) => {
this.getField = res
});
},
//初始化画布 //初始化画布
initGraph() { initGraph() {
if (this.R.isNil(this.graph)) { if (this.R.isNil(this.graph)) {
...@@ -1483,19 +1523,6 @@ export default { ...@@ -1483,19 +1523,6 @@ export default {
this.fieldFormat = res; this.fieldFormat = res;
}); });
let pamerSteps = new FormData(); // 创建form对象
pamerSteps.append("stepName", cell.title);
pamerSteps.append("graphXml", this.getXmlVal);
pamerSteps.append("query", "");
previousSteps(pamerSteps).then((res) => {
console.log(res, 7777777777777);
});
let pamerFields = new FormData(); // 创建form对象
pamerFields.append("valueType", "all");
inputOutputFields().then((res) => {});
if ( if (
cell.ids == "step1" || cell.ids == "step1" ||
cell.value.attributes.ctype.value == "ExcelInput" cell.value.attributes.ctype.value == "ExcelInput"
......
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