Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
ETL-admin
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
莫晓莉
ETL-admin
Commits
261a9af1
Commit
261a9af1
authored
Apr 09, 2021
by
莫晓莉
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
所有组件传递画布databases
parent
33fe19e5
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
101 additions
and
13 deletions
+101
-13
src/views/dashboard-kettle/components/designer/mxgraphDesigner.vue
+1
-0
src/views/output-dialog/delete.vue
+24
-3
src/views/output-dialog/insertOrUpdate.vue
+23
-3
src/views/output-dialog/sqlFileOutput.vue
+7
-1
src/views/output-dialog/synchronize.vue
+23
-3
src/views/output-dialog/update.vue
+23
-3
No files found.
src/views/dashboard-kettle/components/designer/mxgraphDesigner.vue
View file @
261a9af1
...
@@ -1667,6 +1667,7 @@ export default {
...
@@ -1667,6 +1667,7 @@ export default {
//SQL文件输出
//SQL文件输出
this
.
sqlVisible
=
!
this
.
sqlVisible
;
this
.
sqlVisible
=
!
this
.
sqlVisible
;
this
.
outPutFormData7
=
this
.
showDataFunc
();
this
.
outPutFormData7
=
this
.
showDataFunc
();
this
.
$refs
.
sql
.
clickFun
(
this
.
graph
);
//向子组件传递画布
return
;
return
;
}
else
if
(
cell
.
ids
==
"step10"
||
cell
.
value
.
attributes
.
ctype
.
value
==
"TypeExitExcelWriterStep"
)
{
}
else
if
(
cell
.
ids
==
"step10"
||
cell
.
value
.
attributes
.
ctype
.
value
==
"TypeExitExcelWriterStep"
)
{
//mico-Excel输出
//mico-Excel输出
...
...
src/views/output-dialog/delete.vue
View file @
261a9af1
...
@@ -17,7 +17,7 @@
...
@@ -17,7 +17,7 @@
<el-form
ref=
"delForm"
:model=
"deleteForm"
label-width=
"200px"
>
<el-form
ref=
"delForm"
:model=
"deleteForm"
label-width=
"200px"
>
<div
style=
"border:1px solid #99BBE8;padding:15px 15px;margin-bottom:15px;"
>
<div
style=
"border:1px solid #99BBE8;padding:15px 15px;margin-bottom:15px;"
>
<database-choose
ref=
"databaseChoose"
:form=
"deleteForm"
></database-choose>
<database-choose
ref=
"databaseChoose"
:form=
"deleteForm"
:getXmlVal=
"getXmlVal"
:graph=
"newGraph"
></database-choose>
<el-form-item
label=
"提交记录数量:"
>
<el-form-item
label=
"提交记录数量:"
>
<el-row
:gutter=
"10"
>
<el-row
:gutter=
"10"
>
<el-col
:span=
"23"
>
<el-col
:span=
"23"
>
...
@@ -111,6 +111,7 @@ inputOutputFields,//获取表输出
...
@@ -111,6 +111,7 @@ inputOutputFields,//获取表输出
export
default
({
export
default
({
data
(){
data
(){
return
{
return
{
newGraph
:{},
fieldsList1
:[],
fieldsList1
:[],
fieldsList2
:[],
fieldsList2
:[],
field
:
false
,
//编辑弹窗
field
:
false
,
//编辑弹窗
...
@@ -234,6 +235,11 @@ export default ({
...
@@ -234,6 +235,11 @@ export default ({
},
},
methods
:{
methods
:{
clickFun
(
graph
){
console
.
log
(
graph
,
'双击获取值'
)
this
.
newGraph
=
graph
;
this
.
$refs
.
databaseChoose
.
clickFun
(
this
.
newGraph
);
},
handleClose
(){
handleClose
(){
this
.
$emit
(
"update:deleteVisible"
,
false
);
this
.
$emit
(
"update:deleteVisible"
,
false
);
},
},
...
@@ -277,7 +283,15 @@ export default ({
...
@@ -277,7 +283,15 @@ export default ({
// pamer.append("before", true);
// pamer.append("before", true);
// pamer.append("query", '');
// pamer.append("query", '');
pamer
.
append
(
"databaseName"
,
this
.
deleteForm
.
connection
);
pamer
.
append
(
"databaseName"
,
this
.
deleteForm
.
connection
);
pamer
.
append
(
"graphXml"
,
this
.
getXmlVal
);
// pamer.append("graphXml", this.getXmlVal);
// 画布xml转码
const
codec
=
new
mxCodec
();
const
encodedModel
=
codec
.
encode
(
this
.
newGraph
.
getModel
());
//xml对象
console
.
log
(
"获取字段的画布详情:"
,
encodedModel
);
var
myXmlVal
=
mxUtils
.
getXml
(
encodedModel
);
//xml字符串
pamer
.
append
(
"graphXml"
,
myXmlVal
);
pamer
.
append
(
"schema"
,
this
.
deleteForm
.
schema
);
pamer
.
append
(
"schema"
,
this
.
deleteForm
.
schema
);
pamer
.
append
(
"table"
,
this
.
deleteForm
.
table
);
pamer
.
append
(
"table"
,
this
.
deleteForm
.
table
);
pamer
.
append
(
"query"
,
''
);
pamer
.
append
(
"query"
,
''
);
...
@@ -295,7 +309,14 @@ export default ({
...
@@ -295,7 +309,14 @@ export default ({
console
.
log
(
'获取cell888888==='
,
this
.
doubleClickCell
);
console
.
log
(
'获取cell888888==='
,
this
.
doubleClickCell
);
let
pamer
=
new
FormData
();
// 创建form对象
let
pamer
=
new
FormData
();
// 创建form对象
pamer
.
append
(
"stepName"
,
encodeURIComponent
(
title
));
pamer
.
append
(
"stepName"
,
encodeURIComponent
(
title
));
pamer
.
append
(
"graphXml"
,
this
.
getXmlVal
);
// pamer.append("graphXml", this.getXmlVal);
// 画布xml转码
const
codec
=
new
mxCodec
();
const
encodedModel
=
codec
.
encode
(
this
.
newGraph
.
getModel
());
//xml对象
console
.
log
(
"获取字段的画布详情:"
,
encodedModel
);
var
myXmlVal
=
mxUtils
.
getXml
(
encodedModel
);
//xml字符串
pamer
.
append
(
"graphXml"
,
myXmlVal
);
pamer
.
append
(
"before"
,
true
);
pamer
.
append
(
"before"
,
true
);
pamer
.
append
(
"query"
,
''
);
pamer
.
append
(
"query"
,
''
);
inputOutputFields
(
pamer
).
then
(
res
=>
{
inputOutputFields
(
pamer
).
then
(
res
=>
{
...
...
src/views/output-dialog/insertOrUpdate.vue
View file @
261a9af1
...
@@ -17,7 +17,7 @@
...
@@ -17,7 +17,7 @@
<el-form
:model=
"insertOrUpdateForm"
label-width=
"200px"
>
<el-form
:model=
"insertOrUpdateForm"
label-width=
"200px"
>
<el-tabs
v-model=
"activeName"
type=
"border-card"
>
<el-tabs
v-model=
"activeName"
type=
"border-card"
>
<el-tab-pane
label=
"基本配置"
name=
"content"
>
<el-tab-pane
label=
"基本配置"
name=
"content"
>
<database-choose
ref=
"databaseChoose"
:form=
"insertOrUpdateForm"
></database-choose>
<database-choose
ref=
"databaseChoose"
:form=
"insertOrUpdateForm"
:getXmlVal=
"getXmlVal"
:graph=
"newGraph"
></database-choose>
<el-form-item
label=
"提交记录数量:"
>
<el-form-item
label=
"提交记录数量:"
>
<el-row
:gutter=
"10"
>
<el-row
:gutter=
"10"
>
<el-col
:span=
"23"
>
<el-col
:span=
"23"
>
...
@@ -172,6 +172,7 @@ import {
...
@@ -172,6 +172,7 @@ import {
export
default
({
export
default
({
data
(){
data
(){
return
{
return
{
newGraph
:{},
fieldsList1
:[],
fieldsList1
:[],
fieldsList2
:[],
fieldsList2
:[],
field
:
false
,
//编辑弹窗
field
:
false
,
//编辑弹窗
...
@@ -315,6 +316,11 @@ export default ({
...
@@ -315,6 +316,11 @@ export default ({
},
},
methods
:{
methods
:{
clickFun
(
graph
){
console
.
log
(
graph
,
'双击获取值'
)
this
.
newGraph
=
graph
;
this
.
$refs
.
databaseChoose
.
clickFun
(
this
.
newGraph
);
},
handleClose
(){
handleClose
(){
this
.
$emit
(
"update:InsertOrUpdateVisible"
,
false
);
this
.
$emit
(
"update:InsertOrUpdateVisible"
,
false
);
},
},
...
@@ -431,7 +437,14 @@ export default ({
...
@@ -431,7 +437,14 @@ export default ({
// pamer.append("before", true);
// pamer.append("before", true);
// pamer.append("query", '');
// pamer.append("query", '');
pamer
.
append
(
"databaseName"
,
this
.
insertOrUpdateForm
.
connection
);
pamer
.
append
(
"databaseName"
,
this
.
insertOrUpdateForm
.
connection
);
pamer
.
append
(
"graphXml"
,
this
.
getXmlVal
);
// pamer.append("graphXml", this.getXmlVal);
// 画布xml转码
const
codec
=
new
mxCodec
();
const
encodedModel
=
codec
.
encode
(
this
.
newGraph
.
getModel
());
//xml对象
console
.
log
(
"获取字段的画布详情:"
,
encodedModel
);
var
myXmlVal
=
mxUtils
.
getXml
(
encodedModel
);
//xml字符串
pamer
.
append
(
"graphXml"
,
myXmlVal
);
pamer
.
append
(
"schema"
,
this
.
insertOrUpdateForm
.
schema
);
pamer
.
append
(
"schema"
,
this
.
insertOrUpdateForm
.
schema
);
pamer
.
append
(
"table"
,
this
.
insertOrUpdateForm
.
table
);
pamer
.
append
(
"table"
,
this
.
insertOrUpdateForm
.
table
);
pamer
.
append
(
"query"
,
''
);
pamer
.
append
(
"query"
,
''
);
...
@@ -449,7 +462,14 @@ export default ({
...
@@ -449,7 +462,14 @@ export default ({
console
.
log
(
'获取cell888888==='
,
this
.
doubleClickCell
);
console
.
log
(
'获取cell888888==='
,
this
.
doubleClickCell
);
let
pamer
=
new
FormData
();
// 创建form对象
let
pamer
=
new
FormData
();
// 创建form对象
pamer
.
append
(
"stepName"
,
encodeURIComponent
(
title
));
pamer
.
append
(
"stepName"
,
encodeURIComponent
(
title
));
pamer
.
append
(
"graphXml"
,
this
.
getXmlVal
);
// pamer.append("graphXml", this.getXmlVal);
// 画布xml转码
const
codec
=
new
mxCodec
();
const
encodedModel
=
codec
.
encode
(
this
.
newGraph
.
getModel
());
//xml对象
console
.
log
(
"获取字段的画布详情:"
,
encodedModel
);
var
myXmlVal
=
mxUtils
.
getXml
(
encodedModel
);
//xml字符串
pamer
.
append
(
"graphXml"
,
myXmlVal
);
pamer
.
append
(
"before"
,
true
);
pamer
.
append
(
"before"
,
true
);
pamer
.
append
(
"query"
,
''
);
pamer
.
append
(
"query"
,
''
);
inputOutputFields
(
pamer
).
then
(
res
=>
{
inputOutputFields
(
pamer
).
then
(
res
=>
{
...
...
src/views/output-dialog/sqlFileOutput.vue
View file @
261a9af1
...
@@ -20,7 +20,7 @@
...
@@ -20,7 +20,7 @@
<el-tab-pane
label=
"一般"
name=
"content"
>
<el-tab-pane
label=
"一般"
name=
"content"
>
<div
style=
"position:relative;border:1px solid #b5b8c8;padding:15px 0;"
>
<div
style=
"position:relative;border:1px solid #b5b8c8;padding:15px 0;"
>
<div
style=
"position:absolute;top:-15px;left:20px;color:#15428b;background-color:#fff;padding:5px 10px;"
>
连接
</div>
<div
style=
"position:absolute;top:-15px;left:20px;color:#15428b;background-color:#fff;padding:5px 10px;"
>
连接
</div>
<database-choose
ref=
"databaseChoose"
:form=
"sqlForm"
></database-choose>
<database-choose
ref=
"databaseChoose"
:form=
"sqlForm"
:graph=
"newGraph"
></database-choose>
</div>
</div>
<div
style=
"position:relative;border:1px solid #b5b8c8;padding:15px 0;margin-top:15px;"
>
<div
style=
"position:relative;border:1px solid #b5b8c8;padding:15px 0;margin-top:15px;"
>
...
@@ -176,6 +176,7 @@ import {
...
@@ -176,6 +176,7 @@ import {
export
default
({
export
default
({
data
(){
data
(){
return
{
return
{
newGraph
:{},
formName
:
''
,
formName
:
''
,
fileDialogVisible
:
false
,
//选择文件夹弹窗
fileDialogVisible
:
false
,
//选择文件夹弹窗
formatTimeList
:[],
formatTimeList
:[],
...
@@ -291,6 +292,11 @@ export default ({
...
@@ -291,6 +292,11 @@ export default ({
this
.
getAvailableCharsets
();
//获取编码
this
.
getAvailableCharsets
();
//获取编码
},
},
methods
:{
methods
:{
clickFun
(
graph
){
console
.
log
(
graph
,
'双击获取值'
)
this
.
newGraph
=
graph
;
this
.
$refs
.
databaseChoose
.
clickFun
(
this
.
newGraph
);
},
handleClose
(){
handleClose
(){
this
.
$emit
(
"update:sqlVisible"
,
false
);
this
.
$emit
(
"update:sqlVisible"
,
false
);
},
},
...
...
src/views/output-dialog/synchronize.vue
View file @
261a9af1
...
@@ -13,7 +13,7 @@
...
@@ -13,7 +13,7 @@
</el-form-item>
</el-form-item>
<el-tabs
v-model=
"activeName"
type=
"border-card"
>
<el-tabs
v-model=
"activeName"
type=
"border-card"
>
<el-tab-pane
label=
"一般"
name=
"content"
>
<el-tab-pane
label=
"一般"
name=
"content"
>
<database-choose
ref=
"databaseChoose"
:form=
"synForm"
></database-choose>
<database-choose
ref=
"databaseChoose"
:form=
"synForm"
:graph=
"newGraph"
></database-choose>
<el-form-item
label=
"提交的记录数量:"
>
<el-form-item
label=
"提交的记录数量:"
>
<el-row
:gutter=
"10"
>
<el-row
:gutter=
"10"
>
<el-col
:span=
"23"
>
<el-col
:span=
"23"
>
...
@@ -228,6 +228,7 @@ inputOutputFields,//获取表输出
...
@@ -228,6 +228,7 @@ inputOutputFields,//获取表输出
export
default
({
export
default
({
data
(){
data
(){
return
{
return
{
newGraph
:{},
fieldsList1
:[],
fieldsList1
:[],
fieldsList2
:[],
fieldsList2
:[],
field
:
false
,
//编辑弹窗
field
:
false
,
//编辑弹窗
...
@@ -451,6 +452,11 @@ export default ({
...
@@ -451,6 +452,11 @@ export default ({
},
},
methods
:{
methods
:{
clickFun
(
graph
){
console
.
log
(
graph
,
'双击获取值'
)
this
.
newGraph
=
graph
;
this
.
$refs
.
databaseChoose
.
clickFun
(
this
.
newGraph
);
},
handleClose
(){
handleClose
(){
this
.
$emit
(
"update:synVisible"
,
false
);
this
.
$emit
(
"update:synVisible"
,
false
);
},
},
...
@@ -521,7 +527,14 @@ export default ({
...
@@ -521,7 +527,14 @@ export default ({
// pamer.append("before", true);
// pamer.append("before", true);
// pamer.append("query", '');
// pamer.append("query", '');
pamer
.
append
(
"databaseName"
,
this
.
synForm
.
connection
);
pamer
.
append
(
"databaseName"
,
this
.
synForm
.
connection
);
pamer
.
append
(
"graphXml"
,
this
.
getXmlVal
);
// pamer.append("graphXml", this.getXmlVal);
// 画布xml转码
const
codec
=
new
mxCodec
();
const
encodedModel
=
codec
.
encode
(
this
.
newGraph
.
getModel
());
//xml对象
console
.
log
(
"获取字段的画布详情:"
,
encodedModel
);
var
myXmlVal
=
mxUtils
.
getXml
(
encodedModel
);
//xml字符串
pamer
.
append
(
"graphXml"
,
myXmlVal
);
pamer
.
append
(
"schema"
,
this
.
synForm
.
schema
);
pamer
.
append
(
"schema"
,
this
.
synForm
.
schema
);
pamer
.
append
(
"table"
,
this
.
synForm
.
table
);
pamer
.
append
(
"table"
,
this
.
synForm
.
table
);
pamer
.
append
(
"query"
,
''
);
pamer
.
append
(
"query"
,
''
);
...
@@ -539,7 +552,14 @@ export default ({
...
@@ -539,7 +552,14 @@ export default ({
console
.
log
(
'获取cell888888==='
,
this
.
doubleClickCell
);
console
.
log
(
'获取cell888888==='
,
this
.
doubleClickCell
);
let
pamer
=
new
FormData
();
// 创建form对象
let
pamer
=
new
FormData
();
// 创建form对象
pamer
.
append
(
"stepName"
,
encodeURIComponent
(
title
));
pamer
.
append
(
"stepName"
,
encodeURIComponent
(
title
));
pamer
.
append
(
"graphXml"
,
this
.
getXmlVal
);
// pamer.append("graphXml", this.getXmlVal);
// 画布xml转码
const
codec
=
new
mxCodec
();
const
encodedModel
=
codec
.
encode
(
this
.
newGraph
.
getModel
());
//xml对象
console
.
log
(
"获取字段的画布详情:"
,
encodedModel
);
var
myXmlVal
=
mxUtils
.
getXml
(
encodedModel
);
//xml字符串
pamer
.
append
(
"graphXml"
,
myXmlVal
);
pamer
.
append
(
"before"
,
true
);
pamer
.
append
(
"before"
,
true
);
pamer
.
append
(
"query"
,
''
);
pamer
.
append
(
"query"
,
''
);
inputOutputFields
(
pamer
).
then
(
res
=>
{
inputOutputFields
(
pamer
).
then
(
res
=>
{
...
...
src/views/output-dialog/update.vue
View file @
261a9af1
...
@@ -16,7 +16,7 @@
...
@@ -16,7 +16,7 @@
<el-tabs
v-model=
"activeName"
type=
"border-card"
>
<el-tabs
v-model=
"activeName"
type=
"border-card"
>
<el-tab-pane
label=
"基本配置"
name=
"content"
>
<el-tab-pane
label=
"基本配置"
name=
"content"
>
<database-choose
ref=
"databaseChoose"
:form=
"updateForm"
></database-choose>
<database-choose
ref=
"databaseChoose"
:form=
"updateForm"
:graph=
"newGraph"
></database-choose>
<el-form-item
label=
"提交记录数量:"
>
<el-form-item
label=
"提交记录数量:"
>
<el-row
:gutter=
"10"
>
<el-row
:gutter=
"10"
>
<el-col
:span=
"23"
>
<el-col
:span=
"23"
>
...
@@ -194,6 +194,7 @@ inputOutputFields,//获取表输出
...
@@ -194,6 +194,7 @@ inputOutputFields,//获取表输出
export
default
({
export
default
({
data
(){
data
(){
return
{
return
{
newGraph
:{},
fieldsList1
:[],
fieldsList1
:[],
fieldsList2
:[],
fieldsList2
:[],
field
:
false
,
//编辑弹窗
field
:
false
,
//编辑弹窗
...
@@ -344,6 +345,11 @@ export default ({
...
@@ -344,6 +345,11 @@ export default ({
},
},
methods
:{
methods
:{
clickFun
(
graph
){
console
.
log
(
graph
,
'双击获取值'
)
this
.
newGraph
=
graph
;
this
.
$refs
.
databaseChoose
.
clickFun
(
this
.
newGraph
);
},
handleClose
(){
handleClose
(){
this
.
$emit
(
"update:updateVisible"
,
false
);
this
.
$emit
(
"update:updateVisible"
,
false
);
},
},
...
@@ -415,7 +421,14 @@ export default ({
...
@@ -415,7 +421,14 @@ export default ({
// pamer.append("before", true);
// pamer.append("before", true);
// pamer.append("query", '');
// pamer.append("query", '');
pamer
.
append
(
"databaseName"
,
this
.
updateForm
.
connection
);
pamer
.
append
(
"databaseName"
,
this
.
updateForm
.
connection
);
pamer
.
append
(
"graphXml"
,
this
.
getXmlVal
);
// pamer.append("graphXml", this.getXmlVal);
// 画布xml转码
const
codec
=
new
mxCodec
();
const
encodedModel
=
codec
.
encode
(
this
.
newGraph
.
getModel
());
//xml对象
console
.
log
(
"获取字段的画布详情:"
,
encodedModel
);
var
myXmlVal
=
mxUtils
.
getXml
(
encodedModel
);
//xml字符串
pamer
.
append
(
"graphXml"
,
myXmlVal
);
pamer
.
append
(
"schema"
,
this
.
updateForm
.
schema
);
pamer
.
append
(
"schema"
,
this
.
updateForm
.
schema
);
pamer
.
append
(
"table"
,
this
.
updateForm
.
table
);
pamer
.
append
(
"table"
,
this
.
updateForm
.
table
);
pamer
.
append
(
"query"
,
''
);
pamer
.
append
(
"query"
,
''
);
...
@@ -433,7 +446,14 @@ export default ({
...
@@ -433,7 +446,14 @@ export default ({
console
.
log
(
'获取cell888888==='
,
this
.
doubleClickCell
);
console
.
log
(
'获取cell888888==='
,
this
.
doubleClickCell
);
let
pamer
=
new
FormData
();
// 创建form对象
let
pamer
=
new
FormData
();
// 创建form对象
pamer
.
append
(
"stepName"
,
encodeURIComponent
(
title
));
pamer
.
append
(
"stepName"
,
encodeURIComponent
(
title
));
pamer
.
append
(
"graphXml"
,
this
.
getXmlVal
);
// pamer.append("graphXml", this.getXmlVal);
// 画布xml转码
const
codec
=
new
mxCodec
();
const
encodedModel
=
codec
.
encode
(
this
.
newGraph
.
getModel
());
//xml对象
console
.
log
(
"获取字段的画布详情:"
,
encodedModel
);
var
myXmlVal
=
mxUtils
.
getXml
(
encodedModel
);
//xml字符串
pamer
.
append
(
"graphXml"
,
myXmlVal
);
pamer
.
append
(
"before"
,
true
);
pamer
.
append
(
"before"
,
true
);
pamer
.
append
(
"query"
,
''
);
pamer
.
append
(
"query"
,
''
);
inputOutputFields
(
pamer
).
then
(
res
=>
{
inputOutputFields
(
pamer
).
then
(
res
=>
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment