Merge branch 'main' into 2.10-dev

This commit is contained in:
贤心
2025-03-05 19:43:46 +08:00
committed by GitHub
25 changed files with 193 additions and 101 deletions

View File

@@ -178,6 +178,37 @@ toc: true
<li>列表3</li>
</ol>
<h3>混合列表</h3>
<ol>
<li>
<p>有序列表1</p>
<ul>
<li>无序列表1-1</li>
<li>无序列表1-2</li>
<li>无序列表1-3</li>
</ul>
</li>
<li>
<p>有序列表2</p>
<ul>
<li>
<p>无序列表2-1</p>
<ol>
<li>有序列表2-1-1</li>
<li>有序列表2-1-2</li>
</ol>
</li>
<li>
<p>无序列表2-2</p>
<ol>
<li>有序列表2-2-1</li>
</ol>
</li>
</ul>
</li>
<li>有序列表3</li>
</ol>
<h3>Blockquote</h3>
<blockquote>
<p>引用</p>

View File

@@ -22,15 +22,52 @@ toc: true
通过对一个内联元素(如 `<i>`标签)添加基础类 `class="layui-icon"` 来定义一个图标,然后对元素加上图标对应的 `font-class`,即可显示出你想要的图标,如上所示。
<h2 id="list" lay-toc="{hot: true, title: '图标列表'}">图标列表186 个)</h2>
<h2 id="list" lay-toc="{hot: true, title: '图标列表'}">图标列表192 个)</h2>
<div class="ws-docs-icon">
<div>
<i class="layui-icon layui-icon-bot"></i>
<div class="docs-icon-name">机器人</div>
<div class="docs-icon-code">&amp;#xe7d6;</div>
<div class="docs-icon-fontclass">layui-icon-bot</div>
</div>
<div>
<i class="layui-icon layui-icon-leaf"></i>
<div class="docs-icon-name">叶子节点</div>
<div class="docs-icon-code">&amp;#xe701;</div>
<div class="docs-icon-fontclass">layui-icon-leaf</div>
</div>
<div>
<i class="layui-icon layui-icon-folder" style="font-size: 32px;"></i>
<div class="docs-icon-name">文件夹</div>
<div class="docs-icon-code">&amp;#xeabe;</div>
<div class="docs-icon-fontclass">layui-icon-folder</div>
</div>
<div>
<i class="layui-icon layui-icon-folder-open" style="font-size: 32px;"></i>
<div class="docs-icon-name">文件夹打开</div>
<div class="docs-icon-code">&amp;#xeac1;</div>
<div class="docs-icon-fontclass layui-font-12">layui-icon-folder-open</div>
</div>
<div>
<i class="layui-icon layui-icon-gitee"></i>
<div class="docs-icon-name">Gitee</div>
<div class="docs-icon-code">&amp;#xe69b;</div>
<div class="docs-icon-fontclass">layui-icon-gitee</div>
</div>
<div>
<i class="layui-icon layui-icon-github"></i>
<div class="docs-icon-name">Github</div>
<div class="docs-icon-code">&amp;#xe6a7;</div>
<div class="docs-icon-fontclass">layui-icon-github</div>
</div>
<div>
<i class="layui-icon layui-icon-light"></i>
<div class="docs-icon-name">太阳/明亮</div>
<div class="docs-icon-code">&amp;#xe748;</div>
<div class="docs-icon-fontclass">layui-icon-light</div>
</div>
<div>
<i class="layui-icon layui-icon-moon"></i>
<div class="docs-icon-name">月亮</div>
@@ -135,7 +172,6 @@ toc: true
<div class="docs-icon-code">&amp;#xe7bb;</div>
<div class="docs-icon-fontclass">layui-icon-ie</div>
</div>
<div>
<i class="layui-icon layui-icon-heart-fill"></i>
<div class="docs-icon-name">实心</div>
@@ -148,31 +184,36 @@ toc: true
<div class="docs-icon-code">&amp;#xe68c;</div>
<div class="docs-icon-fontclass">layui-icon-heart</div>
</div>
<div>
<i class="layui-icon layui-icon-light"></i>
<div class="docs-icon-name">太阳/明亮</div>
<div class="docs-icon-code">&amp;#xe748;</div>
<div class="docs-icon-fontclass">layui-icon-light</div>
</div>
<div>
<i class="layui-icon layui-icon-time"></i>
<div class="docs-icon-name">时间/历史</div>
<div class="docs-icon-code">&amp;#xe68d;</div>
<div class="docs-icon-fontclass">layui-icon-time</div>
</div>
<div>
<i class="layui-icon layui-icon-bluetooth"></i>
<div class="docs-icon-name">蓝牙</div>
<div class="docs-icon-code">&amp;#xe689;</div>
<div class="docs-icon-fontclass">layui-icon-bluetooth</div>
</div>
<div>
<i class="layui-icon layui-icon-at"></i>
<div class="docs-icon-name">@艾特</div>
<div class="docs-icon-code">&amp;#xe687;</div>
<div class="docs-icon-fontclass">layui-icon-at</div>
</div>
<div>
<i class="layui-icon layui-icon-email"></i>
<div class="docs-icon-name">邮箱</div>
<div class="docs-icon-code">&amp;#xe618;</div>
<div class="docs-icon-fontclass">layui-icon-email</div>
</div>
<div>
<i class="layui-icon layui-icon-rss"></i>
<div class="docs-icon-name">RSS</div>
<div class="docs-icon-code">&amp;#xe808;</div>
<div class="docs-icon-fontclass">layui-icon-rss</div>
</div>
<div>
<i class="layui-icon layui-icon-sound"></i>
<div class="docs-icon-name">声音</div>
<div class="docs-icon-code">&amp;#xe69d;</div>
<div class="docs-icon-fontclass">layui-icon-sound</div>
</div>
<div>
<i class="layui-icon layui-icon-mute"></i>
<div class="docs-icon-name">静音</div>
@@ -198,16 +239,10 @@ toc: true
<div class="docs-icon-fontclass">layui-icon-gift</div>
</div>
<div>
<i class="layui-icon layui-icon-email"></i>
<div class="docs-icon-name">邮箱</div>
<div class="docs-icon-code">&amp;#xe618;</div>
<div class="docs-icon-fontclass">layui-icon-email</div>
</div>
<div>
<i class="layui-icon layui-icon-rss"></i>
<div class="docs-icon-name">RSS</div>
<div class="docs-icon-code">&amp;#xe808;</div>
<div class="docs-icon-fontclass">layui-icon-rss</div>
<i class="layui-icon layui-icon-bluetooth"></i>
<div class="docs-icon-name">蓝牙</div>
<div class="docs-icon-code">&amp;#xe689;</div>
<div class="docs-icon-fontclass">layui-icon-bluetooth</div>
</div>
<div>
<i class="layui-icon layui-icon-wifi"></i>

View File

@@ -245,10 +245,15 @@ layui.use('util', function(){
// 自定义:触发事件的元素属性名、触发事件的方式
util.on('lay-active', {
e3: layui.throttle(function(othis) {
console.log(this);
e3: function(othis, e) {
console.log(othis); // 当前触发事件的元素的 jQuery 对象
// e 为当前事件对象,此处演示阻止事件冒泡(比如委托父元素和子元素共用了同一事件名)
layui.stope(e);
// 演示提示
layer.tips(othis.html(), this);
}, 3000) // 3s 内不重复执行
}
}, {
trigger: 'mouseenter' // 鼠标移入时触发事件
});

View File

@@ -9,9 +9,44 @@ toc: true
<h2 id="2.9.x" lay-toc="{title: '2.9.x'}"></h2>
<h2 id="v2.9.23" class="ws-anchor">
v2.9.23
<span class="layui-badge-rim">2025-02-19</span>
<span class="layui-badge-rim" style="color: #16b777;">稳定版</span>
</h2>
- #### 基础
- 新增 6 个图标 #2511 @sentsim
- #### form
- 修复 `form.val()` 某些情况下赋值失效问题 #2503 @Sight-wcg
- #### 公共类
- 优化 `layui-text` 在混合列表下的显示问题 #2510 @sentsim
### 下载: [layui-v2.9.23.zip](https://gitee.com/layui/layui/attach_files/2060356/download)
---
<h2 id="v2.9.22" class="ws-anchor">
v2.9.22
<span class="layui-badge-rim">2025-02-14</span>
</h2>
- #### form
- 修复 `form.val()` 第二个参数为 ArrayLike 时表单赋值异常 #2455 @Sight-wcg
- 修复 `select` 未选中时 form.val 获取到的值为 null 的问题 #2475 @Sight-wcg
- #### table
- 回滚 #2411 中的 `ResizeObserver` 逻辑,因为可能存在更多的边缘影响 #2501 @Sight-wcg
- #### treeTable
- 修复 异步加载子节点失败后,无法点击重新加载的问题 #2479 @Sight-wcg
- #### 基础
- 优化 Linux 个别环境下的等宽字体 #2488 @SessionHu
### 下载: [layui-v2.9.22.zip](https://gitee.com/layui/layui/attach_files/2054722/download)
---
<h2 id="v2.9.21" class="ws-anchor">
v2.9.21
<span class="layui-badge-rim" style="color: #16b777;">稳定版</span>
<span class="layui-badge-rim">2025-01-03</span>
</h2>