Pre Merge pull request !179 from MccRay/master
This commit is contained in:
MccRay
Gitee
commit
8a7fdc0c25
|
|
@ -1230,6 +1230,25 @@ var table = {
|
|||
$.modal.alertError(result.msg);
|
||||
}
|
||||
$.modal.closeLoading();
|
||||
},
|
||||
// 显示富文本详细内容
|
||||
seeSummernoteDetail: function(index,fild) {
|
||||
table.set();
|
||||
var row = $("#" + table.options.id).bootstrapTable('getData')[index];
|
||||
var content = decodeURI(window.atob(row[fild]));
|
||||
var htmlcontent = [
|
||||
"<div style='padding:20px;'>",
|
||||
content,
|
||||
"</div>"
|
||||
].join('');
|
||||
layer.open({
|
||||
title: false,
|
||||
type: 1,
|
||||
closeBtn: true,
|
||||
shadeClose: true,
|
||||
area: ['800px', ($(window).height() - 50)+ 'px'],
|
||||
content: htmlcontent
|
||||
});
|
||||
}
|
||||
},
|
||||
// 校验封装处理
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@ public class GenTableColumn extends BaseEntity
|
|||
/** 查询方式（EQ等于、NE不等于、GT大于、LT小于、LIKE模糊、BETWEEN范围） */
|
||||
private String queryType;
|
||||
|
||||
/** 显示类型（input文本框、textarea文本域、select下拉框、checkbox复选框、radio单选框、datetime日期控件） */
|
||||
/** 显示类型（input文本框、textarea文本域、select下拉框、checkbox复选框、radio单选框、datetime日期控件、upload附件上传、summernote 富文本） */
|
||||
private String htmlType;
|
||||
|
||||
/** 字典类型 */
|
||||
|
|
|
|||
|
|
@ -520,6 +520,8 @@
|
|||
<option value="radio" {{if htmlType==="radio"}}selected{{/if}}>单选框</option>
|
||||
<option value="checkbox" {{if htmlType==="checkbox"}}selected{{/if}}>复选框</option>
|
||||
<option value="datetime" {{if htmlType==="datetime"}}selected{{/if}}>日期控件</option>
|
||||
<option value="upload" {{if htmlType==="upload"}}selected{{/if}}>文件上传</option>
|
||||
<option value="summernote" {{if htmlType==="summernote"}}selected{{/if}}>富文本</option>
|
||||
</select>
|
||||
</div>
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -2,12 +2,30 @@
|
|||
<html lang="zh" xmlns:th="http://www.thymeleaf.org">
|
||||
<head>
|
||||
<th:block th:include="include :: header('新增${functionName}')"/>
|
||||
#set($isUpload = false)
|
||||
#set($isSummernote = false)
|
||||
#set($isDateTime = false)
|
||||
#foreach($column in $columns)
|
||||
#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "datetime")
|
||||
#set($isDateTime = true)
|
||||
<th:block th:include="include :: datetimepicker-css"/>
|
||||
#break
|
||||
#end
|
||||
#end
|
||||
#foreach($column in $columns)
|
||||
#if($column.edit && !$column.superColumn && !$column.pk && $column.htmlType == "upload" )
|
||||
#set($isUpload = true)
|
||||
<th:block th:include="include :: bootstrap-fileinput-css"/>
|
||||
#break
|
||||
#end
|
||||
#end
|
||||
#foreach($column in $columns)
|
||||
#if($column.edit && !$column.superColumn && !$column.pk && $column.htmlType == "summernote")
|
||||
#set($isSummernote = true)
|
||||
<th:block th:include="include :: summernote-css"/>
|
||||
#break
|
||||
#end
|
||||
#end
|
||||
</head>
|
||||
<body class="white-bg">
|
||||
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
|
||||
|
|
@ -34,24 +52,31 @@
|
|||
#set($BusinessName=$businessName.substring(0,1).toUpperCase() + ${businessName.substring(1)})
|
||||
#set($treeId = "${className}?.${treeCode}")
|
||||
<input id="treeId" name="${treeParentCode}" type="hidden" th:value="${${treeId}}"/>
|
||||
<input class="form-control" type="text" onclick="select${BusinessName}Tree()" id="treeName" readonly="true" th:value="${${treeName}}"#if($column.required) required#end>
|
||||
<input class="form-control" type="text" onclick="select${BusinessName}Tree()"
|
||||
id="treeName" readonly="true" th:value="${${treeName}}"#if($column.required)
|
||||
required#end>
|
||||
<span class="input-group-addon"><i class="fa fa-search"></i></span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
#elseif($column.htmlType == "input")
|
||||
<div class="form-group">
|
||||
<label class="col-sm-3 control-label#if($column.required) is-required#end">${comment}：</label>
|
||||
<label class="col-sm-3 control-label#if($column.required) is-required#end">${comment}
|
||||
：</label>
|
||||
<div class="col-sm-8">
|
||||
<input name="${field}" class="form-control" type="text"#if($column.required) required#end>
|
||||
<input name="${field}" class="form-control" type="text"#if($column.required)
|
||||
required#end>
|
||||
</div>
|
||||
</div>
|
||||
#elseif($column.htmlType == "select" && "" != $dictType)
|
||||
<div class="form-group">
|
||||
<label class="col-sm-3 control-label">${comment}：</label>
|
||||
<div class="col-sm-8">
|
||||
<select name="${field}" class="form-control m-b" th:with="type=${@dict.getType('${dictType}')}"#if($column.required) required#end>
|
||||
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
|
||||
<select name="${field}" class="form-control m-b"
|
||||
th:with="type=${@dict.getType('${dictType}')}"#if($column.required)
|
||||
required#end>
|
||||
<option th:each="dict : ${type}" th:text="${dict.dictLabel}"
|
||||
th:value="${dict.dictValue}"></option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -70,7 +95,8 @@
|
|||
<label class="col-sm-3 control-label">${comment}：</label>
|
||||
<div class="col-sm-8" th:with="type=${@dict.getType('${dictType}')}">
|
||||
<label th:each="dict : ${type}" class="check-box">
|
||||
<input name="${field}" type="checkbox" th:value="${dict.dictValue}" th:text="${dict.dictLabel}"#if($column.required) required#end>
|
||||
<input name="${field}" type="checkbox" th:value="${dict.dictValue}"
|
||||
th:text="${dict.dictLabel}"#if($column.required) required#end>
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -89,7 +115,9 @@
|
|||
<label class="col-sm-3 control-label">${comment}：</label>
|
||||
<div class="col-sm-8">
|
||||
<div class="radio-box" th:each="dict : ${@dict.getType('${dictType}')}">
|
||||
<input type="radio" th:id="${'${field}_' + dict.dictCode}" name="${field}" th:value="${dict.dictValue}" th:checked="${dict.default}"#if($column.required) required#end>
|
||||
<input type="radio" th:id="${'${field}_' + dict.dictCode}" name="${field}"
|
||||
th:value="${dict.dictValue}"
|
||||
th:checked="${dict.default}"#if($column.required) required#end>
|
||||
<label th:for="${'${field}_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -110,7 +138,8 @@
|
|||
<label class="col-sm-3 control-label">${comment}：</label>
|
||||
<div class="col-sm-8">
|
||||
<div class="input-group date">
|
||||
<input name="${field}" class="form-control" placeholder="yyyy-MM-dd" type="text"#if($column.required) required#end>
|
||||
<input name="${field}" class="form-control" placeholder="yyyy-MM-dd"
|
||||
type="text"#if($column.required) required#end>
|
||||
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -119,7 +148,27 @@
|
|||
<div class="form-group">
|
||||
<label class="col-sm-3 control-label">${comment}：</label>
|
||||
<div class="col-sm-8">
|
||||
<textarea name="${field}" class="form-control"#if($column.required) required#end></textarea>
|
||||
<textarea name="${field}" class="form-control"#if($column.required)
|
||||
required#end></textarea>
|
||||
</div>
|
||||
</div>
|
||||
#elseif($column.htmlType == "upload")
|
||||
<div class="form-group">
|
||||
<label class="col-sm-3 control-label">${comment}：</label>
|
||||
<div class="col-sm-8">
|
||||
<input type="hidden" name="${field}">
|
||||
<div class="file-loading">
|
||||
<input class="form-control file-upload" name="file" id="${field}"
|
||||
type="file" >
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
#elseif($column.htmlType == "summernote" )
|
||||
<div class="form-group">
|
||||
<label class="col-sm-3 control-label">${comment}：</label>
|
||||
<div class="col-sm-8">
|
||||
<input type="hidden" class="form-control" name="${field}">
|
||||
<div class="summernote" id="${field}"></div>
|
||||
</div>
|
||||
</div>
|
||||
#end
|
||||
|
|
@ -130,8 +179,10 @@
|
|||
<h4 class="form-header h4">${subTable.functionName}信息</h4>
|
||||
<div class="row">
|
||||
<div class="col-sm-12">
|
||||
<button type="button" class="btn btn-white btn-sm" onclick="addColumn()"><i class="fa fa-plus"> 增加</i></button>
|
||||
<button type="button" class="btn btn-white btn-sm" onclick="sub.delColumn()"><i class="fa fa-minus"> 删除</i></button>
|
||||
<button type="button" class="btn btn-white btn-sm" onclick="addColumn()"><i class="fa fa-plus">
|
||||
增加</i></button>
|
||||
<button type="button" class="btn btn-white btn-sm" onclick="sub.delColumn()"><i class="fa fa-minus">
|
||||
删除</i></button>
|
||||
<div class="col-sm-12 select-table table-striped">
|
||||
<table id="bootstrap-table"></table>
|
||||
</div>
|
||||
|
|
@ -141,11 +192,14 @@
|
|||
</form>
|
||||
</div>
|
||||
<th:block th:include="include :: footer"/>
|
||||
#foreach($column in $columns)
|
||||
#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "datetime")
|
||||
#if($isDateTime)
|
||||
<th:block th:include="include :: datetimepicker-js"/>
|
||||
#break
|
||||
#end
|
||||
#if($isUpload)
|
||||
<th:block th:include="include :: bootstrap-fileinput-js"/>
|
||||
#end
|
||||
#if($isSummernote)
|
||||
<th:block th:include="include :: summernote-js"/>
|
||||
#end
|
||||
<script th:inline="javascript">
|
||||
var prefix = ctx + "${moduleName}/${businessName}"
|
||||
|
|
@ -165,9 +219,9 @@
|
|||
$.operate.save(prefix + "/add", $('#form-${businessName}-add').serialize());
|
||||
}
|
||||
}
|
||||
#if($isDateTime)
|
||||
#foreach($column in $columns)
|
||||
#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "datetime")
|
||||
|
||||
#if($column.edit && !$column.superColumn && !$column.pk && $column.htmlType == "datetime")
|
||||
$("input[name='$column.javaField']").datetimepicker({
|
||||
format: "yyyy-mm-dd",
|
||||
minView: "month",
|
||||
|
|
@ -175,8 +229,72 @@
|
|||
});
|
||||
#end
|
||||
#end
|
||||
#end
|
||||
#if($isUpload)
|
||||
// 文件上传
|
||||
$(".file-upload").fileinput({
|
||||
'theme': 'explorer-fas',
|
||||
'uploadUrl': '/common/upload',
|
||||
overwriteInitial: false,
|
||||
initialPreviewAsData: true,
|
||||
maxFileCount: 1, // 最大上传数
|
||||
autoReplace: true, // 自动替换预览图（maxFileCount 是前置条件）
|
||||
overwriteInitial: true, // 选择文件后覆盖预览图
|
||||
layoutTemplates :{
|
||||
actionDrag:'' // 去除预览图拖拽图标
|
||||
}
|
||||
}).on('fileuploaded', function (event, data, previewId, index) {
|
||||
// 赋值
|
||||
$("input[name='" + event.currentTarget.id + "']").val(data.response.url)
|
||||
}).on('fileremoved', function (event, id, index) {
|
||||
// 清空数据
|
||||
$("input[name='" + event.currentTarget.id + "']").val('')
|
||||
})
|
||||
$(this).fileinput('_initFileActions');
|
||||
#end
|
||||
#if($isSummernote)
|
||||
$(function () {
|
||||
$('.summernote').summernote({
|
||||
height: 100,
|
||||
lang: 'zh-CN',
|
||||
callbacks: {
|
||||
onChange: function (contents, $edittable) {
|
||||
// Xss 过滤掉了html 内容 ，所以用base64 保存
|
||||
$("input[name='" + this.id + "']").val(window.btoa(encodeURI(contents)));
|
||||
},
|
||||
onImageUpload: function(files) {
|
||||
var _self = this;
|
||||
for(var i = 0; i < files.length; i++){
|
||||
var formData = new FormData();
|
||||
formData.append('file', files[i]);
|
||||
var config = {
|
||||
url: '/common/upload',
|
||||
type: 'post',
|
||||
data: formData,
|
||||
contentType: false,
|
||||
processData: false,
|
||||
beforeSend: function () {
|
||||
$.modal.loading("正在处理中，请稍后...");
|
||||
},
|
||||
success: function(result) {
|
||||
if (result.code == web_status.SUCCESS) {
|
||||
$('#'+ _self.id).summernote('insertImage',result.url);
|
||||
} else if (result.code == web_status.WARNING) {
|
||||
$.modal.alertWarning(result.msg)
|
||||
} else {
|
||||
$.modal.alertError(result.msg);
|
||||
}
|
||||
$.modal.closeLoading();
|
||||
}
|
||||
};
|
||||
$.ajax(config)
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
});
|
||||
#end
|
||||
#if($table.tree)
|
||||
|
||||
/*${functionName}-新增-选择父部门树*/
|
||||
function select${BusinessName}Tree() {
|
||||
var options = {
|
||||
|
|
@ -195,8 +313,8 @@
|
|||
layer.close(index);
|
||||
}
|
||||
#end
|
||||
#if($table.sub)
|
||||
|
||||
#if($table.sub)
|
||||
$(function () {
|
||||
var options = {
|
||||
pagination: false,
|
||||
|
|
@ -204,7 +322,8 @@
|
|||
showRefresh: false,
|
||||
showToggle: false,
|
||||
showColumns: false,
|
||||
columns: [{
|
||||
columns: [
|
||||
{
|
||||
checkbox: true
|
||||
},
|
||||
{
|
||||
|
|
@ -235,8 +354,9 @@
|
|||
var name = $.common.sprintf("${subclassName}List[%s].${javaField}", index);
|
||||
return $.common.dictToSelect(${javaField}Datas, value, name);
|
||||
}
|
||||
#if($velocityCount != $subTable.columns.size())},#end
|
||||
|
||||
#if($velocityCount != $subTable.columns.size())
|
||||
},
|
||||
#end
|
||||
#else
|
||||
{
|
||||
field: '${javaField}',
|
||||
|
|
@ -246,11 +366,14 @@
|
|||
var html = $.common.sprintf("<input class='form-control' type='text' name='${subclassName}List[%s].${javaField}' value='%s'>", index, value);
|
||||
return html;
|
||||
}
|
||||
#if($velocityCount != $subTable.columns.size())},#end
|
||||
#if($velocityCount != $subTable.columns.size())
|
||||
},
|
||||
#end
|
||||
|
||||
#end
|
||||
#end
|
||||
}]
|
||||
}
|
||||
]
|
||||
};
|
||||
$.table.init(options);
|
||||
});
|
||||
|
|
@ -258,7 +381,6 @@
|
|||
function addColumn() {
|
||||
var count = $("#" + table.options.id).bootstrapTable('getData').length;
|
||||
sub.editColumn();
|
||||
|
||||
$("#" + table.options.id).bootstrapTable('insertRow', {
|
||||
index: count,
|
||||
row: {
|
||||
|
|
@ -268,7 +390,6 @@
|
|||
#if($column.pk || $javaField == ${subTableFkclassName})
|
||||
#else
|
||||
${javaField}: ""#if($velocityCount != $subTable.columns.size()),#end
|
||||
|
||||
#end
|
||||
#end
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,13 +1,31 @@
|
|||
<!DOCTYPE html>
|
||||
<html lang="zh" xmlns:th="http://www.thymeleaf.org">
|
||||
<head>
|
||||
#set($isUpload = false)
|
||||
#set($isSummernote = false)
|
||||
#set($isDateTime = false)
|
||||
<th:block th:include="include :: header('修改${functionName}')"/>
|
||||
#foreach($column in $columns)
|
||||
#if($column.edit && !$column.superColumn && !$column.pk && $column.htmlType == "datetime")
|
||||
#set($isDateTime = true)
|
||||
<th:block th:include="include :: datetimepicker-css"/>
|
||||
#break
|
||||
#end
|
||||
#end
|
||||
#foreach($column in $columns)
|
||||
#if($column.edit && !$column.superColumn && !$column.pk && $column.htmlType == "upload")
|
||||
#set($isUpload = true)
|
||||
<th:block th:include="include :: bootstrap-fileinput-css"/>
|
||||
#break
|
||||
#end
|
||||
#end
|
||||
#foreach($column in $columns)
|
||||
#if($column.edit && !$column.superColumn && !$column.pk && $column.htmlType == "summernote")
|
||||
#set($isSummernote = true)
|
||||
<th:block th:include="include :: summernote-css"/>
|
||||
#break
|
||||
#end
|
||||
#end
|
||||
</head>
|
||||
<body class="white-bg">
|
||||
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
|
||||
|
|
@ -33,25 +51,33 @@
|
|||
<div class="col-sm-8">
|
||||
<div class="input-group">
|
||||
#set($BusinessName=$businessName.substring(0,1).toUpperCase() + ${businessName.substring(1)})
|
||||
<input id="treeId" name="${treeParentCode}" type="hidden" th:field="*{${treeParentCode}}" />
|
||||
<input class="form-control" type="text" onclick="select${BusinessName}Tree()" id="treeName" readonly="true" th:field="*{parentName}"#if($column.required) required#end>
|
||||
<input id="treeId" name="${treeParentCode}" type="hidden"
|
||||
th:field="*{${treeParentCode}}"/>
|
||||
<input class="form-control" type="text" onclick="select${BusinessName}Tree()"
|
||||
id="treeName" readonly="true" th:field="*{parentName}"#if($column.required)
|
||||
required#end>
|
||||
<span class="input-group-addon"><i class="fa fa-search"></i></span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
#elseif($column.htmlType == "input")
|
||||
<div class="form-group">
|
||||
<label class="col-sm-3 control-label#if($column.required) is-required#end">${comment}：</label>
|
||||
<label class="col-sm-3 control-label#if($column.required) is-required#end">${comment}
|
||||
：</label>
|
||||
<div class="col-sm-8">
|
||||
<input name="${field}" th:field="*{${field}}" class="form-control" type="text"#if($column.required) required#end>
|
||||
<input name="${field}" th:field="*{${field}}" class="form-control"
|
||||
type="text"#if($column.required) required#end>
|
||||
</div>
|
||||
</div>
|
||||
#elseif($column.htmlType == "select" && "" != $dictType)
|
||||
<div class="form-group">
|
||||
<label class="col-sm-3 control-label">${comment}：</label>
|
||||
<div class="col-sm-8">
|
||||
<select name="${field}" class="form-control m-b" th:with="type=${@dict.getType('${dictType}')}"#if($column.required) required#end>
|
||||
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{${field}}"></option>
|
||||
<select name="${field}" class="form-control m-b"
|
||||
th:with="type=${@dict.getType('${dictType}')}"#if($column.required)
|
||||
required#end>
|
||||
<option th:each="dict : ${type}" th:text="${dict.dictLabel}"
|
||||
th:value="${dict.dictValue}" th:field="*{${field}}"></option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -70,7 +96,10 @@
|
|||
<label class="col-sm-3 control-label">${comment}：</label>
|
||||
<div class="col-sm-8" th:with="type=${@dict.getType('${dictType}')}">
|
||||
<label th:each="dict : ${type}" class="check-box">
|
||||
<input name="${field}" type="checkbox" th:value="${dict.dictValue}" th:text="${dict.dictLabel}" th:attr="checked=${${className}.${field}.contains(dict.dictValue)?true:false}"#if($column.required) required#end>
|
||||
<input name="${field}" type="checkbox" th:value="${dict.dictValue}"
|
||||
th:text="${dict.dictLabel}"
|
||||
th:attr="checked=${${className}.${field}.contains(dict.dictValue)?true:false}"#if($column.required)
|
||||
required#end>
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -89,7 +118,9 @@
|
|||
<label class="col-sm-3 control-label">${comment}：</label>
|
||||
<div class="col-sm-8">
|
||||
<div class="radio-box" th:each="dict : ${@dict.getType('${dictType}')}">
|
||||
<input type="radio" th:id="${'${field}_' + dict.dictCode}" name="${field}" th:value="${dict.dictValue}" th:field="*{${field}}"#if($column.required) required#end>
|
||||
<input type="radio" th:id="${'${field}_' + dict.dictCode}" name="${field}"
|
||||
th:value="${dict.dictValue}" th:field="*{${field}}"#if($column.required)
|
||||
required#end>
|
||||
<label th:for="${'${field}_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -110,7 +141,10 @@
|
|||
<label class="col-sm-3 control-label">${comment}：</label>
|
||||
<div class="col-sm-8">
|
||||
<div class="input-group date">
|
||||
<input name="${field}" th:value="${#dates.format(${className}.${field}, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text"#if($column.required) required#end>
|
||||
<input name="${field}"
|
||||
th:value="${#dates.format(${className}.${field}, 'yyyy-MM-dd')}"
|
||||
class="form-control" placeholder="yyyy-MM-dd"
|
||||
type="text"#if($column.required) required#end>
|
||||
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -119,7 +153,27 @@
|
|||
<div class="form-group">
|
||||
<label class="col-sm-3 control-label">${comment}：</label>
|
||||
<div class="col-sm-8">
|
||||
<textarea name="${field}" class="form-control"#if($column.required) required#end>[[*{${field}}]]</textarea>
|
||||
<textarea name="${field}" class="form-control"#if($column.required)
|
||||
required#end>[[*{${field}}]]</textarea>
|
||||
</div>
|
||||
</div>
|
||||
#elseif($column.htmlType == "upload")
|
||||
<div class="form-group">
|
||||
<label class="col-sm-3 control-label">${comment}：</label>
|
||||
<div class="col-sm-8">
|
||||
<input type="hidden" th:field="*{${field}}">
|
||||
<div class="file-loading">
|
||||
<input class="form-control file-upload" name="file" id="${field}"
|
||||
type="file">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
#elseif($column.htmlType == "summernote" )
|
||||
<div class="form-group">
|
||||
<label class="col-sm-3 control-label">${comment}：</label>
|
||||
<div class="col-sm-8">
|
||||
<input type="hidden" class="form-control" th:field="*{${field}}">
|
||||
<div class="summernote" id="${field}"></div>
|
||||
</div>
|
||||
</div>
|
||||
#end
|
||||
|
|
@ -130,8 +184,10 @@
|
|||
<h4 class="form-header h4">${subTable.functionName}信息</h4>
|
||||
<div class="row">
|
||||
<div class="col-sm-12">
|
||||
<button type="button" class="btn btn-white btn-sm" onclick="addColumn()"><i class="fa fa-plus"> 增加</i></button>
|
||||
<button type="button" class="btn btn-white btn-sm" onclick="sub.delColumn()"><i class="fa fa-minus"> 删除</i></button>
|
||||
<button type="button" class="btn btn-white btn-sm" onclick="addColumn()"><i class="fa fa-plus">
|
||||
增加</i></button>
|
||||
<button type="button" class="btn btn-white btn-sm" onclick="sub.delColumn()"><i class="fa fa-minus">
|
||||
删除</i></button>
|
||||
<div class="col-sm-12 select-table table-striped">
|
||||
<table id="bootstrap-table"></table>
|
||||
</div>
|
||||
|
|
@ -141,11 +197,14 @@
|
|||
</form>
|
||||
</div>
|
||||
<th:block th:include="include :: footer"/>
|
||||
#foreach($column in $columns)
|
||||
#if($column.edit && !$column.superColumn && !$column.pk && $column.htmlType == "datetime")
|
||||
#if($isDateTime)
|
||||
<th:block th:include="include :: datetimepicker-js"/>
|
||||
#break
|
||||
#end
|
||||
#if($isUpload)
|
||||
<th:block th:include="include :: bootstrap-fileinput-js"/>
|
||||
#end
|
||||
#if($isSummernote)
|
||||
<th:block th:include="include :: summernote-js"/>
|
||||
#end
|
||||
<script th:inline="javascript">
|
||||
var prefix = ctx + "${moduleName}/${businessName}";
|
||||
|
|
@ -165,9 +224,9 @@
|
|||
$.operate.save(prefix + "/edit", $('#form-${businessName}-edit').serialize());
|
||||
}
|
||||
}
|
||||
#if($isDateTime)
|
||||
#foreach($column in $columns)
|
||||
#if($column.edit && !$column.superColumn && !$column.pk && $column.htmlType == "datetime")
|
||||
|
||||
$("input[name='$column.javaField']").datetimepicker({
|
||||
format: "yyyy-mm-dd",
|
||||
minView: "month",
|
||||
|
|
@ -175,6 +234,79 @@
|
|||
});
|
||||
#end
|
||||
#end
|
||||
#end
|
||||
#if($isUpload)
|
||||
// 文件上传
|
||||
$(".file-upload").each(function (i) {
|
||||
var val = $("input[name='" + this.id + "']").val()
|
||||
$(this).fileinput({
|
||||
'theme': 'explorer-fas',
|
||||
'uploadUrl': '/common/upload',
|
||||
overwriteInitial: false,
|
||||
initialPreviewAsData: true,
|
||||
initialPreview: [val], // 预览图片
|
||||
maxFileCount: 1, // 最大上传数
|
||||
autoReplace: true, // 自动替换预览图（maxFileCount 是前置条件）
|
||||
overwriteInitial: true, // 选择文件后覆盖预览图
|
||||
layoutTemplates :{
|
||||
actionDrag:'' // 去除预览图拖拽图标
|
||||
}
|
||||
}).on('fileuploaded', function (event, data, previewId, index) {
|
||||
// 赋值
|
||||
$("input[name='" + event.currentTarget.id + "']").val(data.response.url)
|
||||
}).on('fileremoved', function (event, id, index) {
|
||||
// 清空数据
|
||||
$("input[name='" + event.currentTarget.id + "']").val('')
|
||||
})
|
||||
$(this).fileinput('_initFileActions');
|
||||
});
|
||||
#end
|
||||
#if($isSummernote)
|
||||
$(function () {
|
||||
$('.summernote').each(function (i) {
|
||||
$('#'+this.id).summernote({
|
||||
height: 100,
|
||||
lang: 'zh-CN',
|
||||
callbacks: {
|
||||
onChange: function (contents, $edittable) {
|
||||
$("input[name='" + this.id + "']").val(window.btoa(encodeURI(contents)));
|
||||
},
|
||||
onImageUpload: function(files) {
|
||||
var _self = this;
|
||||
for(var i = 0; i < files.length; i++){
|
||||
var formData = new FormData();
|
||||
formData.append('file', files[i]);
|
||||
var config = {
|
||||
url: '/common/upload',
|
||||
type: 'post',
|
||||
data: formData,
|
||||
contentType: false,
|
||||
processData: false,
|
||||
beforeSend: function () {
|
||||
$.modal.loading("正在处理中，请稍后...");
|
||||
},
|
||||
success: function(result) {
|
||||
if (result.code == web_status.SUCCESS) {
|
||||
$('#'+ _self.id).summernote('insertImage',result.url);
|
||||
} else if (result.code == web_status.WARNING) {
|
||||
$.modal.alertWarning(result.msg)
|
||||
} else {
|
||||
$.modal.alertError(result.msg);
|
||||
}
|
||||
$.modal.closeLoading();
|
||||
}
|
||||
};
|
||||
$.ajax(config)
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
var content = $("input[name='" + this.id + "']").val()
|
||||
content = decodeURI(window.atob(content));
|
||||
$('#'+this.id).summernote('code',content);
|
||||
})
|
||||
});
|
||||
#end
|
||||
#if($table.tree)
|
||||
|
||||
/*${functionName}-新增-选择父部门树*/
|
||||
|
|
@ -196,7 +328,6 @@
|
|||
}
|
||||
#end
|
||||
#if($table.sub)
|
||||
|
||||
$(function () {
|
||||
var options = {
|
||||
data: [[${${className}.${subclassName}List}]],
|
||||
|
|
@ -205,7 +336,8 @@
|
|||
showRefresh: false,
|
||||
showToggle: false,
|
||||
showColumns: false,
|
||||
columns: [{
|
||||
columns: [
|
||||
{
|
||||
checkbox: true
|
||||
},
|
||||
{
|
||||
|
|
@ -236,8 +368,9 @@
|
|||
var name = $.common.sprintf("${subclassName}List[%s].${javaField}", index);
|
||||
return $.common.dictToSelect(${javaField}Datas, value, name);
|
||||
}
|
||||
#if($velocityCount != $subTable.columns.size())},#end
|
||||
|
||||
#if($velocityCount != $subTable.columns.size())
|
||||
},
|
||||
#end
|
||||
#else
|
||||
{
|
||||
field: '${javaField}',
|
||||
|
|
@ -247,8 +380,9 @@
|
|||
var html = $.common.sprintf("<input class='form-control' type='text' name='${subclassName}List[%s].${javaField}' value='%s'>", index, value);
|
||||
return html;
|
||||
}
|
||||
#if($velocityCount != $subTable.columns.size())},#end
|
||||
|
||||
#if($velocityCount != $subTable.columns.size())
|
||||
},
|
||||
#end
|
||||
#end
|
||||
#end
|
||||
}]
|
||||
|
|
@ -269,7 +403,6 @@
|
|||
#if($column.pk || $javaField == ${subTableFkclassName})
|
||||
#else
|
||||
${javaField}: ""#if($velocityCount != $subTable.columns.size()),#end
|
||||
|
||||
#end
|
||||
#end
|
||||
}
|
||||
|
|
|
|||
|
|
@ -107,6 +107,8 @@
|
|||
#foreach($column in $columns)
|
||||
#set($dictType=$column.dictType)
|
||||
#set($javaField=$column.javaField)
|
||||
#set($isUpload = $column.htmlType == 'upload')
|
||||
#set($isSummernote = $column.htmlType == 'summernote')
|
||||
#set($parentheseIndex=$column.columnComment.indexOf("（"))
|
||||
#if($parentheseIndex != -1)
|
||||
#set($comment=$column.columnComment.substring(0, $parentheseIndex))
|
||||
|
|
@ -124,12 +126,35 @@
|
|||
}
|
||||
},
|
||||
#elseif($column.list && "" != $javaField)
|
||||
#if($isUpload)
|
||||
{
|
||||
field: '${javaField}',
|
||||
title: '${comment}',
|
||||
formatter: function(value, row, index) {
|
||||
if(row.${column.javaField}){
|
||||
return '<a class="btn btn-success btn-xs" href="'+row.${column.javaField}+'" target="view_window"><i class="fa fa-download"></i></a> '
|
||||
// 如果是图片，把下面注释取消
|
||||
// return $.table.imageView(row.${column.javaField});
|
||||
}
|
||||
return ''
|
||||
}
|
||||
},
|
||||
#elseif($isSummernote)
|
||||
{
|
||||
field: '${javaField}',
|
||||
title: '${comment}',
|
||||
formatter: function(value, row, index) {
|
||||
return '<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="$.operate.seeSummernoteDetail(' + index + ',\'${column.javaField}\')"><i class="fa fa-eye"></i></a>'
|
||||
}
|
||||
},
|
||||
#else
|
||||
{
|
||||
field: '${javaField}',
|
||||
title: '${comment}',
|
||||
align: 'left'
|
||||
},
|
||||
#end
|
||||
#end
|
||||
#end
|
||||
{
|
||||
title: '操作',
|
||||
|
|
|
|||
|
|
@ -103,6 +103,8 @@
|
|||
},
|
||||
#foreach($column in $columns)
|
||||
#set($dictType=$column.dictType)
|
||||
#set($isUpload = $column.htmlType == 'upload')
|
||||
#set($isSummernote = $column.htmlType == 'summernote')
|
||||
#set($javaField=$column.javaField)
|
||||
#set($parentheseIndex=$column.columnComment.indexOf("（"))
|
||||
#if($parentheseIndex != -1)
|
||||
|
|
@ -125,11 +127,37 @@
|
|||
}
|
||||
},
|
||||
#elseif($column.list && "" != $javaField)
|
||||
#if($isUpload)
|
||||
{
|
||||
field: '${javaField}',
|
||||
title: '${comment}',
|
||||
formatter: function(value, row, index) {
|
||||
if(row.${column.javaField}){
|
||||
return '<a class="btn btn-success btn-xs" href="'+row.${column.javaField}+'" target="view_window"><i class="fa fa-download"></i></a> '
|
||||
// 如果是图片，把下面注释取消
|
||||
// return $.table.imageView(row.${column.javaField});
|
||||
}
|
||||
return ''
|
||||
}
|
||||
},
|
||||
#elseif($isSummernote)
|
||||
{
|
||||
field: '${javaField}',
|
||||
title: '${comment}',
|
||||
formatter: function(value, row, index) {
|
||||
var actions = [];
|
||||
actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="$.operate.seeSummernoteDetail(' + index + ',\'${column.javaField}\')"><i class="fa fa-eye"></i>查看</a> ');
|
||||
return actions.join('');
|
||||
}
|
||||
},
|
||||
#else
|
||||
{
|
||||
field: '${javaField}',
|
||||
title: '${comment}'
|
||||
},
|
||||
#end
|
||||
|
||||
#end
|
||||
#end
|
||||
{
|
||||
title: '操作',
|
||||
|
|
|
|||
Loading…
Reference in New Issue