From fbd02af4dc973b4658345e869a4d10663053e3f9 Mon Sep 17 00:00:00 2001 From: weizhiqiang <598748873@qq.com> Date: Mon, 2 Jan 2023 22:13:17 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A8=E5=8D=95=E8=AE=BE=E8=AE=A1=E7=AC=AC?= =?UTF-8?q?=E4=B8=80=E7=89=88=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../template/js/actModel/actModelAdd.js | 60 +------ .../template/js/actModel/actModelDetails.js | 10 -- .../template/js/actModel/actModelEdit.js | 71 +------- .../template/js/actModel/actModelList.js | 7 - .../js/approvalActiviti/approvalProcess.js | 5 - .../dsFormPageSequenceDraftProcessAdd.js | 56 ------- .../dsFormPageSequenceDraftProcessDetail.js | 22 --- .../dsFormPageSequenceDraftProcessEdit.js | 40 ----- ...dsFormPageSequenceDraftProcessEditToAct.js | 44 ----- .../dsFormPageSequenceDraftProcessList.js | 152 ------------------ .../template/tpl/actModel/actModelAdd.html | 28 +--- .../tpl/actModel/actModelDetails.html | 18 +-- .../template/tpl/actModel/actModelEdit.html | 25 +-- .../dsFormPageSequenceDraftProcessAdd.html | 22 --- .../dsFormPageSequenceDraftProcessDetail.html | 22 --- .../dsFormPageSequenceDraftProcessEdit.html | 22 --- ...FormPageSequenceDraftProcessEditToAct.html | 22 --- .../dsFormPageSequenceDraftProcessList.html | 45 ------ .../dsFormObjectRelationEdit.js | 8 +- .../js/dsFormPage/dsFormPageDesign.js | 100 ++++-------- .../js/dsFormPage/dsFormPageListChoose.js | 27 ++-- .../template/js/dsFormPage/pageAdd.js | 6 +- .../template/js/dsFormPage/pageEdit.js | 10 +- .../template/js/dsFormPage/pageList.js | 37 ++--- .../tpl/dsFormPage/dsFormPageDesign.html | 24 +-- .../tpl/dsFormPage/dsFormPageListChoose.html | 29 +--- .../template/tpl/dsFormPage/pageAdd.html | 8 +- .../template/tpl/dsFormPage/pageEdit.html | 6 +- .../template/tpl/dsFormPage/pageList.html | 20 +-- .../template/js/material/materialList.js | 1 - .../lib/layui/customer/skyeye/dsFormUtil.js | 14 +- 31 files changed, 121 insertions(+), 840 deletions(-) delete mode 100644 activiti/src/main/resources/template/js/dsFormPageSequence/dsFormPageSequenceDraftProcessAdd.js delete mode 100644 activiti/src/main/resources/template/js/dsFormPageSequence/dsFormPageSequenceDraftProcessDetail.js delete mode 100644 activiti/src/main/resources/template/js/dsFormPageSequence/dsFormPageSequenceDraftProcessEdit.js delete mode 100644 activiti/src/main/resources/template/js/dsFormPageSequence/dsFormPageSequenceDraftProcessEditToAct.js delete mode 100644 activiti/src/main/resources/template/js/dsFormPageSequence/dsFormPageSequenceDraftProcessList.js delete mode 100644 activiti/src/main/resources/template/tpl/dsFormPageSequence/dsFormPageSequenceDraftProcessAdd.html delete mode 100644 activiti/src/main/resources/template/tpl/dsFormPageSequence/dsFormPageSequenceDraftProcessDetail.html delete mode 100644 activiti/src/main/resources/template/tpl/dsFormPageSequence/dsFormPageSequenceDraftProcessEdit.html delete mode 100644 activiti/src/main/resources/template/tpl/dsFormPageSequence/dsFormPageSequenceDraftProcessEditToAct.html delete mode 100644 activiti/src/main/resources/template/tpl/dsFormPageSequence/dsFormPageSequenceDraftProcessList.html diff --git a/activiti/src/main/resources/template/js/actModel/actModelAdd.js b/activiti/src/main/resources/template/js/actModel/actModelAdd.js index cc623e8c9..c23d56815 100644 --- a/activiti/src/main/resources/template/js/actModel/actModelAdd.js +++ b/activiti/src/main/resources/template/js/actModel/actModelAdd.js @@ -17,34 +17,8 @@ layui.config({ // 加载图标信息 systemCommonUtil.initIconChooseHtml('iconMation', form, colorpicker, 17); - // 初始化动态表单 - showGrid({ - id: "dsFormId", - url: flowableBasePath + "actmodletype020", - params: {}, - pagination: false, - template: getFileContent('tpl/template/select-option-must.tpl'), - ajaxSendAfter: function (json) { - form.render('select'); - } - }) - textool.init({eleId: 'remark', maxlength: 200}); - // 页面类型变化事件 - form.on('radio(pageTypes)', function (data) { - var val = data.value; - if (val == 1) { - // 指定页面 - $(".TypeIsTwo").addClass("layui-hide"); - $(".TypeIsOne").removeClass("layui-hide"); - } else if (val == 2) { - // 动态表单 - $(".TypeIsTwo").removeClass("layui-hide"); - $(".TypeIsOne").addClass("layui-hide"); - } - }); - matchingLanguage(); form.render(); form.on('submit(formAddBean)', function (data) { @@ -52,40 +26,14 @@ layui.config({ var params = { typeId: parent.rowId, title: $("#typeName").val(), - pageTypes: data.field.pageTypes, tokenUrl: $("#tokenUrl").val(), remark: $("#remark").val(), commonUsed: data.field.commonUsed, - actFlowId: $("#actFlowId").attr("actFlowId") + actFlowId: $("#actFlowId").attr("actFlowId"), + addPageUrl: $("#addPageUrl").val(), + editPageUrl: $("#editPageUrl").val(), + revokeMapping: $("#revokeMapping").val() }; - if (params.pageTypes == 1) { - params.addPageUrl = $("#addPageUrl").val(); - params.editPageUrl = $("#editPageUrl").val(); - params.revokeMapping = $("#revokeMapping").val(); - if (isNull(params.addPageUrl)) { - winui.window.msg("请输入新增页面地址", {icon: 2, time: 2000}); - return false; - } - if (isNull(params.editPageUrl)) { - winui.window.msg("请输入编辑页面地址", {icon: 2, time: 2000}); - return false; - } - if (isNull(params.revokeMapping)) { - winui.window.msg("请输入撤销接口", {icon: 2, time: 2000}); - return false; - } - params.dsFormId = ""; - } else if (params.pageTypes == 2) { - params.addPageUrl = ""; - params.editPageUrl = ""; - params.revokeMapping = ""; - params.dsFormId = $("#dsFormId").val(); - - if (isNull(params.dsFormId)) { - winui.window.msg("请选择表单页面", {icon: 2, time: 2000}); - return false; - } - } // 获取图标信息 params = systemCommonUtil.getIconChoose(params); if (!params["iconChooseResult"]) { diff --git a/activiti/src/main/resources/template/js/actModel/actModelDetails.js b/activiti/src/main/resources/template/js/actModel/actModelDetails.js index 74f049b91..fcfa4eddc 100644 --- a/activiti/src/main/resources/template/js/actModel/actModelDetails.js +++ b/activiti/src/main/resources/template/js/actModel/actModelDetails.js @@ -18,16 +18,6 @@ layui.config({ method: 'GET', template: $("#beanTemplate").html(), ajaxSendAfter:function (json) { - if(json.bean.pageTypes == 1){ - $("#pageTypes").html('指定业务'); - $(".TypeIsTwo").addClass("layui-hide"); - $(".TypeIsOne").removeClass("layui-hide"); - } else { - $("#pageTypes").html('动态表单'); - $(".TypeIsTwo").removeClass("layui-hide"); - $(".TypeIsOne").addClass("layui-hide"); - } - if(json.bean.iconType == 1){ $("#iconType").html('Icon'); $(".iconTypeIsTwo").addClass("layui-hide"); diff --git a/activiti/src/main/resources/template/js/actModel/actModelEdit.js b/activiti/src/main/resources/template/js/actModel/actModelEdit.js index bfcc5fac2..55f6bc15c 100644 --- a/activiti/src/main/resources/template/js/actModel/actModelEdit.js +++ b/activiti/src/main/resources/template/js/actModel/actModelEdit.js @@ -27,44 +27,6 @@ layui.config({ textool.init({eleId: 'remark', maxlength: 200}); - // 初始化动态表单 - showGrid({ - id: "dsFormId", - url: flowableBasePath + "actmodletype020", - params: {}, - pagination: false, - template: getFileContent('tpl/template/select-option-must.tpl'), - ajaxSendAfter: function (data) { - form.render('select'); - $("#dsFormId").val(json.bean.dsFormId); - } - }) - - // 设置页面类型 - $("input:radio[name=pageTypes][value=" + json.bean.pageTypes + "]").attr("checked", true); - - if (json.bean.pageTypes == 1) { - $(".TypeIsTwo").addClass("layui-hide"); - $(".TypeIsOne").removeClass("layui-hide"); - } else { - $(".TypeIsTwo").removeClass("layui-hide"); - $(".TypeIsOne").addClass("layui-hide"); - } - - // 页面类型变化事件 - form.on('radio(pageTypes)', function (data) { - var val = data.value; - if (val == 1) { - // 指定页面 - $(".TypeIsTwo").addClass("layui-hide"); - $(".TypeIsOne").removeClass("layui-hide"); - } else if (val == 2) { - // 动态表单 - $(".TypeIsTwo").removeClass("layui-hide"); - $(".TypeIsOne").addClass("layui-hide"); - } - }); - matchingLanguage(); form.render(); form.on('submit(formEditBean)', function (data) { @@ -72,39 +34,14 @@ layui.config({ var params = { id: parent.rowId, title: $("#title").val(), - pageTypes: data.field.pageTypes, tokenUrl: $("#tokenUrl").val(), remark: $("#remark").val(), commonUsed: data.field.commonUsed, - actFlowId: $("#actFlowId").attr("actFlowId") + actFlowId: $("#actFlowId").attr("actFlowId"), + addPageUrl: $("#addPageUrl").val(), + editPageUrl: $("#editPageUrl").val(), + revokeMapping: $("#revokeMapping").val() }; - if (params.pageTypes == 1) { - params.addPageUrl = $("#addPageUrl").val(); - params.editPageUrl = $("#editPageUrl").val(); - params.revokeMapping = $("#revokeMapping").val(); - if (isNull(params.addPageUrl)) { - winui.window.msg("请输入新增页面地址", {icon: 2, time: 2000}); - return false; - } - if (isNull(params.editPageUrl)) { - winui.window.msg("请输入编辑页面地址", {icon: 2, time: 2000}); - return false; - } - if (isNull(params.revokeMapping)) { - winui.window.msg("请输入撤销接口", {icon: 2, time: 2000}); - return false; - } - params.dsFormId = ""; - } else if (params.pageTypes == 2) { - params.addPageUrl = ""; - params.editPageUrl = ""; - params.revokeMapping = ""; - params.dsFormId = $("#dsFormId").val(); - if (isNull(params.dsFormId)) { - winui.window.msg("请选择表单页面", {icon: 2, time: 2000}); - return false; - } - } // 获取图标信息 params = systemCommonUtil.getIconChoose(params); if (!params["iconChooseResult"]) { diff --git a/activiti/src/main/resources/template/js/actModel/actModelList.js b/activiti/src/main/resources/template/js/actModel/actModelList.js index 2b7f3062e..125b7c71a 100644 --- a/activiti/src/main/resources/template/js/actModel/actModelList.js +++ b/activiti/src/main/resources/template/js/actModel/actModelList.js @@ -265,13 +265,6 @@ layui.config({ return '' + d.title + ''; }}, { field: 'actFlowName', title: '工作流模型', align: 'left', width: 120}, - { field: 'pageTypes', title: '流程类型', align: 'center', width: 120, templet: function (d) { - if (d.pageTypes == 1) { - return "指定业务"; - } else if (d.pageTypes == 2) { - return "动态表单"; - } - }}, { field: 'addPageUrl', title: '新增页面', align: 'left', width: 200 }, { field: 'editPageUrl', title: '编辑页面', align: 'left', width: 200 }, { field: 'iconBg', title: '背景', align: 'center', width: 80 }, diff --git a/activiti/src/main/resources/template/js/approvalActiviti/approvalProcess.js b/activiti/src/main/resources/template/js/approvalActiviti/approvalProcess.js index d1b75385c..bfb43acd0 100644 --- a/activiti/src/main/resources/template/js/approvalActiviti/approvalProcess.js +++ b/activiti/src/main/resources/template/js/approvalActiviti/approvalProcess.js @@ -2,9 +2,6 @@ var jsonArray = [];//表单项 var layedit, form; -// 当前审批的表单是动态表单还是静态页面 -var pageTypes = ""; - layui.config({ base: basePath, version: skyeyeVersion @@ -37,7 +34,6 @@ layui.config({ voucherTemplate = $("#voucherTemplate").html();//凭证展示 AjaxPostUtil.request({url: flowableBasePath + "activitimode016", params: {taskId: taskId, processInstanceId: processInstanceId}, type: 'json', method: 'GET', callback: function(j){ - pageTypes = isNull(j.bean.pageTypes) ? '1' : j.bean.pageTypes; var jsonStr = "";//实体json对象 var str = ""; //获取该节点的id和名称 @@ -340,7 +336,6 @@ layui.config({ flag: $("input[name='flag']:checked").val(), processInstanceId: processInstanceId, editStr: (params.length > 0) ? JSON.stringify(params) : "", - pageTypes: pageTypes, approverId: activitiUtil.getApprovalPersonId() }; AjaxPostUtil.request({url: flowableBasePath + "activitimode005", params: jStr, type: 'json', callback: function (json) { diff --git a/activiti/src/main/resources/template/js/dsFormPageSequence/dsFormPageSequenceDraftProcessAdd.js b/activiti/src/main/resources/template/js/dsFormPageSequence/dsFormPageSequenceDraftProcessAdd.js deleted file mode 100644 index 948542fa2..000000000 --- a/activiti/src/main/resources/template/js/dsFormPageSequence/dsFormPageSequenceDraftProcessAdd.js +++ /dev/null @@ -1,56 +0,0 @@ -var layedit, form; - -layui.config({ - base: basePath, - version: skyeyeVersion -}).extend({ - window: 'js/winui.window' -}).define(['window', 'jquery', 'winui'].concat(dsFormUtil.mastHaveImport), function (exports) { - winui.renderColor(); - var index = parent.layer.getFrameIndex(window.name); - var $ = layui.$; - layedit = layui.layedit, - form = layui.form; - - var actFlowId = parent.actFlowId; - - // 加载动态表单页 - AjaxPostUtil.request({url: flowableBasePath + "dsformpage004", params: {pageId: parent.dsFormId}, type: 'json', method: 'GET', callback: function (json) { - dsFormUtil.loadDsFormItemToEdit("showForm", json.rows); - $("#showForm").append('
' + - '' + - '' + - '
'); - matchingLanguage(); - form.render(); - }}); - - form.on('submit(formAddBean)', function (data) { - if (winui.verifyForm(data.elem)) { - activitiUtil.startProcess(actFlowId, null, function (approvalId) { - if(isNull(actFlowId)){ - winui.window.msg('流程对象为空，无法启动.', {icon: 2, time: 2000}); - return false; - } - var jStr = { - actFlowId: actFlowId, - jsonStr: JSON.stringify(dsFormUtil.getPageData($("#showForm"))), - pageId: parent.dsFormId, - approvalId: approvalId - }; - AjaxPostUtil.request({url: flowableBasePath + "activitimode022", params: jStr, type: 'json', callback: function (json) { - winui.window.msg("申请提交成功，等待审核...", {icon: 1, time: 2000}, function() { - parent.layer.close(index); - parent.refreshCode = '0'; - }); - }}); - }); - } - return false; - }); - - // 取消 - $("body").on("click", "#cancle", function() { - parent.layer.close(index); - }); -}); \ No newline at end of file diff --git a/activiti/src/main/resources/template/js/dsFormPageSequence/dsFormPageSequenceDraftProcessDetail.js b/activiti/src/main/resources/template/js/dsFormPageSequence/dsFormPageSequenceDraftProcessDetail.js deleted file mode 100644 index b4d659b9f..000000000 --- a/activiti/src/main/resources/template/js/dsFormPageSequence/dsFormPageSequenceDraftProcessDetail.js +++ /dev/null @@ -1,22 +0,0 @@ - -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; - - // 动态表单草稿状态下的详情 - var rowId = parent.rowId; - AjaxPostUtil.request({url: flowableBasePath + "pagesequence006", params: {rowId: rowId}, type: 'json', callback: function(j){ - dsFormUtil.initSequenceDataDetails("showForm", j.rows); - matchingLanguage(); - }}); - - exports('dsFormPageSequenceDraftProcessDetail', {}); -}); diff --git a/activiti/src/main/resources/template/js/dsFormPageSequence/dsFormPageSequenceDraftProcessEdit.js b/activiti/src/main/resources/template/js/dsFormPageSequence/dsFormPageSequenceDraftProcessEdit.js deleted file mode 100644 index 8e4e5cf95..000000000 --- a/activiti/src/main/resources/template/js/dsFormPageSequence/dsFormPageSequenceDraftProcessEdit.js +++ /dev/null @@ -1,40 +0,0 @@ -var layedit, form; - -layui.config({ - base: basePath, - version: skyeyeVersion -}).extend({ - window: 'js/winui.window' -}).define(['window', 'jquery', 'winui'].concat(dsFormUtil.mastHaveImport), function (exports) { - winui.renderColor(); - var index = parent.layer.getFrameIndex(window.name); - var $ = layui.$; - layedit = layui.layedit, - form = layui.form; - - // 编辑动态表单时进行回显 - AjaxPostUtil.request({url: flowableBasePath + "pagesequence003", params: {rowId: parent.rowId}, type: 'json', callback: function (json) { - dsFormUtil.loadDsFormItemToEdit("showForm", json.rows); - $("#showForm").append('
' + - '' + - '' + - '
'); - matchingLanguage(); - form.render(); - }}); - form.on('submit(formAddBean)', function (data) { - if (winui.verifyForm(data.elem)) { - var params = dsFormUtil.getPageData($("#showForm")); - AjaxPostUtil.request({url: flowableBasePath + "pagesequence004", params: {jsonStr: JSON.stringify(params)}, type: 'json', 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 diff --git a/activiti/src/main/resources/template/js/dsFormPageSequence/dsFormPageSequenceDraftProcessEditToAct.js b/activiti/src/main/resources/template/js/dsFormPageSequence/dsFormPageSequenceDraftProcessEditToAct.js deleted file mode 100644 index 2a86e0f80..000000000 --- a/activiti/src/main/resources/template/js/dsFormPageSequence/dsFormPageSequenceDraftProcessEditToAct.js +++ /dev/null @@ -1,44 +0,0 @@ -var layedit, form; - -layui.config({ - base: basePath, - version: skyeyeVersion -}).extend({ - window: 'js/winui.window' -}).define(['window', 'jquery', 'winui'].concat(dsFormUtil.mastHaveImport), function (exports) { - winui.renderColor(); - var index = parent.layer.getFrameIndex(window.name); - var $ = layui.$; - layedit = layui.layedit, - form = layui.form; - - // 获取动态表单内容用于编辑申请类型实体 - AjaxPostUtil.request({url: flowableBasePath + "activitimode023", params: {rowId: parent.sequenceId}, type: 'json', callback: function (json) { - dsFormUtil.loadDsFormItemToEdit("showForm", json.rows); - $("#showForm").append('
' + - '' + - '' + - '
'); - form.render(); - matchingLanguage(); - }}); - form.on('submit(formAddBean)', function (data) { - if (winui.verifyForm(data.elem)) { - var jStr = { - jsonStr: JSON.stringify(dsFormUtil.getPageData($("#showForm"))), - taskId: parent.taskId, - processInstanceId: parent.processInstanceId - }; - AjaxPostUtil.request({url: flowableBasePath + "activitimode024", params: jStr, type: 'json', 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 diff --git a/activiti/src/main/resources/template/js/dsFormPageSequence/dsFormPageSequenceDraftProcessList.js b/activiti/src/main/resources/template/js/dsFormPageSequence/dsFormPageSequenceDraftProcessList.js deleted file mode 100644 index 5793b5f86..000000000 --- a/activiti/src/main/resources/template/js/dsFormPageSequence/dsFormPageSequenceDraftProcessList.js +++ /dev/null @@ -1,152 +0,0 @@ - -var rowId = "";//用户提交的表单数据的id - -layui.config({ - base: basePath, - version: skyeyeVersion -}).extend({ - window: 'js/winui.window' -}).define(['window', 'table', 'jquery', 'winui', 'form', 'laydate'], function (exports) { - winui.renderColor(); - var $ = layui.$, - table = layui.table, - laydate = layui.laydate, - form = layui.form; - - // '申请时间'页面的选取时间段表格 - laydate.render({elem: '#createTime', range: '~'}); - - // 我启动的流程 - table.render({ - id: 'messageMyStartTable', - elem: '#messageMyStartTable', - method: 'post', - url: flowableBasePath + 'pagesequence001', - where: getTableParams(), - even: true, - page: true, - limits: getLimits(), - limit: getLimit(), - cols: [[ - { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' }, - { field: 'title', title: '流程名称', width: 100 }, - { field: 'createTime', title: '申请时间', align: 'center', width: 140}, - { field: 'state', title: '状态', align: 'center', width: 80, templet: function (d) { - if(d.state == 1){ - return "草稿"; - } else { - return "正常"; - } - }}, - { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 240, toolbar: '#myStartTableBar'} - ]], - done: function(json) { - matchingLanguage(); - } - }); - - table.on('tool(messageMyStartTable)', function (obj) { - var data = obj.data; - var layEvent = obj.event; - if (layEvent === 'edit') { //编辑 - edit(data); - } else if (layEvent === 'details') { //详情 - details(data); - } else if (layEvent === 'subApproval') { //提交审批 - subApproval(data); - } else if (layEvent === 'deleteRow') { //删除 - deleteRow(data); - } - }); - - // 编辑 - function edit(data) { - rowId = data.id; - _openNewWindows({ - url: '../../tpl/dsFormPageSequence/dsFormPageSequenceDraftProcessEdit.html', - title: systemLanguage["com.skyeye.editPageTitle"][languageType], - pageId: "dsFormPageSequenceDraftProcessEdit", - area: ['90vw', '90vh'], - callBack: function (refreshCode) { - winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000}); - } - }); - } - - // 表单详情 - function details(data) { - rowId = data.id; - _openNewWindows({ - url: "../../tpl/dsFormPageSequence/dsFormPageSequenceDraftProcessDetail.html", - title: systemLanguage["com.skyeye.detailsPageTitle"][languageType], - pageId: "dsFormPageSequenceDraftProcessDetail", - area: ['90vw', '90vh'], - callBack: function (refreshCode) { - } - }); - } - - // 提交审批 - function subApproval(data) { - layer.confirm('确认提交进行审批吗？', { icon: 3, title: '提交审批' }, function (i) { - layer.close(i); - activitiUtil.startProcess(data.pageId, null, function (approvalId) { - var params = { - rowId: data.id, - approvalId: approvalId - }; - AjaxPostUtil.request({url: flowableBasePath + "pagesequence005", params: params, type: 'json', callback: function (json) { - winui.window.msg("申请提交成功，等待审核...", {icon: 1, time: 2000}); - reloadMyStartTable(); - }}); - }); - }); - } - - // 删除 - function deleteRow(data) { - layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function (index) { - layer.close(index); - AjaxPostUtil.request({url: flowableBasePath + "pagesequence002", params: {rowId: data.id}, type: 'json', callback: function (json) { - winui.window.msg(systemLanguage["com.skyeye.deleteOperationSuccessMsg"][languageType], {icon: 1, time: 2000}); - reloadMyStartTable(); - }}); - }); - } - - form.render(); - form.on('submit(formSearch)', function (data) { - if (winui.verifyForm(data.elem)) { - searchMyStartTable(); - } - return false; - }); - - // 刷新表单草稿列表 - $("body").on("click", "#reloadMyStartTable", function() { - reloadMyStartTable(); - }); - - function reloadMyStartTable(){ - table.reloadData("messageMyStartTable", {where: getTableParams()}); - } - - function searchMyStartTable(){ - table.reloadData("messageMyStartTable", {page: {curr: 1}, where: getTableParams()}); - } - - function getTableParams() { - var startTime = ""; - var endTime = ""; - if (!isNull($("#createTime").val())) {//一定要记得，当createTime为空时 - startTime = $("#createTime").val().split('~')[0].trim() + ' 00:00:00'; - endTime = $("#createTime").val().split('~')[1].trim() + ' 23:59:59'; - } - return { - startTime: startTime, - endTime: endTime - }; - } - - exports('dsFormPageSequenceDraftProcessList', {}); -}); diff --git a/activiti/src/main/resources/template/tpl/actModel/actModelAdd.html b/activiti/src/main/resources/template/tpl/actModel/actModelAdd.html index 26567658f..502aeb3e6 100644 --- a/activiti/src/main/resources/template/tpl/actModel/actModelAdd.html +++ b/activiti/src/main/resources/template/tpl/actModel/actModelAdd.html @@ -22,44 +22,28 @@ -
- -
- - -
-
-
+
- +
格式为：../../tpl/model/modelAdd.html
-
+
- +
格式为：../../tpl/model/modelEdit.html
-
+
- +
格式为：bbb001；直接填写接口名即可
-
- -
- -
-
-
diff --git a/activiti/src/main/resources/template/tpl/actModel/actModelDetails.html b/activiti/src/main/resources/template/tpl/actModel/actModelDetails.html index 3a26cb595..4b7957740 100644 --- a/activiti/src/main/resources/template/tpl/actModel/actModelDetails.html +++ b/activiti/src/main/resources/template/tpl/actModel/actModelDetails.html @@ -28,38 +28,24 @@
- -
- -
-
- -
{{addPageUrl}}
-
+
{{editPageUrl}}
-
+
{{revokeMapping}}
-
- -
- {{dsFormName}} -
-
-
diff --git a/activiti/src/main/resources/template/tpl/actModel/actModelEdit.html b/activiti/src/main/resources/template/tpl/actModel/actModelEdit.html index fac16c8c8..37a6eaa9e 100644 --- a/activiti/src/main/resources/template/tpl/actModel/actModelEdit.html +++ b/activiti/src/main/resources/template/tpl/actModel/actModelEdit.html @@ -30,41 +30,26 @@
- -
- - -
-
-
- +
格式为：../../tpl/model/modelAdd.html
-
+
- +
格式为：../../tpl/model/modelEdit.html
-
+
- +
格式为：bbb001；直接填写接口名即可
-
- -
- -
-
diff --git a/activiti/src/main/resources/template/tpl/dsFormPageSequence/dsFormPageSequenceDraftProcessAdd.html b/activiti/src/main/resources/template/tpl/dsFormPageSequence/dsFormPageSequenceDraftProcessAdd.html deleted file mode 100644 index 937050734..000000000 --- a/activiti/src/main/resources/template/tpl/dsFormPageSequence/dsFormPageSequenceDraftProcessAdd.html +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - -
-
- -
-
- - - - - \ No newline at end of file diff --git a/activiti/src/main/resources/template/tpl/dsFormPageSequence/dsFormPageSequenceDraftProcessDetail.html b/activiti/src/main/resources/template/tpl/dsFormPageSequence/dsFormPageSequenceDraftProcessDetail.html deleted file mode 100644 index e0d536184..000000000 --- a/activiti/src/main/resources/template/tpl/dsFormPageSequence/dsFormPageSequenceDraftProcessDetail.html +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - -
-
- -
-
- - - - - - \ No newline at end of file diff --git a/activiti/src/main/resources/template/tpl/dsFormPageSequence/dsFormPageSequenceDraftProcessEdit.html b/activiti/src/main/resources/template/tpl/dsFormPageSequence/dsFormPageSequenceDraftProcessEdit.html deleted file mode 100644 index 90d942d6f..000000000 --- a/activiti/src/main/resources/template/tpl/dsFormPageSequence/dsFormPageSequenceDraftProcessEdit.html +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - -
-
- -
-
- - - - - \ No newline at end of file diff --git a/activiti/src/main/resources/template/tpl/dsFormPageSequence/dsFormPageSequenceDraftProcessEditToAct.html b/activiti/src/main/resources/template/tpl/dsFormPageSequence/dsFormPageSequenceDraftProcessEditToAct.html deleted file mode 100644 index 786255fa5..000000000 --- a/activiti/src/main/resources/template/tpl/dsFormPageSequence/dsFormPageSequenceDraftProcessEditToAct.html +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - -
-
- -
-
- - - - - \ No newline at end of file diff --git a/activiti/src/main/resources/template/tpl/dsFormPageSequence/dsFormPageSequenceDraftProcessList.html b/activiti/src/main/resources/template/tpl/dsFormPageSequence/dsFormPageSequenceDraftProcessList.html deleted file mode 100644 index adc9b7737..000000000 --- a/activiti/src/main/resources/template/tpl/dsFormPageSequence/dsFormPageSequenceDraftProcessList.html +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - -
-
-
-
- -
- -
- - -
-
-
-
-
-
- -
-
-
-
- -
- - - - - - \ No newline at end of file diff --git a/dsform/src/main/resources/template/js/dsFormObjectRelation/dsFormObjectRelationEdit.js b/dsform/src/main/resources/template/js/dsFormObjectRelation/dsFormObjectRelationEdit.js index 660977b09..8232e29dc 100644 --- a/dsform/src/main/resources/template/js/dsFormObjectRelation/dsFormObjectRelationEdit.js +++ b/dsform/src/main/resources/template/js/dsFormObjectRelation/dsFormObjectRelationEdit.js @@ -27,7 +27,7 @@ layui.config({ addRow(); $("#dsFormChooseList" + (rowNum - 1)).val(item.pageNum); $("#dsFormChooseList" + (rowNum - 1)).attr("dataId", item.id); - $("#pageName" + (rowNum - 1)).html(item.pageName); + $("#name" + (rowNum - 1)).html(item.name); }) } else { addRow(); @@ -75,7 +75,7 @@ layui.config({ id: "row" + rowNum.toString(), //checkbox的id trId: "tr" + rowNum.toString(), //行的id dsFormChooseList: "dsFormChooseList" + rowNum.toString(), // 动态表单选择id - pageName: "pageName" + rowNum.toString() // 动态表单页面名称id + name: "name" + rowNum.toString() // 动态表单页面名称id }; $("#useTable").append(getDataUseHandlebars(usetableTemplate, par)); form.render('checkbox'); @@ -86,9 +86,9 @@ layui.config({ $("body").on("click", "#" + btnId, function (e) { dsFormUtil.chooseType = false; // 单选 dsFormUtil.openDsFormPageChoosePage(function (){ - $("#" + par.dsFormChooseList).val(dsFormUtil.dsFormChooseMation.pageNum); + $("#" + par.dsFormChooseList).val(dsFormUtil.dsFormChooseMation.numCode); $("#" + par.dsFormChooseList).attr("dataId", dsFormUtil.dsFormChooseMation.id); - $("#" + par.pageName).html(dsFormUtil.dsFormChooseMation.pageName); + $("#" + par.name).html(dsFormUtil.dsFormChooseMation.name); }); }); } diff --git a/dsform/src/main/resources/template/js/dsFormPage/dsFormPageDesign.js b/dsform/src/main/resources/template/js/dsFormPage/dsFormPageDesign.js index 0056c14fb..b43176df8 100644 --- a/dsform/src/main/resources/template/js/dsFormPage/dsFormPageDesign.js +++ b/dsform/src/main/resources/template/js/dsFormPage/dsFormPageDesign.js @@ -35,16 +35,17 @@ layui.config({ if(typeof item.aData == 'string'){ obj = JSON.parse(item.aData); } - item.context = getDataUseHandlebars(item.templateContent, obj); + item.context = getDataUseHandlebars(item.dsFormComponent.templateContent, obj); } else if (item.associatedDataTypes == 2){//接口 AjaxPostUtil.request({url: flowableBasePath + "dsformpage011", params: {interfa: item.aData}, type: 'json', callback: function(j){ var obj = JSON.parse(j.bean.aData); - item.context = getDataUseHandlebars(item.templateContent, obj); + item.context = getDataUseHandlebars(item.dsFormComponent.templateContent, obj); }, async: false}); } + item.value = item.defaultValue; var jsonStr = {bean: item}; - var html = getDataUseHandlebars('{{#bean}}' + item.htmlContent + '{{/bean}}', jsonStr); - var html_js = getDataUseHandlebars('{{#bean}}' + item.jsContent + '{{/bean}}', jsonStr); + var html = getDataUseHandlebars('{{#bean}}' + item.dsFormComponent.htmlContent + '{{/bean}}', jsonStr); + var html_js = getDataUseHandlebars('{{#bean}}' + item.dsFormComponent.jsContent + '{{/bean}}', jsonStr); var jsCon = ''; $(html).appendTo($("#showForm").get(0)).attr("rowid", item.id); $("#showForm").append(jsCon); @@ -54,12 +55,7 @@ layui.config({ function loadPageMation(json){ $.each(json.rows, function(i, item) { - if(parseInt(item.state) == 1){ - // 加载非删除状态的数据 - loadNewControl(item); - } else { - jsonArray.push(item); - } + loadNewControl(item); }); loadFormItemDrop(); matchingLanguage(); @@ -96,11 +92,11 @@ layui.config({ $.each(json.bean, function (key, value) { $.each(value, function (j, bean) { bean.logo = systemCommonUtil.initIconShow(bean); + formPageControl.push(bean); }); }); }, ajaxSendAfter:function (json) { - formPageControl = [].concat(json.rows); form.render(); } }); @@ -110,12 +106,8 @@ layui.config({ $(".draggable").draggable({ appendTo: "body", helper: "clone", - drag: function (event, ui) { - - }, - stop: function () { - - } + drag: function (event, ui) {}, + stop: function () {} }); $(".droppable").droppable({ accept: ".draggable", @@ -157,16 +149,14 @@ layui.config({ }); var params = { pageId: rowId, - defaultWidth: 'layui-col-xs12', + width: 'layui-col-xs12', title: '标题', linkedData: linkedData, require: '', placeholder: '', defaultValue: '', formContentId: id, - editableNodeId: '', - editableNodeName: '', - keyId: '' + attrKey: '' }; if(linkedData == 1){ @@ -183,28 +173,15 @@ layui.config({ params.associatedDataTypes = ""; params.aData = ""; } - params = getDataScript(params); // 保存控件 reqSaveData(params, templateContent); } - // 获取该控件的脚本信息 - function getDataScript(params){ - AjaxPostUtil.request({url: flowableBasePath + "queryDsFormContentMationById", params: {id: params.formContentId}, type: 'json', method: 'GET', callback: function (json) { - params.htmlContent = encodeURIComponent(json.bean.htmlContent); - params.jsContent = encodeURIComponent(json.bean.jsContent); - }, async: false}); - return params; - } - // 保存“新增控件” function reqSaveData(params, templateContent){ AjaxPostUtil.request({url: flowableBasePath + "dsformpage003", params: params, type: 'json', callback: function (json) { winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000}); - var templateJson = json.bean; - templateJson.biaoJi = "1"; - templateJson.templateContent = templateContent; - loadNewControl(templateJson); + loadNewControl(json.bean); loadFormItemDrop(); }, async: false}); } @@ -230,14 +207,14 @@ layui.config({ obj = JSON.stringify(item.aData); } // json串 - $("#JsonData").val(obj); + $("#jsonData").val(obj); } else if (associatedDataTypes == "2") { // 接口 - $("#nterfac").val(item.aData); + $("#interfa").val(item.aData); } $("input:radio[name=associatedDataTypes][value=" + associatedDataTypes + "]").attr("checked", true); } - $("#defaultWidth").val(item.defaultWidth); + $("#width").val(item.width); form.render(); form.on('submit(formAddBean)', function (data) { if (winui.verifyForm(data.elem)) { @@ -251,16 +228,11 @@ layui.config({ form.on('select(require)',function(data) { arr = data.value; }); + + if (!isNull(item.require)) { + arr = item.require.split(","); + } - // 可编辑节点Id - $('#editableNodeId').tagEditor({ - placeholder: '请输入可编辑节点Id' - }); - - // 可编辑节点名称 - $('#editableNodeName').tagEditor({ - placeholder: '请输入可编辑节点名称' - }); initRequire(item); matchingLanguage(); return; @@ -274,7 +246,7 @@ layui.config({ $("#showForm div[rowid='" + rowid + "']").remove(); $.each(jsonArray, function(i, item) { if(item.id === rowid){ - jsonArray[i].state = 0; + jsonArray[i].deleteFlag = 1; } }); $("#btnBoxDesignForm").empty(); @@ -291,14 +263,12 @@ layui.config({ return; } var newParams = jsonArray[inDataIndex]; - newParams.labelContent = $("#title").val(); + newParams.title = $("#title").val(); newParams.placeholder = $("#placeholder").val(); newParams.require = arr.join(","); - newParams.value = $("#defaultValue").val(); - newParams.defaultWidth = $("#defaultWidth").val(); - newParams.keyId = $("#keyId").val(); - newParams.editableNodeId = data.field.editableNodeId; - newParams.editableNodeName = data.field.editableNodeName; + newParams.defaultValue = $("#defaultValue").val(); + newParams.width = $("#width").val(); + newParams.attrKey = $("#attrKey").val(); var linkedData; //控件关联的数据 var defaultData; //选择事件的默认数据 var tplContentVal; //数据展示模板的内容的值 @@ -320,7 +290,7 @@ layui.config({ if (newParams.linkedData == 1) { newParams.associatedDataTypes = data.field.associatedDataTypes; if (newParams.associatedDataTypes == 1) { - var defaultDataStr = $("#JsonData").val(); + var defaultDataStr = $("#jsonData").val(); if (isNull(defaultDataStr)) { winui.window.msg("请填写Json串！", {icon: 2, time: 2000}); return false; @@ -339,7 +309,7 @@ layui.config({ } } } else if (newParams.associatedDataTypes == 2) { - var interfa = $("#nterfac").val(); + var interfa = $("#interfa").val(); if (interfa.length == 0) { winui.window.msg("请填写接口！", {icon: 2, time: 2000}); return false; @@ -368,18 +338,16 @@ layui.config({ // 对控件进行排序 sortNodeData(); $("#showForm").empty(); - jsonArray.sort(getSortFun('asc','orderBy')); + jsonArray.sort(getSortFun('asc', 'orderBy')); var newJson = [].concat(jsonArray); jsonArray = []; loadPageMation({rows: newJson}); } - function sortNodeData(){ + function sortNodeData() { $.each(jsonArray, function(i, item) { - if(parseInt(item.state) == 1){ - var inIndex = $("#showForm div[rowid='" + item.id + "']").index(); - jsonArray[i].orderBy = inIndex / 2 + 1; - } + var inIndex = $("#showForm div[rowid='" + item.id + "']").index(); + jsonArray[i].orderBy = inIndex; }); } @@ -407,14 +375,10 @@ layui.config({ form.render(); } - $("body").on("keyup", ".keyIdName", function() { - $(this).val($(this).val().replace(/[^\w\.\/]/ig,'')); - }); - - //保存 + // 保存 $("body").on("click", "#save", function() { sortDataIn(); - if(jsonArray.length == 0){ + if (jsonArray.length == 0) { winui.window.msg('保存页面不能为空！', {icon: 2, time: 2000}); return; } diff --git a/dsform/src/main/resources/template/js/dsFormPage/dsFormPageListChoose.js b/dsform/src/main/resources/template/js/dsFormPage/dsFormPageListChoose.js index 243bf46ec..7cf268010 100644 --- a/dsform/src/main/resources/template/js/dsFormPage/dsFormPageListChoose.js +++ b/dsform/src/main/resources/template/js/dsFormPage/dsFormPageListChoose.js @@ -47,9 +47,9 @@ layui.config({ limit: getLimit(), cols: [[ { type: parent.dsFormUtil.chooseType ? 'checkbox' : 'radio', fixed: 'left'}, - { field: 'pageName', title: '页面名称', align: 'left', width: 120 }, - { field: 'pageDesc', title: '页面简介', align: 'left', width: 350 }, - { field: 'pageNum', title: '页面编号', align: 'center', width: 150 }, + { field: 'name', title: '名称', align: 'left', width: 120 }, + { field: 'remark', title: '简介', align: 'left', width: 350 }, + { field: 'numCode', title: '页面编号', align: 'center', width: 150 }, ]], done: function(res, curr, count){ matchingLanguage(); @@ -85,6 +85,10 @@ layui.config({ form.render(); }); } + + initTableSearchUtil.initAdvancedSearch(this, res.searchFilter, form, "请输入名称", function () { + table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()}); + }); } }); @@ -108,21 +112,16 @@ layui.config({ }); form.render(); - form.on('submit(formSearch)', function (data) { - if (winui.verifyForm(data.elem)) { - table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()}); - } - return false; - }); - $("body").on("click", "#reloadTable", function() { + loadTable(); + }); + + function loadTable() { table.reloadData("messageTable", {where: getTableParams()}); - }); + } function getTableParams() { - return { - pageName: $("#pageName").val() - }; + return $.extend(true, {}, initTableSearchUtil.getSearchValue("messageTable")); } exports('dsFormPageListChoose', {}); diff --git a/dsform/src/main/resources/template/js/dsFormPage/pageAdd.js b/dsform/src/main/resources/template/js/dsFormPage/pageAdd.js index 217face84..e253675c9 100644 --- a/dsform/src/main/resources/template/js/dsFormPage/pageAdd.js +++ b/dsform/src/main/resources/template/js/dsFormPage/pageAdd.js @@ -15,10 +15,10 @@ layui.config({ form.on('submit(formAddBean)', function (data) { if (winui.verifyForm(data.elem)) { var params = { - pageName: $("#pageName").val(), - pageDesc: $("#pageDesc").val() + name: $("#name").val(), + remark: $("#remark").val() }; - AjaxPostUtil.request({url: flowableBasePath + "dsformpage002", params: params, type: 'json', method: "POST", callback: function (json) { + AjaxPostUtil.request({url: flowableBasePath + "writeDsFormPage", params: params, type: 'json', method: "POST", callback: function (json) { parent.layer.close(index); parent.refreshCode = '0'; }}); diff --git a/dsform/src/main/resources/template/js/dsFormPage/pageEdit.js b/dsform/src/main/resources/template/js/dsFormPage/pageEdit.js index b443fcd70..bf41d4479 100644 --- a/dsform/src/main/resources/template/js/dsFormPage/pageEdit.js +++ b/dsform/src/main/resources/template/js/dsFormPage/pageEdit.js @@ -13,7 +13,7 @@ layui.config({ showGrid({ id: "showForm", url: flowableBasePath + "dsformpage006", - params: {rowId:parent.rowId}, + params: {id: parent.rowId}, pagination: false, method: "GET", template: $("#showTemplate").html(), @@ -24,11 +24,11 @@ layui.config({ form.on('submit(formEditBean)', function (data) { if (winui.verifyForm(data.elem)) { var params = { - rowId: parent.rowId, - pageName: $("#pageName").val(), - pageDesc: $("#pageDesc").val() + id: parent.rowId, + name: $("#name").val(), + remark: $("#remark").val() }; - AjaxPostUtil.request({url: flowableBasePath + "dsformpage007", params: params, type: 'json', method: "PUT", callback: function (json) { + AjaxPostUtil.request({url: flowableBasePath + "writeDsFormPage", params: params, type: 'json', method: "POST", callback: function (json) { parent.layer.close(index); parent.refreshCode = '0'; }}); diff --git a/dsform/src/main/resources/template/js/dsFormPage/pageList.js b/dsform/src/main/resources/template/js/dsFormPage/pageList.js index c429e1fb0..235b29151 100644 --- a/dsform/src/main/resources/template/js/dsFormPage/pageList.js +++ b/dsform/src/main/resources/template/js/dsFormPage/pageList.js @@ -25,13 +25,16 @@ layui.config({ limit: getLimit(), cols: [[ { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' }, - { field: 'pageName', title: '页面名称', align: 'left', width: 120 }, - { field: 'pageDesc', title: '页面简介', align: 'left', width: 350 }, - { field: 'pageNum', title: '页面编号', align: 'center', width: 150 }, + { field: 'name', title: '名称', align: 'left', width: 120 }, + { field: 'remark', title: '简介', align: 'left', width: 350 }, + { field: 'numCode', title: '编号', align: 'center', width: 150 }, { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 200, toolbar: '#tableBar'} ]], done: function(json) { matchingLanguage(); + initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入名称", function () { + table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()}); + }); } }); @@ -60,7 +63,7 @@ layui.config({ }}); }); - // 表单控件 + // 表单设计 function control(data) { rowId = data.id; _openNewWindows({ @@ -76,7 +79,7 @@ layui.config({ 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: flowableBasePath + "dsformpage005", params: {rowId: data.id}, type: 'json', method: "DELETE", callback: function (json) { + AjaxPostUtil.request({url: flowableBasePath + "deleteDsFormPage", params: {id: data.id}, type: 'json', method: "DELETE", callback: function (json) { winui.window.msg(systemLanguage["com.skyeye.deleteOperationSuccessMsg"][languageType], {icon: 1, time: 2000}); loadTable(); }}); @@ -98,26 +101,16 @@ layui.config({ } form.render(); - form.on('submit(formSearch)', function (data) { - if (winui.verifyForm(data.elem)) { - table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()}); - } - return false; + $("body").on("click", "#reloadTable", function() { + loadTable(); }); - // 刷新数据 - $("body").on("click", "#reloadTable", function() { - loadTable(); - }); - - function loadTable() { - table.reloadData("messageTable", {where: getTableParams()}); - } + function loadTable() { + table.reloadData("messageTable", {where: getTableParams()}); + } - function getTableParams() { - return { - pageName: $("#pageName").val() - }; + function getTableParams() { + return $.extend(true, {}, initTableSearchUtil.getSearchValue("messageTable")); } exports('pageList', {}); diff --git a/dsform/src/main/resources/template/tpl/dsFormPage/dsFormPageDesign.html b/dsform/src/main/resources/template/tpl/dsFormPage/dsFormPageDesign.html index 36bd1fe66..2b8f26e9a 100644 --- a/dsform/src/main/resources/template/tpl/dsFormPage/dsFormPageDesign.html +++ b/dsform/src/main/resources/template/tpl/dsFormPage/dsFormPageDesign.html @@ -52,7 +52,7 @@
- +
@@ -66,13 +66,13 @@
- +
- +
@@ -99,7 +99,7 @@
- @@ -108,21 +108,9 @@
- +
- -
-
-
- -
- -
-
-
- -
- +
diff --git a/dsform/src/main/resources/template/tpl/dsFormPage/dsFormPageListChoose.html b/dsform/src/main/resources/template/tpl/dsFormPage/dsFormPageListChoose.html index 8f63ddbef..17f6ebb2e 100644 --- a/dsform/src/main/resources/template/tpl/dsFormPage/dsFormPageListChoose.html +++ b/dsform/src/main/resources/template/tpl/dsFormPage/dsFormPageListChoose.html @@ -7,34 +7,15 @@ -
-
-
-
- -
- -
- - -
-
-
-
- - + +
-
-
-
-
-
+
+
+
diff --git a/erp/src/main/resources/template/js/material/materialList.js b/erp/src/main/resources/template/js/material/materialList.js index 79844a9e0..211ffa52f 100644 --- a/erp/src/main/resources/template/js/material/materialList.js +++ b/erp/src/main/resources/template/js/material/materialList.js @@ -118,7 +118,6 @@ layui.config({ } form.render(); - // 刷新数据 $("body").on("click", "#reloadTable", function() { loadTable(); }); diff --git a/web/src/main/resources/template/assets/lib/layui/customer/skyeye/dsFormUtil.js b/web/src/main/resources/template/assets/lib/layui/customer/skyeye/dsFormUtil.js index 765e5afa2..34ab68694 100644 --- a/web/src/main/resources/template/assets/lib/layui/customer/skyeye/dsFormUtil.js +++ b/web/src/main/resources/template/assets/lib/layui/customer/skyeye/dsFormUtil.js @@ -8,7 +8,7 @@ var dsFormUtil = { dsFormDataKey: "initData", dsFormBtnTemplate: '', - customDsFormBox: '
{{pageName}}
', + customDsFormBox: '
{{dsFormPage.name}}
', // 必须包含的包 mastHaveImport: ['laydate', 'layedit', 'colorpicker', 'slider', 'fileUpload', 'codemirror', 'xml', 'clike', 'css', 'htmlmixed', 'javascript', 'nginx', 'solr', 'sql', 'vue', 'matchbrackets', 'closebrackets', 'showHint', 'anywordHint', 'lint', 'jsonLint', 'foldcode', 'foldgutter', 'braceFold', 'commentFold', 'form'], @@ -41,7 +41,7 @@ var dsFormUtil = { }, /** - * 初始化表单选择按钮信息 + * 初始化表单选择按钮信息 todo 目前没有用到 * * @param id dom对象的id */ @@ -86,7 +86,7 @@ var dsFormUtil = { }, /** - * 加载动态表单到页面 + * 加载动态表单(新增操作) * * @param showBoxId 要追加的boxid后面 * @param code 动态表单-----业务逻辑表单关联表中的code @@ -103,7 +103,7 @@ var dsFormUtil = { loadDsFormItem: function(showBoxId, json) { $.each(json.rows, function(j, bean){ - var customBoxId = bean.id; + var customBoxId = bean.dsFormPage.id; $("#" + showBoxId).append(getDataUseHandlebars(dsFormUtil.customDsFormBox, bean)); dsFormUtil.loadDsFormItemToEdit(customBoxId, bean.content); }); @@ -264,7 +264,7 @@ var dsFormUtil = { }, /** - * 加载动态表单详情到页面 + * 加载动态表单详情 * * @param showBoxId要追加的boxid后面 * @param objectId 绑定的objectId @@ -272,7 +272,7 @@ var dsFormUtil = { loadPageShowDetailsByObjectId: function(showBoxId, objectId) { AjaxPostUtil.request({url: flowableBasePath + "dsformpage015", params: {objectId: objectId}, method: "GET", type: 'json', callback: function(json) { $.each(json.rows, function(j, bean) { - var customBoxId = bean.id; + var customBoxId = bean.dsFormPage.id; $("#" + showBoxId).append(getDataUseHandlebars(dsFormUtil.customDsFormBox, bean)); dsFormUtil.initSequenceDataDetails(customBoxId, bean.content); }); @@ -336,7 +336,7 @@ var dsFormUtil = { }, /** - * 加载动态表单详情到编辑 + * 加载动态表单(编辑操作) * * @param showBoxId要追加的boxid后面 * @param objectId 绑定的objectId -- GitLab