From 20c0b4b68dc6aed0a519cdabb0b03fd82149ebcb Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Thu, 20 May 2021 18:38:28 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=BF=87=E6=BB=A4=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E7=BB=91=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/widget/DeWidget/DeDate.vue | 17 ++++++++++++ .../widget/DeWidget/DeInputSearch.vue | 26 ++++++++++++++++--- .../serviceImpl/NumberSelectServiceImpl.js | 2 +- .../serviceImpl/TextInputServiceImpl.js | 3 ++- .../serviceImpl/TimeDateRangeServiceImpl.js | 3 ++- .../widget/serviceImpl/TimeDateServiceImpl.js | 3 ++- .../serviceImpl/TimeMonthServiceImpl.js | 3 ++- .../widget/serviceImpl/TimeYearServiceImpl.js | 3 ++- frontend/src/views/panel/filter/index.vue | 6 ++--- 9 files changed, 54 insertions(+), 12 deletions(-) diff --git a/frontend/src/components/widget/DeWidget/DeDate.vue b/frontend/src/components/widget/DeWidget/DeDate.vue index 6c35974ae3..921e79378a 100644 --- a/frontend/src/components/widget/DeWidget/DeDate.vue +++ b/frontend/src/components/widget/DeWidget/DeDate.vue @@ -7,6 +7,7 @@ :start-placeholder="options.attrs.startPlaceholder" :end-placeholder="options.attrs.endPlaceholder" :placeholder="options.attrs.placeholder" + @change="dateChange" /> @@ -32,6 +33,22 @@ export default { }, created() { this.options = this.element.options + }, + methods: { + search() { + this.setCondition() + }, + setCondition() { + const param = { + component: this.element, + value: Array.isArray(this.options.value) ? this.options.value : [this.options.value], + operator: this.operator + } + this.inDraw && this.$store.dispatch('conditions/add', param) + }, + dateChange(value) { + this.setCondition() + } } } diff --git a/frontend/src/components/widget/DeWidget/DeInputSearch.vue b/frontend/src/components/widget/DeWidget/DeInputSearch.vue index 227c854393..13147978b0 100644 --- a/frontend/src/components/widget/DeWidget/DeInputSearch.vue +++ b/frontend/src/components/widget/DeWidget/DeInputSearch.vue @@ -1,8 +1,14 @@ @@ -23,12 +29,26 @@ export default { data() { return { options: null, - operator: 'eq', + operator: 'like', values: null } }, created() { this.options = this.element.options + }, + methods: { + search() { + // this.options.value && this.setCondition() + this.setCondition() + }, + setCondition() { + const param = { + component: this.element, + value: [this.options.value], + operator: this.operator + } + this.inDraw && this.$store.dispatch('conditions/add', param) + } } } diff --git a/frontend/src/components/widget/serviceImpl/NumberSelectServiceImpl.js b/frontend/src/components/widget/serviceImpl/NumberSelectServiceImpl.js index 514365a509..96326c80ca 100644 --- a/frontend/src/components/widget/serviceImpl/NumberSelectServiceImpl.js +++ b/frontend/src/components/widget/serviceImpl/NumberSelectServiceImpl.js @@ -68,7 +68,7 @@ class NumberSelectServiceImpl extends WidgetService { optionDatas(datas) { if (!datas) return null - return datas.map(item => { + return datas.filter(item => !!item).map(item => { return { id: item, text: item diff --git a/frontend/src/components/widget/serviceImpl/TextInputServiceImpl.js b/frontend/src/components/widget/serviceImpl/TextInputServiceImpl.js index 2b3fa32565..c3de32cb38 100644 --- a/frontend/src/components/widget/serviceImpl/TextInputServiceImpl.js +++ b/frontend/src/components/widget/serviceImpl/TextInputServiceImpl.js @@ -9,7 +9,8 @@ const leftPanel = { const dialogPanel = { options: { attrs: { - placeholder: '请选择' + placeholder: '请输入关键字', + viewIds: [] }, value: '' diff --git a/frontend/src/components/widget/serviceImpl/TimeDateRangeServiceImpl.js b/frontend/src/components/widget/serviceImpl/TimeDateRangeServiceImpl.js index 7900a1459d..9fe15ef3f0 100644 --- a/frontend/src/components/widget/serviceImpl/TimeDateRangeServiceImpl.js +++ b/frontend/src/components/widget/serviceImpl/TimeDateRangeServiceImpl.js @@ -12,7 +12,8 @@ const dialogPanel = { type: 'daterange', rangeSeparator: '至', startPlaceholder: '开始日期', - endPlaceholder: '结束日期' + endPlaceholder: '结束日期', + viewIds: [] }, value: '' }, diff --git a/frontend/src/components/widget/serviceImpl/TimeDateServiceImpl.js b/frontend/src/components/widget/serviceImpl/TimeDateServiceImpl.js index 9dc954f614..b2a0385052 100644 --- a/frontend/src/components/widget/serviceImpl/TimeDateServiceImpl.js +++ b/frontend/src/components/widget/serviceImpl/TimeDateServiceImpl.js @@ -10,7 +10,8 @@ const dialogPanel = { options: { attrs: { type: 'date', - placeholder: '请选择日期' + placeholder: '请选择日期', + viewIds: [] }, value: '' }, diff --git a/frontend/src/components/widget/serviceImpl/TimeMonthServiceImpl.js b/frontend/src/components/widget/serviceImpl/TimeMonthServiceImpl.js index 26e5600638..928eacae3e 100644 --- a/frontend/src/components/widget/serviceImpl/TimeMonthServiceImpl.js +++ b/frontend/src/components/widget/serviceImpl/TimeMonthServiceImpl.js @@ -10,7 +10,8 @@ const dialogPanel = { options: { attrs: { type: 'month', - placeholder: '请选择年月' + placeholder: '请选择年月', + viewIds: [] }, value: '' }, diff --git a/frontend/src/components/widget/serviceImpl/TimeYearServiceImpl.js b/frontend/src/components/widget/serviceImpl/TimeYearServiceImpl.js index 656d8a6ac0..042a9a945a 100644 --- a/frontend/src/components/widget/serviceImpl/TimeYearServiceImpl.js +++ b/frontend/src/components/widget/serviceImpl/TimeYearServiceImpl.js @@ -10,7 +10,8 @@ const dialogPanel = { options: { attrs: { type: 'year', - placeholder: '请选择年份' + placeholder: '请选择年份', + viewIds: [] }, value: '' }, diff --git a/frontend/src/views/panel/filter/index.vue b/frontend/src/views/panel/filter/index.vue index de92d15faa..ab79d5f418 100644 --- a/frontend/src/views/panel/filter/index.vue +++ b/frontend/src/views/panel/filter/index.vue @@ -56,10 +56,10 @@ export default { ], '数字过滤组件': [ 'numberSelectWidget' - ], - '按钮': [ - 'buttonSureWidget' ] + // '按钮': [ + // 'buttonSureWidget' + // ] } } },