Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
D
dataease
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
njgzx
dataease
Commits
fe0be547
提交
fe0be547
authored
5月 06, 2022
作者:
junjun
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
feat: 视图显示名额外显示原始名
上级
8c0098dd
隐藏空白字符变更
内嵌
并排
正在显示
9 个修改的文件
包含
50 行增加
和
10 行删除
+50
-10
en.js
frontend/src/lang/en.js
+3
-1
tw.js
frontend/src/lang/tw.js
+3
-1
zh.js
frontend/src/lang/zh.js
+3
-1
DimensionExtItem.vue
...src/views/chart/components/drag-item/DimensionExtItem.vue
+2
-1
DimensionItem.vue
...nd/src/views/chart/components/drag-item/DimensionItem.vue
+2
-1
QuotaExtItem.vue
...end/src/views/chart/components/drag-item/QuotaExtItem.vue
+2
-1
QuotaItem.vue
frontend/src/views/chart/components/drag-item/QuotaItem.vue
+2
-1
utils.js
frontend/src/views/chart/components/drag-item/utils.js
+19
-0
ChartEdit.vue
frontend/src/views/chart/view/ChartEdit.vue
+14
-3
没有找到文件。
frontend/src/lang/en.js
浏览文件 @
fe0be547
...
...
@@ -711,6 +711,7 @@ export default {
var_pop
:
'Variance'
,
quick_calc
:
'Fast calculation'
,
show_name_set
:
'Display name setting'
,
show_name
:
'Display name'
,
color
:
'Color'
,
color_case
:
'Color Scheme'
,
pls_slc_color_case
:
'Please choose a color scheme'
,
...
...
@@ -1093,7 +1094,8 @@ export default {
unit_million
:
'Million'
,
unit_hundred_million
:
'Hundred Million'
,
formatter_decimal_count_error
:
'Range 0-10'
,
gauge_threshold_compare_error
:
'Range must added'
gauge_threshold_compare_error
:
'Range must added'
,
tick_count
:
'Tick Split'
},
dataset
:
{
sheet_warn
:
'There are multiple sheet pages, and the first one is extracted by default'
,
...
...
frontend/src/lang/tw.js
浏览文件 @
fe0be547
...
...
@@ -713,6 +713,7 @@ export default {
var_pop
:
'方差'
,
quick_calc
:
'快速計算'
,
show_name_set
:
'顯示名設置'
,
show_name
:
'顯示名'
,
color
:
'顔色'
,
color_case
:
'配色方案'
,
pls_slc_color_case
:
'請選擇配色方案'
,
...
...
@@ -1093,7 +1094,8 @@ export default {
unit_million
:
'百萬'
,
unit_hundred_million
:
'億'
,
formatter_decimal_count_error
:
'請輸入0-10的整數'
,
gauge_threshold_compare_error
:
'阈值範圍需逐級遞增'
gauge_threshold_compare_error
:
'阈值範圍需逐級遞增'
,
tick_count
:
'刻度間隔數'
},
dataset
:
{
sheet_warn
:
'有多個 Sheet 頁,默認抽取第一個'
,
...
...
frontend/src/lang/zh.js
浏览文件 @
fe0be547
...
...
@@ -715,6 +715,7 @@ export default {
var_pop
:
'方差'
,
quick_calc
:
'快速计算'
,
show_name_set
:
'显示名设置'
,
show_name
:
'显示名'
,
color
:
'颜色'
,
color_case
:
'配色方案'
,
pls_slc_color_case
:
'请选择配色方案'
,
...
...
@@ -1095,7 +1096,8 @@ export default {
unit_million
:
'百万'
,
unit_hundred_million
:
'亿'
,
formatter_decimal_count_error
:
'请输入0-10的整数'
,
gauge_threshold_compare_error
:
'阈值范围需逐级递增'
gauge_threshold_compare_error
:
'阈值范围需逐级递增'
,
tick_count
:
'刻度间隔数'
},
dataset
:
{
sheet_warn
:
'有多个 Sheet 页,默认抽取第一个'
,
...
...
frontend/src/views/chart/components/drag-item/DimensionExtItem.vue
浏览文件 @
fe0be547
...
...
@@ -87,7 +87,7 @@
</
template
>
<
script
>
import
{
getItemType
}
from
'@/views/chart/components/drag-item/utils'
import
{
getItemType
,
getOriginFieldName
}
from
'@/views/chart/components/drag-item/utils'
import
FieldErrorTips
from
'@/views/chart/components/drag-item/components/FieldErrorTips'
import
bus
from
'@/utils/bus'
...
...
@@ -192,6 +192,7 @@ export default {
showRename
()
{
this
.
item
.
index
=
this
.
index
this
.
item
.
renameType
=
'dimensionExt'
this
.
item
.
dsFieldName
=
getOriginFieldName
(
this
.
dimensionData
,
this
.
quotaData
,
this
.
item
)
this
.
$emit
(
'onNameEdit'
,
this
.
item
)
},
removeItem
()
{
...
...
frontend/src/views/chart/components/drag-item/DimensionItem.vue
浏览文件 @
fe0be547
...
...
@@ -93,7 +93,7 @@
</
template
>
<
script
>
import
{
getItemType
}
from
'@/views/chart/components/drag-item/utils'
import
{
getItemType
,
getOriginFieldName
}
from
'@/views/chart/components/drag-item/utils'
import
FieldErrorTips
from
'@/views/chart/components/drag-item/components/FieldErrorTips'
import
bus
from
'@/utils/bus'
import
{
formatterItem
}
from
'@/views/chart/chart/formatter'
...
...
@@ -214,6 +214,7 @@ export default {
showRename
()
{
this
.
item
.
index
=
this
.
index
this
.
item
.
renameType
=
'dimension'
this
.
item
.
dsFieldName
=
getOriginFieldName
(
this
.
dimensionData
,
this
.
quotaData
,
this
.
item
)
this
.
$emit
(
'onNameEdit'
,
this
.
item
)
},
removeItem
()
{
...
...
frontend/src/views/chart/components/drag-item/QuotaExtItem.vue
浏览文件 @
fe0be547
...
...
@@ -116,7 +116,7 @@
<
script
>
import
{
compareItem
}
from
'@/views/chart/chart/compare'
import
{
getItemType
}
from
'@/views/chart/components/drag-item/utils'
import
{
getItemType
,
getOriginFieldName
}
from
'@/views/chart/components/drag-item/utils'
import
FieldErrorTips
from
'@/views/chart/components/drag-item/components/FieldErrorTips'
import
bus
from
'@/utils/bus'
import
{
formatterItem
}
from
'@/views/chart/chart/formatter'
...
...
@@ -285,6 +285,7 @@ export default {
showRename
()
{
this
.
item
.
index
=
this
.
index
this
.
item
.
renameType
=
'quotaExt'
this
.
item
.
dsFieldName
=
getOriginFieldName
(
this
.
dimensionData
,
this
.
quotaData
,
this
.
item
)
this
.
$emit
(
'onNameEdit'
,
this
.
item
)
},
removeItem
()
{
...
...
frontend/src/views/chart/components/drag-item/QuotaItem.vue
浏览文件 @
fe0be547
...
...
@@ -116,7 +116,7 @@
<
script
>
import
{
compareItem
}
from
'@/views/chart/chart/compare'
import
{
getItemType
}
from
'@/views/chart/components/drag-item/utils'
import
{
getItemType
,
getOriginFieldName
}
from
'@/views/chart/components/drag-item/utils'
import
FieldErrorTips
from
'@/views/chart/components/drag-item/components/FieldErrorTips'
import
bus
from
'@/utils/bus'
import
{
formatterItem
}
from
'@/views/chart/chart/formatter'
...
...
@@ -281,6 +281,7 @@ export default {
showRename
()
{
this
.
item
.
index
=
this
.
index
this
.
item
.
renameType
=
'quota'
this
.
item
.
dsFieldName
=
getOriginFieldName
(
this
.
dimensionData
,
this
.
quotaData
,
this
.
item
)
this
.
$emit
(
'onNameEdit'
,
this
.
item
)
},
removeItem
()
{
...
...
frontend/src/views/chart/components/drag-item/utils.js
浏览文件 @
fe0be547
...
...
@@ -36,3 +36,22 @@ export function getItemType(dimensionData, quotaData, item) {
return
'danger'
}
}
export
function
getOriginFieldName
(
dimensionList
,
quotaList
,
field
)
{
let
originName
=
''
for
(
let
i
=
0
;
i
<
dimensionList
.
length
;
i
++
)
{
const
item
=
dimensionList
[
i
]
if
(
item
.
id
===
field
.
id
)
{
originName
=
item
.
name
break
}
}
for
(
let
i
=
0
;
i
<
quotaList
.
length
;
i
++
)
{
const
item
=
quotaList
[
i
]
if
(
item
.
id
===
field
.
id
)
{
originName
=
item
.
name
break
}
}
return
originName
}
frontend/src/views/chart/view/ChartEdit.vue
浏览文件 @
fe0be547
...
...
@@ -1026,9 +1026,12 @@
<!--显示名修改-->
<el-dialog
v-dialogDrag
:title=
"$t('chart.show_name_set')"
:visible=
"renameItem"
:show-close=
"false"
width=
"30%"
>
<el-form
ref=
"itemForm"
:model=
"itemForm"
:rules=
"itemFormRules"
>
<el-form-item
:label=
"$t('commons.name')"
prop=
"name"
>
<el-input
v-model=
"itemForm.name"
size=
"mini"
clearable
/>
<el-form
ref=
"itemForm"
label-width=
"80px"
:model=
"itemForm"
:rules=
"itemFormRules"
>
<el-form-item
:label=
"$t('dataset.field_origin_name')"
class=
"form-item"
>
<span
style=
"padding: 0 16px;"
>
{{
itemForm
.
dsFieldName
}}
</span>
</el-form-item>
<el-form-item
:label=
"$t('chart.show_name')"
class=
"form-item"
>
<el-input
v-model=
"itemForm.name"
style=
"width: 200px"
size=
"mini"
clearable
/>
</el-form-item>
</el-form>
<div
slot=
"footer"
class=
"dialog-footer"
>
...
...
@@ -3038,4 +3041,12 @@ span {
height
:
100%
;
}
.form-item-slider
>>>
.el-form-item__label
{
font-size
:
12px
;
line-height
:
38px
;
}
.form-item
>>>
.el-form-item__label
{
font-size
:
12px
;
}
</
style
>
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论