From 92e7aa6cca7b7bb02ec3a12439f2e325bbc803d0 Mon Sep 17 00:00:00 2001 From: thinkgem Date: Tue, 23 Jun 2020 23:14:08 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E6=9C=9F=E6=8E=A7=E4=BB=B6=E7=84=A6?= =?UTF-8?q?=E7=82=B9=E4=BA=8B=E4=BB=B6=E6=9B=BF=E6=8D=A2=E4=B8=BA=E5=8D=95?= =?UTF-8?q?=E5=87=BB=E4=BA=8B=E4=BB=B6=EF=BC=8C=E5=85=A8=E5=B1=80=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=20focus()"=20=E6=9B=BF=E6=8D=A2=E4=B8=BA=20click()"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/src/main/resources/static/laydate/5.0/laydate.js | 2 +- .../resources/templates/modules/gen/include/searchForm.html | 2 +- .../src/main/resources/views/modules/msg/msgInnerList.html | 2 +- .../core/src/main/resources/views/modules/sys/logList.html | 2 +- .../resources/views/modules/demo/demoDataGridEditGrid.html | 4 ++-- .../resources/views/modules/demo/demoDataGridGroupGrid.html | 4 ++-- web/src/main/resources/views/modules/test/testDataList.html | 4 ++-- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/common/src/main/resources/static/laydate/5.0/laydate.js b/common/src/main/resources/static/laydate/5.0/laydate.js index 1e5b4ad4..414a890a 100644 --- a/common/src/main/resources/static/laydate/5.0/laydate.js +++ b/common/src/main/resources/static/laydate/5.0/laydate.js @@ -379,7 +379,7 @@ ,value: null //默认日期，支持传入new Date()，或者符合format参数设定的日期格式字符 ,min: '1900-1-1' //有效最小日期，年月日必须用“-”分割，时分秒必须用“:”分割。注意：它并不是遵循 format 设定的格式。 ,max: '2099-12-31' //有效最大日期，同上 - ,trigger: 'focus' //呼出控件的事件 + ,trigger: 'click' //呼出控件的事件 ,show: false //是否直接显示，如果设置true，则默认直接显示控件 ,showBottom: true //是否显示底部栏 ,btns: ['clear', 'now', 'confirm'] //右下角显示的按钮，会按照数组顺序排列 diff --git a/modules/core/src/main/resources/templates/modules/gen/include/searchForm.html b/modules/core/src/main/resources/templates/modules/gen/include/searchForm.html index 80159c0b..57e28fcf 100644 --- a/modules/core/src/main/resources/templates/modules/gen/include/searchForm.html +++ b/modules/core/src/main/resources/templates/modules/gen/include/searchForm.html @@ -33,7 +33,7 @@
<% if (c.queryType == 'BETWEEN'){ %> <${'#'}form:input path="${c.attrName}_gte" readonly="true" maxlength="20" class="form-control laydate width-date${isTime?'time':''}" - dataFormat="date${isTime?'time':''}" data-type="date${isTime?'time':''}" data-format="yyyy-MM-dd${isTime?' HH:mm':''}" data-done="${c.attrName}_lte.focus()"/> + dataFormat="date${isTime?'time':''}" data-type="date${isTime?'time':''}" data-format="yyyy-MM-dd${isTime?' HH:mm':''}" data-done="${c.attrName}_lte.click()"/>  -  <${'#'}form:input path="${c.attrName}_lte" readonly="true" maxlength="20" class="form-control laydate width-date${isTime?'time':''}" dataFormat="date${isTime?'time':''}" data-type="date${isTime?'time':''}" data-format="yyyy-MM-dd${isTime?' HH:mm':''}"/> diff --git a/modules/core/src/main/resources/views/modules/msg/msgInnerList.html b/modules/core/src/main/resources/views/modules/msg/msgInnerList.html index 167bcc4b..494668af 100644 --- a/modules/core/src/main/resources/views/modules/msg/msgInnerList.html +++ b/modules/core/src/main/resources/views/modules/msg/msgInnerList.html @@ -37,7 +37,7 @@
<#form:input path="sendDate_gte" readonly="true" maxlength="20" class="form-control laydate width-date" - dataFormat="date" data-type="date" data-format="yyyy-MM-dd" data-done="sendDate_lte.focus()"/> + dataFormat="date" data-type="date" data-format="yyyy-MM-dd" data-done="sendDate_lte.click()"/>  -  <#form:input path="sendDate_lte" readonly="true" maxlength="20" class="form-control laydate width-date" dataFormat="date" data-type="date" data-format="yyyy-MM-dd"/> diff --git a/modules/core/src/main/resources/views/modules/sys/logList.html b/modules/core/src/main/resources/views/modules/sys/logList.html index dbea08ab..3a02a7e0 100644 --- a/modules/core/src/main/resources/views/modules/sys/logList.html +++ b/modules/core/src/main/resources/views/modules/sys/logList.html @@ -61,7 +61,7 @@
<#form:input path="createDate_gte" readonly="true" maxlength="20" class="form-control laydate width-date" - dataFormat="date" data-type="date" data-format="yyyy-MM-dd" data-done="createDate_lte.focus()"/> - + dataFormat="date" data-type="date" data-format="yyyy-MM-dd" data-done="createDate_lte.click()"/> - <#form:input path="createDate_lte" readonly="true" maxlength="20" class="form-control laydate width-date" dataFormat="date" data-type="date" data-format="yyyy-MM-dd"/>
diff --git a/web/src/main/resources/views/modules/demo/demoDataGridEditGrid.html b/web/src/main/resources/views/modules/demo/demoDataGridEditGrid.html index b5ed6f96..50e10eef 100644 --- a/web/src/main/resources/views/modules/demo/demoDataGridEditGrid.html +++ b/web/src/main/resources/views/modules/demo/demoDataGridEditGrid.html @@ -54,7 +54,7 @@
<#form:input path="testDate_gte" readonly="true" maxlength="20" class="form-control laydate width-date" - dataFormat="date" data-type="date" data-format="yyyy-MM-dd" data-done="testDate_lte.focus()"/> + dataFormat="date" data-type="date" data-format="yyyy-MM-dd" data-done="testDate_lte.click()"/>  -  <#form:input path="testDate_lte" readonly="true" maxlength="20" class="form-control laydate width-date" dataFormat="date" data-type="date" data-format="yyyy-MM-dd"/> @@ -64,7 +64,7 @@
<#form:input path="testDatetime_gte" readonly="true" maxlength="20" class="form-control laydate width-datetime" - dataFormat="datetime" data-type="datetime" data-format="yyyy-MM-dd HH:mm" data-done="testDatetime_lte.focus()"/> + dataFormat="datetime" data-type="datetime" data-format="yyyy-MM-dd HH:mm" data-done="testDatetime_lte.click()"/>  -  <#form:input path="testDatetime_lte" readonly="true" maxlength="20" class="form-control laydate width-datetime" dataFormat="datetime" data-type="datetime" data-format="yyyy-MM-dd HH:mm"/> diff --git a/web/src/main/resources/views/modules/demo/demoDataGridGroupGrid.html b/web/src/main/resources/views/modules/demo/demoDataGridGroupGrid.html index fbc3d200..06630483 100644 --- a/web/src/main/resources/views/modules/demo/demoDataGridGroupGrid.html +++ b/web/src/main/resources/views/modules/demo/demoDataGridGroupGrid.html @@ -55,7 +55,7 @@
<#form:input path="testDate_gte" readonly="true" maxlength="20" class="form-control laydate width-date" - dataFormat="date" data-type="date" data-format="yyyy-MM-dd" data-done="testDate_lte.focus()"/> + dataFormat="date" data-type="date" data-format="yyyy-MM-dd" data-done="testDate_lte.click()"/>  -  <#form:input path="testDate_lte" readonly="true" maxlength="20" class="form-control laydate width-date" dataFormat="date" data-type="date" data-format="yyyy-MM-dd"/> @@ -65,7 +65,7 @@
<#form:input path="testDatetime_gte" readonly="true" maxlength="20" class="form-control laydate width-datetime" - dataFormat="datetime" data-type="datetime" data-format="yyyy-MM-dd HH:mm" data-done="testDatetime_lte.focus()"/> + dataFormat="datetime" data-type="datetime" data-format="yyyy-MM-dd HH:mm" data-done="testDatetime_lte.click()"/>  -  <#form:input path="testDatetime_lte" readonly="true" maxlength="20" class="form-control laydate width-datetime" dataFormat="datetime" data-type="datetime" data-format="yyyy-MM-dd HH:mm"/> diff --git a/web/src/main/resources/views/modules/test/testDataList.html b/web/src/main/resources/views/modules/test/testDataList.html index f04ae83e..c9df4393 100644 --- a/web/src/main/resources/views/modules/test/testDataList.html +++ b/web/src/main/resources/views/modules/test/testDataList.html @@ -38,7 +38,7 @@
<#form:input path="testDate_gte" readonly="true" maxlength="20" class="form-control laydate width-date" - dataFormat="date" data-type="date" data-format="yyyy-MM-dd" data-done="testDate_lte.focus()"/> + dataFormat="date" data-type="date" data-format="yyyy-MM-dd" data-done="testDate_lte.click()"/>  -  <#form:input path="testDate_lte" readonly="true" maxlength="20" class="form-control laydate width-date" dataFormat="date" data-type="date" data-format="yyyy-MM-dd"/> @@ -54,7 +54,7 @@
<#form:input path="testDatetime_gte" readonly="true" maxlength="20" class="form-control laydate width-datetime" - dataFormat="datetime" data-type="datetime" data-format="yyyy-MM-dd HH:mm" data-done="testDatetime_lte.focus()"/> + dataFormat="datetime" data-type="datetime" data-format="yyyy-MM-dd HH:mm" data-done="testDatetime_lte.click()"/>  -  <#form:input path="testDatetime_lte" readonly="true" maxlength="20" class="form-control laydate width-datetime" dataFormat="datetime" data-type="datetime" data-format="yyyy-MM-dd HH:mm"/>