diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index 9940582d9b..cce695692c 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -1656,7 +1656,11 @@ export default { sql_ds_union_error: 'Direct connect SQL dataset can not be union', api_data: 'API dataset', copy: 'Copy', - sync_log: 'Sync log' + sync_log: 'Sync log', + field_edit_name: 'Field Name', + input_edit_name: 'Input field name', + edit_search: 'Search by name', + na: 'None' }, driver: { driver: 'Driver', diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js index eeecbe3040..abd48e4d4a 100644 --- a/frontend/src/lang/tw.js +++ b/frontend/src/lang/tw.js @@ -1656,7 +1656,11 @@ export default { sql_ds_union_error: '直連模式下SQL數據集,不支持關聯', api_data: 'API 數據集', copy: '復製', - sync_log: '同步日誌' + sync_log: '同步日誌', + field_edit_name: '字段名稱', + input_edit_name: '請輸入字段名稱', + edit_search: '通過名稱搜索', + na: '暫無' }, driver: { driver: '驅動', diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index e1f5e5861a..62976c8d72 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -1655,7 +1655,11 @@ export default { sql_ds_union_error: '直连模式下SQL数据集,不支持关联', api_data: 'API 数据集', copy: '复制', - sync_log: '同步日志' + sync_log: '同步日志', + field_edit_name: '字段名称', + input_edit_name: '请输入字段名称', + edit_search: '通过名称搜索', + na: '暂无' }, driver: { driver: '驱动', diff --git a/frontend/src/views/chart/view/CalcChartFieldEdit.vue b/frontend/src/views/chart/view/CalcChartFieldEdit.vue index 4f7e3264f9..e13ebae46c 100644 --- a/frontend/src/views/chart/view/CalcChartFieldEdit.vue +++ b/frontend/src/views/chart/view/CalcChartFieldEdit.vue @@ -2,8 +2,8 @@ - {{ $t('dataset.field_name') }} - + {{ $t('dataset.field_edit_name') }} + @@ -94,13 +94,14 @@
{{ $t('chart.dimension') }} +
{{ $t('dataset.na') }}
{{ $t('chart.quota') }} +
{{ $t('dataset.na') }}
@@ -176,7 +180,7 @@ @@ -670,4 +674,11 @@ span { float: right; margin-top: 10px; } + +.class-na { + margin-top: 8px; + text-align: center; + font-size: 14px; + color: var(--deTextDisable); +} diff --git a/frontend/src/views/dataset/data/CalcFieldEdit.vue b/frontend/src/views/dataset/data/CalcFieldEdit.vue index b9073177fa..0d3881ed9a 100644 --- a/frontend/src/views/dataset/data/CalcFieldEdit.vue +++ b/frontend/src/views/dataset/data/CalcFieldEdit.vue @@ -1,11 +1,11 @@ @@ -326,16 +327,16 @@ export default { } }, watch: { - param: function () { + param: function() { this.initFunctions() }, field: { - handler: function () { + handler: function() { this.initField() }, deep: true }, - tableFields: function () { + tableFields: function() { this.dimensionData = JSON.parse( JSON.stringify(this.tableFields.dimensionList) ).filter((ele) => ele.extField === 0) @@ -343,7 +344,7 @@ export default { JSON.stringify(this.tableFields.quotaList) ).filter((ele) => ele.extField === 0) }, - searchField: function (val) { + searchField: function(val) { if (val && val !== '') { this.dimensionData = JSON.parse( JSON.stringify( @@ -374,7 +375,7 @@ export default { ).filter((ele) => ele.extField === 0) } }, - searchFunction: function (val) { + searchFunction: function(val) { if (val && val !== '') { this.functionData = JSON.parse( JSON.stringify( @@ -563,10 +564,10 @@ export default { box-sizing: border-box; margin-left: 12px; width: 214px; - overflow-y: auto; + overflow-y: hidden; } .field-height { - height: calc(50% - 25px); + height: calc(50% - 41px); margin-top: 4px; } .drag-list { @@ -673,7 +674,7 @@ export default { background: var(--ContentBG); } .function-height { - height: calc(100% - 50px); + height: calc(100% - 21px - 32px - 4px - 24px); overflow: auto; margin-top: 4px; } @@ -689,6 +690,13 @@ export default { margin: 6px 0 0 0; font-size: 10px; } + +.class-na { + margin-top: 8px; + text-align: center; + font-size: 14px; + color: var(--deTextDisable); +} \ No newline at end of file +