From 39e226c4e413215304347dba7d28a8dc22496c85 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Tue, 29 Nov 2022 21:15:04 +0800 Subject: [PATCH 1/8] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BB=AA=E8=A1=A8=E6=9D=BF=E4=B8=AD=E5=85=B6?= =?UTF-8?q?=E4=BB=96=E7=BB=84=E4=BB=B6=E6=8B=96=E5=85=A5Tab=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E9=A1=B5=E9=9D=A2=E4=B8=8D=E5=8F=AF=E7=94=A8=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/widget/deWidget/DeTabs.vue | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/frontend/src/components/widget/deWidget/DeTabs.vue b/frontend/src/components/widget/deWidget/DeTabs.vue index 511b907769..2f28c3a9f1 100644 --- a/frontend/src/components/widget/deWidget/DeTabs.vue +++ b/frontend/src/components/widget/deWidget/DeTabs.vue @@ -202,9 +202,7 @@ Date: Tue, 29 Nov 2022 22:18:44 +0800 Subject: [PATCH 2/8] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8DTab=E7=BB=84=E4=BB=B6=E5=8A=A0=E8=BF=87?= =?UTF-8?q?=E6=BB=A4=E5=99=A8=E8=BD=AE=E6=92=AD=E8=A7=86=E5=9B=BE=E5=8F=AF?= =?UTF-8?q?=E8=83=BD=E4=B8=8D=E6=98=BE=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/widget/deWidget/DeTabs.vue | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/frontend/src/components/widget/deWidget/DeTabs.vue b/frontend/src/components/widget/deWidget/DeTabs.vue index 2f28c3a9f1..c4c2ad52a3 100644 --- a/frontend/src/components/widget/deWidget/DeTabs.vue +++ b/frontend/src/components/widget/deWidget/DeTabs.vue @@ -464,15 +464,20 @@ export default { } }, initCarousel() { - this.timer && clearInterval(this.timer) - if (this.element.style.carouselEnable) { - const switchTime = (this.element.style.switchTime || 5) * 1000 + const _this = this + _this.timer && clearInterval(_this.timer) + if (_this.element.style.carouselEnable) { + const switchTime = (_this.element.style.switchTime || 5) * 1000 let switchCount = 1 // 轮播定时器 - this.timer = setInterval(() => { - const nowIndex = switchCount % this.element.options.tabList.length + _this.timer = setInterval(() => { + const nowIndex = switchCount % _this.element.options.tabList.length switchCount++ - this.activeTabName = this.element.options.tabList[nowIndex].name + _this.activeTabName = _this.element.options.tabList[nowIndex].name + const targetRef = _this.$refs['canvasTabRef-' + _this.activeTabName] + if (targetRef) { + targetRef[0].restore() + } }, switchTime) } }, From 6ccaf22ee5f7ebb414201e9cf383c0ee72d48c53 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Wed, 30 Nov 2022 10:29:48 +0800 Subject: [PATCH 3/8] =?UTF-8?q?fix(=E5=9C=B0=E5=9B=BE):=20=E5=A4=9A?= =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E5=9C=BA=E6=99=AF=E6=B8=85=E9=99=A4=E8=81=94?= =?UTF-8?q?=E5=8A=A8=E5=90=8E=E6=8C=87=E6=A0=87=E9=80=89=E9=A1=B9=E6=81=A2?= =?UTF-8?q?=E5=A4=8D=E5=88=B0=E7=AC=AC=E4=B8=80=E4=B8=AA=E6=8C=87=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../canvas/components/editor/ComponentWrapper.vue | 8 ++++++-- .../components/canvas/components/editor/EditBar.vue | 11 ++++++++++- frontend/src/components/deDrag/index.vue | 10 +++++++--- .../views/chart/components/map/MapLayerController.vue | 11 ++++++++++- 4 files changed, 33 insertions(+), 7 deletions(-) diff --git a/frontend/src/components/canvas/components/editor/ComponentWrapper.vue b/frontend/src/components/canvas/components/editor/ComponentWrapper.vue index 18966e10ae..4cd9f3d347 100644 --- a/frontend/src/components/canvas/components/editor/ComponentWrapper.vue +++ b/frontend/src/components/canvas/components/editor/ComponentWrapper.vue @@ -13,6 +13,7 @@ :canvas-id="canvasId" :chart="chart" :show-position="showPosition" + :series-id-map="seriesIdMap" @showViewDetails="showViewDetails" />
- +
@@ -239,6 +240,14 @@ export default { chart: { type: Object, default: null + }, + seriesIdMap: { + type: Object, + default: () => { + return { + id: '' + } + } } }, data() { diff --git a/frontend/src/components/deDrag/index.vue b/frontend/src/components/deDrag/index.vue index 1fc60a50ab..3ec4ea4362 100644 --- a/frontend/src/components/deDrag/index.vue +++ b/frontend/src/components/deDrag/index.vue @@ -40,6 +40,7 @@ :canvas-id="canvasId" :element="element" :chart="chart" + :series-id-map="seriesIdMap" @showViewDetails="showViewDetails" @amRemoveItem="amRemoveItem" @amAddItem="amAddItem" @@ -65,7 +66,7 @@ @mousedown.stop.prevent="handleDown(handlei, $event)" @touchstart.stop.prevent="handleTouchDown(handlei, $event)" > - +
- +
@@ -431,7 +432,10 @@ export default { // 是否移动 （如果没有移动 不需要记录snapshot） hasMove: false, // 上次的鼠标指针纵向位置，用来判断指针是上移还是下移 - latestMoveY: 0 + latestMoveY: 0, + seriesIdMap: { + id: '' + } } }, computed: { diff --git a/frontend/src/views/chart/components/map/MapLayerController.vue b/frontend/src/views/chart/components/map/MapLayerController.vue index 57b68c7963..34cb830212 100644 --- a/frontend/src/views/chart/components/map/MapLayerController.vue +++ b/frontend/src/views/chart/components/map/MapLayerController.vue @@ -42,6 +42,14 @@ export default { chart: { type: Object, required: true + }, + seriesIdMap: { + type: Object, + default: () => { + return { + id: '' + } + } } }, data() { @@ -79,11 +87,12 @@ export default { id: this.chart.id, seriesId: this.currentSeriesId } + this.seriesIdMap.id = this.currentSeriesId bus.$emit('change-series-id', param) }, init() { - this.currentSeriesId = this.customAttr.currentSeriesId + this.currentSeriesId = this.seriesIdMap?.id || this.customAttr.currentSeriesId } } } From 0bc85a4e4283ff49ab436520993300a4bb659a31 Mon Sep 17 00:00:00 2001 From: junjun Date: Wed, 30 Nov 2022 10:34:59 +0800 Subject: [PATCH 4/8] =?UTF-8?q?fix(i18n):=20=E5=AE=8C=E5=96=84=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=BA=90=E5=9B=BD=E9=99=85=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/lang/en.js | 2 +- frontend/src/views/system/datasource/DsForm.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index 1ab2176296..8ff6d4a01d 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -1758,7 +1758,7 @@ export default { http_port: 'Http Port', port: 'Port', datasource_url: 'URL address', - please_input_datasource_url: 'Please enter Elasticsearch 地址，e.g: http://es_host:es_port', + please_input_datasource_url: 'Please enter Elasticsearch URL address，e.g: http://es_host:es_port', please_input_data_base: 'Please enter the database name', please_select_oracle_type: 'Select connection type', please_input_user_name: 'Please enter user name', diff --git a/frontend/src/views/system/datasource/DsForm.vue b/frontend/src/views/system/datasource/DsForm.vue index 599cfb23ff..65ad1f3738 100644 --- a/frontend/src/views/system/datasource/DsForm.vue +++ b/frontend/src/views/system/datasource/DsForm.vue @@ -155,7 +155,7 @@ Date: Wed, 30 Nov 2022 10:49:21 +0800 Subject: [PATCH 5/8] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?= =?UTF-8?q?=E9=87=8D=E5=91=BD=E5=90=8D=E6=8A=A5=E9=94=99=E8=AF=AF=E6=9D=83?= =?UTF-8?q?=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/panel/list/PanelList.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/frontend/src/views/panel/list/PanelList.vue b/frontend/src/views/panel/list/PanelList.vue index b3f5812ab6..43c765439d 100644 --- a/frontend/src/views/panel/list/PanelList.vue +++ b/frontend/src/views/panel/list/PanelList.vue @@ -729,7 +729,6 @@ export default { optType: 'rename', titlePre: this.$t('commons.edit'), panelInfo: { - pid: param.data.pid, id: param.data.id, name: param.data.name, nodeType: param.type From 367b16df5210a3163985e96cf7613fe30f3794ca Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Wed, 30 Nov 2022 11:35:40 +0800 Subject: [PATCH 6/8] =?UTF-8?q?style(tabs):=20tabs=E9=80=89=E9=A1=B9?= =?UTF-8?q?=E5=8D=A1=E8=BF=87=E5=A4=9A=E6=97=B6,=E5=B7=A6=E5=8F=B3?= =?UTF-8?q?=E6=BB=9A=E5=8A=A8=E7=9A=84=E7=AE=AD=E5=A4=B4=E6=B6=88=E5=A4=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/widget/deWidget/DeTabs.vue | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/frontend/src/components/widget/deWidget/DeTabs.vue b/frontend/src/components/widget/deWidget/DeTabs.vue index c4c2ad52a3..2f8fc685c5 100644 --- a/frontend/src/components/widget/deWidget/DeTabs.vue +++ b/frontend/src/components/widget/deWidget/DeTabs.vue @@ -708,21 +708,27 @@ export default { } ::v-deep .el-tabs__nav { - width: 100%; + display: flex; +} +::v-deep .el-tabs__nav-prev { + line-height: 25px; +} +::v-deep .el-tabs__nav-next { + line-height: 25px; } .tab-head-left ::v-deep .el-tabs__nav { - width: 100%; + display: flex; text-align: left; } .tab-head-right ::v-deep .el-tabs__nav { - width: 100%; + display: flex; text-align: right; } .tab-head-center ::v-deep .el-tabs__nav { - width: 100%; + display: flex; text-align: center; } From e5543e6b0440c58ba59a1be66a107db206e72a6f Mon Sep 17 00:00:00 2001 From: junjun Date: Wed, 30 Nov 2022 12:22:06 +0800 Subject: [PATCH 7/8] =?UTF-8?q?fix(i18n):=20=E5=AE=8C=E5=96=84=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E9=9B=86=E5=9B=BD=E9=99=85=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/lang/en.js | 18 ++++++++++++++++-- frontend/src/lang/tw.js | 17 +++++++++++++++-- frontend/src/lang/zh.js | 17 +++++++++++++++-- .../views/chart/view/CalcChartFieldEdit.vue | 16 ++++++++-------- frontend/src/views/dataset/Form.vue | 2 +- .../src/views/dataset/data/CalcFieldEdit.vue | 16 ++++++++-------- .../dataset/data/components/filterFiled.vue | 4 ++-- 7 files changed, 65 insertions(+), 25 deletions(-) diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index 8ff6d4a01d..191294464c 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -531,7 +531,10 @@ export default { set_saved_successfully: 'Data set saved successfully', to_start_using: 'Browse the contents of your database, tables and columns. Choose a database to get started.', to_run_query: 'Click to run query', - the_running_results: 'You can view the running results' + the_running_results: 'You can view the running results', + item: 'item', + logic_filter: 'Condition Filter', + enum_filter: 'Enum Filter' }, detabs: { custom_sort: 'Custom Sort', @@ -655,6 +658,7 @@ export default { input_password: 'Please input a password', input_phone: 'Please enter the phone number', input_roles: 'Please select role', + select_users: 'Please select user', user_name_pattern_error: 'IDs can only contain alphanumeric and ._- and start with a letter!', special_characters_are_not_supported: 'Special characters are not supported', mobile_number_format_is_incorrect: 'Incorrect format of mobile phone number', @@ -1722,7 +1726,17 @@ export default { export_dataset: 'Export', filename: 'Filename', export_filter: 'Filter', - pls_input_filename: 'Please input filename' + pls_input_filename: 'Please input filename', + calc_tips: { + tip1: 'The expression syntax should follow the database syntax corresponding to the data source.', + tip2: 'Aggregation operation is not supported in the dataset.', + tip3: 'The reference field starts with "[" and ends with "]"', + tip4: 'Do not modify the reference content, otherwise the reference will fail', + tip5: 'If you enter content in the same format as the reference field, it will be treated as a reference field', + tip6: 'Use the functions supported by the database type corresponding to the dataset. The syntax is the same as that of the corresponding database', + tip7: 'For example, date format: MySQL uses DATE_ FORMAT(date,format)； Oracle uses TO_ DATE(X,[,fmt])', + tip8: 'Non direct connection mode data set, use Doris database functions, refer to Doris official website' + } }, driver: { driver: 'Driver', diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js index e4ce6b8e57..a0d1acec93 100644 --- a/frontend/src/lang/tw.js +++ b/frontend/src/lang/tw.js @@ -531,7 +531,10 @@ export default { set_saved_successfully: '數據集保存成功', to_start_using: '瀏覽您的數據庫，表和列的內容。 選擇一個數據庫即可開始使用。', to_run_query: '點擊運行査詢', - the_running_results: '即可查看運行結果' + the_running_results: '即可查看運行結果', + item: '项', + logic_filter: '条件筛选', + enum_filter: '枚举筛选' }, detabs: { custom_sort: '自定義排序', @@ -1722,7 +1725,17 @@ export default { export_dataset: '數據集導出', filename: '文件名稱', export_filter: '篩選條件', - pls_input_filename: '請輸入文件名稱' + pls_input_filename: '請輸入文件名稱', + calc_tips: { + tip1: '表达式语法请遵循该数据源对应的数据库语法。', + tip2: '数据集中不支持聚合运算。', + tip3: '引用字段以 "[" 开始， "]" 结束', + tip4: '请勿修改引用内容，否则将引用失败', + tip5: '若输入与引用字段相同格式的内容，将被当作引用字段处理', + tip6: '使用数据集对应数据库类型所支持的函数，语法同对应数据库', + tip7: '如日期格式化：MySQL使用DATE_FORMAT(date,format)；Oracle使用TO_DATE(X,[,fmt])', + tip8: '非直连模式数据集，使用Doris数据库函数，可参考Doris官网' + } }, driver: { driver: '驅動', diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index 5ed1e27d35..13cb07b53a 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -530,7 +530,10 @@ export default { set_saved_successfully: '数据集保存成功', to_start_using: '浏览您的数据库，表和列的内容。 选择一个数据库即可开始使用。', to_run_query: '点击运行查询', - the_running_results: '即可查看运行结果' + the_running_results: '即可查看运行结果', + item: '项', + logic_filter: '条件筛选', + enum_filter: '枚举筛选' }, detabs: { custom_sort: '自定义排序', @@ -1721,7 +1724,17 @@ export default { export_dataset: '数据集导出', filename: '文件名称', export_filter: '筛选条件', - pls_input_filename: '请输入文件名称' + pls_input_filename: '请输入文件名称', + calc_tips: { + tip1: '表达式语法请遵循该数据源对应的数据库语法。', + tip2: '数据集中不支持聚合运算。', + tip3: '引用字段以 "[" 开始， "]" 结束', + tip4: '请勿修改引用内容，否则将引用失败', + tip5: '若输入与引用字段相同格式的内容，将被当作引用字段处理', + tip6: '使用数据集对应数据库类型所支持的函数，语法同对应数据库', + tip7: '如日期格式化：MySQL使用DATE_FORMAT(date,format)；Oracle使用TO_DATE(X,[,fmt])', + tip8: '非直连模式数据集，使用Doris数据库函数，可参考Doris官网' + } }, driver: { driver: '驱动', diff --git a/frontend/src/views/chart/view/CalcChartFieldEdit.vue b/frontend/src/views/chart/view/CalcChartFieldEdit.vue index 8e4320845a..4ed42a2e45 100644 --- a/frontend/src/views/chart/view/CalcChartFieldEdit.vue +++ b/frontend/src/views/chart/view/CalcChartFieldEdit.vue @@ -32,9 +32,9 @@ placement="bottom" >
- 表达式语法请遵循该数据源对应的数据库语法。 + {{ $t('dataset.calc_tips.tip1') }}
- 字段类型将使用原始类型，如有需要，请在表达式中自行转换。 + {{ $t('dataset.calc_tips.tip2') }}
- 引用字段以 "[" 开始， "]" 结束 + {{ $t('dataset.calc_tips.tip3') }}
- 请勿修改引用内容，否则将引用失败 + {{ $t('dataset.calc_tips.tip4') }}
- 若输入与引用字段相同格式的内容，将被当作引用字段处理 + {{ $t('dataset.calc_tips.tip5') }}
- 使用数据集对应数据库类型所支持的函数，语法同对应数据库 + {{ $t('dataset.calc_tips.tip6') }}
- 如日期格式化：MySQL使用DATE_FORMAT(date,format)；Oracle使用TO_DATE(X,[,fmt]) + {{ $t('dataset.calc_tips.tip7') }}
- 非直连模式数据集，使用Doris数据库函数，可参考Doris官网 https://doris.apache.org/zh-CN/ + {{ $t('dataset.calc_tips.tip8') }} https://doris.apache.org/zh-CN/
{{ $t('deDataset.selected') }} {{ tableNum }} - {{ ['excel'].includes(datasetType) ? $t('deDataset.table') : '项' }} + {{ ['excel'].includes(datasetType) ? $t('deDataset.table') : $t('deDataset.item') }}
- 表达式语法请遵循该数据源对应的数据库语法。 + {{ $t('dataset.calc_tips.tip1') }}
- 数据集中不支持聚合运算。 + {{ $t('dataset.calc_tips.tip2') }}
- 引用字段以 "[" 开始， "]" 结束 + {{ $t('dataset.calc_tips.tip3') }}
- 请勿修改引用内容，否则将引用失败 + {{ $t('dataset.calc_tips.tip4') }}
- 若输入与引用字段相同格式的内容，将被当作引用字段处理 + {{ $t('dataset.calc_tips.tip5') }}
- 使用数据集对应数据库类型所支持的函数，语法同对应数据库 + {{ $t('dataset.calc_tips.tip6') }}
- 如日期格式化：MySQL使用DATE_FORMAT(date,format)；Oracle使用TO_DATE(X,[,fmt]) + {{ $t('dataset.calc_tips.tip7') }}
- 非直连模式数据集，使用Doris数据库函数，可参考Doris官网 + {{ $t('dataset.calc_tips.tip8') }} https://doris.apache.org/zh-CN/
Date: Wed, 30 Nov 2022 13:41:00 +0800 Subject: [PATCH 8/8] =?UTF-8?q?fix(i18n):=20=E5=AE=8C=E5=96=84=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E9=9B=86=E5=9B=BD=E9=99=85=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/lang/tw.js | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js index a0d1acec93..2a4d8aaeaf 100644 --- a/frontend/src/lang/tw.js +++ b/frontend/src/lang/tw.js @@ -532,9 +532,9 @@ export default { to_start_using: '瀏覽您的數據庫，表和列的內容。 選擇一個數據庫即可開始使用。', to_run_query: '點擊運行査詢', the_running_results: '即可查看運行結果', - item: '项', - logic_filter: '条件筛选', - enum_filter: '枚举筛选' + item: '項', + logic_filter: '條件篩選', + enum_filter: '枚舉篩選' }, detabs: { custom_sort: '自定義排序', @@ -1727,14 +1727,14 @@ export default { export_filter: '篩選條件', pls_input_filename: '請輸入文件名稱', calc_tips: { - tip1: '表达式语法请遵循该数据源对应的数据库语法。', - tip2: '数据集中不支持聚合运算。', - tip3: '引用字段以 "[" 开始， "]" 结束', - tip4: '请勿修改引用内容，否则将引用失败', - tip5: '若输入与引用字段相同格式的内容，将被当作引用字段处理', - tip6: '使用数据集对应数据库类型所支持的函数，语法同对应数据库', + tip1: '表達式語法請遵循該數據源對應的數據庫語法。', + tip2: '數據集中不支持聚合運算。', + tip3: '引用字段以 "[" 開始， "]" 結束', + tip4: '請勿修改引用內容，否則將引用失敗', + tip5: '若輸入與引用字段相同格式的內容，將被當作引用字段處理', + tip6: '使用數據集對應數據庫類型所支持的函數，語法同對應數據庫', tip7: '如日期格式化：MySQL使用DATE_FORMAT(date,format)；Oracle使用TO_DATE(X,[,fmt])', - tip8: '非直连模式数据集，使用Doris数据库函数，可参考Doris官网' + tip8: '非直連模式數據集，使用Doris數據庫函數，可參考Doris官網' } }, driver: {