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

wip(i18n): 修复打包后 laydate 和 layer 异常

pull/2695/head
sight 2025-05-24 22:47:33 +08:00
parent cc222d9d22
commit 383baf471a
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/modules/laydate.js
View File

@ -177,7 +177,7 @@
,isPreview: true //是否显示值预览 ,isPreview: true //是否显示值预览
,btns: ['clear', 'now', 'confirm'] //右下角显示的按钮，会按照数组顺序排列 ,btns: ['clear', 'now', 'confirm'] //右下角显示的按钮，会按照数组顺序排列
// 为实现 lang 选项就近生效，去除此处的默认值，原型 lang() 方法中有兜底值 // 为实现 lang 选项就近生效，去除此处的默认值，原型 lang() 方法中有兜底值
,lang: isLayui && layui.cache.i18n.locale //语言，只支持cn/en，即中文和英文 ,lang: '' //语言，只支持cn/en，即中文和英文
,theme: 'default' //主题 ,theme: 'default' //主题
,position: null //控件定位方式定位, 默认absolute，支持：fixed/absolute/static ,position: null //控件定位方式定位, 默认absolute，支持：fixed/absolute/static
,calendar: false //是否开启公历重要节日，仅支持中文版 ,calendar: false //是否开启公历重要节日，仅支持中文版
@ -286,9 +286,17 @@
}else{ }else{
window.console && console.log && console.log('layui[laydate]: Locale "' + i18n.locale + '" not found. Please add i18n messages for this locale first.'); window.console && console.log && console.log('layui[laydate]: Locale "' + i18n.locale + '" not found. Please add i18n messages for this locale first.');
} }
// 同步 locale
if(!options.lang){
options.lang = i18n.locale;
}
} }
return text[options.lang] || text['cn']; if(!options.lang) {
options.lang = 'cn'
};
return text[options.lang];
}; };
Class.prototype.markerOfChineseFestivals = { Class.prototype.markerOfChineseFestivals = {

8
src/modules/layer.js
View File

@ -161,8 +161,6 @@ var $t = isLayui
return result; return result;
}; };
// default btnText 需要在 $t 之后初始化
ready.btn = [$t('lay.layer.confirm'), $t('lay.layer.cancel')];
// 默认内置方法。 // 默认内置方法。
@ -228,7 +226,7 @@ var layer = {
} }
return layer.open($.extend({ return layer.open($.extend({
content: content, content: content,
btn: ready.btn, btn: [$t('lay.layer.confirm'), $t('lay.layer.cancel')],
yes: yes, yes: yes,
btn2: cancel btn2: cancel
}, type ? {} : options)); }, type ? {} : options));
@ -291,6 +289,8 @@ var Class = function(setings){
var that = this, creat = function(){ var that = this, creat = function(){
that.creat(); that.creat();
}; };
// TODO 临时的同步方案
ready.config.title = $t('lay.layer.defaultTitle');
that.index = ++layer.index; that.index = ++layer.index;
that.config.maxWidth = $(win).width() - 15*2; // 初始最大宽度：当前屏幕宽，左右留 15px 边距 that.config.maxWidth = $(win).width() - 15*2; // 初始最大宽度：当前屏幕宽，左右留 15px 边距
that.config = $.extend({}, that.config, ready.config, setings); that.config = $.extend({}, that.config, ready.config, setings);
@ -522,7 +522,7 @@ Class.pt.creat = function(){
switch(config.type){ switch(config.type){
case 0: case 0:
config.btn = ('btn' in config) ? config.btn : ready.btn[0]; config.btn = ('btn' in config) ? config.btn : $t('lay.layer.confirm');
layer.closeAll('dialog'); layer.closeAll('dialog');
break; break;
case 2: case 2: