lsm/layui
1
0
Fork 0
mirror of https://gitee.com/layui/layui.git synced 2025-11-24 16:43:14 +08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

fix: 修复 laydate 的 btns 数组参与深拷贝的问题 (#2909)

Browse Source 
* fix: 修复 laydate 的 `btns` 数组参与深拷贝的问题

* fix(laydate): update
This commit is contained in:
贤心
2025-11-06 16:30:07 +08:00
committed by GitHub
parent 78c15a8e6e
commit 5247cd31e6
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/modules/laydate.js
View File

@@ -47,9 +47,17 @@ layui.define(['lay', 'i18n'], function(exports) {
return code >= 48 && code <= 57; // '0' 到 '9' 的 ASCII 码范围
}
// 对象合并时，让数组覆盖，而非合并
function overwriteArray(objValue, srcValue) {
// 数组覆盖而非合并
if (Array.isArray(objValue) && Array.isArray(srcValue)) {
return srcValue;
}
}
// 外部调用
var laydate = {
v: '5.7.0', // layDate 版本号
v: '5.8.0', // layDate 版本号
config: {
weekStart: 0 // 默认周日一周的开始
}, // 全局配置项
@@ -58,7 +66,7 @@ layui.define(['lay', 'i18n'], function(exports) {
// 设置全局项
set: function (options) {
var that = this;
that.config = lay.extend({}, that.config, options);
that.config = lay.extend({}, that.config, options, overwriteArray);
return that;
},
@@ -128,7 +136,7 @@ layui.define(['lay', 'i18n'], function(exports) {
var Class = function(options){
var that = this;
that.index = ++laydate.index;
that.config = lay.extend({}, that.config, laydate.config, options);
that.config = lay.extend({}, that.config, laydate.config, options, overwriteArray);
// 若 elem 非唯一，则拆分为多个实例
var elem = lay(options.elem || that.config.elem);
@@ -136,13 +144,13 @@ layui.define(['lay', 'i18n'], function(exports) {
lay.each(elem, function(){
laydate.render(lay.extend({}, that.config, {
elem: this
}));
}, overwriteArray));
});
return that;
}
// 初始化属性
options = lay.extend(that.config, lay.options(elem[0])); // 继承节点上的属性
options = lay.extend(that.config, lay.options(elem[0]), overwriteArray); // 继承节点上的属性
// 更新 i18n 消息对象
that.i18nMessages = that.getI18nMessages();
@@ -344,7 +352,7 @@ layui.define(['lay', 'i18n'], function(exports) {
// 重载实例
Class.prototype.reload = function(options){
var that = this;
that.config = lay.extend({}, that.config, options);
that.config = lay.extend({}, that.config, options, overwriteArray);
that.init();
};