Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
D
dataease
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
zhu
dataease
Commits
e2e2b09f
提交
e2e2b09f
authored
5月 17, 2021
作者:
taojinlong
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
feat: 国际化
上级
da8e4473
全部展开
隐藏空白字符变更
内嵌
并排
正在显示
17 个修改的文件
包含
112 行增加
和
69 行删除
+112
-69
Toolbar.vue
frontend/src/components/canvas/components/Toolbar.vue
+10
-10
UserView.vue
frontend/src/components/canvas/custom-component/UserView.vue
+1
-1
en.js
frontend/src/lang/en.js
+29
-1
tw.js
frontend/src/lang/tw.js
+0
-0
zh.js
frontend/src/lang/zh.js
+29
-1
index.vue
frontend/src/views/panel/GrantAuth/dept/index.vue
+1
-1
index.vue
frontend/src/views/panel/GrantAuth/role/index.vue
+1
-2
index.vue
frontend/src/views/panel/GrantAuth/user/index.vue
+3
-3
filterDialog.vue
frontend/src/views/panel/filter/filterDialog.vue
+7
-17
TemplateAllList.vue
frontend/src/views/panel/list/EditPanel/TemplateAllList.vue
+1
-1
index.vue
frontend/src/views/panel/list/EditPanel/index.vue
+10
-10
PanelList.vue
frontend/src/views/panel/list/PanelList.vue
+5
-5
SaveToTemplate.vue
frontend/src/views/panel/list/SaveToTemplate.vue
+4
-4
TemplateItem.vue
frontend/src/views/panel/template/component/TemplateItem.vue
+2
-2
TemplateList.vue
frontend/src/views/panel/template/component/TemplateList.vue
+2
-2
index.vue
frontend/src/views/panel/template/index.vue
+4
-4
index.vue
frontend/src/views/system/datasource/index.vue
+3
-5
没有找到文件。
frontend/src/components/canvas/components/Toolbar.vue
浏览文件 @
e2e2b09f
...
@@ -3,42 +3,42 @@
...
@@ -3,42 +3,42 @@
<div
class=
"toolbar"
>
<div
class=
"toolbar"
>
<div
class=
"canvas-config"
>
<div
class=
"canvas-config"
>
<span>
画布大小
</span>
<span>
{{
$t
(
panel
.
canvas_size
)
}}
</span>
<input
v-model=
"canvasStyleData.width"
>
<input
v-model=
"canvasStyleData.width"
>
<span>
*
</span>
<span>
*
</span>
<input
v-model=
"canvasStyleData.height"
>
<input
v-model=
"canvasStyleData.height"
>
</div>
</div>
<div
class=
"canvas-config"
style=
"margin-right: 10px"
>
<div
class=
"canvas-config"
style=
"margin-right: 10px"
>
<span>
画布比例
</span>
<span>
{{
$t
(
panel
.
canvas_scale
)
}}
</span>
<input
v-model=
"scale"
@
input=
"handleScaleChange"
>
%
<input
v-model=
"scale"
@
input=
"handleScaleChange"
>
%
</div>
</div>
<el-tooltip
content=
"样式
"
>
<el-tooltip
:content=
"$t('panel.style')
"
>
<el-button
class=
"el-icon-magic-stick"
size=
"mini"
circle
@
click=
"showPanel"
/>
<el-button
class=
"el-icon-magic-stick"
size=
"mini"
circle
@
click=
"showPanel"
/>
</el-tooltip>
</el-tooltip>
<el-tooltip
content=
"撤消
"
>
<el-tooltip
:content=
"$t('panel.undo')
"
>
<el-button
class=
"el-icon-refresh-right"
size=
"mini"
circle
@
click=
"undo"
/>
<el-button
class=
"el-icon-refresh-right"
size=
"mini"
circle
@
click=
"undo"
/>
</el-tooltip>
</el-tooltip>
<el-tooltip
content=
"重做
"
>
<el-tooltip
:content=
"$t('panel.redo')
"
>
<el-button
class=
"el-icon-refresh-left"
size=
"mini"
circle
@
click=
"redo"
/>
<el-button
class=
"el-icon-refresh-left"
size=
"mini"
circle
@
click=
"redo"
/>
</el-tooltip>
</el-tooltip>
<el-tooltip
content=
"插入图片
"
>
<el-tooltip
:content=
"$t('panel.insert_picture')
"
>
<el-button
class=
"el-icon-upload"
size=
"mini"
circle
@
click=
"goFile"
/>
<el-button
class=
"el-icon-upload"
size=
"mini"
circle
@
click=
"goFile"
/>
</el-tooltip>
</el-tooltip>
<el-tooltip
content=
"清空画布
"
style=
"margin-right: 10px"
>
<el-tooltip
:content=
"$t('panel.clean_canvas')
"
style=
"margin-right: 10px"
>
<el-button
class=
"el-icon-document-delete"
size=
"mini"
circle
@
click=
"clearCanvas"
/>
<el-button
class=
"el-icon-document-delete"
size=
"mini"
circle
@
click=
"clearCanvas"
/>
</el-tooltip>
</el-tooltip>
<input
id=
"input"
ref=
"files"
type=
"file"
hidden
@
change=
"handleFileChange"
>
<input
id=
"input"
ref=
"files"
type=
"file"
hidden
@
change=
"handleFileChange"
>
<el-tooltip
content=
"保存
"
>
<el-tooltip
:content=
"$t('commons.save')
"
>
<el-button
class=
"el-icon-circle-check"
size=
"mini"
circle
@
click=
"save"
/>
<el-button
class=
"el-icon-circle-check"
size=
"mini"
circle
@
click=
"save"
/>
</el-tooltip>
</el-tooltip>
<el-tooltip
content=
"预览
"
>
<el-tooltip
:content=
"$t('panel.preview')
"
>
<el-button
class=
"el-icon-view"
size=
"mini"
circle
@
click=
"clickPreview"
/>
<el-button
class=
"el-icon-view"
size=
"mini"
circle
@
click=
"clickPreview"
/>
</el-tooltip>
</el-tooltip>
<span
style=
"float: right;margin-left: 10px"
>
<span
style=
"float: right;margin-left: 10px"
>
<el-button
size=
"mini"
@
click=
"closePanelEdit"
>
<el-button
size=
"mini"
@
click=
"closePanelEdit"
>
关闭
{{
$t
(
commons
.
close
)
}}
</el-button>
</el-button>
</span>
</span>
</div>
</div>
...
...
frontend/src/components/canvas/custom-component/UserView.vue
浏览文件 @
e2e2b09f
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
<div
v-loading=
"requestStatus==='waiting'"
class=
"rect-shape"
>
<div
v-loading=
"requestStatus==='waiting'"
class=
"rect-shape"
>
<div
v-if=
"requestStatus==='error'"
style=
";width: 100%;height: 100%;background-color: #ece7e7; text-align: center"
>
<div
v-if=
"requestStatus==='error'"
style=
";width: 100%;height: 100%;background-color: #ece7e7; text-align: center"
>
<div
style=
"font-size: 12px; color: #9ea6b2;"
>
<div
style=
"font-size: 12px; color: #9ea6b2;"
>
获取数据出错 请联系管理员
<br>
{{
$t
(
panel
.
error_data
)
}}
<br>
{{
message
}}
{{
message
}}
</div>
</div>
</div>
</div>
...
...
frontend/src/lang/en.js
浏览文件 @
e2e2b09f
...
@@ -85,6 +85,7 @@ export default {
...
@@ -85,6 +85,7 @@ export default {
tokenError
:
'Token error, please login again'
tokenError
:
'Token error, please login again'
},
},
commons
:
{
commons
:
{
all
:
'All'
,
enable
:
'Enable'
,
enable
:
'Enable'
,
disable
:
'Disable'
,
disable
:
'Disable'
,
yes
:
'Yes'
,
yes
:
'Yes'
,
...
@@ -812,7 +813,34 @@ export default {
...
@@ -812,7 +813,34 @@ export default {
export_to_panel
:
'Export to template'
,
export_to_panel
:
'Export to template'
,
preview
:
'Preview'
,
preview
:
'Preview'
,
select_panel_from_left
:
'Please select panel from left'
,
select_panel_from_left
:
'Please select panel from left'
,
template_nale
:
'Template name'
template_nale
:
'Template name'
,
template
:
'Template'
,
category
:
'Category'
,
all_org
:
'All Organization'
,
custom
:
'Custom'
,
import_template
:
'Import Template'
,
copy_template
:
'Copy Template'
,
upload_template
:
'Upload Template'
,
belong_to_category
:
'Category'
,
pls_select_belong_to_category
:
'Please select category'
,
template_name_cannot_be_empty
:
'Template name cannot be empty'
,
select_by_table
:
'Select by table'
,
data_list
:
'Data list'
,
component_list
:
'Component list'
,
custom_scope
:
'Custom control range'
,
multiple_choice
:
'Multiple choice'
,
single_choice
:
'Single choice'
,
field
:
'Field'
,
unshared_people
:
'Unshared people'
,
shared_people
:
'Shared people'
,
error_data
:
'Error getting data, please contact administrator'
,
canvas_size
:
'Canvas Size'
,
canvas_scale
:
'Canvas Scale'
,
style
:
'Style'
,
clean_canvas
:
'Clean Canvas'
,
insert_picture
:
'Insert Picture'
,
redo
:
'Redo'
,
undo
:
'UToolbar.vuendo'
},
},
plugin
:
{
plugin
:
{
local_install
:
'Local installation'
,
local_install
:
'Local installation'
,
...
...
frontend/src/lang/tw.js
浏览文件 @
e2e2b09f
差异被折叠。
点击展开。
frontend/src/lang/zh.js
浏览文件 @
e2e2b09f
...
@@ -85,6 +85,7 @@ export default {
...
@@ -85,6 +85,7 @@ export default {
tokenError
:
'token错误,请重新登录'
tokenError
:
'token错误,请重新登录'
},
},
commons
:
{
commons
:
{
all
:
'全部'
,
enable
:
'启用'
,
enable
:
'启用'
,
disable
:
'停用'
,
disable
:
'停用'
,
yes
:
'是'
,
yes
:
'是'
,
...
@@ -812,7 +813,34 @@ export default {
...
@@ -812,7 +813,34 @@ export default {
export_to_panel
:
'导出为模板'
,
export_to_panel
:
'导出为模板'
,
preview
:
'预览'
,
preview
:
'预览'
,
select_panel_from_left
:
'请从左侧选择仪表盘'
,
select_panel_from_left
:
'请从左侧选择仪表盘'
,
template_nale
:
'模板名称'
template_nale
:
'模板名称'
,
template
:
'模板'
,
category
:
'分类'
,
all_org
:
'所有组织'
,
custom
:
'自定义'
,
import_template
:
'导入模板'
,
copy_template
:
'复用模板'
,
upload_template
:
'上传模板'
,
belong_to_category
:
'所属类别'
,
pls_select_belong_to_category
:
'请选择所属类别'
,
template_name_cannot_be_empty
:
'模板名称不能为空'
,
select_by_table
:
'按表选择'
,
data_list
:
'数据列表'
,
component_list
:
'组件列表'
,
custom_scope
:
'自定义控制范围'
,
multiple_choice
:
'多选'
,
single_choice
:
'单选'
,
field
:
'字段'
,
unshared_people
:
'未分享人员'
,
shared_people
:
'已分享人员'
,
error_data
:
'获取数据出错 请联系管理员 Error getting data, please contact administrator'
,
canvas_size
:
'画布大小'
,
canvas_scale
:
'画布比例'
,
style
:
'样式'
,
clean_canvas
:
'清空画布'
,
insert_picture
:
'插入图片'
,
redo
:
'重做'
,
undo
:
'撤销'
},
},
plugin
:
{
plugin
:
{
local_install
:
'本地安装'
,
local_install
:
'本地安装'
,
...
...
frontend/src/views/panel/GrantAuth/dept/index.vue
浏览文件 @
e2e2b09f
...
@@ -11,7 +11,7 @@
...
@@ -11,7 +11,7 @@
:tree-props="{children: 'children', hasChildren: 'hasChildren'}"
:tree-props="{children: 'children', hasChildren: 'hasChildren'}"
row-key="deptId"
row-key="deptId"
>
>
<el-table-column
label=
"所有组织
"
prop=
"name"
/>
<el-table-column
:label=
"$t('panel.all_org')
"
prop=
"name"
/>
<el-table-column
type=
"selection"
fixd
/>
<el-table-column
type=
"selection"
fixd
/>
<!--
<el-table-column
label=
"分享给"
prop=
"deptId"
width=
"80"
fixed=
"right"
>
<!--
<el-table-column
label=
"分享给"
prop=
"deptId"
width=
"80"
fixed=
"right"
>
<template
slot-scope=
"scope"
>
<template
slot-scope=
"scope"
>
...
...
frontend/src/views/panel/GrantAuth/role/index.vue
浏览文件 @
e2e2b09f
...
@@ -79,7 +79,7 @@ export default {
...
@@ -79,7 +79,7 @@ export default {
const
rows
=
this
.
$refs
.
table
.
store
.
states
.
selection
const
rows
=
this
.
$refs
.
table
.
store
.
states
.
selection
const
request
=
this
.
buildRequest
(
rows
)
const
request
=
this
.
buildRequest
(
rows
)
saveShare
(
request
).
then
(
res
=>
{
saveShare
(
request
).
then
(
res
=>
{
this
.
$success
(
'保存成功'
)
this
.
$success
(
this
.
$t
(
'commons.save_success'
)
)
return
true
return
true
}).
catch
(
err
=>
{
}).
catch
(
err
=>
{
this
.
$error
(
err
.
message
)
this
.
$error
(
err
.
message
)
...
@@ -88,7 +88,6 @@ export default {
...
@@ -88,7 +88,6 @@ export default {
},
},
cancel
()
{
cancel
()
{
console
.
log
(
'role cancel'
)
},
},
buildRequest
(
rows
)
{
buildRequest
(
rows
)
{
const
targetIds
=
rows
.
map
(
row
=>
row
.
roleId
)
const
targetIds
=
rows
.
map
(
row
=>
row
.
roleId
)
...
...
frontend/src/views/panel/GrantAuth/user/index.vue
浏览文件 @
e2e2b09f
...
@@ -34,9 +34,9 @@ export default {
...
@@ -34,9 +34,9 @@ export default {
data
()
{
data
()
{
return
{
return
{
data
:
[],
data
:
[],
defaultHeadName
:
'全部'
,
defaultHeadName
:
this
.
$t
(
'commons.all'
)
,
columnLabel
:
null
,
columnLabel
:
null
,
filter_options
:
[{
text
:
'未分享人员'
,
value
:
0
},
{
text
:
'已分享人员'
,
value
:
1
}],
filter_options
:
[{
text
:
this
.
$t
(
'panel.unshared_people'
),
value
:
0
},
{
text
:
this
.
$t
(
'panel.shared_people'
)
,
value
:
1
}],
fieldName
:
'nickName'
,
fieldName
:
'nickName'
,
type
:
0
,
// 类型0代表用户
type
:
0
,
// 类型0代表用户
shares
:
[]
shares
:
[]
...
@@ -80,7 +80,7 @@ export default {
...
@@ -80,7 +80,7 @@ export default {
const
rows
=
this
.
$refs
.
table
.
store
.
states
.
selection
const
rows
=
this
.
$refs
.
table
.
store
.
states
.
selection
const
request
=
this
.
buildRequest
(
rows
)
const
request
=
this
.
buildRequest
(
rows
)
saveShare
(
request
).
then
(
res
=>
{
saveShare
(
request
).
then
(
res
=>
{
this
.
$success
(
'保存成功'
)
this
.
$success
(
this
.
$t
(
'commons.save_success'
)
)
return
true
return
true
}).
catch
(
err
=>
{
}).
catch
(
err
=>
{
this
.
$error
(
err
.
message
)
this
.
$error
(
err
.
message
)
...
...
frontend/src/views/panel/filter/filterDialog.vue
浏览文件 @
e2e2b09f
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
<de-container
class=
"de-dialog-container"
>
<de-container
class=
"de-dialog-container"
>
<de-aside-container
:show-drag-bar=
"false"
class=
"ms-aside-container"
>
<de-aside-container
:show-drag-bar=
"false"
class=
"ms-aside-container"
>
<el-tabs
v-model=
"activeName"
class=
"filter-dialog-tabs"
>
<el-tabs
v-model=
"activeName"
class=
"filter-dialog-tabs"
>
<el-tab-pane
:lazy=
"true"
class=
"de-tab"
label=
"按表选择
"
name=
"dataset"
>
<el-tab-pane
:lazy=
"true"
class=
"de-tab"
:label=
"$t('panel.select_by_table')
"
name=
"dataset"
>
<div
class=
"component-header filter-common"
>
<div
class=
"component-header filter-common"
>
<el-breadcrumb
separator-class=
"el-icon-arrow-right"
>
<el-breadcrumb
separator-class=
"el-icon-arrow-right"
>
<el-breadcrumb-item
v-for=
"bread in dataSetBreads"
:key=
"bread.label"
>
<el-breadcrumb-item
v-for=
"bread in dataSetBreads"
:key=
"bread.label"
>
...
@@ -120,7 +120,7 @@
...
@@ -120,7 +120,7 @@
<div
class=
"filter-field"
>
<div
class=
"filter-field"
>
<div
class=
"field-content"
>
<div
class=
"field-content"
>
<div
class=
"field-content-left"
>
<div
class=
"field-content-left"
>
<div
class=
"field-content-text"
>
字段
</div>
<div
class=
"field-content-text"
>
{{ $t(panel.field) }}
</div>
</div>
</div>
<div
class=
"field-content-right"
>
<div
class=
"field-content-right"
>
...
@@ -149,14 +149,14 @@
...
@@ -149,14 +149,14 @@
<el-switch
<el-switch
v-if=
"widget.showSwitch"
v-if=
"widget.showSwitch"
v-model=
"componentInfo.options.attrs.multiple"
v-model=
"componentInfo.options.attrs.multiple"
active-text=
"多选
"
:active-text=
"$t('panel.multiple_choice')
"
inactive-text=
"单选
"
:inactive-text=
"$t('panel.single_choice')
"
@
change=
"multipleChange"
@
change=
"multipleChange"
/>
/>
</div>
</div>
</el-col>
</el-col>
<el-col
:span=
"16"
><div
class=
"filter-options-right"
>
<el-col
:span=
"16"
><div
class=
"filter-options-right"
>
<el-checkbox
v-model=
"customRange"
><span>
自定义控制范围
</span>
</el-checkbox>
<el-checkbox
v-model=
"customRange"
><span>
{{ $t(panel.custom_scope) }}
</span>
</el-checkbox>
<el-popover
<el-popover
v-model=
"popovervisible"
v-model=
"popovervisible"
...
@@ -175,10 +175,6 @@
...
@@ -175,10 +175,6 @@
</el-checkbox-group>
</el-checkbox-group>
</div>
</div>
<!-- <div style="text-align: right; margin: 0">
<el-button size="mini" type="text" @click="popovervisible=false">取消</el-button>
<el-button type="primary" size="mini" @click="popovervisible=false">确定</el-button>
</div> -->
<i
slot=
"reference"
:class=
"{'i-filter-active': customRange, 'i-filter-inactive': !customRange}"
class=
"el-icon-setting i-filter"
/>
<i
slot=
"reference"
:class=
"{'i-filter-active': customRange, 'i-filter-inactive': !customRange}"
class=
"el-icon-setting i-filter"
/>
</el-popover>
</el-popover>
<!-- <el-checkbox disabled>备选项</el-checkbox> -->
<!-- <el-checkbox disabled>备选项</el-checkbox> -->
...
@@ -243,10 +239,10 @@ export default {
...
@@ -243,10 +239,10 @@ export default {
showDomType
:
'tree'
,
showDomType
:
'tree'
,
comShowDomType
:
'view'
,
comShowDomType
:
'view'
,
dataSetBreads
:
[
dataSetBreads
:
[
{
label
:
'数据列表'
,
link
:
false
,
type
:
'root'
}
{
label
:
this
.
$t
(
'panel.data_list'
)
,
link
:
false
,
type
:
'root'
}
],
],
componentSetBreads
:
[
componentSetBreads
:
[
{
label
:
'组件列表'
,
link
:
false
,
type
:
'root'
}
{
label
:
this
.
$t
(
'panel.component_list'
)
,
link
:
false
,
type
:
'root'
}
],
],
data
:
[],
data
:
[],
sceneDatas
:
[],
sceneDatas
:
[],
...
@@ -321,12 +317,6 @@ export default {
...
@@ -321,12 +317,6 @@ export default {
.
map
(
item
=>
item
.
propValue
.
viewId
)
.
map
(
item
=>
item
.
propValue
.
viewId
)
viewsWithIds
(
viewIds
).
then
(
res
=>
{
viewsWithIds
(
viewIds
).
then
(
res
=>
{
const
datas
=
res
.
data
const
datas
=
res
.
data
// for (let index = 0; index
<
4
;
index
++
)
{
// datas = datas.concat(datas)
// }
// datas.forEach(item => item.name += 'aaaaaaaaabbbbb')
this
.
viewInfos
=
datas
this
.
viewInfos
=
datas
})
})
},
},
...
...
frontend/src/views/panel/list/EditPanel/TemplateAllList.vue
浏览文件 @
e2e2b09f
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
<el-row>
<el-row>
<el-input
<el-input
v-model=
"templateFilterText"
v-model=
"templateFilterText"
placeholder=
"输入关键字进行过滤
"
:placeholder=
"$t('panel.filter_keywords')
"
size=
"mini"
size=
"mini"
clearable
clearable
prefix-icon=
"el-icon-search"
prefix-icon=
"el-icon-search"
...
...
frontend/src/views/panel/list/EditPanel/index.vue
浏览文件 @
e2e2b09f
...
@@ -2,17 +2,17 @@
...
@@ -2,17 +2,17 @@
<el-row>
<el-row>
<el-row
v-if=
"editPanel.optType==='new' && editPanel.panelInfo.nodeType==='panel'"
>
<el-row
v-if=
"editPanel.optType==='new' && editPanel.panelInfo.nodeType==='panel'"
>
<el-col
:span=
"18"
style=
"height: 40px"
>
<el-col
:span=
"18"
style=
"height: 40px"
>
<el-radio
v-model=
"inputType"
label=
"self"
>
自定义
</el-radio>
<el-radio
v-model=
"inputType"
label=
"self"
>
{{
$t
(
panel
.
custom
)
}}
</el-radio>
<el-radio
v-model=
"inputType"
label=
"import"
>
导入模板
</el-radio>
<el-radio
v-model=
"inputType"
label=
"import"
>
{{
$t
(
panel
.
import_template
)
}}
</el-radio>
<el-radio
v-model=
"inputType"
label=
"copy"
>
复用模板
</el-radio>
<el-radio
v-model=
"inputType"
label=
"copy"
>
{{
$t
(
panel
.
copy_template
)
}}
</el-radio>
</el-col>
</el-col>
<el-col
v-if=
"inputType==='import'"
:span=
"6"
>
<el-col
v-if=
"inputType==='import'"
:span=
"6"
>
<el-button
class=
"el-icon-upload"
size=
"small"
type=
"primary"
@
click=
"goFile"
>
上传模板
</el-button>
<el-button
class=
"el-icon-upload"
size=
"small"
type=
"primary"
@
click=
"goFile"
>
{{
$t
(
panel
.
upload_template
)
}}
</el-button>
<input
id=
"input"
ref=
"files"
type=
"file"
accept=
".DE"
hidden
@
change=
"handleFileChange"
>
<input
id=
"input"
ref=
"files"
type=
"file"
accept=
".DE"
hidden
@
change=
"handleFileChange"
>
</el-col>
</el-col>
</el-row>
</el-row>
<el-row
style=
"margin-top: 5px"
>
<el-row
style=
"margin-top: 5px"
>
<el-col
:span=
"4"
>
{{
editPanel
.
titleSuf
}}
名称
</el-col>
<el-col
:span=
"4"
>
{{
editPanel
.
titleSuf
}}
{{
$t
(
commons
.
name
)
}}
</el-col>
<el-col
:span=
"20"
>
<el-col
:span=
"20"
>
<el-input
v-model=
"editPanel.panelInfo.name"
clearable
size=
"mini"
/>
<el-input
v-model=
"editPanel.panelInfo.name"
clearable
size=
"mini"
/>
</el-col>
</el-col>
...
@@ -25,8 +25,8 @@
...
@@ -25,8 +25,8 @@
</el-row>
</el-row>
<el-row
v-if=
"inputType==='import'"
class=
"preview"
:style=
"classBackground"
/>
<el-row
v-if=
"inputType==='import'"
class=
"preview"
:style=
"classBackground"
/>
<el-row
class=
"root-class"
>
<el-row
class=
"root-class"
>
<el-button
@
click=
"cancel()"
>
取 消
</el-button>
<el-button
@
click=
"cancel()"
>
{{
$t
(
commons
.
cancel
)
}}
</el-button>
<el-button
type=
"primary"
@
click=
"save()"
>
确 定
</el-button>
<el-button
type=
"primary"
@
click=
"save()"
>
{{
$t
(
commons
.
confirm
)
}}
</el-button>
</el-row>
</el-row>
</el-row>
</el-row>
</
template
>
</
template
>
...
@@ -49,7 +49,7 @@ export default {
...
@@ -49,7 +49,7 @@ export default {
fieldName
:
'name'
,
fieldName
:
'name'
,
tableRadio
:
null
,
tableRadio
:
null
,
keyWordSearch
:
''
,
keyWordSearch
:
''
,
columnLabel
:
'所属类别'
,
columnLabel
:
this
.
$t
(
'panel.belong_to_category'
)
,
templateList
:
[],
templateList
:
[],
importTemplateInfo
:
{
importTemplateInfo
:
{
snapshot
:
''
snapshot
:
''
...
@@ -101,12 +101,12 @@ export default {
...
@@ -101,12 +101,12 @@ export default {
},
},
save
()
{
save
()
{
if
(
!
this
.
editPanel
.
panelInfo
.
name
)
{
if
(
!
this
.
editPanel
.
panelInfo
.
name
)
{
this
.
$warning
(
'名称不能为空'
)
this
.
$warning
(
this
.
$t
(
'commons.name_can_not_empty'
)
)
return
false
return
false
}
}
panelSave
(
this
.
editPanel
.
panelInfo
).
then
(
response
=>
{
panelSave
(
this
.
editPanel
.
panelInfo
).
then
(
response
=>
{
this
.
$message
({
this
.
$message
({
message
:
'保存成功'
,
message
:
this
.
$t
(
'commons.save_success'
)
,
type
:
'success'
,
type
:
'success'
,
showClose
:
true
showClose
:
true
})
})
...
...
frontend/src/views/panel/list/PanelList.vue
浏览文件 @
e2e2b09f
...
@@ -314,24 +314,24 @@ export default {
...
@@ -314,24 +314,24 @@ export default {
this
.
editPanel
.
visible
=
true
this
.
editPanel
.
visible
=
true
switch
(
param
.
optType
)
{
switch
(
param
.
optType
)
{
case
'new'
:
case
'new'
:
this
.
editPanel
.
titlePre
=
'新建'
this
.
editPanel
.
titlePre
=
this
.
$t
(
'commons.create'
)
this
.
editPanel
.
panelInfo
.
name
=
'新建仪表盘'
this
.
editPanel
.
panelInfo
.
name
=
this
.
$t
(
'panel.panelAdd'
)
this
.
editPanel
.
panelInfo
.
pid
=
param
.
data
.
id
this
.
editPanel
.
panelInfo
.
pid
=
param
.
data
.
id
this
.
editPanel
.
panelInfo
.
level
=
param
.
data
.
level
+
1
this
.
editPanel
.
panelInfo
.
level
=
param
.
data
.
level
+
1
break
break
case
'edit'
:
case
'edit'
:
case
'rename'
:
case
'rename'
:
this
.
editPanel
.
titlePre
=
'编辑'
this
.
editPanel
.
titlePre
=
this
.
$t
(
'commons.edit'
)
this
.
editPanel
.
panelInfo
.
id
=
param
.
data
.
id
this
.
editPanel
.
panelInfo
.
id
=
param
.
data
.
id
this
.
editPanel
.
panelInfo
.
name
=
param
.
data
.
name
this
.
editPanel
.
panelInfo
.
name
=
param
.
data
.
name
break
break
}
}
switch
(
param
.
type
)
{
switch
(
param
.
type
)
{
case
'folder'
:
case
'folder'
:
this
.
editPanel
.
titleSuf
=
'目录'
this
.
editPanel
.
titleSuf
=
this
.
$t
(
'panel.group'
)
break
break
case
'panel'
:
case
'panel'
:
this
.
editPanel
.
titleSuf
=
'仪表盘'
this
.
editPanel
.
titleSuf
=
this
.
$t
(
'panel.panel'
)
break
break
}
}
},
},
...
...
frontend/src/views/panel/list/SaveToTemplate.vue
浏览文件 @
e2e2b09f
...
@@ -49,7 +49,7 @@ export default {
...
@@ -49,7 +49,7 @@ export default {
fieldName
:
'name'
,
fieldName
:
'name'
,
tableRadio
:
null
,
tableRadio
:
null
,
keyWordSearch
:
''
,
keyWordSearch
:
''
,
columnLabel
:
'所属类别'
columnLabel
:
this
.
$t
(
'panel.belong_to_category'
)
}
}
},
},
created
()
{
created
()
{
...
@@ -74,16 +74,16 @@ export default {
...
@@ -74,16 +74,16 @@ export default {
},
},
save
()
{
save
()
{
if
(
!
this
.
templateInfo
.
pid
)
{
if
(
!
this
.
templateInfo
.
pid
)
{
this
.
$warning
(
'请选择所属类别'
)
this
.
$warning
(
this
.
$t
(
panel
.
pls_select_belong_to_category
)
)
return
false
return
false
}
}
if
(
!
this
.
templateInfo
.
name
)
{
if
(
!
this
.
templateInfo
.
name
)
{
this
.
$warning
(
'模板名称不能为空'
)
this
.
$warning
(
this
.
$t
(
'panel.template_name_cannot_be_empty'
)
)
return
false
return
false
}
}
post
(
'/template/save'
,
this
.
templateInfo
).
then
(
response
=>
{
post
(
'/template/save'
,
this
.
templateInfo
).
then
(
response
=>
{
this
.
$message
({
this
.
$message
({
message
:
'保存成功'
,
message
:
this
.
$t
(
'commons.save_success'
)
,
type
:
'success'
,
type
:
'success'
,
showClose
:
true
showClose
:
true
})
})
...
...
frontend/src/views/panel/template/component/TemplateItem.vue
浏览文件 @
e2e2b09f
...
@@ -34,8 +34,8 @@ export default {
...
@@ -34,8 +34,8 @@ export default {
},
},
methods
:
{
methods
:
{
templateDelete
()
{
templateDelete
()
{
this
.
$alert
(
'是否删除模板:
'
+
this
.
template
.
name
+
'?'
,
''
,
{
this
.
$alert
(
this
.
$t
(
'panel.confirm_delete'
)
+
this
.
$t
(
'panel.template'
)
+
':
'
+
this
.
template
.
name
+
'?'
,
''
,
{
confirmButtonText
:
'确认'
,
confirmButtonText
:
this
.
$t
(
'panel.confirm'
)
,
callback
:
(
action
)
=>
{
callback
:
(
action
)
=>
{
if
(
action
===
'confirm'
)
{
if
(
action
===
'confirm'
)
{
this
.
$emit
(
'templateDelete'
,
this
.
template
.
id
)
this
.
$emit
(
'templateDelete'
,
this
.
template
.
id
)
...
...
frontend/src/views/panel/template/component/TemplateList.vue
浏览文件 @
e2e2b09f
...
@@ -129,8 +129,8 @@ export default {
...
@@ -129,8 +129,8 @@ export default {
this
.
$emit
(
'showTemplateEditDialog'
,
'new'
)
this
.
$emit
(
'showTemplateEditDialog'
,
'new'
)
},
},
templateDelete
(
template
)
{
templateDelete
(
template
)
{
this
.
$alert
(
'是否删除分类:
'
+
template
.
name
+
'?'
,
''
,
{
this
.
$alert
(
this
.
$t
(
'panel.confirm_delete'
)
+
this
.
$t
(
'panel.category'
)
+
':
'
+
template
.
name
+
'?'
,
''
,
{
confirmButtonText
:
'确认'
,
confirmButtonText
:
this
.
$t
(
'panel.confirm_delete'
)
,
callback
:
(
action
)
=>
{
callback
:
(
action
)
=>
{
if
(
action
===
'confirm'
)
{
if
(
action
===
'confirm'
)
{
this
.
$emit
(
'templateDelete'
,
template
.
id
)
this
.
$emit
(
'templateDelete'
,
template
.
id
)
...
...
frontend/src/views/panel/template/index.vue
浏览文件 @
e2e2b09f
...
@@ -88,7 +88,7 @@ export default {
...
@@ -88,7 +88,7 @@ export default {
if
(
id
)
{
if
(
id
)
{
post
(
'/template/delete/'
+
id
,
null
).
then
(
response
=>
{
post
(
'/template/delete/'
+
id
,
null
).
then
(
response
=>
{
this
.
$message
({
this
.
$message
({
message
:
'删除成功'
,
message
:
this
.
$t
(
'commons.delete_success'
)
,
type
:
'success'
,
type
:
'success'
,
showClose
:
true
showClose
:
true
})
})
...
@@ -98,10 +98,10 @@ export default {
...
@@ -98,10 +98,10 @@ export default {
},
},
showTemplateEditDialog
(
type
,
templateInfo
)
{
showTemplateEditDialog
(
type
,
templateInfo
)
{
if
(
type
===
'edit'
)
{
if
(
type
===
'edit'
)
{
this
.
dialogTitle
=
'编辑'
this
.
dialogTitle
=
this
.
$t
(
'commons.edit'
)
this
.
templateEditForm
=
JSON
.
parse
(
JSON
.
stringify
(
templateInfo
))
this
.
templateEditForm
=
JSON
.
parse
(
JSON
.
stringify
(
templateInfo
))
}
else
{
}
else
{
this
.
dialogTitle
=
'新建'
this
.
dialogTitle
=
this
.
$t
(
'commons.create'
)
this
.
templateEditForm
=
{
name
:
''
,
nodeType
:
'folder'
,
templateType
:
this
.
currentTemplateType
,
level
:
0
}
this
.
templateEditForm
=
{
name
:
''
,
nodeType
:
'folder'
,
templateType
:
this
.
currentTemplateType
,
level
:
0
}
}
}
this
.
editTemplate
=
true
this
.
editTemplate
=
true
...
@@ -112,7 +112,7 @@ export default {
...
@@ -112,7 +112,7 @@ export default {
saveTemplateEdit
(
templateEditForm
)
{
saveTemplateEdit
(
templateEditForm
)
{
post
(
'/template/save'
,
templateEditForm
).
then
(
response
=>
{
post
(
'/template/save'
,
templateEditForm
).
then
(
response
=>
{
this
.
$message
({
this
.
$message
({
message
:
'保存成功'
,
message
:
this
.
$t
(
'commons.save_success'
)
,
type
:
'success'
,
type
:
'success'
,
showClose
:
true
showClose
:
true
})
})
...
...
frontend/src/views/system/datasource/index.vue
浏览文件 @
e2e2b09f
...
@@ -132,15 +132,13 @@ export default {
...
@@ -132,15 +132,13 @@ export default {
],
],
searchConfig
:
{
searchConfig
:
{
useQuickSearch
:
true
,
useQuickSearch
:
true
,
quickPlaceholder
:
'按名称搜索'
,
quickPlaceholder
:
this
.
$t
(
'commons.search_by_name'
)
,
combine
:
false
,
combine
:
false
,
components
:
[
components
:
[
// { field: 'name', label: '姓名', component: 'FuComplexInput', defaultOperator: 'eq' },
{
field
:
'name'
,
label
:
this
.
$t
(
'commons.name'
),
component
:
'FuComplexInput'
},
{
field
:
'name'
,
label
:
'名称'
,
component
:
'FuComplexInput'
},
{
{
field
:
'type'
,
field
:
'type'
,
label
:
'类型'
,
label
:
this
.
$t
(
'datasource.type'
)
,
component
:
'FuComplexSelect'
,
component
:
'FuComplexSelect'
,
options
:
[{
label
:
'mysql'
,
value
:
'mysql'
},
{
label
:
'sqlServer'
,
value
:
'sqlServer'
}],
options
:
[{
label
:
'mysql'
,
value
:
'mysql'
},
{
label
:
'sqlServer'
,
value
:
'sqlServer'
}],
multiple
:
false
multiple
:
false
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论