From aa0cb3d7252d3795acaedc12f485ddf2c3736a21 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Tue, 28 Dec 2021 11:32:48 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix:=20=E6=97=B6=E9=97=B4=E8=8C=83=E5=9B=B4?= =?UTF-8?q?=E5=8A=A8=E6=80=81=E6=97=B6=E9=97=B4=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../filter/defaultValue/DeDateRangeDefault.vue | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/frontend/src/views/panel/filter/defaultValue/DeDateRangeDefault.vue b/frontend/src/views/panel/filter/defaultValue/DeDateRangeDefault.vue index 947458329b..f0b707259b 100644 --- a/frontend/src/views/panel/filter/defaultValue/DeDateRangeDefault.vue +++ b/frontend/src/views/panel/filter/defaultValue/DeDateRangeDefault.vue @@ -37,7 +37,7 @@ v-model="element.options.attrs.default.sDynamicPrefix" type="number" size="mini" - :min="1" + :min="0" :max="10" @input="sDynamicPrefixChange" /> @@ -90,7 +90,7 @@ v-model="element.options.attrs.default.eDynamicPrefix" type="number" size="mini" - :min="1" + :min="0" :max="10" @input="eDynamicPrefixChange" /> @@ -189,16 +189,16 @@ export default { }, sDynamicPrefixChange(value) { - if (value < 1) { - value = 1 - this.element.options.attrs.default.sDynamicPrefix = 1 + if (value < 0) { + value = 0 + this.element.options.attrs.default.sDynamicPrefix = 0 } this.setDval() }, eDynamicPrefixChange(value) { - if (value < 1) { - value = 1 - this.element.options.attrs.default.eDynamicPrefix = 1 + if (value < 0) { + value = 0 + this.element.options.attrs.default.eDynamicPrefix = 0 } this.setDval() }, From 8d0a6670929086a7720d5eb9271d93de80f58b0a Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Tue, 28 Dec 2021 11:40:19 +0800 Subject: [PATCH 2/5] =?UTF-8?q?refactor:=20=E5=8E=BB=E6=8E=89=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E4=B8=AD=E5=9B=BA=E5=AE=9A=E7=9A=84=E8=B6=85=E6=97=B6?= =?UTF-8?q?=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/api/authModel/authModel.js | 2 +- frontend/src/api/chart/chart.js | 2 -- frontend/src/api/dataset/dataset.js | 2 +- frontend/src/api/link/index.js | 1 - frontend/src/api/panel/panel.js | 15 ++++----------- frontend/src/api/panel/view.js | 3 --- 6 files changed, 6 insertions(+), 19 deletions(-) diff --git a/frontend/src/api/authModel/authModel.js b/frontend/src/api/authModel/authModel.js index 9f72a1b128..bea288f6b3 100644 --- a/frontend/src/api/authModel/authModel.js +++ b/frontend/src/api/authModel/authModel.js @@ -1,6 +1,6 @@ import request from '@/utils/request' -export function queryAuthModel(data, loading = true, timeout = 30000) { +export function queryAuthModel(data, loading = true, timeout = 60000) { return request({ url: 'authModel/queryAuthModel', method: 'post', diff --git a/frontend/src/api/chart/chart.js b/frontend/src/api/chart/chart.js index 8bb9a0c4df..87abbcd662 100644 --- a/frontend/src/api/chart/chart.js +++ b/frontend/src/api/chart/chart.js @@ -15,7 +15,6 @@ export function ajaxGetData(id, data) { method: 'post', loading: true, hideMsg: true, - timeout: 30000, data }) } @@ -67,7 +66,6 @@ export function ajaxGetDataOnly(id, data) { method: 'post', loading: true, hideMsg: true, - timeout: 30000, data }) } diff --git a/frontend/src/api/dataset/dataset.js b/frontend/src/api/dataset/dataset.js index 32054bc8b8..84b4e5dfb0 100644 --- a/frontend/src/api/dataset/dataset.js +++ b/frontend/src/api/dataset/dataset.js @@ -120,7 +120,7 @@ export function batchEdit(data) { }) } -export function post(url, data, showLoading = true, timeout = 20000) { +export function post(url, data, showLoading = true, timeout = 60000) { return request({ url: url, method: 'post', diff --git a/frontend/src/api/link/index.js b/frontend/src/api/link/index.js index 50f9881224..7cf27c9bff 100644 --- a/frontend/src/api/link/index.js +++ b/frontend/src/api/link/index.js @@ -68,7 +68,6 @@ export function viewInfo(id, data) { return request({ url: 'api/link/viewDetail/' + id, method: 'post', - timeout: 30000, hideMsg: true, data }) diff --git a/frontend/src/api/panel/panel.js b/frontend/src/api/panel/panel.js index 702302a4c5..bad9f772cd 100644 --- a/frontend/src/api/panel/panel.js +++ b/frontend/src/api/panel/panel.js @@ -22,7 +22,6 @@ export function querySubject(data) { url: '/panel/subject/query', method: 'post', loading: true, - timeout: 30000, data }) } @@ -31,12 +30,11 @@ export function querySubjectWithGroup(data) { return request({ url: '/panel/subject/querySubjectWithGroup', method: 'post', - timeout: 30000, data }) } -export function defaultTree(data, loading = true, timeout = 30000) { +export function defaultTree(data, loading = true, timeout = 60000) { return request({ url: '/panel/group/defaultTree', method: 'post', @@ -46,7 +44,7 @@ export function defaultTree(data, loading = true, timeout = 30000) { }) } -export function groupTree(data, loading = true, timeout = 30000) { +export function groupTree(data, loading = true, timeout = 60000) { return request({ url: '/panel/group/tree', method: 'post', @@ -60,7 +58,6 @@ export function viewData(id, data) { return request({ url: '/chart/view/getData/' + id, method: 'post', - timeout: 30000, hideMsg: true, data }) @@ -69,7 +66,6 @@ export function panelSave(data) { return request({ url: 'panel/group/save', method: 'post', - timeout: 30000, loading: true, data }) @@ -78,8 +74,7 @@ export function findOne(id) { return request({ url: 'panel/group/findOne/' + id, method: 'get', - loading: true, - timeout: 30000 + loading: true }) } @@ -94,7 +89,6 @@ export function getPreviewData(data) { return request({ url: '/panel/table/getPreviewData', method: 'post', - timeout: 30000, data }) } @@ -133,7 +127,6 @@ export function get(url) { export function delGroup(groupId) { return request({ url: '/panel/group/deleteCircle/' + groupId, - method: 'post', - timeout: 30000 + method: 'post' }) } diff --git a/frontend/src/api/panel/view.js b/frontend/src/api/panel/view.js index 5cc64150b1..1c3f9c12c6 100644 --- a/frontend/src/api/panel/view.js +++ b/frontend/src/api/panel/view.js @@ -4,7 +4,6 @@ export function tree(data) { return request({ url: '/api/panelView/tree', method: 'post', - timeout: 30000, data }) } @@ -13,7 +12,6 @@ export function viewsWithIds(data) { return request({ url: '/api/panelView/viewsWithIds', method: 'post', - timeout: 30000, loading: true, data }) @@ -23,7 +21,6 @@ export function findOne(id) { return request({ url: '/api/panelView/findOne/' + id, method: 'get', - timeout: 30000, loading: true }) } From 87d3ec69f229be05997fdc6d2666ebe2d4e1ad79 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Tue, 28 Dec 2021 11:46:10 +0800 Subject: [PATCH 3/5] =?UTF-8?q?refactor:=20=E5=8E=BB=E9=99=A4=E6=89=80?= =?UTF-8?q?=E6=9C=89=E5=89=8D=E7=AB=AFapi=E8=87=AA=E5=AE=9A=E4=B9=89?= =?UTF-8?q?=E8=B6=85=E6=97=B6=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/api/authModel/authModel.js | 1 - frontend/src/api/chart/chart.js | 2 -- frontend/src/api/dataset/dataset.js | 1 - frontend/src/api/link/index.js | 1 - frontend/src/api/panel/panel.js | 13 ++----------- frontend/src/api/panel/pdfTemplate.js | 4 +--- frontend/src/api/panel/view.js | 3 --- frontend/src/api/system/email.js | 1 - frontend/src/api/system/template.js | 5 ----- 9 files changed, 3 insertions(+), 28 deletions(-) diff --git a/frontend/src/api/authModel/authModel.js b/frontend/src/api/authModel/authModel.js index 9f72a1b128..81b11f7c89 100644 --- a/frontend/src/api/authModel/authModel.js +++ b/frontend/src/api/authModel/authModel.js @@ -5,7 +5,6 @@ export function queryAuthModel(data, loading = true, timeout = 30000) { url: 'authModel/queryAuthModel', method: 'post', loading: loading, - timeout: timeout, data }) } diff --git a/frontend/src/api/chart/chart.js b/frontend/src/api/chart/chart.js index 8bb9a0c4df..87abbcd662 100644 --- a/frontend/src/api/chart/chart.js +++ b/frontend/src/api/chart/chart.js @@ -15,7 +15,6 @@ export function ajaxGetData(id, data) { method: 'post', loading: true, hideMsg: true, - timeout: 30000, data }) } @@ -67,7 +66,6 @@ export function ajaxGetDataOnly(id, data) { method: 'post', loading: true, hideMsg: true, - timeout: 30000, data }) } diff --git a/frontend/src/api/dataset/dataset.js b/frontend/src/api/dataset/dataset.js index 32054bc8b8..156f90eee5 100644 --- a/frontend/src/api/dataset/dataset.js +++ b/frontend/src/api/dataset/dataset.js @@ -125,7 +125,6 @@ export function post(url, data, showLoading = true, timeout = 20000) { url: url, method: 'post', loading: showLoading, - timeout: timeout, data }) } diff --git a/frontend/src/api/link/index.js b/frontend/src/api/link/index.js index 50f9881224..7cf27c9bff 100644 --- a/frontend/src/api/link/index.js +++ b/frontend/src/api/link/index.js @@ -68,7 +68,6 @@ export function viewInfo(id, data) { return request({ url: 'api/link/viewDetail/' + id, method: 'post', - timeout: 30000, hideMsg: true, data }) diff --git a/frontend/src/api/panel/panel.js b/frontend/src/api/panel/panel.js index 702302a4c5..15937f36cd 100644 --- a/frontend/src/api/panel/panel.js +++ b/frontend/src/api/panel/panel.js @@ -22,7 +22,6 @@ export function querySubject(data) { url: '/panel/subject/query', method: 'post', loading: true, - timeout: 30000, data }) } @@ -31,7 +30,6 @@ export function querySubjectWithGroup(data) { return request({ url: '/panel/subject/querySubjectWithGroup', method: 'post', - timeout: 30000, data }) } @@ -41,7 +39,6 @@ export function defaultTree(data, loading = true, timeout = 30000) { url: '/panel/group/defaultTree', method: 'post', loading: loading, - timeout: timeout, data }) } @@ -51,7 +48,6 @@ export function groupTree(data, loading = true, timeout = 30000) { url: '/panel/group/tree', method: 'post', loading: loading, - timeout: timeout, data }) } @@ -60,7 +56,6 @@ export function viewData(id, data) { return request({ url: '/chart/view/getData/' + id, method: 'post', - timeout: 30000, hideMsg: true, data }) @@ -69,7 +64,6 @@ export function panelSave(data) { return request({ url: 'panel/group/save', method: 'post', - timeout: 30000, loading: true, data }) @@ -78,8 +72,7 @@ export function findOne(id) { return request({ url: 'panel/group/findOne/' + id, method: 'get', - loading: true, - timeout: 30000 + loading: true }) } @@ -94,7 +87,6 @@ export function getPreviewData(data) { return request({ url: '/panel/table/getPreviewData', method: 'post', - timeout: 30000, data }) } @@ -133,7 +125,6 @@ export function get(url) { export function delGroup(groupId) { return request({ url: '/panel/group/deleteCircle/' + groupId, - method: 'post', - timeout: 30000 + method: 'post' }) } diff --git a/frontend/src/api/panel/pdfTemplate.js b/frontend/src/api/panel/pdfTemplate.js index afd0efce18..729a3c2b97 100644 --- a/frontend/src/api/panel/pdfTemplate.js +++ b/frontend/src/api/panel/pdfTemplate.js @@ -1,11 +1,9 @@ import request from '@/utils/request' - export function queryAll() { return request({ url: '/pdf-template/queryAll', method: 'get', - loading: true, - timeout: 30000 + loading: true }) } diff --git a/frontend/src/api/panel/view.js b/frontend/src/api/panel/view.js index 5cc64150b1..1c3f9c12c6 100644 --- a/frontend/src/api/panel/view.js +++ b/frontend/src/api/panel/view.js @@ -4,7 +4,6 @@ export function tree(data) { return request({ url: '/api/panelView/tree', method: 'post', - timeout: 30000, data }) } @@ -13,7 +12,6 @@ export function viewsWithIds(data) { return request({ url: '/api/panelView/viewsWithIds', method: 'post', - timeout: 30000, loading: true, data }) @@ -23,7 +21,6 @@ export function findOne(id) { return request({ url: '/api/panelView/findOne/' + id, method: 'get', - timeout: 30000, loading: true }) } diff --git a/frontend/src/api/system/email.js b/frontend/src/api/system/email.js index c5a7e6af41..3263995b09 100644 --- a/frontend/src/api/system/email.js +++ b/frontend/src/api/system/email.js @@ -4,7 +4,6 @@ export function validate(data) { return request({ url: '/system/testConnection', method: 'post', - timeout: 30000, loading: true, data diff --git a/frontend/src/api/system/template.js b/frontend/src/api/system/template.js index 16f427ea36..5b83b15bcb 100644 --- a/frontend/src/api/system/template.js +++ b/frontend/src/api/system/template.js @@ -4,14 +4,12 @@ export function save(data) { return request({ url: '/template/save', data: data, - timeout: 60000, method: 'post' }) } export function templateDelete(id) { return request({ url: '/template/delete/' + id, - timeout: 60000, method: 'delete' }) } @@ -19,7 +17,6 @@ export function templateDelete(id) { export function showTemplateList(data) { return request({ url: '/template/templateList', - timeout: 60000, data: data, method: 'post' }) @@ -28,7 +25,6 @@ export function showTemplateList(data) { export function findOne(id) { return request({ url: '/template/findOne/' + id, - timeout: 60000, method: 'get' }) } @@ -36,7 +32,6 @@ export function findOne(id) { export function find(data) { return request({ url: '/template/find', - timeout: 60000, data: data, method: 'post' }) From 4a0e577ad149ce5167fb09c37eb3fd7e4470c14e Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Tue, 28 Dec 2021 12:12:46 +0800 Subject: [PATCH 4/5] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E6=96=87=E6=9C=AC=E8=BF=87=E6=BB=A4=E7=BB=84=E4=BB=B6=E5=90=8E?= =?UTF-8?q?=EF=BC=8C=E6=98=BE=E7=A4=BA=E9=94=99=E4=BD=8D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/canvas/components/Editor/index.vue | 2 +- frontend/src/views/panel/edit/index.vue | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/frontend/src/components/canvas/components/Editor/index.vue b/frontend/src/components/canvas/components/Editor/index.vue index 70d0ec478e..2b94721d25 100644 --- a/frontend/src/components/canvas/components/Editor/index.vue +++ b/frontend/src/components/canvas/components/Editor/index.vue @@ -825,7 +825,7 @@ export default { }, data() { return { - psDebug: false, // 定位调试模式 + psDebug: true, // 定位调试模式 editorX: 0, editorY: 0, start: { // 选中区域的起点 diff --git a/frontend/src/views/panel/edit/index.vue b/frontend/src/views/panel/edit/index.vue index e0e79c5635..8ea2331039 100644 --- a/frontend/src/views/panel/edit/index.vue +++ b/frontend/src/views/panel/edit/index.vue @@ -313,7 +313,8 @@ export default { 'de-show-date', 'de-video' ], - enableSureButton: false + enableSureButton: false, + filterFromDrag: false } }, @@ -628,7 +629,7 @@ export default { if (this.currentWidget.filterDialog) { this.show = false - this.openFilterDialog() + this.openFilterDialog(true) return } component = deepCopy(this.currentFilterCom) @@ -676,7 +677,8 @@ export default { this.$store.commit('hideContextMenu') } }, - openFilterDialog() { + openFilterDialog(fromDrag = false) { + this.filterFromDrag = fromDrag this.filterVisible = true }, closeFilter() { @@ -686,7 +688,9 @@ export default { }, cancelFilter() { this.closeFilter() - bus.$emit('onRemoveLastItem') + if(this.filterFromDrag){ + bus.$emit('onRemoveLastItem') + } }, sureFilter() { this.currentFilterCom = this.$refs['filter-setting-' + this.currentFilterCom.id].getElementInfo() From 40081b3c0969d5affc5a5feafc4b0cd46548c313 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Tue, 28 Dec 2021 12:26:01 +0800 Subject: [PATCH 5/5] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E6=96=87=E6=9C=AC=E8=BF=87=E6=BB=A4=E7=BB=84=E4=BB=B6=E5=90=8E?= =?UTF-8?q?=EF=BC=8C=E6=98=BE=E7=A4=BA=E9=94=99=E4=BD=8D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/canvas/components/Editor/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/components/canvas/components/Editor/index.vue b/frontend/src/components/canvas/components/Editor/index.vue index 2b94721d25..70d0ec478e 100644 --- a/frontend/src/components/canvas/components/Editor/index.vue +++ b/frontend/src/components/canvas/components/Editor/index.vue @@ -825,7 +825,7 @@ export default { }, data() { return { - psDebug: true, // 定位调试模式 + psDebug: false, // 定位调试模式 editorX: 0, editorY: 0, start: { // 选中区域的起点