From a783be2556a99c13029941790ffaf7c3ddd0b045 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Tue, 6 Apr 2021 19:10:16 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E8=BF=87=E6=BB=A4=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E5=BC=B9=E6=A1=86=E9=80=89=E6=8B=A9=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../widget/serviceImpl/TimeYearServiceImpl.js | 3 +- frontend/src/styles/index.scss | 14 ++ frontend/src/views/panel/edit/index.vue | 26 ++- .../src/views/panel/filter/filterDialog.vue | 169 ++++++++++++++++++ 4 files changed, 208 insertions(+), 4 deletions(-) create mode 100644 frontend/src/views/panel/filter/filterDialog.vue diff --git a/frontend/src/components/widget/serviceImpl/TimeYearServiceImpl.js b/frontend/src/components/widget/serviceImpl/TimeYearServiceImpl.js index 5c4a88cd30..2f2638c14e 100644 --- a/frontend/src/components/widget/serviceImpl/TimeYearServiceImpl.js +++ b/frontend/src/components/widget/serviceImpl/TimeYearServiceImpl.js @@ -22,7 +22,8 @@ const defaultOptions = { value: '' }, defaultClass: 'time-filter', - component: 'de-date' + component: 'de-date', + filterDialog: true } class TimeYearServiceImpl extends WidgetService { diff --git a/frontend/src/styles/index.scss b/frontend/src/styles/index.scss index cf7f3f5859..39bb7d023f 100644 --- a/frontend/src/styles/index.scss +++ b/frontend/src/styles/index.scss @@ -85,6 +85,20 @@ div:focus { } } +.de-filter-dialog { + min-width: 500px !important; + width: 50% !important; + + .el-dialog__header{ + background-color: #f4f4f5; + padding: 10px 20px !important; + } + .el-dialog__body{ + padding: 1px 20px !important; + + } +} + .de-search-header { .el-tabs__header{ display: none !important;; diff --git a/frontend/src/views/panel/edit/index.vue b/frontend/src/views/panel/edit/index.vue index a2b2969f1e..b2a381237b 100644 --- a/frontend/src/views/panel/edit/index.vue +++ b/frontend/src/views/panel/edit/index.vue @@ -68,6 +68,14 @@ + + + + @@ -94,6 +102,7 @@ import '@/components/canvas/styles/animate.css' import 'element-ui/lib/theme-chalk/index.css' import '@/components/canvas/styles/reset.css' import { ApplicationContext } from '@/utils/ApplicationContext' +import FilterDialog from '../filter/filterDialog' export default { name: 'PanelEdit', components: { @@ -103,7 +112,8 @@ export default { FilterGroup, ViewSelect, Editor, - Toolbar + Toolbar, + FilterDialog }, data() { return { @@ -112,7 +122,8 @@ export default { clickNotClose: false, showIndex: -1, activeName: 'attr', - reSelectAnimateIndex: undefined + reSelectAnimateIndex: undefined, + filterVisible: false } }, @@ -249,7 +260,13 @@ export default { } }) } else { - component = deepCopy(ApplicationContext.getService(componentInfo.id)) + const wd = ApplicationContext.getService(componentInfo.id) + if (wd.filterDialog) { + this.show = false + this.openFilterDiolog() + return + } + component = deepCopy(wd) } component.style.top = e.offsetY @@ -282,6 +299,9 @@ export default { if (e.button !== 2) { this.$store.commit('hideContextMenu') } + }, + openFilterDiolog() { + this.filterVisible = true } } diff --git a/frontend/src/views/panel/filter/filterDialog.vue b/frontend/src/views/panel/filter/filterDialog.vue new file mode 100644 index 0000000000..bcc734e4c3 --- /dev/null +++ b/frontend/src/views/panel/filter/filterDialog.vue @@ -0,0 +1,169 @@ + + + + From 26a25d0338f9c4b75829edb87317273a7ff22f9e Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Wed, 7 Apr 2021 09:49:07 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E5=88=A0=E9=99=A4debugger?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/canvas/components/Editor/ContextMenu.vue | 1 - .../components/canvas/components/Editor/PreviewEject.vue | 1 - frontend/src/components/canvas/components/Editor/index.vue | 1 - frontend/src/components/canvas/components/Toolbar.vue | 1 - frontend/src/components/canvas/index.vue | 7 +++---- frontend/src/views/chart/components/ChartComponent.vue | 1 - frontend/src/views/panel/index.vue | 1 - 7 files changed, 3 insertions(+), 10 deletions(-) diff --git a/frontend/src/components/canvas/components/Editor/ContextMenu.vue b/frontend/src/components/canvas/components/Editor/ContextMenu.vue index b3453178ba..c2b67f7323 100644 --- a/frontend/src/components/canvas/components/Editor/ContextMenu.vue +++ b/frontend/src/components/canvas/components/Editor/ContextMenu.vue @@ -41,7 +41,6 @@ export default { ]), methods: { edit() { - debugger // 编辑时临时保存 当前修改的画布 localStorage.setItem('canvasDataEditTmp', JSON.stringify(this.componentData)) localStorage.setItem('canvasStyleEditTmp', JSON.stringify(this.canvasStyleData)) diff --git a/frontend/src/components/canvas/components/Editor/PreviewEject.vue b/frontend/src/components/canvas/components/Editor/PreviewEject.vue index 1f6faeec8b..3fe13d9347 100644 --- a/frontend/src/components/canvas/components/Editor/PreviewEject.vue +++ b/frontend/src/components/canvas/components/Editor/PreviewEject.vue @@ -54,7 +54,6 @@ export default { this.$emit('change', false) }, restore() { - debugger // 用保存的数据恢复画布 if (localStorage.getItem('canvasData')) { this.componentData = this.resetID(JSON.parse(localStorage.getItem('canvasData'))) diff --git a/frontend/src/components/canvas/components/Editor/index.vue b/frontend/src/components/canvas/components/Editor/index.vue index 4a09bed1cd..13a016959d 100644 --- a/frontend/src/components/canvas/components/Editor/index.vue +++ b/frontend/src/components/canvas/components/Editor/index.vue @@ -134,7 +134,6 @@ export default { this.isShowArea = true const move = (moveEvent) => { - debugger this.width = Math.abs(moveEvent.clientX - startX) this.height = Math.abs(moveEvent.clientY - startY) if (moveEvent.clientX < startX) { diff --git a/frontend/src/components/canvas/components/Toolbar.vue b/frontend/src/components/canvas/components/Toolbar.vue index 25b4e1c712..826a69cdda 100644 --- a/frontend/src/components/canvas/components/Toolbar.vue +++ b/frontend/src/components/canvas/components/Toolbar.vue @@ -87,7 +87,6 @@ export default { }, methods: { closePanelEdit() { - debugger bus.$emit('PanelSwitchComponent', { name: 'PanelMain' }) }, goFile() { diff --git a/frontend/src/components/canvas/index.vue b/frontend/src/components/canvas/index.vue index e3a752eb32..d349e1744d 100644 --- a/frontend/src/components/canvas/index.vue +++ b/frontend/src/components/canvas/index.vue @@ -4,9 +4,9 @@
- - - + + +
{ diff --git a/frontend/src/views/chart/components/ChartComponent.vue b/frontend/src/views/chart/components/ChartComponent.vue index 87b431239a..c5fb5f40d7 100644 --- a/frontend/src/views/chart/components/ChartComponent.vue +++ b/frontend/src/views/chart/components/ChartComponent.vue @@ -56,7 +56,6 @@ export default { }, methods: { drawEcharts() { - // debugger const chart = this.chart let chart_option = {} // type diff --git a/frontend/src/views/panel/index.vue b/frontend/src/views/panel/index.vue index ed7a82ce00..a2a29bf107 100644 --- a/frontend/src/views/panel/index.vue +++ b/frontend/src/views/panel/index.vue @@ -25,7 +25,6 @@ export default { }, mounted() { bus.$on('PanelSwitchComponent', (c) => { - debugger console.log(c) this.param = c.param switch (c.name) {