1.0.8

2017-02-21 06:48:54 +08:00
parent 7a2e9467de
commit e201faebf1
58 changed files with 3468 additions and 258 deletions
--- a/test/button.html
+++ b/test/button.html
@@ -0,0 +1,108 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <title>按钮 - layui</title>
+  <meta name="renderer" content="webkit">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+  <meta name="apple-mobile-web-app-status-bar-style" content="black"> 
+  <meta name="apple-mobile-web-app-capable" content="yes">
+  <meta name="format-detection" content="telephone=no">
+
+  <link rel="stylesheet" href="../src/css/layui.css">
+
+<style>
+body{padding: 10px;}
+</style>
+</head>
+<body>
+
+<span>按钮色系：</span>
+
+<a href="" class="layui-btn layui-btn-primary">原始按钮</a>
+<a href="" class="layui-btn">默认按钮</a>
+<button class="layui-btn layui-btn-normal">百搭按钮</button>
+<button class="layui-btn layui-btn-warm">暖色按钮</button>
+<button class="layui-btn layui-btn-danger">警告按钮</button>
+<button class="layui-btn layui-btn-disabled">禁用按钮</button>
+
+<br><br>
+
+<span>按钮图标：</span>
+
+<button class="layui-btn"><i class="layui-icon">&#xe603;</i></button>
+<button class="layui-btn"><i class="layui-icon">&#xe602;</i></button>
+<button class="layui-btn"><i class="layui-icon">&#xe654;</i></button>
+<button class="layui-btn"><i class="layui-icon">&#xe642;</i></button>
+<button class="layui-btn"><i class="layui-icon">&#xe640;</i></button>
+<button class="layui-btn"><i class="layui-icon">&#xe641;</i></button>
+
+
+<br><br>
+
+<span>按钮尺寸：</span>
+
+
+<button class="layui-btn layui-btn-big">大型按钮</button>
+<button class="layui-btn">默认按钮</button>
+<button class="layui-btn layui-btn-small">小型按钮</button>
+<button class="layui-btn layui-btn-mini">迷你按钮</button>
+<button class="layui-btn layui-btn-primary layui-btn-big">大型按钮</button>
+<button class="layui-btn layui-btn-primary">默认按钮</button>
+<button class="layui-btn layui-btn-primary layui-btn-small">小型按钮</button>
+<button class="layui-btn layui-btn-primary layui-btn-mini">迷你按钮</button>
+
+<br><br>
+
+<span>按钮圆角：</span>
+
+<button class="layui-btn layui-btn-primary layui-btn-radius">原始按钮</button>
+<button class="layui-btn layui-btn-radius">默认按钮</button>
+<button class="layui-btn layui-btn-normal layui-btn-radius">百搭按钮</button>
+<button class="layui-btn layui-btn-warm layui-btn-radius">暖色按钮</button>
+<button class="layui-btn layui-btn-danger layui-btn-radius">警告按钮</button>
+<button class="layui-btn layui-btn-disabled layui-btn-radius">禁用按钮</button>
+
+<br><br>
+
+<span>按钮图文：</span>
+
+<button class="layui-btn layui-btn-big layui-btn-primary layui-btn-radius">大型加圆角</button>
+<button class="layui-btn layui-btn-small layui-btn-normal"><i class="layui-icon">&#xe640;</i> 删除</button>
+<button class="layui-btn layui-btn-mini layui-btn-disabled"><i class="layui-icon">&#xe641;</i> 禁分享</button>
+
+<br><br>
+
+<span>按钮组：</span>
+
+<div class="layui-btn-group">
+  <button class="layui-btn">增加</button>
+  <button class="layui-btn ">编辑</button>
+  <button class="layui-btn">删除</button>
+</div>
+
+<div class="layui-btn-group">
+  <button class="layui-btn layui-btn-small"><i class="layui-icon">&#xe654;</i></button>
+  <button class="layui-btn layui-btn-small"><i class="layui-icon">&#xe642;</i></button>
+  <button class="layui-btn layui-btn-small"><i class="layui-icon">&#xe640;</i></button>
+  <button class="layui-btn layui-btn-small"><i class="layui-icon">&#xe602;</i></button>
+</div>
+
+<div class="layui-btn-group">
+  <button class="layui-btn layui-btn-primary layui-btn-small"><i class="layui-icon">&#xe654;</i></button>
+  <button class="layui-btn layui-btn-primary layui-btn-small"><i class="layui-icon">&#xe642;</i></button>
+  <button class="layui-btn layui-btn-primary layui-btn-small"><i class="layui-icon">&#xe640;</i></button>
+  <button class="layui-btn layui-btn-primary layui-btn-small"><i class="layui-icon">&#xe602;</i></button>
+</div>
+
+<br><br><br>
+
+
+<script src="../src/layui.js"></script>
+
+<script>
+
+</script>
+</body>
+</html>
--- a/test/element.html
+++ b/test/element.html
@@ -8,11 +8,45 @@
 <link rel="stylesheet" href="../src/css/layui.css">

 <style>
-body{padding: 10px;}
+body{padding:20px;}
 </style>
 </head>
 <body>

+
+<div class="layui-progress">
+  <div class="layui-progress-bar" lay-percent="10%"></div>
+</div>
+
+<br>
+
+<div class="layui-progress">
+  <div class="layui-progress-bar layui-bg-red" lay-percent="20%"></div>
+</div>
+<br>
+<div class="layui-progress">
+  <div class="layui-progress-bar layui-bg-orange" lay-percent="30%"></div>
+</div>
+<br>
+<div class="layui-progress">
+  <div class="layui-progress-bar layui-bg-green" lay-percent="40%"></div>
+</div>
+<br>
+<div class="layui-progress">
+  <div class="layui-progress-bar layui-bg-blue" lay-percent="50%"></div>
+</div>
+<br>
+<div class="layui-progress">
+  <div class="layui-progress-bar layui-bg-cyan" lay-percent="60%"></div>
+</div>
+<br>
+
+<div class="layui-progress layui-progress-big" lay-filter="demo" lay-showPercent="true">
+  <div class="layui-progress-bar" lay-percent="100%"></div>
+</div>
+
+<br><br>
+
 <blockquote class="layui-elem-quote">Layui正是你苦苦寻找的前端UI框架</blockquote>
 <blockquote class="layui-elem-quote layui-quote-nm">Layui正是你苦苦寻找的前端UI框架Layui正是你苦苦寻找的前端UI框架Layui正是你苦苦寻找的前端UI框架Layui正是你苦苦寻找的前端UI框架Layui正是你苦苦寻找的前端UI框架</blockquote>

@@ -23,19 +57,16 @@ body{padding: 10px;}
  </div>
 </fieldset>

-<fieldset class="layui-elem-field layui-field-title">
-  <legend>字段集区块 - 横线风格</legend>
-</fieldset>
-
-我们都是
+横线上文
 <hr>
-好孩子
+横线下文

+<br><br>

 <ul class="layui-nav">
  <li class="layui-nav-item"><a href="">最新活动</a></li>
  <li class="layui-nav-item layui-this">
-    <a href="">产品</a>
+    <a href="javascript:;">产品</a>
    <dl class="layui-nav-child">
      <dd><a href="">选项1</a></dd>
      <dd><a href="">选项2</a></dd>
--- a/test/form.html
+++ b/test/form.html
@@ -1,11 +1,16 @@
 <!DOCTYPE html>
 <html>
 <head>
-<meta charset="utf-8">
-<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-<title>表单模块 - layui</title>
+  <meta charset="utf-8">
+  <title>表单模块 - layui</title>
+  <meta name="renderer" content="webkit">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+  <meta name="apple-mobile-web-app-status-bar-style" content="black"> 
+  <meta name="apple-mobile-web-app-capable" content="yes">
+  <meta name="format-detection" content="telephone=no">

-<link rel="stylesheet" href="../src/css/layui.css">
+  <link rel="stylesheet" href="../src/css/layui.css">

 <style>
 body{padding: 10px;}
@@ -17,19 +22,19 @@ body{padding: 10px;}
  <div class="layui-form-item">
    <label class="layui-form-label">输入框</label>
    <div class="layui-input-block">
-      <input type="text" name="title" lay-verify="title" required placeholder="请输入标题" autocomplete="off" class="layui-input">
+      <input type="text" name="title" lay-verify="required|title" required placeholder="请输入标题" autocomplete="off" class="layui-input">
    </div>
  </div>
  <div class="layui-form-item">
    <label class="layui-form-label">手机</label>
    <div class="layui-input-block">
-      <input type="tel" name="phone" lay-verify="" autocomplete="off" class="layui-input">
+      <input type="tel" name="phone" lay-verify="phone" autocomplete="off" class="layui-input">
    </div>
  </div>
  <div class="layui-form-item">
    <label class="layui-form-label">邮箱</label>
    <div class="layui-input-block">
-      <input type="tel" name="email" lay-verify="" autocomplete="off" class="layui-input">
+      <input type="tel" name="email" lay-verify="email" autocomplete="off" class="layui-input">
    </div>
  </div>
  <div class="layui-form-item">
@@ -90,7 +95,7 @@ body{padding: 10px;}
      </select>
    </div>
  </div>
-  <div class="layui-form-item">
+  <div class="layui-form-item" pane>
    <label class="layui-form-label">复选框</label>
    <div class="layui-input-block">
      <input type="checkbox" name="like[write]" title="写作">
@@ -98,19 +103,19 @@ body{padding: 10px;}
      <input type="checkbox" name="like[game]" title="游戏" disabled>
    </div>
  </div>
-  <div class="layui-form-item">
+  <div class="layui-form-item" pane>
    <label class="layui-form-label">开关关</label>
    <div class="layui-input-block">
      <input type="checkbox" name="close" lay-skin="switch" title="开关" disabled>
    </div>
  </div>
-  <div class="layui-form-item">
+  <div class="layui-form-item" pane>
    <label class="layui-form-label">开关开</label>
    <div class="layui-input-block">
      <input type="checkbox" checked name="open" lay-skin="switch" lay-filter="switchTest" title="开关">
    </div>
  </div>
-  <div class="layui-form-item">
+  <div class="layui-form-item" pane>
    <label class="layui-form-label">单选框</label>
    <div class="layui-input-block">
      <input type="radio" name="sex" value="男" title="男">
@@ -118,7 +123,7 @@ body{padding: 10px;}
      <input type="radio" name="sex" value="中型" title="中" disabled>
    </div>
  </div>
-  <div class="layui-form-item">
+  <div class="layui-form-item" pane>
    <label class="layui-form-label">单选框</label>
    <div class="layui-input-block">
      <input type="radio" name="sex.id" value="男" title="男">
@@ -140,64 +145,7 @@ body{padding: 10px;}
  </div>
 </form>

-<br><br><br><br><br><br><br><br><br><br>
-
-<span>按钮色系：</span>
-
-<a href="" class="layui-btn layui-btn-primary">原始按钮</a>
-<a href="" class="layui-btn">默认按钮</a>
-<button class="layui-btn layui-btn-normal">百搭按钮</button>
-<button class="layui-btn layui-btn-warm">暖色按钮</button>
-<button class="layui-btn layui-btn-danger">警告按钮</button>
-<button class="layui-btn layui-btn-disabled">禁用按钮</button>
-
-<br><br>
-
-<span>按钮图标：</span>
-
-<button class="layui-btn"><i class="layui-icon">&#xe608;</i> 添加</button>
-<button class="layui-btn"><i class="layui-icon">&#x1002;</i></button>
-<button class="layui-btn"><i class="layui-icon">&#xe603;</i></button>
-<button class="layui-btn"><i class="layui-icon">&#xe602;</i></button>
-<button class="layui-btn"><i class="layui-icon">&#xe642;</i></button>
-<button class="layui-btn"><i class="layui-icon">&#xe640;</i></button>
-<button class="layui-btn"><i class="layui-icon">&#xe641;</i></button>
-
-
-<br><br>
-
-<span>按钮尺寸：</span>
-
-
-<button class="layui-btn layui-btn-big">大型按钮</button>
-<button class="layui-btn">默认按钮</button>
-<button class="layui-btn layui-btn-small">小型按钮</button>
-<button class="layui-btn layui-btn-mini">迷你按钮</button>
-<button class="layui-btn layui-btn-primary layui-btn-big">大型按钮</button>
-<button class="layui-btn layui-btn-primary">默认按钮</button>
-<button class="layui-btn layui-btn-primary layui-btn-small">小型按钮</button>
-<button class="layui-btn layui-btn-primary layui-btn-mini">迷你按钮</button>
-
-<br><br>
-
-<span>按钮圆角：</span>
-
-<button class="layui-btn layui-btn-primary layui-btn-radius">原始按钮</button>
-<button class="layui-btn layui-btn-radius">默认按钮</button>
-<button class="layui-btn layui-btn-normal layui-btn-radius">百搭按钮</button>
-<button class="layui-btn layui-btn-warm layui-btn-radius">暖色按钮</button>
-<button class="layui-btn layui-btn-danger layui-btn-radius">警告按钮</button>
-<button class="layui-btn layui-btn-disabled layui-btn-radius">禁用按钮</button>
-
-<br><br>
-
-<span>按钮组合：</span>
-
-<button class="layui-btn layui-btn-big layui-btn-primary layui-btn-radius">大型加圆角</button>
-<button class="layui-btn layui-btn-small layui-btn-normal"><i class="layui-icon">&#xe640;</i> 删除</button>
-<button class="layui-btn layui-btn-mini layui-btn-disabled"><i class="layui-icon">&#xe641;</i> 禁分享</button>
-
-<br><br><br><br><br>
+<br><br><br>


 <script src="../src/layui.js"></script>
--- a/test/json/layim/getList.json
+++ b/test/json/layim/getList.json
@@ -4,7 +4,7 @@
  ,"data": {
    "mine": {
      "username": "纸飞机"
-      ,"id": "1003"
+      ,"id": "100000"
      ,"status": "online"
      ,"sign": "在深邃的编码世界，做一枚轻盈的纸飞机"
      ,"avatar": "http://cdn.firstlinkapp.com/upload/2016_6/1465575923433_33812.jpg"
@@ -19,9 +19,9 @@
        ,"avatar": "http://tp1.sinaimg.cn/1571889140/180/40030060651/1"
        ,"sign": "这些都是测试数据，实际使用请严格按照该格式返回"
      },{
-        "username": "老彭VIP"
-        ,"id": "1000"
-        ,"avatar": "http://wx.qlogo.cn/mmopen/sktw7MUgN2rQ8jWoEI59VURq3iczG6KWBdWxSUyZiblzPJCAl1eUz0WQDYQ0VMyKD0Bnc6Qtpb5DsvmMicYRXWkPg/0"
+        "username": "Z_子晴"
+        ,"id": "108101"
+        ,"avatar": "http://tva3.sinaimg.cn/crop.0.0.512.512.180/8693225ajw8f2rt20ptykj20e80e8weu.jpg"
        ,"sign": "微电商达人"
      },{
        "username": "Lemon_CC"
@@ -74,18 +74,26 @@
      "groupname": "我心中的女神"
      ,"id": 3
      ,"online": 1
-      ,"list": null
+      ,"list": [{
+        "username": "林心如"
+        ,"id": "76543"
+        ,"avatar": "http://tp3.sinaimg.cn/1223762662/180/5741707953/0"
+        ,"sign": "我爱贤心"
+      },{
+        "username": "佟丽娅"
+        ,"id": "4803920"
+        ,"avatar": "http://tp4.sinaimg.cn/1345566427/180/5730976522/0"
+        ,"sign": "我也爱贤心吖吖啊"
+      }]
    }]
    ,"group": [{
      "groupname": "前端群"
      ,"id": "101"
      ,"avatar": "http://tp2.sinaimg.cn/2211874245/180/40050524279/0"
-      ,"members": 67
    },{
      "groupname": "Fly社区官方群"
      ,"id": "102"
      ,"avatar": "http://tp2.sinaimg.cn/5488749285/50/5719808192/1"
-      ,"members": 161
    }]
  }
 }
--- a/test/json/layim/getMembers.json
+++ b/test/json/layim/getMembers.json
@@ -6,63 +6,69 @@
      "username": "贤心"
      ,"id": "100001"
      ,"avatar": "http://tp1.sinaimg.cn/1571889140/180/40030060651/1"
-      ,"remark": "这些都是测试数据，实际使用请严格按照该格式返回"
+      ,"sign": "这些都是测试数据，实际使用请严格按照该格式返回"
    }
+    ,"members": 12
    ,"list": [{
+      "username": "贤心"
+      ,"id": "100001"
+      ,"avatar": "http://tp1.sinaimg.cn/1571889140/180/40030060651/1"
+      ,"sign": "这些都是测试数据，实际使用请严格按照该格式返回"
+    },{
      "username": "Z_子晴"
      ,"id": "108101"
      ,"avatar": "http://tva3.sinaimg.cn/crop.0.0.512.512.180/8693225ajw8f2rt20ptykj20e80e8weu.jpg"
-      ,"remark": "微电商达人"
+      ,"sign": "微电商达人"
    },{
      "username": "Lemon_CC"
      ,"id": "102101"
      ,"avatar": "http://tp2.sinaimg.cn/1833062053/180/5643591594/0"
-      ,"remark": ""
+      ,"sign": ""
    },{
      "username": "马小云"
      ,"id": "168168"
      ,"avatar": "http://tp4.sinaimg.cn/2145291155/180/5601307179/1"
-      ,"remark": "让天下没有难写的代码"
+      ,"sign": "让天下没有难写的代码"
    },{
      "username": "徐小峥"
      ,"id": "666666"
      ,"avatar": "http://tp2.sinaimg.cn/1783286485/180/5677568891/1"
-      ,"remark": "代码在囧途，也要写到底"
+      ,"sign": "代码在囧途，也要写到底"
    },{
      "username": "罗玉凤"
      ,"id": "121286"
      ,"avatar": "http://tp1.sinaimg.cn/1241679004/180/5743814375/0"
-      ,"remark": "在自己实力不济的时候，不要去相信什么媒体和记者。他们不是善良的人，有时候候他们的采访对当事人而言就是陷阱"
+      ,"sign": "在自己实力不济的时候，不要去相信什么媒体和记者。他们不是善良的人，有时候候他们的采访对当事人而言就是陷阱"
    },{
      "username": "长泽梓Azusa"
      ,"id": "100001222"
-      ,"remark": "我是日本女艺人长泽あずさ"
      ,"avatar": "http://tva1.sinaimg.cn/crop.0.0.180.180.180/86b15b6cjw1e8qgp5bmzyj2050050aa8.jpg"
+      ,"sign": "我是日本女艺人长泽あずさ"
    },{
      "username": "大鱼_MsYuyu"
      ,"id": "12123454"
      ,"avatar": "http://tp1.sinaimg.cn/5286730964/50/5745125631/0"
-      ,"remark": "我瘋了！這也太準了吧  超級笑點低"
+      ,"sign": "我瘋了！這也太準了吧  超級笑點低"
    },{
      "username": "谢楠"
      ,"id": "10034001"
      ,"avatar": "http://tp4.sinaimg.cn/1665074831/180/5617130952/0"
-      ,"remark": ""
+      ,"sign": ""
    },{
      "username": "柏雪近在它香"
      ,"id": "3435343"
      ,"avatar": "http://tp2.sinaimg.cn/2518326245/180/5636099025/0"
-      ,"remark": ""
+      ,"sign": ""
    },{
      "username": "林心如"
      ,"id": "76543"
      ,"avatar": "http://tp3.sinaimg.cn/1223762662/180/5741707953/0"
-      ,"remark": "我爱贤心"
+      ,"sign": "我爱贤心"
    },{
      "username": "佟丽娅"
      ,"id": "4803920"
      ,"avatar": "http://tp4.sinaimg.cn/1345566427/180/5730976522/0"
-      ,"remark": "我也爱贤心吖吖啊"
+      ,"sign": "我也爱贤心吖吖啊"
    }]
  }
 }
--- a/test/laydate.html
+++ b/test/laydate.html
@@ -28,6 +28,8 @@ body{padding: 50px 100px;}
 <script>
 layui.use('laydate', function(){
  var laydate = layui.laydate
+  
+  
 });
 </script>
 </body>
--- a/test/layer.html
+++ b/test/layer.html
@@ -17,7 +17,62 @@ body{padding: 50px 100px;}

 <button class="layui-btn demo" data-type="test">测试一</button>
 <button class="layui-btn demo" data-type="test2">测试二</button>
+<button class="layui-btn demo" data-type="test3">捕获页</button>

+<div id="bbs_update_form" style="display: none;padding: 20px;">
+  <form class="layui-form layui-form-pane" id="update_bbs_info_form">
+
+  <div class="layui-form-item">
+    <label class="layui-form-label">论坛封面</label>
+    <div class="layui-input-block">
+      <input type="text" name="bbs_bg" autocomplete="off" placeholder="请输入图片地址（1045px*180px）" class="layui-input" value="http://q.jinsom.cn/wp-content/uploads/2016/12/bbs_bg.jpg">
+    </div>
+  </div>
+
+  <div class="layui-form-item">
+    <label class="layui-form-label">论坛头像</label>
+    <div class="layui-input-block">
+      <input type="text" name="bbs_avatar" autocomplete="off" placeholder="请输入图片地址（150px*150px）" class="layui-input" value="http://q.jinsom.cn/wp-content/uploads/2016/12/timg.jpg">
+    </div>
+  </div>
+
+  <div class="layui-form-item">
+    <label class="layui-form-label">论坛介绍</label>
+    <div class="layui-input-block">
+      <textarea placeholder="50字内" class="layui-textarea" name="bbs_desc" >LightSNS是一款wordpress轻社交主题，这里是关于你这个论坛的描述，随便扯吧。
+</textarea>
+    </div>
+  </div>
+
+  <div class="layui-form-item">
+    <label class="layui-form-label">论坛公告</label>
+    <div class="layui-input-block">
+      <textarea placeholder="100字内" class="layui-textarea" name="bbs_notice">公告</textarea>
+    </div>
+  </div>
+
+  <div class="layui-form-item">
+    <label class="layui-form-label">付费功能</label>
+    <div class="layui-input-block">
+      <input type="checkbox" name="bbs_fufei" lay-skin="switch" title="开启付费可看功能"  checked lay-skin="switch">
+    </div>
+  </div>
+
+  <div class="layui-form-item">
+    <label class="layui-form-label">验证码</label>
+    <div class="layui-input-block">
+      <input type="checkbox" name="bbs_captcha" lay-skin="switch" title="开启验证码功能" >
+    </div>
+  </div>
+
+  <div class="layui-form-item" style="text-align: right;">
+    <div class="layui-btn" id="bbs_update_button">更新</div>
+  </div>
+
+  </form>
+</div>
+
+<script type='text/javascript' src='http://q.jinsom.cn/wp-content/themes/jinsomQ/js/jquery.min.js?ver=0.3'></script>
 <script src="../src/layui.js"></script>
 <script>
 layui.use('layer', function(){
@@ -36,6 +91,15 @@ layui.use('layer', function(){
        ,maxmin: true
      })
    }
+	,test3: function(){
+		 layer.open({
+      title:'更新论坛信息',
+      type: 1,
+      skin: 'layui-layer-rim', 
+      area: ['500px', '580px'], 
+      content: $('#bbs_update_form')
+    });
+	}
  };
  $('.demo').on('click', function(){
    var type = $(this).data('type');