升级.net8暂存

This commit is contained in:
dell
2024-11-14 09:01:37 +08:00
parent 08a59bd2a3
commit 48e9e27fa0
110 changed files with 11291 additions and 4541 deletions

View File

@ -4,11 +4,11 @@
* version:1.6
* description:watercloud 主体框架扩展
*/
layui.define(["jquery", "layer", 'table', 'treeTable', 'xmSelect', 'miniTab'], function (exports) {
layui.define(["jquery", "layer", 'table', 'treeTablelay', 'xmSelect', 'miniTab'], function (exports) {
var $ = layui.jquery,
miniTab = layui.miniTab,
layer = layui.layer,
treeTable = layui.treeTable,
treeTablelay = layui.treeTablelay,
xmSelect = layui.xmSelect;
var obj = {
@ -22,7 +22,7 @@ layui.define(["jquery", "layer", 'table', 'treeTable', 'xmSelect', 'miniTab'], f
defaultToolbar: ['filter', 'exports', 'print'],//默认工具栏
search: true,//搜索按钮
loading: false,
checkOther:false,//关闭复选框联动
checkOther: false,//关闭复选框联动
tree: {
iconIndex: 0, // 折叠图标显示在第几列 多选等记得修改
isPidData: true, // 是否是id、pid形式数据
@ -55,15 +55,15 @@ layui.define(["jquery", "layer", 'table', 'treeTable', 'xmSelect', 'miniTab'], f
}
//搜索框按钮
if (options.search) {
options.defaultToolbar = !options.defaultToolbar? [] : options.defaultToolbar;
options.defaultToolbar = !options.defaultToolbar ? [] : options.defaultToolbar;
options.defaultToolbar.push({
title: '搜索',
layEvent: 'TABLE_SEARCH',
icon: 'layui-icon-search'
});
}
}
//ie缓存问题
//options.url = obj.urlAddTime(options.url);
options.url = obj.urlAddTime(options.url);
//字段权限
if (options.authorizeFields) {
options.cols = obj.tableAuthorizeFields(options.cols);
@ -75,7 +75,7 @@ layui.define(["jquery", "layer", 'table', 'treeTable', 'xmSelect', 'miniTab'], f
doneCallback(res, curr, count);
}
};
return treeTable.render(options);
return treeTablelay.render(options);
},
//treetable刷新
reloadtreetable: function (tree, options) {
@ -147,7 +147,7 @@ layui.define(["jquery", "layer", 'table', 'treeTable', 'xmSelect', 'miniTab'], f
IsClose = true;
}
if (IsClose) {
if (window.top.iframesList) {
if (window.top != null && window.top.hasOwnProperty('iframesList')) {
delete window.top.iframesList[index];
}
parent.layer.close(index);
@ -204,7 +204,7 @@ layui.define(["jquery", "layer", 'table', 'treeTable', 'xmSelect', 'miniTab'], f
success: function (layero, index) {
$(layero).addClass("scroll-wrapper");//苹果 iframe 滚动条失效解决方式
//建立父子关系
if (!window.top.iframesList) {
if (window.top != null && !window.top.hasOwnProperty('iframesList')) {
window.top.iframesList = {};
}
window.top.iframesList[index] = window;
@ -224,13 +224,13 @@ layui.define(["jquery", "layer", 'table', 'treeTable', 'xmSelect', 'miniTab'], f
options.btn2(index, layero);
}
else {
if (window.top.iframesList) {
if (window.top != null && window.top.hasOwnProperty('iframesList')) {
delete window.top.iframesList[index];
}
return true;
}
}, cancel: function (index, layero) {
if (window.top.iframesList) {
if (window.top != null && window.top.hasOwnProperty('iframesList')) {
delete window.top.iframesList[index];
}
if (!!options.cancel) {
@ -258,7 +258,7 @@ layui.define(["jquery", "layer", 'table', 'treeTable', 'xmSelect', 'miniTab'], f
param: [],
success: null,
close: true,
preventReuse:'.site-demo-active'//防止重复的参数
preventReuse: '.site-demo-active'//防止重复的参数
};
var options = $.extend(defaults, options);
//ie缓存问题
@ -324,7 +324,7 @@ layui.define(["jquery", "layer", 'table', 'treeTable', 'xmSelect', 'miniTab'], f
},
//二次确认框
modalConfirm: function (content, callBack) {
var index= top.layer.confirm(content, {
var index = top.layer.confirm(content, {
icon: "fa-exclamation-circle",
title: "系统提示",
id: "系统提示",
@ -346,7 +346,7 @@ layui.define(["jquery", "layer", 'table', 'treeTable', 'xmSelect', 'miniTab'], f
formType: type,
value: '',
title: title,
id:title,
id: title,
btn: ['确认', '取消'],
btnclass: ['btn btn-primary', 'btn btn-danger'],
}, function (value, index, elem) {
@ -476,7 +476,7 @@ layui.define(["jquery", "layer", 'table', 'treeTable', 'xmSelect', 'miniTab'], f
if ($id.hasClass("select2-hidden-accessible")) {
type = "select";
}
if ($id.find("input[type=radio]").length>0) {
if ($id.find("input[type=radio]").length > 0) {
type = "radio";
}
switch (type) {
@ -530,7 +530,7 @@ layui.define(["jquery", "layer", 'table', 'treeTable', 'xmSelect', 'miniTab'], f
//父窗体
parentWindow: function () {
var index = parent.layer.getFrameIndex(window.name);
if (window.top.iframesList) {
if (window.top != null && window.top.hasOwnProperty('iframesList')) {
return window.top.iframesList[index];
}
else {
@ -568,7 +568,6 @@ layui.define(["jquery", "layer", 'table', 'treeTable', 'xmSelect', 'miniTab'], f
var readForm = layui.$('[lay-filter="' + filter + '"]');
readForm.find('input,textarea,select').prop('disabled', true);
readForm.find('input,textarea,select').removeAttr('lay-verify');
readForm.find('.layui-layedit iframe').contents().find('body').prop('contenteditable', false);
},
//按钮权限(控制js模板,格式必须严格,新)
authorizeButtonNew: function (innerHTML) {
@ -602,9 +601,9 @@ layui.define(["jquery", "layer", 'table', 'treeTable', 'xmSelect', 'miniTab'], f
});
}
if (!!buttonHumanized) {
returnhtml = returnhtml.replace('layui-hide','');
returnhtml = returnhtml.replace('layui-hide', '');
}
if (itemList.length>2) {
if (itemList.length > 2) {
returnhtml = returnhtml + itemList[2];
}
}
@ -613,7 +612,7 @@ layui.define(["jquery", "layer", 'table', 'treeTable', 'xmSelect', 'miniTab'], f
}
}
}
else if (innerHTML.indexOf('</a>') > -1){
else if (innerHTML.indexOf('</a>') > -1) {
var tempList = innerHTML.split('</a>');
for (var i = 0; i < tempList.length; i++) {
if (tempList[i].indexOf('<a ') > -1) {
@ -666,7 +665,7 @@ layui.define(["jquery", "layer", 'table', 'treeTable', 'xmSelect', 'miniTab'], f
$element.find("#" + dataJson[i].F_EnCode).attr('authorize', 'yes');
//去除隐藏
if (!!buttonHumanized) {
$element.find("#" + dataJson[i].F_EnCode).removeClass('layui-hide');
$element.find("#" + dataJson[i].F_EnCode).removeClass('layui-hide');
}
});
}
@ -750,7 +749,7 @@ layui.define(["jquery", "layer", 'table', 'treeTable', 'xmSelect', 'miniTab'], f
}
},
//iframe定时器方法
iframeInterval:function(func, time){
iframeInterval: function (func, time) {
console.log("启动定时器", func, time);
//点击iframe对应的标签则直接执行定时器方法。不过注意这里我默认只执行最后一个定时器方法如果有多个定时器请自行更改。
top.$("li[lay-id='" + $(self.frameElement).attr("src") + "']").unbind('click').click(function () {
@ -857,7 +856,7 @@ layui.define(["jquery", "layer", 'table', 'treeTable', 'xmSelect', 'miniTab'], f
//刷新tab Iframe
reloadIframe: function (src, filter) {
var iframes = top.$('.layui-tab-item>iframe[src="' + src + '"]');
if (iframes.length>0) {
if (iframes.length > 0) {
iframes[0].contentWindow.$('button[lay-filter="' + filter + '"]').click();
}
},
@ -865,7 +864,7 @@ layui.define(["jquery", "layer", 'table', 'treeTable', 'xmSelect', 'miniTab'], f
urlAddTime: function (url) {
if (!!url) {
if (url.indexOf("?") >= 0) {
url = url+ '&v=' + new Date().Format("yyyy-MM-dd hh:mm:ss");
url = url + '&v=' + new Date().Format("yyyy-MM-dd hh:mm:ss");
}
else {
url = url + '?v=' + new Date().Format("yyyy-MM-dd hh:mm:ss");
@ -883,7 +882,7 @@ layui.define(["jquery", "layer", 'table', 'treeTable', 'xmSelect', 'miniTab'], f
moduleId = location.pathname;
}
//没有权限就返回无
if (!top.clients||!top.clients.moduleFields) {
if (!top.clients || !top.clients.moduleFields) {
return [];
}
if (!!top.clients.moduleFields[moduleId.split("?")[0]] && top.clients.moduleFields[moduleId.split("?")[0]] == true) {
@ -914,7 +913,7 @@ layui.define(["jquery", "layer", 'table', 'treeTable', 'xmSelect', 'miniTab'], f
treeTableRowClick: function (type, rendertree, tableId, oneList, moreList, clickfunction) {
var oneList = !!oneList ? oneList : [];
var moreList = !!moreList ? moreList : [];
treeTable.on('row(' + tableId + ')', function (obj) {
treeTablelay.on('row(' + tableId + ')', function (obj) {
obj.tr.addClass("layui-table-click").siblings().removeClass("layui-table-click");
obj.tr.find("div.layui-unselect.layui-form-" + type)[0].click();
if (type == "radio") {
@ -930,7 +929,7 @@ layui.define(["jquery", "layer", 'table', 'treeTable', 'xmSelect', 'miniTab'], f
}
})
//多选框监听
treeTable.on(type + '(' + tableId + ')', function (obj) {
treeTablelay.on(type + '(' + tableId + ')', function (obj) {
var buttonHumanized = sessionStorage.getItem('watercloudButtonHumanized');
//控制按钮
var data = rendertree.checkStatus(false);
@ -1007,14 +1006,14 @@ layui.define(["jquery", "layer", 'table', 'treeTable', 'xmSelect', 'miniTab'], f
if (!!formdate) {
for (var key in formdate) {
var $id = element.find('#' + key);
if (!!$id && formdate[key] != 0 && formdate[key]!=false && !formdate[key]) {
if (!!$id && formdate[key] != 0 && formdate[key] != false && !formdate[key]) {
$id.parent().parent().remove();
}
};
return false;
}
},
checkPhone:function (cols) {
checkPhone: function (cols) {
var sUserAgent = navigator.userAgent.toLowerCase();
var bIsIpad = sUserAgent.match(/ipad/i) == "ipad";
var bIsIphoneOs = sUserAgent.match(/iphone os/i) == "iphone os";
@ -1034,7 +1033,7 @@ layui.define(["jquery", "layer", 'table', 'treeTable', 'xmSelect', 'miniTab'], f
//跳转pc端页面
return cols;
}
}
}
//表格单元格自动列宽
//tableResize: function (id) {
// //动态监听表头高度变化,冻结行跟着改变高度