diff --git a/bower.json b/bower.json index 5a49e815..9ce7d243 100644 --- a/bower.json +++ b/bower.json @@ -1,7 +1,7 @@ { "name": "layui", "main": "src/layui.js", - "version": "2.3.0", + "version": "2.4.0", "homepage": "https://github.com/sentsin/layui", "authors": [ "sentsin " diff --git a/examples/colorpicker.html b/examples/colorpicker.html new file mode 100644 index 00000000..1988c38f --- /dev/null +++ b/examples/colorpicker.html @@ -0,0 +1,94 @@ + + + + + +颜色拾取器 - layui + + + + + + + + + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + + + + \ No newline at end of file diff --git a/examples/form.html b/examples/form.html index 6de1caf6..4462c139 100644 --- a/examples/form.html +++ b/examples/form.html @@ -108,11 +108,11 @@ body{padding: 10px;} - - + + - - + + @@ -210,7 +210,7 @@ layui.use('form', function(){ ,'phone': 11111111111 ,'email': 'xu@sentsin.com' ,'password': 123123 - ,'quiz': 2 + //,'quiz': 2 ,'interest': 3 ,'like[write]': true //,'open': false diff --git a/examples/json/table/demo1.json b/examples/json/table/demo1.json index c6f06bd3..9d579c23 100644 --- a/examples/json/table/demo1.json +++ b/examples/json/table/demo1.json @@ -8,7 +8,7 @@ ,"email": "xianxin@layui.com" ,"sex": "男" ,"city": "浙江杭州" - ,"sign": "点击此处，显示更多。当内容超出时，点击单元格会自动显示更多内容。" + ,"sign": "鼠标移动到此处，可以通过点击单元格右侧的下拉图标，查看到被隐藏的全部内容。" ,"experience": "7" ,"ip": "192.168.0.8" ,"logins": 0 diff --git a/examples/json/table/demo3.json b/examples/json/table/demo3.json new file mode 100644 index 00000000..0be3e652 --- /dev/null +++ b/examples/json/table/demo3.json @@ -0,0 +1,75 @@ +{ + "status": 200 + ,"message": "" + ,"total": 3000000 + ,"data": { + "list": [{ + "id": "10001" + ,"username": "杜甫3" + ,"email": "xianxin@layui.com" + ,"sex": "男" + ,"city": "浙江杭州" + ,"sign": "鼠标移动到此处，可以通过点击单元格右侧的下拉图标，查看到被隐藏的全部内容。" + ,"experience": "7" + ,"ip": "192.168.0.8" + ,"logins": 0 + ,"joinTime": "2016-10-14" + }, { + "id": "10002" + ,"username": "李白3" + ,"email": "xianxin@layui.com" + ,"sex": "男" + ,"city": "浙江杭州" + ,"sign": "君不见，黄河之水天上来，奔流到海不复回。 君不见，高堂明镜悲白发，朝如青丝暮成雪。 人生得意须尽欢，莫使金樽空对月。 天生我材必有用，千金散尽还复来。 烹羊宰牛且为乐，会须一饮三百杯。 岑夫子，丹丘生，将进酒，杯莫停。 与君歌一曲，请君为我倾耳听。(倾耳听 一作：侧耳听) 钟鼓馔玉不足贵，但愿长醉不复醒。(不足贵 一作：何足贵；不复醒 一作：不愿醒/不用醒) 古来圣贤皆寂寞，惟有饮者留其名。(古来 一作：自古；惟 通：唯) 陈王昔时宴平乐，斗酒十千恣欢谑。 主人何为言少钱，径须沽取对君酌。 五花马，千金裘，呼儿将出换美酒，与尔同销万古愁。" + ,"experience": "9" + ,"ip": "192.168.0.8" + ,"logins": "106" + ,"joinTime": "2016-10-14" + ,"LAY_CHECKED": true + }, { + "id": "10003" + ,"username": "王勃" + ,"email": "xianxin@layui.com" + ,"sex": "男" + ,"city": "浙江杭州" + ,"sign": "人生恰似一场修行" + ,"experience": "8" + ,"ip": "192.168.0.8" + ,"logins": "106" + ,"joinTime": "2016-10-14" + }, { + "id": "10004" + ,"username": "李清照" + ,"email": "xianxin@layui.com" + ,"sex": "女" + ,"city": "浙江杭州" + ,"sign": "人生恰似一场修行" + ,"experience": "6" + ,"ip": "192.168.0.8" + ,"logins": "106" + ,"joinTime": "2016-10-14" + }, { + "id": "10005" + ,"username": "冰心" + ,"email": "xianxin@layui.com" + ,"sex": "女" + ,"city": "浙江杭州" + ,"sign": "人生恰似一场修行" + ,"experience": "64" + ,"ip": "192.168.0.8" + ,"logins": "106" + ,"joinTime": "2016-10-14" + }, { + "id": "10006" + ,"username": "贤心" + ,"email": "xianxin@layui.com" + ,"sex": "男" + ,"city": "浙江杭州" + ,"sign": "人生恰似一场修行" + ,"experience": "65" + ,"ip": "192.168.0.8" + ,"logins": "106" + ,"joinTime": "2016-10-14" + }] + } +} \ No newline at end of file diff --git a/examples/slider.html b/examples/slider.html new file mode 100644 index 00000000..41e91370 --- /dev/null +++ b/examples/slider.html @@ -0,0 +1,55 @@ + + + + + +滑块 - layui + + + + + + + +
+
+
+

默认滑块

+
+
+
+
+ + + + + diff --git a/examples/table.html b/examples/table.html index de1a86a2..4fa22767 100644 --- a/examples/table.html +++ b/examples/table.html @@ -15,11 +15,13 @@ body{padding: 20px; /*overflow-y: scroll;*/} -
- - - -
+
@@ -46,159 +48,201 @@ body{padding: 20px; /*overflow-y: scroll;*/}
- - - - - - - - - - - - - - - -
联系人金额地址操作
省市区
+
+ + + + + + + + + + + + + + + +
联系人金额地址操作
省市区
- - - - - - - - - - - - - - - - - - - - - - -
联系人金额地址1地址2操作
省市详细区省市
小区单元
+ + + + + + + + + + + + + + + + + + + + + + +
联系人金额地址1地址2操作
省市详细区省市
小区单元
-
+
-
- +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
昵称加入时间签名
贤心12016-11-28人生就像是一场修行a
贤心22016-11-29人生就像是一场修行b
贤心32016-11-30人生就像是一场修行c
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
楼层1单元2单元
1门2门1门2门
3楼301302301302
2楼201202201202
1楼101102101102
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
昵称加入时间签名
贤心12016-11-28人生就像是一场修行a
贤心22016-11-29人生就像是一场修行b
贤心32016-11-30人生就像是一场修行c
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
楼层1单元2单元
1门2门1门2门
3楼301302301302
2楼201202201202
1楼101102101102
- - -