cdl/HTCloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

升级.net8暂存

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
HT.Cloud.Web/wwwroot/js/lay-config.js
View File

@ -21,7 +21,7 @@ layui.config({
miniTheme: "layuimini/miniTheme", // layuimini 主题扩展
miniTongji: "layuimini/miniTongji", // layuimini 统计扩展
step: 'step-lay/step', // 分步表单扩展
treeTable: 'treetable-lay/treeTable', //table树形扩展3.x
treeTablelay: 'treetable-lay/treeTable', //table树形扩展3.x
tableSelect: 'tableSelect/tableSelect', // table选择扩展
tableEdit: 'tableSelect/tableEdit', // table编辑扩展
iconPickerFa: 'iconPicker/iconPickerFa', // fa图标选择扩展

2
HT.Cloud.Web/wwwroot/js/lay-module/formDesigner/formPreview.js
View File

@ -1262,13 +1262,11 @@ layui.define(['layer', 'laytpl', 'element', 'form', 'slider', 'laydate', 'rate',
var readForm = $('#formPreviewForm');
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);
if (typeof options.canformitems != "undefined" && Array.isArray(options.canformitems)) {
var readForm = $('#formPreviewForm');
for (var i = 0; i < options.canformitems.length; i++) {
$('[name="' + options.canformitems[i]+'"]').removeAttr('disabled');
$('[name="' + options.canformitems[i] + ']"').attr('lay-verify', 'required');
readForm.find('.layui-layedit iframe').contents().find('body').prop('contenteditable', true);
}
}
}

2
HT.Cloud.Web/wwwroot/js/lay-module/soulTable/tableFilter.js
View File

@ -2810,7 +2810,7 @@ layui.define(['table', 'form', 'laydate', 'util', 'excel', 'laytpl'], function (
for (i = 0; i < data.length; i++) {
for (j = 0; j < columns.length; j++) {
if ((columns[j].field || columns[j].type === 'numbers') && (customColumns && Array.isArray(customColumns) || !columns[j].hide)) {
data[i][columns[j].key] = data[i][columns[j].field || columns[j]['LAY_TABLE_INDEX']]
data[i][columns[j].key] = data[i][columns[j].field || columns[j]['LAY_INDEX']]
}
}
}

17
HT.Cloud.Web/wwwroot/js/lay-module/tableSelect/tableEdit.js
View File

@ -12,7 +12,7 @@ layui.define(["laydate","laytpl","table","layer"],function(exports) {
,'{{# d.data.forEach(function(item){ }}'
,'{{# var selectedClass = d.callbackFn(item) }}'
,'<li class="{{ selectedClass }}" data-name="{{ item.name }}" data-value="{{ item.value }}">'
,'<div class="layui-unselect layui-form-checkbox" lay-skin="primary"><span>{{ item.name }}</span></div>'
,'<div class="layui-unselect layui-form-checkbox" lay-skin="primary"><div>{{ item.name }}</div></div>'
,'</li>'
,'{{# }); }}'
,'{{# } else { }}'
@ -29,7 +29,7 @@ layui.define(["laydate","laytpl","table","layer"],function(exports) {
,'{{# d.data.forEach(function(item){ }}'
,'{{# var selectedClass = d.callbackFn(item) }}'
,'<li class="{{ selectedClass }}" data-name="{{ item.name }}" data-value="{{ item.value }}">'
,'<div class="layui-unselect layui-form-checkbox" lay-skin="primary"><span>{{ item.name }}</span><i class="layui-icon layui-icon-ok"></i></div>'
,'<div class="layui-unselect layui-form-checkbox" lay-skin="primary"><div>{{ item.name }}</div><i class="layui-icon layui-icon-ok"></i></div>'
,'</li>'
,'{{# }); }}'
,'{{# } else { }}'
@ -112,7 +112,7 @@ layui.define(["laydate","laytpl","table","layer"],function(exports) {
document.onclick = function () {if(singleInstance.leaveStat)singleInstance.deleteAll();};
//日期选择框
Class.prototype.date = function(options){
Class.prototype.date = function (options) {
var othis = this;
othis.callback = options.callback,othis.element = options.element,othis.dateType = options.dateType;
othis.dateType = othis.isEmpty(othis.dateType) ? "datetime":othis.dateType;
@ -124,7 +124,8 @@ layui.define(["laydate","laytpl","table","layer"],function(exports) {
(that.offsetHeight - 39 > 3) && input.css('height','50px');
$(that).append(input),input.focus();
//日期时间选择器 (show: true 表示直接显示)
laydate.render({elem: input[0],type: othis.dateType,show: true,done:function (value, date) {
laydate.render({
elem: input[0], value: options.element.innerText, type: othis.dateType, show: true, done: function (value, date) {
othis.deleteAll();
if(othis.callback)othis.callback.call(that,value);
}});
@ -133,7 +134,7 @@ layui.define(["laydate","laytpl","table","layer"],function(exports) {
};
//输入框
Class.prototype.input = function(options){
Class.prototype.input = function (options) {
var othis = this;
othis.callback = options.callback,othis.element = options.element;
othis.oldValue = options.oldValue;
@ -155,7 +156,7 @@ layui.define(["laydate","laytpl","table","layer"],function(exports) {
};
//带加号和减号的输入框(只支持输入数字)
Class.prototype.signedInput = function(options){
Class.prototype.signedInput = function (options) {
var othis = this;
othis.callback = options.callback,othis.element = options.element;
othis.oldValue = options.oldValue;
@ -165,8 +166,8 @@ layui.define(["laydate","laytpl","table","layer"],function(exports) {
othis.deleteAll(),othis.leaveStat = false;
var thisWidth = that.offsetWidth-49;
var input = $('<input class="layui-input layui-tableEdit-input" style="left: 24px;width: '+thisWidth+'px" type="text">');//
var leftBtn = $('<button type="button" class="layui-btn layui-btn-sm layui-tableEdit-sub"><i class="layui-icon layui-icon-subtraction" style="margin-top:-14px!important;position: absolute;left:2px!important"></i></button>');
var rightBtn = $('<button type="button" class="layui-btn layui-btn-sm layui-tableEdit-add"><i class="layui-icon layui-icon-addition" style="margin-top:-14px!important;position: absolute;right:-1px!important"></i></button>');
var leftBtn = $('<button type="button" class="layui-btn layui-btn-sm layui-tableEdit-sub"><i class="layui-icon layui-icon-subtraction" style="margin-top:-14px!important;position: absolute;left:-1px!important;padding: 0px;"></i></button>');
var rightBtn = $('<button type="button" class="layui-btn layui-btn-sm layui-tableEdit-add"><i class="layui-icon layui-icon-addition" style="margin-top:-14px!important;position: absolute;right:-1px!important;padding: 0px;"></i></button>');
if(39 - that.offsetHeight > 3){
input.css('height','30px');leftBtn.css('top','16px');rightBtn.css('top','16px');
}

2
HT.Cloud.Web/wwwroot/js/lay-module/tableSelect/tableSelect.js
View File

@ -113,7 +113,7 @@ layui.define(['table', 'jquery', 'form'], function (exports) {
for (var j = 0; j < checkedData.length; j++) {
if (res.data[i][opt.checkedKey] == checkedData[j][opt.checkedKey]) {
res.data[i].LAY_CHECKED = true;
var index = res.data[i]['LAY_TABLE_INDEX'];
var index = res.data[i]['LAY_INDEX'];
var checkbox = $('#' + tableName + '').next().find('tr[data-index=' + index + '] input[type="checkbox"]');
checkbox.prop('checked', true).next().addClass('layui-form-checked');
var radio = $('#' + tableName + '').next().find('tr[data-index=' + index + '] input[type="radio"]');

8
HT.Cloud.Web/wwwroot/js/lay-module/treetable-lay/treeTable.js
View File

@ -6,7 +6,7 @@ layui.define(['laytpl', 'form', 'util'], function (exports) {
var form = layui.form;
var util = layui.util;
var device = layui.device();
var MOD_NAME = 'treeTable'; // 模块名
var MOD_NAME = 'treeTablelay'; // 模块名
var _instances = {}; // 记录所有实例
/* 表格默认参数 */
@ -836,7 +836,7 @@ layui.define(['laytpl', 'form', 'util'], function (exports) {
if (h) hide = h;//当所有父级存在隐藏时，隐藏所有子集
for (var i = 0; i < data.length; i++) {
var d = data[i];
d.LAY_INDEX = (parent ? parent.LAY_INDEX + '-' : '') + i;
d.LAY_NUM = (parent ? parent.LAY_NUM + '-' : '') + i;
html += this.renderBodyTr(d, indent, hide);
// 递归渲染子集
html += this.renderBody(d[options.tree.childName], indent + 1, d, h);
@ -870,7 +870,7 @@ layui.define(['laytpl', 'form', 'util'], function (exports) {
if (hide) classNames += 'ew-tree-tb-hide';
html += (' class="' + classNames + '"');
if (haveChild) html += (' data-have-child="' + haveChild + '"');
html += (' data-index="' + d.LAY_INDEX + '"');
html += (' data-index="' + d.LAY_NUM + '"');
html += (' data-indent="' + indent + '">');
var index = 0;
this.eachCols(function (i, col) {
@ -2276,5 +2276,5 @@ layui.define(['laytpl', 'form', 'util'], function (exports) {
'</style>'
].join(''));
exports('treeTable', tt);
exports('treeTablelay', tt);
});

59
HT.Cloud.Web/wwwroot/js/lay-module/waterCloud/common.js
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) {
// //动态监听表头高度变化，冻结行跟着改变高度