update
This commit is contained in:
parent
74e8842789
commit
b0646a2f11
@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "layui",
|
||||
"main": "dist/layui.js",
|
||||
"version": "2.6.2",
|
||||
"version": "2.6.3",
|
||||
"homepage": "https://github.com/sentsin/layui",
|
||||
"authors": [
|
||||
"sentsin <xu@sentsin.com>"
|
||||
|
2
dist/css/modules/laydate/default/laydate.css
vendored
2
dist/css/modules/laydate/default/laydate.css
vendored
File diff suppressed because one or more lines are too long
6
dist/layui.js
vendored
6
dist/layui.js
vendored
File diff suppressed because one or more lines are too long
@ -1,15 +1,16 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
|
||||
<title>完整库使用 - layui</title>
|
||||
<meta charset="utf-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
|
||||
<title>完整库使用 - layui</title>
|
||||
|
||||
<link rel="stylesheet" href="../src/css/layui.css">
|
||||
<link rel="stylesheet" href="../src/css/layui.css">
|
||||
|
||||
<style>
|
||||
body{padding: 10px;}
|
||||
</style>
|
||||
<style>
|
||||
body{padding: 10px;}
|
||||
</style>
|
||||
|
||||
</head>
|
||||
<body>
|
||||
|
||||
@ -25,6 +26,7 @@ resize: none;">
|
||||
|
||||
</textarea>
|
||||
|
||||
|
||||
<div id="demo1"></div>
|
||||
<button class="layui-btn demo" test-active="test-form">测试弹出式 Form</button>
|
||||
<button class="layui-btn demo" test-active="test-use">测试是否重复加载内置组件</button>
|
||||
@ -39,7 +41,14 @@ resize: none;">
|
||||
</ul>
|
||||
<div class="layui-tab-content">
|
||||
<div class="layui-tab-item layui-show">
|
||||
内容1
|
||||
<div class="layui-form">
|
||||
<select name="city" lay-verify="">
|
||||
<option value="">请选择一个城市</option>
|
||||
<option value="010">北京</option>
|
||||
<option value="021">上海</option>
|
||||
<option value="0571">杭州</option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
<div class="layui-tab-item">
|
||||
<div id="test2" class="demo-transfer"></div>
|
||||
@ -53,7 +62,7 @@ resize: none;">
|
||||
|
||||
<script src="../dist/layui.js"></script>
|
||||
<script>
|
||||
;!function(){
|
||||
layui.use(function(){
|
||||
var $ = layui.jquery
|
||||
,layer = layui.layer
|
||||
,form = layui.form
|
||||
@ -62,15 +71,13 @@ resize: none;">
|
||||
,transfer = layui.transfer
|
||||
,util = layui.util;
|
||||
|
||||
layer.ready(function(){
|
||||
layer.msg('hello');
|
||||
});
|
||||
layer.msg('hello');
|
||||
|
||||
laypage.render({
|
||||
elem: 'demo1'
|
||||
,count: 100 //总页数
|
||||
});
|
||||
|
||||
|
||||
|
||||
//测试加载非内置模块
|
||||
layui.config({
|
||||
@ -143,7 +150,7 @@ resize: none;">
|
||||
});
|
||||
}
|
||||
});
|
||||
}();
|
||||
});
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
|
@ -1,5 +1,7 @@
|
||||
|
||||
layui.define(['mod2', 'layer'], function(exports){
|
||||
/**
|
||||
扩展模块,且依赖 mod2
|
||||
**/
|
||||
layui.define('mod2', function(exports){
|
||||
var $ = layui.jquery;
|
||||
|
||||
console.log(layui.mod2, layui.layer, layui.form)
|
||||
|
@ -1,6 +1,11 @@
|
||||
/**
|
||||
扩展模块,只依赖内置模块
|
||||
**/
|
||||
|
||||
layui.define(['jquery', 'form'], function(exports){
|
||||
console.log(layui.$)
|
||||
layui.define(function(exports){
|
||||
console.log('mod2.js')
|
||||
|
||||
layer.alert(1)
|
||||
|
||||
exports('mod2', {
|
||||
name: 'mod2'
|
||||
|
@ -123,9 +123,10 @@ layui.use('laydate', function(laydate){
|
||||
elem: '#test1' //指定元素
|
||||
,type: 'datetime'
|
||||
,trigger: 'click'
|
||||
,lang: 'en'
|
||||
//,lang: 'en'
|
||||
//,theme: 'grid'
|
||||
,range: true //开启日期范围,默认使用“_”分割
|
||||
,value: '2021-03-27 00:00:00 - 2021-02-27 00:00:00'
|
||||
//,value: '2021-03-27 00:00:00 - 2021-02-27 00:00:00'
|
||||
,done: function(value, date, endDate){
|
||||
console.log(value, date, endDate);
|
||||
}
|
||||
|
@ -38,7 +38,8 @@ layui.use('layer', function(){
|
||||
var $ = layui.jquery, layer = layui.layer; //独立版的layer无需执行这一句
|
||||
|
||||
|
||||
layer.msg('hello');
|
||||
var index = layer.msg('hello');
|
||||
//layer.close(index);
|
||||
|
||||
//触发事件
|
||||
var active = {
|
||||
|
@ -183,7 +183,6 @@ body{padding: 20px; /*overflow-y: scroll;*/}
|
||||
<script>
|
||||
layui.use('table', function(){
|
||||
var table = layui.table;
|
||||
//return;
|
||||
|
||||
//全局设定某参数
|
||||
table.set({
|
||||
@ -228,7 +227,7 @@ layui.use('table', function(){
|
||||
,{field:'sex', title:'性别', width:80, edit: 'text', sort: true}
|
||||
,{field:'city', title:'城市', width:120, templet: '#cityTpl1'}
|
||||
,{field:'sign', title:'签名'}
|
||||
,{field:'experience', title:'积分', width:80, sort: true, totalRow: true, templet: '<div>{{ d.experience }} 分</div>'}
|
||||
,{field:'experience', title:'积分', width:80, sort: true, totalRow: '{{ d.TOTAL_NUMS }} 分', templet: '<div>{{ d.experience }} 分</div>'}
|
||||
,{field:'ip', title:'IP', width:120}
|
||||
,{field:'logins', title:'登入次数', width:100, sort: true, totalRow: true}
|
||||
,{field:'joinTime', title:'加入时间', width:120}
|
||||
@ -319,7 +318,7 @@ layui.use('table', function(){
|
||||
break;
|
||||
case 'reload':
|
||||
//深度重载
|
||||
table.reload('test', {
|
||||
var instReload = table.reload('test', {
|
||||
|
||||
where: {
|
||||
abc: 123
|
||||
|
@ -50,7 +50,7 @@ var argv = require('minimist')(process.argv.slice(2), {
|
||||
//聚合 JS 文件
|
||||
alljs: function(ver){
|
||||
var src = [
|
||||
'./src/**/{layui,all,'+ mods +'}.js'
|
||||
'./src/**/{layui,layui.all,'+ mods +'}.js'
|
||||
]
|
||||
,dir = destDir(ver);
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "layui-src",
|
||||
"realname": "layui",
|
||||
"version": "2.6.2",
|
||||
"version": "2.6.3",
|
||||
"description": "Classic modular front-end component library",
|
||||
"main": "dist/layui.js",
|
||||
"license": "MIT",
|
||||
|
@ -98,10 +98,10 @@ html #layuicss-laydate{display: none; position: absolute; width: 1989px;}
|
||||
.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: #00F7DE;}
|
||||
.layui-laydate-content td.laydate-selected{background-color: #B5FFF8;}
|
||||
.laydate-selected:hover{background-color: #00F7DE !important;}
|
||||
.layui-laydate-content td:hover,
|
||||
.layui-laydate-list li:hover{background-color: #eaeaea; color: #333;}
|
||||
.layui-laydate-list li:hover{background-color: #eee; 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;}
|
||||
|
35
src/layui.js
35
src/layui.js
@ -17,7 +17,7 @@
|
||||
}
|
||||
|
||||
,Layui = function(){
|
||||
this.v = '2.6.2'; //版本号
|
||||
this.v = '2.6.3'; //版本号
|
||||
}
|
||||
|
||||
//获取layui所在目录
|
||||
@ -46,7 +46,7 @@
|
||||
,isOpera = typeof opera !== 'undefined' && opera.toString() === '[object Opera]'
|
||||
|
||||
//内置模块
|
||||
,modules = {
|
||||
,modules = config.builtin = {
|
||||
lay: 'lay' //基础 DOM 操作
|
||||
,layer: 'layer' //弹层
|
||||
,laydate: 'laydate' //日期
|
||||
@ -69,7 +69,8 @@
|
||||
,code: 'code' //代码修饰器
|
||||
,jquery: 'jquery' //DOM 库(第三方)
|
||||
|
||||
,'layui.all': '../layui' //聚合
|
||||
,all: 'all'
|
||||
,'layui.all': 'layui.all' //聚合标识(功能性的,非真实模块)
|
||||
};
|
||||
|
||||
//记录基础数据
|
||||
@ -108,9 +109,20 @@
|
||||
,dir = config.dir = config.dir ? config.dir : getPath
|
||||
,head = doc.getElementsByTagName('head')[0];
|
||||
|
||||
apps = typeof apps === 'string' ? [apps] : apps;
|
||||
apps = function(){
|
||||
if(typeof apps === 'string'){
|
||||
return [apps];
|
||||
}
|
||||
//当第一个参数为 function 时,则自动加载所有内置模块,且执行的回调即为该 function 参数;
|
||||
else if(typeof apps === 'function'){
|
||||
callback = apps;
|
||||
return ['all'];
|
||||
}
|
||||
return apps;
|
||||
}();
|
||||
|
||||
//如果页面已经存在 jQuery 1.7+ 库且所定义的模块依赖 jQuery,则不加载内部 jquery 模块
|
||||
/*
|
||||
if(window.jQuery && jQuery.fn.on){
|
||||
that.each(apps, function(index, item){
|
||||
if(item === 'jquery'){
|
||||
@ -119,6 +131,7 @@
|
||||
});
|
||||
layui.jquery = layui.$ = jQuery;
|
||||
}
|
||||
*/
|
||||
|
||||
var item = apps[0]
|
||||
,timeout = 0;
|
||||
@ -147,13 +160,19 @@
|
||||
exports.push(layui[item]);
|
||||
apps.length > 1 ?
|
||||
that.use(apps.slice(1), callback, exports)
|
||||
: ( typeof callback === 'function' && callback.apply(layui, exports) );
|
||||
: ( typeof callback === 'function' && function(){
|
||||
//保证文档加载完毕再执行回调
|
||||
if(layui.jquery && typeof layui.jquery === 'function'){
|
||||
return layui.jquery(function(){
|
||||
callback.apply(layui, exports);
|
||||
});
|
||||
}
|
||||
callback.apply(layui, exports);
|
||||
}() );
|
||||
}
|
||||
|
||||
//如果引入了聚合板,内置的模块则不必重复加载
|
||||
if(apps.length === 0
|
||||
|| (layui['layui.all'] && modules[item])
|
||||
){
|
||||
if( apps.length === 0 || (layui['layui.all'] && modules[item]) ){
|
||||
return onCallback(), that;
|
||||
}
|
||||
|
||||
|
@ -1,13 +1,33 @@
|
||||
/**
|
||||
|
||||
@Name:用于打包聚合版,该文件不会存在于构建后的目录
|
||||
@Name:用于加载所有内置模块
|
||||
@License:MIT
|
||||
|
||||
*/
|
||||
|
||||
layui.define(function(exports){
|
||||
var cache = layui.cache;
|
||||
layui.config({
|
||||
dir: cache.dir.replace(/lay\/dest\/$/, '')
|
||||
layui.define(function(){
|
||||
var mods = []
|
||||
,builtin = layui.cache.builtin;
|
||||
layui.each(builtin, function(modName){
|
||||
(modName === 'all' || modName === 'layui.all') || mods.push(modName);
|
||||
});
|
||||
exports('layui.all', layui.v);
|
||||
layui.cache.startTime = new Date().getTime();
|
||||
|
||||
return mods;
|
||||
}(), function(exports){
|
||||
"use strict";
|
||||
|
||||
var MOD_NAME = 'all'
|
||||
|
||||
//外部接口
|
||||
,all = {
|
||||
config: {}
|
||||
,time: function(){
|
||||
var time = new Date().getTime() - layui.cache.startTime;
|
||||
delete layui.cache.startTime;
|
||||
return time;
|
||||
}()
|
||||
};
|
||||
|
||||
exports(MOD_NAME, all);
|
||||
});
|
||||
|
@ -1,6 +1,6 @@
|
||||
/**
|
||||
|
||||
@Name:layui.carousel 轮播模块
|
||||
@Name:carousel 轮播模块
|
||||
@License:MIT
|
||||
|
||||
*/
|
||||
|
@ -1,6 +1,6 @@
|
||||
/**
|
||||
|
||||
@Name:layui.code 代码修饰器
|
||||
@Name:code 代码修饰器
|
||||
@License:MIT
|
||||
|
||||
*/
|
||||
|
@ -1,6 +1,6 @@
|
||||
/**
|
||||
|
||||
@Title: layui.colorpicker 颜色选择器组件
|
||||
@Title: colorpicker 颜色选择器组件
|
||||
@License:MIT
|
||||
|
||||
*/
|
||||
|
@ -1,6 +1,6 @@
|
||||
/**
|
||||
|
||||
@Name:layui.MODULE_DEMO_NAME 模块组件通用结构
|
||||
@Name:MODULE_DEMO_NAME 模块组件通用结构
|
||||
@License:MIT
|
||||
|
||||
*/
|
||||
|
@ -1,12 +1,12 @@
|
||||
/**
|
||||
|
||||
@Name:layui.dropdown 下拉菜单组件
|
||||
@Name:dropdown 下拉菜单组件
|
||||
@License:MIT
|
||||
|
||||
*/
|
||||
|
||||
layui.define(['jquery', 'laytpl', 'lay'], function(exports){
|
||||
//"use strict";
|
||||
"use strict";
|
||||
|
||||
var $ = layui.$
|
||||
,laytpl = layui.laytpl
|
||||
|
@ -1,6 +1,6 @@
|
||||
/**
|
||||
|
||||
@Name:layui.element 常用元素操作
|
||||
@Name:element 常用元素操作
|
||||
@License:MIT
|
||||
|
||||
*/
|
||||
|
@ -1,6 +1,6 @@
|
||||
/**
|
||||
|
||||
@Name:layui.flow 流加载
|
||||
@Name flow 流加载组件
|
||||
@License:MIT
|
||||
|
||||
*/
|
||||
|
@ -1,6 +1,6 @@
|
||||
/**
|
||||
|
||||
@Name:layui.form 表单组件
|
||||
@Name:form 表单组件
|
||||
@License:MIT
|
||||
|
||||
*/
|
||||
|
@ -20,7 +20,7 @@
|
||||
}
|
||||
|
||||
,laydate = {
|
||||
v: '5.2.0'
|
||||
v: '5.2.1'
|
||||
,config: {} //全局配置项
|
||||
,index: (window.laydate && window.laydate.v) ? 100000 : 0
|
||||
,path: ready.getPath
|
||||
@ -804,6 +804,7 @@
|
||||
|
||||
//同步按钮可点状态
|
||||
that.setBtnStatus();
|
||||
that.stampRange(index, tds); //标记范围内的日期
|
||||
|
||||
return that;
|
||||
};
|
||||
@ -1116,7 +1117,90 @@
|
||||
return this;
|
||||
};
|
||||
|
||||
//执行done/change回调
|
||||
//标记范围内的日期
|
||||
Class.prototype.stampRange = function(index, tds){
|
||||
var that = this
|
||||
,options = that.config
|
||||
,startTime, endTime;
|
||||
|
||||
if(!options.range) return;
|
||||
|
||||
startTime = that.newDate(options.dateTime).getTime();
|
||||
endTime = that.newDate(that.endDate).getTime();
|
||||
|
||||
//标记范围样式
|
||||
lay.each(tds, function(i, item){
|
||||
var ymd = lay(item).attr('lay-ymd').split('-')
|
||||
,thisTime = that.newDate({
|
||||
year: ymd[0]
|
||||
,month: ymd[1] - 1
|
||||
,date: ymd[2]
|
||||
}).getTime();
|
||||
|
||||
if(index == 0){
|
||||
if(thisTime > startTime){
|
||||
lay(item).addClass(ELEM_SELECTED);
|
||||
}
|
||||
} else {
|
||||
if(thisTime < endTime){
|
||||
lay(item).addClass(ELEM_SELECTED);
|
||||
}
|
||||
}
|
||||
|
||||
return;
|
||||
if(thisTime === startTime || thisTime === endTime){
|
||||
lay(item).addClass(
|
||||
lay(item).hasClass(ELEM_PREV) || lay(item).hasClass(ELEM_NEXT)
|
||||
? ELEM_SELECTED
|
||||
: THIS
|
||||
);
|
||||
}
|
||||
if(thisTime > startTime && thisTime < endTime){
|
||||
lay(item).addClass(ELEM_SELECTED);
|
||||
}
|
||||
});
|
||||
|
||||
return;
|
||||
|
||||
if(options.range && !that.endDate) lay(that.footer).find(ELEM_CONFIRM).addClass(DISABLED);
|
||||
if(!that.endDate) return;
|
||||
|
||||
startTime = that.newDate({
|
||||
year: that.startDate.year
|
||||
,month: that.startDate.month
|
||||
,date: that.startDate.date
|
||||
}).getTime();
|
||||
|
||||
endTime = that.newDate({
|
||||
year: that.endDate.year
|
||||
,month: that.endDate.month
|
||||
,date: that.endDate.date
|
||||
}).getTime();
|
||||
|
||||
if(startTime > endTime) return that.hint(TIPS_OUT);
|
||||
|
||||
lay.each(tds, function(i, item){
|
||||
var ymd = lay(item).attr('lay-ymd').split('-')
|
||||
,thisTime = that.newDate({
|
||||
year: ymd[0]
|
||||
,month: ymd[1] - 1
|
||||
,date: ymd[2]
|
||||
}).getTime();
|
||||
lay(item).removeClass(ELEM_SELECTED + ' ' + THIS);
|
||||
if(thisTime === startTime || thisTime === endTime){
|
||||
lay(item).addClass(
|
||||
lay(item).hasClass(ELEM_PREV) || lay(item).hasClass(ELEM_NEXT)
|
||||
? ELEM_SELECTED
|
||||
: THIS
|
||||
);
|
||||
}
|
||||
if(thisTime > startTime && thisTime < endTime){
|
||||
lay(item).addClass(ELEM_SELECTED);
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
//执行 done/change 回调
|
||||
Class.prototype.done = function(param, type){
|
||||
var that = this
|
||||
,options = that.config
|
||||
|
@ -1,6 +1,6 @@
|
||||
/**
|
||||
|
||||
@Name:layui.layedit 富文本编辑器
|
||||
@Name:layedit 富文本编辑器
|
||||
@License:MIT
|
||||
|
||||
*/
|
||||
|
@ -905,61 +905,65 @@ layer.title = function(name, index){
|
||||
|
||||
//关闭layer总方法
|
||||
layer.close = function(index){
|
||||
var layero = $('#'+ doms[0] + index), type = layero.attr('type'), closeAnim = 'layer-anim-close';
|
||||
if(!layero[0]) return;
|
||||
var WRAP = 'layui-layer-wrap', remove = function(){
|
||||
if(type === ready.type[1] && layero.attr('conType') === 'object'){
|
||||
layero.children(':not(.'+ doms[5] +')').remove();
|
||||
var wrap = layero.find('.'+WRAP);
|
||||
for(var i = 0; i < 2; i++){
|
||||
wrap.unwrap();
|
||||
layer.ready(function(){
|
||||
var layero = $('#'+ doms[0] + index), type = layero.attr('type'), closeAnim = 'layer-anim-close';
|
||||
if(!layero[0]) return;
|
||||
var WRAP = 'layui-layer-wrap', remove = function(){
|
||||
if(type === ready.type[1] && layero.attr('conType') === 'object'){
|
||||
layero.children(':not(.'+ doms[5] +')').remove();
|
||||
var wrap = layero.find('.'+WRAP);
|
||||
for(var i = 0; i < 2; i++){
|
||||
wrap.unwrap();
|
||||
}
|
||||
wrap.css('display', wrap.data('display')).removeClass(WRAP);
|
||||
} else {
|
||||
//低版本IE 回收 iframe
|
||||
if(type === ready.type[2]){
|
||||
try {
|
||||
var iframe = $('#'+doms[4]+index)[0];
|
||||
iframe.contentWindow.document.write('');
|
||||
iframe.contentWindow.close();
|
||||
layero.find('.'+doms[5])[0].removeChild(iframe);
|
||||
} catch(e){}
|
||||
}
|
||||
layero[0].innerHTML = '';
|
||||
layero.remove();
|
||||
}
|
||||
wrap.css('display', wrap.data('display')).removeClass(WRAP);
|
||||
} else {
|
||||
//低版本IE 回收 iframe
|
||||
if(type === ready.type[2]){
|
||||
try {
|
||||
var iframe = $('#'+doms[4]+index)[0];
|
||||
iframe.contentWindow.document.write('');
|
||||
iframe.contentWindow.close();
|
||||
layero.find('.'+doms[5])[0].removeChild(iframe);
|
||||
} catch(e){}
|
||||
}
|
||||
layero[0].innerHTML = '';
|
||||
layero.remove();
|
||||
typeof ready.end[index] === 'function' && ready.end[index]();
|
||||
delete ready.end[index];
|
||||
};
|
||||
|
||||
if(layero.data('isOutAnim')){
|
||||
layero.addClass('layer-anim '+ closeAnim);
|
||||
}
|
||||
typeof ready.end[index] === 'function' && ready.end[index]();
|
||||
delete ready.end[index];
|
||||
};
|
||||
|
||||
if(layero.data('isOutAnim')){
|
||||
layero.addClass('layer-anim '+ closeAnim);
|
||||
}
|
||||
|
||||
$('#layui-layer-moves, #layui-layer-shade' + index).remove();
|
||||
layer.ie == 6 && ready.reselect();
|
||||
ready.rescollbar(index);
|
||||
if(layero.attr('minLeft')){
|
||||
ready.minIndex--;
|
||||
ready.minLeft.push(layero.attr('minLeft'));
|
||||
}
|
||||
|
||||
if((layer.ie && layer.ie < 10) || !layero.data('isOutAnim')){
|
||||
remove()
|
||||
} else {
|
||||
setTimeout(function(){
|
||||
remove();
|
||||
}, 200);
|
||||
}
|
||||
|
||||
$('#layui-layer-moves, #layui-layer-shade' + index).remove();
|
||||
layer.ie == 6 && ready.reselect();
|
||||
ready.rescollbar(index);
|
||||
if(layero.attr('minLeft')){
|
||||
ready.minIndex--;
|
||||
ready.minLeft.push(layero.attr('minLeft'));
|
||||
}
|
||||
|
||||
if((layer.ie && layer.ie < 10) || !layero.data('isOutAnim')){
|
||||
remove()
|
||||
} else {
|
||||
setTimeout(function(){
|
||||
remove();
|
||||
}, 200);
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
//关闭所有层
|
||||
layer.closeAll = function(type){
|
||||
$.each($('.'+doms[0]), function(){
|
||||
var othis = $(this);
|
||||
var is = type ? (othis.attr('type') === type) : 1;
|
||||
is && layer.close(othis.attr('times'));
|
||||
is = null;
|
||||
layer.ready(function(){
|
||||
$.each($('.'+doms[0]), function(){
|
||||
var othis = $(this);
|
||||
var is = type ? (othis.attr('type') === type) : 1;
|
||||
is && layer.close(othis.attr('times'));
|
||||
is = null;
|
||||
});
|
||||
});
|
||||
};
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
/**
|
||||
|
||||
@Name : layui.laypage 分页组件
|
||||
@Name : laypage 分页组件
|
||||
@License:MIT
|
||||
|
||||
*/
|
||||
|
@ -1,6 +1,6 @@
|
||||
/**
|
||||
|
||||
@Name : layui.laytpl 模板引擎
|
||||
@Name : laytpl 模板引擎
|
||||
@License:MIT
|
||||
|
||||
*/
|
||||
|
13
src/modules/layui.all.js
Normal file
13
src/modules/layui.all.js
Normal file
@ -0,0 +1,13 @@
|
||||
/**
|
||||
|
||||
@Name:用于打包聚合版,该文件不会存在于构建后的目录
|
||||
|
||||
*/
|
||||
|
||||
layui.define(function(exports){
|
||||
var cache = layui.cache;
|
||||
layui.config({
|
||||
dir: cache.dir.replace(/lay\/dest\/$/, '')
|
||||
});
|
||||
exports('layui.all', layui.v);
|
||||
});
|
@ -1,6 +1,6 @@
|
||||
/**
|
||||
|
||||
@Title: layui.rate 评分评星组件
|
||||
@Title: rate 评分评星组件
|
||||
@License:MIT
|
||||
|
||||
*/
|
||||
|
@ -1,6 +1,6 @@
|
||||
/**
|
||||
|
||||
@Title: layui.slider 滑块组件
|
||||
@Title: slider 滑块组件
|
||||
@License:MIT
|
||||
|
||||
*/
|
||||
|
@ -1,10 +1,10 @@
|
||||
/**
|
||||
|
||||
@Name:layui.table 表格操作组件
|
||||
@Name:table 表格操作组件
|
||||
@License:MIT
|
||||
|
||||
*/
|
||||
|
||||
|
||||
layui.define(['laytpl', 'laypage', 'layer', 'form', 'util'], function(exports){
|
||||
"use strict";
|
||||
|
||||
@ -963,7 +963,7 @@ layui.define(['laytpl', 'laypage', 'layer', 'form', 'util'], function(exports){
|
||||
that.eachCols(function(i3, item3){
|
||||
var field = item3.field || i3;
|
||||
|
||||
//td内容
|
||||
//td 内容
|
||||
var content = function(){
|
||||
var text = item3.totalRowText || ''
|
||||
,thisTotalNum = parseFloat(totalNums[field]).toFixed(2)
|
||||
@ -995,7 +995,16 @@ layui.define(['laytpl', 'laypage', 'layer', 'form', 'util'], function(exports){
|
||||
var str = (options.index + '-' + item3.key);
|
||||
return item3.type === 'normal' ? str
|
||||
: (str + ' laytable-cell-' + item3.type);
|
||||
}() +'">' + content
|
||||
}() +'">' + function(){
|
||||
var totalRow = item3.totalRow || options.totalRow;
|
||||
//如果 totalRow 参数为字符类型,则解析为自定义模版
|
||||
if(typeof totalRow === 'string'){
|
||||
return laytpl(totalRow).render($.extend({
|
||||
TOTAL_NUMS: content
|
||||
}, item3))
|
||||
}
|
||||
return content;
|
||||
}()
|
||||
,'</div></td>'].join('');
|
||||
|
||||
item3.field && (that.dataTotal[field] = content);
|
||||
|
@ -1,6 +1,6 @@
|
||||
/**
|
||||
|
||||
@Name:layui.transfer 穿梭框组件
|
||||
@Name:transfer 穿梭框组件
|
||||
@License:MIT
|
||||
|
||||
*/
|
||||
|
@ -1,6 +1,6 @@
|
||||
/**
|
||||
|
||||
@Name:layui.tree 树组件
|
||||
@Name:tree 树组件
|
||||
@License:MIT
|
||||
|
||||
*/
|
||||
|
@ -1,6 +1,6 @@
|
||||
/**
|
||||
|
||||
@Title: layui.upload 文件上传组件
|
||||
@Title: upload 文件上传组件
|
||||
@License:MIT
|
||||
|
||||
*/
|
||||
|
@ -1,6 +1,6 @@
|
||||
/**
|
||||
|
||||
@Name:layui.util 工具集组件
|
||||
@Name:util 工具集组件
|
||||
@License:MIT
|
||||
|
||||
*/
|
||||
|
Loading…
Reference in New Issue
Block a user