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

升级 laydate 5.3 升级注意：查找替换 /5.0/laydate.js 为 /5.3/laydate.js

Browse Source
This commit is contained in:
thinkgem
2022-01-17 12:03:13 +08:00
parent 9d79ae73ec
commit 660087f613
10 changed files with 1602 additions and 673 deletions
Download Patch File Download Diff File Expand all files Collapse all files

174
common/src/main/resources/static/laydate/5.0/theme/default/laydate.css
View File

@@ -1,174 +0,0 @@
/** 图标字体 **/
@font-face {font-family:'laydate-icon';
src:url('./font/iconfont.eot');
src:url('./font/iconfont.eot#iefix') format('embedded-opentype'),
url('./font/iconfont.svg#iconfont') format('svg'),
url('./font/iconfont.woff') format('woff'),
url('./font/iconfont.ttf') format('truetype');
}
.laydate-icon{
font-family:"laydate-icon"!important;
font-size:16px;
font-style:normal;
-webkit-font-smoothing:antialiased;
-moz-osx-font-smoothing:grayscale;
}
/**
@Name:laydata
@Author:贤心
**/
html #layuicss-laydate{display:none;position:absolute;width:1989px;}
/* 初始化 */
.layui-laydate *{margin:0;padding:0;}
/* 主体结构 */
.layui-laydate, .layui-laydate *{box-sizing:border-box;}
.layui-laydate{position:absolute;z-index:66666666;margin:5px 0;border-radius:2px;font-size:14px;-webkit-animation-duration:0.3s;animation-duration:0.3s;-webkit-animation-fill-mode:both;animation-fill-mode:both;}
.layui-laydate-main{width:260px;}
.layui-laydate-header *,
.layui-laydate-content td,
.layui-laydate-list li{transition-duration:.3s;-webkit-transition-duration:.3s;}
@-webkit-keyframes laydate-upbit{ /* 微微往上滑入 */
from {-webkit-transform:translate3d(0, 20px, 0);opacity:0.3;}
to {-webkit-transform:translate3d(0, 0, 0); opacity:1;}
}
@keyframes laydate-upbit{
from {transform:translate3d(0, 20px, 0); opacity:0.3;}
to {transform:translate3d(0, 0, 0); opacity:1;}
}
.layui-laydate{-webkit-animation-name:laydate-upbit;animation-name:laydate-upbit;}
.layui-laydate-static{ position:relative;z-index:0;display:inline-block;margin:0;-webkit-animation:none;animation:none;}
/* 展开年月列表时 */
.laydate-ym-show .laydate-prev-m,
.laydate-ym-show .laydate-next-m{display:none!important;}
.laydate-ym-show .laydate-prev-y,
.laydate-ym-show .laydate-next-y{display:inline-block!important;}
.laydate-ym-show .laydate-set-ym span[lay-type="month"]{display:none!important;}
/* 展开时间列表时 */
.laydate-time-show .layui-laydate-header .layui-icon,
.laydate-time-show .laydate-set-ym span[lay-type="year"],
.laydate-time-show .laydate-set-ym span[lay-type="month"]{display:none!important;}
/* 头部结构 */
.layui-laydate-header{position:relative;line-height:22px;padding:6px 50px 5px;}
.layui-laydate-header *{display:inline-block;vertical-align:bottom;}
.layui-laydate-header i{position:absolute;top:6px;padding:0 2px;color:#999;font-size:14px;cursor:pointer;}
.layui-laydate-header i.laydate-prev-y{left:15px;}
.layui-laydate-header i.laydate-prev-m{left:45px;}
.layui-laydate-header i.laydate-next-y{right:15px;}
.layui-laydate-header i.laydate-next-m{right:45px;}
.laydate-set-ym{width:100%;text-align:center;box-sizing:border-box;text-overflow:ellipsis;overflow:hidden;white-space:nowrap;}
.laydate-set-ym span{padding:0 5px;cursor:pointer;}
.laydate-time-text{cursor:default!important;}
/* 主体结构 */
.layui-laydate-content{position:relative;padding:5px;-moz-user-select:none;-webkit-user-select:none;-ms-user-select:none;}
.layui-laydate-content table{border-collapse:collapse;border-spacing:0;}
.layui-laydate-content th,
.layui-laydate-content td{width:36px;height:30px;padding:0px;text-align:center;}
.layui-laydate-content th{font-weight:400;}
.layui-laydate-content td{position:relative;cursor:pointer;}
.laydate-day-mark{position:absolute;left:0;top:0;width:100%;height:100%;line-height:30px;font-size:12px;overflow:hidden;}
.laydate-day-mark::after{position:absolute;content:'';right:2px;top:2px;width:5px;height:5px;border-radius:50%;}
/* 底部结构 */
.layui-laydate-footer{position:relative;height:36px;line-height:22px;padding:6px 15px;}
.layui-laydate-footer span{margin-right:15px;display:inline-block;cursor:pointer;font-size:12px;}
.layui-laydate-footer span:hover{color:#08c;}
.laydate-footer-btns{position:absolute;right:5px;top:5px;}
.laydate-footer-btns span{margin:0 0 0 3px;padding:0 8px;border:1px solid #C9C9C9;background-color:#fff; white-space:nowrap;vertical-align:top;border-radius:4px;}
/* 年月列表 */
.layui-laydate-list{position:absolute;left:0;top:0;width:100%;height:100%;padding:10px;box-sizing:border-box;background-color:#fff;}
.layui-laydate-list>li{position:relative;display:inline-block;width:33.3%;height:36px;line-height:36px;margin:3px 0;vertical-align:middle;text-align:center;cursor:pointer;}
.laydate-month-list>li{width:25%;margin:17px 0;}
.laydate-time-list{}
.laydate-time-list>li{height:100%;margin:0;line-height:normal;cursor:default;}
.laydate-time-list p{position:relative;top:-4px;line-height:29px;}
.laydate-time-list ol{height:181px;overflow:hidden;}
.laydate-time-list>li:hover ol{overflow-y:auto;}
.laydate-time-list ol li{width:130%;padding-left:27px;line-height:30px;text-align:left;cursor:pointer;}
/* 提示 */
.layui-laydate-hint{position:absolute;top:115px;left:50%;width:250px;margin-left:-125px;line-height:20px;padding:15px;text-align:center;font-size:12px;color:#FF5722;}
/* 双日历 */
.layui-laydate-range{width:523px;}
.layui-laydate-range .layui-laydate-main{display:inline-block;vertical-align:middle;}
.layui-laydate-range .laydate-main-list-0 .laydate-next-m,
.layui-laydate-range .laydate-main-list-0 .laydate-next-y,
.layui-laydate-range .laydate-main-list-1 .laydate-prev-y,
.layui-laydate-range .laydate-main-list-1 .laydate-prev-m{display:none;}
.layui-laydate-range .laydate-main-list-1 .layui-laydate-content{border-left:1px solid #e2e2e2;}
/* 默认简约主题 */
.layui-laydate, .layui-laydate-hint{border:1px solid #d2d2d2;box-shadow:0 2px 4px rgba(0,0,0,.12);border-radius:5px;background-color:#fff;color:#666;}
.layui-laydate-header{border-bottom:1px solid #e2e2e2;}
.layui-laydate-header i:hover,
.layui-laydate-header span:hover{color:#08c;}
.layui-laydate-content{border-top:none 0;border-bottom:none 0;}
.layui-laydate-content th{color:#333;}
.layui-laydate-content td{color:#666;}
.layui-laydate-content td.laydate-selected{background-color:#c2eaff;}
.laydate-selected:hover{background-color:#c2eaff!important;}
.layui-laydate-content td:hover,
.layui-laydate-list li:hover{background-color:#eaeaea;color:#333;}
.laydate-time-list li ol{margin:0;padding:0;border:1px solid #e2e2e2;border-left-width:0;}
.laydate-time-list li:first-child ol{border-left-width:1px;}
.laydate-time-list>li:hover{background:none;}
.layui-laydate-content .laydate-day-prev,
.layui-laydate-content .laydate-day-next{color:#d2d2d2;}
.laydate-selected.laydate-day-prev,
.laydate-selected.laydate-day-next{background-color:#f8f8f8!important;}
.layui-laydate-footer{border-top:1px solid #e2e2e2;}
.layui-laydate-hint{color:#FF5722;}
.laydate-day-mark::after{background-color:#08c;}
.layui-laydate-content td.layui-this .laydate-day-mark::after{display:none;}
.layui-laydate-footer span[lay-type="date"]{color:#08c;}
.layui-laydate .layui-this{background-color:#08c!important;color:#fff!important;}
.layui-laydate .laydate-btns-confirm{background-color:#139ce0;border:1px solid #139ce0;color:#fff;}
.layui-laydate .laydate-btns-confirm:hover{background-color:#08c;color:#fff;}
.layui-laydate .laydate-disabled,
.layui-laydate .laydate-disabled:hover{background:none!important;color:#d2d2d2!important;border-color:#d2d2d2;cursor:not-allowed!important;-moz-user-select:none;-webkit-user-select:none;-ms-user-select:none;}
/* 墨绿/自定义背景色主题 */
.laydate-theme-molv{border:none;}
.laydate-theme-molv.layui-laydate-range{width:548px}
.laydate-theme-molv .layui-laydate-main{width:274px;}
.laydate-theme-molv .layui-laydate-header{border:none;background-color:#009688;}
.laydate-theme-molv .layui-laydate-header i,
.laydate-theme-molv .layui-laydate-header span{color:#f6f6f6;}
.laydate-theme-molv .layui-laydate-header i:hover,
.laydate-theme-molv .layui-laydate-header span:hover{color:#fff;}
.laydate-theme-molv .layui-laydate-content{border:1px solid #e2e2e2;border-top:none;border-bottom:none;}
.laydate-theme-molv .laydate-main-list-1 .layui-laydate-content{border-left:none;}
.laydate-theme-molv .layui-laydate-footer{border:1px solid #e2e2e2;}
/* 格子主题 */
.laydate-theme-grid .layui-laydate-content td,
.laydate-theme-grid .layui-laydate-content thead,
.laydate-theme-grid .laydate-year-list>li,
.laydate-theme-grid .laydate-month-list>li{border:1px solid #e2e2e2;}
.laydate-theme-grid .laydate-selected,
.laydate-theme-grid .laydate-selected:hover{background-color:#f2f2f2!important;color:#009688!important;}
.laydate-theme-grid .laydate-selected.laydate-day-prev,
.laydate-theme-grid .laydate-selected.laydate-day-next{color:#d2d2d2!important;}
.laydate-theme-grid .laydate-year-list,
.laydate-theme-grid .laydate-month-list{margin:1px 0 0 1px;}
.laydate-theme-grid .laydate-year-list>li,
.laydate-theme-grid .laydate-month-list>li{margin:0 -1px -1px 0;}
.laydate-theme-grid .laydate-year-list>li{height:43px;line-height:43px;}
.laydate-theme-grid .laydate-month-list>li{height:71px;line-height:71px;}

1926
common/src/main/resources/static/laydate/5.0/laydate.js → common/src/main/resources/static/laydate/5.3/laydate.js
View File

File diff suppressed because it is too large Load Diff

0
common/src/main/resources/static/laydate/5.0/test.html → common/src/main/resources/static/laydate/5.3/test.html
View File

0
common/src/main/resources/static/laydate/5.0/theme/default/font/iconfont.eot → common/src/main/resources/static/laydate/5.3/theme/default/font/iconfont.eot
View File

0
common/src/main/resources/static/laydate/5.0/theme/default/font/iconfont.svg → common/src/main/resources/static/laydate/5.3/theme/default/font/iconfont.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 3.0 KiB

0
common/src/main/resources/static/laydate/5.0/theme/default/font/iconfont.ttf → common/src/main/resources/static/laydate/5.3/theme/default/font/iconfont.ttf
View File

0
common/src/main/resources/static/laydate/5.0/theme/default/font/iconfont.woff → common/src/main/resources/static/laydate/5.3/theme/default/font/iconfont.woff
View File

171
common/src/main/resources/static/laydate/5.3/theme/default/laydate.css Normal file
View File

@@ -0,0 +1,171 @@
/** 图标字体 **/
@font-face {font-family: 'laydate-icon';
src: url('./font/iconfont.eot');
src: url('./font/iconfont.eot#iefix') format('embedded-opentype'),
url('./font/iconfont.svg#iconfont') format('svg'),
url('./font/iconfont.woff') format('woff'),
url('./font/iconfont.ttf') format('truetype');
}
.laydate-icon{
font-family:"laydate-icon" !important;
font-size: 16px;
font-style: normal;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
/**
@Name: laydata
**/
html #layuicss-laydate{display: none; position: absolute; width: 1989px;}
/* 初始化 */
.layui-laydate *{margin: 0; padding: 0;}
/* 主体结构 */
.layui-laydate, .layui-laydate *{box-sizing: border-box;}
.layui-laydate{position: absolute; z-index: 66666666; margin: 5px 0; border-radius: 2px; font-size: 14px; -webkit-animation-duration: 0.2s; animation-duration: 0.2s; -webkit-animation-fill-mode: both; animation-fill-mode: both;}
.layui-laydate-main{width: 260px;}
.layui-laydate-header *,
.layui-laydate-content td,
.layui-laydate-list li{transition-duration: .3s; -webkit-transition-duration: .3s;}
/* 微微往下滑入 */
@keyframes laydate-downbit {
0% {opacity: 0.3; transform: translate3d(0, -5px, 0);}
100% {opacity: 1; transform: translate3d(0, 0, 0);}
}
.layui-laydate{animation-name: laydate-downbit;}
.layui-laydate-static{ position: relative; z-index: 0; display: inline-block; margin: 0; -webkit-animation: none; animation: none;}
/* 展开年月列表时 */
.laydate-ym-show .laydate-prev-m,
.laydate-ym-show .laydate-next-m{display: none !important;}
.laydate-ym-show .laydate-prev-y,
.laydate-ym-show .laydate-next-y{display: inline-block !important;}
.laydate-ym-show .laydate-set-ym span[lay-type="month"]{display: none !important;}
/* 展开时间列表时 */
.laydate-time-show .layui-laydate-header .layui-icon,
.laydate-time-show .laydate-set-ym span[lay-type="year"],
.laydate-time-show .laydate-set-ym span[lay-type="month"]{display: none !important;}
/* 头部结构 */
.layui-laydate-header{position: relative; line-height: 22px; padding: 6px 50px 5px;}
.layui-laydate-header *{display: inline-block; vertical-align: bottom;}
.layui-laydate-header i{position: absolute; top: 6px; padding: 0 2px; color: #999; font-size: 14px; cursor: pointer;}
.layui-laydate-header i.laydate-prev-y{left: 15px;}
.layui-laydate-header i.laydate-prev-m{left: 45px;}
.layui-laydate-header i.laydate-next-y{right: 15px;}
.layui-laydate-header i.laydate-next-m{right: 45px;}
.laydate-set-ym{width: 100%; text-align: center; box-sizing: border-box; text-overflow: ellipsis; overflow: hidden; white-space: nowrap;}
.laydate-set-ym span{padding: 0 5px; cursor: pointer;}
.laydate-time-text{cursor: default !important;}
/* 主体结构 */
.layui-laydate-content{position: relative; padding: 5px; -moz-user-select: none; -webkit-user-select: none; -ms-user-select: none;}
.layui-laydate-content table{border-collapse: collapse; border-spacing: 0;}
.layui-laydate-content th,
.layui-laydate-content td{width: 36px; height: 30px; padding: 5px; text-align: center;}
.layui-laydate-content th{font-weight: 400;}
.layui-laydate-content td{position: relative; cursor: pointer;}
.laydate-day-mark{position: absolute; left: 0; top: 0; width: 100%; line-height: 30px; font-size: 12px; overflow: hidden;}
.laydate-day-mark::after{position: absolute; content:''; right: 2px; top: 2px; width: 5px; height: 5px; border-radius: 50%;}
/* 底部结构 */
.layui-laydate-footer{position: relative; height: 36px; line-height: 22px; padding: 6px 15px;}
.layui-laydate-footer span{display: inline-block; vertical-align: top; height: 24px; line-height: 22px; padding: 0 10px; border: 1px solid #C9C9C9; border-radius: 2px; background-color: #fff; font-size: 12px; cursor: pointer; white-space: nowrap; transition: all .3s;}
.layui-laydate-footer span:hover{color: #08c;}
.layui-laydate-footer span.layui-laydate-preview{cursor: default; border-color: transparent !important;}
.layui-laydate-footer span.layui-laydate-preview:hover{color: #666;}
.layui-laydate-footer span:first-child.layui-laydate-preview{padding-left: 0;}
.laydate-footer-btns{position: absolute; right: 5px; top: 5px;}
.laydate-footer-btns span{margin:0 0 0 3px;padding:0 8px;border:1px solid #C9C9C9;background-color:#fff; white-space:nowrap;vertical-align:top;border-radius:4px;}
/* 年月列表 */
.layui-laydate-list{position: absolute; left: 0; top: 0; width: 100%; height: 100%; padding: 10px; box-sizing: border-box; background-color: #fff;}
.layui-laydate-list>li{position: relative; display: inline-block; width: 33.3%; height: 36px; line-height: 36px; margin: 3px 0; vertical-align: middle; text-align: center; cursor: pointer;}
.laydate-month-list>li{width: 25%; margin: 17px 0;}
.laydate-time-list{}
.laydate-time-list>li{height: 100%; margin: 0; line-height: normal; cursor: default;}
.laydate-time-list p{position: relative; top: -4px; line-height: 29px;}
.laydate-time-list ol{height: 181px; overflow: hidden;}
.laydate-time-list>li:hover ol{overflow-y: auto;}
.laydate-time-list ol li{width: 130%; padding-left: 27px; height: 30px; line-height: 30px; text-align: left; cursor: pointer;}
/* 提示 */
.layui-laydate-hint{position: absolute; top: 115px; left: 50%; width: 250px; margin-left: -125px; line-height: 20px; padding: 15px; text-align: center; font-size: 12px; color: #FF5722;}
/* 双日历 */
.layui-laydate-range{width: 546px;}
.layui-laydate-range .layui-laydate-main{display: inline-block; vertical-align: middle;}
.layui-laydate-range .laydate-main-list-1 .layui-laydate-header,
.layui-laydate-range .laydate-main-list-1 .layui-laydate-content{border-left: 1px solid #e2e2e2;}
/* 默认简约主题 */
.layui-laydate, .layui-laydate-hint{border: 1px solid #d2d2d2; box-shadow: 0 2px 4px rgba(0,0,0,.12); background-color: #fff; color: #666;}
.layui-laydate-header{border-bottom: 1px solid #e2e2e2;}
.layui-laydate-header i:hover,
.layui-laydate-header span:hover{color: #08c;}
.layui-laydate-content{border-top: none 0; border-bottom: none 0;}
.layui-laydate-content th{color: #333;}
.layui-laydate-content td{color: #666;}
.layui-laydate-content td.laydate-selected{background-color: #c2eaff;}
.laydate-selected:hover{background-color: #c2eaff !important;}
.layui-laydate-content td:hover,
.layui-laydate-list li:hover{background-color: #eaeaea; color: #333;}
.laydate-time-list li ol{margin: 0; padding: 0; border: 1px solid #e2e2e2; border-left-width: 0;}
.laydate-time-list li:first-child ol{border-left-width: 1px;}
.laydate-time-list>li:hover{background: none;}
.layui-laydate-content .laydate-day-prev,
.layui-laydate-content .laydate-day-next{color: #d2d2d2;}
.laydate-selected.laydate-day-prev,
.laydate-selected.laydate-day-next{background-color: #f8f8f8 !important;}
.layui-laydate-footer{border-top: 1px solid #e2e2e2;}
.layui-laydate-hint{color: #FF5722;}
.laydate-day-mark::after{background-color: #08c;}
.layui-laydate-content td.layui-this .laydate-day-mark::after{display: none;}
.layui-laydate-footer span[lay-type="date"]{color: #08c;}
.layui-laydate .layui-this{background-color: #08c !important; color: #fff !important;}
.layui-laydate .laydate-btns-confirm{background-color:#139ce0;border:1px solid #139ce0;color:#fff;}
.layui-laydate .laydate-btns-confirm:hover{background-color:#08c;color:#fff;}
.layui-laydate .laydate-disabled,
.layui-laydate .laydate-disabled:hover{background:none !important; color: #d2d2d2 !important; cursor: not-allowed !important; -moz-user-select: none; -webkit-user-select: none; -ms-user-select: none;}
/* 墨绿/自定义背景色主题 */
.laydate-theme-molv{border: none;}
.laydate-theme-molv.layui-laydate-range{width: 548px}
.laydate-theme-molv .layui-laydate-main{width: 274px;}
.laydate-theme-molv .layui-laydate-header{border: none; background-color: #009688;}
.laydate-theme-molv .layui-laydate-header i,
.laydate-theme-molv .layui-laydate-header span{color: #f6f6f6;}
.laydate-theme-molv .layui-laydate-header i:hover,
.laydate-theme-molv .layui-laydate-header span:hover{color: #fff;}
.laydate-theme-molv .layui-laydate-content{border: 1px solid #e2e2e2; border-top: none; border-bottom: none;}
.laydate-theme-molv .laydate-main-list-1 .layui-laydate-content{border-left: none;}
.laydate-theme-molv .layui-laydate-footer{border: 1px solid #e2e2e2;}
/* 格子主题 */
.laydate-theme-grid .layui-laydate-content td,
.laydate-theme-grid .layui-laydate-content thead,
.laydate-theme-grid .laydate-year-list>li,
.laydate-theme-grid .laydate-month-list>li{border: 1px solid #e2e2e2;}
.laydate-theme-grid .laydate-selected,
.laydate-theme-grid .laydate-selected:hover{background-color: #f2f2f2 !important; color: #009688 !important;}
.laydate-theme-grid .laydate-selected.laydate-day-prev,
.laydate-theme-grid .laydate-selected.laydate-day-next{color: #d2d2d2 !important;}
.laydate-theme-grid .laydate-year-list,
.laydate-theme-grid .laydate-month-list{margin: 1px 0 0 1px;}
.laydate-theme-grid .laydate-year-list>li,
.laydate-theme-grid .laydate-month-list>li{margin: 0 -1px -1px 0;}
.laydate-theme-grid .laydate-year-list>li{height: 43px; line-height: 43px;}
.laydate-theme-grid .laydate-month-list>li{height: 71px; line-height: 71px;}

2
modules/cms/src/main/resources/views/modules/cmsfront/themes/default/search.html
View File

@@ -1,5 +1,5 @@
<% layout('layouts/default.html', {title: '全站搜索', libs: []}){ %>
<script src="${ctxStatic}/laydate/5.0/laydate.js?${_version}"></script>
<script src="${ctxStatic}/laydate/5.3/laydate.js?${_version}"></script>
<style type="text/css">
form.search {margin:12px 20px 5px;}
form.search input.txt {padding:4px 8px;font-size:16px;width:300px;margin:5px;border:1px solid #bbb;border-radius:3px;}

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

@@ -4,7 +4,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}/laydate/5.0/laydate.js?${_version}"></script>
<script src="${ctxStatic}/laydate/5.3/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>
<% } %>