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

release v2.8.18-rc.4 

release v2.8.18-rc.4
pull/1440/head v2.8.18-rc.4
贤心 2023-10-31 16:28:51 +08:00 committed by GitHub
parent 7d5d8ce8bc d71106eefd
commit d8bf3f1cfd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 136 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dist/layui.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/layui.js.map vendored
View File

File diff suppressed because one or more lines are too long

237
docs/laydate/examples/shortcut.md
View File

@ -110,17 +110,31 @@ layui.use(function(){
text: "上个月",
value: function(){
var now = new Date();
// now.setDate(now.getDate() - 1);
now.setMonth(now.getMonth() - 1);
var month = now.getMonth() - 1;
now.setMonth(month);
// 若上个月数不匹配，则表示天数溢出
if (now.getMonth() !== month) {
now.setDate(0); // 重置天数
}
return [now];
}
},
{
text: "上个月的前一天",
text: "下个月",
value: function(){
var now = new Date();
now.setMonth(now.getMonth() - 1);
now.setDate(now.getDate() - 1);
var month = now.getMonth() + 1;
now.setMonth(month);
// 若下个月数不匹配，则表示天数溢出
if (now.getMonth() !== month) {
now.setDate(0); // 重置天数
}
return [now];
}
},
@ -164,7 +178,7 @@ layui.use(function(){
text: "上个月",
value: function(){
var now = new Date();
now.setMonth(now.getMonth() - 1);
now.setMonth(now.getMonth() - 1, 1);
return now;
}
},
@ -172,15 +186,14 @@ layui.use(function(){
text: "下个月",
value: function(){
var now = new Date();
now.setMonth(now.getMonth() + 1);
now.setMonth(now.getMonth() + 1, 1);
return now;
}
},
{
text: "去年12月",
text: "去年本月",
value: function(){
var now = new Date();
now.setMonth(11);
now.setFullYear(now.getFullYear() - 1);
return now;
}
@ -239,23 +252,37 @@ layui.use(function(){
text: "上个月",
value: function(){
var now = new Date();
// now.setDate(now.getDate() - 1);
now.setMonth(now.getMonth() - 1);
var month = now.getMonth() - 1;
now.setMonth(month);
// 若上个月数不匹配，则表示天数溢出
if (now.getMonth() !== month) {
now.setDate(0); // 重置天数
}
return [now];
}
},
{
text: "上个月的前一天",
text: "下个月",
value: function(){
var now = new Date();
now.setMonth(now.getMonth() - 1);
now.setDate(now.getDate() - 1);
var month = now.getMonth() + 1;
now.setMonth(month);
// 若上个月数不匹配，则表示天数溢出
if (now.getMonth() !== month) {
now.setDate(0); // 重置天数
}
return [now];
}
},
{
text: "某一天",
value: "2016-10-14 00:00:00"
value: "2016-10-14 10:00:00"
}
]
});
@ -288,23 +315,37 @@ layui.use(function(){
text: "上个月",
value: function(){
var now = new Date();
// now.setDate(now.getDate() - 1);
now.setMonth(now.getMonth() - 1);
var month = now.getMonth() - 1;
now.setMonth(month);
// 若上个月数不匹配，则表示天数溢出
if (now.getMonth() !== month) {
now.setDate(0); // 重置天数
}
return [now];
}
},
{
text: "上个月的前一天",
text: "下个月",
value: function(){
var now = new Date();
now.setMonth(now.getMonth() - 1);
now.setDate(now.getDate() - 1);
var month = now.getMonth() + 1;
now.setMonth(month);
// 若上个月数不匹配，则表示天数溢出
if (now.getMonth() !== month) {
now.setDate(0); // 重置天数
}
return [now];
}
},
{
text: "某一天",
value: "2016-10-14 11:32:32"
value: "2016-10-14 09:30:00"
}
]
});
@ -318,63 +359,40 @@ layui.use(function(){
{
text: "上个月",
value: function(){
var value = [];
var date = new Date();
var year = date.getFullYear();
var month = date.getMonth();
var date1 = new Date();
date1.setMonth(date1.getMonth() - 1);
date1.setDate(1);
date1.setHours(0, 0, 0, 0);
value.push(date1);
var date2 = new Date();
date2.setDate(1);
date2.setHours(0, 0, 0, 0);
date2 = date2.getTime() - 1;
value.push(new Date(date2));
return value;
return [
new Date(year, month - 1, 1),
new Date(year, month, 0)
];
}
},
{
text: "这个月",
value: function(){
var value = [];
var date = new Date();
var year = date.getFullYear();
var month = date.getMonth();
var date1 = new Date();
// date1.setMonth(date1.getMonth() - 1);
date1.setDate(1);
date1.setHours(0, 0, 0, 0);
value.push(date1);
var date2 = new Date();
date2.setMonth(date2.getMonth() + 1);
date2.setDate(1);
date2.setHours(0, 0, 0, 0);
date2 = date2.getTime() - 1;
value.push(new Date(date2));
return value;
return [
new Date(year, month, 1),
new Date(year, month + 1, 0)
];
}
},
{
text: "下个月",
value: function(){
var value = [];
var date = new Date();
var year = date.getFullYear();
var month = date.getMonth();
var date1 = new Date();
date1.setMonth(date1.getMonth() + 1);
date1.setDate(1);
date1.setHours(0, 0, 0, 0);
value.push(date1);
var date2 = new Date();
date2.setMonth(date2.getMonth() + 2);
date2.setDate(1);
date2.setHours(0, 0, 0, 0);
date2 = date2.getTime() - 1;
value.push(new Date(date2));
return value;
return [
new Date(year, month + 1, 1),
new Date(year, month + 2, 0)
];
}
}
]
@ -423,21 +441,25 @@ layui.use(function(){
{
text: "去年",
value: function(){
var date1 = new Date();
date1.setFullYear(date1.getFullYear() - 1, 0, 1);
date1.setHours(0, 0, 0, 0);
var date2 = new Date();
date2.setMonth(0, 1);
date2.setHours(0, 0, 0, 0);
return [date1, date2.getTime() - 1];
var now = new Date();
var year = now.getFullYear() - 1;
return [
new Date(year, 0),
new Date(year, 11)
];
}
},
{
text: "明年",
value: function(){
var now = new Date();
now.setFullYear(now.getFullYear() + 1);
return [now, now];
var year = now.getFullYear() + 1;
return [
new Date(year, 0),
new Date(year, 11)
];
}
},
{
@ -493,67 +515,44 @@ layui.use(function(){
{
text: "上个月",
value: function(){
var value = [];
var date = new Date();
var year = date.getFullYear();
var month = date.getMonth();
var date1 = new Date();
date1.setMonth(date1.getMonth() - 1);
date1.setDate(1);
date1.setHours(0, 0, 0, 0);
value.push(date1);
var date2 = new Date();
date2.setDate(1);
date2.setHours(0, 0, 0, 0);
date2 = date2.getTime() - 1;
value.push(new Date(date2));
return value;
return [
new Date(year, month - 1, 1),
new Date(year, month, 0, 23, 59, 59)
];
}
},
{
text: "这个月",
value: function(){
var value = [];
var date = new Date();
var year = date.getFullYear();
var month = date.getMonth();
var date1 = new Date();
// date1.setMonth(date1.getMonth() - 1);
date1.setDate(1);
date1.setHours(0, 0, 0, 0);
value.push(date1);
var date2 = new Date();
date2.setMonth(date2.getMonth() + 1);
date2.setDate(1);
date2.setHours(0, 0, 0, 0);
date2 = date2.getTime() - 1;
value.push(new Date(date2));
return value;
return [
new Date(year, month, 1),
new Date(year, month + 1, 0, 23, 59, 59)
];
}
},
{
text: "下个月",
value: function(){
var value = [];
var date = new Date();
var year = date.getFullYear();
var month = date.getMonth();
var date1 = new Date();
date1.setMonth(date1.getMonth() + 1);
date1.setDate(1);
date1.setHours(0, 0, 0, 0);
value.push(date1);
var date2 = new Date();
date2.setMonth(date2.getMonth() + 2);
date2.setDate(1);
date2.setHours(0, 0, 0, 0);
date2 = date2.getTime() - 1;
value.push(new Date(date2));
return value;
return [
new Date(year, month + 1, 1),
new Date(year, month + 2, 0, 23, 59, 59)
];
}
}
]
});
});
</script>
</script>

9
docs/versions.md
View File

@ -13,7 +13,7 @@ toc: true
<h2 id="2.8.18" class="ws-anchor">
2.8.18-rc.3
2.8.18-rc.4
<span class="layui-badge-rim">2023-10-31</span>
</h2>
@ -31,10 +31,13 @@ toc: true
- #### table
- 新增 `complete` 属性，当数据接口请求完成后执行，无论成功还是失败均会触发 # 1379
- 修复 `ignoreExport` 表头属性值效果与文档不符的问题 # I86DBY
- 修复 `type:'radio'` 且为右侧固定列时，选择效果无效的问题 # 1406
- 修复 `type: 'radio'` 且为右侧固定列时，选择效果无效的问题 # 1406
- 优化 某些情况在 Firefox 的报错问题
- #### treeTable
- 修复 `treeTable.removeNode()` 在开启 `data` 模式时删除异常问题 # I7Z0AB/I82E2S
- 修复 `treeTable.setRowChecked()` 方法未逐层展开上级节点的问题 # 1385/I84RUT
- 修复 `treeTable.addNodes()` 新增根节点时出现的报错问题 # 1414
- 修复 数据格式为简单类型时 IE9+ 兼容问题 # 1415/I8C04Y
- #### upload
- 修复 `unified: true` 时的报错问题 # 1391
- 优化 渲染入口逻辑，以解决因重复渲染导致的若干问题 # 1391
@ -61,7 +64,7 @@ toc: true
- 新增 lay 模块部分函数 JSDoc 注释和示例 #1401
- 优化 `<hr>` 全局样式优先级 # I86R6G
### 下载： [layui-v2.8.18.rc.3.zip](https://gitee.com/layui/layui/attach_files/1569050/download)
### 下载： [layui-v2.8.18.rc.4.zip](https://gitee.com/layui/layui/attach_files/1569887/download)
---

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "layui",
"version": "2.8.18-rc.3",
"version": "2.8.18-rc.4",
"description": "Classic modular Front-End UI library",
"main": "dist/layui.js",
"license": "MIT",

2
src/layui.js
View File

@ -16,7 +16,7 @@
};
var Layui = function(){
this.v = '2.8.18-rc.3'; // Layui 版本号
this.v = '2.8.18-rc.4'; // Layui 版本号
};
// 识别预先可能定义的指定全局对象

12
src/modules/treeTable.js
View File

@ -301,9 +301,13 @@ layui.define(['table'], function (exports) {
}
})
// 返回顶层节点
return Object.values(nodes).filter(function (item) {
return rootPid ? item[pIdKey] === rootPid : !item[pIdKey];
})
return Object.keys(nodes)
.map(function(k) {
return nodes[k];
})
.filter(function (item) {
return rootPid ? item[pIdKey] === rootPid : !item[pIdKey];
})
}
Class.prototype.flatToTree = function (tableData) {
@ -1291,7 +1295,7 @@ layui.define(['table'], function (exports) {
// 若未传入 LAY_CHECKED 属性，则继承父节点的 checked 状态
layui.each(newNodes, function(i, item){
if(!(checkName in item)){
if(!(checkName in item) && parentNode){
item[checkName] = parentNode[checkName];
}
})