发版

ParkerTzh · Jun 2, 2019 · 203c9cb · 203c9cb
1 parent d3e63fe
commit 203c9cb
Show file tree

Hide file tree

Showing 15 changed files with 18 additions and 8 deletions.
diff --git a/dist/css/layui.css b/dist/css/layui.css
diff --git a/dist/font/iconfont.eot b/dist/font/iconfont.eot
diff --git a/dist/font/iconfont.svg b/dist/font/iconfont.svg
diff --git a/dist/font/iconfont.ttf b/dist/font/iconfont.ttf
diff --git a/dist/font/iconfont.woff b/dist/font/iconfont.woff
diff --git a/dist/font/iconfont.woff2 b/dist/font/iconfont.woff2
diff --git a/examples/tree.html b/examples/tree.html
@@ -147,7 +147,9 @@
       elem: '#test1'
       ,data: data1
       ,click: function(obj){
-        layer.msg(JSON.stringify(obj.data))
+        layer.msg(JSON.stringify(obj.data));
+
+
       }
       ,oncheck: function(obj){
         console.log(obj);

diff --git a/examples/upload.html b/examples/upload.html
@@ -132,8 +132,9 @@
   //重置上述 upload 实例
   uploadInst.reload({
     name:'avatar'
-    ,acceptMime: 'image/*'
-    //,size: 2
+    ,accept: 'images' //只允许上传图片
+    ,acceptMime: 'image/*' //只筛选图片
+    ,size: 2
   });
 
   upload.render({

diff --git a/src/css/layui.css b/src/css/layui.css
@@ -207,16 +207,17 @@ a cite{font-style: normal; *cursor:pointer;}
 .layui-icon-template-1:before{content:"\e656"}
 .layui-icon-vercode:before{content:"\e679"}
 .layui-icon-cellphone:before{content:"\e678"}
+
 .layui-icon-screen-full:before{content:"\e622";}
 .layui-icon-screen-restore:before{content:"\e758";}
 .layui-icon-cols:before{content:"\e610";}
 .layui-icon-export:before{content:"\e67d";}
 .layui-icon-print:before{content:"\e66d";}
 .layui-icon-slider:before{content: "\e714";}
-
 .layui-icon-addition:before{content: "\e624";}
 .layui-icon-subtraction:before{content: "\e67e";}
 .layui-icon-service:before{content: "\e626";}
+.layui-icon-transfer:before{content: "\e691";}
 
 /* 基本布局 */
 .layui-main{position: relative; width: 1140px; margin: 0 auto;}
@@ -1252,7 +1253,7 @@ body .layui-util-face  .layui-layer-content{padding:0; background-color:#fff; co
 .layui-tree-line .layui-tree-set.layui-tree-setLineShort:before{height: 13px;}
 .layui-tree-line .layui-tree-set.layui-tree-setHide:before{height: 0;}
 .layui-tree-iconClick{display: inline-block; vertical-align: middle; position: relative; height: 20px; line-height: 20px; margin: 0 10px; color: #c0c4cc;}
-.layui-tree-icon{height: 14px; line-height: 14px; width: 14px; text-align: center; border: 1px solid #c0c4cc;}
+.layui-tree-icon{height: 12px; line-height: 12px; width: 12px; text-align: center; border: 1px solid #c0c4cc;}
 .layui-tree-iconClick .layui-icon{font-size: 18px;}
 .layui-tree-icon .layui-icon{font-size: 12px; color: #666;}
 .layui-tree-iconArrow{padding: 0 5px;}

diff --git a/src/font/iconfont.eot b/src/font/iconfont.eot
diff --git a/src/font/iconfont.svg b/src/font/iconfont.svg
diff --git a/src/font/iconfont.ttf b/src/font/iconfont.ttf
diff --git a/src/font/iconfont.woff b/src/font/iconfont.woff
diff --git a/src/font/iconfont.woff2 b/src/font/iconfont.woff2
diff --git a/src/lay/modules/transfer.js b/src/lay/modules/transfer.js
@@ -111,8 +111,8 @@ layui.define('form', function(exports){
         ,listLeft + '</ul>'
       ,'</div>'
       ,'<div class="layui-transfer-btn">'
-        ,'<button class="layui-btn layui-btn-primary layui-transfer-btnRight layui-btn-disabled"><i class="layui-icon layui-icon-next"></i></button>'
-        ,'<button class="layui-btn layui-btn-primary layui-transfer-btnLeft layui-btn-disabled"><i class="layui-icon layui-icon-prev"></i></button></div>'
+        ,'<button type="button" class="layui-btn layui-btn-primary layui-transfer-btnRight layui-btn-disabled"><i class="layui-icon layui-icon-next"></i></button>'
+        ,'<button type="button" class="layui-btn layui-btn-primary layui-transfer-btnLeft layui-btn-disabled"><i class="layui-icon layui-icon-prev"></i></button></div>'
       ,'<div class="layui-transfer-right" data-arr="'+ arr +'" data-total="'+ total2 +'">'
         ,'<div class="layui-transfer-topTitle"><input lay-skin="primary" name="layTranRightCheck" lay-filter="layTranRightCheckAll" type="checkbox" class="layui-input" title="'+ options.title[1] +'"></div>'
         ,function(){