From 63bde5e19656bb2f8f19f03edf89d4a02dc921e7 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Mon, 21 Nov 2022 15:57:11 +0800 Subject: [PATCH 01/22] =?UTF-8?q?fix(=E5=85=AC=E5=85=B1=E9=93=BE=E6=8E=A5)?= =?UTF-8?q?:=20=E6=B7=B1=E8=89=B2=E4=B8=BB=E9=A2=98=E4=B8=8B=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=E5=8C=BA=E5=9F=9F=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../canvas/components/editor/CanvasOptBar.vue | 66 +++++++++++++++++-- .../canvas/components/editor/Preview.vue | 6 ++ frontend/src/icons/svg/link-back.svg | 5 +- frontend/src/icons/svg/link-down.svg | 5 +- .../src/views/panel/export/PDFPreExport.vue | 2 +- 5 files changed, 68 insertions(+), 16 deletions(-) diff --git a/frontend/src/components/canvas/components/editor/CanvasOptBar.vue b/frontend/src/components/canvas/components/editor/CanvasOptBar.vue index 0f174096c0..4aae7a12ad 100644 --- a/frontend/src/components/canvas/components/editor/CanvasOptBar.vue +++ b/frontend/src/components/canvas/components/editor/CanvasOptBar.vue @@ -8,6 +8,7 @@ v-if="isPublicLink" ref="widget-div" class="function-div" + :class="functionClass" > {{ $t('panel.remove_all_linkage') }} + >{{ $t('panel.remove_all_linkage') }} { @@ -142,13 +164,43 @@ export default { width: max-content; text-align: end; z-index: 999; - ::v-deep button:hover { - background-color: rgba(31, 35, 41, 0.1); - color: #1F2329; - font-weight: bold; - border-color: rgba(31, 35, 41, 0.1) + border-radius: 4px; + ::v-deep button { + border-radius: 0px; + } + } + .function-light { + background: #FFFFFF; + border: 1px solid #DEE0E3; + box-shadow: 0px 4px 8px rgb(31 35 41 / 10%); + ::v-deep button { + background-color: #FFFFFF; + box-shadow: 0px 4px 8px rgba(31, 35, 41, 0.1); + border: 1px solid #DEE0E3; + &:hover { + background-color: rgba(31, 35, 41, 0.1); + color: #1F2329; + font-weight: bold; + border-color: rgba(31, 35, 41, 0.1) + } + } + } + .function-dark { + background: #1A1A1A; + border: 1px solid #434343; + box-shadow: 0px 4px 8px rgba(26, 26, 26, 0.1); + ::v-deep button { + background-color: #1A1A1A; + border: 1px solid #434343; + box-shadow: 0px 4px 8px rgba(26, 26, 26, 0.1); + color: #FFFFFF; + &:hover { + background-color: rgba(235, 235, 235, 0.1); + color: #EBEBEB; + font-weight: bold; + border-color: rgba(235, 235, 235, 0.1); + } } - } &:hover { border-top: 60px solid rgba(245, 74, 69, 0);; diff --git a/frontend/src/components/canvas/components/editor/Preview.vue b/frontend/src/components/canvas/components/editor/Preview.vue index 15a5186b6e..2aeb6fb1d5 100644 --- a/frontend/src/components/canvas/components/editor/Preview.vue +++ b/frontend/src/components/canvas/components/editor/Preview.vue @@ -11,6 +11,7 @@ >
{ this.exporting = true + this.backScreenShot = true + const scrollHeight = document.getElementById('preview-temp-canvas-main').scrollHeight + + document.getElementById('preview-canvas-main').style.height = (scrollHeight + 'px') setTimeout(() => { html2canvas(document.getElementById(domId)).then(canvas => { const snapshot = canvas.toDataURL('image/jpeg', 1) // 是图片质量 this.dataLoading = false this.exporting = false + this.backScreenShot = false if (snapshot !== '') { this.snapshotInfo = snapshot this.pdfExportShow = true diff --git a/frontend/src/icons/svg/link-back.svg b/frontend/src/icons/svg/link-back.svg index 1d1352fe5d..88339b6c3a 100644 --- a/frontend/src/icons/svg/link-back.svg +++ b/frontend/src/icons/svg/link-back.svg @@ -1,4 +1 @@ - - - - \ No newline at end of file + \ No newline at end of file diff --git a/frontend/src/icons/svg/link-down.svg b/frontend/src/icons/svg/link-down.svg index 90a6a5bda1..f0aaca266a 100644 --- a/frontend/src/icons/svg/link-down.svg +++ b/frontend/src/icons/svg/link-down.svg @@ -1,4 +1 @@ - - - - \ No newline at end of file + \ No newline at end of file diff --git a/frontend/src/views/panel/export/PDFPreExport.vue b/frontend/src/views/panel/export/PDFPreExport.vue index 586b653d0a..8d2c54076c 100644 --- a/frontend/src/views/panel/export/PDFPreExport.vue +++ b/frontend/src/views/panel/export/PDFPreExport.vue @@ -117,7 +117,7 @@ export default { initContent() { this.templateContentChange = this.templateContent for (const [key, value] of Object.entries(this.varsInfo)) { - this.templateContentChange = pdfTemplateReplaceAll(this.templateContentChange, key, value) + this.templateContentChange = pdfTemplateReplaceAll(this.templateContentChange, key, value || '') } }, From 01c7d4d4d74aa6403528a37a7580726add2ae014 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Mon, 21 Nov 2022 17:39:51 +0800 Subject: [PATCH 02/22] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?= =?UTF-8?q?=E6=89=B9=E9=87=8F=E8=AE=BE=E7=BD=AEecharts=E8=A7=86=E5=9B=BE?= =?UTF-8?q?=E5=A4=96=E9=97=B4=E8=B7=9D=E6=97=A0=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/canvas/customComponent/UserView.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/frontend/src/components/canvas/customComponent/UserView.vue b/frontend/src/components/canvas/customComponent/UserView.vue index cfedd58b54..2c5988c915 100644 --- a/frontend/src/components/canvas/customComponent/UserView.vue +++ b/frontend/src/components/canvas/customComponent/UserView.vue @@ -585,6 +585,9 @@ export default { updateParams['customAttr'] = this.sourceCustomAttrStr } else if (param.custom === 'customStyle') { const sourceCustomStyle = JSON.parse(this.sourceCustomStyleStr) + if (param.property === 'margin') { + sourceCustomStyle[param.property] = param.value + } sourceCustomStyle[param.property][param.value.modifyName] = param.value[param.value.modifyName] this.sourceCustomStyleStr = JSON.stringify(sourceCustomStyle) this.chart.customStyle = this.sourceCustomStyleStr From 5991e9c11f4df6ce6f5e7118001c9152842bc32b Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Tue, 22 Nov 2022 10:51:08 +0800 Subject: [PATCH 03/22] =?UTF-8?q?feat(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20Tab?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E6=94=AF=E6=8C=81=E8=BD=AE=E6=92=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/canvas/utils/utils.js | 2 + .../src/components/widget/deWidget/DeTabs.vue | 27 ++++++++ .../components/widget/deWidget/TabStyle.vue | 30 +++++++++ frontend/src/lang/en.js | 4 +- frontend/src/lang/tw.js | 2 + frontend/src/lang/zh.js | 2 + frontend/src/views/chart/view/ChartEdit.vue | 62 +++++++++---------- 7 files changed, 96 insertions(+), 33 deletions(-) diff --git a/frontend/src/components/canvas/utils/utils.js b/frontend/src/components/canvas/utils/utils.js index c81866fc7b..86918cf2e4 100644 --- a/frontend/src/components/canvas/utils/utils.js +++ b/frontend/src/components/canvas/utils/utils.js @@ -103,6 +103,8 @@ export function panelDataPrepare(componentData, componentStyle, callback) { } if (item.type === 'de-tabs') { item.style.fontSize = item.style.fontSize || 16 + item.style.carouselEnable = item.style.carouselEnable || false + item.style.switchTime = item.style.switchTime || 5 } if (item.type === 'custom') { item.options.manualModify = false diff --git a/frontend/src/components/widget/deWidget/DeTabs.vue b/frontend/src/components/widget/deWidget/DeTabs.vue index 99d655a4a2..b7560db60e 100644 --- a/frontend/src/components/widget/deWidget/DeTabs.vue +++ b/frontend/src/components/widget/deWidget/DeTabs.vue @@ -272,6 +272,7 @@ export default { }, data() { return { + timer: null, scrollLeft: 50, scrollTop: 10, // 需要展示属性设置的组件类型 @@ -393,6 +394,16 @@ export default { } }, watch: { + 'element.style.carouselEnable': { + handler(newVal, oldVla) { + this.initCarousel() + } + }, + 'element.style.switchTime': { + handler(newVal, oldVla) { + this.initCarousel() + } + }, activeTabName: { handler(newVal, oldVla) { this.$store.commit('setTabActiveTabNameMap', { tabId: this.element.id, activeTabName: this.activeTabName }) @@ -439,10 +450,26 @@ export default { this.$store.commit('setTabActiveTabNameMap', { tabId: this.element.id, activeTabName: this.activeTabName }) this.setContentThemeStyle() }, + mounted() { + this.initCarousel() + }, beforeDestroy() { bus.$off('add-new-tab', this.addNewTab) }, methods: { + initCarousel() { + this.timer && clearInterval(this.timer) + if (this.element.style.carouselEnable) { + const switchTime = (this.element.style.switchTime || 5) * 1000 + let switchCount = 1 + // 轮播定时器 + this.timer = setInterval(() => { + switchCount++ + const nowIndex = switchCount % this.element.options.tabList.length + this.activeTabName = this.element.options.tabList[nowIndex].name + }, switchTime) + } + }, initScroll() { this.scrollLeft = 50 this.scrollTop = 10 diff --git a/frontend/src/components/widget/deWidget/TabStyle.vue b/frontend/src/components/widget/deWidget/TabStyle.vue index a95cdae96b..e7d1d3d15f 100644 --- a/frontend/src/components/widget/deWidget/TabStyle.vue +++ b/frontend/src/components/widget/deWidget/TabStyle.vue @@ -112,6 +112,36 @@ {{ $t('chart.text_pos_right') }} + + + + {{ $('common.enable') }} + + + + {{ $('panel.switch_time') }} + + + + + + + + + - + - + {{ $t('chart.change_chart_type') }} - + @@ -490,8 +490,8 @@ > {{ - $t('chart.drag_block_table_data_column') - }} + $t('chart.drag_block_table_data_column') + }} {{ $t('chart.drag_block_type_axis') }} @@ -499,18 +499,18 @@ v-else-if="view.type && view.type.includes('pie')" >{{ $t('chart.drag_block_pie_label') }} {{ - $t('chart.drag_block_funnel_split') - }} + $t('chart.drag_block_funnel_split') + }} {{ - $t('chart.drag_block_radar_label') - }} + $t('chart.drag_block_radar_label') + }} {{ $t('chart.area') }} {{ - $t('chart.drag_block_treemap_label') - }} + $t('chart.drag_block_treemap_label') + }} {{ - $t('chart.drag_block_word_cloud_label') - }} + $t('chart.drag_block_word_cloud_label') + }} {{ $t('chart.drag_block_label') }} / {{ $t('chart.dimension') }} @@ -633,8 +633,8 @@ > {{ - $t('chart.drag_block_table_data_column') - }} + $t('chart.drag_block_table_data_column') + }} {{ $t('chart.drag_block_value_axis') }} @@ -642,30 +642,30 @@ v-else-if="view.type && view.type.includes('pie')" >{{ $t('chart.drag_block_pie_angel') }} {{ - $t('chart.drag_block_funnel_width') - }} + $t('chart.drag_block_funnel_width') + }} {{ - $t('chart.drag_block_radar_length') - }} + $t('chart.drag_block_radar_length') + }} {{ - $t('chart.drag_block_gauge_angel') - }} + $t('chart.drag_block_gauge_angel') + }} {{ $t('chart.drag_block_label_value') }} {{ $t('chart.chart_data') }} {{ - $t('chart.drag_block_treemap_size') - }} + $t('chart.drag_block_treemap_size') + }} {{ - $t('chart.drag_block_value_axis_main') - }} + $t('chart.drag_block_value_axis_main') + }} {{ $t('chart.drag_block_progress') }} {{ - $t('chart.drag_block_word_cloud_size') - }} + $t('chart.drag_block_word_cloud_size') + }} / {{ $t('chart.quota') }} - + @@ -1268,7 +1268,7 @@ width="800px" class="dialog-css" > - +
- +
Date: Tue, 22 Nov 2022 10:52:17 +0800 Subject: [PATCH 04/22] =?UTF-8?q?feat:=20=E6=97=A5=E6=9C=9F=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E7=9A=84=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataease/provider/query/ck/CKQueryProvider.java | 13 +++++++++++++ .../provider/query/db2/Db2QueryProvider.java | 13 +++++++++++++ .../dataease/provider/query/es/EsQueryProvider.java | 13 +++++++++++++ .../provider/query/hive/HiveQueryProvider.java | 13 +++++++++++++ .../provider/query/impala/ImpalaQueryProvider.java | 13 +++++++++++++ .../provider/query/mongodb/MongoQueryProvider.java | 13 +++++++++++++ .../provider/query/oracle/OracleQueryProvider.java | 13 +++++++++++++ .../dataease/provider/query/pg/PgQueryProvider.java | 13 +++++++++++++ .../query/redshift/RedshiftQueryProvider.java | 13 +++++++++++++ 9 files changed, 117 insertions(+) diff --git a/backend/src/main/java/io/dataease/provider/query/ck/CKQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/ck/CKQueryProvider.java index 8f2c593918..2b8e0b1008 100644 --- a/backend/src/main/java/io/dataease/provider/query/ck/CKQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/query/ck/CKQueryProvider.java @@ -1,5 +1,6 @@ package io.dataease.provider.query.ck; +import com.alibaba.fastjson.JSONArray; import io.dataease.commons.utils.BeanUtils; import io.dataease.plugins.common.base.domain.ChartViewWithBLOBs; import io.dataease.plugins.common.base.domain.DatasetTableField; @@ -17,6 +18,7 @@ import io.dataease.plugins.common.dto.sqlObj.SQLObj; import io.dataease.plugins.common.request.chart.ChartExtFilterRequest; import io.dataease.plugins.common.request.permission.DataSetRowPermissionsTreeDTO; import io.dataease.plugins.common.request.permission.DatasetRowPermissionsTreeItem; +import io.dataease.plugins.datasource.entity.Dateformat; import io.dataease.plugins.datasource.entity.PageInfo; import io.dataease.plugins.datasource.query.QueryProvider; import io.dataease.plugins.datasource.query.Utils; @@ -1400,4 +1402,15 @@ public class CKQueryProvider extends QueryProvider { return sql; } } + + public List dateformat() { + return JSONArray.parseArray("[\n" + + "{\"dateformat\": \"%Y%m%d\"},\n" + + "{\"dateformat\": \"%Y/%m/%d\"},\n" + + "{\"dateformat\": \"%Y-%m-%d\"},\n" + + "{\"dateformat\": \"%Y%m%d %H:%M:%S\"},\n" + + "{\"dateformat\": \"%Y/%m/%d %H:%M:%S\"},\n" + + "{\"dateformat\": \"%Y-%m-%d %H:%M:%S\"}\n" + + "]", Dateformat.class); + } } diff --git a/backend/src/main/java/io/dataease/provider/query/db2/Db2QueryProvider.java b/backend/src/main/java/io/dataease/provider/query/db2/Db2QueryProvider.java index 7fad9ee875..e1cdf780f5 100644 --- a/backend/src/main/java/io/dataease/provider/query/db2/Db2QueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/query/db2/Db2QueryProvider.java @@ -1,5 +1,6 @@ package io.dataease.provider.query.db2; +import com.alibaba.fastjson.JSONArray; import com.google.gson.Gson; import io.dataease.dto.datasource.Db2Configuration; import io.dataease.plugins.common.base.domain.ChartViewWithBLOBs; @@ -18,6 +19,7 @@ import io.dataease.plugins.common.dto.sqlObj.SQLObj; import io.dataease.plugins.common.request.chart.ChartExtFilterRequest; import io.dataease.plugins.common.request.permission.DataSetRowPermissionsTreeDTO; import io.dataease.plugins.common.request.permission.DatasetRowPermissionsTreeItem; +import io.dataease.plugins.datasource.entity.Dateformat; import io.dataease.plugins.datasource.entity.JdbcConfiguration; import io.dataease.plugins.datasource.entity.PageInfo; import io.dataease.plugins.datasource.query.QueryProvider; @@ -1378,4 +1380,15 @@ public class Db2QueryProvider extends QueryProvider { schema = String.format(Db2Constants.KEYWORD_TABLE, schema); return "SELECT * FROM " + schema + "." + String.format(Db2Constants.KEYWORD_TABLE, table); } + + public List dateformat() { + return JSONArray.parseArray("[\n" + + "{\"dateformat\": \"YYYYMMDD\"},\n" + + "{\"dateformat\": \"YYYY/MM/DD\"},\n" + + "{\"dateformat\": \"YYYY-MM-DD\"},\n" + + "{\"dateformat\": \"YYYYMMDD HH24:MI:SS\"},\n" + + "{\"dateformat\": \"YYYY/MM/DD HH24:MI:SS\"},\n" + + "{\"dateformat\": \"YYYY-MM-DD HH24:MI:SS\"}\n" + + "]", Dateformat.class); + } } diff --git a/backend/src/main/java/io/dataease/provider/query/es/EsQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/es/EsQueryProvider.java index 673392fabc..2a7c7134fe 100644 --- a/backend/src/main/java/io/dataease/provider/query/es/EsQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/query/es/EsQueryProvider.java @@ -1,5 +1,6 @@ package io.dataease.provider.query.es; +import com.alibaba.fastjson.JSONArray; import io.dataease.plugins.common.base.domain.ChartViewWithBLOBs; import io.dataease.plugins.common.base.domain.DatasetTableField; import io.dataease.plugins.common.base.domain.DatasetTableFieldExample; @@ -16,6 +17,7 @@ import io.dataease.plugins.common.dto.sqlObj.SQLObj; import io.dataease.plugins.common.request.chart.ChartExtFilterRequest; import io.dataease.plugins.common.request.permission.DataSetRowPermissionsTreeDTO; import io.dataease.plugins.common.request.permission.DatasetRowPermissionsTreeItem; +import io.dataease.plugins.datasource.entity.Dateformat; import io.dataease.plugins.datasource.query.QueryProvider; import io.dataease.plugins.datasource.query.Utils; import org.apache.commons.collections4.CollectionUtils; @@ -1311,4 +1313,15 @@ public class EsQueryProvider extends QueryProvider { return sql; } } + + public List dateformat() { + return JSONArray.parseArray("[\n" + + "{\"dateformat\": \"yyyy/MM/dd\"},\n" + + "{\"dateformat\": \"yyyy/MMdd\"},\n" + + "{\"dateformat\": \"yyyy-MM-dd\"},\n" + + "{\"dateformat\": \"yyyyMMdd HH:mm:ss\"},\n" + + "{\"dateformat\": \"yyyy/MMdd HH:mm:ss\"},\n" + + "{\"dateformat\": \"yyyy-MM-dd HH:mm:ss\"}\n" + + "]", Dateformat.class); + } } diff --git a/backend/src/main/java/io/dataease/provider/query/hive/HiveQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/hive/HiveQueryProvider.java index ce089d53c9..14fa0d1b06 100644 --- a/backend/src/main/java/io/dataease/provider/query/hive/HiveQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/query/hive/HiveQueryProvider.java @@ -1,5 +1,6 @@ package io.dataease.provider.query.hive; +import com.alibaba.fastjson.JSONArray; import io.dataease.plugins.common.base.domain.ChartViewWithBLOBs; import io.dataease.plugins.common.base.domain.DatasetTableField; import io.dataease.plugins.common.base.domain.DatasetTableFieldExample; @@ -16,6 +17,7 @@ import io.dataease.plugins.common.dto.sqlObj.SQLObj; import io.dataease.plugins.common.request.chart.ChartExtFilterRequest; import io.dataease.plugins.common.request.permission.DataSetRowPermissionsTreeDTO; import io.dataease.plugins.common.request.permission.DatasetRowPermissionsTreeItem; +import io.dataease.plugins.datasource.entity.Dateformat; import io.dataease.plugins.datasource.entity.PageInfo; import io.dataease.plugins.datasource.query.QueryProvider; import io.dataease.plugins.datasource.query.Utils; @@ -1299,4 +1301,15 @@ public class HiveQueryProvider extends QueryProvider { return sql; } } + + public List dateformat() { + return JSONArray.parseArray("[\n" + + "{\"dateformat\": \"yyyyMMdd\"},\n" + + "{\"dateformat\": \"yyyy/MM/dd\"},\n" + + "{\"dateformat\": \"yyyy-MM-dd\"},\n" + + "{\"dateformat\": \"yyyy/MM/dd HH:mm:ss\"},\n" + + "{\"dateformat\": \"yyyyMMdd HH:mm:ss\"},\n" + + "{\"dateformat\": \"yyyy-MM-dd HH:mm:ss\"}\n" + + "]", Dateformat.class); + } } diff --git a/backend/src/main/java/io/dataease/provider/query/impala/ImpalaQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/impala/ImpalaQueryProvider.java index edfd4a8810..2e33fc8d93 100644 --- a/backend/src/main/java/io/dataease/provider/query/impala/ImpalaQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/query/impala/ImpalaQueryProvider.java @@ -1,5 +1,6 @@ package io.dataease.provider.query.impala; +import com.alibaba.fastjson.JSONArray; import io.dataease.plugins.common.base.domain.ChartViewWithBLOBs; import io.dataease.plugins.common.base.domain.DatasetTableField; import io.dataease.plugins.common.base.domain.DatasetTableFieldExample; @@ -16,6 +17,7 @@ import io.dataease.plugins.common.dto.sqlObj.SQLObj; import io.dataease.plugins.common.request.chart.ChartExtFilterRequest; import io.dataease.plugins.common.request.permission.DataSetRowPermissionsTreeDTO; import io.dataease.plugins.common.request.permission.DatasetRowPermissionsTreeItem; +import io.dataease.plugins.datasource.entity.Dateformat; import io.dataease.plugins.datasource.entity.PageInfo; import io.dataease.plugins.datasource.query.QueryProvider; import io.dataease.plugins.datasource.query.Utils; @@ -1276,4 +1278,15 @@ public class ImpalaQueryProvider extends QueryProvider { return sql; } } + + public List dateformat() { + return JSONArray.parseArray("[\n" + + "{\"dateformat\": \"yyyy-MM-dd\"},\n" + + "{\"dateformat\": \"yyyy/MM/dd\"},\n" + + "{\"dateformat\": \"yyyyMMdd\"},\n" + + "{\"dateformat\": \"yyyy-MM-dd HH:mm:ss\"},\n" + + "{\"dateformat\": \"yyyy/MMdd HH:mm:ss\"},\n" + + "{\"dateformat\": \"yyyyMMdd HH:mm:ss\"}\n" + + "]", Dateformat.class); + } } diff --git a/backend/src/main/java/io/dataease/provider/query/mongodb/MongoQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/mongodb/MongoQueryProvider.java index 1a11a1d232..34730987a4 100644 --- a/backend/src/main/java/io/dataease/provider/query/mongodb/MongoQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/query/mongodb/MongoQueryProvider.java @@ -1,5 +1,6 @@ package io.dataease.provider.query.mongodb; +import com.alibaba.fastjson.JSONArray; import io.dataease.plugins.common.base.domain.ChartViewWithBLOBs; import io.dataease.plugins.common.base.domain.DatasetTableField; import io.dataease.plugins.common.base.domain.DatasetTableFieldExample; @@ -16,6 +17,7 @@ import io.dataease.plugins.common.dto.sqlObj.SQLObj; import io.dataease.plugins.common.request.chart.ChartExtFilterRequest; import io.dataease.plugins.common.request.permission.DataSetRowPermissionsTreeDTO; import io.dataease.plugins.common.request.permission.DatasetRowPermissionsTreeItem; +import io.dataease.plugins.datasource.entity.Dateformat; import io.dataease.plugins.datasource.entity.PageInfo; import io.dataease.plugins.datasource.query.QueryProvider; import io.dataease.plugins.datasource.query.Utils; @@ -1150,4 +1152,15 @@ public class MongoQueryProvider extends QueryProvider { return sql; } } + + public List dateformat() { + return JSONArray.parseArray("[\n" + + "{\"dateformat\": \"%Y-%m-%d\"},\n" + + "{\"dateformat\": \"%Y/%m/%d\"},\n" + + "{\"dateformat\": \"%Y%m%d\"},\n" + + "{\"dateformat\": \"%Y-%m-%d %H:%i:%S\"},\n" + + "{\"dateformat\": \"%Y/%m/%d %H:%i:%S\"},\n" + + "{\"dateformat\": \"%Y%m%d %H:%i:%S\"}\n" + + "]", Dateformat.class); + } } diff --git a/backend/src/main/java/io/dataease/provider/query/oracle/OracleQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/oracle/OracleQueryProvider.java index 8d1c685527..c3ce406b2d 100644 --- a/backend/src/main/java/io/dataease/provider/query/oracle/OracleQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/query/oracle/OracleQueryProvider.java @@ -1,5 +1,6 @@ package io.dataease.provider.query.oracle; +import com.alibaba.fastjson.JSONArray; import com.google.gson.Gson; import io.dataease.dto.datasource.OracleConfiguration; import io.dataease.plugins.common.base.domain.ChartViewWithBLOBs; @@ -18,6 +19,7 @@ import io.dataease.plugins.common.dto.sqlObj.SQLObj; import io.dataease.plugins.common.request.chart.ChartExtFilterRequest; import io.dataease.plugins.common.request.permission.DataSetRowPermissionsTreeDTO; import io.dataease.plugins.common.request.permission.DatasetRowPermissionsTreeItem; +import io.dataease.plugins.datasource.entity.Dateformat; import io.dataease.plugins.datasource.entity.JdbcConfiguration; import io.dataease.plugins.datasource.entity.PageInfo; import io.dataease.plugins.datasource.query.QueryProvider; @@ -1427,4 +1429,15 @@ public class OracleQueryProvider extends QueryProvider { schema = String.format(OracleConstants.KEYWORD_TABLE, schema); return "SELECT * FROM " + schema + "." + String.format(OracleConstants.KEYWORD_TABLE, table); } + + public List dateformat() { + return JSONArray.parseArray("[\n" + + "{\"dateformat\": \"YYYY-MM-DD\"},\n" + + "{\"dateformat\": \"YYYY/MM/DD\"},\n" + + "{\"dateformat\": \"YYYYMMDD\"},\n" + + "{\"dateformat\": \"YYYY-MM-DD HH24:MI:SS\"},\n" + + "{\"dateformat\": \"YYYY/MM/DD HH24:MI:SS\"},\n" + + "{\"dateformat\": \"YYYYMMDD HH24:MI:SS\"}\n" + + "]", Dateformat.class); + } } diff --git a/backend/src/main/java/io/dataease/provider/query/pg/PgQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/pg/PgQueryProvider.java index ead69fa59f..227fb75f1d 100644 --- a/backend/src/main/java/io/dataease/provider/query/pg/PgQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/query/pg/PgQueryProvider.java @@ -1,5 +1,6 @@ package io.dataease.provider.query.pg; +import com.alibaba.fastjson.JSONArray; import com.google.gson.Gson; import io.dataease.plugins.common.base.domain.ChartViewWithBLOBs; import io.dataease.plugins.common.base.domain.DatasetTableField; @@ -18,6 +19,7 @@ import io.dataease.plugins.common.dto.sqlObj.SQLObj; import io.dataease.plugins.common.request.chart.ChartExtFilterRequest; import io.dataease.plugins.common.request.permission.DataSetRowPermissionsTreeDTO; import io.dataease.plugins.common.request.permission.DatasetRowPermissionsTreeItem; +import io.dataease.plugins.datasource.entity.Dateformat; import io.dataease.plugins.datasource.entity.JdbcConfiguration; import io.dataease.plugins.datasource.entity.PageInfo; import io.dataease.plugins.datasource.query.QueryProvider; @@ -1301,4 +1303,15 @@ public class PgQueryProvider extends QueryProvider { schema = String.format(PgConstants.KEYWORD_TABLE, schema); return "SELECT * FROM " + schema + "." + String.format(PgConstants.KEYWORD_TABLE, table); } + + public List dateformat() { + return JSONArray.parseArray("[\n" + + "{\"dateformat\": \"YYYY-MM-DD\"},\n" + + "{\"dateformat\": \"YYYY/MM/DD\"},\n" + + "{\"dateformat\": \"YYYYMMDD\"},\n" + + "{\"dateformat\": \"YYYY-MM-DD HH24:MI:SS\"},\n" + + "{\"dateformat\": \"YYYY/MM/DD HH24:MI:SS\"},\n" + + "{\"dateformat\": \"YYYYMMDD HH24:MI:SS\"}\n" + + "]", Dateformat.class); + } } diff --git a/backend/src/main/java/io/dataease/provider/query/redshift/RedshiftQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/redshift/RedshiftQueryProvider.java index 2ba6bc0e15..4a8fa038aa 100644 --- a/backend/src/main/java/io/dataease/provider/query/redshift/RedshiftQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/query/redshift/RedshiftQueryProvider.java @@ -1,5 +1,6 @@ package io.dataease.provider.query.redshift; +import com.alibaba.fastjson.JSONArray; import com.google.gson.Gson; import io.dataease.plugins.common.base.domain.ChartViewWithBLOBs; import io.dataease.plugins.common.base.domain.DatasetTableField; @@ -16,6 +17,7 @@ import io.dataease.plugins.common.dto.sqlObj.SQLObj; import io.dataease.plugins.common.request.chart.ChartExtFilterRequest; import io.dataease.plugins.common.request.permission.DataSetRowPermissionsTreeDTO; import io.dataease.plugins.common.request.permission.DatasetRowPermissionsTreeItem; +import io.dataease.plugins.datasource.entity.Dateformat; import io.dataease.plugins.datasource.entity.JdbcConfiguration; import io.dataease.plugins.datasource.entity.PageInfo; import io.dataease.plugins.datasource.query.QueryProvider; @@ -1286,4 +1288,15 @@ public class RedshiftQueryProvider extends QueryProvider { schema = String.format(PgConstants.KEYWORD_TABLE, schema); return "SELECT * FROM " + schema + "." + String.format(PgConstants.KEYWORD_TABLE, table); } + + public List dateformat() { + return JSONArray.parseArray("[\n" + + "{\"dateformat\": \"YYYY-MM-DD\"},\n" + + "{\"dateformat\": \"YYYY/MM/DD\"},\n" + + "{\"dateformat\": \"YYYYMMDD\"},\n" + + "{\"dateformat\": \"YYYY-MM-DD HH24:MI:SS\"},\n" + + "{\"dateformat\": \"YYYY/MM/DD HH24:MI:SS\"},\n" + + "{\"dateformat\": \"YYYYMMDD HH24:MI:SS\"}\n" + + "]", Dateformat.class); + } } From 03634cd100f4af8a1d549addbdfd4adf551d46bb Mon Sep 17 00:00:00 2001 From: dataeaseShu <106045316+dataeaseShu@users.noreply.github.com> Date: Tue, 22 Nov 2022 11:00:46 +0800 Subject: [PATCH 05/22] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E6=B8=90?= =?UTF-8?q?=E5=8F=98=E8=89=B2AntV=E5=9B=BE=E5=BA=93=E7=9A=84=E6=89=80?= =?UTF-8?q?=E6=9C=89=E6=9F=B1=E7=8A=B6=E5=9B=BE=E3=80=81=E9=9D=A2=E7=A7=AF?= =?UTF-8?q?=E5=9B=BE=E3=80=81=E9=A5=BC=E5=9B=BE=E3=80=81=E7=8E=AF=E5=BD=A2?= =?UTF-8?q?=E5=9B=BE=E3=80=81=E4=BB=AA=E8=A1=A8=E7=9B=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/lang/en.js | 1 + frontend/src/lang/tw.js | 1 + frontend/src/lang/zh.js | 1 + frontend/src/views/chart/chart/bar/bar_antv.js | 10 ++++++++++ frontend/src/views/chart/chart/chart.js | 1 + .../src/views/chart/chart/gauge/gauge_antv.js | 13 +++++++++++++ frontend/src/views/chart/chart/line/line_antv.js | 11 +++++++++++ frontend/src/views/chart/chart/pie/pie_antv.js | 12 ++++++++++++ frontend/src/views/chart/chart/util.js | 15 ++++++++++++++- .../chart/components/shapeAttr/ColorSelector.vue | 12 ++++++++++++ 10 files changed, 76 insertions(+), 1 deletion(-) diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index 75277831cc..7416bd843a 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -915,6 +915,7 @@ export default { password_input_error: 'Original password input error' }, chart: { + gradient: 'Gradient', layer_controller: 'Quota switch', suspension: 'Suspension', chart_background: 'Component background', diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js index 34cb3bb7f6..c62f20507e 100644 --- a/frontend/src/lang/tw.js +++ b/frontend/src/lang/tw.js @@ -915,6 +915,7 @@ export default { password_input_error: '原始密碼輸入錯誤' }, chart: { + gradient: '漸變', layer_controller: '指標切換', suspension: '懸浮', chart_background: '組件背景', diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index a29a2b0b17..d36c92ed67 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -914,6 +914,7 @@ export default { password_input_error: '原始密码输入错误' }, chart: { + gradient: '渐变', layer_controller: '指标切换', suspension: '悬浮', chart_background: '组件背景', diff --git a/frontend/src/views/chart/chart/bar/bar_antv.js b/frontend/src/views/chart/chart/bar/bar_antv.js index 8a95f15dd8..b799ec2517 100644 --- a/frontend/src/views/chart/chart/bar/bar_antv.js +++ b/frontend/src/views/chart/chart/bar/bar_antv.js @@ -103,6 +103,11 @@ export function baseBarOptionAntV(plot, container, chart, action, isGroup, isSta options.isPercent = chart.type === 'percentage-bar-stack' // custom color options.color = antVCustomColor(chart) + if (customAttr.color.gradient) { + options.color = options.color.map((ele) => { + return `l(270) 0:#ffffff00 1:${ele}` + }) + } // 开始渲染 if (plot) { @@ -199,6 +204,11 @@ export function hBaseBarOptionAntV(plot, container, chart, action, isGroup, isSt } // custom color options.color = antVCustomColor(chart) + if (customAttr.color.gradient) { + options.color = options.color.map((ele) => { + return `l(0) 0:#ffffff00 1:${ele}` + }) + } // 开始渲染 if (plot) { diff --git a/frontend/src/views/chart/chart/chart.js b/frontend/src/views/chart/chart/chart.js index a1083cc57a..c9c81595cc 100644 --- a/frontend/src/views/chart/chart/chart.js +++ b/frontend/src/views/chart/chart/chart.js @@ -28,6 +28,7 @@ export const DEFAULT_COLOR_CASE = { tableBorderColor: '#E6E7E4', seriesColors: [], // 格式：{"name":"s1","color":"","isCustom":false} areaBorderColor: '#303133', + gradient: false, areaBaseColor: '#FFFFFF' } diff --git a/frontend/src/views/chart/chart/gauge/gauge_antv.js b/frontend/src/views/chart/chart/gauge/gauge_antv.js index 86473dab33..e7a25db3f7 100644 --- a/frontend/src/views/chart/chart/gauge/gauge_antv.js +++ b/frontend/src/views/chart/chart/gauge/gauge_antv.js @@ -124,6 +124,8 @@ export function baseGaugeOptionAntV(plot, container, chart, action, scale = 1) { } } } + console.log('hasThreshold', hasThreshold) + if (hasThreshold) { options.range = { color: theme.styleSheet.paletteQualitative10, @@ -152,6 +154,17 @@ export function baseGaugeOptionAntV(plot, container, chart, action, scale = 1) { } } + if (customAttr.color.gradient) { + const colorList = (theme.styleSheet?.paletteQualitative10 || []).map((ele) => `l(0) 0:#ffffff00 1:${ele}`) + if (!options.range) { + options.range = { + color: colorList + } + } else { + options.range.color = colorList + } + } + // 开始渲染 if (plot) { plot.destroy() diff --git a/frontend/src/views/chart/chart/line/line_antv.js b/frontend/src/views/chart/chart/line/line_antv.js index 52cd766dfe..fa6f38bf52 100644 --- a/frontend/src/views/chart/chart/line/line_antv.js +++ b/frontend/src/views/chart/chart/line/line_antv.js @@ -178,6 +178,17 @@ export function baseAreaOptionAntV(plot, container, chart, action, isStack) { } // custom color options.color = antVCustomColor(chart) + const areaColors = [...options.color, ...options.color] + if (customAttr.color.gradient) { + options.areaStyle = () => { + const cr = areaColors.shift() + if (cr) { + return { + fill: `l(270) 0:#ffffff00 1:${cr}` + } + } + } + } // 开始渲染 if (plot) { diff --git a/frontend/src/views/chart/chart/pie/pie_antv.js b/frontend/src/views/chart/chart/pie/pie_antv.js index 00fbb8ba81..b3ad13f44a 100644 --- a/frontend/src/views/chart/chart/pie/pie_antv.js +++ b/frontend/src/views/chart/chart/pie/pie_antv.js @@ -82,6 +82,12 @@ export function basePieOptionAntV(plot, container, chart, action) { // custom color options.color = antVCustomColor(chart) + if (customAttr.color.gradient) { + options.color = options.color.map((ele) => { + return `l(270) 0:#ffffff00 1:${ele}` + }) + } + // 开始渲染 if (plot) { plot.destroy() @@ -159,6 +165,12 @@ export function basePieRoseOptionAntV(plot, container, chart, action) { // custom color options.color = antVCustomColor(chart) + if (customAttr.color.gradient) { + options.color = options.color.map((ele) => { + return `l(270) 0:#ffffff00 1:${ele}` + }) + } + // 开始渲染 if (plot) { plot.destroy() diff --git a/frontend/src/views/chart/chart/util.js b/frontend/src/views/chart/chart/util.js index c14f28c8d7..6a0593eed8 100644 --- a/frontend/src/views/chart/chart/util.js +++ b/frontend/src/views/chart/chart/util.js @@ -280,6 +280,7 @@ export const TYPE_CONFIGS = [ 'color-selector': [ 'value', 'custom', + 'gradient', 'alpha' ], 'size-selector-ant-v': [ @@ -464,7 +465,8 @@ export const TYPE_CONFIGS = [ 'value', 'colorPanel', 'customColor', - 'alpha' + 'alpha', + 'gradient' ], 'size-selector-ant-v': [ 'lineWidth', @@ -624,6 +626,7 @@ export const TYPE_CONFIGS = [ 'value', 'colorPanel', 'customColor', + 'gradient', 'alpha' ], 'size-selector-ant-v': [ @@ -703,6 +706,7 @@ export const TYPE_CONFIGS = [ 'value', 'colorPanel', 'customColor', + 'gradient', 'alpha' ], 'size-selector-ant-v': [ @@ -782,6 +786,7 @@ export const TYPE_CONFIGS = [ 'value', 'colorPanel', 'customColor', + 'gradient', 'alpha' ], 'size-selector-ant-v': [ @@ -861,6 +866,7 @@ export const TYPE_CONFIGS = [ 'value', 'colorPanel', 'customColor', + 'gradient', 'alpha' ], 'size-selector-ant-v': [ @@ -1004,6 +1010,7 @@ export const TYPE_CONFIGS = [ 'value', 'colorPanel', 'customColor', + 'gradient', 'alpha' ], 'size-selector-ant-v': [ @@ -1083,6 +1090,7 @@ export const TYPE_CONFIGS = [ 'value', 'colorPanel', 'customColor', + 'gradient', 'alpha' ], 'size-selector-ant-v': [ @@ -1160,6 +1168,7 @@ export const TYPE_CONFIGS = [ 'value', 'colorPanel', 'customColor', + 'gradient', 'alpha' ], 'size-selector-ant-v': [ @@ -1219,6 +1228,7 @@ export const TYPE_CONFIGS = [ 'value', 'colorPanel', 'customColor', + 'gradient', 'alpha' ], 'size-selector-ant-v': [ @@ -1279,6 +1289,7 @@ export const TYPE_CONFIGS = [ 'value', 'colorPanel', 'customColor', + 'gradient', 'alpha' ], 'size-selector-ant-v': [ @@ -1336,6 +1347,7 @@ export const TYPE_CONFIGS = [ 'value', 'colorPanel', 'customColor', + 'gradient', 'alpha' ], 'size-selector-ant-v': [ @@ -1396,6 +1408,7 @@ export const TYPE_CONFIGS = [ 'value', 'colorPanel', 'customColor', + 'gradient', 'alpha' ], 'size-selector-ant-v': [ diff --git a/frontend/src/views/chart/components/shapeAttr/ColorSelector.vue b/frontend/src/views/chart/components/shapeAttr/ColorSelector.vue index 6c8d7a0749..03bbf03191 100644 --- a/frontend/src/views/chart/components/shapeAttr/ColorSelector.vue +++ b/frontend/src/views/chart/components/shapeAttr/ColorSelector.vue @@ -151,6 +151,17 @@ + + + + { this.colorForm['modifyName'] = item From 7dafec6cd4b1a084838ebc8c1cc82c1f611a72c4 Mon Sep 17 00:00:00 2001 From: dataeaseShu <106045316+dataeaseShu@users.noreply.github.com> Date: Tue, 22 Nov 2022 11:03:32 +0800 Subject: [PATCH 06/22] =?UTF-8?q?fix:=20=E5=8E=BB=E9=99=A4=E6=89=93?= =?UTF-8?q?=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/chart/chart/gauge/gauge_antv.js | 1 - frontend/src/views/chart/components/shapeAttr/ColorSelector.vue | 1 - 2 files changed, 2 deletions(-) diff --git a/frontend/src/views/chart/chart/gauge/gauge_antv.js b/frontend/src/views/chart/chart/gauge/gauge_antv.js index e7a25db3f7..b4b3844d6e 100644 --- a/frontend/src/views/chart/chart/gauge/gauge_antv.js +++ b/frontend/src/views/chart/chart/gauge/gauge_antv.js @@ -124,7 +124,6 @@ export function baseGaugeOptionAntV(plot, container, chart, action, scale = 1) { } } } - console.log('hasThreshold', hasThreshold) if (hasThreshold) { options.range = { diff --git a/frontend/src/views/chart/components/shapeAttr/ColorSelector.vue b/frontend/src/views/chart/components/shapeAttr/ColorSelector.vue index 03bbf03191..e4972fc2d0 100644 --- a/frontend/src/views/chart/components/shapeAttr/ColorSelector.vue +++ b/frontend/src/views/chart/components/shapeAttr/ColorSelector.vue @@ -431,7 +431,6 @@ export default { }, methods: { gradientColorChange(colorDto) { - console.log('gradientColorChange') const modifyNames = ['value', 'colors', 'seriesColors'] modifyNames.forEach(item => { this.colorForm['modifyName'] = item From f920f1fe6a3150d9cc23cb1ebb32c9ebdbb656e7 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Tue, 22 Nov 2022 11:42:05 +0800 Subject: [PATCH 07/22] =?UTF-8?q?feat(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20Tab?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E6=94=AF=E6=8C=81=E8=AE=BE=E7=BD=AE=E6=BF=80?= =?UTF-8?q?=E6=B4=BB=E5=AD=97=E4=BD=93=E5=A4=A7=E5=B0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/canvas/components/TextAttr.vue | 41 + .../canvas/components/editor/Preview.vue | 1 + .../canvas/customComponent/component-list.js | 8 +- frontend/src/components/canvas/utils/utils.js | 1 + .../src/components/widget/deWidget/DeTabs.vue | 18 +- .../components/widget/deWidget/TabStyle.vue | 6 +- frontend/src/lang/en.js | 1 + frontend/src/lang/tw.js | 1 + frontend/src/lang/zh.js | 1 + frontend/src/styles/deicon/demo_index.html | 767 +++++++++--------- frontend/src/styles/deicon/iconfont.css | 10 +- frontend/src/styles/deicon/iconfont.js | 2 +- frontend/src/styles/deicon/iconfont.json | 7 + frontend/src/styles/deicon/iconfont.ttf | Bin 33068 -> 33252 bytes frontend/src/styles/deicon/iconfont.woff | Bin 36341 -> 20304 bytes frontend/src/styles/deicon/iconfont.woff2 | Bin 17092 -> 17132 bytes frontend/src/views/chart/view/ChartEdit.vue | 60 +- 17 files changed, 507 insertions(+), 417 deletions(-) diff --git a/frontend/src/components/canvas/components/TextAttr.vue b/frontend/src/components/canvas/components/TextAttr.vue index b478bc30d6..bc8c430ee5 100644 --- a/frontend/src/components/canvas/components/TextAttr.vue +++ b/frontend/src/components/canvas/components/TextAttr.vue @@ -99,6 +99,30 @@ />
+ + + + +
+ +
+ this.maxFontSize) { + this.styleInfo.activeFontSize = this.maxFontSize + } else { + this.styleInfo.activeFontSize = newVal + } + } + }, initFontSize: { handler(newVal) { if (newVal < this.miniFontSize) { @@ -656,6 +694,9 @@ export default { if (this.attrShow('fontSize')) { this.initFontSize = this.styleInfo.fontSize } + if (this.attrShow('activeFontSize')) { + this.initActiveFontSize = this.styleInfo.activeFontSize + } }, methods: { diff --git a/frontend/src/components/canvas/components/editor/Preview.vue b/frontend/src/components/canvas/components/editor/Preview.vue index 15a5186b6e..eb44181a00 100644 --- a/frontend/src/components/canvas/components/editor/Preview.vue +++ b/frontend/src/components/canvas/components/editor/Preview.vue @@ -207,6 +207,7 @@ export default { 'left', 'width', 'fontSize', + 'activeFontSize', 'borderWidth', 'letterSpacing' ], diff --git a/frontend/src/components/canvas/customComponent/component-list.js b/frontend/src/components/canvas/customComponent/component-list.js index 0c79e78f02..08146c3716 100644 --- a/frontend/src/components/canvas/customComponent/component-list.js +++ b/frontend/src/components/canvas/customComponent/component-list.js @@ -94,8 +94,7 @@ export const VIDEOLINKS = { fullscreenToggle: false, pause: false }, - sources: [{ - }] + sources: [{}] }, rtmp: { sources: [{ @@ -389,7 +388,10 @@ const list = [ borderStyle: 'solid', borderWidth: 0, borderColor: '#000000', - fontSize: 16 + fontSize: 16, + activeFontSize: 18, + carouselEnable: false, + switchTime: 5 }, options: { tabList: [{ diff --git a/frontend/src/components/canvas/utils/utils.js b/frontend/src/components/canvas/utils/utils.js index 86918cf2e4..bb8e851623 100644 --- a/frontend/src/components/canvas/utils/utils.js +++ b/frontend/src/components/canvas/utils/utils.js @@ -103,6 +103,7 @@ export function panelDataPrepare(componentData, componentStyle, callback) { } if (item.type === 'de-tabs') { item.style.fontSize = item.style.fontSize || 16 + item.style.activeFontSize = item.style.activeFontSize || 18 item.style.carouselEnable = item.style.carouselEnable || false item.style.switchTime = item.style.switchTime || 5 } diff --git a/frontend/src/components/widget/deWidget/DeTabs.vue b/frontend/src/components/widget/deWidget/DeTabs.vue index b7560db60e..6e401c8166 100644 --- a/frontend/src/components/widget/deWidget/DeTabs.vue +++ b/frontend/src/components/widget/deWidget/DeTabs.vue @@ -29,7 +29,7 @@ :name="item.name" > - {{ item.title }} + {{ item.title }} {{ $('common.enable') }} + @change="styleChange" + >{{ $t('commons.enable') }} - {{ $('panel.switch_time') }} + {{ $t('panel.switch_time') }} diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index dab474542a..5c0f0092e3 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -1875,6 +1875,7 @@ export default { back_parent: 'Back to previous' }, panel: { + active_font_size: 'Active font size', carousel: 'Carousel', switch_time: 'Switch time', position_adjust: 'Position', diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js index 141350aeb6..eac1c18aaa 100644 --- a/frontend/src/lang/tw.js +++ b/frontend/src/lang/tw.js @@ -1875,6 +1875,7 @@ export default { back_parent: '返回上一級' }, panel: { + active_font_size: '激活字體大小', carousel: '輪播', switch_time: '切換時間', position_adjust: '位置', diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index e84468e10f..174b395d3f 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -1875,6 +1875,7 @@ export default { back_parent: '返回上一级' }, panel: { + active_font_size: '激活字体大小', carousel: '轮播', switch_time: '切换时间', position_adjust: '位置', diff --git a/frontend/src/styles/deicon/demo_index.html b/frontend/src/styles/deicon/demo_index.html index 1d6af76fd2..54ed133a17 100644 --- a/frontend/src/styles/deicon/demo_index.html +++ b/frontend/src/styles/deicon/demo_index.html @@ -38,7 +38,7 @@

- +

    @@ -46,740 +46,746 @@
  • Font class
  • Symbol
- + 查看项目 - +
    - + +
  • + +
    font
    +
    &#xe63d;
    +
    • +
  • WATERMARK
    &#xea16;
    • - +
  • 图层
    &#xe63b;
    • - +
  • application
    &#xe89e;
    • - +
  • data-source-24
    &#xe6ef;
    • - +
  • 重置
    &#xe63c;
    • - +
  • None_Select
    &#xe638;
    • - +
  • button_right
    &#xe635;
    • - +
  • icon-maybe
    &#xe631;
    • - +
  • icon_up-left_outlined
    &#xe632;
    • - +
  • close
    &#xe633;
    • - +
  • Frame 3425
    &#xe634;
    • - +
  • icon-filter
    &#xe636;
    • - +
  • icon_Batch_outlined
    &#xe630;
    • - +
  • icon_clear_outlined
    &#xe61d;
    • - +
  • icon_dialpad_outlined
    &#xe61e;
    • - +
  • icon_effects_outlined
    &#xe620;
    • - +
  • icon_magnify_outlined
    &#xe621;
    • - +
  • icon_moments-categories_outlined
    &#xe623;
    • - +
  • icon_pc_outlined
    &#xe626;
    • - +
  • icon_phone_outlined
    &#xe627;
    • - +
  • icon_redo_outlined
    &#xe629;
    • - +
  • icon_undo_outlined
    &#xe62b;
    • - +
  • icon-more
    &#xe62e;
    • - +
  • icon-quicksetting
    &#xe62f;
    • - +
  • square-selected
    &#xe73e;
    • - +
  • italic
    &#xe777;
    • - +
  • 箭头
    &#xe622;
    • - +
  • magic-line
    &#xe63a;
    • - +
  • 更多
    &#xe60c;
    • - +
  • 清空
    &#xe61c;
    • - +
  • 查看
    &#xe610;
    • - +
  • outline-redo
    &#xe68c;
    • - +
  • outline-undo
    &#xe68d;
    • - +
  • 定位
    &#xe60a;
    • - +
  • 富文本框
    &#xe670;
    • - +
  • 下架
    &#xe6e5;
    • - +
  • 上架
    &#xe6e6;
    • - +
  • 发布
    &#xe71f;
    • - +
  • 批量操作
    &#xe61b;
    • - +
  • 图片
    &#xe666;
    • - +
  • 超链接
    &#xe6e4;
    • - +
  • 跳转
    &#xe618;
    • - +
  • 跳转
    &#xe616;
    • - +
  • 网格\表格
    &#xe60b;
    • - +
  • 关闭网格
    &#xe609;
    • - +
  • 流媒体，媒体列表
    &#xe607;
    • - +
  • iframe
    &#xe6de;
    • - +
  • 参数
    &#xe6d7;
    • - +
  • 更换
    &#xe606;
    • - +
  • 发送邮件
    &#xe605;
    • - +
  • github
    &#xe6f8;
    • - +
  • 电话
    &#xe681;
    • - +
  • 关闭
    &#xe60d;
    • - +
  • 矩形
    &#xe67e;
    • - +
  • 移动端
    &#xe653;
    • - +
  • video
    &#xe625;
    • - +
  • 悬浮按钮发动态
    &#xe6e8;
    • - +
  • 吸附选择
    &#xe697;
    • - +
  • margin
    &#xe902;
    • - +
  • padding
    &#xe91b;
    • - +
  • 时间
    &#xe665;
    • - +
  • 时间格式转换
    &#xe6fb;
    • - +
  • 超链接
    &#xe9b2;
    • - +
  • 科学技术
    &#xe60f;
    • - +
  • 符号-数据矩阵
    &#xe69c;
    • - +
  • 视图矩阵_o
    &#xeb85;
    • - +
  • 悬浮
    &#xe62c;
    • - +
  • 右悬浮-选中
    &#xe6db;
    • - +
  • 悬浮
    &#xe6f6;
    • - +
  • 悬浮按钮
    &#xe8e6;
    • - +
  • 右悬浮-选中
    &#xeb86;
    • - +
  • 44.tabs
    &#xe62a;
    • - +
  • 洗浴
    &#xe619;
    • - +
  • 线性图标-取消下钻
    &#xe973;
    • - +
  • 线性图标-取消下钻
    &#xe6ed;
    • - +
  • 联动
    &#xe6f7;
    • - +
  • 下钻
    &#xe613;
    • - +
  • 上钻
    &#xe61f;
    • - +
  • 取消联动
    &#xe637;
    • - +
  • edit-2
    &#xe604;
    • - +
  • edit-2
    &#xe612;
    • - +
  • 详情
    &#xe706;
    • - +
  • 弧形框
    &#xe603;
    • - +
  • 弧形框
    &#xe602;
    • - +
  • 透明
    &#xe642;
    • - +
  • 弧度
    &#xe61a;
    • - +
  • 放大
    &#xe62d;
    • - +
  • 设 置
    &#xe696;
    • - +
  • 屏幕_全屏
    &#xe655;
    • - +
  • font-weight-bold
    &#xe659;
    • - +
  • letter_spacing
    &#xe601;
    • - +
  • letter-spacing
    &#xe679;
    • - +
  • 字体颜色
    &#xe60e;
    • - +
  • format_letter_spacing_2
    &#xe6c3;
    • - +
  • font_size
    &#xe710;
    • - +
  • 居中
    &#xe972;
    • - +
  • 居右
    &#xe608;
    • - +
  • 居左
    &#xe688;
    • - +
  • 实线
    &#xe64a;
    • - +
  • 画笔
    &#xe640;
    • - +
  • 点线
    &#xe614;
    • - +
  • 虚线
    &#xe617;
    • - +
  • 背景色‘
    &#xe600;
    • - +
  • 矩形
    &#xe648;
    • - +
  • text
    &#xe959;
    • - +
  • picture
    &#xe643;
    • - +
  • 输入
    &#xe6ab;
    • - +
  • 树
    &#xe628;
    • - +
  • 查询搜索
    &#xe615;
    • - +
  • 季度
    &#xe624;
    • - +
  • 数字顺序
    &#xe7de;
    • - +
  • 树列表
    &#xe6a6;
    • - +
  • 日期
    &#xe639;
    • - +
  • 左侧-区间
    &#xe6dd;
    • - +
  • 列表
    &#xe66f;
    • - +
  • 下拉框
    &#xe8ca;
    • - +
  • 下拉树
    &#xe8d0;
    • - +
  • 重置
    &#xe611;
    • - +
  • 日
    &#xe691;
    • - +
  • 年
    &#xe692;
    • - +
  • 月
    &#xe695;
    • - +

Unicode 引用

@@ -798,9 +804,9 @@ 
@font-face {
   font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1668397590143') format('woff2'),
-       url('iconfont.woff?t=1668397590143') format('woff'),
-       url('iconfont.ttf?t=1668397590143') format('truetype');
+  src: url('iconfont.woff2?t=1669087400468') format('woff2'),
+       url('iconfont.woff?t=1669087400468') format('woff'),
+       url('iconfont.ttf?t=1669087400468') format('truetype');
 }

第二步：定义使用 iconfont 的样式

@@ -825,7 +831,16 @@
    - + +
  • + +
    + font +
    +
    .icon-font +
    +
    • +
  • @@ -834,7 +849,7 @@
    .icon-WATERMARK
    • - +
  • @@ -843,7 +858,7 @@
    .icon-layer
    • - +
  • @@ -852,7 +867,7 @@
    .icon-application
    • - +
  • @@ -861,7 +876,7 @@
    .icon-datasource-select
    • - +
  • @@ -870,7 +885,7 @@
    .icon-zhongzhi2
    • - +
  • @@ -879,7 +894,7 @@
    .icon-None_Select
    • - +
  • @@ -888,7 +903,7 @@
    .icon-button_right
    • - +
  • @@ -897,7 +912,7 @@
    .icon-icon-maybe
    • - +
  • @@ -906,7 +921,7 @@
    .icon-icon_up-left_outlined
    • - +
  • @@ -915,7 +930,7 @@
    .icon-close
    • - +
  • @@ -924,7 +939,7 @@
    .icon-a-Frame3425
    • - +
  • @@ -933,7 +948,7 @@
    .icon-icon-filter
    • - +
  • @@ -942,7 +957,7 @@
    .icon-icon_Batch_outlined
    • - +
  • @@ -951,7 +966,7 @@
    .icon-icon_clear_outlined
    • - +
  • @@ -960,7 +975,7 @@
    .icon-icon_dialpad_outlined
    • - +
  • @@ -969,7 +984,7 @@
    .icon-icon_effects_outlined
    • - +
  • @@ -978,7 +993,7 @@
    .icon-icon_magnify_outlined
    • - +
  • @@ -987,7 +1002,7 @@
    .icon-icon_moments-categories_outlined
    • - +
  • @@ -996,7 +1011,7 @@
    .icon-icon_pc_outlined
    • - +
  • @@ -1005,7 +1020,7 @@
    .icon-icon_phone_outlined
    • - +
  • @@ -1014,7 +1029,7 @@
    .icon-icon_redo_outlined
    • - +
  • @@ -1023,7 +1038,7 @@
    .icon-icon_undo_outlined
    • - +
  • @@ -1032,7 +1047,7 @@
    .icon-icon-more
    • - +
  • @@ -1041,7 +1056,7 @@
    .icon-icon-quicksetting
    • - +
  • @@ -1050,7 +1065,7 @@
    .icon-square-selected
    • - +
  • @@ -1059,7 +1074,7 @@
    .icon-italic
    • - +
  • @@ -1068,7 +1083,7 @@
    .icon-jiantou
    • - +
  • @@ -1077,7 +1092,7 @@
    .icon-magic-line
    • - +
  • @@ -1086,7 +1101,7 @@
    .icon-gengduo
    • - +
  • @@ -1095,7 +1110,7 @@
    .icon-qingkong
    • - +
  • @@ -1104,7 +1119,7 @@
    .icon-chakan
    • - +
  • @@ -1113,7 +1128,7 @@
    .icon-outline-redo
    • - +
  • @@ -1122,7 +1137,7 @@
    .icon-outline-undo
    • - +
  • @@ -1131,7 +1146,7 @@
    .icon-dingwei
    • - +
  • @@ -1140,7 +1155,7 @@
    .icon-fuwenbenkuang
    • - +
  • @@ -1149,7 +1164,7 @@
    .icon-unpublish
    • - +
  • @@ -1158,7 +1173,7 @@
    .icon-publish
    • - +
  • @@ -1167,7 +1182,7 @@
    .icon-fabu
    • - +
  • @@ -1176,7 +1191,7 @@
    .icon-piliang-copy
    • - +
  • @@ -1185,7 +1200,7 @@
    .icon-tupian
    • - +
  • @@ -1194,7 +1209,7 @@
    .icon-chaolianjie1
    • - +
  • @@ -1203,7 +1218,7 @@
    .icon-com-jump
    • - +
  • @@ -1212,7 +1227,7 @@
    .icon-component-tiaozhuan
    • - +
  • @@ -1221,7 +1236,7 @@
    .icon-wangge-open
    • - +
  • @@ -1230,7 +1245,7 @@
    .icon-wangge-close
    • - +
  • @@ -1239,7 +1254,7 @@
    .icon-a-liumeitimeitiliebiao
    • - +
  • @@ -1248,7 +1263,7 @@
    .icon-iframe
    • - +
  • @@ -1257,7 +1272,7 @@
    .icon-canshu
    • - +
  • @@ -1266,7 +1281,7 @@
    .icon-genghuan
    • - +
  • @@ -1275,7 +1290,7 @@
    .icon-fasongyoujian
    • - +
  • @@ -1284,7 +1299,7 @@
    .icon-github
    • - +
  • @@ -1293,7 +1308,7 @@
    .icon-dianhua
    • - +
  • @@ -1302,7 +1317,7 @@
    .icon-guanbi
    • - +
  • @@ -1311,7 +1326,7 @@
    .icon-juxing1
    • - +
  • @@ -1320,7 +1335,7 @@
    .icon-yidongduan
    • - +
  • @@ -1329,7 +1344,7 @@
    .icon-video
    • - +
  • @@ -1338,7 +1353,7 @@
    .icon-xuanfuanniufadongtai
    • - +
  • @@ -1347,7 +1362,7 @@
    .icon-xifuxuanze
    • - +
  • @@ -1356,7 +1371,7 @@
    .icon-margin
    • - +
  • @@ -1365,7 +1380,7 @@
    .icon-padding
    • - +
  • @@ -1374,7 +1389,7 @@
    .icon-shijian
    • - +
  • @@ -1383,7 +1398,7 @@
    .icon-shijiangeshizhuanhuan
    • - +
  • @@ -1392,7 +1407,7 @@
    .icon-chaolianjie
    • - +
  • @@ -1401,7 +1416,7 @@
    .icon-kexuejishu
    • - +
  • @@ -1410,7 +1425,7 @@
    .icon-shujujuzhen
    • - +
  • @@ -1419,7 +1434,7 @@
    .icon-shitujuzhen_o
    • - +
  • @@ -1428,7 +1443,7 @@
    .icon-xuanfu1
    • - +
  • @@ -1437,7 +1452,7 @@
    .icon-youxuanfu-copy
    • - +
  • @@ -1446,7 +1461,7 @@
    .icon-xuanfu
    • - +
  • @@ -1455,7 +1470,7 @@
    .icon-xuanfuanniu
    • - +
  • @@ -1464,7 +1479,7 @@
    .icon-youxuanfu-copy-copy
    • - +
  • @@ -1473,7 +1488,7 @@
    .icon-tabs
    • - +
  • @@ -1482,7 +1497,7 @@
    .icon-xiyu
    • - +
  • @@ -1491,7 +1506,7 @@
    .icon-quxiaoshangzuan
    • - +
  • @@ -1500,7 +1515,7 @@
    .icon-quxiaoxiazuan
    • - +
  • @@ -1509,7 +1524,7 @@
    .icon-linkage
    • - +
  • @@ -1518,7 +1533,7 @@
    .icon-xiazuan
    • - +
  • @@ -1527,7 +1542,7 @@
    .icon-shangzuan
    • - +
  • @@ -1536,7 +1551,7 @@
    .icon-quxiaoliandong
    • - +
  • @@ -1545,7 +1560,7 @@
    .icon-edit-outline
    • - +
  • @@ -1554,7 +1569,7 @@
    .icon-edit
    • - +
  • @@ -1563,7 +1578,7 @@
    .icon-xiangqing1
    • - +
  • @@ -1572,7 +1587,7 @@
    .icon-weibiaoti-1
    • - +
  • @@ -1581,7 +1596,7 @@
    .icon-weibiaoti-
    • - +
  • @@ -1590,7 +1605,7 @@
    .icon-touming
    • - +
  • @@ -1599,7 +1614,7 @@
    .icon-fangxing-
    • - +
  • @@ -1608,7 +1623,7 @@
    .icon-fangda
    • - +
  • @@ -1617,7 +1632,7 @@
    .icon-shezhi
    • - +
  • @@ -1626,7 +1641,7 @@
    .icon-quanping1
    • - +
  • @@ -1635,7 +1650,7 @@
    .icon-font-weight-bold
    • - +
  • @@ -1644,7 +1659,7 @@
    .icon-letter_spacing
    • - +
  • @@ -1653,7 +1668,7 @@
    .icon-letter-spacing
    • - +
  • @@ -1662,7 +1677,7 @@
    .icon-zimua
    • - +
  • @@ -1671,7 +1686,7 @@
    .icon-format_letter_spacing_
    • - +
  • @@ -1680,7 +1695,7 @@
    .icon-font_size
    • - +
  • @@ -1689,7 +1704,7 @@
    .icon-align-center
    • - +
  • @@ -1698,7 +1713,7 @@
    .icon-juyou
    • - +
  • @@ -1707,7 +1722,7 @@
    .icon-juzuo
    • - +
  • @@ -1716,7 +1731,7 @@
    .icon-solid_line
    • - +
  • @@ -1725,7 +1740,7 @@
    .icon-huabi
    • - +
  • @@ -1734,7 +1749,7 @@
    .icon-dianxian
    • - +
  • @@ -1743,7 +1758,7 @@
    .icon-xuxian
    • - +
  • @@ -1752,7 +1767,7 @@
    .icon-beijingse1
    • - +
  • @@ -1761,7 +1776,7 @@
    .icon-juxing
    • - +
  • @@ -1770,7 +1785,7 @@
    .icon-text
    • - +
  • @@ -1779,7 +1794,7 @@
    .icon-picture
    • - +
  • @@ -1788,7 +1803,7 @@
    .icon-shuru
    • - +
  • @@ -1797,7 +1812,7 @@
    .icon-tree
    • - +
  • @@ -1806,7 +1821,7 @@
    .icon-chaxunsousuo
    • - +
  • @@ -1815,7 +1830,7 @@
    .icon-jidu
    • - +
  • @@ -1824,7 +1839,7 @@
    .icon-shuzishunxu
    • - +
  • @@ -1833,7 +1848,7 @@
    .icon-Group-
    • - +
  • @@ -1842,7 +1857,7 @@
    .icon-riqi
    • - +
  • @@ -1851,7 +1866,7 @@
    .icon-zuoce-qujian
    • - +
  • @@ -1860,7 +1875,7 @@
    .icon-liebiao
    • - +
  • @@ -1869,7 +1884,7 @@
    .icon-xialakuang
    • - +
  • @@ -1878,7 +1893,7 @@
    .icon-xialashu
    • - +
  • @@ -1887,7 +1902,7 @@
    .icon-zhongzhi
    • - +
  • @@ -1896,7 +1911,7 @@
    .icon-ri
    • - +
  • @@ -1905,7 +1920,7 @@
    .icon-nian
    • - +
  • @@ -1914,7 +1929,7 @@
    .icon-yue
    • - +

font-class 引用

@@ -1941,7 +1956,15 @@
    - + +
  • + +
    font
    +
    #icon-font
    +
    • +
  • WATERMARK
    #icon-WATERMARK
    • - +
  • 图层
    #icon-layer
    • - +
  • application
    #icon-application
    • - +
  • data-source-24
    #icon-datasource-select
    • - +
  • 重置
    #icon-zhongzhi2
    • - +
  • None_Select
    #icon-None_Select
    • - +
  • button_right
    #icon-button_right
    • - +
  • icon-maybe
    #icon-icon-maybe
    • - +
  • icon_up-left_outlined
    #icon-icon_up-left_outlined
    • - +
  • close
    #icon-close
    • - +
  • Frame 3425
    #icon-a-Frame3425
    • - +
  • icon-filter
    #icon-icon-filter
    • - +
  • icon_Batch_outlined
    #icon-icon_Batch_outlined
    • - +
  • icon_clear_outlined
    #icon-icon_clear_outlined
    • - +
  • icon_dialpad_outlined
    #icon-icon_dialpad_outlined
    • - +
  • icon_effects_outlined
    #icon-icon_effects_outlined
    • - +
  • icon_magnify_outlined
    #icon-icon_magnify_outlined
    • - +
  • icon_moments-categories_outlined
    #icon-icon_moments-categories_outlined
    • - +
  • icon_pc_outlined
    #icon-icon_pc_outlined
    • - +
  • icon_phone_outlined
    #icon-icon_phone_outlined
    • - +
  • icon_redo_outlined
    #icon-icon_redo_outlined
    • - +
  • icon_undo_outlined
    #icon-icon_undo_outlined
    • - +
  • icon-more
    #icon-icon-more
    • - +
  • icon-quicksetting
    #icon-icon-quicksetting
    • - +
  • square-selected
    #icon-square-selected
    • - +
  • italic
    #icon-italic
    • - +
  • 箭头
    #icon-jiantou
    • - +
  • magic-line
    #icon-magic-line
    • - +
  • 更多
    #icon-gengduo
    • - +
  • 清空
    #icon-qingkong
    • - +
  • 查看
    #icon-chakan
    • - +
  • outline-redo
    #icon-outline-redo
    • - +
  • outline-undo
    #icon-outline-undo
    • - +
  • 定位
    #icon-dingwei
    • - +
  • 富文本框
    #icon-fuwenbenkuang
    • - +
  • 下架
    #icon-unpublish
    • - +
  • 上架
    #icon-publish
    • - +
  • 发布
    #icon-fabu
    • - +
  • 批量操作
    #icon-piliang-copy
    • - +
  • 图片
    #icon-tupian
    • - +
  • 超链接
    #icon-chaolianjie1
    • - +
  • 跳转
    #icon-com-jump
    • - +
  • 跳转
    #icon-component-tiaozhuan
    • - +
  • 网格\表格
    #icon-wangge-open
    • - +
  • 关闭网格
    #icon-wangge-close
    • - +
  • 流媒体，媒体列表
    #icon-a-liumeitimeitiliebiao
    • - +
  • iframe
    #icon-iframe
    • - +
  • 参数
    #icon-canshu
    • - +
  • 更换
    #icon-genghuan
    • - +
  • 发送邮件
    #icon-fasongyoujian
    • - +
  • github
    #icon-github
    • - +
  • 电话
    #icon-dianhua
    • - +
  • 关闭
    #icon-guanbi
    • - +
  • 矩形
    #icon-juxing1
    • - +
  • 移动端
    #icon-yidongduan
    • - +
  • video
    #icon-video
    • - +
  • 悬浮按钮发动态
    #icon-xuanfuanniufadongtai
    • - +
  • 吸附选择
    #icon-xifuxuanze
    • - +
  • margin
    #icon-margin
    • - +
  • padding
    #icon-padding
    • - +
  • 时间
    #icon-shijian
    • - +
  • 时间格式转换
    #icon-shijiangeshizhuanhuan
    • - +
  • 超链接
    #icon-chaolianjie
    • - +
  • 科学技术
    #icon-kexuejishu
    • - +
  • 符号-数据矩阵
    #icon-shujujuzhen
    • - +
  • 视图矩阵_o
    #icon-shitujuzhen_o
    • - +
  • 悬浮
    #icon-xuanfu1
    • - +
  • 右悬浮-选中
    #icon-youxuanfu-copy
    • - +
  • 悬浮
    #icon-xuanfu
    • - +
  • 悬浮按钮
    #icon-xuanfuanniu
    • - +
  • 右悬浮-选中
    #icon-youxuanfu-copy-copy
    • - +
  • 44.tabs
    #icon-tabs
    • - +
  • 洗浴
    #icon-xiyu
    • - +
  • 线性图标-取消下钻
    #icon-quxiaoshangzuan
    • - +
  • 线性图标-取消下钻
    #icon-quxiaoxiazuan
    • - +
  • 联动
    #icon-linkage
    • - +
  • 下钻
    #icon-xiazuan
    • - +
  • 上钻
    #icon-shangzuan
    • - +
  • 取消联动
    #icon-quxiaoliandong
    • - +
  • edit-2
    #icon-edit-outline
    • - +
  • edit-2
    #icon-edit
    • - +
  • 详情
    #icon-xiangqing1
    • - +
  • 弧形框
    #icon-weibiaoti-1
    • - +
  • 弧形框
    #icon-weibiaoti-
    • - +
  • 透明
    #icon-touming
    • - +
  • 弧度
    #icon-fangxing-
    • - +
  • 放大
    #icon-fangda
    • - +
  • 设 置
    #icon-shezhi
    • - +
  • 屏幕_全屏
    #icon-quanping1
    • - +
  • font-weight-bold
    #icon-font-weight-bold
    • - +
  • letter_spacing
    #icon-letter_spacing
    • - +
  • letter-spacing
    #icon-letter-spacing
    • - +
  • 字体颜色
    #icon-zimua
    • - +
  • format_letter_spacing_2
    #icon-format_letter_spacing_
    • - +
  • font_size
    #icon-font_size
    • - +
  • 居中
    #icon-align-center
    • - +
  • 居右
    #icon-juyou
    • - +
  • 居左
    #icon-juzuo
    • - +
  • 实线
    #icon-solid_line
    • - +
  • 画笔
    #icon-huabi
    • - +
  • 点线
    #icon-dianxian
    • - +
  • 虚线
    #icon-xuxian
    • - +
  • 背景色‘
    #icon-beijingse1
    • - +
  • 矩形
    #icon-juxing
    • - +
  • text
    #icon-text
    • - +
  • picture
    #icon-picture
    • - +
  • 输入
    #icon-shuru
    • - +
  • 树
    #icon-tree
    • - +
  • 查询搜索
    #icon-chaxunsousuo
    • - +
  • 季度
    #icon-jidu
    • - +
  • 数字顺序
    #icon-shuzishunxu
    • - +
  • 树列表
    #icon-Group-
    • - +
  • 日期
    #icon-riqi
    • - +
  • 左侧-区间
    #icon-zuoce-qujian
    • - +
  • 列表
    #icon-liebiao
    • - +
  • 下拉框
    #icon-xialakuang
    • - +
  • 下拉树
    #icon-xialashu
    • - +
  • 重置
    #icon-zhongzhi
    • - +
  • 日
    #icon-ri
    • - +
  • 年
    #icon-nian
    • - +
  • 月
    #icon-yue
    • - +

Symbol 引用

diff --git a/frontend/src/styles/deicon/iconfont.css b/frontend/src/styles/deicon/iconfont.css index 4602023a5f..417e999b4a 100644 --- a/frontend/src/styles/deicon/iconfont.css +++ b/frontend/src/styles/deicon/iconfont.css @@ -1,8 +1,8 @@ @font-face { font-family: "iconfont"; /* Project id 2459092 */ - src: url('iconfont.woff2?t=1668397590143') format('woff2'), - url('iconfont.woff?t=1668397590143') format('woff'), - url('iconfont.ttf?t=1668397590143') format('truetype'); + src: url('iconfont.woff2?t=1669087400468') format('woff2'), + url('iconfont.woff?t=1669087400468') format('woff'), + url('iconfont.ttf?t=1669087400468') format('truetype'); } .iconfont { @@ -13,6 +13,10 @@ -moz-osx-font-smoothing: grayscale; } +.icon-font:before { + content: "\e63d"; +} + .icon-WATERMARK:before { content: "\ea16"; } diff --git a/frontend/src/styles/deicon/iconfont.js b/frontend/src/styles/deicon/iconfont.js index 3e8e62d958..6af6d673df 100644 --- a/frontend/src/styles/deicon/iconfont.js +++ b/frontend/src/styles/deicon/iconfont.js @@ -1 +1 @@ -window._iconfont_svg_string_2459092='',function(a){var l=(l=document.getElementsByTagName("script"))[l.length-1],c=l.getAttribute("data-injectcss"),l=l.getAttribute("data-disable-injectsvg");if(!l){var h,i,t,v,o,z=function(l,c){c.parentNode.insertBefore(l,c)};if(c&&!a.__iconfont__svg__cssinject__){a.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(l){console&&console.log(l)}}h=function(){var l,c=document.createElement("div");c.innerHTML=a._iconfont_svg_string_2459092,(c=c.getElementsByTagName("svg")[0])&&(c.setAttribute("aria-hidden","true"),c.style.position="absolute",c.style.width=0,c.style.height=0,c.style.overflow="hidden",c=c,(l=document.body).firstChild?z(c,l.firstChild):l.appendChild(c))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(h,0):(i=function(){document.removeEventListener("DOMContentLoaded",i,!1),h()},document.addEventListener("DOMContentLoaded",i,!1)):document.attachEvent&&(t=h,v=a.document,o=!1,p(),v.onreadystatechange=function(){"complete"==v.readyState&&(v.onreadystatechange=null,m())})}function m(){o||(o=!0,t())}function p(){try{v.documentElement.doScroll("left")}catch(l){return void setTimeout(p,50)}m()}}(window); +window._iconfont_svg_string_2459092='',function(a){var l=(l=document.getElementsByTagName("script"))[l.length-1],c=l.getAttribute("data-injectcss"),l=l.getAttribute("data-disable-injectsvg");if(!l){var h,i,t,v,o,z=function(l,c){c.parentNode.insertBefore(l,c)};if(c&&!a.__iconfont__svg__cssinject__){a.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(l){console&&console.log(l)}}h=function(){var l,c=document.createElement("div");c.innerHTML=a._iconfont_svg_string_2459092,(c=c.getElementsByTagName("svg")[0])&&(c.setAttribute("aria-hidden","true"),c.style.position="absolute",c.style.width=0,c.style.height=0,c.style.overflow="hidden",c=c,(l=document.body).firstChild?z(c,l.firstChild):l.appendChild(c))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(h,0):(i=function(){document.removeEventListener("DOMContentLoaded",i,!1),h()},document.addEventListener("DOMContentLoaded",i,!1)):document.attachEvent&&(t=h,v=a.document,o=!1,p(),v.onreadystatechange=function(){"complete"==v.readyState&&(v.onreadystatechange=null,m())})}function m(){o||(o=!0,t())}function p(){try{v.documentElement.doScroll("left")}catch(l){return void setTimeout(p,50)}m()}}(window); \ No newline at end of file diff --git a/frontend/src/styles/deicon/iconfont.json b/frontend/src/styles/deicon/iconfont.json index b3a60559df..c192e40599 100644 --- a/frontend/src/styles/deicon/iconfont.json +++ b/frontend/src/styles/deicon/iconfont.json @@ -5,6 +5,13 @@ "css_prefix_text": "icon-", "description": "", "glyphs": [ + { + "icon_id": "109745", + "name": "font", + "font_class": "font", + "unicode": "e63d", + "unicode_decimal": 58941 + }, { "icon_id": "23072499", "name": "WATERMARK", diff --git a/frontend/src/styles/deicon/iconfont.ttf b/frontend/src/styles/deicon/iconfont.ttf index 250300b27e7704e0786377a0d9b9db6f133b8958..9cbbe7f95b9051629f4b052e430f26eea4ad7195 100644 GIT binary patch delta 2545 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 diff --git a/frontend/src/styles/deicon/iconfont.woff b/frontend/src/styles/deicon/iconfont.woff index 6dfe2b312d06f3ad49480dc02f7f7d8b6325a495..47cb972f4b9ed8f004e33a39d5ac7f1307457d28 100644 GIT binary patch literal 20304 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 literal 36341 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 YuHPpfMt(M$LHf=~6B!>LkWT;q0vq7EivR!s diff --git a/frontend/src/styles/deicon/iconfont.woff2 b/frontend/src/styles/deicon/iconfont.woff2 index 2952bdbe04ed5198b49e2f5786a8a67a6eee7402..d660c1dd621f6e74fd287706775c1fccbc2ac48e 100644 GIT binary patch literal 17132 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 diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue index 9d34f0a5e5..9b0b7ff39e 100644 --- a/frontend/src/views/chart/view/ChartEdit.vue +++ b/frontend/src/views/chart/view/ChartEdit.vue @@ -192,7 +192,7 @@ @command="chartFieldEdit" > - + - + {{ $t('chart.change_chart_type') }} - + @@ -490,8 +490,8 @@ > {{ - $t('chart.drag_block_table_data_column') - }} + $t('chart.drag_block_table_data_column') + }} {{ $t('chart.drag_block_type_axis') }} @@ -499,18 +499,18 @@ v-else-if="view.type && view.type.includes('pie')" >{{ $t('chart.drag_block_pie_label') }} {{ - $t('chart.drag_block_funnel_split') - }} + $t('chart.drag_block_funnel_split') + }} {{ - $t('chart.drag_block_radar_label') - }} + $t('chart.drag_block_radar_label') + }} {{ $t('chart.area') }} {{ - $t('chart.drag_block_treemap_label') - }} + $t('chart.drag_block_treemap_label') + }} {{ - $t('chart.drag_block_word_cloud_label') - }} + $t('chart.drag_block_word_cloud_label') + }} {{ $t('chart.drag_block_label') }} / {{ $t('chart.dimension') }} @@ -633,8 +633,8 @@ > {{ - $t('chart.drag_block_table_data_column') - }} + $t('chart.drag_block_table_data_column') + }} {{ $t('chart.drag_block_value_axis') }} @@ -642,30 +642,30 @@ v-else-if="view.type && view.type.includes('pie')" >{{ $t('chart.drag_block_pie_angel') }} {{ - $t('chart.drag_block_funnel_width') - }} + $t('chart.drag_block_funnel_width') + }} {{ - $t('chart.drag_block_radar_length') - }} + $t('chart.drag_block_radar_length') + }} {{ - $t('chart.drag_block_gauge_angel') - }} + $t('chart.drag_block_gauge_angel') + }} {{ $t('chart.drag_block_label_value') }} {{ $t('chart.chart_data') }} {{ - $t('chart.drag_block_treemap_size') - }} + $t('chart.drag_block_treemap_size') + }} {{ - $t('chart.drag_block_value_axis_main') - }} + $t('chart.drag_block_value_axis_main') + }} {{ $t('chart.drag_block_progress') }} {{ - $t('chart.drag_block_word_cloud_size') - }} + $t('chart.drag_block_word_cloud_size') + }} / {{ $t('chart.quota') }} - + @@ -1268,7 +1268,7 @@ width="800px" class="dialog-css" > - +

- +
Date: Tue, 22 Nov 2022 11:53:31 +0800 Subject: [PATCH 08/22] =?UTF-8?q?feat(=E8=A7=86=E5=9B=BE):=20=E9=80=8F?= =?UTF-8?q?=E8=A7=86=E8=A1=A8=E6=94=AF=E6=8C=81=E6=8C=89=E5=90=88=E8=AE=A1?= =?UTF-8?q?=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/package.json | 2 +- frontend/src/views/chart/chart/table/table-info.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/package.json b/frontend/package.json index 15c23737b0..2c535eb052 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -35,7 +35,7 @@ "@antv/l7-scene": "2.8.31", "@antv/l7-source": "2.8.31", "@antv/l7-utils": "2.8.31", - "@antv/s2": "^1.11.0", + "@antv/s2": "1.35.0", "@antv/util": "^2.0.17", "@riophae/vue-treeselect": "0.4.0", "@tinymce/tinymce-vue": "^3.2.8", diff --git a/frontend/src/views/chart/chart/table/table-info.js b/frontend/src/views/chart/chart/table/table-info.js index 976215d370..5e7a7d552f 100644 --- a/frontend/src/views/chart/chart/table/table-info.js +++ b/frontend/src/views/chart/chart/table/table-info.js @@ -424,7 +424,7 @@ export function baseTablePivot(s2, container, chart, action, tableData) { // 解析合计、小计排序 const sortParams = [] - if (totalCfg.row.totalSort && totalCfg.row.totalSort !== 'none' && c.length > 0) { + if (totalCfg.row.totalSort && totalCfg.row.totalSort !== 'none' && c.length > 0 && totalCfg.row.showGrandTotals) { const sort = { sortFieldId: c[0], sortMethod: totalCfg.row.totalSort.toUpperCase(), @@ -435,7 +435,7 @@ export function baseTablePivot(s2, container, chart, action, tableData) { } sortParams.push(sort) } - if (totalCfg.col.totalSort && totalCfg.col.totalSort !== 'none' && r.length > 0) { + if (totalCfg.col.totalSort && totalCfg.col.totalSort !== 'none' && r.length > 0 && totalCfg.col.showGrandTotals) { const sort = { sortFieldId: r[0], sortMethod: totalCfg.col.totalSort.toUpperCase(), From 282a13475bbcee171c56a316cf76cabbeab1e32d Mon Sep 17 00:00:00 2001 From: junjun Date: Tue, 22 Nov 2022 12:57:44 +0800 Subject: [PATCH 09/22] =?UTF-8?q?feat(=E8=A7=86=E5=9B=BE):=20=E9=80=8F?= =?UTF-8?q?=E8=A7=86=E8=A1=A8=E8=A1=8C=E6=B1=87=E6=80=BB=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E6=8C=89=E5=90=88=E8=AE=A1=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/chart/chart/table/table-info.js | 1 + frontend/src/views/chart/components/shapeAttr/TotalCfg.vue | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/frontend/src/views/chart/chart/table/table-info.js b/frontend/src/views/chart/chart/table/table-info.js index 5e7a7d552f..3d12c5cc62 100644 --- a/frontend/src/views/chart/chart/table/table-info.js +++ b/frontend/src/views/chart/chart/table/table-info.js @@ -435,6 +435,7 @@ export function baseTablePivot(s2, container, chart, action, tableData) { } sortParams.push(sort) } + totalCfg.col.totalSort = false if (totalCfg.col.totalSort && totalCfg.col.totalSort !== 'none' && r.length > 0 && totalCfg.col.showGrandTotals) { const sort = { sortFieldId: r[0], diff --git a/frontend/src/views/chart/components/shapeAttr/TotalCfg.vue b/frontend/src/views/chart/components/shapeAttr/TotalCfg.vue index bac489ec89..49ef97efe2 100644 --- a/frontend/src/views/chart/components/shapeAttr/TotalCfg.vue +++ b/frontend/src/views/chart/components/shapeAttr/TotalCfg.vue @@ -225,7 +225,7 @@ @@ -239,7 +239,7 @@ From 98acbb10d364d62a3530a9f890613787095ece98 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Tue, 22 Nov 2022 14:00:11 +0800 Subject: [PATCH 10/22] =?UTF-8?q?feat:=20Excel=E7=A9=BA=E5=8D=95=E5=85=83?= =?UTF-8?q?=E6=A0=BC=E4=B8=8D=E5=8F=82=E4=B8=8E=E7=B1=BB=E5=9E=8B=E5=88=A4?= =?UTF-8?q?=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commons/utils/ExcelXlsReader.java | 53 ++++---- .../commons/utils/ExcelXlsxReader.java | 114 ++++++++++-------- 2 files changed, 87 insertions(+), 80 deletions(-) diff --git a/backend/src/main/java/io/dataease/commons/utils/ExcelXlsReader.java b/backend/src/main/java/io/dataease/commons/utils/ExcelXlsReader.java index f998cfa398..59744d8384 100644 --- a/backend/src/main/java/io/dataease/commons/utils/ExcelXlsReader.java +++ b/backend/src/main/java/io/dataease/commons/utils/ExcelXlsReader.java @@ -125,12 +125,11 @@ public class ExcelXlsReader implements HSSFListener { return data; } - public void setData(List> data) { + public void setData(List> data) { this.data = data; } - /** * 遍历excel下所有的sheet * @@ -212,8 +211,8 @@ public class ExcelXlsReader implements HSSFListener { thisColumn = frec.getColumn(); thisStr = String.valueOf(frec.getValue()); String fieldType = checkType(thisStr, thisColumn); - if(fieldType.equalsIgnoreCase("LONG") && thisStr.endsWith(".0")){ - thisStr = thisStr.substring(0, thisStr.length() -2); + if (fieldType != null && fieldType.equalsIgnoreCase("LONG") && thisStr.endsWith(".0")) { + thisStr = thisStr.substring(0, thisStr.length() - 2); } cellList.add(thisColumn, thisStr); checkRowIsNull(thisStr); //如果里面某个单元格含有值，则标识该行不为空行 @@ -268,9 +267,9 @@ public class ExcelXlsReader implements HSSFListener { value = value.equals("") ? "" : value; //向容器加入列值 cellList.add(thisColumn, value); - if(formatIndex == 59 || formatIndex== 14){ - totalSheets.get(totalSheets.size() -1).getFields().get(thisColumn).setFieldType("DATETIME"); - }else { + if (formatIndex == 59 || formatIndex == 14) { + totalSheets.get(totalSheets.size() - 1).getFields().get(thisColumn).setFieldType("DATETIME"); + } else { checkType(value, thisColumn); } checkRowIsNull(value); //如果里面某个单元格含有值，则标识该行不为空行 @@ -308,7 +307,7 @@ public class ExcelXlsReader implements HSSFListener { } lastColumnNumber = -1; - if(!totalSheets.stream().map(ExcelSheetData::getExcelLabel).collect(Collectors.toList()).contains(sheetName)){ + if (!totalSheets.stream().map(ExcelSheetData::getExcelLabel).collect(Collectors.toList()).contains(sheetName)) { ExcelSheetData excelSheetData = new ExcelSheetData(); excelSheetData.setExcelLabel(sheetName); excelSheetData.setData(new ArrayList<>()); @@ -316,7 +315,7 @@ public class ExcelXlsReader implements HSSFListener { totalSheets.add(excelSheetData); } - if(curRow == 0){ + if (curRow == 0) { for (String s : cellList) { TableField tableField = new TableField(); tableField.setFieldType("TEXT"); @@ -324,13 +323,13 @@ public class ExcelXlsReader implements HSSFListener { tableField.setFieldName(s); tableField.setRemarks(s); this.fields.add(tableField); - totalSheets.get(totalSheets.size() -1).getFields().add(tableField); + totalSheets.get(totalSheets.size() - 1).getFields().add(tableField); } } if (flag && curRow != 0) { //该行不为空行且该行不是第一行，发送（第一行为列名，不需要） - if(!totalSheets.stream().map(ExcelSheetData::getExcelLabel).collect(Collectors.toList()).contains(sheetName)){ + if (!totalSheets.stream().map(ExcelSheetData::getExcelLabel).collect(Collectors.toList()).contains(sheetName)) { ExcelSheetData excelSheetData = new ExcelSheetData(); excelSheetData.setData(new ArrayList<>(data)); excelSheetData.setExcelLabel(sheetName); @@ -339,13 +338,13 @@ public class ExcelXlsReader implements HSSFListener { excelSheetData.getData().add(tmp); totalRows++; totalSheets.add(excelSheetData); - }else { + } else { List tmp = new ArrayList<>(cellList); - if(obtainedNum != null && totalSheets.stream().filter(s->s.getExcelLabel().equalsIgnoreCase(sheetName)).collect(Collectors.toList()).get(0).getData().size() < obtainedNum){ - totalSheets.stream().filter(s->s.getExcelLabel().equalsIgnoreCase(sheetName)).collect(Collectors.toList()).get(0).getData().add(tmp); + if (obtainedNum != null && totalSheets.stream().filter(s -> s.getExcelLabel().equalsIgnoreCase(sheetName)).collect(Collectors.toList()).get(0).getData().size() < obtainedNum) { + totalSheets.stream().filter(s -> s.getExcelLabel().equalsIgnoreCase(sheetName)).collect(Collectors.toList()).get(0).getData().add(tmp); } - if(obtainedNum == null){ - totalSheets.stream().filter(s->s.getExcelLabel().equalsIgnoreCase(sheetName)).collect(Collectors.toList()).get(0).getData().add(tmp); + if (obtainedNum == null) { + totalSheets.stream().filter(s -> s.getExcelLabel().equalsIgnoreCase(sheetName)).collect(Collectors.toList()).get(0).getData().add(tmp); } totalRows++; } @@ -369,7 +368,7 @@ public class ExcelXlsReader implements HSSFListener { } - private String checkType(String str, int thisColumn){ + private String checkType(String str, int thisColumn) { String type = null; try { double d = Double.valueOf(str); @@ -382,22 +381,20 @@ public class ExcelXlsReader implements HSSFListener { type = "DOUBLE"; } } catch (Exception e) { - type = "TEXT"; } - }catch (Exception e){ - type = "TEXT"; + } catch (Exception e) { } - if(curRow==1){ - totalSheets.get(totalSheets.size() -1).getFields().get(thisColumn).setFieldType(type); + if (curRow == 1) { + totalSheets.get(totalSheets.size() - 1).getFields().get(thisColumn).setFieldType(type == null ? "TEXT" : type); } - if(curRow > 1) { - String oldType = totalSheets.get(totalSheets.size() -1).getFields().get(thisColumn).getFieldType(); - if(type.equalsIgnoreCase("TEXT")){ - totalSheets.get(totalSheets.size() -1).getFields().get(thisColumn).setFieldType(type); + if (curRow > 1 && type != null) { + String oldType = totalSheets.get(totalSheets.size() - 1).getFields().get(thisColumn).getFieldType(); + if (type.equalsIgnoreCase("TEXT")) { + totalSheets.get(totalSheets.size() - 1).getFields().get(thisColumn).setFieldType(type); } - if(type.equalsIgnoreCase("DOUBLE") && oldType.equalsIgnoreCase("LONG")){ - totalSheets.get(totalSheets.size() -1).getFields().get(thisColumn).setFieldType(type); + if (type.equalsIgnoreCase("DOUBLE") && oldType.equalsIgnoreCase("LONG")) { + totalSheets.get(totalSheets.size() - 1).getFields().get(thisColumn).setFieldType(type); } } return type; diff --git a/backend/src/main/java/io/dataease/commons/utils/ExcelXlsxReader.java b/backend/src/main/java/io/dataease/commons/utils/ExcelXlsxReader.java index 1d7be1dc7d..d144b05d7d 100644 --- a/backend/src/main/java/io/dataease/commons/utils/ExcelXlsxReader.java +++ b/backend/src/main/java/io/dataease/commons/utils/ExcelXlsxReader.java @@ -1,4 +1,5 @@ package io.dataease.commons.utils; + import io.dataease.dto.dataset.ExcelSheetData; import io.dataease.i18n.Translator; import io.dataease.plugins.common.dto.datasource.TableField; @@ -35,7 +36,8 @@ public class ExcelXlsxReader extends DefaultHandler { /** * 自定义获取表格某些信 */ - public Map map = new TreeMap(); + public Map map = new TreeMap(); + /** * 单元格中的数据可能的数据类型 */ @@ -56,7 +58,7 @@ public class ExcelXlsxReader extends DefaultHandler { /** * 总行数 */ - private int totalRows=0; + private int totalRows = 0; /** * 一行内cell集合 @@ -101,7 +103,6 @@ public class ExcelXlsxReader extends DefaultHandler { private String formatString; - //定义前一个元素和当前元素的位置，用来计算其中空的单元格数量，如A6和A8等 private String preRef = null, ref = null; @@ -143,7 +144,7 @@ public class ExcelXlsxReader extends DefaultHandler { return data; } - public void setData(List> data) { + public void setData(List> data) { this.data = data; } @@ -190,11 +191,11 @@ public class ExcelXlsxReader extends DefaultHandler { */ @Override public void startElement(String uri, String localName, String name, Attributes attributes) throws SAXException { - if(this.obtainedNum !=null && curRow>this.obtainedNum){ + if (this.obtainedNum != null && curRow > this.obtainedNum) { return; } - if(name.equalsIgnoreCase("mergeCell")){ + if (name.equalsIgnoreCase("mergeCell")) { throw new RuntimeException(Translator.get("i18n_excel_have_merge_region")); } //c => 单元格 @@ -221,6 +222,7 @@ public class ExcelXlsxReader extends DefaultHandler { * 得到单元格对应的索引值或是内容值 * 如果单元格类型是字符串、INLINESTR、数字、日期，lastIndex则是索引值 * 如果单元格类型是布尔值、错误、公式，lastIndex则是内容值 + * * @param ch * @param start * @param length @@ -228,7 +230,7 @@ public class ExcelXlsxReader extends DefaultHandler { */ @Override public void characters(char[] ch, int start, int length) throws SAXException { - if(this.obtainedNum !=null && curRow>this.obtainedNum){ + if (this.obtainedNum != null && curRow > this.obtainedNum) { return; } lastIndex += new String(ch, start, length); @@ -244,14 +246,14 @@ public class ExcelXlsxReader extends DefaultHandler { */ @Override public void endElement(String uri, String localName, String name) throws SAXException { - if(this.obtainedNum !=null && curRow>this.obtainedNum){ + if (this.obtainedNum != null && curRow > this.obtainedNum) { return; } //t元素也包含字符串 if (isTElement) { //这个程序没经过 //将单元格内容加入rowlist中，在这之前先去掉字符串前后的空白符 String value = lastIndex.trim(); - if(curRow==1){ + if (curRow == 1) { TableField tableField = new TableField(); tableField.setFieldType("TEXT"); tableField.setFieldSize(65533); @@ -271,21 +273,21 @@ public class ExcelXlsxReader extends DefaultHandler { String value = this.getDataValue(lastIndex.trim(), "");//根据索引值获取对应的单元格值 if (preRef == null) { preRef = "A" + curRow; - if(!preRef.equalsIgnoreCase(ref)){ + if (!preRef.equalsIgnoreCase(ref)) { cellList.add(curCol, ""); curCol++; } } //补全单元格之间的空单元格 - if (!"A".equals(preRef.substring(0, 1)) && curRow==1 && preRef.equalsIgnoreCase(ref)) { + if (!"A".equals(preRef.substring(0, 1)) && curRow == 1 && preRef.equalsIgnoreCase(ref)) { throw new RuntimeException(Translator.get("i18n_excel_empty_column")); - }else if (!ref.equals(preRef)) { + } else if (!ref.equals(preRef)) { int len = countNullCell(ref, preRef); for (int i = 0; i < len; i++) { - if(curCol < this.fields.size()){ + if (curCol < this.fields.size()) { cellList.add(curCol, ""); - if(curRow==1){ + if (curRow == 1) { addField("", curCol); } curCol++; @@ -293,7 +295,7 @@ public class ExcelXlsxReader extends DefaultHandler { } } - if(curCol < this.fields.size()){ + if (curCol < this.fields.size()) { cellList.add(curCol, value); } curCol++; @@ -309,8 +311,8 @@ public class ExcelXlsxReader extends DefaultHandler { if (curRow == 1) { maxRef = ref; } - if(curRow>1){ - for (int i=cellList.size();i 1) { + for (int i = cellList.size(); i < this.fields.size(); i++) { cellList.add(""); } List tmp = new ArrayList<>(cellList); @@ -322,7 +324,7 @@ public class ExcelXlsxReader extends DefaultHandler { curCol = 0; preRef = null; ref = null; - flag=false; + flag = false; } } } @@ -357,9 +359,8 @@ public class ExcelXlsxReader extends DefaultHandler { formatIndex = style.getDataFormat(); formatString = style.getDataFormatString(); short format = this.formatIndex; - if ( (14 <= format && format <= 17) || format == 20 || format == 22 || format == 31 || format == 35 || format == 45 || format == 46 || format == 47 || (57 <= format && format <= 59) - || (175 < format && format < 178) || (182 <= format && format <= 196) || (210 <= format && format <= 213) || (208 == format)) - { // 日期 + if ((14 <= format && format <= 17) || format == 20 || format == 22 || format == 31 || format == 35 || format == 45 || format == 46 || format == 47 || (57 <= format && format <= 59) + || (175 < format && format < 178) || (182 <= format && format <= 196) || (210 <= format && format <= 213) || (208 == format)) { // 日期 isDateFormat = true; } @@ -369,6 +370,7 @@ public class ExcelXlsxReader extends DefaultHandler { /** * 对解析出来的数据进行类型处理 + * * @param value 单元格的值， * value代表解析：BOOL的为0或1， ERROR的为内容值，FORMULA的为内容值，INLINESTR的为索引值需转换为内容值， * SSTINDEX的为索引值需转换为内容值， NUMBER为内容值，DATE为内容值 @@ -377,7 +379,7 @@ public class ExcelXlsxReader extends DefaultHandler { */ @SuppressWarnings("deprecation") public String getDataValue(String value, String thisStr) { - String type = "TEXT"; + String type = null; switch (nextDataType) { // 这几个的顺序不能随便交换，交换了很可能会导致数据错误 case BOOL: //布尔值 @@ -401,11 +403,11 @@ public class ExcelXlsxReader extends DefaultHandler { String sstIndex = value.toString(); try { int idx = Integer.parseInt(sstIndex); - if(sst != null){ + if (sst != null) { XSSFRichTextString rtss = new XSSFRichTextString(sst.getEntryAt(idx));//根据idx索引值获取内容值 thisStr = rtss.toString(); rtss = null; - }else { + } else { thisStr = value.toString(); } @@ -422,12 +424,13 @@ public class ExcelXlsxReader extends DefaultHandler { } thisStr = thisStr.replace("_", "").trim(); - if(isDateFormat ){ - type = "DATETIME";isDateFormat = false; - if(formatString != null && formatString.contains("%")){ + if (isDateFormat) { + type = "DATETIME"; + isDateFormat = false; + if (formatString != null && formatString.contains("%")) { type = getType(thisStr); } - }else { + } else { type = getType(thisStr); } break; @@ -441,60 +444,67 @@ public class ExcelXlsxReader extends DefaultHandler { thisStr = " "; break; } - if(curRow==1){ + if (curRow == 1) { addField(thisStr, null); - }else { - if(CollectionUtils.isEmpty(this.getFields())){ + } else { + if (CollectionUtils.isEmpty(this.getFields())) { throw new RuntimeException(Translator.get("i18n_excel_header_empty")); } - if(curCol >= this.fields.size()){ + if (curCol >= this.fields.size()) { return thisStr; } - if(curRow==2){ - this.getFields().get(curCol).setFieldType(type); - }else { - if(type.equalsIgnoreCase("TEXT")){ + if (curRow == 2) { + if (type != null) { this.getFields().get(curCol).setFieldType(type); } - if(type.equalsIgnoreCase("DOUBLE") && this.getFields().get(curCol).getFieldType().equalsIgnoreCase("LONG")){ - this.getFields().get(curCol).setFieldType(type); - } - if(type.equalsIgnoreCase("DATETIME")){ - this.getFields().get(curCol).setFieldType(type); + } else { + if (type != null) { + if (type.equalsIgnoreCase("TEXT")) { + this.getFields().get(curCol).setFieldType(type); + } + if (type.equalsIgnoreCase("DOUBLE") && this.getFields().get(curCol).getFieldType().equalsIgnoreCase("LONG")) { + this.getFields().get(curCol).setFieldType(type); + } + if (type.equalsIgnoreCase("DATETIME")) { + this.getFields().get(curCol).setFieldType(type); + } } } } return thisStr; } - private void addField(String columeName, Integer index){ + private void addField(String columeName, Integer index) { TableField tableField = new TableField(); tableField.setFieldType("TEXT"); tableField.setFieldSize(65533); tableField.setFieldName(columeName); tableField.setRemarks(columeName); - if(index != null){ + if (index != null) { this.fields.add(index, tableField); - }else { + } else { this.fields.add(tableField); } } - private String getType(String thisStr){ - if(totalRows==0){ + + private String getType(String thisStr) { + if (totalRows == 0) { return "TEXT"; } - try{ - if(thisStr.endsWith("%")){ - thisStr = thisStr.substring(0, thisStr.length()-1); - thisStr = String.valueOf(Double.valueOf(thisStr)/100); + + try { + if (thisStr.endsWith("%")) { + thisStr = thisStr.substring(0, thisStr.length() - 1); + thisStr = String.valueOf(Double.valueOf(thisStr) / 100); } Long.valueOf(thisStr); return "LONG"; - }catch (Exception e){ + } catch (Exception e) { try { Double.valueOf(thisStr); return "DOUBLE"; - }catch (Exception ignore){ } + } catch (Exception ignore) { + } } return "TEXT"; } From bbea8ecef85afef5805fefa334d55612b9c82391 Mon Sep 17 00:00:00 2001 From: dataeaseShu <106045316+dataeaseShu@users.noreply.github.com> Date: Tue, 22 Nov 2022 15:11:39 +0800 Subject: [PATCH 11/22] =?UTF-8?q?feat:=20=E9=80=89=E6=8B=A9=E6=97=A5?= =?UTF-8?q?=E6=9C=9F=E8=A7=A3=E6=9E=90=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/lang/en.js | 1 + frontend/src/lang/tw.js | 1 + frontend/src/lang/zh.js | 1 + frontend/src/views/chart/view/ChartEdit.vue | 2 - frontend/src/views/dataset/data/FieldEdit.vue | 135 +++++++++++------- 5 files changed, 87 insertions(+), 53 deletions(-) diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index 1979ce85d2..c52860c2ef 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -918,6 +918,7 @@ export default { layer_controller: 'Quota switch', suspension: 'Suspension', chart_background: 'Component background', + date_format: 'Select date resolution format', solid_color: 'Solid color', split_gradient: 'Split gradient', continuous_gradient: 'Continuous gradient', diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js index 4914de9835..48825494a1 100644 --- a/frontend/src/lang/tw.js +++ b/frontend/src/lang/tw.js @@ -918,6 +918,7 @@ export default { layer_controller: '指標切換', suspension: '懸浮', chart_background: '組件背景', + date_format: '選擇日期解析格式', solid_color: '純色', split_gradient: '分離漸變', continuous_gradient: '連續漸變', diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index 88749cf7c9..a5ec7337bf 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -917,6 +917,7 @@ export default { layer_controller: '指标切换', suspension: '悬浮', chart_background: '组件背景', + date_format: '请选择日期解析格式', solid_color: '纯色', split_gradient: '分离渐变', continuous_gradient: '连续渐变', diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue index 30ac660e0c..9b0b7ff39e 100644 --- a/frontend/src/views/chart/view/ChartEdit.vue +++ b/frontend/src/views/chart/view/ChartEdit.vue @@ -1655,14 +1655,12 @@ import ScrollCfg from '@/views/chart/components/senior/ScrollCfg' import ChartFieldEdit from '@/views/chart/view/ChartFieldEdit' import CalcChartFieldEdit from '@/views/chart/view/CalcChartFieldEdit' import { equalsAny } from '@/utils/StringUtils' -import MarginSelector from '@/views/chart/components/componentStyle/MarginSelector' import PositionAdjust from '@/views/chart/view/PositionAdjust' export default { name: 'ChartEdit', components: { PositionAdjust, - MarginSelector, ScrollCfg, CalcChartFieldEdit, ChartFieldEdit, diff --git a/frontend/src/views/dataset/data/FieldEdit.vue b/frontend/src/views/dataset/data/FieldEdit.vue index 6e879d8947..dc35dffd72 100644 --- a/frontend/src/views/dataset/data/FieldEdit.vue +++ b/frontend/src/views/dataset/data/FieldEdit.vue @@ -141,46 +141,49 @@ min-width="200" >