From 746bd44e1610cce32236ea064b7111498f4683e3 Mon Sep 17 00:00:00 2001 From: Jack Date: Thu, 28 Jul 2022 11:35:44 +0800 Subject: [PATCH 01/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20layer.photos=20?= =?UTF-8?q?=E5=BA=95=E9=83=A8=E6=8F=90=E7=A4=BA=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/layer.js | 35 +++++++++++++++++++++++++++++------ 1 file changed, 29 insertions(+), 6 deletions(-) diff --git a/src/modules/layer.js b/src/modules/layer.js index 8e59e25e..4f0cba9b 100644 --- a/src/modules/layer.js +++ b/src/modules/layer.js @@ -1280,6 +1280,8 @@ layer.photos = function(options, loop, key){ loadImage(data[start].src, function(img){ layer.close(dict.loadi); + let alt = data[start].alt||''; + //切换图片时不出现动画 if(key) options.anim = -1; @@ -1317,15 +1319,36 @@ layer.photos = function(options, loop, key){ isOutAnim: false, skin: 'layui-layer-photos' + skin('photos'), content: '
' - +''+ (data[start].alt||'') +'' + +''+ alt +'' +function(){ + let tip = '
'; + if(data.length > 1){ - return '
' - +'' - +'
'+ (data[start].alt || '') +''+ dict.imgIndex +' / '+ data.length +'
' - +'
' + tip += ''; + + if(alt===''){ + tip += '
'+ dict.imgIndex +' / '+ data.length +'
'; + } + else{ + tip += '
'+ alt +''+ dict.imgIndex +' / '+ data.length +'
'; + } + + tip += '
'; } - return ''; + else if(data.length === 1){ + if(alt===''){ + tip = ''; + } + else{ + tip += '
'+ alt +'
'; + tip += '
'; + } + } + else{ + tip = ''; + } + + return tip; }() +'', success: function(layero, index){ From 821de03d8a17a5f739ae42aa219bfdf1b0b9cc03 Mon Sep 17 00:00:00 2001 From: Jack Date: Tue, 2 Aug 2022 14:36:21 +0800 Subject: [PATCH 02/15] =?UTF-8?q?=E4=B8=BA=20layer.photo=20=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E2=80=9C=E6=9F=A5=E7=9C=8B=E5=8E=9F=E5=9B=BE=E2=80=9D?= =?UTF-8?q?=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/css/modules/layer/default/layer.css | 3 ++- src/modules/layer.js | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/css/modules/layer/default/layer.css b/src/css/modules/layer/default/layer.css index 54a6aeee..75b23654 100644 --- a/src/css/modules/layer/default/layer.css +++ b/src/css/modules/layer/default/layer.css @@ -157,7 +157,8 @@ html #layuicss-layer{display: none; position: absolute; width: 1989px;} .layui-layer-imgtit *{display:inline-block; *display:inline; *zoom:1; vertical-align:top; font-size:12px;} .layui-layer-imgtit a{max-width:65%; text-overflow: ellipsis; overflow: hidden; white-space: nowrap; color:#fff;} .layui-layer-imgtit a:hover{color:#fff; text-decoration:underline;} -.layui-layer-imgtit em{padding-left:10px; font-style: normal;} +.layui-layer-imgtit em{padding:0 10px; font-style: normal;} +.layui-layer-imgtit>span+a{margin-left: 10px;} /* 关闭动画 */ @-webkit-keyframes layer-bounceOut { diff --git a/src/modules/layer.js b/src/modules/layer.js index 4f0cba9b..75d98993 100644 --- a/src/modules/layer.js +++ b/src/modules/layer.js @@ -1327,20 +1327,20 @@ layer.photos = function(options, loop, key){ tip += ''; if(alt===''){ - tip += '
'+ dict.imgIndex +' / '+ data.length +'
'; + tip += '
'+ dict.imgIndex +' / '+ data.length +'查看原图
'; } else{ - tip += '
'+ alt +''+ dict.imgIndex +' / '+ data.length +'
'; + tip += '
'+ alt +''+ dict.imgIndex +' / '+ data.length +'查看原图
'; } tip += ''; } else if(data.length === 1){ if(alt===''){ - tip = ''; + tip = ''; } else{ - tip += '
'+ alt +'
'; + tip += '
'+ alt +'查看原图
'; tip += ''; } } From 7735aeef7bdcc767b3d6cffbede7f04ae1b8c25d Mon Sep 17 00:00:00 2001 From: Jack Date: Tue, 2 Aug 2022 14:38:15 +0800 Subject: [PATCH 03/15] =?UTF-8?q?=E5=B0=86=20layer.photo=20=E7=9A=84=20let?= =?UTF-8?q?=20=E6=94=B9=E4=B8=BA=20var?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/layer.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/layer.js b/src/modules/layer.js index 75d98993..ecdbbf7d 100644 --- a/src/modules/layer.js +++ b/src/modules/layer.js @@ -1280,7 +1280,7 @@ layer.photos = function(options, loop, key){ loadImage(data[start].src, function(img){ layer.close(dict.loadi); - let alt = data[start].alt||''; + var alt = data[start].alt||''; //切换图片时不出现动画 if(key) options.anim = -1; @@ -1321,7 +1321,7 @@ layer.photos = function(options, loop, key){ content: '
' +''+ alt +'' +function(){ - let tip = '
'; + var tip = '
'; if(data.length > 1){ tip += ''; From a74548b0408424e4f2859a59b67bf9a0e31970fa Mon Sep 17 00:00:00 2001 From: ZZZping <475377765@qq.com> Date: Mon, 8 Aug 2022 15:08:47 +0800 Subject: [PATCH 04/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9C=A8=E6=A0=91?= =?UTF-8?q?=E5=BD=A2=E7=BB=84=E4=BB=B6=E4=B8=AD=E4=BD=BF=E7=94=A8=E9=95=BF?= =?UTF-8?q?=E6=95=B0=E5=AD=97=E5=AD=97=E7=AC=A6=E4=B8=B2=E4=BD=9C=E4=B8=BA?= =?UTF-8?q?=E8=8A=82=E7=82=B9id=E6=97=B6setChecked=E5=87=BA=E7=8E=B0?= =?UTF-8?q?=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/tree.js | 144 ++++++++++++++++++++++---------------------- 1 file changed, 72 insertions(+), 72 deletions(-) diff --git a/src/modules/tree.js b/src/modules/tree.js index 7f03e53a..731050e3 100644 --- a/src/modules/tree.js +++ b/src/modules/tree.js @@ -4,11 +4,11 @@ layui.define('form', function(exports){ "use strict"; - + var $ = layui.$ ,form = layui.form ,layer = layui.layer - + //模块名 ,MOD_NAME = 'tree' @@ -23,7 +23,7 @@ layui.define('form', function(exports){ that.config = $.extend({}, that.config, options); return that; } - + //事件 ,on: function(events, callback){ return layui.onevent.call(this, MOD_NAME, events, callback); @@ -35,10 +35,10 @@ layui.define('form', function(exports){ var that = this ,options = that.config ,id = options.id || that.index; - + thisModule.that[id] = that; //记录当前实例对象 thisModule.config[id] = options; //记录当前实例配置项 - + return { config: options //重置实例 @@ -53,7 +53,7 @@ layui.define('form', function(exports){ } } } - + //获取当前实例配置项 ,getThisModuleConfig = function(id){ var config = thisModule.config[id]; @@ -63,11 +63,11 @@ layui.define('form', function(exports){ //字符常量 ,SHOW = 'layui-show', HIDE = 'layui-hide', NONE = 'layui-none', DISABLED = 'layui-disabled' - + ,ELEM_VIEW = 'layui-tree', ELEM_SET = 'layui-tree-set', ICON_CLICK = 'layui-tree-iconClick' ,ICON_ADD = 'layui-icon-addition', ICON_SUB = 'layui-icon-subtraction', ELEM_ENTRY = 'layui-tree-entry', ELEM_MAIN = 'layui-tree-main', ELEM_TEXT = 'layui-tree-txt', ELEM_PACK = 'layui-tree-pack', ELEM_SPREAD = 'layui-tree-spread' ,ELEM_LINE_SHORT = 'layui-tree-setLineShort', ELEM_SHOW = 'layui-tree-showLine', ELEM_EXTEND = 'layui-tree-lineExtend' - + //构造器 ,Class = function(options){ var that = this; @@ -79,28 +79,28 @@ layui.define('form', function(exports){ //默认配置 Class.prototype.config = { data: [] //数据 - + ,showCheckbox: false //是否显示复选框 ,showLine: true //是否开启连接线 ,accordion: false //是否开启手风琴模式 ,onlyIconControl: false //是否仅允许节点左侧图标控制展开收缩 ,isJump: false //是否允许点击节点时弹出新窗口跳转 ,edit: false //是否开启节点的操作图标 - + ,text: { defaultNodeName: '未命名' //节点默认名称 ,none: '无数据' //数据为空时的文本提示 } }; - + //重载实例 Class.prototype.reload = function(options){ var that = this; - + layui.each(options, function(key, item){ if(layui.type(item) === 'array') delete that.config[key]; }); - + that.config = $.extend(true, {}, that.config, options); that.render(); }; @@ -109,7 +109,7 @@ layui.define('form', function(exports){ Class.prototype.render = function(){ var that = this ,options = that.config; - + that.checkids = []; var temp = $('
'); @@ -120,7 +120,7 @@ layui.define('form', function(exports){ //索引 that.key = options.id || that.index; - + //插入组件结构 that.elem = temp; that.elemNone = $('
'+ options.text.none +'
'); @@ -129,7 +129,7 @@ layui.define('form', function(exports){ if(that.elem.find('.layui-tree-set').length == 0){ return that.elem.append(that.elemNone); }; - + //复选框渲染 if(options.showCheckbox){ that.renderForm('checkbox'); @@ -146,7 +146,7 @@ layui.define('form', function(exports){ if(!othis.next()[0] && othis.parents('.layui-tree-pack').eq(1).hasClass('layui-tree-lineExtend')){ othis.addClass(ELEM_LINE_SHORT); }; - + //没有下一个节点 外层最后一个 if(!othis.next()[0] && !othis.parents('.layui-tree-set').eq(0).next()[0]){ othis.addClass(ELEM_LINE_SHORT); @@ -155,7 +155,7 @@ layui.define('form', function(exports){ that.events(); }; - + //渲染表单 Class.prototype.renderForm = function(type){ form.render(type, 'LAY-tree-'+ this.index); @@ -186,12 +186,12 @@ layui.define('form', function(exports){ return ''; }; }() - + //复选框 ,function(){ return options.showCheckbox ? '' : ''; }() - + //节点 ,function(){ if(options.isJump && item.href){ @@ -201,21 +201,21 @@ layui.define('form', function(exports){ } }() ,'
' - + //节点操作图标 ,function(){ if(!options.edit) return ''; - + var editIcon = { add: '' ,update: '' ,del: '' }, arr = ['
']; - + if(options.edit === true){ options.edit = ['update', 'del'] } - + if(typeof options.edit === 'object'){ layui.each(options.edit, function(i, val){ arr.push(editIcon[val] || '') @@ -232,12 +232,12 @@ layui.define('form', function(exports){ }; elem.append(entryDiv); - + //若有前置节点,前置节点加连接线 if(entryDiv.prev('.'+ELEM_SET)[0]){ entryDiv.prev().children('.layui-tree-pack').addClass('layui-tree-showLine'); }; - + //若无子节点,则父节点加延伸线 if(!hasChild){ entryDiv.parent('.layui-tree-pack').addClass('layui-tree-lineExtend'); @@ -245,16 +245,16 @@ layui.define('form', function(exports){ //展开节点操作 that.spread(entryDiv, item); - + //选择框 if(options.showCheckbox){ item.checked && that.checkids.push(item.id); that.checkClick(entryDiv, item); } - + //操作节点 options.edit && that.operate(entryDiv, item); - + }); }; @@ -268,7 +268,7 @@ layui.define('form', function(exports){ ,elemText = entry.find('.'+ ELEM_TEXT) ,touchOpen = options.onlyIconControl ? elemIcon : elemMain //判断展开通过节点还是箭头图标 ,state = ''; - + //展开收缩 touchOpen.on('click', function(e){ var packCont = elem.children('.'+ELEM_PACK) @@ -281,7 +281,7 @@ layui.define('form', function(exports){ if(elem.hasClass(ELEM_SPREAD)){ elem.removeClass(ELEM_SPREAD); packCont.slideUp(200); - iconClick.removeClass(ICON_SUB).addClass(ICON_ADD); + iconClick.removeClass(ICON_SUB).addClass(ICON_ADD); }else{ elem.addClass(ELEM_SPREAD); packCont.slideDown(200); @@ -297,21 +297,21 @@ layui.define('form', function(exports){ }; }; }); - + //点击回调 elemText.on('click', function(){ var othis = $(this); - + //判断是否禁用状态 if(othis.hasClass(DISABLED)) return; - + //判断展开收缩状态 if(elem.hasClass(ELEM_SPREAD)){ state = options.onlyIconControl ? 'open' : 'close'; } else { state = options.onlyIconControl ? 'close' : 'open'; } - + //点击产生的回调 options.click && options.click({ elem: elem @@ -320,13 +320,13 @@ layui.define('form', function(exports){ }); }); }; - + //计算复选框选中状态 Class.prototype.setCheckbox = function(elem, item, elemCheckbox){ var that = this ,options = that.config ,checked = elemCheckbox.prop('checked'); - + if(elemCheckbox.prop('disabled')) return; //同步子节点选中状态 @@ -357,38 +357,38 @@ layui.define('form', function(exports){ state = true; } }); - + //如果兄弟子孙节点全部未选中,则父节点也应为非选中状态 state || parentCheckbox.prop('checked', false); } - + //向父节点递归 setParentsChecked(parentNodeElem); }; - + setParentsChecked(elem); that.renderForm('checkbox'); }; - + //复选框选择 Class.prototype.checkClick = function(elem, item){ var that = this ,options = that.config ,entry = elem.children('.'+ ELEM_ENTRY) ,elemMain = entry.children('.'+ ELEM_MAIN); - - - + + + //点击复选框 elemMain.on('click', 'input[same="layuiTreeCheck"]+', function(e){ layui.stope(e); //阻止点击节点事件 var elemCheckbox = $(this).prev() ,checked = elemCheckbox.prop('checked'); - + if(elemCheckbox.prop('disabled')) return; - + that.setCheckbox(elem, item, elemCheckbox); //复选框点击产生的回调 @@ -439,7 +439,7 @@ layui.define('form', function(exports){ obj.title = options.text.defaultNodeName; obj.id = key; that.tree(elem.children('.'+ELEM_PACK), [obj]); - + //放在新增后面,因为要对元素进行操作 if(options.showLine){ //节点本身无子节点 @@ -495,7 +495,7 @@ layui.define('form', function(exports){ packLast.find('input[same="layuiTreeCheck"]')[0].checked = true; }; that.renderForm('checkbox'); - + //修改 }else if(type == 'update'){ var text = elemMain.children('.'+ ELEM_TEXT).html(); @@ -510,10 +510,10 @@ layui.define('form', function(exports){ textNew = textNew ? textNew : options.text.defaultNodeName; input.remove(); elemMain.children('.'+ ELEM_TEXT).html(textNew); - + //同步数据 returnObj.data.title = textNew; - + //节点修改的回调 options.operate && options.operate(returnObj); }; @@ -534,9 +534,9 @@ layui.define('form', function(exports){ layer.confirm('确认删除该节点 "'+ (item.title || '') +'" 吗?', function(index){ options.operate && options.operate(returnObj); //节点删除的回调 returnObj.status = 'remove'; //标注节点删除 - + layer.close(index); - + //若删除最后一个,显示空数据提示 if(!elem.prev('.'+ELEM_SET)[0] && !elem.next('.'+ELEM_SET)[0] && !elem.parent('.'+ELEM_PACK)[0]){ elem.remove(); @@ -616,7 +616,7 @@ layui.define('form', function(exports){ }; }; }; - + }else{ //若无兄弟节点 var prevDiv = elem.parent('.'+ELEM_PACK).prev(); @@ -644,7 +644,7 @@ layui.define('form', function(exports){ elem.remove(); }); - + }; }); }; @@ -654,10 +654,10 @@ layui.define('form', function(exports){ var that = this ,options = that.config ,checkWarp = that.elem.find('.layui-tree-checkedFirst'); - + //初始选中 that.setChecked(that.checkids); - + //搜索 that.elem.find('.layui-tree-search').on('keyup', function(){ var input = $(this) @@ -671,7 +671,7 @@ layui.define('form', function(exports){ //若值匹配,加一个类以作标识 if($(this).html().indexOf(val) != -1){ arr.push($(this).parent()); - + var select = function(div){ div.addClass('layui-tree-searchShow'); //向上父节点渲染 @@ -716,12 +716,12 @@ layui.define('form', function(exports){ ,options = that.config ,checkId = [] ,checkData = []; - + //遍历节点找到选中索引 that.elem.find('.layui-form-checked').each(function(){ checkId.push($(this).prev()[0].value); }); - + //遍历节点 var eachNodes = function(data, checkNode){ layui.each(data, function(index, item){ @@ -729,9 +729,9 @@ layui.define('form', function(exports){ if(item.id == item2){ var cloneItem = $.extend({}, item); delete cloneItem.children; - + checkNode.push(cloneItem); - + if(item.children){ cloneItem.children = []; eachNodes(item.children, cloneItem.children); @@ -743,7 +743,7 @@ layui.define('form', function(exports){ }; eachNodes($.extend({}, options.data), checkData); - + return checkData; }; @@ -757,20 +757,20 @@ layui.define('form', function(exports){ var thisId = $(this).data('id') ,input = $(item).children('.'+ELEM_ENTRY).find('input[same="layuiTreeCheck"]') ,reInput = input.next(); - + //若返回数字 if(typeof checkedId === 'number'){ - if(thisId == checkedId){ + if(thisId.toString() == checkedId.toString()){ if(!input[0].checked){ reInput.click(); }; return false; }; - } + } //若返回数组 else if(typeof checkedId === 'object'){ layui.each(checkedId, function(index, value){ - if(value == thisId && !input[0].checked){ + if(value.toString() == thisId.toString() && !input[0].checked){ reInput.click(); return true; } @@ -782,27 +782,27 @@ layui.define('form', function(exports){ //记录所有实例 thisModule.that = {}; //记录所有实例对象 thisModule.config = {}; //记录所有实例配置项 - + //重载实例 tree.reload = function(id, options){ var that = thisModule.that[id]; that.reload(options); - + return thisModule.call(that); }; - + //获得选中的节点数据 tree.getChecked = function(id){ var that = thisModule.that[id]; return that.getChecked(); }; - + //设置选中节点 tree.setChecked = function(id, checkedId){ var that = thisModule.that[id]; return that.setChecked(checkedId); }; - + //核心入口 tree.render = function(options){ var inst = new Class(options); @@ -810,4 +810,4 @@ layui.define('form', function(exports){ }; exports(MOD_NAME, tree); -}) \ No newline at end of file +}) From 018c2069a7ea6333e1f68e3d65e66d2413d94834 Mon Sep 17 00:00:00 2001 From: ZZZping <475377765@qq.com> Date: Tue, 16 Aug 2022 15:10:17 +0800 Subject: [PATCH 05/15] =?UTF-8?q?=E6=B7=BB=E5=8A=A0pr=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/pull_request_template.md | 54 ++++++++++++++++++++++++++++++-- 1 file changed, 51 insertions(+), 3 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 60abdbc5..c546389e 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -10,7 +10,55 @@ ### 🌱 本次 PR 的变化内容 -- 在此处尽可能列出本次 PR 的每一项改动的内容 +- 在树形组件中的**setChecked**方法中,当节点id为长数字字符串时, +设置已选择节点的复选框时,在判断节点id时添加字符串转换 +````javascript + //line 763 + thisId.toString() == checkedId.toString() + //lin 773 + value.toString() == thisId.toString() && !input[0].checked +```` +- 如果缺少类型转换的话,在使用长数字字符串作为节点id时,如果选择了某个节点,在第二次 +渲染树时,会将一些未选择的节点的checkbox渲染为已选择;以下数据中,如果第一次选择了域名 +节点但是没有选择概览节点,在不加类型转换时会将概览节点渲染为已选择状态。 +````javascript +var data2 = [ + { + title: '控制台' + , id: '113715891127976666' + , spread: true + , checked: false + , children: [ + { + title: '概览' + , id: '113715891127976000' + , spread: true + , checked: false, + }, { + title: '域名' + , id: '113715891127976001' + , spread: true + , checked: false, + }, { + title: '域名1' + , id: '113715891127976002' + , spread: true + , checked: true, + }, + ], + }]; + + tree.render({ + elem: '#test1' + , data: data2 + , id: 'demoId2' + , showCheckbox: true //是否显示复选框 + , accordion: 0 //是否开启手风琴模式 + , onlyIconControl: true //是否仅允许节点左侧图标控制展开收缩 + , isJump: 0 //点击文案跳转地址 + , edit: true, //操作节点图标 + }); +```` ### ✅ 本次 PR 的满足条件 @@ -18,6 +66,6 @@ > 请在申请合并之前,将符合条件的每一项进行勾选(即 [ ] 内填写 x ) - [ ] 已提供在线演示地址(如:[codepen](https://codepen.io/))或无需演示 -- [ ] 已对每一项的改动均测试通过 -- [ ] 已提供具体的变化内容说明 +- [x] 已对每一项的改动均测试通过 +- [x] 已提供具体的变化内容说明 From e8819bfdc14ac050842af53f26c1cbd19f75f1de Mon Sep 17 00:00:00 2001 From: ZZZping <475377765@qq.com> Date: Tue, 16 Aug 2022 15:15:02 +0800 Subject: [PATCH 06/15] =?UTF-8?q?Revert=20"=E6=B7=BB=E5=8A=A0pr=E8=AF=B4?= =?UTF-8?q?=E6=98=8E"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 018c2069a7ea6333e1f68e3d65e66d2413d94834. --- .github/pull_request_template.md | 54 ++------------------------------ 1 file changed, 3 insertions(+), 51 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index c546389e..60abdbc5 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -10,55 +10,7 @@ ### 🌱 本次 PR 的变化内容 -- 在树形组件中的**setChecked**方法中,当节点id为长数字字符串时, -设置已选择节点的复选框时,在判断节点id时添加字符串转换 -````javascript - //line 763 - thisId.toString() == checkedId.toString() - //lin 773 - value.toString() == thisId.toString() && !input[0].checked -```` -- 如果缺少类型转换的话,在使用长数字字符串作为节点id时,如果选择了某个节点,在第二次 -渲染树时,会将一些未选择的节点的checkbox渲染为已选择;以下数据中,如果第一次选择了域名 -节点但是没有选择概览节点,在不加类型转换时会将概览节点渲染为已选择状态。 -````javascript -var data2 = [ - { - title: '控制台' - , id: '113715891127976666' - , spread: true - , checked: false - , children: [ - { - title: '概览' - , id: '113715891127976000' - , spread: true - , checked: false, - }, { - title: '域名' - , id: '113715891127976001' - , spread: true - , checked: false, - }, { - title: '域名1' - , id: '113715891127976002' - , spread: true - , checked: true, - }, - ], - }]; - - tree.render({ - elem: '#test1' - , data: data2 - , id: 'demoId2' - , showCheckbox: true //是否显示复选框 - , accordion: 0 //是否开启手风琴模式 - , onlyIconControl: true //是否仅允许节点左侧图标控制展开收缩 - , isJump: 0 //点击文案跳转地址 - , edit: true, //操作节点图标 - }); -```` +- 在此处尽可能列出本次 PR 的每一项改动的内容 ### ✅ 本次 PR 的满足条件 @@ -66,6 +18,6 @@ var data2 = [ > 请在申请合并之前,将符合条件的每一项进行勾选(即 [ ] 内填写 x ) - [ ] 已提供在线演示地址(如:[codepen](https://codepen.io/))或无需演示 -- [x] 已对每一项的改动均测试通过 -- [x] 已提供具体的变化内容说明 +- [ ] 已对每一项的改动均测试通过 +- [ ] 已提供具体的变化内容说明 From 3acb7786d6966db5d7e149b565ed87e65b6278a4 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, 17 Aug 2022 14:35:34 +0800 Subject: [PATCH 07/15] =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=9D=97=E7=9A=84=E5=B0=BA=E5=AF=B8=EF=BC=88?= =?UTF-8?q?lg/md/sm/xs=EF=BC=89=EF=BC=8C=E4=BB=A5=E6=9B=B4=E5=A5=BD?= =?UTF-8?q?=E5=9C=B0=E5=BA=94=E7=94=A8=E4=BA=8E=E5=85=B6=E4=BB=96=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E5=86=85=EF=BC=88=E5=A6=82=20table=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/css/layui.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/css/layui.css b/src/css/layui.css index e6b31ab6..e83ed058 100644 --- a/src/css/layui.css +++ b/src/css/layui.css @@ -1307,11 +1307,11 @@ body .layui-util-face .layui-layer-content{padding:0; background-color:#fff; co .layui-rate[readonly] li i:hover{cursor: default; transform: scale(1);} /** 颜色选择器 **/ -.layui-colorpicker{width: 26px; height: 26px; border: 1px solid #eee; padding: 5px; border-radius: 2px; line-height: 24px; display: inline-block; cursor: pointer; transition: all .3s; -webkit-transition: all .3s;} +.layui-colorpicker{width: 38px; height: 38px; border: 1px solid #eee; padding: 5px; border-radius: 2px; line-height: 24px; display: inline-block; cursor: pointer; transition: all .3s; -webkit-transition: all .3s; box-sizing: border-box;} .layui-colorpicker:hover{border-color: #d2d2d2;} -.layui-colorpicker.layui-colorpicker-lg{width: 34px; height: 34px; line-height: 32px;} -.layui-colorpicker.layui-colorpicker-sm{width: 24px; height: 24px; line-height: 22px;} -.layui-colorpicker.layui-colorpicker-xs{width: 22px; height: 22px; line-height: 20px;} +.layui-colorpicker.layui-colorpicker-lg{width: 44px; height: 44px; line-height: 30px;} +.layui-colorpicker.layui-colorpicker-sm{width: 30px; height: 30px; line-height: 20px; padding: 3px;} +.layui-colorpicker.layui-colorpicker-xs{width: 22px; height: 22px; line-height: 16px; padding: 1px;} .layui-colorpicker-trigger-bgcolor{display: block; background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAwAAAAMCAIAAADZF8uwAAAAGUlEQVQYV2M4gwH+YwCGIasIUwhT25BVBADtzYNYrHvv4gAAAABJRU5ErkJggg==); border-radius: 2px;} .layui-colorpicker-trigger-span{display: block; height: 100%; box-sizing: border-box; border: 1px solid rgba(0,0,0,.15); border-radius: 2px; text-align: center;} From 7bc2f8f84f1455f93b138a2b6bff12fac6ff0cb0 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, 17 Aug 2022 14:36:25 +0800 Subject: [PATCH 08/15] =?UTF-8?q?=E4=BC=98=E5=8C=96=20table=20=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E7=BB=86=E8=8A=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/table.js | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/src/modules/table.js b/src/modules/table.js index 25cd0f60..c25fd4bb 100644 --- a/src/modules/table.js +++ b/src/modules/table.js @@ -1013,9 +1013,9 @@ layui.define(['laytpl', 'laypage', 'form', 'util'], function(exports){ //遍历表头 that.eachCols(function(i3, item3){ - var field = item3.field || i3 - ,key = options.index + '-' + item3.key - ,content = item1[field]; + var field = item3.field || i3; + var key = options.index + '-' + item3.key; + var content = item1[field]; if(content === undefined || content === null) content = ''; if(item3.colGroup) return; @@ -1023,6 +1023,7 @@ layui.define(['laytpl', 'laypage', 'form', 'util'], function(exports){ // td 内容 var td = [' Date: Thu, 18 Aug 2022 13:03:29 +0800 Subject: [PATCH 09/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9C=A8=E6=A0=91?= =?UTF-8?q?=E5=BD=A2=E7=BB=84=E4=BB=B6=E4=B8=AD=E4=BD=BF=E7=94=A8=E9=95=BF?= =?UTF-8?q?=E6=95=B0=E5=AD=97=E5=AD=97=E7=AC=A6=E4=B8=B2=E4=BD=9C=E4=B8=BA?= =?UTF-8?q?=E8=8A=82=E7=82=B9id=E6=97=B6=E8=8A=82=E7=82=B9=E6=B8=B2?= =?UTF-8?q?=E6=9F=93=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/tree.js | 140 ++++++++++++++++++++++---------------------- 1 file changed, 70 insertions(+), 70 deletions(-) diff --git a/src/modules/tree.js b/src/modules/tree.js index 731050e3..634a8c4e 100644 --- a/src/modules/tree.js +++ b/src/modules/tree.js @@ -4,11 +4,11 @@ layui.define('form', function(exports){ "use strict"; - + var $ = layui.$ ,form = layui.form ,layer = layui.layer - + //模块名 ,MOD_NAME = 'tree' @@ -23,7 +23,7 @@ layui.define('form', function(exports){ that.config = $.extend({}, that.config, options); return that; } - + //事件 ,on: function(events, callback){ return layui.onevent.call(this, MOD_NAME, events, callback); @@ -35,10 +35,10 @@ layui.define('form', function(exports){ var that = this ,options = that.config ,id = options.id || that.index; - + thisModule.that[id] = that; //记录当前实例对象 thisModule.config[id] = options; //记录当前实例配置项 - + return { config: options //重置实例 @@ -53,7 +53,7 @@ layui.define('form', function(exports){ } } } - + //获取当前实例配置项 ,getThisModuleConfig = function(id){ var config = thisModule.config[id]; @@ -63,11 +63,11 @@ layui.define('form', function(exports){ //字符常量 ,SHOW = 'layui-show', HIDE = 'layui-hide', NONE = 'layui-none', DISABLED = 'layui-disabled' - + ,ELEM_VIEW = 'layui-tree', ELEM_SET = 'layui-tree-set', ICON_CLICK = 'layui-tree-iconClick' ,ICON_ADD = 'layui-icon-addition', ICON_SUB = 'layui-icon-subtraction', ELEM_ENTRY = 'layui-tree-entry', ELEM_MAIN = 'layui-tree-main', ELEM_TEXT = 'layui-tree-txt', ELEM_PACK = 'layui-tree-pack', ELEM_SPREAD = 'layui-tree-spread' ,ELEM_LINE_SHORT = 'layui-tree-setLineShort', ELEM_SHOW = 'layui-tree-showLine', ELEM_EXTEND = 'layui-tree-lineExtend' - + //构造器 ,Class = function(options){ var that = this; @@ -79,28 +79,28 @@ layui.define('form', function(exports){ //默认配置 Class.prototype.config = { data: [] //数据 - + ,showCheckbox: false //是否显示复选框 ,showLine: true //是否开启连接线 ,accordion: false //是否开启手风琴模式 ,onlyIconControl: false //是否仅允许节点左侧图标控制展开收缩 ,isJump: false //是否允许点击节点时弹出新窗口跳转 ,edit: false //是否开启节点的操作图标 - + ,text: { defaultNodeName: '未命名' //节点默认名称 ,none: '无数据' //数据为空时的文本提示 } }; - + //重载实例 Class.prototype.reload = function(options){ var that = this; - + layui.each(options, function(key, item){ if(layui.type(item) === 'array') delete that.config[key]; }); - + that.config = $.extend(true, {}, that.config, options); that.render(); }; @@ -109,7 +109,7 @@ layui.define('form', function(exports){ Class.prototype.render = function(){ var that = this ,options = that.config; - + that.checkids = []; var temp = $('
'); @@ -120,7 +120,7 @@ layui.define('form', function(exports){ //索引 that.key = options.id || that.index; - + //插入组件结构 that.elem = temp; that.elemNone = $('
'+ options.text.none +'
'); @@ -129,7 +129,7 @@ layui.define('form', function(exports){ if(that.elem.find('.layui-tree-set').length == 0){ return that.elem.append(that.elemNone); }; - + //复选框渲染 if(options.showCheckbox){ that.renderForm('checkbox'); @@ -146,7 +146,7 @@ layui.define('form', function(exports){ if(!othis.next()[0] && othis.parents('.layui-tree-pack').eq(1).hasClass('layui-tree-lineExtend')){ othis.addClass(ELEM_LINE_SHORT); }; - + //没有下一个节点 外层最后一个 if(!othis.next()[0] && !othis.parents('.layui-tree-set').eq(0).next()[0]){ othis.addClass(ELEM_LINE_SHORT); @@ -155,7 +155,7 @@ layui.define('form', function(exports){ that.events(); }; - + //渲染表单 Class.prototype.renderForm = function(type){ form.render(type, 'LAY-tree-'+ this.index); @@ -186,12 +186,12 @@ layui.define('form', function(exports){ return ''; }; }() - + //复选框 ,function(){ return options.showCheckbox ? '' : ''; }() - + //节点 ,function(){ if(options.isJump && item.href){ @@ -201,21 +201,21 @@ layui.define('form', function(exports){ } }() ,'
' - + //节点操作图标 ,function(){ if(!options.edit) return ''; - + var editIcon = { add: '' ,update: '' ,del: '' }, arr = ['
']; - + if(options.edit === true){ options.edit = ['update', 'del'] } - + if(typeof options.edit === 'object'){ layui.each(options.edit, function(i, val){ arr.push(editIcon[val] || '') @@ -232,12 +232,12 @@ layui.define('form', function(exports){ }; elem.append(entryDiv); - + //若有前置节点,前置节点加连接线 if(entryDiv.prev('.'+ELEM_SET)[0]){ entryDiv.prev().children('.layui-tree-pack').addClass('layui-tree-showLine'); }; - + //若无子节点,则父节点加延伸线 if(!hasChild){ entryDiv.parent('.layui-tree-pack').addClass('layui-tree-lineExtend'); @@ -245,16 +245,16 @@ layui.define('form', function(exports){ //展开节点操作 that.spread(entryDiv, item); - + //选择框 if(options.showCheckbox){ item.checked && that.checkids.push(item.id); that.checkClick(entryDiv, item); } - + //操作节点 options.edit && that.operate(entryDiv, item); - + }); }; @@ -268,7 +268,7 @@ layui.define('form', function(exports){ ,elemText = entry.find('.'+ ELEM_TEXT) ,touchOpen = options.onlyIconControl ? elemIcon : elemMain //判断展开通过节点还是箭头图标 ,state = ''; - + //展开收缩 touchOpen.on('click', function(e){ var packCont = elem.children('.'+ELEM_PACK) @@ -281,7 +281,7 @@ layui.define('form', function(exports){ if(elem.hasClass(ELEM_SPREAD)){ elem.removeClass(ELEM_SPREAD); packCont.slideUp(200); - iconClick.removeClass(ICON_SUB).addClass(ICON_ADD); + iconClick.removeClass(ICON_SUB).addClass(ICON_ADD); }else{ elem.addClass(ELEM_SPREAD); packCont.slideDown(200); @@ -297,21 +297,21 @@ layui.define('form', function(exports){ }; }; }); - + //点击回调 elemText.on('click', function(){ var othis = $(this); - + //判断是否禁用状态 if(othis.hasClass(DISABLED)) return; - + //判断展开收缩状态 if(elem.hasClass(ELEM_SPREAD)){ state = options.onlyIconControl ? 'open' : 'close'; } else { state = options.onlyIconControl ? 'close' : 'open'; } - + //点击产生的回调 options.click && options.click({ elem: elem @@ -320,13 +320,13 @@ layui.define('form', function(exports){ }); }); }; - + //计算复选框选中状态 Class.prototype.setCheckbox = function(elem, item, elemCheckbox){ var that = this ,options = that.config ,checked = elemCheckbox.prop('checked'); - + if(elemCheckbox.prop('disabled')) return; //同步子节点选中状态 @@ -357,38 +357,38 @@ layui.define('form', function(exports){ state = true; } }); - + //如果兄弟子孙节点全部未选中,则父节点也应为非选中状态 state || parentCheckbox.prop('checked', false); } - + //向父节点递归 setParentsChecked(parentNodeElem); }; - + setParentsChecked(elem); that.renderForm('checkbox'); }; - + //复选框选择 Class.prototype.checkClick = function(elem, item){ var that = this ,options = that.config ,entry = elem.children('.'+ ELEM_ENTRY) ,elemMain = entry.children('.'+ ELEM_MAIN); - - - + + + //点击复选框 elemMain.on('click', 'input[same="layuiTreeCheck"]+', function(e){ layui.stope(e); //阻止点击节点事件 var elemCheckbox = $(this).prev() ,checked = elemCheckbox.prop('checked'); - + if(elemCheckbox.prop('disabled')) return; - + that.setCheckbox(elem, item, elemCheckbox); //复选框点击产生的回调 @@ -439,7 +439,7 @@ layui.define('form', function(exports){ obj.title = options.text.defaultNodeName; obj.id = key; that.tree(elem.children('.'+ELEM_PACK), [obj]); - + //放在新增后面,因为要对元素进行操作 if(options.showLine){ //节点本身无子节点 @@ -495,7 +495,7 @@ layui.define('form', function(exports){ packLast.find('input[same="layuiTreeCheck"]')[0].checked = true; }; that.renderForm('checkbox'); - + //修改 }else if(type == 'update'){ var text = elemMain.children('.'+ ELEM_TEXT).html(); @@ -510,10 +510,10 @@ layui.define('form', function(exports){ textNew = textNew ? textNew : options.text.defaultNodeName; input.remove(); elemMain.children('.'+ ELEM_TEXT).html(textNew); - + //同步数据 returnObj.data.title = textNew; - + //节点修改的回调 options.operate && options.operate(returnObj); }; @@ -534,9 +534,9 @@ layui.define('form', function(exports){ layer.confirm('确认删除该节点 "'+ (item.title || '') +'" 吗?', function(index){ options.operate && options.operate(returnObj); //节点删除的回调 returnObj.status = 'remove'; //标注节点删除 - + layer.close(index); - + //若删除最后一个,显示空数据提示 if(!elem.prev('.'+ELEM_SET)[0] && !elem.next('.'+ELEM_SET)[0] && !elem.parent('.'+ELEM_PACK)[0]){ elem.remove(); @@ -616,7 +616,7 @@ layui.define('form', function(exports){ }; }; }; - + }else{ //若无兄弟节点 var prevDiv = elem.parent('.'+ELEM_PACK).prev(); @@ -644,7 +644,7 @@ layui.define('form', function(exports){ elem.remove(); }); - + }; }); }; @@ -654,10 +654,10 @@ layui.define('form', function(exports){ var that = this ,options = that.config ,checkWarp = that.elem.find('.layui-tree-checkedFirst'); - + //初始选中 that.setChecked(that.checkids); - + //搜索 that.elem.find('.layui-tree-search').on('keyup', function(){ var input = $(this) @@ -671,7 +671,7 @@ layui.define('form', function(exports){ //若值匹配,加一个类以作标识 if($(this).html().indexOf(val) != -1){ arr.push($(this).parent()); - + var select = function(div){ div.addClass('layui-tree-searchShow'); //向上父节点渲染 @@ -716,12 +716,12 @@ layui.define('form', function(exports){ ,options = that.config ,checkId = [] ,checkData = []; - + //遍历节点找到选中索引 that.elem.find('.layui-form-checked').each(function(){ checkId.push($(this).prev()[0].value); }); - + //遍历节点 var eachNodes = function(data, checkNode){ layui.each(data, function(index, item){ @@ -729,9 +729,9 @@ layui.define('form', function(exports){ if(item.id == item2){ var cloneItem = $.extend({}, item); delete cloneItem.children; - + checkNode.push(cloneItem); - + if(item.children){ cloneItem.children = []; eachNodes(item.children, cloneItem.children); @@ -743,7 +743,7 @@ layui.define('form', function(exports){ }; eachNodes($.extend({}, options.data), checkData); - + return checkData; }; @@ -757,7 +757,7 @@ layui.define('form', function(exports){ var thisId = $(this).data('id') ,input = $(item).children('.'+ELEM_ENTRY).find('input[same="layuiTreeCheck"]') ,reInput = input.next(); - + //若返回数字 if(typeof checkedId === 'number'){ if(thisId.toString() == checkedId.toString()){ @@ -766,7 +766,7 @@ layui.define('form', function(exports){ }; return false; }; - } + } //若返回数组 else if(typeof checkedId === 'object'){ layui.each(checkedId, function(index, value){ @@ -782,27 +782,27 @@ layui.define('form', function(exports){ //记录所有实例 thisModule.that = {}; //记录所有实例对象 thisModule.config = {}; //记录所有实例配置项 - + //重载实例 tree.reload = function(id, options){ var that = thisModule.that[id]; that.reload(options); - + return thisModule.call(that); }; - + //获得选中的节点数据 tree.getChecked = function(id){ var that = thisModule.that[id]; return that.getChecked(); }; - + //设置选中节点 tree.setChecked = function(id, checkedId){ var that = thisModule.that[id]; return that.setChecked(checkedId); }; - + //核心入口 tree.render = function(options){ var inst = new Class(options); @@ -810,4 +810,4 @@ layui.define('form', function(exports){ }; exports(MOD_NAME, tree); -}) +}) \ No newline at end of file From e2149fc8b194c6f0ca5bed3cbbb1c9613d02c60d 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, 19 Aug 2022 00:51:44 +0800 Subject: [PATCH 10/15] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20layer=20=E5=86=85?= =?UTF-8?q?=E9=83=A8=20resize=20=E6=96=B9=E6=B3=95=E7=9A=84=E4=B8=80?= =?UTF-8?q?=E5=A4=84=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/layer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/layer.js b/src/modules/layer.js index 95619737..af7458a4 100644 --- a/src/modules/layer.js +++ b/src/modules/layer.js @@ -481,7 +481,7 @@ Class.pt.resize = function(){ var config = that.config; that.offset(); - (/^\d+%$/.test(config.area[0]) || /^\d+%$/.test(config.area[1])) && that.auto(times); + (/^\d+%$/.test(config.area[0]) || /^\d+%$/.test(config.area[1])) && that.auto(that.index); config.type == 4 && that.tips(); }; From be325adb20417383b3197e8ad672492e0a3e83f6 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, 19 Aug 2022 00:52:12 +0800 Subject: [PATCH 11/15] =?UTF-8?q?=E4=BC=98=E5=8C=96=20layer=20loading=20?= =?UTF-8?q?=E9=A3=8E=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/css/modules/layer.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/css/modules/layer.css b/src/css/modules/layer.css index bb541ea2..27675b3d 100644 --- a/src/css/modules/layer.css +++ b/src/css/modules/layer.css @@ -99,7 +99,7 @@ html #layuicss-layer{display: none; position: absolute; width: 1989px;} .layui-layer-loading-2{position: relative; height: 38px;} .layui-layer-loading-2:before, .layui-layer-loading-2:after{content: ''; position: absolute; left: 50%; top: 50%; width: 38px; height: 38px; margin: -19px 0 0 -19px; border-radius: 50%; border: 3px solid #d2d2d2; box-sizing: border-box;} -.layui-layer-loading-2:after{border-color: transparent; border-left-color: #1E9FFF; border-right-color: #1E9FFF;} +.layui-layer-loading-2:after{border-color: transparent; border-left-color: #1E9FFF;} .layui-layer-tips{background: none; box-shadow:none; border:none;} From 3e349823fed4c844ac46b57e351ff937136b06a9 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, 19 Aug 2022 00:53:00 +0800 Subject: [PATCH 12/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20table=20=E4=B8=80?= =?UTF-8?q?=E5=A4=84=E5=8F=98=E9=87=8F=E5=A3=B0=E6=98=8E=EF=BC=8C=E4=BB=A5?= =?UTF-8?q?=E5=85=BC=E5=AE=B9=20ie?= 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 0fabc1bb..9be8c024 100644 --- a/src/modules/table.js +++ b/src/modules/table.js @@ -794,7 +794,7 @@ layui.define(['laytpl', 'laypage', 'form', 'util'], function(exports){ // 如果表格内容为空(无数据 或 请求异常) if (that.layMain.find('tbody').is(":empty")) { // 将表格宽度设置为跟表头一样的宽度,使之可以出现底部滚动条,以便滚动查看所有字段 - const headerWidth = that.layHeader.first().children('table').width() + var headerWidth = that.layHeader.first().children('table').width() that.layMain.find('table').width(headerWidth); } From 1df1498491862aacb577e95565b676000ae895b0 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, 19 Aug 2022 01:58:30 +0800 Subject: [PATCH 13/15] =?UTF-8?q?=E8=B0=83=E6=95=B4=20layer/laydate=20?= =?UTF-8?q?=E4=BE=9D=E8=B5=96=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/css/modules/laydate/default/font.css | 16 -- src/css/modules/laydate/default/laydate.css | 156 ----------------- src/css/modules/layer/default/icon-ext.png | Bin 5911 -> 0 bytes src/css/modules/layer/default/icon.png | Bin 11493 -> 0 bytes src/css/modules/layer/default/layer.css | 180 -------------------- src/css/modules/layer/default/loading-0.gif | Bin 5793 -> 0 bytes src/css/modules/layer/default/loading-1.gif | Bin 701 -> 0 bytes src/css/modules/layer/default/loading-2.gif | Bin 1787 -> 0 bytes 8 files changed, 352 deletions(-) delete mode 100644 src/css/modules/laydate/default/font.css delete mode 100644 src/css/modules/laydate/default/laydate.css delete mode 100644 src/css/modules/layer/default/icon-ext.png delete mode 100644 src/css/modules/layer/default/icon.png delete mode 100644 src/css/modules/layer/default/layer.css delete mode 100644 src/css/modules/layer/default/loading-0.gif delete mode 100644 src/css/modules/layer/default/loading-1.gif delete mode 100644 src/css/modules/layer/default/loading-2.gif diff --git a/src/css/modules/laydate/default/font.css b/src/css/modules/laydate/default/font.css deleted file mode 100644 index f429656e..00000000 --- a/src/css/modules/laydate/default/font.css +++ /dev/null @@ -1,16 +0,0 @@ -/** 图标字体 **/ -@font-face {font-family: 'laydate-icon'; - src: url('./font/iconfont.eot'); - src: url('./font/iconfont.eot#iefix') format('embedded-opentype'), - url('./font/iconfont.svg#iconfont') format('svg'), - url('./font/iconfont.woff') format('woff'), - url('./font/iconfont.ttf') format('truetype'); -} - -.laydate-icon{ - font-family:"laydate-icon" !important; - font-size: 16px; - font-style: normal; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; -} \ No newline at end of file diff --git a/src/css/modules/laydate/default/laydate.css b/src/css/modules/laydate/default/laydate.css deleted file mode 100644 index 1238c92c..00000000 --- a/src/css/modules/laydate/default/laydate.css +++ /dev/null @@ -1,156 +0,0 @@ -/** - - @Name: laydata - - **/ - - -html #layuicss-laydate{display: none; position: absolute; width: 1989px;} - -/* 初始化 */ -.layui-laydate *{margin: 0; padding: 0;} - -/* 主体结构 */ -.layui-laydate, .layui-laydate *{box-sizing: border-box;} -.layui-laydate{position: absolute; z-index: 66666666; margin: 5px 0; border-radius: 2px; font-size: 14px; -webkit-animation-duration: 0.2s; animation-duration: 0.2s; -webkit-animation-fill-mode: both; animation-fill-mode: both;} -.layui-laydate-main{width: 272px;} -.layui-laydate-header *, -.layui-laydate-content td, -.layui-laydate-list li{transition-duration: .3s; -webkit-transition-duration: .3s;} - -/* 微微往下滑入 */ -@keyframes laydate-downbit { - 0% {opacity: 0.3; transform: translate3d(0, -5px, 0);} - 100% {opacity: 1; transform: translate3d(0, 0, 0);} -} - -.layui-laydate{animation-name: laydate-downbit;} -.layui-laydate-static{ position: relative; z-index: 0; display: inline-block; margin: 0; -webkit-animation: none; animation: none;} - -/* 展开年月列表时 */ -.laydate-ym-show .laydate-prev-m, -.laydate-ym-show .laydate-next-m{display: none !important;} -.laydate-ym-show .laydate-prev-y, -.laydate-ym-show .laydate-next-y{display: inline-block !important;} -.laydate-ym-show .laydate-set-ym span[lay-type="month"]{display: none !important;} - -/* 展开时间列表时 */ -.laydate-time-show .layui-laydate-header .layui-icon, -.laydate-time-show .laydate-set-ym span[lay-type="year"], -.laydate-time-show .laydate-set-ym span[lay-type="month"]{display: none !important;} - -/* 头部结构 */ -.layui-laydate-header{position: relative; line-height:30px; padding: 10px 70px 5px;} -.layui-laydate-header *{display: inline-block; vertical-align: bottom;} -.layui-laydate-header i{position: absolute; top: 10px; padding: 0 5px; color: #999; font-size: 18px; cursor: pointer;} -.layui-laydate-header i.laydate-prev-y{left: 15px;} -.layui-laydate-header i.laydate-prev-m{left: 45px;} -.layui-laydate-header i.laydate-next-y{right: 15px;} -.layui-laydate-header i.laydate-next-m{right: 45px;} -.laydate-set-ym{width: 100%; text-align: center; box-sizing: border-box; text-overflow: ellipsis; overflow: hidden; white-space: nowrap;} -.laydate-set-ym span{padding: 0 10px; cursor: pointer;} -.laydate-time-text{cursor: default !important;} - -/* 主体结构 */ -.layui-laydate-content{position: relative; padding: 10px; -moz-user-select: none; -webkit-user-select: none; -ms-user-select: none;} -.layui-laydate-content table{border-collapse: collapse; border-spacing: 0;} -.layui-laydate-content th, -.layui-laydate-content td{width: 36px; height: 30px; padding: 5px; text-align: center;} -.layui-laydate-content th{font-weight: 400;} -.layui-laydate-content td{position: relative; cursor: pointer;} -.laydate-day-mark{position: absolute; left: 0; top: 0; width: 100%; line-height: 30px; font-size: 12px; overflow: hidden;} -.laydate-day-mark::after{position: absolute; content:''; right: 2px; top: 2px; width: 5px; height: 5px; border-radius: 50%;} -.laydate-day-holidays:before{position: absolute; left: 0; top: 0; font-size: 12px; transform: scale(.7);} -.laydate-day-holidays:before{content:'\4F11'; color: #FF5722;} -.laydate-day-holidays[type="work"]:before{content:'\73ED'; color: inherit;} -.layui-laydate .layui-this .laydate-day-holidays:before{color: #fff;} - -/* 底部结构 */ -.layui-laydate-footer{position: relative; height: 46px; line-height: 26px; padding: 10px;} -.layui-laydate-footer span{display: inline-block; vertical-align: top; height: 26px; line-height: 24px; padding: 0 10px; border: 1px solid #C9C9C9; border-radius: 2px; background-color: #fff; font-size: 12px; cursor: pointer; white-space: nowrap; transition: all .3s;} -.layui-laydate-footer span:hover{color: #5FB878;} -.layui-laydate-footer span.layui-laydate-preview{cursor: default; border-color: transparent !important;} -.layui-laydate-footer span.layui-laydate-preview:hover{color: #666;} -.layui-laydate-footer span:first-child.layui-laydate-preview{padding-left: 0;} -.laydate-footer-btns{position: absolute; right: 10px; top: 10px;} -.laydate-footer-btns span{margin: 0 0 0 -1px;} - -/* 年月列表 */ -.layui-laydate-list{position: absolute; left: 0; top: 0; width: 100%; height: 100%; padding: 10px; box-sizing: border-box; background-color: #fff;} -.layui-laydate-list>li{position: relative; display: inline-block; width: 33.3%; height: 36px; line-height: 36px; margin: 3px 0; vertical-align: middle; text-align: center; cursor: pointer;} -.laydate-month-list>li{width: 25%; margin: 17px 0;} -.laydate-time-list{} -.laydate-time-list>li{height: 100%; margin: 0; line-height: normal; cursor: default;} -.laydate-time-list p{position: relative; top: -4px; line-height: 29px;} -.laydate-time-list ol{height: 181px; overflow: hidden;} -.laydate-time-list>li:hover ol{overflow-y: auto;} -.laydate-time-list ol li{width: 130%; padding-left: 33px; height: 30px; line-height: 30px; text-align: left; cursor: pointer;} - -/* 提示 */ -.layui-laydate-hint{position: absolute; top: 115px; left: 50%; width: 250px; margin-left: -125px; line-height: 20px; padding: 15px; text-align: center; font-size: 12px; color: #FF5722;} - - -/* 双日历 */ -.layui-laydate-range{width: 546px;} -.layui-laydate-range .layui-laydate-main{display: inline-block; vertical-align: middle;} -.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;} - - -/* 默认简约主题 */ -.layui-laydate, .layui-laydate-hint{border: 1px solid #d2d2d2; box-shadow: 0 2px 4px rgba(0,0,0,.12); background-color: #fff; color: #666;} -.layui-laydate-header{border-bottom: 1px solid #e2e2e2;} -.layui-laydate-header i:hover, -.layui-laydate-header span:hover{color: #5FB878;} -.layui-laydate-content{border-top: none 0; border-bottom: none 0;} -.layui-laydate-content th{color: #333;} -.layui-laydate-content td{color: #666;} -.layui-laydate-content td.laydate-selected{background-color: #B5FFF8;} -.laydate-selected:hover{background-color: #00F7DE !important;} -.layui-laydate-content td:hover, -.layui-laydate-list li:hover{background-color: #eee; color: #333;} -.laydate-time-list li ol{margin: 0; padding: 0; border: 1px solid #e2e2e2; border-left-width: 0;} -.laydate-time-list li:first-child ol{border-left-width: 1px;} -.laydate-time-list>li:hover{background: none;} -.layui-laydate-content .laydate-day-prev, -.layui-laydate-content .laydate-day-next{color: #d2d2d2;} -.laydate-selected.laydate-day-prev, -.laydate-selected.laydate-day-next{background-color: #f8f8f8 !important;} -.layui-laydate-footer{border-top: 1px solid #e2e2e2;} -.layui-laydate-hint{color: #FF5722;} -.laydate-day-mark::after{background-color: #5FB878;} -.layui-laydate-content td.layui-this .laydate-day-mark::after{display: none;} -.layui-laydate-footer span[lay-type="date"]{color: #5FB878;} -.layui-laydate .layui-this{background-color: #009688 !important; color: #fff !important;} -.layui-laydate .laydate-disabled, -.layui-laydate .laydate-disabled:hover{background:none !important; color: #d2d2d2 !important; cursor: not-allowed !important; -moz-user-select: none; -webkit-user-select: none; -ms-user-select: none;} - -/* 墨绿/自定义背景色主题 */ -.laydate-theme-molv{border: none;} -.laydate-theme-molv.layui-laydate-range{width: 548px} -.laydate-theme-molv .layui-laydate-main{width: 274px;} -.laydate-theme-molv .layui-laydate-header{border: none; background-color: #009688;} -.laydate-theme-molv .layui-laydate-header i, -.laydate-theme-molv .layui-laydate-header span{color: #f6f6f6;} -.laydate-theme-molv .layui-laydate-header i:hover, -.laydate-theme-molv .layui-laydate-header span:hover{color: #fff;} -.laydate-theme-molv .layui-laydate-content{border: 1px solid #e2e2e2; border-top: none; border-bottom: none;} -.laydate-theme-molv .laydate-main-list-1 .layui-laydate-content{border-left: none;} -.laydate-theme-molv .layui-laydate-footer{border: 1px solid #e2e2e2;} - -/* 格子主题 */ -.laydate-theme-grid .layui-laydate-content td, -.laydate-theme-grid .layui-laydate-content thead, -.laydate-theme-grid .laydate-year-list>li, -.laydate-theme-grid .laydate-month-list>li{border: 1px solid #e2e2e2;} -.laydate-theme-grid .laydate-selected, -.laydate-theme-grid .laydate-selected:hover{background-color: #f2f2f2 !important; color: #009688 !important;} -.laydate-theme-grid .laydate-selected.laydate-day-prev, -.laydate-theme-grid .laydate-selected.laydate-day-next{color: #d2d2d2 !important;} -.laydate-theme-grid .laydate-year-list, -.laydate-theme-grid .laydate-month-list{margin: 1px 0 0 1px;} -.laydate-theme-grid .laydate-year-list>li, -.laydate-theme-grid .laydate-month-list>li{margin: 0 -1px -1px 0;} -.laydate-theme-grid .laydate-year-list>li{height: 43px; line-height: 43px;} -.laydate-theme-grid .laydate-month-list>li{height: 71px; line-height: 71px;} - diff --git a/src/css/modules/layer/default/icon-ext.png b/src/css/modules/layer/default/icon-ext.png deleted file mode 100644 index bbbb669bb311514baa5db3a6a00b4644d0e280f1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5911 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 z5{$+UBj`4>dWspan+a{margin-left: 10px;} - -/* 关闭动画 */ -@-webkit-keyframes layer-bounceOut { - 100% {opacity: 0; -webkit-transform: scale(.7); transform: scale(.7)} - 30% {-webkit-transform: scale(1.05); transform: scale(1.05)} - 0% {-webkit-transform: scale(1); transform: scale(1);} -} -@keyframes layer-bounceOut { - 100% {opacity: 0; -webkit-transform: scale(.7); -ms-transform: scale(.7); transform: scale(.7);} - 30% {-webkit-transform: scale(1.05); -ms-transform: scale(1.05); transform: scale(1.05);} - 0% {-webkit-transform: scale(1); -ms-transform: scale(1);transform: scale(1);} -} -.layer-anim-close{-webkit-animation-name: layer-bounceOut; animation-name: layer-bounceOut; -webkit-animation-fill-mode: both; animation-fill-mode: both; -webkit-animation-duration:.2s; animation-duration:.2s;} - -@media screen and (max-width: 1100px) { - .layui-layer-iframe{overflow-y: auto; -webkit-overflow-scrolling: touch;} -} - - diff --git a/src/css/modules/layer/default/loading-0.gif b/src/css/modules/layer/default/loading-0.gif deleted file mode 100644 index 6f3c9539a22171cc2f12639492e346d97a9078e8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5793 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 bWW^%>x7XlHV^#Q1uOX^B?ki3(VEg|7!QHuF diff --git a/src/css/modules/layer/default/loading-1.gif b/src/css/modules/layer/default/loading-1.gif deleted file mode 100644 index db3a483e4b74971fbfb1cc0fb6499852cedfe650..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 701 zcmZ?wbhEHbRAo?Qn8?Ji_w)@mZNLBj|1&T!DE{a6a}5c0b_{Se(lcOY1PT3QVdY|A zV$cDyff`g97?`@J^shYqmS1s(LX_+4yGox$4el*+Jm?ved2^25GBru=T^dGm#<906 za&AQCZ08H8P;Bd&{NT;vl&}c_^L4%p?g_hjBu{YB29{c>Ob}p@z~Ks3xCw+@!HClp xtZ<(QPf3`00FNu+VbOvoEE+h73k#4LIKl$IE8t;)<_eUs!0QU6uz&iJhvXcHF*h)T1OnEW1i^?zgDfop1p?usL*#PMGT;HQkSO{q6FlJyb$PWkPf|h*eTST}7h8z$}MF(XD(aQ)ZLZ zM?v0rT<1C4XHn<6PbNA{XL@>1^)apdD_@tcYDrW#m`k#MmslI7p^P;Az74wGs`!SI zLs$GEZHsafXsu1i-WleMzAL(yw$-LK{0hv;6hrx8kx!!4$``dAyBnY9Jz&DqJo2$A z!(L$H=KqBeY~CF_viHPz^tTglc?D97CqEBjzUwH}7GI zapg8YZM~>2Wk%E$d&r@9ly9b4Q zJpM7T@}r63I(OExUlG%Xcjz3MU+9U^r!SkpjNThDtaP)7>j6L5z%o5|^hlVOyI*uY zt^UU6NTuY?(Lb4ZIU2Zb5Vz}Pb7KF%ivf&j^CL>$cDz?rMNTQQ|NqDVD7mhghUp%h zhIA{gi{S8y9YhIIbSv$`B!JiPi!0#4#Jge0)p&YVPHchWcyAn zQhvb8ggXGXs9;k`u9Uq*YB>O+Q3Rq=2hlLFcG{Q3ORH_}JnY8C+r%@}6|%ySP%bWG zV~mA;?P`Q2L_Ss})nrJ{$TmeA9Tt*4=}X5x%RioM@_?ZsKSEST-f+GBv~Ya)xX3O{ z8!d=YthI-13OI;RN~`>|6u5L{z20oBp%9MIj)n$!Aw{Wpq&Rtr4~*_74Gjo@3el>B zz(Rk;;>2lp73<2;d=r*8z%WkdsG=vRuG_fvxO#uN^El|+5Qoz^X!2MfxJ3m}vyi?> zMLLDi8+${Z6YbUg?8GNR>-+SwHKdFyr%HqWcs|X_l*-DAC^bG&KCqWg7-_`UlwQ`EdOp_LJkr`L$mHHs75uP?fSgVfsDjuE#ft2b8HDt0yFt!+;C zEgL=)G9ZFt4wa+N3Xg7FGc0~`&EEt6_%7tyzmnb9B_h1~7~GD4V-Bhx7~QKRkF>&aT>(-!Us@aJxAY@8E?HW$G8g zSz@7Jcp>iCp;lU1ieF6n7!oAa-1E!rS0 zF1lBFVS%G#ZO}b@*+bIk+7@Q|iG60vIDVpV%4tW8rKyzwRo_<25;8*Ky@n z-sX>W*b;M){5lB_Edc@m1`VHy0@dg$PTR9uE$O2&a?KAe?xRlCj&Z$iZYw Date: Fri, 19 Aug 2022 02:43:44 +0800 Subject: [PATCH 14/15] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20layer=20=E7=A4=BA?= =?UTF-8?q?=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- examples/layer.html | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/examples/layer.html b/examples/layer.html index 3ea830ab..3305852d 100644 --- a/examples/layer.html +++ b/examples/layer.html @@ -28,6 +28,7 @@ body{padding: 100px;} + 更多例子
@@ -40,7 +41,7 @@ body{padding: 100px;}
    -
  • +
  • 123
@@ -129,7 +130,7 @@ layui.use(['layer', 'util'], function(layer, util){ }); } ,test3: function(){ - !1 ? layer.msg('一个常用消息框') + !0 ? layer.msg('一个常用消息框') : layer.msg('一个常用消息框',{closeBtn: 0,time: 0, icon: 16}); } ,test4: function(){ @@ -162,8 +163,8 @@ layui.use(['layer', 'util'], function(layer, util){ }); } ,testLoading: function(){ - layer.load(2, { - //time: 5*1000 + layer.load(0, { + time: 5*1000 //content: '123' }); } @@ -191,6 +192,16 @@ layui.use(['layer', 'util'], function(layer, util){ }] }); } + ,test9: function(){ + layer.photos({ + photos: { + "data": [{ + "src": "https://unpkg.com/outeres/demo/layer.png" + }] + }, + hideFooter: true // 是否隐藏图片底部栏(v2.8.0 新增) + }); + } ,testTime: function(){ layer.alert('你好么,体验者。
在标题栏显示自动关闭倒计秒数', { time: 5*1000 @@ -209,18 +220,11 @@ layui.use(['layer', 'util'], function(layer, util){ } }); - //相册层 + // 相册层 layer.photos({ photos: '#photos' //$('#photos') }); - $('#photos li-').each(function(i, e){ - layer.photos({ - photos: $(e) - }); - }); - - //动态追加 $('#photos').append('
  • '); From 3b3794dfb4d04497ddd8745dadf77ff14a2f3f01 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, 19 Aug 2022 02:44:43 +0800 Subject: [PATCH 15/15] =?UTF-8?q?=E5=8A=A0=E5=BC=BA=20layer=20photos=20?= =?UTF-8?q?=E5=B1=82=E5=BA=95=E9=83=A8=E6=A0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/css/modules/layer.css | 8 +++---- src/modules/layer.js | 49 ++++++++++++++++++--------------------- 2 files changed, 26 insertions(+), 31 deletions(-) diff --git a/src/css/modules/layer.css b/src/css/modules/layer.css index 27675b3d..41c1b9e0 100644 --- a/src/css/modules/layer.css +++ b/src/css/modules/layer.css @@ -157,10 +157,10 @@ html #layuicss-layer{display: none; position: absolute; width: 1989px;} .layui-layer-imgnext:hover{color: #959595;} .layui-layer-imgbar{position: fixed; left:0; right: 0; bottom:0; width:100%; height: 40px; line-height: 40px; background-color:#000\9; filter:Alpha(opacity=60); background-color: rgba(2,0,0,.35); color: #fff; text-overflow: ellipsis; overflow: hidden; white-space: nowrap; font-size:0;} .layui-layer-imgtit{/*position:absolute; left:20px;*/} -.layui-layer-imgtit *{display:inline-block; *display:inline; *zoom:1; vertical-align:top; font-size:12px;} -.layui-layer-imgtit a{max-width:65%; text-overflow: ellipsis; overflow: hidden; white-space: nowrap; color:#fff;} -.layui-layer-imgtit a:hover{color:#fff; text-decoration:underline;} -.layui-layer-imgtit em{padding-left:10px; font-style: normal;} +.layui-layer-imgtit *{display:inline-block; *display:inline; *zoom:1; vertical-align:top; padding: 0 5px; font-size:12px; color: #fff;} +.layui-layer-imgtit h3{max-width:65%; text-overflow: ellipsis; overflow: hidden; white-space: nowrap; font-weight: 300;} +.layui-layer-imgtit a:hover{color: #fff; text-decoration: underline;} +.layui-layer-imgtit em{font-style: normal;} /* 关闭动画 */ @-webkit-keyframes layer-bounceOut { diff --git a/src/modules/layer.js b/src/modules/layer.js index ea1b5a33..f5a96ffd 100644 --- a/src/modules/layer.js +++ b/src/modules/layer.js @@ -1412,7 +1412,7 @@ layer.photos = function(options, loop, key){ loadImage(data[start].src, function(img){ layer.close(dict.loadi); - var alt = data[start].alt||''; + var alt = data[start].alt || ''; //切换图片时不出现动画 if(key) options.anim = -1; @@ -1451,36 +1451,31 @@ layer.photos = function(options, loop, key){ isOutAnim: false, skin: 'layui-layer-photos' + skin('photos'), content: '
    ' - +''+ alt +'' - +function(){ - var tip = '
    '; + + ''+ alt +'' + + function(){ + var arr = ['
    ']; + // 左右箭头翻页 if(data.length > 1){ - tip += ''; + arr.push(['
    ' + ,'' + ,'' + ,'
    '].join('')); + } - if(alt===''){ - tip += '
    '+ dict.imgIndex +' / '+ data.length +'查看原图
    '; - } - else{ - tip += '
    '+ alt +''+ dict.imgIndex +' / '+ data.length +'查看原图
    '; - } + // 底部栏 + if(!options.hideFooter){ + arr.push(['
    ' + ,'
    ' + ,'

    '+ alt +'

    ' + ,''+ dict.imgIndex +' / '+ data.length +'' + ,'查看原图' + ,'
    ' + ,'
    '].join('')); + } - tip += '
    '; - } - else if(data.length === 1){ - if(alt===''){ - tip = ''; - } - else{ - tip += '
    '+ alt +'查看原图
    '; - tip += '
    '; - } - } - else{ - tip = ''; - } - - return tip; + arr.push('
    '); + return arr.join(''); }() +'
    ', success: function(layero, index){