Skip to content

S
Skyeye

Skyeye云 / Skyeye

通知 1433
Star 162
Fork 130
S
Skyeye
提交 3da3824e 编写于 作者: Skyeye云's avatar Skyeye云
浏览文件
操作

工作流模型适用对象修改

上级 722ca774
隐藏空白更改
内联 并排
Showing with 101 addition and 275 deletion
activiti/src/main/resources/template/js/actFlow/actFlowAdd.js
浏览文件 @ 3da3824e
// 关联的工作流业务模型
var skyeyeClassFlowableMation = {};
layui.config({
base: basePath,
version: skyeyeVersion
}).extend({
window: 'js/winui.window'
}).define(['window', 'jquery', 'winui', 'form'], function (exports) {
}).define(['window', 'jquery', 'winui', 'form', 'eleTree'], function (exports) {
winui.renderColor();
var index = parent.layer.getFrameIndex(window.name);
var $ = layui.$,
form = layui.form;
form.on('radio(businessLinkType)', function (data) {
var val = data.value;
if (val == '1') {
// 不关联业务数据
$(".business").addClass("layui-hide");
} else if (val == '2') {
// 关联业务数据
$(".business").removeClass("layui-hide");
}
treeSelectUtil.init({
eleTree: layui.eleTree,
elem: 'serviceClassName',
url: reqBasePath + "queryServiceClassForTree"
});
matchingLanguage();
......@@ -31,22 +23,8 @@ layui.config({
var params = {
flowName: $("#flowName").val(),
modelKey: $("#modelKey").val(),
businessLinkType: data.field.businessLinkType,
serviceClassName: $("#serviceClassName").attr("className")
serviceClassName: $("#serviceClassName").attr("serviceClassName")
};
if (params.businessLinkType == 2) {
params.businessKey = $("#businessKey").val();
params.businessData = $("#businessData").val();
if (isNull(params.businessKey)) {
winui.window.msg("请输入属性字段", {icon: 2, time: 2000});
return false;
}
if (isNull(params.businessData)) {
winui.window.msg("请输入属性值", {icon: 2, time: 2000});
return false;
}
params.dsFormId = "";
}
AjaxPostUtil.request({url: flowableBasePath + "writeActFlowMation", params: params, type: 'json', method: 'POST', callback: function (json) {
parent.layer.close(index);
......@@ -56,19 +34,6 @@ layui.config({
return false;
});
// 工作流业务模型选择
$("body").on("click", "#serviceClassNameSel", function (e) {
_openNewWindows({
url: "../../tpl/skyeyeClassFlowable/skyeyeClassFlowableChoose.html",
title: "工作流业务模型选择",
pageId: "skyeyeClassFlowableChoose",
area: ['90vw', '90vh'],
callBack: function (refreshCode) {
$("#serviceClassName").val(skyeyeClassFlowableMation.serviceName);
$("#serviceClassName").attr("className", skyeyeClassFlowableMation.className);
}});
});
$("body").on("click", "#cancle", function() {
parent.layer.close(index);
});
......
activiti/src/main/resources/template/js/actFlow/actFlowEdit.js
浏览文件 @ 3da3824e
......@@ -4,7 +4,7 @@ layui.config({
version: skyeyeVersion
}).extend({
window: 'js/winui.window'
}).define(['window', 'jquery', 'winui', 'form'], function (exports) {
}).define(['window', 'jquery', 'winui', 'form', 'eleTree'], function (exports) {
winui.renderColor();
var index = parent.layer.getFrameIndex(window.name);
var $ = layui.$,
......@@ -18,15 +18,13 @@ layui.config({
pagination: false,
template: $("#beanTemplate").html(),
ajaxSendAfter:function (json) {
if (json.bean.businessLinkType == 1) {
// 不关联业务数据
$("#businessLinkType").html('否');
$(".business").addClass("layui-hide");
} else if (json.bean.businessLinkType == 2) {
// 关联业务数据
$("#businessLinkType").html('是');
$(".business").removeClass("layui-hide");
}
treeSelectUtil.init({
eleTree: layui.eleTree,
elem: 'serviceClassName',
url: reqBasePath + "queryServiceClassForTree",
defaultId: json.bean.serviceClassName
});
matchingLanguage();
form.render();
......@@ -36,22 +34,8 @@ layui.config({
id: parent.rowId,
flowName: $("#flowName").val(),
modelKey: $("#modelKey").val(),
businessLinkType: json.bean.businessLinkType,
serviceClassName: $("#serviceClassName").attr("className")
serviceClassName: $("#serviceClassName").attr("serviceClassName")
};
if (params.businessLinkType == 2) {
params.businessKey = $("#businessKey").val();
params.businessData = $("#businessData").val();
if (isNull(params.businessKey)) {
winui.window.msg("请输入属性字段", {icon: 2, time: 2000});
return false;
}
if (isNull(params.businessData)) {
winui.window.msg("请输入属性值", {icon: 2, time: 2000});
return false;
}
params.dsFormId = "";
}
AjaxPostUtil.request({url: flowableBasePath + "writeActFlowMation", params: params, type: 'json', method: 'POST', callback: function (json) {
parent.layer.close(index);
......@@ -63,19 +47,6 @@ layui.config({
}
});
// 工作流业务模型选择
$("body").on("click", "#serviceClassNameSel", function (e) {
_openNewWindows({
url: "../../tpl/skyeyeClassFlowable/skyeyeClassFlowableChoose.html",
title: "工作流业务模型选择",
pageId: "skyeyeClassFlowableChoose",
area: ['90vw', '90vh'],
callBack: function (refreshCode) {
$("#serviceClassName").val(skyeyeClassFlowableMation.serviceName);
$("#serviceClassName").attr("className", skyeyeClassFlowableMation.className);
}});
});
$("body").on("click", "#cancle", function() {
parent.layer.close(index);
});
......
activiti/src/main/resources/template/js/actFlow/actFlowList.js
浏览文件 @ 3da3824e
......@@ -43,7 +43,7 @@ layui.config({
{ field: 'modelId', title: '模型ID', width: 100 },
{ field: 'modelKey', title: '模型key', width: 250 },
{ field: 'version', title: '版本', width: 80, templet: function (d) {return d.model.version}},
{ field: 'serviceName', title: '工作流业务模型', width: 140 },
{ field: 'serviceClassName', title: '适用对象', width: 400 },
{ field: 'deploymentId', title: '发布状态', align: "center", width: 80, templet: function (d) {
if (isNull(d.model.deploymentId)) {
return "<span class='state-new'>未发布</span>";
......
activiti/src/main/resources/template/js/skyeyeClassFlowable/skyeyeClassFlowableChoose.js 已删除 100644 → 0
浏览文件 @ 722ca774
layui.config({
base: basePath,
version: skyeyeVersion
}).extend({
window: 'js/winui.window'
}).define(['window', 'table', 'jquery', 'winui', 'form'], function (exports) {
winui.renderColor();
var index = parent.layer.getFrameIndex(window.name);
var $ = layui.$,
form = layui.form,
table = layui.table;
table.render({
id: 'messageTable',
elem: '#messageTable',
method: 'post',
url: reqBasePath + 'queryClassFlowableDataList',
where: getTableParams(),
even: true,
page: true,
limits: getLimits(),
limit: getLimit(),
cols: [[
{ type: 'radio', fixed: 'left'},
{ title: systemLanguage["com.skyeye.serialNumber"][languageType], fixed: 'left', type: 'numbers' },
{ field: 'serviceName', title: '服务名', align: 'center', width: 150},
{ field: 'className', title: '服务', width: 400}
]],
done: function(res) {
matchingLanguage();
initTableSearchUtil.initAdvancedSearch(this, res.searchFilter, form, "请输入服务名", function () {
table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()});
});
$('#messageTable').next().find('.layui-table-body').find("table" ).find("tbody").children("tr").on('dblclick',function() {
var dubClick = $('#messageTable').next().find('.layui-table-body').find("table").find("tbody").find(".layui-table-hover");
dubClick.find("input[type='radio']").prop("checked", true);
form.render();
var chooseIndex = JSON.stringify(dubClick.data('index'));
var obj = res.rows[chooseIndex];
parent.skyeyeClassFlowableMation = obj;
parent.refreshCode = '0';
parent.layer.close(index);
});
$('#messageTable').next().find('.layui-table-body').find("table" ).find("tbody").children("tr").on('click',function() {
var click = $('#messageTable').next().find('.layui-table-body').find("table").find("tbody").find(".layui-table-hover");
click.find("input[type='radio']").prop("checked", true);
form.render();
});
}
});
form.render();
$("body").on("click", "#reloadTable", function() {
loadTable();
});
function loadTable() {
table.reloadData("messageTable", {where: getTableParams()});
}
function getTableParams() {
return $.extend(true, {}, initTableSearchUtil.getSearchValue("messageTable"));
}
exports('skyeyeClassFlowableChoose', {});
});
\ No newline at end of file
activiti/src/main/resources/template/tpl/actFlow/actFlowAdd.html
浏览文件 @ 3da3824e
......@@ -9,6 +9,9 @@
<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-xs12">
<label class="layui-form-label">模型名称<i class="red">*</i></label>
<div class="layui-input-block">
......@@ -22,34 +25,12 @@
<div class="layui-form-mid layui-word-aux">在系统中保持唯一。</div>
</div>
</div>
<div class="layui-form-item layui-col-xs12">
<label class="layui-form-label">工作流业务模型</label>
<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="serviceClassName" name="serviceClassName" placeholder="请选择工作流业务模型" class="layui-input" readonly/>
<i class="fa fa-user-plus input-icon" id="serviceClassNameSel"></i>
<div class="layui-form-mid layui-word-aux" style="width: 100%;">动态表单类型的工作流可不选择业务模型</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">
<input type="radio" name="businessLinkType" value="2" title="是" lay-filter="businessLinkType" checked/>
<input type="radio" name="businessLinkType" value="1" title="否" lay-filter="businessLinkType" />
<div class="layui-form-mid layui-word-aux" style="width: 100%;">该选项确定后无法更换</div>
<input type="text" id="serviceClassName" name="serviceClassName" placeholder="请选择适用对象" class="layui-input" readonly="readonly" typeId=""/>
</div>
</div>
<div class="layui-form-item layui-col-xs12 business">
<label class="layui-form-label">属性字段<i class="red">*</i></label>
<div class="layui-input-block">
<input type="text" id="businessKey" name="businessKey" placeholder="请输入属性字段" class="layui-input"/>
</div>
</div>
<div class="layui-form-item layui-col-xs12 business">
<label class="layui-form-label">属性值<i class="red">*</i></label>
<div class="layui-input-block">
<input type="text" id="businessData" name="businessData" placeholder="请输入属性值" class="layui-input"/>
</div>
</div>
<div class="layui-form-item layui-col-xs12">
<div class="layui-input-block">
......
activiti/src/main/resources/template/tpl/actFlow/actFlowEdit.html
浏览文件 @ 3da3824e
......@@ -15,6 +15,9 @@
<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-xs12">
<label class="layui-form-label">模型名称<i class="red">*</i></label>
<div class="layui-input-block">
......@@ -28,31 +31,10 @@
<div class="layui-form-mid layui-word-aux">在系统中保持唯一。</div>
</div>
</div>
<div class="layui-form-item layui-col-xs12">
<label class="layui-form-label">工作流业务模型</label>
<div class="layui-input-block">
<input type="text" id="serviceClassName" name="serviceClassName" placeholder="请选择工作流业务模型" class="layui-input" readonly
value="{{serviceName}}" className="{{serviceClassName}}"/>
<i class="fa fa-user-plus input-icon" id="serviceClassNameSel"></i>
<div class="layui-form-mid layui-word-aux" style="width: 100%;">动态表单类型的工作流可不选择业务模型</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 ver-center" id="businessLinkType">
</div>
</div>
<div class="layui-form-item layui-col-xs12 business">
<label class="layui-form-label">属性字段<i class="red">*</i></label>
<div class="layui-input-block">
<input type="text" id="businessKey" name="businessKey" placeholder="请输入属性字段" class="layui-input" value="{{businessKey}}"/>
</div>
</div>
<div class="layui-form-item layui-col-xs12 business">
<label class="layui-form-label">属性值<i class="red">*</i></label>
<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="businessData" name="businessData" placeholder="请输入属性值" class="layui-input" value="{{businessData}}"/>
<input type="text" id="serviceClassName" name="serviceClassName" placeholder="请选择适用对象" class="layui-input" readonly="readonly" typeId=""/>
</div>
</div>
......
activiti/src/main/resources/template/tpl/skyeyeClassFlowable/skyeyeClassFlowableChoose.html 已删除 100644 → 0
浏览文件 @ 722ca774
<!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-tip alert-info" id="showInfo">双击要选择的数据即可选中。</div>
<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>
</div>
</div>
<div style="margin:auto 10px;">
<div style="margin:auto 10px;">
<table id="messageTable" lay-filter="messageTable"></table>
</div>
</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/skyeyeClassFlowable/'}).use('skyeyeClassFlowableChoose');
</script>
</body>
</html>
\ No newline at end of file
common/src/main/resources/template/js/sysDictData/sysDictDataMove.js
浏览文件 @ 3da3824e
......@@ -8,30 +8,13 @@ layui.config({
winui.renderColor();
layui.use(['form'], function (form) {
var index = parent.layer.getFrameIndex(window.name);
var $ = layui.$,
eleTree = layui.eleTree;
var $ = layui.$;
var url = reqBasePath + "queryDictDataListByDictTypeCodeAndNotId?dictTypeCode=" + parent.parentNode.dictCode + '&notId=' + parent.parentNode.id;
eleTree.render({
elem: '.ele5',
url: url,
defaultExpandAll: true,
expandOnClickNode: false,
highlightCurrent: true
treeSelectUtil.init({
eleTree: layui.eleTree,
elem: 'parentId',
url: reqBasePath + "queryDictDataListByDictTypeCodeAndNotId?dictTypeCode=" + parent.parentNode.dictCode + '&notId=' + parent.parentNode.id
});
$(".ele5").hide();
$("#parentId").on("click",function (e) {
e.stopPropagation();
$(".ele5").toggle();
});
eleTree.on("nodeClick(data5)",function(d) {
$("#parentId").val(d.data.currentData.name);
$("#parentId").attr("parentId", d.data.currentData.id);
$(".ele5").hide();
})
$(document).on("click",function() {
$(".ele5").hide();
})
matchingLanguage();
form.render();
......
common/src/main/resources/template/tpl/sysDictData/sysDictDataMove.html
浏览文件 @ 3da3824e
......@@ -13,7 +13,6 @@
<label class="layui-form-label">父节点<i class="red">*</i></label>
<div class="layui-input-block">
<input type="text" id="parentId" name="parentId" placeholder="请选择父节点" class="layui-input" readonly="readonly" parentId="">
<div class="eleTree ele5" lay-filter="data5"></div>
</div>
</div>
......
knowlg/src/main/resources/template/js/knowledgecontent/knowledgecontentedit.js
浏览文件 @ 3da3824e
......@@ -8,32 +8,14 @@ layui.config({
winui.renderColor();
layui.use(['form'], function (form) {
var index = parent.layer.getFrameIndex(window.name);
var $ = layui.$,
eleTree = layui.eleTree;
var $ = layui.$;
//初始化类型
function initType(){
var el5;
el5 = eleTree.render({
elem: '.ele5',
url: sysMainMation.knowlgBasePath + "knowledgetype008",
defaultExpandAll: true,
expandOnClickNode: false,
highlightCurrent: true
treeSelectUtil.init({
eleTree: layui.eleTree,
elem: 'typeId',
url: sysMainMation.knowlgBasePath + "knowledgetype008"
});
$(".ele5").hide();
$("#typeId").on("click",function (e) {
e.stopPropagation();
$(".ele5").toggle();
});
eleTree.on("nodeClick(data5)",function(d) {
$("#typeId").val(d.data.currentData.name);
$("#typeId").attr("typeId", d.data.currentData.id);
$(".ele5").hide();
})
$(document).on("click",function() {
$(".ele5").hide();
})
}
showGrid({
......
knowlg/src/main/resources/template/tpl/knowledgecontent/knowledgecontenteditTemplate.tpl
浏览文件 @ 3da3824e
......@@ -9,7 +9,6 @@
<label class="layui-form-label">所属类型<i class="red">*</i></label>
<div class="layui-input-block">
<input type="text" id="typeId" name="typeId" placeholder="请选择类型" class="layui-input" readonly="readonly" typeId=""/>
<div class="eleTree ele5" lay-filter="data5"></div>
</div>
</div>
<div class="layui-form-item layui-col-xs12">
......
web/src/main/resources/template/assets/lib/layui/customer/common/systemCommonUtil.js
浏览文件 @ 3da3824e
......@@ -899,4 +899,66 @@ var ztreeUtil = {
});
}
}
\ No newline at end of file
};
// 树状下拉框工具
var treeSelectUtil = {
config: {
eleTree: null,
elem: '',
url: '',
idKey: 'id',
nameKey: 'name',
defaultId: ''
},
init: function (_config) {
treeSelectUtil.config = $.extend(true, treeSelectUtil.config, _config);
treeSelectUtil.initShow();
},
initShow: function () {
$(`#${treeSelectUtil.config.elem}`).after(`<div class="eleTree ele5" lay-filter="data5"></div>`);
treeSelectUtil.config.eleTree.render({
elem: '.ele5',
url: treeSelectUtil.config.url,
defaultExpandAll: true,
expandOnClickNode: false,
highlightCurrent: true,
request: {
name: treeSelectUtil.config.nameKey,
key: treeSelectUtil.config.idKey,
},
done: function (res) {
// 设置默认值
if (!isNull(treeSelectUtil.config.defaultId)) {
var html = $(".ele5").find(`div[data-id='${treeSelectUtil.config.defaultId}']`).find('.eleTree-node-content-label').html();
$(`#${treeSelectUtil.config.elem}`).val(html);
$(`#${treeSelectUtil.config.elem}`).attr(`${treeSelectUtil.config.elem}`, treeSelectUtil.config.defaultId);
}
}
});
$(".ele5").hide();
$(`#${treeSelectUtil.config.elem}`).on("click", function (e) {
e.stopPropagation();
$(".ele5").toggle();
});
treeSelectUtil.config.eleTree.on("nodeClick(data5)", function(d) {
if (d.data.currentData.disabled) {
d.event.stopPropagation();
return false;
}
$(`#${treeSelectUtil.config.elem}`).val(d.data.currentData[treeSelectUtil.config.nameKey]);
$(`#${treeSelectUtil.config.elem}`).attr(`${treeSelectUtil.config.elem}`, d.data.currentData[treeSelectUtil.config.idKey]);
$(".ele5").hide();
})
$(document).on("click",function() {
$(".ele5").hide();
})
}
};
web/src/main/resources/template/assets/lib/winui/css/winui.css
浏览文件 @ 3da3824e
......@@ -2682,7 +2682,6 @@ body .layer-ext-winconfirm .layui-layer-content {
.hr-title{
font-size: 15px;
font-style: oblique;
color: #6379bb;
margin: 10px 0px 0px 10px;
}
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或