From da711a38cc9f03421b300512e6791554cbc15c3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=81=AB=E7=83=88=E9=B8=9F?= <250023777@qq.com>
Date: Thu, 10 Aug 2023 22:16:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96=E5=AE=8C?=
=?UTF-8?q?=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/modules/code.js | 2 +-
src/modules/colorpicker.js | 2 +-
src/modules/flow.js | 66 +++++++++++++++++++-------------------
src/modules/laydate.js | 10 +++---
4 files changed, 40 insertions(+), 40 deletions(-)
diff --git a/src/modules/code.js b/src/modules/code.js
index 6408077c..4dd034db 100644
--- a/src/modules/code.js
+++ b/src/modules/code.js
@@ -294,7 +294,7 @@ layui.define(['lay', 'util', 'element', 'form'], function(exports){
// header
var headerElem = $('
');
- // 添加组件 clasName
+ // 添加组件 className
othis.addClass('layui-code-view layui-box');
// 自定义风格
diff --git a/src/modules/colorpicker.js b/src/modules/colorpicker.js
index 514e35bd..c88427f4 100644
--- a/src/modules/colorpicker.js
+++ b/src/modules/colorpicker.js
@@ -214,7 +214,7 @@ layui.define(['jquery', 'lay'], function(exports){
,'
'].join(''))
//初始化颜色选择框
- var elem = options.elem = $(options.elem);
+ elem = options.elem = $(options.elem);
options.size && elemColorBox.addClass('layui-colorpicker-'+ options.size); //初始化颜色选择框尺寸
// 插入颜色选择框
diff --git a/src/modules/flow.js b/src/modules/flow.js
index bb4a4bcd..ae63f2c7 100644
--- a/src/modules/flow.js
+++ b/src/modules/flow.js
@@ -1,11 +1,11 @@
/**
- * flow 流加载组件
+ * flow 流加载组件
*/
-
-
+
+
layui.define('jquery', function(exports){
"use strict";
-
+
var $ = layui.$, Flow = function(options){}
,ELEM_MORE = 'layui-flow-more'
,ELEM_LOAD = '';
@@ -14,26 +14,26 @@ layui.define('jquery', function(exports){
Flow.prototype.load = function(options){
var that = this, page = 0, lock, isOver, lazyimg, timer;
options = options || {};
-
+
var elem = $(options.elem); if(!elem[0]) return;
var scrollElem = $(options.scrollElem || document); //滚动条所在元素
var mb = options.mb || 50; //与底部的临界距离
var isAuto = 'isAuto' in options ? options.isAuto : true; //是否自动滚动加载
var end = options.end || '没有更多了'; //“末页”显示文案
-
+
//滚动条所在元素是否为document
var notDocument = options.scrollElem && options.scrollElem !== document;
-
+
//加载更多
var ELEM_TEXT = '加载更多'
,more = $('');
-
+
if(!elem.find('.layui-flow-more')[0]){
elem.append(more);
}
-
+
//加载下一个元素
- var next = function(html, over){
+ var next = function(html, over){
html = $(html);
more.before(html);
over = over == 0 ? true : null;
@@ -42,43 +42,43 @@ layui.define('jquery', function(exports){
lock = null;
lazyimg && lazyimg();
};
-
+
//触发请求
var done = function(){
lock = true;
more.find('a').html(ELEM_LOAD);
typeof options.done === 'function' && options.done(++page, next);
};
-
+
done();
-
+
//不自动滚动加载
more.find('a').on('click', function(){
var othis = $(this);
if(isOver) return;
lock || done();
});
-
+
//如果允许图片懒加载
if(options.isLazyimg){
- var lazyimg = that.lazyimg({
+ lazyimg = that.lazyimg({
elem: options.elem + ' img'
,scrollElem: options.scrollElem
});
}
-
+
if(!isAuto) return that;
-
+
scrollElem.on('scroll', function(){
var othis = $(this), top = othis.scrollTop();
-
+
if(timer) clearTimeout(timer);
if(isOver || !elem.width()) return; //如果已经结束,或者元素处于隐藏状态,则不执行滚动加载
-
+
timer = setTimeout(function(){
//计算滚动所在容器的可视高度
var height = notDocument ? othis.height() : $(window).height();
-
+
//计算滚动所在容器的实际高度
var scrollHeight = notDocument
? othis.prop('scrollHeight')
@@ -90,21 +90,21 @@ layui.define('jquery', function(exports){
}
}, 100);
});
-
+
return that;
};
-
+
//图片懒加载
Flow.prototype.lazyimg = function(options){
var that = this, index = 0, haveScroll;
options = options || {};
-
+
var scrollElem = $(options.scrollElem || document); //滚动条所在元素
var elem = options.elem || 'img';
-
+
//滚动条所在元素是否为document
var notDocument = options.scrollElem && options.scrollElem !== document;
-
+
//显示图片
var show = function(item, height){
var start = scrollElem.scrollTop(), end = start + height;
@@ -119,7 +119,7 @@ layui.define('jquery', function(exports){
layui.img(src, function(){
var next = that.lazyimg.elem.eq(index);
item.attr('src', src).removeAttr('lay-src');
-
+
/* 当前图片加载就绪后,检测下一个图片是否在当前屏 */
next[0] && render(next);
index++;
@@ -130,7 +130,7 @@ layui.define('jquery', function(exports){
}
}
}, render = function(othis, scroll){
-
+
//计算滚动所在容器的可视高度
var height = notDocument ? (scroll||scrollElem).height() : $(window).height();
var start = scrollElem.scrollTop(), end = start + height;
@@ -145,18 +145,18 @@ layui.define('jquery', function(exports){
var item = that.lazyimg.elem.eq(i), elemTop = notDocument ? function(){
return item.offset().top - scrollElem.offset().top + start;
}() : item.offset().top;
-
+
show(item, height);
index = i;
-
+
//如果图片的top坐标,超出了当前屏,则终止后续图片的遍历
if(elemTop > end) break;
}
}
};
-
+
render();
-
+
if(!haveScroll){
var timer;
scrollElem.on('scroll', function(){
@@ -165,12 +165,12 @@ layui.define('jquery', function(exports){
timer = setTimeout(function(){
render(null, othis);
}, 50);
- });
+ });
haveScroll = true;
}
return render;
};
-
+
//暴露接口
exports('flow', new Flow());
});
diff --git a/src/modules/laydate.js b/src/modules/laydate.js
index 0725bfb2..3da065fe 100644
--- a/src/modules/laydate.js
+++ b/src/modules/laydate.js
@@ -1128,9 +1128,9 @@
//日历表
Class.prototype.calendar = function(value, index, type){
+ index = index ? 1 : 0;
var that = this
,options = that.config
- ,index = index ? 1 : 0
,dateTime = value || that.thisDateTime(index)
,thisDate = new Date(), startWeek, prevMaxDate, thisMaxDate
,lang = that.lang()
@@ -1156,7 +1156,7 @@
//赋值日
lay.each(tds, function(index_, item){
- var YMD = [dateTime.year, dateTime.month], st = 0;
+ var YMD = [dateTime.year, dateTime.month], st;
item = lay(item);
item.removeAttr("class");
if(index_ < startWeek){
@@ -1971,7 +1971,7 @@
,elemCont = that.elemCont[index || 0]
,listYM = that.listYM[index]
- ,addSubYeay = function(type){
+ ,addSubYear = function(type){
var isYear = lay(elemCont).find('.laydate-year-list')[0]
,isMonth = lay(elemCont).find('.laydate-month-list')[0];
@@ -2006,7 +2006,7 @@
return {
prevYear: function(){
- if(addSubYeay('sub')) return;
+ if(addSubYear('sub')) return;
if (that.rangeLinked) {
options.dateTime.year--;
that.checkDate('limit').calendar(null, null, 'init');
@@ -2048,7 +2048,7 @@
}
}
,nextYear: function(){
- if(addSubYeay()) return;
+ if(addSubYear()) return;
if (that.rangeLinked) {
options.dateTime.year++;
that.checkDate('limit').calendar(null, 0, 'init');