Merge pull request #4009 from dataease/pr@dev@fix_i18n

fix(i18n): i18n
This commit is contained in:
wisonic-s 2022-12-04 16:46:19 +08:00 committed by GitHub
commit ea1cd62ffd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
18 changed files with 113 additions and 106 deletions

View File

@ -304,7 +304,6 @@ export default {
setTimeout(() => {
_this.$store.commit('setCurComponent', { component: _this.config, index: _this.index })
}, 200)
},
showViewDetails(params) {
this.$refs.wrapperChild.openChartDetailsDialog(params)

View File

@ -716,12 +716,12 @@ export default {
.tab-head-left ::v-deep .el-tabs__nav-scroll {
display: flex;
justify-content: start;
justify-content: flex-start;
}
.tab-head-right ::v-deep .el-tabs__nav-scroll {
display: flex;
justify-content: end;
justify-content: flex-end;
}
.tab-head-center ::v-deep .el-tabs__nav-scroll {

View File

@ -1031,12 +1031,12 @@ export default {
line_symbol_size: 'Break point size',
line_type_solid: 'Solid line',
line_type_dashed: 'Dotted line',
line_symbol_circle: 'circular',
line_symbol_circle: 'Circular',
line_symbol_emptyCircle: 'Hollow circle',
line_symbol_rect: 'rectangle',
line_symbol_rect: 'Rectangle',
line_symbol_roundRect: 'Rounded rectangle',
line_symbol_triangle: 'triangle',
line_symbol_diamond: 'diamond',
line_symbol_triangle: 'Triangle',
line_symbol_diamond: 'Diamond',
line_symbol_pin: 'nail',
line_symbol_arrow: 'arrow',
line_symbol_none: 'None',
@ -1046,7 +1046,7 @@ export default {
funnel_width: 'width',
line_smooth: 'Smooth polyline',
title_style: 'Title Style',
text_fontsize: 'font size',
text_fontsize: 'Font size',
text_color: 'Font color',
text_h_position: 'Horizontal position',
text_v_position: 'Vertical position',
@ -1064,7 +1064,7 @@ export default {
shape: 'shape',
polygon: 'polygon',
circle: 'circular',
label: 'label',
label: 'Label',
label_position: 'Label location',
label_bg: 'Label BG',
label_shadow: 'Label Shadow',
@ -1475,10 +1475,23 @@ export default {
drill_dimension_tip: 'Only fields in the dataset can be drilled',
table_scroll_tip: 'The detail table is only effective when the pagination mode is "Drop-down".',
table_threshold_tip: 'Tip: Do not select fields repeatedly. If the same field is configured repeatedly, only the last field will take effect.',
table_column_width_tip: 'Column width do not always work. The priority of the container width is higher than the column width, which means if the result of dividing the width of the table container by the number of columns is greater than specified column width, the former will take effect.',
reference_field_tip: 'Reference fields start with "[" and end with "]". Do not modify the reference content, otherwise the reference will fail. If you enter content in the same format as the reference field, it will be treated as a reference field.',
table_column_width_tip: `Column width do not always work.<br/>
The priority of the container width is higher than the column width, <br/>
which means if the result of dividing the width of the table container by the number of columns is greater than specified column width, <br/>
the former will take effect.`,
reference_field_tip: `Reference fields start with "[" and end with "]". <br/>
Do not modify the reference content, otherwise the reference will fail.<br/>
If you enter content in the same format as the reference field, it will be treated as a reference field.`,
scatter_tip: 'When this indicator is in effect, the bubble size attribute in the style size will be invalid',
place_name_mapping: 'Place name mapping'
place_name_mapping: 'Place name mapping',
axis_tip: 'The minimum value, maximum value, and interval are all numeric types; it will be regarded as automatic if left blank.<br/>Please make sure that the filled values can be calculated correctly, otherwise the axis values will not be displayed normally.',
format_tip: `The template variables include {a}, {b}, {c}, {d}, which represent series name, data name, data value, etc. respectively.<br>
When the trigger position is 'coordinate axis', there will be multiple series of data. At this time, the index of the series can be represented by {a0}, {a1}, {a2} followed by an index.<br>
{a}, {b}, {c}, {d} have different meanings under different graph types. Among them, variables {a}, {b}, {c}, {d} represent data meanings in different chart types:<br><br>
Line (area) chart, Column (Bar) chart, Dashboard: {a} is series name, {b} is category value, {c} is value<br>
Pie chart, Funnel chart: {a} is series name, {b} is data item name, {c} is value, {d} is percentage<br>
Map : {a} (series name), {b} is area name, {c} is merged values, {d} is none<br>
Scatter (Bubble) plot: {a} is series name, {b} is data name, {c} is numeric array, {d} is none`
},
dataset: {
spend_time: 'Spend',
@ -2062,6 +2075,7 @@ export default {
delete_success: 'Delete Success',
confirm: 'Confirm',
cancel: 'Cancel',
save: 'Save',
search: 'Search',
back: 'Back',
view: 'Chart',

View File

@ -1474,10 +1474,18 @@ export default {
drill_dimension_tip: '鑽取字段僅支持數據集中的字段',
table_scroll_tip: '明細表僅在分頁模式為"下拉"時生效。',
table_threshold_tip: '提示:請勿重複選擇字段,若同一字段重複配置,則只有最後的字段配置生效。',
table_column_width_tip: '列寬並非任何時候都能生效。容器寬度優先級高於列寬。即(表格容器寬度 / 列數 > 指定列寬),則列寬優先取(容器寬度 / 列數)',
reference_field_tip: '引用字段以 "[" 開始,"]" 結束。請勿修改引用內容,否則將引用失敗。若輸入與引用字段相同格式的內容,將被當做引用字段處理。',
table_column_width_tip: '列寬並非任何時候都能生效。<br/>容器寬度優先級高於列寬。即(表格容器寬度 / 列數 > 指定列寬),則列寬優先取(容器寬度 / 列數)',
reference_field_tip: '引用字段以 "[" 開始,"]" 結束。請<br/>勿修改引用內容,否則將引用失敗。<br/>若輸入與引用字段相同格式的內容,將被當做引用字段處理。',
scatter_tip: '該指標生效時,樣式大小中的氣泡大小屬性將失效',
place_name_mapping: '地名映射'
place_name_mapping: '地名映射',
axis_tip: '最小值、最大值、間隔均為數值類型;若不填,則該項視為自動。<br/>請確保填寫數值能正確計算,否則將無法正常顯示值軸',
format_tip: `模板變量有 {a}, {b}{c}{d},分別表示系列名,數據名,數據值等。<br>
觸發位置 '坐標軸' 的時候會有多個系列的數據此時可以通過 {a0}, {a1}, {a2} 這種後面加索引的方式表示系列的索引<br>
不同圖表類型下的 {a}{b}{c}{d} 含義不一樣 其中變量{a}, {b}, {c}, {d}在不同圖表類型下代表數據含義為<br><br>
折線區域柱狀條形儀表盤 : {a}系列名稱{b}類目值{c}數值<br>
餅圖漏鬥圖: {a}系列名稱{b}數據項名稱{c}數值, {d}百分比<br>
地圖 : {a}系列名稱{b}區域名稱{c}合並數值, {d}<br>
散點圖氣泡 : {a}系列名稱{b}數據名稱{c}數值數組, {d}`
},
dataset: {
spend_time: '耗時',

View File

@ -1473,10 +1473,18 @@ export default {
drill_dimension_tip: '钻取字段仅支持数据集中的字段',
table_scroll_tip: '明细表仅在分页模式为"下拉"时生效。',
table_threshold_tip: '提示:请勿重复选择字段,若同一字段重复配置,则只有最后的字段配置生效',
table_column_width_tip: '列宽并非任何时候都能生效。容器宽度优先级高于列宽,即(表格容器宽度 / 列数 > 指定列宽),则列宽优先取(容器宽度 / 列数)。',
reference_field_tip: '引用字段以 "[" 开始, "]" 结束。请勿修改引用内容,否则将引用失败。若输入与引用字段相同格式的内容,将被当作引用字段处理',
table_column_width_tip: '列宽并非任何时候都能生效。<br/>容器宽度优先级高于列宽,即(表格容器宽度 / 列数 > 指定列宽),则列宽优先取(容器宽度 / 列数)。',
reference_field_tip: '引用字段以 "[" 开始, "]" 结束。<br/>请勿修改引用内容,否则将引用失败。<br/>若输入与引用字段相同格式的内容,将被当作引用字段处理',
scatter_tip: '该指标生效时,样式大小中的气泡大小属性将失效',
place_name_mapping: '地名映射'
place_name_mapping: '地名映射',
axis_tip: '最小值、最大值、间隔均为数值类型;若不填,则该项视为自动。<br/>请确保填写数值能正确计算,否则将无法正常显示轴值。',
format_tip: `模板变量有 {a}, {b}{c}{d},分别表示系列名,数据名,数据值等。<br>
触发位置 '坐标轴' 的时候会有多个系列的数据此时可以通过 {a0}, {a1}, {a2} 这种后面加索引的方式表示系列的索引<br>
不同图表类型下的 {a}{b}{c}{d} 含义不一样 其中变量{a}, {b}, {c}, {d}在不同图表类型下代表数据含义为<br><br>
折线区域柱状条形仪表盘 : {a}系列名称{b}类目值{c}数值<br>
饼图漏斗图: {a}系列名称{b}数据项名称{c}数值, {d}百分比<br>
地图 : {a}系列名称{b}区域名称{c}合并数值, {d}<br>
散点图气泡 : {a}系列名称{b}数据名称{c}数值数组, {d}`
},
dataset: {
spend_time: '耗时',

View File

@ -1704,7 +1704,3 @@ div:focus {
display: inline-block;
}
}
.popper-tip{
width: 20%;
}

View File

@ -84,11 +84,10 @@
effect="dark"
placement="bottom"
>
<div slot="content">
最小值最大值间隔均为数值类型若不填则该项视为自动
<br>
请确保填写数值能正确计算否则将无法正常显示轴值
</div>
<div
slot="content"
v-html="$t('chart.axis_tip')"
/>
<i
class="el-icon-info"
style="cursor: pointer;"

View File

@ -84,11 +84,10 @@
effect="dark"
placement="bottom"
>
<div slot="content">
最小值最大值间隔均为数值类型若不填则该项视为自动
<br>
请确保填写数值能正确计算否则将无法正常显示轴值
</div>
<div
slot="content"
v-html="$t('chart.axis_tip')"
/>
<i
class="el-icon-info"
style="cursor: pointer;"

View File

@ -81,11 +81,10 @@
effect="dark"
placement="bottom"
>
<div slot="content">
最小值最大值间隔均为数值类型若不填则该项视为自动
<br>
请确保填写数值能正确计算否则将无法正常显示轴值
</div>
<div
slot="content"
v-html="$t('chart.axis_tip')"
/>
<i
class="el-icon-info"
style="cursor: pointer;"

View File

@ -84,11 +84,10 @@
effect="dark"
placement="bottom"
>
<div slot="content">
最小值最大值间隔均为数值类型若不填则该项视为自动
<br>
请确保填写数值能正确计算否则将无法正常显示轴值
</div>
<div
slot="content"
v-html="$t('chart.axis_tip')"
/>
<i
class="el-icon-info"
style="cursor: pointer;"

View File

@ -84,11 +84,10 @@
effect="dark"
placement="bottom"
>
<div slot="content">
最小值最大值间隔均为数值类型若不填则该项视为自动
<br>
请确保填写数值能正确计算否则将无法正常显示轴值
</div>
<div
slot="content"
v-html="$t('chart.axis_tip')"
/>
<i
class="el-icon-info"
style="cursor: pointer;"

View File

@ -84,11 +84,10 @@
effect="dark"
placement="bottom"
>
<div slot="content">
最小值最大值间隔均为数值类型若不填则该项视为自动
<br>
请确保填写数值能正确计算否则将无法正常显示轴值
</div>
<div
slot="content"
v-html="$t('chart.axis_tip')"
/>
<i
class="el-icon-info"
style="cursor: pointer;"

View File

@ -330,11 +330,11 @@
class="item"
effect="dark"
placement="bottom"
popper-class="popper-tip"
>
<div slot="content">
{{ $t('chart.table_column_width_tip') }}
</div>
<div
slot="content"
v-html="$t('chart.table_column_width_tip')"
/>
<i
class="el-icon-info"
style="cursor: pointer;color: #606266;margin-left: 4px;"

View File

@ -87,21 +87,10 @@
effect="dark"
placement="bottom"
>
<div slot="content">
模板变量有 {a}, {b}{c}{d}分别表示系列名数据名数据值等
<br>
触发位置 '坐标轴' 的时候会有多个系列的数据此时可以通过 {a0}, {a1}, {a2} 这种后面加索引的方式表示系列的索引
<br>
不同图表类型下的 {a}{b}{c}{d} 含义不一样 其中变量{a}, {b}, {c}, {d}在不同图表类型下代表数据含义为
<br><br>
折线区域柱状条形仪表盘 : {a}系列名称{b}类目值{c}数值
<br>
饼图漏斗图: {a}系列名称{b}数据项名称{c}数值, {d}百分比
<br>
地图 : {a}系列名称{b}区域名称{c}合并数值, {d}
<br>
散点图气泡 : {a}系列名称{b}数据名称{c}数值数组, {d}
</div>
<div
slot="content"
v-html="$t('chart.format_tip')"
/>
<i
class="el-icon-info"
style="cursor: pointer;"

View File

@ -859,7 +859,7 @@ export default {
if (item.dateFormatType !== 'custom') {
item.dateFormat = item.dateFormatType
}
}else {
} else {
item.dateFormatType = ''
item.dateFormat = ''
}

View File

@ -165,12 +165,12 @@
v-show=" show &&showIndex===1"
:canvas-id="canvasId"
/>
<subject-setting v-show=" show &&showIndex===2"/>
<assist-component v-show=" show &&showIndex===3"/>
<subject-setting v-show=" show &&showIndex===2" />
<assist-component v-show=" show &&showIndex===3" />
</div>
</el-drawer>
<!--PC端画布区域-->
<canvas-opt-bar v-if="!previewVisible&&!mobileLayoutStatus"/>
<canvas-opt-bar v-if="!previewVisible&&!mobileLayoutStatus" />
<de-canvas
v-if="!previewVisible&&!mobileLayoutStatus"
ref="canvasMainRef"
@ -196,7 +196,7 @@
:style="customCanvasMobileStyle"
class="this_mobile_canvas"
>
<el-row class="this_mobile_canvas_top"/>
<el-row class="this_mobile_canvas_top" />
<el-row class="this_mobile_canvas_inner_top">
{{ panelInfo.name }}
</el-row>
@ -205,7 +205,7 @@
class="this_mobile_canvas_main"
:style="mobileCanvasStyle"
>
<canvas-opt-bar v-if="!previewVisible&&mobileLayoutStatus"/>
<canvas-opt-bar v-if="!previewVisible&&mobileLayoutStatus" />
<de-canvas
v-if="!previewVisible&&mobileLayoutStatus"
ref="canvasMainRef"
@ -243,14 +243,14 @@
/>
</el-col>
</el-row>
<el-row class="this_mobile_canvas_bottom"/>
<el-row class="this_mobile_canvas_bottom" />
</div>
</el-col>
<el-col
:span="16"
class="this_mobile_canvas_cell this_mobile_canvas_wait_cell"
>
<component-wait/>
<component-wait />
</el-col>
</el-row>
</de-main-container>
@ -268,7 +268,7 @@
/>
</div>
<div v-if="showBatchViewToolsAside">
<chart-style-batch-set/>
<chart-style-batch-set />
</div>
<div v-if="!showViewToolsAside&&!showBatchViewToolsAside">
<el-row style="height: 40px">
@ -287,13 +287,14 @@
>{{ $t('panel.position_adjust') }}</span>
</el-row>
<el-row>
<position-adjust v-if="curComponent&&!curComponent.auxiliaryMatrix"/>
<position-adjust v-if="curComponent&&!curComponent.auxiliaryMatrix" />
<div
v-else
class="view-selected-message-class"
>
<span style="font-size: 14px;margin-left: 10px;font-weight: bold;line-height: 20px"
>{{ $t('panel.select_view') }}</span>
<span style="font-size: 14px;margin-left: 10px;font-weight: bold;line-height: 20px">
{{ $t('panel.select_view') }}
</span>
</div>
</el-row>
</div>
@ -453,8 +454,9 @@
/>
</el-col>
<el-col :span="21">
<span style="font-size: 13px;margin-left: 10px;font-weight: bold;line-height: 20px"
>{{ $t('panel.panel_cache_use_tips') }}</span>
<span style="font-size: 13px;margin-left: 10px;font-weight: bold;line-height: 20px">
{{ $t('panel.panel_cache_use_tips') }}
</span>
</el-col>
</el-row>
<div
@ -967,12 +969,11 @@ export default {
showPanel(type) {
if (this.showIndex === -1 || this.showIndex === type) {
this.$nextTick(() => {
if (this.show) {
this.showIndex === -1
}
this.show = !this.show
if (this.show) {
this.showIndex = -1
}
)
this.show = !this.show
})
}
this.showIndex = type
},

View File

@ -133,21 +133,19 @@ export default {
_this.toExport = true
setTimeout(() => {
html2canvas(document.getElementById('exportPdf')).then(function(canvas) {
_this.exportLoading = false
const contentWidth = canvas.width / 4
const contentHeight = canvas.height / 4
const pageData = canvas.toDataURL('image/jpeg', 1.0)
const lp = contentWidth > contentHeight ? 'l' : 'p'
const PDF = new JsPDF(lp, 'pt', [contentWidth, contentHeight])
PDF.addImage(pageData, 'JPEG', 0, 0, contentWidth, contentHeight)
PDF.save(_this.panelName + '.pdf')
_this.$emit('closePreExport')
}
)
_this.exportLoading = false
const contentWidth = canvas.width / 4
const contentHeight = canvas.height / 4
const pageData = canvas.toDataURL('image/jpeg', 1.0)
const lp = contentWidth > contentHeight ? 'l' : 'p'
const PDF = new JsPDF(lp, 'pt', [contentWidth, contentHeight])
PDF.addImage(pageData, 'JPEG', 0, 0, contentWidth, contentHeight)
PDF.save(_this.panelName + '.pdf')
_this.$emit('closePreExport')
})
}, 1500)
}, 500)
}
}
}
</script>

View File

@ -282,11 +282,11 @@
class="item"
effect="dark"
placement="bottom"
popper-class="popper-tip"
>
<div slot="content">
{{ $t('chart.reference_field_tip') }}
</div>
<div
slot="content"
v-html="$t('chart.reference_field_tip')"
/>
<i
class="el-icon-info"
style="cursor: pointer;"