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
4febc18a
Commit
4febc18a
authored
Mar 31, 2021
by
zlr
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改etlweb路径配置,显示图标
parent
d9f1394f
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
74 additions
and
63 deletions
+74
-63
src/assets/styles/index.scss
+1
-1
src/main.js
+3
-1
src/views/dashboard-kettle/components/designer/modules/node.vue
+1
-1
src/views/dashboard-kettle/components/designer/modules/node_menu.vue
+12
-13
src/views/dashboard-kettle/components/designer/modules/node_menu2.vue
+5
-3
src/views/dashboard-kettle/components/designer/mxgraphDesigner.vue
+27
-17
src/views/dialogs-components/global/export-tree/main.vue
+8
-9
src/views/dialogs-components/global/in-repository/main.vue
+16
-17
src/views/kettle/home2.vue
+0
-0
src/views/kettle/toolbar.js
+1
-1
No files found.
src/assets/styles/index.scss
View file @
4febc18a
...
...
@@ -581,7 +581,7 @@ aside {
//
$svgUrl
:
'http://192.168.0.
2
:9888/ETLWEB-SERVER/etlweb'
;
$svgUrl
:
'http://192.168.0.
44
:9888/ETLWEB-SERVER/etlweb'
;
// $svgUrl:'http://192.168.0.44:9888/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;}
...
...
src/main.js
View file @
4febc18a
...
...
@@ -65,7 +65,7 @@ new Vue({
router
,
store
,
render
:
h
=>
h
(
App
)
})
...
...
@@ -75,6 +75,8 @@ import * as R from 'ramda'
Vue
.
prototype
.
R
=
R
Vue
.
config
.
productionTip
=
false
const
baseUrl
=
process
.
env
.
VUE_APP_BASE_API
===
'/'
?
''
:
process
.
env
.
VUE_APP_BASE_API
Vue
.
prototype
.
etlWeb
=
baseUrl
+
"ETLWEB-SERVER/etlweb/"
new
Vue
({
router
,
...
...
src/views/dashboard-kettle/components/designer/modules/node.vue
View file @
4febc18a
...
...
@@ -35,7 +35,7 @@
},
data
()
{
return
{
prefix
:
'http://192.168.0.44:9882/etlweb/'
,
prefix
:
this
.
etlWeb
,
}
},
computed
:
{
...
...
src/views/dashboard-kettle/components/designer/modules/node_menu.vue
View file @
4febc18a
<
template
>
<div
class=
"flow-menu"
ref=
"tool"
>
<!--
<div
v-for=
"menu in menuList"
:key=
"menu.id"
>
-->
<!--
<span
class=
"ef-node-pmenu"
@
click=
"menu.open = !menu.open"
>
<i
:class=
"
{'el-icon-caret-bottom': menu.open,'el-icon-caret-right': !menu.open}">
</i>
{{
menu
.
name
}}
</span>
-->
<!--
<!--
<ul
v-show=
"menu.open"
class=
"ef-node-menu-ul"
>
<draggable
@
end=
"end"
...
...
@@ -59,12 +59,11 @@
<!--
<span
class=
"custom-tree-node"
slot-scope=
"
{node,data}">
<span>
<i
:class=
"data.icon"
></i>
{{
node
.
label
}}
</span>
</span>
</span>
-->
<span
class=
"custom-tree-node"
slot-scope=
"
{ node, data }">
<span>
<span>
<img
:src=
"prefix+data.icon"
style=
"width:20px"
width=
""
alt=
""
>
{{
node
.
label
}}
</span>
...
...
@@ -88,7 +87,7 @@ export default {
data
()
{
return
{
// prefix:'http://192.168.0.2:9700/etlweb/',
prefix
:
'http://192.168.0.44:9882/etlweb/'
,
prefix
:
this
.
etlWeb
,
// 测试数据开始=====
jobTreeList
:
[
{
...
...
@@ -172,12 +171,12 @@ export default {
type
:
"group"
,
name
:
"基础节点"
,
ico
:
"el-icon-video-play"
,
open
:
true
,
open
:
true
,
children
:
[
{
id
:
"01"
,
type
:
"start"
,
name
:
"没了"
,
name
:
"没了"
,
ico
:
"el-icon-caret-right"
,
// 自定义覆盖样式
style
:
{},
...
...
@@ -301,15 +300,15 @@ export default {
},
stepsFun
()
{
let
pamer
=
new
FormData
();
// 创建form对象
pamer
.
append
(
"node"
,
"xnode-12"
);
this
.
$forceUpdate
();
steps
(
pamer
).
then
((
res
)
=>
{
this
.
jobTreeList
=
res
console
.
log
(
this
.
menuList
,
res
[
0
]);
});
},
...
...
@@ -400,7 +399,7 @@ export default {
console
.
log
(
"树形拖拽开始2:==="
,
event
);
var
type
=
Node
.
data
.
type
;
this
.
nodeMenu
=
this
.
getMenuByType
(
type
);
},
handleDragend
(
draggingNode
,
endNode
,
position
,
event
)
{
...
...
src/views/dashboard-kettle/components/designer/modules/node_menu2.vue
View file @
4febc18a
...
...
@@ -11,10 +11,11 @@
class=
"custom-tree-node"
:key-id=
"data.children ? '' : 123"
:id=
"data.id"
:icon=
"data.icon"
:icon=
"
prefix+
data.icon"
:pluginId=
"data.pluginId"
>
{{
data
.
text
}}
<img
:src=
"prefix+data.icon"
style=
"width:20px"
width=
""
alt=
""
>
{{
data
.
text
}}
</div>
</div>
</el-tree>
...
...
@@ -34,6 +35,7 @@ export default {
pluginId
:
"pluginId"
,
},
data
:
[],
prefix
:
this
.
etlWeb
};
},
components
:
{},
...
...
@@ -41,7 +43,7 @@ export default {
this
.
stepsFun
()
},
mounted
()
{
},
beforeUpdate
(){
this
.
$emit
(
'shooStatus'
,
true
)
...
...
src/views/dashboard-kettle/components/designer/mxgraphDesigner.vue
View file @
4febc18a
...
...
@@ -883,7 +883,7 @@ export default {
// type: Boolean,
// default: false,
// },
// },
props
:
[
"blankCanvas"
],
//从父组件传过来的值
...
...
@@ -1158,7 +1158,7 @@ export default {
decode
(
graphXml
,
graph
)
{
window
[
"mxGraphModel"
]
=
mxGraphModel
;
window
[
"mxGeometry"
]
=
mxGeometry
;
// const xmlDocument = mxUtils.parseXml(graphXml);
// const decoder = new mxCodec(xmlDocument);
// const node = xmlDocument.documentElement;
...
...
@@ -1168,7 +1168,7 @@ export default {
var
node
=
enc
.
encode
(
graph
.
getModel
());
console
.
log
(
mxUtils
.
getPrettyXml
(
node
));
return
mxUtils
.
getPrettyXml
(
node
);
},
//初始化画布
...
...
@@ -1267,6 +1267,18 @@ export default {
const
{
width
,
height
}
=
toolItem
;
const
parent
=
this
.
graph
.
getDefaultParent
();
this
.
graph
.
getModel
().
beginUpdate
();
const
styleObj
=
{
fillColor
:
'transparent'
,
strokeColor
:
'#000000'
,
strokeWidth
:
'1'
,
shape
:
mxConstants
.
SHAPE_LABEL
,
align
:
mxConstants
.
ALIGN_CENTER
,
verticalAlign
:
mxConstants
.
ALIGN_BOTTOM
,
imageAlign
:
mxConstants
.
ALIGN_CENTER
,
imageVerticalAlign
:
mxConstants
.
ALIGN_TOP
,
image
:
toolItem
[
'icon'
]
}
const
style
=
Object
.
keys
(
styleObj
).
map
((
attr
)
=>
`
${
attr
}
=
${
styleObj
[
attr
]}
`
).
join
(
';'
)
try
{
let
vertex
=
this
.
graph
.
insertVertex
(
parent
,
...
...
@@ -1275,21 +1287,23 @@ export default {
x
,
y
,
width
,
height
height
,
style
);
vertex
.
title
=
toolItem
[
"title"
];
vertex
.
ids
=
toolItem
[
"id"
];
vertex
.
pluginId
=
toolItem
[
"pluginId"
];
this
.
xmlDocuments
=
mxUtils
.
parseXml
(
decodeURIComponent
(
this
.
blankCanvas
));
console
.
log
(
this
.
xmlDocuments
,
'拖拽'
);
var
oSerializer
=
new
XMLSerializer
();
console
.
log
(
oSerializer
.
serializeToString
(
this
.
xmlDocuments
));
console
.
log
(
oSerializer
.
serializeToString
(
this
.
xmlDocuments
));
...
...
@@ -1319,20 +1333,16 @@ export default {
//选择
initToolbar
()
{
let
domArr
=
document
.
querySelectorAll
(
'[key-id="123"]'
);
console
.
log
(
domArr
);
domArr
.
forEach
((
dom
,
index
)
=>
{
// console.log(dom.pluginId);
// console.log(dom);
let
toolItemObj
=
{
title
:
dom
.
inner
HTML
,
title
:
dom
.
inner
Text
,
id
:
dom
.
id
,
width
:
60
,
height
:
60
,
width
:
50
,
height
:
50
,
icon
:
dom
.
attributes
[
"icon"
].
nodeValue
,
// value: dom.pluginId,
pluginId
:
dom
.
getAttribute
(
"pluginId"
),
};
const
{
width
,
height
}
=
toolItemObj
;
...
...
src/views/dialogs-components/global/export-tree/main.vue
View file @
4febc18a
...
...
@@ -3,7 +3,7 @@
<!-- 浏览 -->
<el-dialog
title=
"资源库导出"
:visible
.
sync=
"exportDialogVisible"
:visible
.
sync=
"exportDialogVisible"
width=
"650px"
top=
"15%"
:close-on-click-modal=
"false"
...
...
@@ -44,7 +44,7 @@
<el-button
type=
"primary"
@
click=
"expRespository()"
>
确 定
</el-button>
</span>
</el-dialog>
</div>
</
template
>
...
...
@@ -63,7 +63,7 @@ export default {
},
checkedArr
:[]
}
},
props
:
{
exportDialogVisible
:
Boolean
,
...
...
@@ -102,7 +102,7 @@ export default {
});
this
.
checkedArr
=
checkArr
;
console
.
log
(
'当前选择文件===='
,
this
.
checkedArr
);
},
//导出资源库
expRespository
()
{
...
...
@@ -110,7 +110,7 @@ export default {
this
.
$message
.
error
(
'请先选择要导出文件'
);
}
let
data
=
new
FormData
();
data
.
append
(
"data"
,
JSON
.
stringify
(
this
.
checkedArr
)
);
expRespository
(
data
).
then
((
res
)
=>
{
if
(
res
)
{
...
...
@@ -123,7 +123,7 @@ export default {
// document.body.appendChild(link);
// link.click();
var
url
=
`http://192.168.0.2:9888/ETLWEB-SERVER/etlweb/
attachment/download?filePath=
${
res
.
message
}
&remove=true`
var
url
=
this
.
etlWeb
+
`
attachment/download?filePath=
${
res
.
message
}
&remove=true`
window
.
open
(
url
);
}
else
{
...
...
@@ -131,7 +131,7 @@ export default {
}
});
},
handleCloseScan
()
{
this
.
$emit
(
"update:exportDialogVisible"
,
false
);
},
...
...
@@ -143,4 +143,4 @@ export default {
background-color
:
#8888ff
;
color
:
#fff
;
}
</
style
>
\ No newline at end of file
</
style
>
src/views/dialogs-components/global/in-repository/main.vue
View file @
4febc18a
...
...
@@ -14,10 +14,10 @@
action=
"https://jsonplaceholder.typicode.com/posts/"
:file-list=
"fileList"
:auto-upload=
"false"
:on-change=
"handleChange"
>
:on-change=
"handleChange"
>
<el-button
size=
"small"
type=
"primary"
>
点击上传
</el-button>
</el-upload>
<!-- 文件夹存放区域start-->
<el-tree
...
...
@@ -74,7 +74,7 @@ export default {
checkedArr
:[],
uploadPath
:
''
}
},
props
:
{
inputVisibility
:
Boolean
,
...
...
@@ -114,8 +114,8 @@ export default {
});
this
.
checkedArr
=
checkArr
;
console
.
log
(
'当前选择文件===='
,
this
.
checkedArr
);
},
// 导入资源库
imp
(
data
){
...
...
@@ -124,7 +124,7 @@ export default {
formData
.
append
(
'data'
,
JSON
.
stringify
(
data
));
console
.
log
(
'参数=='
,
formData
);
imp
(
formData
).
then
(
res
=>
{
if
(
res
)
{
if
(
res
)
{
this
.
$message
.
success
(
'导入成功!'
);
this
.
explorer
(
''
);
//刷新列表
this
.
$emit
(
"update:inputVisibility"
,
false
);
//关闭弹窗
...
...
@@ -146,7 +146,7 @@ export default {
this
.
$message
.
error
(
'请先选择要导出文件'
);
}
let
data
=
new
FormData
();
data
.
append
(
"data"
,
JSON
.
stringify
(
this
.
checkedArr
)
);
expRespository
(
data
).
then
((
res
)
=>
{
if
(
res
)
{
...
...
@@ -159,7 +159,7 @@ export default {
// document.body.appendChild(link);
// link.click();
var
url
=
`http://192.168.0.2:9888/ETLWEB-SERVER/etlweb/
attachment/download?filePath=
${
res
.
message
}
&remove=true`
var
url
=
this
.
etlWeb
+
`
attachment/download?filePath=
${
res
.
message
}
&remove=true`
window
.
open
(
url
);
}
else
{
...
...
@@ -167,7 +167,7 @@ export default {
}
});
},
handleClose
()
{
this
.
$emit
(
"update:inputVisibility"
,
false
);
},
...
...
@@ -177,9 +177,9 @@ export default {
// path='H:\\小曾发来的新项目\\kettle\\kettle-webapp\\file_trans1.zip';
path
=
"D:
\\
file
\\
111.zip"
;
this
.
uploadPath
=
path
;
this
.
Imptree
(
path
);
},
// 导入资源库
Imptree
(
path
){
...
...
@@ -189,18 +189,18 @@ export default {
formData
.
append
(
'node'
,
'root'
);
console
.
log
(
'参数=='
,
formData
);
Imptree
(
formData
).
then
(
res
=>
{
if
(
res
)
{
if
(
res
)
{
// this.$message.success('成功!');
this
.
impFileList
=
res
;
}
else
{
this
.
$message
.
error
(
res
.
errMsg
)
}
})
},
},
};
...
...
@@ -210,4 +210,4 @@ export default {
background-color
:
#8888ff
;
color
:
#fff
;
}
</
style
>
\ No newline at end of file
</
style
>
src/views/kettle/home2.vue
View file @
4febc18a
This diff is collapsed.
Click to expand it.
src/views/kettle/toolbar.js
View file @
4febc18a
...
...
@@ -2,7 +2,7 @@ import mxgraph from './mx.js'
import
{
steps
}
from
'@/api/kettle/link'
const
MxConstants
=
mxgraph
.
mxConstants
const
prefix
=
'192.168.0.2:9700/etlweb/'
const
prefix
=
this
.
etlWeb
const
bar
=
[]
const
pamer
=
new
FormData
()
// 创建form对象
...
...
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