升级.net8
This commit is contained in:
@ -1,13 +1,13 @@
|
||||
/**
|
||||
* util 工具组件
|
||||
* util 工具组件
|
||||
*/
|
||||
|
||||
layui.define('jquery', function(exports){
|
||||
"use strict";
|
||||
|
||||
|
||||
var $ = layui.$;
|
||||
var hint = layui.hint();
|
||||
|
||||
|
||||
// 外部接口
|
||||
var util = {
|
||||
// 固定块
|
||||
@ -19,7 +19,7 @@ layui.define('jquery', function(exports){
|
||||
options = $.extend(true, {
|
||||
target: 'body', // fixbar 的插入目标选择器
|
||||
bars: [], // bar 信息
|
||||
default: true, // 是否显示默认 bar
|
||||
"default": true, // 是否显示默认 bar
|
||||
margin: 160, // 出现 top bar 的滚动条高度临界值
|
||||
duration: 320 // top bar 等动画时长(毫秒)
|
||||
}, options);
|
||||
@ -28,12 +28,12 @@ layui.define('jquery', function(exports){
|
||||
var $target = $(options.target);
|
||||
|
||||
// 滚动条所在元素对象
|
||||
var $scroll = options.scroll
|
||||
? $(options.scroll)
|
||||
var $scroll = options.scroll
|
||||
? $(options.scroll)
|
||||
: $(options.target === 'body' ? $doc : $target)
|
||||
|
||||
// 是否提供默认图标
|
||||
if(options.default){
|
||||
if(options['default']){
|
||||
// 兼容旧版本的一些属性
|
||||
if(options.bar1){
|
||||
options.bars.push({
|
||||
@ -72,8 +72,8 @@ layui.define('jquery', function(exports){
|
||||
var type = $(this).attr('lay-type');
|
||||
if(type === 'top'){
|
||||
(
|
||||
options.target === 'body'
|
||||
? $('html,body')
|
||||
options.target === 'body'
|
||||
? $('html,body')
|
||||
: $scroll
|
||||
).animate({
|
||||
scrollTop : 0
|
||||
@ -130,9 +130,9 @@ layui.define('jquery', function(exports){
|
||||
timer = setTimeout(function(){
|
||||
setTopBar();
|
||||
}, 100);
|
||||
});
|
||||
});
|
||||
},
|
||||
|
||||
|
||||
// 倒计时
|
||||
countdown: function(options){
|
||||
var that = this;
|
||||
@ -198,27 +198,27 @@ layui.define('jquery', function(exports){
|
||||
if(countTime <= 0){
|
||||
clearTimeout(inst.timer);
|
||||
typeof options.done === 'function' && options.done(result, inst);
|
||||
};
|
||||
}
|
||||
|
||||
return fn;
|
||||
})();
|
||||
|
||||
|
||||
return inst;
|
||||
},
|
||||
|
||||
|
||||
// 某个时间在当前时间的多久前
|
||||
timeAgo: function(time, onlyDate){
|
||||
var that = this;
|
||||
var arr = [[], []];
|
||||
var stamp = new Date().getTime() - new Date(time).getTime();
|
||||
|
||||
|
||||
// 返回具体日期
|
||||
if(stamp > 1000*60*60*24*31){
|
||||
stamp = new Date(time);
|
||||
arr[0][0] = that.digit(stamp.getFullYear(), 4);
|
||||
arr[0][1] = that.digit(stamp.getMonth() + 1);
|
||||
arr[0][2] = that.digit(stamp.getDate());
|
||||
|
||||
|
||||
// 是否输出时间
|
||||
if(!onlyDate){
|
||||
arr[1][0] = that.digit(stamp.getHours());
|
||||
@ -227,7 +227,7 @@ layui.define('jquery', function(exports){
|
||||
}
|
||||
return arr[0].join('-') + ' ' + arr[1].join(':');
|
||||
}
|
||||
|
||||
|
||||
// 30 天以内,返回「多久前」
|
||||
if(stamp >= 1000*60*60*24){
|
||||
return ((stamp/1000/60/60/24)|0) + ' 天前';
|
||||
@ -241,7 +241,7 @@ layui.define('jquery', function(exports){
|
||||
return '刚刚';
|
||||
}
|
||||
},
|
||||
|
||||
|
||||
// 数字前置补零
|
||||
digit: function(num, length){
|
||||
var str = '';
|
||||
@ -252,39 +252,75 @@ layui.define('jquery', function(exports){
|
||||
}
|
||||
return num < Math.pow(10, length) ? str + (num|0) : num;
|
||||
},
|
||||
|
||||
|
||||
// 转化为日期格式字符
|
||||
toDateString: function(time, format){
|
||||
//若 null 或空字符,则返回空字符
|
||||
toDateString: function(time, format, options){
|
||||
// 若 null 或空字符,则返回空字符
|
||||
if(time === null || time === '') return '';
|
||||
|
||||
var that = this
|
||||
,date = new Date(function(){
|
||||
|
||||
// 引用自 dayjs
|
||||
// https://github.com/iamkun/dayjs/blob/v1.11.9/src/constant.js#L30
|
||||
var REGEX_FORMAT = /\[([^\]]+)]|y{1,4}|M{1,2}|d{1,2}|H{1,2}|h{1,2}|a|A|m{1,2}|s{1,2}|SSS/g;
|
||||
var that = this;
|
||||
var date = new Date(function(){
|
||||
if(!time) return;
|
||||
return isNaN(time) ? time : (typeof time === 'string' ? parseInt(time) : time)
|
||||
}() || new Date())
|
||||
,ymd = [
|
||||
that.digit(date.getFullYear(), 4)
|
||||
,that.digit(date.getMonth() + 1)
|
||||
,that.digit(date.getDate())
|
||||
]
|
||||
,hms = [
|
||||
that.digit(date.getHours())
|
||||
,that.digit(date.getMinutes())
|
||||
,that.digit(date.getSeconds())
|
||||
];
|
||||
|
||||
if(!date.getDate()) return hint.error('Invalid Msec for "util.toDateString(Msec)"'), '';
|
||||
|
||||
|
||||
if(!date.getDate()) return hint.error('Invalid millisecond for "util.toDateString(millisecond)"'), '';
|
||||
|
||||
var years = date.getFullYear();
|
||||
var month = date.getMonth();
|
||||
var days = date.getDate();
|
||||
var hours = date.getHours();
|
||||
var minutes = date.getMinutes();
|
||||
var seconds = date.getSeconds();
|
||||
var milliseconds = date.getMilliseconds();
|
||||
|
||||
var defaultMeridiem = function(hours, minutes){
|
||||
var hm = hours * 100 + minutes;
|
||||
if (hm < 600) {
|
||||
return '凌晨';
|
||||
} else if (hm < 900) {
|
||||
return '早上';
|
||||
} else if (hm < 1100) {
|
||||
return '上午';
|
||||
} else if (hm < 1300) {
|
||||
return '中午';
|
||||
} else if (hm < 1800) {
|
||||
return '下午';
|
||||
}
|
||||
return '晚上';
|
||||
};
|
||||
|
||||
var meridiem = (options && options.customMeridiem) || defaultMeridiem;
|
||||
|
||||
var matches = {
|
||||
yy: function(){return String(years).slice(-2);},
|
||||
yyyy: function(){return that.digit(years, 4);},
|
||||
M: function(){return String(month + 1);},
|
||||
MM: function(){return that.digit(month + 1);},
|
||||
d: function(){return String(days);},
|
||||
dd: function(){return that.digit(days);},
|
||||
H: function(){return String(hours);},
|
||||
HH: function(){return that.digit(hours);},
|
||||
h: function(){return String(hours % 12 || 12);},
|
||||
hh: function(){return that.digit(hours % 12 || 12);},
|
||||
A: function(){return meridiem(hours, minutes);},
|
||||
m: function(){return String(minutes);},
|
||||
mm: function(){return that.digit(minutes);},
|
||||
s: function(){return String(seconds);},
|
||||
ss: function(){return that.digit(seconds);},
|
||||
SSS: function(){return that.digit(milliseconds, 3);}
|
||||
}
|
||||
|
||||
format = format || 'yyyy-MM-dd HH:mm:ss';
|
||||
return format.replace(/yyyy/g, ymd[0])
|
||||
.replace(/MM/g, ymd[1])
|
||||
.replace(/dd/g, ymd[2])
|
||||
.replace(/HH/g, hms[0])
|
||||
.replace(/mm/g, hms[1])
|
||||
.replace(/ss/g, hms[2]);
|
||||
|
||||
return format.replace(REGEX_FORMAT, function(match, $1) {
|
||||
return $1 || (matches[match] && matches[match]()) || match;
|
||||
});
|
||||
},
|
||||
|
||||
|
||||
// 转义 html
|
||||
escape: function(html){
|
||||
var exp = /[<"'>]|&(?=#[a-zA-Z0-9]+)/g;
|
||||
@ -297,7 +333,7 @@ layui.define('jquery', function(exports){
|
||||
.replace(/</g, '<').replace(/>/g, '>')
|
||||
.replace(/'/g, ''').replace(/"/g, '"');
|
||||
},
|
||||
|
||||
|
||||
// 还原转义的 html
|
||||
unescape: function(html){
|
||||
if(html === undefined || html === null) html = '';
|
||||
@ -318,68 +354,102 @@ layui.define('jquery', function(exports){
|
||||
win.document.write(options.content || '');
|
||||
win.document.close();
|
||||
},
|
||||
|
||||
|
||||
// 让指定的元素保持在可视区域
|
||||
toVisibleArea: function(options){
|
||||
options = $.extend({
|
||||
margin: 160 //触发动作的边界值
|
||||
,duration: 200 //动画持续毫秒数
|
||||
,type: 'y' //触发方向,x 水平、y 垂直
|
||||
margin: 160, // 触发动作的边界值
|
||||
duration: 200, // 动画持续毫秒数
|
||||
type: 'y' // 触发方向,x 水平、y 垂直
|
||||
}, options);
|
||||
|
||||
|
||||
if(!options.scrollElem[0] || !options.thisElem[0]) return;
|
||||
|
||||
var scrollElem = options.scrollElem //滚动元素
|
||||
,thisElem = options.thisElem //目标元素
|
||||
,vertical = options.type === 'y' //是否垂直方向
|
||||
,SCROLL_NAME = vertical ? 'scrollTop' : 'scrollLeft' //滚动方法
|
||||
,OFFSET_NAME = vertical ? 'top' : 'left' //坐标方式
|
||||
,scrollValue = scrollElem[SCROLL_NAME]() //当前滚动距离
|
||||
,size = scrollElem[vertical ? 'height' : 'width']() //滚动元素的尺寸
|
||||
,scrollOffet = scrollElem.offset()[OFFSET_NAME] //滚动元素所处位置
|
||||
,thisOffset = thisElem.offset()[OFFSET_NAME] - scrollOffet //目标元素当前的所在位置
|
||||
,obj = {};
|
||||
|
||||
//边界满足条件
|
||||
|
||||
var scrollElem = options.scrollElem // 滚动元素
|
||||
var thisElem = options.thisElem // 目标元素
|
||||
var vertical = options.type === 'y' // 是否垂直方向
|
||||
var SCROLL_NAME = vertical ? 'scrollTop' : 'scrollLeft' // 滚动方法
|
||||
var OFFSET_NAME = vertical ? 'top' : 'left' // 坐标方式
|
||||
var scrollValue = scrollElem[SCROLL_NAME]() // 当前滚动距离
|
||||
var size = scrollElem[vertical ? 'height' : 'width']() // 滚动元素的尺寸
|
||||
var scrollOffset = scrollElem.offset()[OFFSET_NAME] // 滚动元素所处位置
|
||||
var thisOffset = thisElem.offset()[OFFSET_NAME] - scrollOffset // 目标元素当前的所在位置
|
||||
var obj = {};
|
||||
|
||||
// 边界满足条件
|
||||
if(thisOffset > size - options.margin || thisOffset < options.margin){
|
||||
obj[SCROLL_NAME] = thisOffset - size/2 + scrollValue
|
||||
scrollElem.animate(obj, options.duration);
|
||||
}
|
||||
},
|
||||
|
||||
//批量事件
|
||||
event: function(attr, obj, eventType){
|
||||
var _body = $('body');
|
||||
eventType = eventType || 'click';
|
||||
|
||||
//记录事件回调集合
|
||||
obj = util.event[attr] = $.extend(true, util.event[attr], obj) || {};
|
||||
|
||||
//清除委托事件
|
||||
util.event.UTIL_EVENT_CALLBACK = util.event.UTIL_EVENT_CALLBACK || {};
|
||||
_body.off(eventType, '*['+ attr +']', util.event.UTIL_EVENT_CALLBACK[attr])
|
||||
|
||||
//绑定委托事件
|
||||
util.event.UTIL_EVENT_CALLBACK[attr] = function(){
|
||||
var othis = $(this)
|
||||
,key = othis.attr(attr);
|
||||
(typeof obj[key] === 'function') && obj[key].call(this, othis);
|
||||
};
|
||||
|
||||
//清除旧事件,绑定新事件
|
||||
_body.on(eventType, '*['+ attr +']', util.event.UTIL_EVENT_CALLBACK[attr]);
|
||||
|
||||
return obj;
|
||||
/**
|
||||
* 批量事件
|
||||
* @param {string} [attr="lay-on"] - 触发事件的元素属性名
|
||||
* @param {Object.<string, Function>} events - 事件集合
|
||||
* @param {Object} [options] - 参数的更多选项
|
||||
* @param {(string|HTMLElement|JQuery)} [options.elem="body"] - 触发事件的委托元素
|
||||
* @param {string} [options.trigger="click"] - 事件触发的方式
|
||||
* @returns {Object} 返回当前 events 参数设置的事件集合
|
||||
*/
|
||||
on: function(attr, events, options) {
|
||||
// 若参数一为 object 类型,则为事件集,且省略 attr
|
||||
if (typeof attr === 'object') {
|
||||
options = events || {};
|
||||
events = attr;
|
||||
attr = options.attr || 'lay-on'; // 默认属性名
|
||||
}
|
||||
|
||||
// 更多选项
|
||||
options = $.extend({
|
||||
elem: 'body',
|
||||
trigger: 'click'
|
||||
}, typeof options === 'object' ? options : {
|
||||
trigger: options // 兼容旧版
|
||||
});
|
||||
|
||||
var elem = options.elem = $(options.elem);
|
||||
var attrSelector = '['+ attr +']';
|
||||
var DATANAME = 'UTIL_ON_DATA'; // 缓存在委托元素上的 data-* 属性名
|
||||
|
||||
if (!elem[0]) return; // 若委托元素不存在
|
||||
|
||||
// 初始化 data 默认值,以委托元素为存储单元
|
||||
if (!elem.data(DATANAME)) {
|
||||
elem.data(DATANAME, {
|
||||
events: {},
|
||||
callbacks: {}
|
||||
});
|
||||
}
|
||||
|
||||
// 读取 data 缓存
|
||||
var dataCache = elem.data(DATANAME);
|
||||
var callbacks = dataCache.callbacks;
|
||||
|
||||
// 根据 attr 记录事件集合
|
||||
events = dataCache.events[attr] = $.extend(true, dataCache.events[attr], events);
|
||||
|
||||
// 清除事件委托,避免重复绑定
|
||||
elem.off(options.trigger, attrSelector, callbacks[attr]);
|
||||
|
||||
// 绑定事件委托
|
||||
elem.on(
|
||||
options.trigger,
|
||||
attrSelector,
|
||||
callbacks[attr] = function(e) {
|
||||
var othis = $(this);
|
||||
var key = othis.attr(attr);
|
||||
typeof events[key] === 'function' && events[key].call(this, othis, e);
|
||||
}
|
||||
);
|
||||
|
||||
return events;
|
||||
}
|
||||
};
|
||||
|
||||
util.on = util.event;
|
||||
|
||||
// DOM 尺寸变化,该创意来自:http://benalman.com/projects/jquery-resize-plugin/
|
||||
/*
|
||||
!function(a,b,c){"$:nomunge";function l(){f=b[g](function(){d.each(function(){var b=a(this),c=b.width(),d=b.height(),e=a.data(this,i);(c!==e.w||d!==e.h)&&b.trigger(h,[e.w=c,e.h=d])}),l()},e[j])}var f,d=a([]),e=a.resize=a.extend(a.resize,{}),g="setTimeout",h="resize",i=h+"-special-event",j="delay",k="throttleWindow";e[j]=250,e[k]=!0,a.event.special[h]={setup:function(){if(!e[k]&&this[g])return!1;var b=a(this);d=d.add(b),a.data(this,i,{w:b.width(),h:b.height()}),1===d.length&&l()},teardown:function(){if(!e[k]&&this[g])return!1;var b=a(this);d=d.not(b),b.removeData(i),d.length||clearTimeout(f)},add:function(b){function f(b,e,f){var g=a(this),h=a.data(this,i)||{};h.w=e!==c?e:g.width(),h.h=f!==c?f:g.height(),d.apply(this,arguments)}if(!e[k]&&this[g])return!1;var d;return a.isFunction(b)?(d=b,f):(d=b.handler,b.handler=f,void 0)}}}($,window);
|
||||
*/
|
||||
|
||||
// 兼容旧版
|
||||
util.event = util.on;
|
||||
|
||||
// 输出接口
|
||||
exports('util', util);
|
||||
});
|
||||
});
|
||||
|
Reference in New Issue
Block a user