From 784d5f335de6f548912c84b938153827c7136ebe Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Wed, 1 Dec 2021 17:06:51 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix:=20=E6=96=87=E6=9C=AC=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=A4=9A=E9=80=89=E5=88=87=E6=8D=A2=E5=8D=95=E9=80=89=E6=97=A0?= =?UTF-8?q?=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/panel/edit/index.vue | 2 -- 1 file changed, 2 deletions(-) diff --git a/frontend/src/views/panel/edit/index.vue b/frontend/src/views/panel/edit/index.vue index c25f8668e7..5a08771880 100644 --- a/frontend/src/views/panel/edit/index.vue +++ b/frontend/src/views/panel/edit/index.vue @@ -661,8 +661,6 @@ export default { }, sureFilter() { this.currentFilterCom.options.value = [] - const component = deepCopy(this.currentFilterCom) - this.$store.commit('setComponentWithId', component) this.$store.commit('recordSnapshot', 'sureFilter') this.closeFilter() }, From b38d54e6619ffe064b37cf18f5c22e0b52aeb337 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Wed, 1 Dec 2021 17:14:16 +0800 Subject: [PATCH 2/5] =?UTF-8?q?fix:=20=E8=BF=87=E6=BB=A4=E6=8E=89=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E5=88=97=E5=90=8D=E7=9A=84=20sheet=20=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/dataease/service/dataset/DataSetTableService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java index 40c15f1b63..58edb770b0 100644 --- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java +++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java @@ -1263,7 +1263,7 @@ public class DataSetTableService { } else { retrunSheetDataList = excelSheetDataList; } - + retrunSheetDataList = retrunSheetDataList.stream().filter(excelSheetData -> CollectionUtils.isNotEmpty(excelSheetData.getFields())).collect(Collectors.toList()); // save file String excelId = UUID.randomUUID().toString(); String filePath = saveFile(file, excelId); From 6c8a2d76850e55d8bde0b32ca6b463063c9aec87 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Wed, 1 Dec 2021 17:38:33 +0800 Subject: [PATCH 3/5] =?UTF-8?q?fix:=20=E6=9D=A1=E4=BB=B6=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/panel/edit/index.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/frontend/src/views/panel/edit/index.vue b/frontend/src/views/panel/edit/index.vue index 5a08771880..fe14354dad 100644 --- a/frontend/src/views/panel/edit/index.vue +++ b/frontend/src/views/panel/edit/index.vue @@ -661,6 +661,7 @@ export default { }, sureFilter() { this.currentFilterCom.options.value = [] + this.$store.commit('setComponentWithId', this.currentFilterCom) this.$store.commit('recordSnapshot', 'sureFilter') this.closeFilter() }, From abb9f456987a48e506f2b8dbf8772ff82aeead50 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Wed, 1 Dec 2021 17:39:27 +0800 Subject: [PATCH 4/5] =?UTF-8?q?refactor:=20=E8=A7=86=E5=9B=BE=E6=96=B0?= =?UTF-8?q?=E5=BB=BA=E8=BF=BD=E5=8A=A0=E8=87=AA=E5=8A=A8=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E4=BA=8B=E4=BB=B6=EF=BC=8C=E5=BD=93=E5=89=8D=E6=96=B0=E5=8A=A0?= =?UTF-8?q?=E8=A7=86=E5=9B=BE=E9=AB=98=E4=BA=AE=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/chart/group/Group.vue | 25 ++++++++++++++++++--- frontend/src/views/chart/index.vue | 7 ++++-- frontend/src/views/chart/view/ChartEdit.vue | 1 + 3 files changed, 28 insertions(+), 5 deletions(-) diff --git a/frontend/src/views/chart/group/Group.vue b/frontend/src/views/chart/group/Group.vue index 1f837baf53..998c0eb391 100644 --- a/frontend/src/views/chart/group/Group.vue +++ b/frontend/src/views/chart/group/Group.vue @@ -422,7 +422,9 @@ export default { searchMap: { all: this.$t('commons.all'), folder: this.$t('commons.folder') - } + }, + currentNodeData: {}, + currentKey: null } }, watch: { @@ -626,16 +628,28 @@ export default { }) }, + initCurrentNode() { + if (this.currentKey) { + this.$nextTick(() => { + this.$refs.chartTreeRef.setCurrentKey(this.currentKey) + this.$nextTick(() => { + document.querySelector('.is-current').firstChild.click() + }) + }) + } + }, treeNode(cache = false) { const modelInfo = localStorage.getItem('chart-tree') const userCache = (modelInfo && cache) if (userCache) { this.tData = JSON.parse(modelInfo) + this.initCurrentNode() } queryAuthModel({ modelType: 'chart' }, !userCache).then(res => { localStorage.setItem('chart-tree', JSON.stringify(res.data)) if (!userCache) { this.tData = res.data + this.initCurrentNode() } }) }, @@ -655,6 +669,7 @@ export default { }, nodeClick(data, node) { + this.currentNodeData = data if (data.modelInnerType !== 'group') { this.$emit('switchComponent', { name: 'ChartEdit', param: data }) } @@ -767,8 +782,7 @@ export default { this.$emit('newViewInfo', { 'id': response.data.id }) } else { _this.expandedArray.push(response.data.sceneId) - _this.$refs.chartTreeRef.setCurrentKey(response.data.id) - _this.$emit('switchComponent', { name: 'ChartEdit', param: response.data }) + _this.currentKey = response.data.id _this.treeNode() } }) @@ -923,6 +937,11 @@ export default { }, searchTypeClick(searchTypeInfo) { this.searchType = searchTypeInfo + }, + nodeTypeChange(newType) { + if (this.currentNodeData) { + this.currentNodeData.modelInnerType = newType + } } } } diff --git a/frontend/src/views/chart/index.vue b/frontend/src/views/chart/index.vue index 7e5d0b43ad..8d605050c1 100644 --- a/frontend/src/views/chart/index.vue +++ b/frontend/src/views/chart/index.vue @@ -2,12 +2,12 @@ - + - + @@ -49,6 +49,9 @@ export default { }, saveSuccess(val) { this.saveStatus = val + }, + typeChange(newType) { + this.$refs.group.nodeTypeChange(newType) } } } diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue index fcaf2844a9..ec346f9900 100644 --- a/frontend/src/views/chart/view/ChartEdit.vue +++ b/frontend/src/views/chart/view/ChartEdit.vue @@ -1100,6 +1100,7 @@ export default { if (newVal === 'map' && newVal !== oldVal) { this.initAreas() } + this.$emit('typeChange', newVal) } }, created() { From df13bfa008dd60690e55cdad432890c99bc3578b Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Wed, 1 Dec 2021 18:04:53 +0800 Subject: [PATCH 5/5] =?UTF-8?q?refactor:=20=E5=89=8D=E7=AB=AFeslint?= =?UTF-8?q?=E8=AD=A6=E5=91=8A=E4=BB=A5=E5=8F=8A=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/api/dataset/dataset.js | 1 + .../components/Editor/ComponentWrapper.vue | 2 +- .../canvas/components/Editor/index.vue | 7 +- .../components/canvas/components/TextAttr.vue | 38 ++-- .../canvas/custom-component/DeVideo.vue | 11 +- .../canvas/custom-component/UserView.vue | 1 + .../widget/DeWidget/DeTreeSelect.vue | 2 +- .../views/dataset/add/union/UnionItemEdit.vue | 2 +- .../src/views/panel/export/PDFPreExport.vue | 1 + .../src/views/panel/list/PanelViewShow.vue | 3 +- frontend/src/views/system/datasource/form.vue | 181 +++++++++++------- .../src/views/system/task/DatasetTaskList.vue | 4 +- 12 files changed, 158 insertions(+), 95 deletions(-) diff --git a/frontend/src/api/dataset/dataset.js b/frontend/src/api/dataset/dataset.js index 861c40dad7..07c3a56f68 100644 --- a/frontend/src/api/dataset/dataset.js +++ b/frontend/src/api/dataset/dataset.js @@ -150,6 +150,7 @@ export function taskList(spage, size, data) { return request({ url: '/dataset/group/isKettleRunning', method: 'post', + // eslint-disable-next-line no-undef loading: showLoading }) } diff --git a/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue b/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue index 1908e14d82..96bae648b8 100644 --- a/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue +++ b/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue @@ -70,7 +70,7 @@ export default { return this.curComponent && this.config === this.curComponent }, curGap() { - return this.config.auxiliaryMatrix ? this.componentGap : 0 + return this.config.auxiliaryMatrix ? this.componentGap : 0 }, ...mapState([ 'mobileLayoutStatus', diff --git a/frontend/src/components/canvas/components/Editor/index.vue b/frontend/src/components/canvas/components/Editor/index.vue index a56ec4bd6c..f54f5ef3eb 100644 --- a/frontend/src/components/canvas/components/Editor/index.vue +++ b/frontend/src/components/canvas/components/Editor/index.vue @@ -471,6 +471,7 @@ function removeItem(index) { this.yourList.splice(index, 1, {}) } +// eslint-disable-next-line no-unused-vars function initPosition(_this) { _this.yourList.forEach(item => { checkItemPosition.call(_this, item, { @@ -501,6 +502,7 @@ function addItem(item, index) { // makeCoordinate.call(this, item); } +// eslint-disable-next-line no-unused-vars function changeToCoord(left, top, width, height) { return { x1: left, @@ -517,6 +519,7 @@ function changeToCoord(left, top, width, height) { * * @param {any} tCoord 比对对象的坐标 */ +// eslint-disable-next-line no-unused-vars function findClosetCoords(item, tCoord) { if (isOverlay) return let i = coordinates.length @@ -560,6 +563,7 @@ function findClosetCoords(item, tCoord) { * * @param {any} item */ +// eslint-disable-next-line no-unused-vars function makeCoordinate(item) { const width = this.cellWidth * (item.sizex) - this.baseMarginLeft const height = this.cellHeight * (item.sizey) - this.baseMarginTop @@ -750,7 +754,7 @@ function findBelowItems(item) { return _.sortBy(_.values(belowItems), 'y') } - +// eslint-disable-next-line no-unused-vars function getoPsitionBox() { return positionBox } @@ -1287,6 +1291,7 @@ export default { this.resizeStart.call(null, e, item, index) // e.preventDefault(); + // eslint-disable-next-line no-unused-vars const target = $(e.target) if (!this.infoBox) { diff --git a/frontend/src/components/canvas/components/TextAttr.vue b/frontend/src/components/canvas/components/TextAttr.vue index 0e8ce60e93..7116db4ed1 100644 --- a/frontend/src/components/canvas/components/TextAttr.vue +++ b/frontend/src/components/canvas/components/TextAttr.vue @@ -283,24 +283,7 @@ export default { ] } }, - watch: { - innerOpacity: { - handler(oldVal, newVal) { - this.styleInfo['opacity'] = this.innerOpacity / 100 - } - }, - curComponent: { - handler(oldVal, newVal) { - this.$nextTick(() => { - this.init() - }) - // console.log('curComponent change') - } - } - }, - mounted() { - this.init() - }, + computed: { boardDivColor() { const style = { @@ -348,6 +331,25 @@ export default { ]) }, + watch: { + innerOpacity: { + handler(oldVal, newVal) { + this.styleInfo['opacity'] = this.innerOpacity / 100 + } + }, + curComponent: { + handler(oldVal, newVal) { + this.$nextTick(() => { + this.init() + }) + // console.log('curComponent change') + } + } + }, + mounted() { + this.init() + }, + methods: { init() { if (this.styleInfo['opacity']) { diff --git a/frontend/src/components/canvas/custom-component/DeVideo.vue b/frontend/src/components/canvas/custom-component/DeVideo.vue index 7e1b0aea74..3a31a25e44 100644 --- a/frontend/src/components/canvas/custom-component/DeVideo.vue +++ b/frontend/src/components/canvas/custom-component/DeVideo.vue @@ -1,6 +1,6 @@