Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
D
dataease
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
zhu
dataease
Commits
5a2a5830
Unverified
提交
5a2a5830
authored
7月 13, 2021
作者:
王嘉豪
提交者:
GitHub
7月 13, 2021
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #222 from dataease/pr@dev@panel
feat:编辑保存,放大效果等文案修改
上级
bf29a9bc
ab7c33c8
全部展开
隐藏空白字符变更
内嵌
并排
正在显示
11 个修改的文件
包含
90 行增加
和
15 行删除
+90
-15
V14__update_function.sql
.../src/main/resources/db/migration/V14__update_function.sql
+4
-0
Toolbar.vue
frontend/src/components/canvas/components/Toolbar.vue
+8
-4
UserView.vue
frontend/src/components/canvas/custom-component/UserView.vue
+3
-3
warn-tre.svg
frontend/src/icons/svg/warn-tre.svg
+1
-2
demo_index.html
frontend/src/styles/deicon/demo_index.html
+49
-3
iconfont.css
frontend/src/styles/deicon/iconfont.css
+11
-3
iconfont.js
frontend/src/styles/deicon/iconfont.js
+0
-0
iconfont.json
frontend/src/styles/deicon/iconfont.json
+14
-0
iconfont.ttf
frontend/src/styles/deicon/iconfont.ttf
+0
-0
iconfont.woff
frontend/src/styles/deicon/iconfont.woff
+0
-0
iconfont.woff2
frontend/src/styles/deicon/iconfont.woff2
+0
-0
没有找到文件。
backend/src/main/resources/db/migration/V14__update_function.sql
浏览文件 @
5a2a5830
DROP
FUNCTION
IF
EXISTS
`GET_CHART_VIEW_COPY_NAME`
;
delimiter
;;
CREATE
FUNCTION
`GET_CHART_VIEW_COPY_NAME`
(
chartId
varchar
(
255
))
RETURNS
varchar
(
255
)
CHARSET
utf8
READS
SQL
DATA
BEGIN
...
...
@@ -24,3 +26,5 @@ and REPLACE(name,chartName,'') REGEXP '-copy\\(([0-9])+\\)$' and name like CONCA
RETURN
concat
(
chartName
,
'-copy('
,
chartNameCount
,
')'
);
END
;;
delimiter
;
frontend/src/components/canvas/components/Toolbar.vue
浏览文件 @
5a2a5830
...
...
@@ -64,10 +64,14 @@
<!--关闭弹框-->
<el-dialog
:visible
.
sync=
"closePanelVisible"
:title=
"$t('panel.panel_save_tips')"
:show-close=
"false"
width=
"30%"
class=
"dialog-css"
>
<div>
<svg-icon
icon-class=
"warn-tre"
style=
"width: 30px;height: 30px"
/>
<span
style=
"font-size: 12px;margin-left: 10px"
>
{{
$t
(
'panel.panel_save_warn_tips'
)
}}
</span>
</div>
<el-row
style=
"height: 20px"
>
<el-col
:span=
"6"
>
<svg-icon
icon-class=
"warn-tre"
style=
"width: 20px;height: 20px;float: right"
/>
</el-col>
<el-col
:span=
"16"
>
<span
style=
"font-size: 13px;margin-left: 10px;font-weight: bold;line-height: 20px"
>
{{
$t
(
'panel.panel_save_warn_tips'
)
}}
</span>
</el-col>
</el-row>
<div
slot=
"footer"
class=
"dialog-footer"
>
<el-button
style=
"float: left"
size=
"mini"
@
click=
"closeNotSave()"
>
{{
$t
(
'panel.do_not_save'
)
}}
</el-button>
<el-button
size=
"mini"
@
click=
"closePanelVisible=false"
>
{{
$t
(
'panel.cancel'
)
}}
</el-button>
...
...
frontend/src/components/canvas/custom-component/UserView.vue
浏览文件 @
5a2a5830
<
template
>
<div
v-loading=
"requestStatus==='waiting'"
class=
"rect-shape"
>
<i
v-if=
"requestStatus==='success'"
style=
"right:5px;position: absolute;z-index: 2"
class=
"icon iconfont icon-
quanping1
"
@
click
.
stop=
"openChartDetailsDialog"
/>
<i
v-if=
"requestStatus==='success'"
style=
"right:5px;position: absolute;z-index: 2"
class=
"icon iconfont icon-
fangda
"
@
click
.
stop=
"openChartDetailsDialog"
/>
<div
v-if=
"requestStatus==='error'"
class=
"chart-error-class"
>
<div
style=
"font-size: 12px; color: #9ea6b2;height: 100%;display: flex;align-items: center;justify-content: center;"
>
{{
message
}}
,
{{
$t
(
'chart.chart_show_error'
)
}}
...
...
@@ -223,12 +223,12 @@ export default {
color
:
red
;
}
.rect-shape
:hover
>
.icon-
quanping1
{
.rect-shape
:hover
>
.icon-
fangda
{
z-index
:
2
;
display
:block
;
}
.rect-shape
>>>
.icon-
quanping1
{
.rect-shape
>>>
.icon-
fangda
{
display
:none
}
...
...
frontend/src/icons/svg/warn-tre.svg
浏览文件 @
5a2a5830
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg
t=
"1626064715257"
class=
"icon"
viewBox=
"0 0 1024 1024"
version=
"1.1"
xmlns=
"http://www.w3.org/2000/svg"
p-id=
"4612"
xmlns:xlink=
"http://www.w3.org/1999/xlink"
width=
"200"
height=
"200"
><defs><style
type=
"text/css"
></style></defs><path
d=
"M1019.204 901.632L546.628 82.944c-15.36-26.112-52.736-26.112-68.096 0L5.444 901.632c-15.36 26.112 3.584 58.88 34.304 58.88H984.9c30.208 0 49.152-32.768 34.304-58.88z"
fill=
"#f4ea2a"
p-id=
"4613"
data-spm-anchor-id=
"a313x.7781069.0.i1"
class=
"selected"
></path><path
d=
"M462.148 353.792h0.512a46.98 46.98 0 0 1 47.104-47.104h5.632a46.98 46.98 0 0 1 47.104 47.104v254.464c0 26.112-21.504 47.616-48.128 47.104h-4.608c-26.112 0-47.616-20.992-47.616-47.104V353.792z m107.52 421.888c-5.12 26.112-20.48 41.984-46.592 47.616-6.144 1.536-12.288 1.536-18.432 0-27.136-5.632-43.52-20.992-49.152-46.592-1.536-6.656-1.536-13.312 0-19.456 5.632-25.6 22.016-40.96 49.152-46.08a55.68 55.68 0 0 1 18.432 0c26.112 5.632 41.472 20.992 46.592 47.104 1.024 5.632 1.024 11.776 0 17.408z"
fill=
"#FFFFFF"
p-id=
"4614"
></path></svg>
\ No newline at end of file
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg
t=
"1626064715257"
class=
"icon"
viewBox=
"0 0 1024 1024"
version=
"1.1"
xmlns=
"http://www.w3.org/2000/svg"
p-id=
"4612"
xmlns:xlink=
"http://www.w3.org/1999/xlink"
width=
"200"
height=
"200"
><defs><style
type=
"text/css"
></style></defs><path
d=
"M1019.204 901.632L546.628 82.944c-15.36-26.112-52.736-26.112-68.096 0L5.444 901.632c-15.36 26.112 3.584 58.88 34.304 58.88H984.9c30.208 0 49.152-32.768 34.304-58.88z"
fill=
"#0a7be0"
p-id=
"4613"
data-spm-anchor-id=
"a313x.7781069.0.i1"
class=
"selected"
></path><path
d=
"M462.148 353.792h0.512a46.98 46.98 0 0 1 47.104-47.104h5.632a46.98 46.98 0 0 1 47.104 47.104v254.464c0 26.112-21.504 47.616-48.128 47.104h-4.608c-26.112 0-47.616-20.992-47.616-47.104V353.792z m107.52 421.888c-5.12 26.112-20.48 41.984-46.592 47.616-6.144 1.536-12.288 1.536-18.432 0-27.136-5.632-43.52-20.992-49.152-46.592-1.536-6.656-1.536-13.312 0-19.456 5.632-25.6 22.016-40.96 49.152-46.08a55.68 55.68 0 0 1 18.432 0c26.112 5.632 41.472 20.992 46.592 47.104 1.024 5.632 1.024 11.776 0 17.408z"
fill=
"#FFFFFF"
p-id=
"4614"
></path></svg>
frontend/src/styles/deicon/demo_index.html
浏览文件 @
5a2a5830
...
...
@@ -54,6 +54,18 @@
<div
class=
"content unicode"
style=
"display: block;"
>
<ul
class=
"icon_lists dib-box"
>
<li
class=
"dib"
>
<span
class=
"icon iconfont"
>

</span>
<div
class=
"name"
>
放大
</div>
<div
class=
"code-name"
>
&
#xe62d;
</div>
</li>
<li
class=
"dib"
>
<span
class=
"icon iconfont"
>

</span>
<div
class=
"name"
>
设 置
</div>
<div
class=
"code-name"
>
&
#xe696;
</div>
</li>
<li
class=
"dib"
>
<span
class=
"icon iconfont"
>

</span>
<div
class=
"name"
>
屏幕_全屏
</div>
...
...
@@ -270,9 +282,9 @@
<pre><code
class=
"language-css"
>
@font-face {
font-family: 'iconfont';
src: url('iconfont.woff2?t=162
5729811345
') format('woff2'),
url('iconfont.woff?t=162
5729811345
') format('woff'),
url('iconfont.ttf?t=162
5729811345
') format('truetype');
src: url('iconfont.woff2?t=162
6147352097
') format('woff2'),
url('iconfont.woff?t=162
6147352097
') format('woff'),
url('iconfont.ttf?t=162
6147352097
') format('truetype');
}
</code></pre>
<h3
id=
"-iconfont-"
>
第二步:定义使用 iconfont 的样式
</h3>
...
...
@@ -298,6 +310,24 @@
<div
class=
"content font-class"
>
<ul
class=
"icon_lists dib-box"
>
<li
class=
"dib"
>
<span
class=
"icon iconfont icon-fangda"
></span>
<div
class=
"name"
>
放大
</div>
<div
class=
"code-name"
>
.icon-fangda
</div>
</li>
<li
class=
"dib"
>
<span
class=
"icon iconfont icon-shezhi"
></span>
<div
class=
"name"
>
设 置
</div>
<div
class=
"code-name"
>
.icon-shezhi
</div>
</li>
<li
class=
"dib"
>
<span
class=
"icon iconfont icon-quanping1"
></span>
<div
class=
"name"
>
...
...
@@ -622,6 +652,22 @@
<div
class=
"content symbol"
>
<ul
class=
"icon_lists dib-box"
>
<li
class=
"dib"
>
<svg
class=
"icon svg-icon"
aria-hidden=
"true"
>
<use
xlink:href=
"#icon-fangda"
></use>
</svg>
<div
class=
"name"
>
放大
</div>
<div
class=
"code-name"
>
#icon-fangda
</div>
</li>
<li
class=
"dib"
>
<svg
class=
"icon svg-icon"
aria-hidden=
"true"
>
<use
xlink:href=
"#icon-shezhi"
></use>
</svg>
<div
class=
"name"
>
设 置
</div>
<div
class=
"code-name"
>
#icon-shezhi
</div>
</li>
<li
class=
"dib"
>
<svg
class=
"icon svg-icon"
aria-hidden=
"true"
>
<use
xlink:href=
"#icon-quanping1"
></use>
...
...
frontend/src/styles/deicon/iconfont.css
浏览文件 @
5a2a5830
@font-face
{
font-family
:
"iconfont"
;
/* Project id 2459092 */
src
:
url('iconfont.woff2?t=162
5729811345
')
format
(
'woff2'
),
url('iconfont.woff?t=162
5729811345
')
format
(
'woff'
),
url('iconfont.ttf?t=162
5729811345
')
format
(
'truetype'
);
src
:
url('iconfont.woff2?t=162
6147352097
')
format
(
'woff2'
),
url('iconfont.woff?t=162
6147352097
')
format
(
'woff'
),
url('iconfont.ttf?t=162
6147352097
')
format
(
'truetype'
);
}
.iconfont
{
...
...
@@ -13,6 +13,14 @@
-moz-osx-font-smoothing
:
grayscale
;
}
.icon-fangda
:before
{
content
:
"\e62d"
;
}
.icon-shezhi
:before
{
content
:
"\e696"
;
}
.icon-quanping1
:before
{
content
:
"\e655"
;
}
...
...
frontend/src/styles/deicon/iconfont.js
浏览文件 @
5a2a5830
差异被折叠。
点击展开。
frontend/src/styles/deicon/iconfont.json
浏览文件 @
5a2a5830
...
...
@@ -5,6 +5,20 @@
"css_prefix_text"
:
"icon-"
,
"description"
:
""
,
"glyphs"
:
[
{
"icon_id"
:
"20921234"
,
"name"
:
"放大"
,
"font_class"
:
"fangda"
,
"unicode"
:
"e62d"
,
"unicode_decimal"
:
58925
},
{
"icon_id"
:
"18379488"
,
"name"
:
"设 置"
,
"font_class"
:
"shezhi"
,
"unicode"
:
"e696"
,
"unicode_decimal"
:
59030
},
{
"icon_id"
:
"18668726"
,
"name"
:
"屏幕_全屏"
,
...
...
frontend/src/styles/deicon/iconfont.ttf
浏览文件 @
5a2a5830
No preview for this file type
frontend/src/styles/deicon/iconfont.woff
浏览文件 @
5a2a5830
No preview for this file type
frontend/src/styles/deicon/iconfont.woff2
浏览文件 @
5a2a5830
No preview for this file type
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论