github
/
layui
mirror of https://github.com/layui/layui
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/2.x' into 2.x

Browse Source
pull/1260/head
sunxiaobin89 2 years ago
parent 2d7b9c020e d3000748fd
commit 5d34c6f523
4 changed files with 163 additions and 6 deletions
Show Stats Download Patch File Download Diff File

7
docs/laydate/detail/options.md
Unescape View File

@ -183,6 +183,13 @@ value: '2018-08-18'
value: new Date(1534766888000) // 参数即为：2018-08-20 20:08:08 的毫秒数 value: new Date(1534766888000) // 参数即为：2018-08-20 20:08:08 的毫秒数
``` ```
- 当开启 `range` 时，初始设置日期范围值
```
// 开始日期 - 结束日期
value: '1900-01-01 - 2100-01-01'
```
</td> </td>
<td>string<br>date</td> <td>string<br>date</td>
<td> <td>

148
examples/table-test-border.html
Unescape View File

@ -0,0 +1,148 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<meta name="viewport"
content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
<title>表格边框测试</title>
<link rel="stylesheet" href="../src/css/layui.css">
<style>
body {
padding: 32px; /*overflow-y: scroll;*/
}
.layui-table-view {
margin: 8px 0;
}
</style>
</head>
<body>
<script type="text/html" id="barDemo">
<a class="layui-btn layui-btn-xs" lay-event="edit">编辑</a>
<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>
</script>
<blockquote class="layui-elem-quote">
无统计、无分页
</blockquote>
<table id="test"></table>
<blockquote class="layui-elem-quote">
有统计、无分页
</blockquote>
<table id="test1"></table>
<blockquote class="layui-elem-quote">
无统计、有分页
</blockquote>
<table id="test2"></table>
<blockquote class="layui-elem-quote">
有统计、有分页
</blockquote>
<table id="test3"></table>
<script src="../src/layui.js" src1="https://cdn.staticfile.org/layui/2.7.6/layui.js"></script>
<script>
layui.use(['table', 'laydate'], function () {
var $ = layui.$;
var table = layui.table;
var url = 'json/table/demo1.json';
// 无统计、无分页
table.render({
elem: '#test'
, url: url
// , totalRow: true
, height: 300
, cellMinWidth: 80
//,skin: 'line'
//,size: 'lg'
// , toolbar: true
, cols: [[
{field: 'id', hide: true}
, {field: 'username', title: '用户名'}
, {field: 'email', title: '邮箱'}
, {title: '操作', align: 'center', toolbar: '#barDemo'}
]]
});
// 有统计、无分页
table.render({
elem: '#test1'
, url: url
, totalRow: true
, height: 300
, cellMinWidth: 80
//,skin: 'line'
//,size: 'lg'
// , toolbar: true
, cols: [[
{field: 'id', hide: true}
, {field: 'username', title: '用户名'}
, {field: 'email', title: '邮箱'}
, {title: '操作', align: 'center', toolbar: '#barDemo'}
]]
});
// 无统计、有分页
table.render({
elem: '#test2'
, url: url
//,contentType: 'application/json' // 参数为 json 格式传递
, page: { // 详细参数可参考 laypage 组件文档
curr: 5
, groups: 1
, first: false
, last: false
, layout: ['limit', 'prev', 'page', 'next', 'count'] //自定义分页布局
}
// , totalRow: true
, height: 300
, cellMinWidth: 80
//,skin: 'line'
//,size: 'lg'
// , toolbar: true
, cols: [[
{field: 'id', hide: true}
, {field: 'username', title: '用户名'}
, {field: 'email', title: '邮箱'}
, {title: '操作', align: 'center', toolbar: '#barDemo'}
]]
});
// 有统计、有分页
table.render({
elem: '#test3'
, url: url
//,contentType: 'application/json' // 参数为 json 格式传递
, page: { // 详细参数可参考 laypage 组件文档
curr: 5
, groups: 1
, first: false
, last: false
, layout: ['limit', 'prev', 'page', 'next', 'count'] //自定义分页布局
}
, totalRow: true
, height: 300
, cellMinWidth: 80
//,skin: 'line'
//,size: 'lg'
// , toolbar: true
, cols: [[
{field: 'id', hide: true}
, {field: 'username', title: '用户名'}
, {field: 'email', title: '邮箱'}
, {title: '操作', align: 'center', toolbar: '#barDemo'}
]]
});
});
</script>
</body>
</html>

12
src/modules/form.js
Unescape View File

@ -690,6 +690,13 @@ layui.define(['lay', 'layer', 'util'], function(exports){
}())); }()));
var disabled = this.disabled; var disabled = this.disabled;
if(!skins[skin]) skin = 'primary'; // 若非内置风格，则强制为默认风格
var RE_CLASS = CLASS[skin] || CLASS.checkbox;
// 替代元素
var hasRender = othis.next('.' + RE_CLASS[0]);
hasRender[0] && hasRender.remove(); // 如果已经渲染，则Rerender
// 若存在标题模板，则优先读取标题模板 // 若存在标题模板，则优先读取标题模板
if(othis.next('[lay-checkbox]')[0]){ if(othis.next('[lay-checkbox]')[0]){
title = othis.next().html() || ''; title = othis.next().html() || '';
@ -697,14 +704,10 @@ layui.define(['lay', 'layer', 'util'], function(exports){
// 若为开关，则对 title 进行分隔解析 // 若为开关，则对 title 进行分隔解析
title = skin === 'switch' ? title.split('|') : [title]; title = skin === 'switch' ? title.split('|') : [title];
if(!skins[skin]) skin = 'primary'; // 若非内置风格，则强制为默认风格
var RE_CLASS = CLASS[skin] || CLASS.checkbox;
if(typeof othis.attr('lay-ignore') === 'string') return othis.show(); if(typeof othis.attr('lay-ignore') === 'string') return othis.show();
// 替代元素 // 替代元素
var hasRender = othis.next('.' + RE_CLASS[0]);
var reElem = $(['<div class="layui-unselect '+ RE_CLASS[0], var reElem = $(['<div class="layui-unselect '+ RE_CLASS[0],
(check.checked ? (' '+ RE_CLASS[1]) : ''), // 选中状态 (check.checked ? (' '+ RE_CLASS[1]) : ''), // 选中状态
(disabled ? ' layui-checkbox-disabled '+ DISABLED : ''), // 禁用状态 (disabled ? ' layui-checkbox-disabled '+ DISABLED : ''), // 禁用状态
@ -725,7 +728,6 @@ layui.define(['lay', 'layer', 'util'], function(exports){
}(), }(),
'</div>'].join('')); '</div>'].join(''));
hasRender[0] && hasRender.remove(); // 如果已经渲染，则Rerender
othis.after(reElem); othis.after(reElem);
events.call(this, reElem, RE_CLASS); events.call(this, reElem, RE_CLASS);
}); });

2
src/modules/upload.js
Unescape View File

@ -399,7 +399,7 @@ layui.define(['lay','layer'], function(exports){
break; break;
default: //图片文件 default: //图片文件
layui.each(value, function(i, item){ layui.each(value, function(i, item){
if(!RegExp('.\\.('+ (exts || 'jpg|png|gif|bmp|jpeg') +')$', 'i').test(escape(item))){ if(!RegExp('.\\.('+ (exts || 'jpg|png|gif|bmp|jpeg|svg') +')$', 'i').test(escape(item))){
return check = true; return check = true;
} }
}); });

Write Preview
Loading…
Cancel
Save