From aedf338e6cfca44f52dc3cb7f61e5e641249b3d7 Mon Sep 17 00:00:00 2001 From: meihangbo Date: Mon, 24 Oct 2022 23:47:42 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=9B=A0=E6=B5=8F=E8=A7=88=E5=99=A8?= =?UTF-8?q?=E7=BC=A9=E6=94=BE=E5=AF=BC=E8=87=B4=E5=8F=8C=E6=97=A5=E5=8E=86?= =?UTF-8?q?=E5=B7=A6=E5=8F=B3=E5=AE=BD=E5=BA=A6=E4=B8=8D=E5=A4=9F=E6=8D=A2?= =?UTF-8?q?=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/css/modules/laydate.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/css/modules/laydate.css b/src/css/modules/laydate.css index 46cce051..caa7840e 100644 --- a/src/css/modules/laydate.css +++ b/src/css/modules/laydate.css @@ -98,7 +98,7 @@ html #layuicss-laydate{display: none; position: absolute; width: 1989px;} /* 双日历 */ .layui-laydate-range{width: 546px;} -.layui-laydate-range .layui-laydate-main{display: inline-block; vertical-align: middle;} +.layui-laydate-range .layui-laydate-main{display: inline-block; vertical-align: middle;width:50%;} .layui-laydate-range .laydate-main-list-1 .layui-laydate-header, .layui-laydate-range .laydate-main-list-1 .layui-laydate-content{border-left: 1px solid #e2e2e2;} From bf52e7a006b5fce5ce86b6df800631bf6a6adf22 Mon Sep 17 00:00:00 2001 From: raypard Date: Fri, 28 Oct 2022 12:31:12 +0800 Subject: [PATCH 2/4] Update form.js Swap 'eye' and 'eye-invisible' --- src/modules/form.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/form.js b/src/modules/form.js index 08a602f3..fa174f7b 100644 --- a/src/modules/form.js +++ b/src/modules/form.js @@ -208,13 +208,13 @@ layui.define(['layer', 'util'], function(exports){ // 密码显隐 ,eye: [function(){ // 渲染 - renderSuffix('eye'); + renderSuffix('eye-invisible'); }, function(){ // 事件 var SHOW_NAME = 'LAY_FORM_INPUT_AFFIX_SHOW'; var isShow = othis.data(SHOW_NAME); othis.attr('type', isShow ? 'password' : 'text').data(SHOW_NAME, !isShow); - renderSuffix(isShow ? 'eye' : 'eye-invisible'); + renderSuffix(isShow ? 'eye-invisible' : 'eye'); }] }; From 9a4536ed6254d7a5c83e79132c0b49b4141fa64e Mon Sep 17 00:00:00 2001 From: sunxiaobin89 <470459819@qq.com> Date: Mon, 7 Nov 2022 10:08:39 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dtable=E7=9A=84height?= =?UTF-8?q?=E9=85=8D=E7=BD=AE#divid-=E5=B7=AE=E5=80=BC=E7=9A=84=E8=AE=BE?= =?UTF-8?q?=E5=AE=9A=E4=B8=AD=E5=A6=82=E6=9E=9Cdivid=E5=87=BA=E7=8E=B0?= =?UTF-8?q?=E6=A8=AA=E6=9D=86=E7=9A=84=E8=AF=9D=E6=97=A0=E6=B3=95=E5=91=BD?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/table.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/table.js b/src/modules/table.js index 74f15f33..fcb87d77 100644 --- a/src/modules/table.js +++ b/src/modules/table.js @@ -376,7 +376,7 @@ layui.define(['lay', 'laytpl', 'laypage', 'form', 'util'], function(exports){ if(options.height && /^full-\d+$/.test(options.height)){ that.fullHeightGap = options.height.split('-')[1]; options.height = _WIN.height() - that.fullHeightGap; - } else if (options.height && /^#\w+-{1}\d+$/.test(options.height)) { + } else if (options.height && /^#\w+\S*-\d+$/.test(options.height)) { var parentDiv = options.height.split("-"); that.parentHeightGap = parentDiv.pop(); that.parentDiv = parentDiv.join("-"); From 86680d3c63d28c835857aae4e3ca809a7d592dd7 Mon Sep 17 00:00:00 2001 From: Ikko Ashimine Date: Wed, 9 Nov 2022 00:48:38 +0900 Subject: [PATCH 4/4] Fix var name typo STAUTS_NAME -> STATUS_NAME --- src/modules/layer.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/modules/layer.js b/src/modules/layer.js index f455483b..6233a191 100644 --- a/src/modules/layer.js +++ b/src/modules/layer.js @@ -48,7 +48,7 @@ var isLayui = window.layui && layui.define, $, win, ready = { var app = (cssname || href).replace(/\.|\//g, ''); var id = 'layuicss-'+ app - ,STAUTS_NAME = 'creating' + ,STATUS_NAME = 'creating' ,timeout = 0; link.rel = 'stylesheet'; @@ -74,13 +74,13 @@ var isLayui = window.layui && layui.define, $, win, ready = { //css 加载就绪 if(parseInt(ready.getStyle(getLinkElem, 'width')) === 1989){ //如果参数来自于初始轮询（即未加载就绪时的），则移除 link 标签状态 - if(status === STAUTS_NAME) getLinkElem.removeAttribute('lay-status'); + if(status === STATUS_NAME) getLinkElem.removeAttribute('lay-status'); //如果 link 标签的状态仍为「创建中」，则继续进入轮询，直到状态改变，则执行回调 - getLinkElem.getAttribute('lay-status') === STAUTS_NAME ? setTimeout(poll, delay) : fn(); + getLinkElem.getAttribute('lay-status') === STATUS_NAME ? setTimeout(poll, delay) : fn(); } else { - getLinkElem.setAttribute('lay-status', STAUTS_NAME); + getLinkElem.setAttribute('lay-status', STATUS_NAME); setTimeout(function(){ - poll(STAUTS_NAME); + poll(STATUS_NAME); }, delay); }