manager/my-worker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

日期控件焦点事件替换为单击事件，全局搜索 focus()" 替换为 click()"

Browse Source
This commit is contained in:
thinkgem
2020-06-23 23:14:08 +08:00
parent c21f9d13ac
commit 92e7aa6cca
7 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/src/main/resources/static/laydate/5.0/laydate.js
View File

@@ -379,7 +379,7 @@
,value: null //默认日期，支持传入new Date()，或者符合format参数设定的日期格式字符 ,value: null //默认日期，支持传入new Date()，或者符合format参数设定的日期格式字符
,min: '1900-1-1' //有效最小日期，年月日必须用“-”分割，时分秒必须用“:”分割。注意：它并不是遵循 format 设定的格式。 ,min: '1900-1-1' //有效最小日期，年月日必须用“-”分割，时分秒必须用“:”分割。注意：它并不是遵循 format 设定的格式。
,max: '2099-12-31' //有效最大日期，同上 ,max: '2099-12-31' //有效最大日期，同上
,trigger: 'focus' //呼出控件的事件 ,trigger: 'click' //呼出控件的事件
,show: false //是否直接显示，如果设置true，则默认直接显示控件 ,show: false //是否直接显示，如果设置true，则默认直接显示控件
,showBottom: true //是否显示底部栏 ,showBottom: true //是否显示底部栏
,btns: ['clear', 'now', 'confirm'] //右下角显示的按钮，会按照数组顺序排列 ,btns: ['clear', 'now', 'confirm'] //右下角显示的按钮，会按照数组顺序排列

2
modules/core/src/main/resources/templates/modules/gen/include/searchForm.html
View File

@@ -33,7 +33,7 @@
<div class="control-inline"> <div class="control-inline">
<% if (c.queryType == 'BETWEEN'){ %> <% if (c.queryType == 'BETWEEN'){ %>
<${'#'}form:input path="${c.attrName}_gte" readonly="true" maxlength="20" class="form-control laydate width-date${isTime?'time':''}" <${'#'}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()"/>
&nbsp;-&nbsp; &nbsp;-&nbsp;
<${'#'}form:input path="${c.attrName}_lte" readonly="true" maxlength="20" class="form-control laydate width-date${isTime?'time':''}" <${'#'}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':''}"/> dataFormat="date${isTime?'time':''}" data-type="date${isTime?'time':''}" data-format="yyyy-MM-dd${isTime?' HH:mm':''}"/>

2
modules/core/src/main/resources/views/modules/msg/msgInnerList.html
View File

@@ -37,7 +37,7 @@
<label class="control-label">${text('发送时间')}：</label> <label class="control-label">${text('发送时间')}：</label>
<div class="control-inline"> <div class="control-inline">
<#form:input path="sendDate_gte" readonly="true" maxlength="20" class="form-control laydate width-date" <#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()"/>
&nbsp;-&nbsp; &nbsp;-&nbsp;
<#form:input path="sendDate_lte" readonly="true" maxlength="20" class="form-control laydate width-date" <#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"/> dataFormat="date" data-type="date" data-format="yyyy-MM-dd"/>

2
modules/core/src/main/resources/views/modules/sys/logList.html
View File

@@ -61,7 +61,7 @@
<label class="control-label">操作时间：</label> <label class="control-label">操作时间：</label>
<div class="control-inline"> <div class="control-inline">
<#form:input path="createDate_gte" readonly="true" maxlength="20" class="form-control laydate width-date" <#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" <#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"/> dataFormat="date" data-type="date" data-format="yyyy-MM-dd"/>
</div> </div>

4
web/src/main/resources/views/modules/demo/demoDataGridEditGrid.html
View File

@@ -54,7 +54,7 @@
<label class="control-label">日期选择：</label> <label class="control-label">日期选择：</label>
<div class="control-inline"> <div class="control-inline">
<#form:input path="testDate_gte" readonly="true" maxlength="20" class="form-control laydate width-date" <#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()"/>
&nbsp;-&nbsp; &nbsp;-&nbsp;
<#form:input path="testDate_lte" readonly="true" maxlength="20" class="form-control laydate width-date" <#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"/> dataFormat="date" data-type="date" data-format="yyyy-MM-dd"/>
@@ -64,7 +64,7 @@
<label class="control-label">日期时间：</label> <label class="control-label">日期时间：</label>
<div class="control-inline"> <div class="control-inline">
<#form:input path="testDatetime_gte" readonly="true" maxlength="20" class="form-control laydate width-datetime" <#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()"/>
&nbsp;-&nbsp; &nbsp;-&nbsp;
<#form:input path="testDatetime_lte" readonly="true" maxlength="20" class="form-control laydate width-datetime" <#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"/> dataFormat="datetime" data-type="datetime" data-format="yyyy-MM-dd HH:mm"/>

4
web/src/main/resources/views/modules/demo/demoDataGridGroupGrid.html
View File

@@ -55,7 +55,7 @@
<label class="control-label">日期选择：</label> <label class="control-label">日期选择：</label>
<div class="control-inline"> <div class="control-inline">
<#form:input path="testDate_gte" readonly="true" maxlength="20" class="form-control laydate width-date" <#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()"/>
&nbsp;-&nbsp; &nbsp;-&nbsp;
<#form:input path="testDate_lte" readonly="true" maxlength="20" class="form-control laydate width-date" <#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"/> dataFormat="date" data-type="date" data-format="yyyy-MM-dd"/>
@@ -65,7 +65,7 @@
<label class="control-label">日期时间：</label> <label class="control-label">日期时间：</label>
<div class="control-inline"> <div class="control-inline">
<#form:input path="testDatetime_gte" readonly="true" maxlength="20" class="form-control laydate width-datetime" <#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()"/>
&nbsp;-&nbsp; &nbsp;-&nbsp;
<#form:input path="testDatetime_lte" readonly="true" maxlength="20" class="form-control laydate width-datetime" <#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"/> dataFormat="datetime" data-type="datetime" data-format="yyyy-MM-dd HH:mm"/>

4
web/src/main/resources/views/modules/test/testDataList.html
View File

@@ -38,7 +38,7 @@
<label class="control-label">${text('日期选择')}：</label> <label class="control-label">${text('日期选择')}：</label>
<div class="control-inline"> <div class="control-inline">
<#form:input path="testDate_gte" readonly="true" maxlength="20" class="form-control laydate width-date" <#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()"/>
&nbsp;-&nbsp; &nbsp;-&nbsp;
<#form:input path="testDate_lte" readonly="true" maxlength="20" class="form-control laydate width-date" <#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"/> dataFormat="date" data-type="date" data-format="yyyy-MM-dd"/>
@@ -54,7 +54,7 @@
<label class="control-label">${text('日期时间')}：</label> <label class="control-label">${text('日期时间')}：</label>
<div class="control-inline"> <div class="control-inline">
<#form:input path="testDatetime_gte" readonly="true" maxlength="20" class="form-control laydate width-datetime" <#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()"/>
&nbsp;-&nbsp; &nbsp;-&nbsp;
<#form:input path="testDatetime_lte" readonly="true" maxlength="20" class="form-control laydate width-datetime" <#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"/> dataFormat="datetime" data-type="datetime" data-format="yyyy-MM-dd HH:mm"/>