From 0d09448599414ffc8767f966b577b01699823652 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B4=A4=E5=BF=83?= <3277200+sentsim@users.noreply.github.com> Date: Wed, 31 Aug 2022 01:45:37 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20css=20=E5=8A=A0=E8=BD=BD?= =?UTF-8?q?=E8=B7=AF=E5=BE=84=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/code.js | 7 ++++++- src/modules/laydate.js | 17 ++++++++++++----- src/modules/layer.js | 9 ++++++--- 3 files changed, 24 insertions(+), 9 deletions(-) diff --git a/src/modules/code.js b/src/modules/code.js index 743a0471..47a1fc5d 100644 --- a/src/modules/code.js +++ b/src/modules/code.js @@ -96,4 +96,9 @@ layui.define(['lay', 'util'], function(exports){ }); }); -}).addcss('modules/code.css?v=3', 'skincodecss'); \ No newline at end of file +}); + +// 若为源码版,则自动加载该组件依赖的 css 文件 +if(!layui['layui.all']){ + layui.addcss('modules/code.css?v=3', 'skincodecss'); +} \ No newline at end of file diff --git a/src/modules/laydate.js b/src/modules/laydate.js index 2bf890f7..b76b1441 100644 --- a/src/modules/laydate.js +++ b/src/modules/laydate.js @@ -24,7 +24,7 @@ //外部调用 ,laydate = { - v: '5.3.1' //layDate 版本号 + v: '5.4.0' //layDate 版本号 ,config: { weekStart: 0, // 默认周日一周的开始 } //全局配置项 @@ -39,10 +39,17 @@ } // 主体 CSS 等待事件 - ,ready: function(fn){ - var cssname = 'laydate', ver = '' - ,path = (isLayui ? 'modules/' : 'css/') + 'laydate.css?v='+ laydate.v + ver; - isLayui ? layui.addcss(path, fn, cssname) : ready.link(path, fn, cssname); + ,ready: function(callback){ + var cssname = 'laydate'; + var ver = '' + var path = (isLayui ? 'modules/' : 'css/') + 'laydate.css?v='+ laydate.v + ver; + + isLayui ? ( + layui['layui.all'] + ? (typeof callback === 'function' && callback()) + : layui.addcss(path, callback, cssname) + ) : ready.link(path, callback, cssname); + return this; } } diff --git a/src/modules/layer.js b/src/modules/layer.js index f5a96ffd..141c1138 100644 --- a/src/modules/layer.js +++ b/src/modules/layer.js @@ -120,15 +120,18 @@ var layer = { return this; }, - //主体 CSS 等待事件 + // 主体 CSS 等待事件 ready: function(callback){ - var cssname = 'layer', ver = '' - ,path = (isLayui ? 'modules/' : 'css/') + 'layer.css?v='+ layer.v + ver; + var cssname = 'layer'; + var ver = ''; + var path = (isLayui ? 'modules/' : 'css/') + 'layer.css?v='+ layer.v + ver; + isLayui ? ( layui['layui.all'] ? (typeof callback === 'function' && callback()) : layui.addcss(path, callback, cssname) ) : ready.link(path, callback, cssname); + return this; },