release v2.8.15release v2.8.15

release v2.8.15
df-business · Aug 16, 2023 · 7db1d8d · 7db1d8d
2 parents ea44bce + 8239401
commit 7db1d8d
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 28 deletions.
diff --git a/dist/css/layui.css b/dist/css/layui.css
diff --git a/dist/layui.js b/dist/layui.js
diff --git a/docs/table/detail/options.cols.md b/docs/table/detail/options.cols.md
@@ -75,6 +75,16 @@
 
 设置当前列的最大宽度。其优先级高于基础属性中的 `cellMaxWidth`
 
+</td>
+<td>number</td>
+<td>-</td>
+    </tr>
+    <tr>
+<td>expandedWidth <sup>2.8.14+</sup></td>
+<td>
+
+设置单元格被展开后的宽度，默认取表格容器的三分之一宽度。若设置的值的小于当前列宽，则展开后的列宽保持不变。
+
 </td>
 <td>number</td>
 <td>-</td>

diff --git a/docs/table/examples/demo.md b/docs/table/examples/demo.md
@@ -36,15 +36,6 @@
   </div>
 !}}</script>
 
-<script type="text/html" id="cityTpl">
-  <select id="demoCity1" class="layui-border" lay-ignore>
-    <option value="浙江杭州">浙江杭州</option>
-    <option value="江西南昌">江西南昌</option>
-    <option value="湖北武汉">湖北武汉</option>
-    <option value="湖南长沙">湖南长沙</option>
-  </select>
-</script>
-
 <script type="text/html" id="barDemo">
   <div class="layui-clear-space">
     <a class="layui-btn layui-btn-xs" lay-event="edit">编辑</a>
@@ -84,13 +75,7 @@ layui.use(['table', 'dropdown'], function(){
       {field:'username', width:80, title: '用户'},
       {field:'email', title:'邮箱 <i class="layui-icon layui-icon-tips layui-font-14" lay-event="email-tips" title="该字段开启了编辑功能" style="margin-left: 5px;"></i>', fieldTitle: '邮箱', hide: 0, width:150, edit: 'text'},
       {field:'sex', width:80, title: '性别', sort: true},
-      {field:'city', width:115, title: '城市', minWidth:115, templet: '#cityTpl', exportTemplet: function(d, obj){
-        // console.log(obj)
-        // 处理该字段的导出数据
-        var td = obj.td(this.field); // 获取当前 td
-        return td.find('select').val();
-      }},
-      {field:'sign', title: '签名', edit: 'textarea', minWidth: 260, expandedWidth: 320, style: '-moz-box-align: start;', totalRow: '{{!人物：<span class="layui-badge-rim">唐代：{{= d.TOTAL_ROW.era.tang }} </span> <span class="layui-badge-rim">宋代：{{= d.TOTAL_ROW.era.song }}</span> <span class="layui-badge-rim">现代：{{= d.TOTAL_ROW.era.xian }}</span>!}}'},
+      {field:'sign', title: '签名', edit: 'textarea', minWidth: 260, expandedWidth: 260, style: '-moz-box-align: start;', totalRow: '{{!人物：<span class="layui-badge-rim">唐代：{{= d.TOTAL_ROW.era.tang }} </span> <span class="layui-badge-rim">宋代：{{= d.TOTAL_ROW.era.song }}</span> <span class="layui-badge-rim">现代：{{= d.TOTAL_ROW.era.xian }}</span>!}}'},
       {field:'experience', width: 100, title: '积分', sort: true, totalRow: '{{!{{= d.TOTAL_NUMS }} 😊!}}'}, 
       {field:'checkin', title:'打卡', width: 100, sort: true, totalRow: '{{!{{= parseInt(d.TOTAL_NUMS) }} 次!}}'},
       {field:'ip', title:'IP', width: 120},

diff --git a/docs/versions.md b/docs/versions.md
@@ -11,17 +11,19 @@ toc: true
 
 > 导读：📑 [Layui 2.8 《升级指南》](/notes/2.8/upgrade-guide.html) · 📑 [Layui 新版文档站上线初衷](/notes/2.8/news.html)
 
-<h2 id="2.8.14" class="ws-anchor">
-  2.8.14
+<h2 id="2.8.15" class="ws-anchor">
+  2.8.15
   <span class="layui-badge-rim">2023-08-16</span>
 </h2>
 
 - #### table
   - 新增 `expandedWidth` 表头属性，用于设置单元格被展开后的宽度
   - 优化 单元格内容下拉展开状态面板，以解决此前因展开后内容不可操作等问题 # I7RS8S
   - 优化 `table.reload()` 造成 `window resize` 事件重复绑定的问题 # I7RJWY
+  - 优化 多行模式在 Firefox 的内容显示问题
 - #### layer
   - 优化 开启默认动画弹出层后，鼠标移入按钮出现往上偏移的问题 # I7QVVP
+  - 优化 弹层右上角关闭按钮因上个版本更新导致的主题样式异常问题 # I7TP11
 - #### dropdown
   - 新增 `customName` 属性，用于自定义 `data` 属性中常用的字段名称
   - 修复 在某些特殊情况下调整浏览器窗口尺寸时出现的 `resize` 事件报错问题
@@ -31,7 +33,11 @@ toc: true
   - 新增 `lay.style()` 方法，用于向页面创建 style 样式
   - 优化 `lay.position()` 方法，可让下拉弹出元素的定位更智能
 
-### 下载： [layui-v2.8.14.zip](https://gitee.com/layui/layui/attach_files/1498186/download)
+### 下载： [layui-v2.8.15.zip](https://gitee.com/layui/layui/attach_files/1499232/download)
+
+---
+
+因 `2.8.14` 版本存在 layer 主题样式异常问题，`2.8.14` 已被跳过。
 
 ---
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "layui",
-  "version": "2.8.14",
+  "version": "2.8.15",
   "description": "Classic modular Front-End UI library",
   "main": "dist/layui.js",
   "license": "MIT",

diff --git a/src/css/modules/layer.css b/src/css/modules/layer.css
@@ -133,7 +133,7 @@ html #layuicss-layer{display: none; position: absolute; width: 1989px;}
 .layui-layer-setwin .layui-layer-maxmin:after{z-index: 0; margin: -5px 0 0 -1px;}
 .layui-layer-setwin .layui-layer-close{cursor: pointer;}
 .layui-layer-setwin .layui-layer-close:hover{opacity:0.7;}
-.layui-layer-setwin .layui-layer-close2{position:absolute; right: -28px; top: -28px; color: #fff; background-color: #787878; padding: 3px; border: 3px solid; width: 18px; height: 18px; font-size: 18px; font-weight: bolder; border-radius: 50%; margin-left: 0; *right:-18px; _display:none;}
+.layui-layer-setwin .layui-layer-close2{position:absolute; right: -28px; top: -28px; color: #fff; background-color: #787878; padding: 3px; border: 3px solid; width: 28px; height: 28px; font-size: 16px; font-weight: bolder; border-radius: 50%; margin-left: 0; *right:-18px; _display:none;}
 .layui-layer-setwin .layui-layer-close2:hover{opacity: unset; background-color: #3888f6;}
 
 /* 按钮栏 */
@@ -204,14 +204,14 @@ html #layuicss-layer{display: none; position: absolute; width: 1989px;}
 .layui-layer-win10{border: 1px solid #aaa; box-shadow: 1px 1px 6px rgba(0,0,0,.3); border-radius: none;}
 .layui-layer-win10 .layui-layer-title{height: 32px; line-height: 32px; padding-left: 8px; border-bottom: none; font-size: 12px;}
 .layui-layer-win10 .layui-layer-setwin{right: 0; top: 0;}
-.layui-layer-win10 .layui-layer-setwin span{margin-left: 0; padding: 8px;}
-.layui-layer-win10.layui-layer-page .layui-layer-setwin span{padding: 8px 11px;}
+.layui-layer-win10 .layui-layer-setwin span{margin-left: 0; width: 32px; height: 32px; padding: 8px;}
+.layui-layer-win10.layui-layer-page .layui-layer-setwin span{width: 38px;}
 .layui-layer-win10 .layui-layer-setwin span:hover{background-color: #E5E5E5;}
 .layui-layer-win10 .layui-layer-setwin span.layui-icon-close:hover{background-color: #E81123; color: #fff;}
 .layui-layer-win10.layui-layer-dialog .layui-layer-content{padding: 8px 16px 32px; color: #0033BC;}
 .layui-layer-win10.layui-layer-dialog .layui-layer-padding{padding-top: 18px; padding-left: 58px;}
 .layui-layer-win10 .layui-layer-btn{padding: 5px 5px 10px; border-top:1px solid #DFDFDF; background-color: #F0F0F0;}
-.layui-layer-win10 .layui-layer-btn a{height: 18px; line-height: 18px; background-color: #E1E1E1; border-color: #ADADAD; color: #000; font-size: 12px; transition: all .3s;}
+.layui-layer-win10 .layui-layer-btn a{height: 20px; line-height: 18px; background-color: #E1E1E1; border-color: #ADADAD; color: #000; font-size: 12px; transition: all .3s;}
 .layui-layer-win10 .layui-layer-btn a:hover{border-color: #2A8EDD; background-color: #E5F1FB;}
 .layui-layer-win10 .layui-layer-btn .layui-layer-btn0{border-color: #0078D7;}
 

diff --git a/src/layui.js b/src/layui.js
@@ -16,7 +16,7 @@
   };
 
   var Layui = function(){
-    this.v = '2.8.14'; // Layui 版本号
+    this.v = '2.8.15'; // Layui 版本号
   };
 
   // 识别预先可能定义的指定全局对象

diff --git a/src/modules/table.js b/src/modules/table.js
@@ -273,7 +273,7 @@ layui.define(['lay', 'laytpl', 'laypage', 'form', 'util'], function(exports){
       ,'var cellClassName = ".layui-table-view-"+ d.index +" .layui-table-body .layui-table .layui-table-cell";'
     ,'}}'
       ,'{{= cellClassName }}{'
-        ,'display: -webkit-box; -webkit-box-align: center; white-space: normal; {{- d.data.lineStyle }} '
+        ,'display: -webkit-box; -webkit-box-align: center; -moz-box-align: start; white-space: normal; {{- d.data.lineStyle }} '
       ,'}'
       ,'{{= cellClassName }}:hover{overflow: auto;}'
     ,'{{# } }}'