From cde6a4483669805fee8457d16a5a22844593b521 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B4=A4=E5=BF=83?= <3277200+sentsim@users.noreply.github.com> Date: Fri, 23 Jun 2023 14:32:31 +0800 Subject: [PATCH 01/29] =?UTF-8?q?=E5=BE=AE=E8=B0=83=20`upload`=20=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E4=B9=A6=E5=86=99=E8=A7=84=E8=8C=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/upload.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/modules/upload.js b/src/modules/upload.js index 2f588942..cfea6032 100644 --- a/src/modules/upload.js +++ b/src/modules/upload.js @@ -53,7 +53,6 @@ layui.define(['lay','layer'], function(exports){ var ELEM_CHOOSE = 'layui-upload-choose'; var ELEM_DRAG = 'layui-upload-drag'; - // 构造器 var Class = function(options){ var that = this; @@ -152,8 +151,8 @@ layui.define(['lay','layer'], function(exports){ //异常提示 Class.prototype.msg = function(content){ return layer.msg(content, { - icon: 2 - ,shift: 6 + icon: 2, + shift: 6 }); }; From fa1ceb330e35897b7b3f0c893774cbb9d3ebadb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B4=A4=E5=BF=83?= <3277200+sentsim@users.noreply.github.com> Date: Fri, 23 Jun 2023 14:34:03 +0800 Subject: [PATCH 02/29] =?UTF-8?q?=E4=BC=98=E5=8C=96=20slider=20=E4=B8=AD?= =?UTF-8?q?=E8=BE=93=E5=85=A5=E6=A1=86=E7=9B=B8=E5=85=B3=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/css/layui.css | 4 ++-- src/modules/slider.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/css/layui.css b/src/css/layui.css index eb8021e3..ed0a2f7b 100644 --- a/src/css/layui.css +++ b/src/css/layui.css @@ -1509,12 +1509,12 @@ body .layui-util-face .layui-layer-content{padding:0; background-color:#fff; co .layui-slider-wrap-btn.layui-disabled:hover{transform: scale(1) !important;} .layui-slider-tips{position: absolute; top: -42px; z-index: 77777777; white-space:nowrap; display: none; -webkit-transform: translateX(-50%); transform: translateX(-50%); color: #FFF; background: #000; border-radius: 3px; height: 25px; line-height: 25px; padding: 0 10px;} .layui-slider-tips:after{content: ""; position: absolute; bottom: -12px; left: 50%; margin-left: -6px; width: 0; height: 0; border-width: 6px; border-style: solid; border-color: #000 transparent transparent transparent;} -.layui-slider-input{width: 70px; height: 32px; border: 1px solid #eee; border-radius: 3px; font-size: 16px; line-height: 32px; position: absolute; right: 0; top: -14px;} +.layui-slider-input{width: 70px; height: 32px; border: 1px solid #eee; border-radius: 3px; font-size: 16px; line-height: 32px; position: absolute; right: 0; top: -14px; box-sizing: border-box;} .layui-slider-input-btn{position: absolute; top: 0; right: 0; width: 20px; height: 100%; border-left: 1px solid #eee;} .layui-slider-input-btn i{cursor: pointer; position: absolute; right: 0; bottom: 0; width: 20px; height: 50%; font-size: 12px; line-height: 16px; text-align: center; color: #999;} .layui-slider-input-btn i:first-child{top: 0; border-bottom: 1px solid #eee;} .layui-slider-input-txt{height: 100%; font-size: 14px;} -.layui-slider-input-txt input{height: 100%; border: none;} +.layui-slider-input-txt input{height: 100%; border: none; padding-right: 21px;} .layui-slider-input-btn i:hover{color: #16baaa;} /*垂直滑块*/ .layui-slider-vertical{width: 4px; margin-left: 33px;} diff --git a/src/modules/slider.js b/src/modules/slider.js index eab3bafe..c0f3e350 100644 --- a/src/modules/slider.js +++ b/src/modules/slider.js @@ -179,7 +179,7 @@ layui.define(['jquery', 'lay'], function(exports){ //插入输入框 if(options.input && !options.range){ - var elemInput = $('
'); + var elemInput = $(' '); othis.css("position","relative"); othis.append(elemInput); othis.find('.' + SLIDER_INPUT_TXT).children('input').val(options.value); From 5523eefb8334d6b2bc45198693db788c466b53e0 Mon Sep 17 00:00:00 2001 From: morning-star+From be13118fd1ae21f722f432d616441819e80ebe2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B4=A4=E5=BF=83?= <3277200+sentsim@users.noreply.github.com> Date: Sat, 24 Jun 2023 23:47:25 +0800 Subject: [PATCH 04/29] =?UTF-8?q?=E4=BC=98=E5=8C=96=20code=20=E5=BD=93?= =?UTF-8?q?=E5=BC=80=E5=90=AF=20iframe=20=E6=A8=A1=E5=BC=8F=E6=97=B6?= =?UTF-8?q?=E5=AF=B9=20`codeParse`=20=E7=9A=84=E8=A7=A3=E6=9E=90=E6=94=AF?= =?UTF-8?q?=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/code.js | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/modules/code.js b/src/modules/code.js index aa6c4ba6..5efd496b 100644 --- a/src/modules/code.js +++ b/src/modules/code.js @@ -90,6 +90,14 @@ layui.define(['lay', 'util', 'element', 'form'], function(exports){ othis.data('code', codes); + // code + var html = finalCode = codes.join(''); + + // 外部重新解析 code + if(typeof options.codeParse === 'function'){ + html = finalCode = options.codeParse(html); + } + // 工具栏 var tools = { copy: { @@ -231,7 +239,7 @@ layui.define(['lay', 'util', 'element', 'form'], function(exports){ var run = function(thisItemBody){ var iframe = thisItemBody.children('iframe')[0]; if(isIframePreview && iframe){ - iframe.srcdoc = codes.join(''); + iframe.srcdoc = finalCode; } else { thisItemBody.html(codes.join('')); } @@ -297,13 +305,7 @@ layui.define(['lay', 'util', 'element', 'form'], function(exports){ } - // code - var html = finalCode = codes.join(''); - - // 外部重新解析 code - if(typeof options.codeParse === 'function'){ - html = finalCode = options.codeParse(html); - } + // 转义 HTML 标签 if(options.encode) html = util.escape(html); // 编码 From 3e19d36e97d32f082d7586292e1980ee89d8aea0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B4=A4=E5=BF=83?= <3277200+sentsim@users.noreply.github.com> Date: Sun, 25 Jun 2023 09:41:00 +0800 Subject: [PATCH 05/29] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20countdown=20?= =?UTF-8?q?=E7=A4=BA=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/util/detail/demo.md | 37 ++++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/docs/util/detail/demo.md b/docs/util/detail/demo.md index 24e20589..f23f2c3c 100644 --- a/docs/util/detail/demo.md +++ b/docs/util/detail/demo.md @@ -1,4 +1,4 @@ --\ No newline at end of file +
+