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

日期控件替换为 laydate

Browse Source
This commit is contained in:
thinkgem
2020-04-13 15:28:03 +08:00
parent 8d270a7bdf
commit 8fe448ca2c
54 changed files with 2742 additions and 16119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
modules/core/src/main/resources/static/images/date.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 682 B

10
modules/core/src/main/resources/templates/modules/gen/include/formChildTableScript.html
View File

@@ -71,11 +71,11 @@ for (c in child.columnList){
%>
{header:'\${text("${c.columnLabel}")}', name:'${c.attrName}', width:150,
formatter:'date', formatoptions:{srcformat:'Y-m-d H:i:s',newformat:'Y-m-d${isTime?' H:i:s':''}'},
editable:true, edittype:'text', editoptions:{'class':'form-control Wdate${cssClass}', 'readonly':'true',
dataInit: function(element){ $(element).on('focus', function(){
WdatePicker({dateFmt:'yyyy-MM-dd${isTime?' HH:mm':''}',isShowClear:${c.isRequired != '1'}});
});
}}
editable:true, edittype:'text', editoptions:{'class':'form-control laydate${cssClass}', 'readonly':'true',
dataInit: function(element){
laydate.render({elem:element, type:'date${isTime?'time':''}', format:'yyyy-MM-dd${isTime?' HH:mm':''}'});
}
}
},
<%
}else if(c.showType == 'userselect'){

10
modules/core/src/main/resources/templates/modules/gen/include/formControl.html
View File

@@ -123,8 +123,8 @@
<%
} else if (c.showType == 'date' || c.showType == 'datetime') {
var isTime = (c.showType == 'datetime');
%><${'#'}form:input path="${c.attrName}" readonly="true" maxlength="20" class="form-control Wdate${cssClass}"
dataFormat="date${isTime?'time':''}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd${isTime?' HH:mm':''}',isShowClear:${c.isRequired != '1'}});"/>
%><${'#'}form:input path="${c.attrName}" readonly="true" maxlength="20" class="form-control laydate${cssClass}"
dataFormat="date${isTime?'time':''}" data-type="date${isTime?'time':''}" data-format="yyyy-MM-dd${isTime?' HH:mm':''}"/>
<%
} else if (c.showType == 'userselect') {
%><${'#'}form:treeselect id="${c.simpleAttrName}" title="\${text('用户选择')}"
@@ -173,7 +173,8 @@
<div class="row">
<div class="col-xs-12">
<div class="form-group">
<label class="control-label col-sm-2">\${text('图片上传')}：</label>
<label class="control-label col-sm-2">
<span class="required hide">*</span> \${text('图片上传')}：</label>
<div class="col-sm-10">
<${'#'}form:fileupload id="uploadImage" bizKey="\${${className}.id}" bizType="${className}_image"
uploadType="image" class="" readonly="false"/>
@@ -189,7 +190,8 @@
<div class="row">
<div class="col-xs-12">
<div class="form-group">
<label class="control-label col-sm-2">\${text('附件上传')}：</label>
<label class="control-label col-sm-2">
<span class="required hide">*</span> \${text('附件上传')}：</label>
<div class="col-sm-10">
<${'#'}form:fileupload id="uploadFile" bizKey="\${${className}.id}" bizType="${className}_file"
uploadType="all" class="" readonly="false"/>

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

@@ -9,7 +9,7 @@
<div class="control-inline">
<% if (c.queryType == 'BETWEEN'){ %>
<${'#'}form:input path="${c.attrName}_gte"${c.dataLength != "0" ? ' maxlength="'+c.dataLength+'"' : ''} class="form-control width-60"/>
&nbsp;--&nbsp;
&nbsp;-&nbsp;
<${'#'}form:input path="${c.attrName}_lte"${c.dataLength != "0" ? ' maxlength="'+c.dataLength+'"' : ''} class="form-control width-60"/>
<% } else { %>
<${'#'}form:input path="${c.attrName}"${c.dataLength != "0" ? ' maxlength="'+c.dataLength+'"' : ''} class="form-control width-120"/>
@@ -22,24 +22,24 @@
</div>
<% }else if(c.showType == 'radio'){ %>
<div class="control-inline">
<${'#'}form:radio path="${c.attrName}" dictType="${c.optionMap['dictType']}" blankOption="true" class="form-control"/>
<${'#'}form:radio path="${c.attrName}" dictType="${c.optionMap['dictType']}" class="form-control"/>
</div>
<% }else if(c.showType == 'checkbox'){ %>
<div class="control-inline">
<${'#'}form:checkbox path="${c.attrName}" dictType="${c.optionMap['dictType']}" blankOption="true" class="form-control"/>
<${'#'}form:checkbox path="${c.attrName}" dictType="${c.optionMap['dictType']}" class="form-control"/>
</div>
<% }else if(c.showType == 'date' || c.showType == 'datetime'){
var isTime = (c.showType == 'datetime'); %>
<div class="control-inline">
<% if (c.queryType == 'BETWEEN'){ %>
<${'#'}form:input path="${c.attrName}_gte" readonly="true" maxlength="20" class="form-control Wdate-date${isTime?'time':''}"
dataFormat="date${isTime?'time':''}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd${isTime?' HH:mm':''}',isShowClear:false,onpicked:function(){${c.attrName}_lte.click()}});"/>
&nbsp;--&nbsp;
<${'#'}form:input path="${c.attrName}_lte" readonly="true" maxlength="20" class="form-control Wdate-date${isTime?'time':''}"
dataFormat="date${isTime?'time':''}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd${isTime?' HH:mm':''}',isShowClear:false});"/>
<${'#'}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()"/>
&nbsp;-&nbsp;
<${'#'}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':''}"/>
<% } else { %>
<${'#'}form:input path="${c.attrName}" readonly="true" maxlength="20" class="form-control Wdate-date${isTime?'time':''}"
dataFormat="date${isTime?'time':''}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd${isTime?' HH:mm':''}',isShowClear:false});"/>
<${'#'}form:input path="${c.attrName}" 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':''}"/>
<% } %>
</div>
<% }else if(c.showType == 'userselect'){ %>

2
modules/core/src/main/resources/views/include/jslibs.html
View File

@@ -3,7 +3,7 @@
<script src="${ctxStatic}/select2/4.0/select2.js?${_version}"></script>
<script src="${ctxStatic}/select2/4.0/i18n/${lang()}.js?${_version}"></script>
<script src="${ctxStatic}/layer/3.1/layer.js?${_version}"></script>
<script src="${ctxStatic}/my97/WdatePicker.js?${_version}"></script>
<script src="${ctxStatic}/laydate/5.0/laydate.js?${_version}"></script>
<% if (@ListUtils.inString('zTree', libs!)){ %>
<script src="${ctxStatic}/jquery-ztree/3.5/js/jquery.ztree.all-3.5.js?${_version}"></script>
<% } %>

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

@@ -36,11 +36,11 @@
<div class="form-group">
<label class="control-label">${text('发送时间')}：</label>
<div class="control-inline">
<#form:input path="sendDate_gte" readonly="true" maxlength="20" class="form-control Wdate-date"
dataFormat="date" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false,onpicked:function(){sendDate_lte.click()}});"/>
&nbsp;--&nbsp;
<#form:input path="sendDate_lte" readonly="true" maxlength="20" class="form-control Wdate-date"
dataFormat="date" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/>
<#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()"/>
&nbsp;-&nbsp;
<#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"/>
</div>
</div>
<div class="form-group">

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

@@ -10,13 +10,13 @@
</div>
</div>
<div class="box-body">
<#form:form id="searchForm" model="${log}" action="${ctx}/sys/log/listData" method="post" class="form-inline hide"
data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize}" data-order-by="${parameter.orderBy}">
<div class="form-group">
<label class="control-label">日志标题：</label>
<div class="control-inline">
<#form:input path="logTitle" maxlength="500" class="form-control width-90"/>
</div>
<#form:form id="searchForm" model="${log}" action="${ctx}/sys/log/listData" method="post" class="form-inline "
data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize}" data-order-by="${parameter.orderBy}">
<div class="form-group">
<label class="control-label">日志标题：</label>
<div class="control-inline">
<#form:input path="logTitle" maxlength="500" class="form-control width-90"/>
</div>
</div>
<div class="form-group">
<label class="control-label">请求地址：</label>
@@ -26,17 +26,17 @@
</div>
<div class="form-group">
<label class="control-label">日志类型：</label>
<div class="control-inline width-90">
<div class="control-inline width-date">
<#form:select path="logType" dictType="sys_log_type" blankOption="true" class="form-control required " />
</div>
</div>
<div class="form-group">
<label class="control-label">操作用户：</label>
<div class="control-inline width-120">
<div class="form-group">
<label class="control-label">操作用户：</label>
<div class="control-inline width-120">
<#form:listselect id="userSelect" title="用户选择" path="createBy"
url="${ctx}/sys/user/userSelect?userType=" allowClear="false"
checkbox="false" itemCode="userCode" itemName="userName"/>
</div>
checkbox="false" itemCode="userCode" itemName="userName"/>
</div>
</div>
<div class="form-group">
<label class="control-label">是否异常：</label>
@@ -44,12 +44,12 @@
<#form:select path="isException" dictType="sys_yes_no" blankOption="true" class="form-control"/>
</div>
</div>
<div class="clearfix"></div>
<div class="form-group">
<label class="control-label">业务类型：</label>
<div class="control-inline">
<#form:input path="bizType" maxlength="64" class="form-control width-90"/>
</div>
<div class="clearfix"></div>
<div class="form-group">
<label class="control-label">业务类型：</label>
<div class="control-inline">
<#form:input path="bizType" maxlength="64" class="form-control width-90"/>
</div>
</div>
<div class="form-group">
<label class="control-label">业务主键：</label>
@@ -60,11 +60,16 @@
<div class="form-group">
<label class="control-label">操作时间：</label>
<div class="control-inline">
<#form:input path="createDate_gte" readonly="readonly" maxlength="20" class="form-control Wdate-date"
dataFormat="date" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true,onpicked:function(){createDate_lte.click()}});"/>
&nbsp;--&nbsp;
<#form:input path="createDate_lte" readonly="readonly" maxlength="20" class="form-control Wdate-date"
dataFormat="date" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/>
<#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()"/> -
<#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"/>
</div>
<div class="control-inline" style="width:75px;">
<select onchange="js.quickSelectDate(this.value, 'createDate_gte', 'createDate_lte');" class="form-control">
<option value="0">&nbsp;</option><option value="1">今日</option><option value="2">本周</option>
<option value="3">本月</option><option value="4">本季度</option><option value="5">上月</option>
</select>
</div>
</div>
<div class="form-group">
@@ -72,11 +77,11 @@
<div class="control-inline">
<#form:input path="remoteAddr" maxlength="255" class="form-control width-90"/>
</div>
</div>
<div class="form-group">
<button type="submit" class="btn btn-primary btn-sm">查询</button>
<button type="reset" class="btn btn-default btn-sm">重置</button>
</div>
</div>
<div class="form-group">
<button type="submit" class="btn btn-primary btn-sm">查询</button>
<button type="reset" class="btn btn-default btn-sm">重置</button>
</div>
</#form:form>
<table id="dataGrid"></table>
<div id="dataGridPage"></div>