修复一些小问题

pull/1150/head
sunxb 2022-10-14 15:42:11 +08:00
parent e08932d935
commit 1caa24fd98
3 changed files with 10 additions and 9 deletions

View File

@ -1409,7 +1409,7 @@
setTimeStatus(); setTimeStatus();
scroll(); scroll();
(that.endDate || options.type === 'time') && that.done(null, 'change'); (that.endDate || options.type === 'time' || (options.type === 'datetime' && options.fullPanel)) && that.done(null, 'change');
//同步按钮可点状态 //同步按钮可点状态
that.setBtnStatus(); that.setBtnStatus();

View File

@ -902,8 +902,8 @@ Class.pt.openLayer = function(){
//记录宽高坐标,用于还原 //记录宽高坐标,用于还原
ready.record = function(layero){ ready.record = function(layero){
var area = [ var area = [
layero.width(), layero[0].style.width || layero.width(),
layero.height(), layero[0].style.height || layero.height(),
layero.position().top, layero.position().top,
layero.position().left + parseFloat(layero.css('margin-left')) layero.position().left + parseFloat(layero.css('margin-left'))
]; ];
@ -981,11 +981,11 @@ layer.style = function(index, options, limit){
if(type === ready.type[2]){ if(type === ready.type[2]){
layero.find('iframe').css({ layero.find('iframe').css({
height: parseFloat(options.height) - titHeight - btnHeight height: (typeof options.height === 'number' ? options.height : layero.height()) - titHeight - btnHeight
}); });
} else { } else {
contElem.css({ contElem.css({
height: parseFloat(options.height) - titHeight - btnHeight height: (typeof options.height === 'number' ? options.height : layero.height()) - titHeight - btnHeight
- parseFloat(contElem.css('padding-top')) - parseFloat(contElem.css('padding-top'))
- parseFloat(contElem.css('padding-bottom')) - parseFloat(contElem.css('padding-bottom'))
}) })
@ -1058,9 +1058,9 @@ layer.restore = function(index){
//恢复原来尺寸 //恢复原来尺寸
layer.style(index, { layer.style(index, {
width: parseFloat(area[0]), width: area[0], // 数值或百分比
height: parseFloat(area[1]), height: area[1],
top: parseFloat(area[2]), top: parseFloat(area[2]),
left: parseFloat(area[3]), left: parseFloat(area[3]),
position: layero.attr('position'), position: layero.attr('position'),
overflow: 'visible' overflow: 'visible'

View File

@ -1363,7 +1363,8 @@ layui.define(['lay', 'laytpl', 'laypage', 'form', 'util'], function(exports){
tds.push(td); tds.push(td);
}); });
that.layTotal.find('tbody').html('<tr>' + tds.join('') + '</tr>'); var patchElem = that.layTotal.find('.layui-table-patch'); // 可能存在滚动条补丁
that.layTotal.find('tbody').html('<tr>' + tds.join('') + (patchElem.length ? patchElem.get(0).outerHTML : '') + '</tr>');
}; };
//找到对应的列元素 //找到对应的列元素