From 5c086806b93328bd540da62fce4c81d35f14c83b Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 30 Mar 2020 15:57:29 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B5=81=E7=A8=8B=E8=A1=A8?= =?UTF-8?q?=E5=8D=95=E4=B8=AD=E5=B5=8C=E5=85=A5=E8=A7=86=E5=9B=BE=E7=9A=84?= =?UTF-8?q?=E6=97=B6=E5=80=99=EF=BC=8C=E9=80=89=E6=8B=A9=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E4=B8=BA=E8=BF=87=E6=BB=A4=E6=9D=A1=E4=BB=B6=E4=B8=8D=E8=B5=B7?= =?UTF-8?q?=E4=BD=9C=E7=94=A8=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../x_component_cms_QueryViewDesigner/widget/ViewFilter.js | 3 +++ .../x_component_portal_PageDesigner/Module/View/view.html | 2 +- .../x_component_process_FormDesigner/Module/View/view.html | 2 +- .../Module/ViewSelector/ViewSelector.html | 2 +- o2web/source/x_component_process_ViewDesigner/$View/view.html | 2 +- .../x_component_process_ViewDesigner/widget/ViewFilter.js | 3 +++ 6 files changed, 10 insertions(+), 4 deletions(-) diff --git a/o2web/source/x_component_cms_QueryViewDesigner/widget/ViewFilter.js b/o2web/source/x_component_cms_QueryViewDesigner/widget/ViewFilter.js index 363c8cdcfe..c8f648f101 100644 --- a/o2web/source/x_component_cms_QueryViewDesigner/widget/ViewFilter.js +++ b/o2web/source/x_component_cms_QueryViewDesigner/widget/ViewFilter.js @@ -88,6 +88,7 @@ MWF.xApplication.cms.QueryViewDesigner.widget.ViewFilter = new Class({ this.valueBooleanInput.setStyle("display", "none"); break; case "datetimeValue": + case "dateTimeValue": this.valueTextInput.setStyle("display", "none"); this.valueNumberInput.setStyle("display", "none"); this.valueDatetimeInput.setStyle("display", "block"); @@ -169,6 +170,7 @@ MWF.xApplication.cms.QueryViewDesigner.widget.ViewFilter = new Class({ value = this.valueNumberInput.get("value").toFloat(); break; case "datetimeValue": + case "dateTimeValue": value = this.valueDatetimeInput.get("value"); break; case "booleanValue": @@ -221,6 +223,7 @@ MWF.xApplication.cms.QueryViewDesigner.widget.ViewFilter = new Class({ this.valueNumberInput.set("value", data.value); break; case "datetimeValue": + case "dateTimeValue": this.valueDatetimeInput.set("value", data.value); break; case "booleanValue": diff --git a/o2web/source/x_component_portal_PageDesigner/Module/View/view.html b/o2web/source/x_component_portal_PageDesigner/Module/View/view.html index 22163b9c02..47bd9c1bef 100644 --- a/o2web/source/x_component_portal_PageDesigner/Module/View/view.html +++ b/o2web/source/x_component_portal_PageDesigner/Module/View/view.html @@ -131,7 +131,7 @@ diff --git a/o2web/source/x_component_process_FormDesigner/Module/View/view.html b/o2web/source/x_component_process_FormDesigner/Module/View/view.html index 4a947f0b32..929beef9b4 100644 --- a/o2web/source/x_component_process_FormDesigner/Module/View/view.html +++ b/o2web/source/x_component_process_FormDesigner/Module/View/view.html @@ -192,7 +192,7 @@ diff --git a/o2web/source/x_component_process_FormDesigner/Module/ViewSelector/ViewSelector.html b/o2web/source/x_component_process_FormDesigner/Module/ViewSelector/ViewSelector.html index 0fb5f99839..03d04dfe4f 100644 --- a/o2web/source/x_component_process_FormDesigner/Module/ViewSelector/ViewSelector.html +++ b/o2web/source/x_component_process_FormDesigner/Module/ViewSelector/ViewSelector.html @@ -118,7 +118,7 @@ diff --git a/o2web/source/x_component_process_ViewDesigner/$View/view.html b/o2web/source/x_component_process_ViewDesigner/$View/view.html index 2b2478f8cc..4f2ea68e86 100644 --- a/o2web/source/x_component_process_ViewDesigner/$View/view.html +++ b/o2web/source/x_component_process_ViewDesigner/$View/view.html @@ -269,7 +269,7 @@ diff --git a/o2web/source/x_component_process_ViewDesigner/widget/ViewFilter.js b/o2web/source/x_component_process_ViewDesigner/widget/ViewFilter.js index 8b56941350..5a19c3c873 100644 --- a/o2web/source/x_component_process_ViewDesigner/widget/ViewFilter.js +++ b/o2web/source/x_component_process_ViewDesigner/widget/ViewFilter.js @@ -132,6 +132,7 @@ MWF.xApplication.process.ViewDesigner.widget.ViewFilter = new Class({ this.valueBooleanInput.setStyle("display", "none"); break; case "datetimeValue": + case "dateTimeValue": this.valueTextInput.setStyle("display", "none"); this.valueNumberInput.setStyle("display", "none"); this.valueDatetimeInput.setStyle("display", "block"); @@ -277,6 +278,7 @@ MWF.xApplication.process.ViewDesigner.widget.ViewFilter = new Class({ value = this.valueNumberInput.get("value").toFloat(); break; case "datetimeValue": + case "dateTimeValue": value = this.valueDatetimeInput.get("value"); break; case "booleanValue": @@ -332,6 +334,7 @@ MWF.xApplication.process.ViewDesigner.widget.ViewFilter = new Class({ this.valueNumberInput.set("value", data.value); break; case "datetimeValue": + case "dateTimeValue": this.valueDatetimeInput.set("value", data.value); break; case "booleanValue": -- GitLab