diff --git a/frontend/src/views/chart/components/normal/LabelNormalText.vue b/frontend/src/views/chart/components/normal/LabelNormalText.vue
index db542ec0a0..17fb477a6e 100644
--- a/frontend/src/views/chart/components/normal/LabelNormalText.vue
+++ b/frontend/src/views/chart/components/normal/LabelNormalText.vue
@@ -1,7 +1,12 @@
-
{{ chart.title }}
+
+
+
From f3d8eb3d745c2885afd4b0e745a3bb4218dfb31d Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw
Date: Mon, 25 Jul 2022 10:36:25 +0800
Subject: [PATCH 15/19] =?UTF-8?q?fix(=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86)?=
=?UTF-8?q?:=20=E5=AE=9A=E6=97=B6=E6=8A=A5=E5=91=8A=E5=8F=91=E5=A2=9E?=
=?UTF-8?q?=E5=8A=A0=E8=A7=86=E5=9B=BEId=E9=9B=86=E5=90=88=E6=B3=A8?=
=?UTF-8?q?=E9=87=8A=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
backend/src/main/resources/db/migration/V38__1.13.sql | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/backend/src/main/resources/db/migration/V38__1.13.sql b/backend/src/main/resources/db/migration/V38__1.13.sql
index 0817d25c1d..7ad0eab53f 100644
--- a/backend/src/main/resources/db/migration/V38__1.13.sql
+++ b/backend/src/main/resources/db/migration/V38__1.13.sql
@@ -77,4 +77,4 @@ ALTER TABLE `panel_group`
ADD COLUMN `update_time` bigint(13) NULL COMMENT '更新时间' AFTER `update_by`;
ALTER TABLE `sys_task_email`
-ADD COLUMN `view_ids` varchar(255) NULL COMMENT '视图ID结婚' AFTER `task_id`;
+ADD COLUMN `view_ids` varchar(255) NULL COMMENT '视图ID集合' AFTER `task_id`;
From 03e81d2205e1482540c299a5e411b3a95dfb4ee8 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Mon, 25 Jul 2022 11:57:49 +0800
Subject: [PATCH 16/19] =?UTF-8?q?refactor(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?=
=?UTF-8?q?=E4=BB=AA=E8=A1=A8=E6=9D=BF=E7=9A=84=E5=A4=8D=E7=94=A8=E6=94=AF?=
=?UTF-8?q?=E6=8C=81=E5=A4=8D=E7=94=A8=E6=89=80=E6=9C=89=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../components/Editor/ComponentWrapper.vue | 4 +--
.../canvas/components/Editor/EditBar.vue | 27 ++++++++++++++++---
.../canvas/custom-component/UserView.vue | 2 +-
frontend/src/components/canvas/store/copy.js | 4 +--
.../src/components/widget/DeWidget/DeTabs.vue | 6 +++++
frontend/src/layout/components/Topbar.vue | 2 +-
frontend/src/permission.js | 3 ++-
7 files changed, 37 insertions(+), 11 deletions(-)
diff --git a/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue b/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue
index 0c1bd92118..fdd949c3bc 100644
--- a/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue
+++ b/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue
@@ -5,7 +5,7 @@
@click="handleClick"
@mousedown="elementMouseDown"
>
-
+
+
+
+
@@ -73,10 +76,16 @@ export default {
previewVisible: {
type: Boolean,
default: false
+ },
+ showPosition: {
+ type: String,
+ required: false,
+ default: 'NotProvided'
}
},
data() {
return {
+ multiplexingCheckModel: false,
barWidth: 24,
componentType: null,
linkageActiveStatus: false,
@@ -106,7 +115,6 @@ export default {
return 'bar-main-preview'
}
},
-
showJumpFlag() {
return this.curComponent && this.curComponent.hyperlinks && this.curComponent.hyperlinks.enable
},
@@ -120,7 +128,7 @@ export default {
},
// 编辑或预览区域显示
normalAreaShow() {
- return !this.linkageSettingStatus && !this.batchOptStatus
+ return !this.linkageSettingStatus && !this.batchOptStatus && !this.positionCheck('multiplexing')
},
existLinkage() {
let linkageFiltersCount = 0
@@ -166,6 +174,18 @@ export default {
beforeDestroy() {
},
methods: {
+ positionCheck(position) {
+ return this.showPosition.includes(position)
+ },
+ multiplexingCheck(val) {
+ if (val) {
+ // push
+ this.$store.commit('addCurMultiplexingComponent', { 'component': this.element, 'componentId': this.element.id })
+ } else {
+ // remove
+ this.$store.commit('removeCurMultiplexingComponentWithId', this.element.id )
+ }
+ },
closePreview() {
this.$emit('closePreview')
},
@@ -217,8 +237,7 @@ export default {
edit() {
if (this.curComponent.type === 'custom') {
bus.$emit('component-dialog-edit', 'update')
- }
- else if (this.curComponent.type === 'custom-button') {
+ } else if (this.curComponent.type === 'custom-button') {
bus.$emit('button-dialog-edit')
} else if (this.curComponent.type === 'v-text' || this.curComponent.type === 'de-rich-text' || this.curComponent.type === 'rect-shape') {
bus.$emit('component-dialog-style')
diff --git a/frontend/src/components/canvas/custom-component/UserView.vue b/frontend/src/components/canvas/custom-component/UserView.vue
index 498a06a4cd..56b45d5e42 100644
--- a/frontend/src/components/canvas/custom-component/UserView.vue
+++ b/frontend/src/components/canvas/custom-component/UserView.vue
@@ -236,7 +236,7 @@ export default {
}
},
editBarViewShowFlag() {
- return (this.active && this.inTab && !this.mobileLayoutStatus) || this.showPosition.includes('multiplexing') || this.showPosition.includes('email-task')
+ return (this.active && this.inTab && !this.mobileLayoutStatus) && !this.showPosition.includes('multiplexing') || this.showPosition.includes('email-task')
},
charViewShowFlag() {
return this.httpRequest.status && this.chart.type && !this.chart.type.includes('table') && !this.chart.type.includes('text') && this.chart.type !== 'label' && this.renderComponent() === 'echarts'
diff --git a/frontend/src/components/canvas/store/copy.js b/frontend/src/components/canvas/store/copy.js
index 0771f09a48..1c5ded3c56 100644
--- a/frontend/src/components/canvas/store/copy.js
+++ b/frontend/src/components/canvas/store/copy.js
@@ -35,10 +35,10 @@ export default {
const canvasStyleData = state.canvasStyleData
const curCanvasScale = state.curCanvasScale
const componentGap = state.componentGap
- Object.keys(state.curMultiplexingComponents).forEach(function(viewId, index) {
+ Object.keys(state.curMultiplexingComponents).forEach(function(componentId, index) {
const component =
{
- ...deepCopy(state.curMultiplexingComponents[viewId]),
+ ...deepCopy(state.curMultiplexingComponents[componentId]),
...deepCopy(deepCopy(state.viewBase)),
'auxiliaryMatrix': canvasStyleData.auxiliaryMatrix
}
diff --git a/frontend/src/components/widget/DeWidget/DeTabs.vue b/frontend/src/components/widget/DeWidget/DeTabs.vue
index a250968fff..97ed4dcb29 100644
--- a/frontend/src/components/widget/DeWidget/DeTabs.vue
+++ b/frontend/src/components/widget/DeWidget/DeTabs.vue
@@ -80,6 +80,7 @@
:filters="filterMap[item.content.propValue && item.content.propValue.viewId] || []"
:out-style="outStyle"
:canvas-style-data="canvasStyleData"
+ :show-position="showPosition"
/>
@@ -193,6 +194,11 @@ export default {
h: {
type: Number,
default: 200
+ },
+ showPosition: {
+ type: String,
+ required: false,
+ default: 'NotProvided'
}
},
data() {
diff --git a/frontend/src/layout/components/Topbar.vue b/frontend/src/layout/components/Topbar.vue
index 9459ee439d..5786652d3d 100644
--- a/frontend/src/layout/components/Topbar.vue
+++ b/frontend/src/layout/components/Topbar.vue
@@ -329,7 +329,7 @@ export default {
if (result !== 'success' && result !== 'fail') {
window.location.href = result
} else {
- this.$router.push(`/login?redirect=${this.$route.fullPath}`)
+ this.$router.push('/login')
}
},
loadUiInfo() {
diff --git a/frontend/src/permission.js b/frontend/src/permission.js
index e06dc31f53..a2898d8ab1 100644
--- a/frontend/src/permission.js
+++ b/frontend/src/permission.js
@@ -92,7 +92,8 @@ router.beforeEach(async(to, from, next) => {
next()
} else {
// other pages that do not have permission to access are redirected to the login page.
- next(`/login?redirect=${to.path}`)
+ // next(`/login?redirect=${to.path}`)
+ next('/login')
NProgress.done()
}
}
From 4607b80751e107768bf85e8c14fe7b3519ddbff9 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Mon, 25 Jul 2022 12:04:29 +0800
Subject: [PATCH 17/19] =?UTF-8?q?refactor(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?=
=?UTF-8?q?=E4=BB=AA=E8=A1=A8=E6=9D=BF=E7=9A=84=E5=A4=8D=E7=94=A8=E6=94=AF?=
=?UTF-8?q?=E6=8C=81=E5=A4=8D=E7=94=A8=E6=89=80=E6=9C=89=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
frontend/src/components/canvas/store/copy.js | 1 +
1 file changed, 1 insertion(+)
diff --git a/frontend/src/components/canvas/store/copy.js b/frontend/src/components/canvas/store/copy.js
index 1c5ded3c56..4eba66bfef 100644
--- a/frontend/src/components/canvas/store/copy.js
+++ b/frontend/src/components/canvas/store/copy.js
@@ -105,6 +105,7 @@ export default {
} else if (data.type === 'de-tabs') {
const sourceAndTargetIds = {}
const newCop = deepCopy(data)
+ newCop.id = uuid.v1()
newCop.options.tabList.forEach((item) => {
if (item.content && item.content.type === 'view') {
const newViewId = uuid.v1()
From b4c67fee500d0112613696b9c9b34f492a3dbb4c Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw
Date: Mon, 25 Jul 2022 13:07:15 +0800
Subject: [PATCH 18/19] =?UTF-8?q?fix(=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86)?=
=?UTF-8?q?:=20=E5=AE=9A=E6=97=B6=E6=8A=A5=E5=91=8A=E5=8F=91=E9=80=81?=
=?UTF-8?q?=E9=82=AE=E4=BB=B6=E9=99=84=E4=BB=B6=E5=90=8D=E7=A7=B0=E8=BF=87?=
=?UTF-8?q?=E9=95=BF=E5=AF=BC=E8=87=B4=E5=B1=95=E7=A4=BA=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/main/java/io/dataease/service/system/EmailService.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/backend/src/main/java/io/dataease/service/system/EmailService.java b/backend/src/main/java/io/dataease/service/system/EmailService.java
index ddf3ff2f06..483ddd4056 100644
--- a/backend/src/main/java/io/dataease/service/system/EmailService.java
+++ b/backend/src/main/java/io/dataease/service/system/EmailService.java
@@ -140,6 +140,7 @@ public class EmailService {
attach.setFileName(MimeUtility.encodeText(file.getName()));
multipart.addBodyPart(attach);
}
+ System.getProperties().setProperty("mail.mime.splitlongparameters", "false");
multipart.setSubType("related");
return multipart;
}
From 07956353784fb1157a197faade08e27c426c42cf Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Mon, 25 Jul 2022 16:10:33 +0800
Subject: [PATCH 19/19] =?UTF-8?q?refactor(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?=
=?UTF-8?q?=E4=BB=AA=E8=A1=A8=E6=9D=BF=E8=83=8C=E6=99=AF=E6=94=AF=E6=8C=81?=
=?UTF-8?q?=E7=9B=B4=E6=8E=A5=E9=87=8D=E6=96=B0=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/api/staticResource/staticResource.js | 10 +-
frontend/src/lang/en.js | 11 +-
frontend/src/lang/tw.js | 3 +
frontend/src/lang/zh.js | 3 +
frontend/src/views/background/index.vue | 2 +-
.../PanelStyle/BackgroundSelector.vue | 152 ++++++++++++------
6 files changed, 121 insertions(+), 60 deletions(-)
diff --git a/frontend/src/api/staticResource/staticResource.js b/frontend/src/api/staticResource/staticResource.js
index 40ee10055e..9af311c16d 100644
--- a/frontend/src/api/staticResource/staticResource.js
+++ b/frontend/src/api/staticResource/staticResource.js
@@ -2,9 +2,7 @@ import request from '@/utils/request'
import { uuid } from 'vue-uuid'
import store from '@/store'
-export function uploadFile(fileId, file) {
- const param = new FormData()
- param.append('file', file.file)
+export function uploadFile(fileId, param) {
return request({
url: '/static/resource/upload/' + fileId,
method: 'post',
@@ -16,10 +14,12 @@ export function uploadFile(fileId, file) {
export function uploadFileResult(file, callback) {
const fileId = uuid.v1()
- const fileName = file.file.name
+ const fileName = file.name
const newFileName = fileId + fileName.substr(fileName.lastIndexOf('.'), fileName.length)
const fileUrl = store.state.staticResourcePath + newFileName
- uploadFile(fileId, file).then(() => {
+ const param = new FormData()
+ param.append('file', file)
+ uploadFile(fileId, param).then(() => {
callback(fileUrl)
})
}
diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js
index e0e3fb7cd6..429ffa0efa 100644
--- a/frontend/src/lang/en.js
+++ b/frontend/src/lang/en.js
@@ -1544,10 +1544,13 @@ export default {
sure_bt: 'Confirm'
},
panel: {
- create_by: '创建人',
- create_time: '创建时间',
- update_by: '最近修改人',
- update_time: '最近修改时间',
+ panel_background_item: 'Customize panel background',
+ panel_background_image_tips: 'Currently.Jpeg,.Jpg,.Png,.Gif files are supported, and the size should not exceed 15m',
+ reUpload: 'reUpload',
+ create_by: 'Create By',
+ create_time: 'Create Time',
+ update_by: 'Update By',
+ update_time: 'Update Time',
target_url: 'Target Url',
target_url_tips: 'You can click fields to splice URLs or parameters',
select_world: 'Select World',
diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js
index 1119087f3c..82b5fa89e7 100644
--- a/frontend/src/lang/tw.js
+++ b/frontend/src/lang/tw.js
@@ -1544,6 +1544,9 @@ export default {
sure_bt: '確定'
},
panel: {
+ panel_background_item: '自定义仪表板背景',
+ panel_background_image_tips: '当前支持.jpeg,.jpg,.png,.gif文件,大小不要超过15M',
+ reUpload: '重新上传',
create_by: '创建人',
create_time: '创建时间',
update_by: '最近修改人',
diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js
index 1767f03c2e..4bc67a27ac 100644
--- a/frontend/src/lang/zh.js
+++ b/frontend/src/lang/zh.js
@@ -1552,6 +1552,9 @@ export default {
sure_bt: '确定'
},
panel: {
+ panel_background_item: '自定义仪表板背景',
+ panel_background_image_tips: '当前支持.jpeg,.jpg,.png,.gif文件,大小不要超过15M',
+ reUpload: '重新上传',
create_by: '创建人',
create_time: '创建时间',
update_by: '最近修改人',
diff --git a/frontend/src/views/background/index.vue b/frontend/src/views/background/index.vue
index c1659f9d3b..df0ed3d101 100644
--- a/frontend/src/views/background/index.vue
+++ b/frontend/src/views/background/index.vue
@@ -213,7 +213,7 @@ export default {
},
upload(file) {
const _this = this
- uploadFileResult(file, (fileUrl) => {
+ uploadFileResult(file.file, (fileUrl) => {
_this.curComponent.commonBackground.outerImage = fileUrl
})
}
diff --git a/frontend/src/views/panel/SubjectSetting/PanelStyle/BackgroundSelector.vue b/frontend/src/views/panel/SubjectSetting/PanelStyle/BackgroundSelector.vue
index 9b672f2485..e4d73faa64 100644
--- a/frontend/src/views/panel/SubjectSetting/PanelStyle/BackgroundSelector.vue
+++ b/frontend/src/views/panel/SubjectSetting/PanelStyle/BackgroundSelector.vue
@@ -1,49 +1,47 @@
-
+
@@ -59,6 +57,7 @@ export default {
name: 'BackgroundSelector',
data() {
return {
+ maxImageSize: 15000000,
fileList: [],
dialogImageUrl: '',
dialogVisible: false,
@@ -82,6 +81,9 @@ export default {
}
},
methods: {
+ goFile() {
+ this.$refs.files.click()
+ },
commitStyle() {
const canvasStyleData = deepCopy(this.canvasStyleData)
canvasStyleData.panel = this.panel
@@ -103,11 +105,34 @@ export default {
},
upload(file) {
const _this = this
+ if (file.size > this.maxImageSize) {
+ this.sizeMessage()
+ }
+ uploadFileResult(file.file, (fileUrl) => {
+ _this.$store.state.styleChangeTimes++
+ _this.panel.imageUrl = fileUrl
+ _this.fileList = [{ url: this.panel.imageUrl }]
+ _this.commitStyle()
+ })
+ },
+ reUpload(e) {
+ const file = e.target.files[0]
+ const _this = this
+ if (file.size > this.maxImageSize) {
+ this.sizeMessage()
+ }
uploadFileResult(file, (fileUrl) => {
_this.$store.state.styleChangeTimes++
_this.panel.imageUrl = fileUrl
+ _this.fileList = [{ url: this.panel.imageUrl }]
_this.commitStyle()
})
+ },
+ sizeMessage() {
+ this.$notify({
+ message: '背景图片请不要大于15M',
+ position: 'top-left'
+ })
}
}
}
@@ -115,18 +140,22 @@ export default {