Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
D
dataease
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
zhu
dataease
Commits
3a8adf40
提交
3a8adf40
authored
7月 21, 2021
作者:
junjie
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
feat: 视图字段排序增加icon标识
上级
1ef870c8
隐藏空白字符变更
内嵌
并排
正在显示
7 个修改的文件
包含
23 行增加
和
4 行删除
+23
-4
sort-asc.svg
frontend/src/icons/svg/sort-asc.svg
+1
-0
sort-desc.svg
frontend/src/icons/svg/sort-desc.svg
+1
-0
index.scss
frontend/src/styles/index.scss
+6
-1
ChartDragItem.vue
...nd/src/views/chart/components/drag-item/ChartDragItem.vue
+4
-0
DimensionItem.vue
...nd/src/views/chart/components/drag-item/DimensionItem.vue
+4
-0
QuotaItem.vue
frontend/src/views/chart/components/drag-item/QuotaItem.vue
+5
-1
ChartEdit.vue
frontend/src/views/chart/view/ChartEdit.vue
+2
-2
没有找到文件。
frontend/src/icons/svg/sort-asc.svg
0 → 100644
浏览文件 @
3a8adf40
<svg
t=
"1626861945234"
class=
"icon"
viewBox=
"0 0 1024 1024"
version=
"1.1"
xmlns=
"http://www.w3.org/2000/svg"
p-id=
"5279"
width=
"200"
height=
"200"
><path
d=
"M0 0h307.2v122.88H0V0z m0 460.8h614.4v122.88H0V460.8z m0 440.32h1024V1024H0v-122.88z"
p-id=
"5280"
></path></svg>
frontend/src/icons/svg/sort-desc.svg
0 → 100644
浏览文件 @
3a8adf40
<svg
t=
"1626861978178"
class=
"icon"
viewBox=
"0 0 1024 1024"
version=
"1.1"
xmlns=
"http://www.w3.org/2000/svg"
p-id=
"4648"
width=
"200"
height=
"200"
><path
d=
"M0 0h1024v122.88H0V0z m0 460.8h614.4v122.88H0V460.8z m0 440.32h307.2V1024H0v-122.88z"
p-id=
"4649"
></path></svg>
frontend/src/styles/index.scss
浏览文件 @
3a8adf40
...
@@ -221,7 +221,7 @@ div:focus {
...
@@ -221,7 +221,7 @@ div:focus {
%field-icon
{
%field-icon
{
font-size
:
13px
;
font-size
:
13px
;
margin
:
0
3
px
0
0
;
margin
:
0
2
px
0
0
;
}
}
.field-icon-text
{
.field-icon-text
{
@extend
%field-icon
;
@extend
%field-icon
;
...
@@ -239,6 +239,11 @@ div:focus {
...
@@ -239,6 +239,11 @@ div:focus {
@extend
%field-icon
;
@extend
%field-icon
;
color
:
#F56C6C
;
color
:
#F56C6C
;
}
}
.field-icon-sort
{
font-size
:
10px
;
@extend
%field-icon
;
color
:
#999999
;
}
.ds-icon-scene
{
.ds-icon-scene
{
width
:
13px
;
width
:
13px
;
height
:
13px
;
height
:
13px
;
...
...
frontend/src/views/chart/components/drag-item/ChartDragItem.vue
浏览文件 @
3a8adf40
...
@@ -6,6 +6,8 @@
...
@@ -6,6 +6,8 @@
<svg-icon
v-if=
"item.deType === 1"
icon-class=
"field_time"
class=
"field-icon-time"
/>
<svg-icon
v-if=
"item.deType === 1"
icon-class=
"field_time"
class=
"field-icon-time"
/>
<svg-icon
v-if=
"item.deType === 2 || item.deType === 3"
icon-class=
"field_value"
class=
"field-icon-value"
/>
<svg-icon
v-if=
"item.deType === 2 || item.deType === 3"
icon-class=
"field_value"
class=
"field-icon-value"
/>
<svg-icon
v-if=
"item.deType === 5"
icon-class=
"field_location"
class=
"field-icon-location"
/>
<svg-icon
v-if=
"item.deType === 5"
icon-class=
"field_location"
class=
"field-icon-location"
/>
<svg-icon
v-if=
"item.sort === 'asc'"
icon-class=
"sort-asc"
class-name=
"field-icon-sort"
/>
<svg-icon
v-if=
"item.sort === 'desc'"
icon-class=
"sort-desc"
class-name=
"field-icon-sort"
/>
</span>
</span>
<span
class=
"item-span-style"
:title=
"item.name"
>
{{
item
.
name
}}
</span>
<span
class=
"item-span-style"
:title=
"item.name"
>
{{
item
.
name
}}
</span>
</el-tag>
</el-tag>
...
@@ -17,6 +19,8 @@
...
@@ -17,6 +19,8 @@
<svg-icon
v-if=
"item.deType === 1"
icon-class=
"field_time"
class=
"field-icon-time"
/>
<svg-icon
v-if=
"item.deType === 1"
icon-class=
"field_time"
class=
"field-icon-time"
/>
<svg-icon
v-if=
"item.deType === 2 || item.deType === 3"
icon-class=
"field_value"
class=
"field-icon-value"
/>
<svg-icon
v-if=
"item.deType === 2 || item.deType === 3"
icon-class=
"field_value"
class=
"field-icon-value"
/>
<svg-icon
v-if=
"item.deType === 5"
icon-class=
"field_location"
class=
"field-icon-location"
/>
<svg-icon
v-if=
"item.deType === 5"
icon-class=
"field_location"
class=
"field-icon-location"
/>
<svg-icon
v-if=
"item.sort === 'asc'"
icon-class=
"sort-asc"
class-name=
"field-icon-sort"
/>
<svg-icon
v-if=
"item.sort === 'desc'"
icon-class=
"sort-desc"
class-name=
"field-icon-sort"
/>
</span>
</span>
<span
class=
"item-span-style"
:title=
"item.name"
>
{{
item
.
name
}}
</span>
<span
class=
"item-span-style"
:title=
"item.name"
>
{{
item
.
name
}}
</span>
<i
class=
"el-icon-arrow-down el-icon--right"
style=
"position: absolute;top: 6px;right: 10px;"
/>
<i
class=
"el-icon-arrow-down el-icon--right"
style=
"position: absolute;top: 6px;right: 10px;"
/>
...
...
frontend/src/views/chart/components/drag-item/DimensionItem.vue
浏览文件 @
3a8adf40
...
@@ -6,6 +6,8 @@
...
@@ -6,6 +6,8 @@
<svg-icon
v-if=
"item.deType === 1"
icon-class=
"field_time"
class=
"field-icon-time"
/>
<svg-icon
v-if=
"item.deType === 1"
icon-class=
"field_time"
class=
"field-icon-time"
/>
<svg-icon
v-if=
"item.deType === 2 || item.deType === 3"
icon-class=
"field_value"
class=
"field-icon-value"
/>
<svg-icon
v-if=
"item.deType === 2 || item.deType === 3"
icon-class=
"field_value"
class=
"field-icon-value"
/>
<svg-icon
v-if=
"item.deType === 5"
icon-class=
"field_location"
class=
"field-icon-location"
/>
<svg-icon
v-if=
"item.deType === 5"
icon-class=
"field_location"
class=
"field-icon-location"
/>
<svg-icon
v-if=
"item.sort === 'asc'"
icon-class=
"sort-asc"
class-name=
"field-icon-sort"
/>
<svg-icon
v-if=
"item.sort === 'desc'"
icon-class=
"sort-desc"
class-name=
"field-icon-sort"
/>
</span>
</span>
<span
class=
"item-span-style"
:title=
"item.name"
>
{{
item
.
name
}}
</span>
<span
class=
"item-span-style"
:title=
"item.name"
>
{{
item
.
name
}}
</span>
</el-tag>
</el-tag>
...
@@ -17,6 +19,8 @@
...
@@ -17,6 +19,8 @@
<svg-icon
v-if=
"item.deType === 1"
icon-class=
"field_time"
class=
"field-icon-time"
/>
<svg-icon
v-if=
"item.deType === 1"
icon-class=
"field_time"
class=
"field-icon-time"
/>
<svg-icon
v-if=
"item.deType === 2 || item.deType === 3"
icon-class=
"field_value"
class=
"field-icon-value"
/>
<svg-icon
v-if=
"item.deType === 2 || item.deType === 3"
icon-class=
"field_value"
class=
"field-icon-value"
/>
<svg-icon
v-if=
"item.deType === 5"
icon-class=
"field_location"
class=
"field-icon-location"
/>
<svg-icon
v-if=
"item.deType === 5"
icon-class=
"field_location"
class=
"field-icon-location"
/>
<svg-icon
v-if=
"item.sort === 'asc'"
icon-class=
"sort-asc"
class-name=
"field-icon-sort"
/>
<svg-icon
v-if=
"item.sort === 'desc'"
icon-class=
"sort-desc"
class-name=
"field-icon-sort"
/>
</span>
</span>
<span
class=
"item-span-style"
:title=
"item.name"
>
{{
item
.
name
}}
</span>
<span
class=
"item-span-style"
:title=
"item.name"
>
{{
item
.
name
}}
</span>
<i
class=
"el-icon-arrow-down el-icon--right"
style=
"position: absolute;top: 6px;right: 10px;"
/>
<i
class=
"el-icon-arrow-down el-icon--right"
style=
"position: absolute;top: 6px;right: 10px;"
/>
...
...
frontend/src/views/chart/components/drag-item/QuotaItem.vue
浏览文件 @
3a8adf40
...
@@ -6,6 +6,8 @@
...
@@ -6,6 +6,8 @@
<svg-icon
v-if=
"item.deType === 1"
icon-class=
"field_time"
class=
"field-icon-time"
/>
<svg-icon
v-if=
"item.deType === 1"
icon-class=
"field_time"
class=
"field-icon-time"
/>
<svg-icon
v-if=
"item.deType === 2 || item.deType === 3"
icon-class=
"field_value"
class=
"field-icon-value"
/>
<svg-icon
v-if=
"item.deType === 2 || item.deType === 3"
icon-class=
"field_value"
class=
"field-icon-value"
/>
<svg-icon
v-if=
"item.deType === 5"
icon-class=
"field_location"
class=
"field-icon-location"
/>
<svg-icon
v-if=
"item.deType === 5"
icon-class=
"field_location"
class=
"field-icon-location"
/>
<svg-icon
v-if=
"item.sort === 'asc'"
icon-class=
"sort-asc"
class-name=
"field-icon-sort"
/>
<svg-icon
v-if=
"item.sort === 'desc'"
icon-class=
"sort-desc"
class-name=
"field-icon-sort"
/>
</span>
</span>
<span
class=
"item-span-style"
:title=
"item.name"
>
{{
item
.
name
}}
</span>
<span
class=
"item-span-style"
:title=
"item.name"
>
{{
item
.
name
}}
</span>
<span
v-if=
"item.summary"
class=
"summary-span"
>
{{
$t
(
'chart.'
+
item
.
summary
)
}}
</span>
<span
v-if=
"item.summary"
class=
"summary-span"
>
{{
$t
(
'chart.'
+
item
.
summary
)
}}
</span>
...
@@ -18,6 +20,8 @@
...
@@ -18,6 +20,8 @@
<svg-icon
v-if=
"item.deType === 1"
icon-class=
"field_time"
class=
"field-icon-time"
/>
<svg-icon
v-if=
"item.deType === 1"
icon-class=
"field_time"
class=
"field-icon-time"
/>
<svg-icon
v-if=
"item.deType === 2 || item.deType === 3"
icon-class=
"field_value"
class=
"field-icon-value"
/>
<svg-icon
v-if=
"item.deType === 2 || item.deType === 3"
icon-class=
"field_value"
class=
"field-icon-value"
/>
<svg-icon
v-if=
"item.deType === 5"
icon-class=
"field_location"
class=
"field-icon-location"
/>
<svg-icon
v-if=
"item.deType === 5"
icon-class=
"field_location"
class=
"field-icon-location"
/>
<svg-icon
v-if=
"item.sort === 'asc'"
icon-class=
"sort-asc"
class-name=
"field-icon-sort"
/>
<svg-icon
v-if=
"item.sort === 'desc'"
icon-class=
"sort-desc"
class-name=
"field-icon-sort"
/>
</span>
</span>
<span
class=
"item-span-style"
:title=
"item.name"
>
{{
item
.
name
}}
</span>
<span
class=
"item-span-style"
:title=
"item.name"
>
{{
item
.
name
}}
</span>
<span
v-if=
"item.summary"
class=
"summary-span"
>
{{
$t
(
'chart.'
+
item
.
summary
)
}}
</span>
<span
v-if=
"item.summary"
class=
"summary-span"
>
{{
$t
(
'chart.'
+
item
.
summary
)
}}
</span>
...
@@ -226,7 +230,7 @@ export default {
...
@@ -226,7 +230,7 @@ export default {
.item-span-style
{
.item-span-style
{
display
:
inline-block
;
display
:
inline-block
;
width
:
8
0px
;
width
:
7
0px
;
white-space
:
nowrap
;
white-space
:
nowrap
;
text-overflow
:
ellipsis
;
text-overflow
:
ellipsis
;
overflow
:
hidden
;
overflow
:
hidden
;
...
...
frontend/src/views/chart/view/ChartEdit.vue
浏览文件 @
3a8adf40
...
@@ -286,9 +286,9 @@
...
@@ -286,9 +286,9 @@
</transition-group>
</transition-group>
</draggable>
</draggable>
</el-row>
</el-row>
<el-row
v-if=
"chart.type.includes('stack')"
class=
"padding-lr"
style=
"margin-top: 6px;"
>
<el-row
v-if=
"chart.type
&& chart.type
.includes('stack')"
class=
"padding-lr"
style=
"margin-top: 6px;"
>
<span
style=
"width: 80px;text-align: right;"
>
<span
style=
"width: 80px;text-align: right;"
>
<span
v-if=
"chart.type.includes('stack')"
>
{{
$t
(
'chart.stack_item'
)
}}
</span>
<span>
{{
$t
(
'chart.stack_item'
)
}}
</span>
/
/
<span>
{{
$t
(
'chart.dimension'
)
}}
</span>
<span>
{{
$t
(
'chart.dimension'
)
}}
</span>
</span>
</span>
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论