Skip to content

S
Skyeye

doc_wei / Skyeye

通知 1195
Star 154
Fork 127
S
Skyeye
提交 96b850be 编写于 作者: doc_wei's avatar doc_wei
浏览文件
操作

表单布局优化，删除桌面管理前台代码

上级 11edd4bc
隐藏空白更改
内联 并排
Showing with 64 addition and 449 deletion
base-server/src/main/resources/template/js/attr/attrList.js
浏览文件 @ 96b850be
......@@ -36,13 +36,13 @@ layui.config({
limit: getLimit(),
cols: [[
{ title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
{ field: 'attrKey', title: '属性', align: 'left', width: 150 },
{ field: 'name', title: '名称', align: 'left', width: 120, templet: function (d) {
if (!isNull(d.attrDefinitionCustom)) {
return d.attrDefinitionCustom.name;
}
return d.name;
}},
{ field: 'attrKey', title: '属性', align: 'left', width: 150 },
{ field: 'attrType', title: '类型', align: 'left', width: 120 },
{ field: 'componentName', title: '关联组件', align: 'left', width: 140, templet: function (d) {
if (!isNull(d.attrDefinitionCustom) && !isNull(d.attrDefinitionCustom.dsFormComponent)) {
......
base-server/src/main/resources/template/js/processAttr/processAttrAdd.js
浏览文件 @ 96b850be
......@@ -71,11 +71,12 @@ layui.config({
even: true,
page: false,
rowDrag: {
trigger: 'row',
trigger: '.drag-row',
done: function(obj) {}
},
cols: [[
{ type: 'checkbox', align: 'center' },
{ field: 'test', title: '', align: 'left', width: 40, templet: function (d) {return '<i class="fa fa-arrows drag-row" />';}},
{ field: 'attrKey', title: '属性<i class="red">*</i>', align: 'left', width: 150, templet: function (d) {
var _html = `<select lay-filter="tableSelect" lay-search="" id="attrKey${d.id}" cus-id="${d.id}" win-verify="required"><option value="">全部</option>`;
$.each(childAttr, function (i, item) {
......
base-server/src/main/resources/template/js/processAttr/processAttrEdit.js
浏览文件 @ 96b850be
......@@ -127,11 +127,12 @@ layui.config({
even: true,
page: false,
rowDrag: {
trigger: 'row',
trigger: '.drag-row',
done: function(obj) {}
},
cols: [[
{ type: 'checkbox', align: 'center' },
{ field: 'test', title: '', align: 'left', width: 40, templet: function (d) {return '<i class="fa fa-arrows drag-row" />';}},
{ field: 'attrKey', title: '属性<i class="red">*</i>', align: 'left', width: 150, templet: function (d) {
var _html = `<select lay-filter="tableSelect" lay-search="" id="attrKey${d.id}" cus-id="${d.id}" win-verify="required"><option value="">全部</option>`;
$.each(childAttr, function (i, item) {
......
common/src/main/resources/template/js/dsFormPage/editPageContent.js
浏览文件 @ 96b850be
......@@ -171,10 +171,6 @@ layui.config({
newParams.width = $("#width").val();
newParams.attrKey = $("#attrKey").val();
if (!$("#attrKeyBox").hasClass('layui-hide') && isNull($("#attrKey").val())) {
winui.window.msg("请选择关联属性.", {icon: 2, time: 2000});
return false;
}
if (!isNull($("#attrKey").val())) {
newParams.attrDefinition = getInPoingArr(parent.attrList, 'attrKey', $("#attrKey").val());
}
......
common/src/main/resources/template/js/dsFormPage/simpleTableDesign.js
浏览文件 @ 96b850be
......@@ -123,7 +123,9 @@ layui.config({
var id = $(item).attr('cus-id');
var tableData = getInPoingArr(tableDataList, 'id', id);
var jsEditor = CodeMirror.fromTextArea(document.getElementById("templet" + id), codeUtil.getConfig('text/javascript'));
jsEditor.setValue(tableData.templet);
if (!isNull(tableData.templet)) {
jsEditor.setValue(tableData.templet);
}
jsEditorMap[id] = jsEditor;
});
......
userauth/src/main/resources/template/js/sysEveDesktop/sysEveDesktopAdd.js 已删除 100644 → 0
浏览文件 @ 11edd4bc
layui.config({
base: basePath,
version: skyeyeVersion
}).extend({
window: 'js/winui.window'
}).define(['window', 'jquery', 'winui', 'fileUpload'], function (exports) {
winui.renderColor();
layui.use(['form'], function (form) {
var index = parent.layer.getFrameIndex(window.name);
var $ = layui.$;
skyeyeClassEnumUtil.showEnumDataListByClassName("commonEnable", 'radio', "enabled", '', form);
// 初始化上传
$("#logo").upload(systemCommonUtil.uploadCommon003Config('logo', 12, '', 1));
matchingLanguage();
form.render();
form.on('submit(formAddBean)', function (data) {
if (winui.verifyForm(data.elem)) {
var params = {
name: $("#name").val(),
desktopCode: $("#code").val(),
enabled: $("#enabled input:radio:checked").val(),
appPageUrl: $("#appPageUrl").val(),
logo: $("#logo").find("input[name='upload']").attr("oldurl")
};
if (isNull(params.logo)) {
winui.window.msg('请上传图片', {icon: 2, time: 2000});
return false;
}
AjaxPostUtil.request({url: reqBasePath + "writeSysEveDesktopMation", params: params, type: 'json', method: "POST", callback: function(json) {
parent.layer.close(index);
parent.refreshCode = '0';
}});
}
return false;
});
$("body").on("click", "#cancle", function() {
parent.layer.close(index);
});
});
});
\ No newline at end of file
userauth/src/main/resources/template/js/sysEveDesktop/sysEveDesktopEdit.js 已删除 100644 → 0
浏览文件 @ 11edd4bc
layui.config({
base: basePath,
version: skyeyeVersion
}).extend({
window: 'js/winui.window'
}).define(['window', 'jquery', 'winui', 'fileUpload'], function (exports) {
winui.renderColor();
layui.use(['form'], function (form) {
var index = parent.layer.getFrameIndex(window.name);
var $ = layui.$;
showGrid({
id: "showForm",
url: reqBasePath + "desktop006",
params: {id: parent.rowId},
pagination: false,
method: "GET",
template: $("#beanTemplate").html(),
ajaxSendAfter:function (json) {
skyeyeClassEnumUtil.showEnumDataListByClassName("commonEnable", 'radio', "enabled", json.bean.enabled, form);
// 初始化上传
$("#logo").upload(systemCommonUtil.uploadCommon003Config('logo', 12, json.bean.logo, 1));
matchingLanguage();
form.render();
form.on('submit(formEditBean)', function (data) {
if (winui.verifyForm(data.elem)) {
var params = {
id: parent.rowId,
name: $("#name").val(),
desktopCode: $("#code").val(),
enabled: $("#enabled input:radio:checked").val(),
appPageUrl: $("#appPageUrl").val(),
logo: $("#logo").find("input[name='upload']").attr("oldurl")
};
if (isNull(params.logo)) {
winui.window.msg('请上传图片', {icon: 2, time: 2000});
return false;
}
AjaxPostUtil.request({url: reqBasePath + "writeSysEveDesktopMation", params: params, type: 'json', method: "POST", callback: function (json) {
parent.layer.close(index);
parent.refreshCode = '0';
}});
}
return false;
});
}
});
$("body").on("click", "#cancle", function() {
parent.layer.close(index);
});
});
});
\ No newline at end of file
userauth/src/main/resources/template/js/sysEveDesktop/sysEveDesktopList.js 已删除 100644 → 0
浏览文件 @ 11edd4bc
var rowId = "";
layui.config({
base: basePath,
version: skyeyeVersion
}).extend({
window: 'js/winui.window'
}).define(['window', 'table', 'jquery', 'winui', 'form'], function (exports) {
winui.renderColor();
var $ = layui.$,
form = layui.form,
table = layui.table;
authBtn('1563780633455');
table.render({
id: 'messageTable',
elem: '#messageTable',
method: 'post',
url: reqBasePath + 'desktop001',
where: getTableParams(),
even: true,
page: true,
limits: getLimits(),
limit: getLimit(),
cols: [[
{ title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
{ field: 'name', title: '桌面名称', align: 'left', width: 150 },
{ field: 'code', title: '编码', align: 'left', width: 120 },
{ field: 'logo', title: 'LOGO', align: 'center', width: 60, templet: function (d) {
if (isNull(d.logo)) {
return '<img src="../../assets/images/os_windows.png" class="photo-img">';
} else {
return '<img src="' + systemCommonUtil.getFilePath(d.logo) + '" class="photo-img" lay-event="logo">';
}
}},
{ field: 'allNum', title: '菜单数量', align: 'center', width: 100 },
{ field: 'orderBy', title: '序号', align: 'center', width: 80 },
{ field: 'enabled', title: '状态', width: 80, align: 'center', templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("commonEnable", 'id', d.enabled, 'name');
}},
{ field: 'appPageUrl', title: 'APP跳转地址', align: 'left', width: 180 },
{ field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], width: 120 },
{ field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], align: 'center', width: 150 },
{ field: 'lastUpdateName', title: systemLanguage["com.skyeye.lastUpdateName"][languageType], align: 'left', width: 120 },
{ field: 'lastUpdateTime', title: systemLanguage["com.skyeye.lastUpdateTime"][languageType], align: 'center', width: 150 },
{ title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 300, toolbar: '#tableBar'}
]],
done: function(json) {
matchingLanguage();
initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入桌面名称", function () {
table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()});
});
}
});
table.on('tool(messageTable)', function (obj) {
var data = obj.data;
var layEvent = obj.event;
if (layEvent === 'edit') { //编辑
edit(data);
} else if (layEvent === 'delet') { //删除
delet(data);
} else if (layEvent === 'upMove') { //上移
upMove(data);
} else if (layEvent === 'downMove') { //下移
downMove(data);
} else if (layEvent === 'remove') { //一键移除菜单
remove(data);
} else if (layEvent === 'logo') { //logo预览
systemCommonUtil.showPicImg(systemCommonUtil.getFilePath(data.logo));
}
});
// 添加
$("body").on("click", "#addBean", function() {
_openNewWindows({
url: "../../tpl/sysEveDesktop/sysEveDesktopAdd.html",
title: systemLanguage["com.skyeye.addPageTitle"][languageType],
pageId: "sysEveDesktopAdd",
area: ['90vw', '90vh'],
callBack: function (refreshCode) {
winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
loadTable();
}});
});
// 删除
function delet(data) {
layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function (index) {
layer.close(index);
AjaxPostUtil.request({url: reqBasePath + "desktop003", params: {id: data.id}, type: 'json', method: "DELETE", callback: function (json) {
winui.window.msg(systemLanguage["com.skyeye.deleteOperationSuccessMsg"][languageType], {icon: 1, time: 2000});
loadTable();
}});
});
}
// 一键移除菜单
function remove(data) {
var msg = '确认一键移除菜单选择该桌面的所有菜单吗？';
layer.confirm(msg, { icon: 3, title: '一键移除菜单' }, function (index) {
layer.close(index);
AjaxPostUtil.request({url: reqBasePath + "desktop012", params: {id: data.id}, type: 'json', method: "POST", callback: function (json) {
winui.window.msg("移除成功", {icon: 1, time: 2000});
loadTable();
}});
});
}
// 编辑
function edit(data) {
rowId = data.id;
_openNewWindows({
url: "../../tpl/sysEveDesktop/sysEveDesktopEdit.html",
title: systemLanguage["com.skyeye.editPageTitle"][languageType],
pageId: "sysEveDesktopEdit",
area: ['90vw', '90vh'],
callBack: function (refreshCode) {
winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
loadTable();
}
});
}
// 上移
function upMove(data) {
AjaxPostUtil.request({url: reqBasePath + "desktop008", params: {id: data.id}, type: 'json', method: "POST", callback: function (json) {
winui.window.msg(systemLanguage["com.skyeye.moveUpOperationSuccessMsg"][languageType], {icon: 1, time: 2000});
loadTable();
}});
}
// 下移
function downMove(data) {
AjaxPostUtil.request({url: reqBasePath + "desktop009", params: {id: data.id}, type: 'json', method: "POST", callback: function (json) {
winui.window.msg(systemLanguage["com.skyeye.moveDownOperationSuccessMsg"][languageType], {icon: 1, time: 2000});
loadTable();
}});
}
form.render();
$("body").on("click", "#reloadTable", function() {
loadTable();
});
function loadTable() {
table.reloadData("messageTable", {where: getTableParams()});
}
function getTableParams() {
return $.extend(true, {}, initTableSearchUtil.getSearchValue("messageTable"));
}
exports('sysEveDesktopList', {});
});
userauth/src/main/resources/template/tpl/sysEveDesktop/sysEveDesktopAdd.html 已删除 100644 → 0
浏览文件 @ 11edd4bc
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8" />
<title></title>
<link href="../../assets/lib/layui/css/layui.css" rel="stylesheet" />
<link href="../../assets/lib/winui/css/winui.css" rel="stylesheet" />
</head>
<body>
<div style="margin:0 auto;padding:20px;">
<form class="layui-form" action="" id="showForm" autocomplete="off">
<div class="layui-form-item layui-col-xs12">
<span class="hr-title">基本信息</span><hr>
</div>
<div class="layui-form-item layui-col-xs6">
<label class="layui-form-label">名称<i class="red">*</i></label>
<div class="layui-input-block">
<input type="text" id="name" name="name" win-verify="required" placeholder="请输入名称" class="layui-input"/>
<div class="layui-form-mid layui-word-aux">该名称在系统中唯一。</div>
</div>
</div>
<div class="layui-form-item layui-col-xs6">
<label class="layui-form-label">编码<i class="red">*</i></label>
<div class="layui-input-block">
<input type="text" id="code" name="code" win-verify="required" placeholder="请输入编码" class="layui-input"/>
<div class="layui-form-mid layui-word-aux">该编码在系统中唯一。例如：ERP_DESKTOP</div>
</div>
</div>
<div class="layui-form-item layui-col-xs12">
<label class="layui-form-label">状态<i class="red">*</i></label>
<div class="layui-input-block winui-radio" id="enabled">
</div>
</div>
<div class="layui-form-item layui-col-xs12">
<label class="layui-form-label">logo<i class="red">*</i></label>
<div class="layui-input-block">
<div class="upload" id="logo"></div>
</div>
</div>
<div class="layui-form-item layui-col-xs12">
<span class="hr-title">APP配置</span><hr>
</div>
<div class="layui-form-item layui-col-xs12">
<label class="layui-form-label">跳转地址</label>
<div class="layui-input-block">
<input type="text" id="appPageUrl" name="appPageUrl" placeholder="请输入跳转地址" class="layui-input"/>
</div>
</div>
<div class="layui-form-item layui-col-xs12">
<div class="layui-input-block">
<button class="winui-btn" id="cancle"><language showName="com.skyeye.cancel"></language></button>
<button class="winui-btn" lay-submit lay-filter="formAddBean"><language showName="com.skyeye.save"></language></button>
</div>
</div>
</form>
</div>
<script src="../../assets/lib/layui/layui.js"></script>
<script src="../../assets/lib/layui/custom.js"></script>
<script type="text/javascript">
layui.config({base: '../../js/sysEveDesktop/'}).use('sysEveDesktopAdd');
</script>
</body>
</html>
\ No newline at end of file
userauth/src/main/resources/template/tpl/sysEveDesktop/sysEveDesktopEdit.html 已删除 100644 → 0
浏览文件 @ 11edd4bc
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8" />
<title></title>
<link href="../../assets/lib/layui/css/layui.css" rel="stylesheet" />
<link href="../../assets/lib/winui/css/winui.css" rel="stylesheet" />
</head>
<body>
<div style="padding:20px; margin:0 auto;">
<form class="layui-form" action="" id="showForm">
</form>
</div>
<script type="text/x-handlebars-template" id="beanTemplate">
{{#bean}}
<div class="layui-form-item layui-col-xs12">
<span class="hr-title">基本信息</span><hr>
</div>
<div class="layui-form-item layui-col-xs6">
<label class="layui-form-label">名称<i class="red">*</i></label>
<div class="layui-input-block">
<input type="text" id="name" name="name" win-verify="required" placeholder="请输入名称" class="layui-input" value="{{name}}"/>
<div class="layui-form-mid layui-word-aux">该名称在系统中唯一。</div>
</div>
</div>
<div class="layui-form-item layui-col-xs6">
<label class="layui-form-label">编码<i class="red">*</i></label>
<div class="layui-input-block">
<input type="text" id="code" name="code" win-verify="required" placeholder="请输入编码" class="layui-input" value="{{desktopCode}}"/>
<div class="layui-form-mid layui-word-aux">该编码在系统中唯一。例如：ERP_DESKTOP</div>
</div>
</div>
<div class="layui-form-item layui-col-xs12">
<label class="layui-form-label">状态<i class="red">*</i></label>
<div class="layui-input-block winui-radio" id="enabled">
</div>
</div>
<div class="layui-form-item layui-col-xs12">
<label class="layui-form-label">logo<i class="red">*</i></label>
<div class="layui-input-block">
<div class="upload" id="logo"></div>
</div>
</div>
<div class="layui-form-item layui-col-xs12">
<span class="hr-title">APP配置</span><hr>
</div>
<div class="layui-form-item layui-col-xs12">
<label class="layui-form-label">跳转地址</label>
<div class="layui-input-block">
<input type="text" id="appPageUrl" name="appPageUrl" placeholder="请输入跳转地址" class="layui-input" value="{{appPageUrl}}"/>
</div>
</div>
<div class="layui-form-item layui-col-xs12">
<div class="layui-input-block">
<button class="winui-btn" id="cancle"><language showName="com.skyeye.cancel"></language></button>
<button class="winui-btn" lay-submit lay-filter="formEditBean"><language showName="com.skyeye.save"></language></button>
</div>
</div>
{{/bean}}
</script>
<script src="../../assets/lib/layui/layui.js"></script>
<script src="../../assets/lib/layui/custom.js"></script>
<script type="text/javascript">
layui.config({base: '../../js/sysEveDesktop/'}).use('sysEveDesktopEdit');
</script>
</body>
</html>
\ No newline at end of file
userauth/src/main/resources/template/tpl/sysEveDesktop/sysEveDesktopList.html 已删除 100644 → 0
浏览文件 @ 11edd4bc
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8" />
<title></title>
<link href="../../assets/lib/layui/css/layui.css" rel="stylesheet" />
<link href="../../assets/lib/winui/css/winui.css" rel="stylesheet" />
</head>
<body>
<div class="winui-toolbar">
<div class="winui-tool">
<button id="reloadTable" class="winui-toolbtn search-table-btn-right"><i class="fa fa-refresh" aria-hidden="true"></i><language showName="com.skyeye.refreshDataBtn"></language></button>
<button id="addBean" class="winui-toolbtn search-table-btn-right" auth="1563780633455"><i class="fa fa-plus" aria-hidden="true"></i><language showName="com.skyeye.addBtn"></language></button>
</div>
</div>
<div style="margin:auto 10px;">
<table id="messageTable" lay-filter="messageTable"></table>
<script type="text/html" id="tableBar">
{{# if(auth('1563780633455')){ }}
<a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="edit"><language showName="com.skyeye.editBtn"></language></a>
{{# } }}
{{# if(d.allNum == 0 && auth('1563780647628')){ }}
<a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="delet"><language showName="com.skyeye.deleteBtn"></language></a>
{{# } }}
{{# if(auth('1563780703264')){ }}
<a class="layui-btn layui-btn-xs" lay-event="upMove">上移</a>
{{# } }}
{{# if(auth('1563780716346')){ }}
<a class="layui-btn layui-btn-xs" lay-event="downMove">下移</a>
{{# } }}
{{# if(d.allNum > 0 && auth('1563866719229')){ }}
<a class="layui-btn layui-btn-xs" lay-event="remove">一键移除菜单</a>
{{# } }}
</script>
</div>
<script src="../../assets/lib/layui/layui.js"></script>
<script src="../../assets/lib/layui/custom.js"></script>
<script type="text/javascript">
layui.config({base: '../../js/sysEveDesktop/'}).use('sysEveDesktopList');
</script>
</body>
</html>
\ No newline at end of file
web/src/main/resources/template/assets/lib/layui/customer/common/systemCommonUtil.js
浏览文件 @ 96b850be
......@@ -1006,9 +1006,14 @@ var dataShowType = {
*/
showData: function (json, showType, showBoxId, defaultId, form, callback, chooseCallback, valueKey) {
$("#" + showBoxId).html('');
$("#" + showBoxId).attr('showType', showType);
if (showType == 'select') {
// 下拉框
$("#" + showBoxId).html(getDataUseHandlebars(getFileContent('tpl/template/select-option.tpl'), json));
if ($("#" + showBoxId).is('select')) {
$("#" + showBoxId).html(getDataUseHandlebars(getFileContent('tpl/template/select-option.tpl'), json));
} else {
$("#" + showBoxId).html('<select>' + getDataUseHandlebars(getFileContent('tpl/template/select-option.tpl'), json) + '</select>');
}
if (!isNull(defaultId)) {
$("#" + showBoxId).val(defaultId);
} else {
......@@ -1024,7 +1029,7 @@ var dataShowType = {
$("#" + showBoxId).html(getDataUseHandlebars(getFileContent('tpl/template/checkbox-property.tpl'), json));
if (!isNull(defaultId)) {
var arr = defaultId.split(",");
for(var i = 0; i < arr.length; i++){
for (var i = 0; i < arr.length; i++) {
$('input:checkbox[rowId="' + arr[i] + '"]').attr("checked", true);
}
} else {
......@@ -1217,6 +1222,38 @@ var dataShowType = {
if (typeof (callback) == "function") {
callback(json);
}
},
getData: function (showBoxId) {
var showType = $("#" + showBoxId).attr('showType');
var value;
if (showType == 'select') {
// 下拉框
if ($("#" + showBoxId).is('select')) {
value = $("#" + showBoxId).val();
} else {
value = $("#" + showBoxId).find('select').val();
}
} else if (showType == 'checkbox') {
// 多选框
var checkRow = $(`#${showBoxId} input[type='checkbox']:checked`);
var checkTrueList = [];
$.each(checkRow, function (i, item) {
checkTrueList.push($(item).attr('id'));
});
value = checkTrueList;
} else if (showType == 'radio') {
// 单选框
value = $(`#${showBoxId} input:radio:checked`).val()
} else if (showType == 'verificationSelect') {
// 多选下拉框
value = $(`#${showBoxId}`).attr('value')
} else if (showType == 'radioTree' || showType == 'checkboxTree') {
// 单选框树/多选框树
value = $(`#${showBoxId}`).attr('chooseId');
} else if (showType == 'selectTree') {
}
return value;
}
};
......
web/src/main/resources/template/assets/lib/layui/customer/skyeye/dsFormUtil.js
浏览文件 @ 96b850be
......@@ -56,13 +56,21 @@ var dsFormUtil = {
initEditPage: function(showBoxId, pageMation, data) {
dsFormUtil.initCreatePage(showBoxId, pageMation);
$.each(dsFormUtil.pageMation.dsFormPageContents, function (i, content) {
if (!isNull(content.attrDefinition)) {
var attrDefinition = content.attrDefinition;
if (!isNull(attrDefinition) && !$.isEmptyObject(attrDefinition)) {
// 获取组件中设置值的脚本
var dsFormComponent = content.dsFormComponent;
var setValueScript = getDataUseHandlebars('{{#this}}' + dsFormComponent.jsFitValue + '{{/this}}', content);
// value参数不能删除，用于组件的赋值脚本使用
var value = data[content.attrDefinition.attrKey];
eval(setValueScript);
var value = data[attrDefinition.attrKey];
content["value"] = value;
var jsFitValue = dsFormComponent.jsFitValue;
if (!isNull(jsFitValue) && jsFitValue.startsWith('layui.define')) {
var setValueScript = getDataUseHandlebars('{{#this}}' + dsFormComponent.jsFitValue + '{{/this}}', content);
$(`#script${content.id}`).remove();
$(`div[contentId="${content.id}"]`).after(`<script id="script${content.id}">${setValueScript}</script>`);
} else {
var setValueScript = getDataUseHandlebars('{{#this}}' + dsFormComponent.jsFitValue + '{{/this}}', content);
eval(setValueScript);
}
}
});
layui.form.render();
......@@ -98,7 +106,7 @@ var dsFormUtil = {
if (winui.verifyForm(data.elem) && !isNull(dsFormUtil.pageMation)) {
var params = {};
$.each(dsFormUtil.pageMation.dsFormPageContents, function (i, content) {
if (!isNull(content.attrDefinition)) {
if (!isNull(content.attrDefinition) && !$.isEmptyObject(content.attrDefinition)) {
// 获取组件中获取值的脚本
var dsFormComponent = content.dsFormComponent;
var getValueScript = getDataUseHandlebars('{{#this}}' + dsFormComponent.jsValue + '{{/this}}', content);
......@@ -150,7 +158,7 @@ var dsFormUtil = {
var jsonStr = {bean: content};
var html = getDataUseHandlebars('{{#bean}}' + component.htmlContent + '{{/bean}}', jsonStr);
var html_js = getDataUseHandlebars('{{#bean}}' + component.jsContent + '{{/bean}}', jsonStr);
var jsCon = `<script>${html_js}</script>`;
var jsCon = `<script id="script${content.id}">${html_js}</script>`;
$("#" + boxId).append(html + jsCon);
if (!isNull(content.require) && content.require.indexOf('required') >= 0) {
......@@ -691,7 +699,7 @@ var dsFormTableUtil = {
calcOperateColumnWidth: function () {
var _a = $('#actionBar').find('a');
var width = 100;
// 获取操作列中有多少个按钮，公式：文字的数量 * 12(一个文字的宽度) + 按钮的数量 * 10(按钮的内边距) + (按钮的数量 - 1) * 10(按钮外边距) + 16(操作列的内边距)
// 获取操作列中有多少个按钮，公式：文字的数量 * 14(一个文字的宽度) + 按钮的数量 * 10(按钮的内边距) + (按钮的数量 - 1) * 10(按钮外边距) + 16(操作列的内边距)
if (!isNull(_a) && _a.length > 0) {
var btnName = '';
$.each(_a, function (i, item) {
......@@ -699,7 +707,7 @@ var dsFormTableUtil = {
});
if (!isNull(btnName)) {
var length = btnName.length;
width = 12 * length + _a.length * 10 + (_a.length - 1) * 10 + 16;
width = 14 * length + _a.length * 10 + (_a.length - 1) * 10 + 16;
}
}
return width;
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或