Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
D
dataease
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
njgzx
dataease
Commits
e4771169
Unverified
提交
e4771169
authored
3月 17, 2022
作者:
Junjun
提交者:
GitHub
3月 17, 2022
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #1925 from dataease/pr@dev@feat_label
feat: 文本卡
上级
19107a74
f3d32a6e
隐藏空白字符变更
内嵌
并排
正在显示
5 个修改的文件
包含
14 行增加
和
15 行删除
+14
-15
LabelNormalText.vue
...end/src/views/chart/components/normal/LabelNormalText.vue
+5
-6
ColorSelector.vue
...d/src/views/chart/components/shape-attr/ColorSelector.vue
+1
-1
SizeSelector.vue
...nd/src/views/chart/components/shape-attr/SizeSelector.vue
+3
-3
SizeSelectorAntV.vue
...rc/views/chart/components/shape-attr/SizeSelectorAntV.vue
+3
-3
ChartEdit.vue
frontend/src/views/chart/view/ChartEdit.vue
+2
-2
没有找到文件。
frontend/src/views/chart/components/normal/LabelNormalText.vue
浏览文件 @
e4771169
...
@@ -11,12 +11,11 @@
...
@@ -11,12 +11,11 @@
{{
chart
.
data
.
series
[
0
].
data
[
0
]
}}
{{
chart
.
data
.
series
[
0
].
data
[
0
]
}}
</p>
</p>
</span>
</span>
<!-- 字段名暂时隐藏-->
<span
v-if=
"dimensionShow"
:style=
"label_space"
>
<!--
<span
v-if=
"dimensionShow"
:style=
"label_space"
>
-->
<p
:style=
"label_class"
>
<!--
<p
:style=
"label_class"
>
-->
{{
chart
.
data
.
series
[
0
].
name
}}
<!--
{{
chart
.
data
.
datas
[
0
].
category
}}
-->
</p>
<!--
</p>
-->
</span>
<!--
</span>
-->
</div>
</div>
</div>
</div>
</
template
>
</
template
>
...
...
frontend/src/views/chart/components/shape-attr/ColorSelector.vue
浏览文件 @
e4771169
...
@@ -48,7 +48,7 @@
...
@@ -48,7 +48,7 @@
<el-form-item
v-show=
"(chart.type && (chart.type.includes('text') || chart.type === 'label')) || sourceType==='panelTable'"
:label=
"$t('chart.quota_color')"
class=
"form-item"
>
<el-form-item
v-show=
"(chart.type && (chart.type.includes('text') || chart.type === 'label')) || sourceType==='panelTable'"
:label=
"$t('chart.quota_color')"
class=
"form-item"
>
<el-color-picker
v-model=
"colorForm.quotaColor"
class=
"color-picker-style"
:predefine=
"predefineColors"
@
change=
"changeColorCase"
/>
<el-color-picker
v-model=
"colorForm.quotaColor"
class=
"color-picker-style"
:predefine=
"predefineColors"
@
change=
"changeColorCase"
/>
</el-form-item>
</el-form-item>
<el-form-item
v-show=
"(chart.type && chart.type.includes('text')) || sourceType==='panelTable'"
:label=
"$t('chart.dimension_color')"
class=
"form-item"
>
<el-form-item
v-show=
"(chart.type && chart.type.includes('text')
|| chart.type === 'label'
) || sourceType==='panelTable'"
:label=
"$t('chart.dimension_color')"
class=
"form-item"
>
<el-color-picker
v-model=
"colorForm.dimensionColor"
class=
"color-picker-style"
:predefine=
"predefineColors"
@
change=
"changeColorCase"
/>
<el-color-picker
v-model=
"colorForm.dimensionColor"
class=
"color-picker-style"
:predefine=
"predefineColors"
@
change=
"changeColorCase"
/>
</el-form-item>
</el-form-item>
</div>
</div>
...
...
frontend/src/views/chart/components/shape-attr/SizeSelector.vue
浏览文件 @
e4771169
...
@@ -133,15 +133,15 @@
...
@@ -133,15 +133,15 @@
<el-option
v-for=
"option in fontSize"
:key=
"option.value"
:label=
"option.name"
:value=
"option.value"
/>
<el-option
v-for=
"option in fontSize"
:key=
"option.value"
:label=
"option.name"
:value=
"option.value"
/>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item
v-show=
"chart.type
&& (chart.type.includes('text'))
"
:label=
"$t('chart.dimension_show')"
class=
"form-item"
>
<el-form-item
v-show=
"chart.type"
:label=
"$t('chart.dimension_show')"
class=
"form-item"
>
<el-checkbox
v-model=
"sizeForm.dimensionShow"
@
change=
"changeBarSizeCase"
>
{{
$t
(
'chart.show'
)
}}
</el-checkbox>
<el-checkbox
v-model=
"sizeForm.dimensionShow"
@
change=
"changeBarSizeCase"
>
{{
$t
(
'chart.show'
)
}}
</el-checkbox>
</el-form-item>
</el-form-item>
<el-form-item
v-show=
"chart.type
&& (chart.type.includes('text'))
"
:label=
"$t('chart.dimension_font_size')"
class=
"form-item"
>
<el-form-item
v-show=
"chart.type"
:label=
"$t('chart.dimension_font_size')"
class=
"form-item"
>
<el-select
v-model=
"sizeForm.dimensionFontSize"
:placeholder=
"$t('chart.dimension_font_size')"
@
change=
"changeBarSizeCase"
>
<el-select
v-model=
"sizeForm.dimensionFontSize"
:placeholder=
"$t('chart.dimension_font_size')"
@
change=
"changeBarSizeCase"
>
<el-option
v-for=
"option in fontSize"
:key=
"option.value"
:label=
"option.name"
:value=
"option.value"
/>
<el-option
v-for=
"option in fontSize"
:key=
"option.value"
:label=
"option.name"
:value=
"option.value"
/>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item
v-show=
"chart.type
&& (chart.type.includes('text'))
"
:label=
"$t('chart.space_split')"
class=
"form-item"
>
<el-form-item
v-show=
"chart.type"
:label=
"$t('chart.space_split')"
class=
"form-item"
>
<el-input-number
v-model=
"sizeForm.spaceSplit"
size=
"mini"
@
change=
"changeBarSizeCase"
/>
<el-input-number
v-model=
"sizeForm.spaceSplit"
size=
"mini"
@
change=
"changeBarSizeCase"
/>
</el-form-item>
</el-form-item>
</el-form>
</el-form>
...
...
frontend/src/views/chart/components/shape-attr/SizeSelectorAntV.vue
浏览文件 @
e4771169
...
@@ -159,15 +159,15 @@
...
@@ -159,15 +159,15 @@
<el-option
v-for=
"option in fontSize"
:key=
"option.value"
:label=
"option.name"
:value=
"option.value"
/>
<el-option
v-for=
"option in fontSize"
:key=
"option.value"
:label=
"option.name"
:value=
"option.value"
/>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item
v-show=
"chart.type
&& (chart.type.includes('text'))
"
:label=
"$t('chart.dimension_show')"
class=
"form-item"
>
<el-form-item
v-show=
"chart.type"
:label=
"$t('chart.dimension_show')"
class=
"form-item"
>
<el-checkbox
v-model=
"sizeForm.dimensionShow"
@
change=
"changeBarSizeCase"
>
{{
$t
(
'chart.show'
)
}}
</el-checkbox>
<el-checkbox
v-model=
"sizeForm.dimensionShow"
@
change=
"changeBarSizeCase"
>
{{
$t
(
'chart.show'
)
}}
</el-checkbox>
</el-form-item>
</el-form-item>
<el-form-item
v-show=
"chart.type
&& (chart.type.includes('text'))
"
:label=
"$t('chart.dimension_font_size')"
class=
"form-item"
>
<el-form-item
v-show=
"chart.type"
:label=
"$t('chart.dimension_font_size')"
class=
"form-item"
>
<el-select
v-model=
"sizeForm.dimensionFontSize"
:placeholder=
"$t('chart.dimension_font_size')"
@
change=
"changeBarSizeCase"
>
<el-select
v-model=
"sizeForm.dimensionFontSize"
:placeholder=
"$t('chart.dimension_font_size')"
@
change=
"changeBarSizeCase"
>
<el-option
v-for=
"option in fontSize"
:key=
"option.value"
:label=
"option.name"
:value=
"option.value"
/>
<el-option
v-for=
"option in fontSize"
:key=
"option.value"
:label=
"option.name"
:value=
"option.value"
/>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item
v-show=
"chart.type
&& (chart.type.includes('text'))
"
:label=
"$t('chart.space_split')"
class=
"form-item"
>
<el-form-item
v-show=
"chart.type"
:label=
"$t('chart.space_split')"
class=
"form-item"
>
<el-input-number
v-model=
"sizeForm.spaceSplit"
size=
"mini"
@
change=
"changeBarSizeCase"
/>
<el-input-number
v-model=
"sizeForm.spaceSplit"
size=
"mini"
@
change=
"changeBarSizeCase"
/>
</el-form-item>
</el-form-item>
</el-form>
</el-form>
...
...
frontend/src/views/chart/view/ChartEdit.vue
浏览文件 @
e4771169
...
@@ -2882,11 +2882,11 @@ span {
...
@@ -2882,11 +2882,11 @@ span {
}
}
::v-deep
.el-slider__input
{
::v-deep
.el-slider__input
{
width
:
8
0px
!
important
;
width
:
10
0px
!
important
;
}
}
::v-deep
.el-input-number--mini
{
::v-deep
.el-input-number--mini
{
width
:
8
0px
!
important
;
width
:
10
0px
!
important
;
}
}
.no-senior
{
.no-senior
{
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论