diff --git a/code-doc/src/main/resources/template/js/codemodel/codemodeladd.js b/code-doc/src/main/resources/template/js/codemodel/codemodeladd.js index 87efc7ffe235aa4cd475e6ea4cccf39242136a51..97321b635144cf136be7963be21f61987112d93c 100644 --- a/code-doc/src/main/resources/template/js/codemodel/codemodeladd.js +++ b/code-doc/src/main/resources/template/js/codemodel/codemodeladd.js @@ -4,22 +4,21 @@ layui.config({ version: skyeyeVersion }).extend({ window: 'js/winui.window' -}).define(['window', 'table', 'jquery', 'winui'], function (exports) { +}).define(['window', 'table', 'jquery', 'winui', 'element'], function (exports) { winui.renderColor(); layui.use(['form', 'codemirror', 'xml', 'clike', 'css', 'htmlmixed', 'javascript', 'nginx', 'solr', 'sql', 'vue'], function (form) { var index = parent.layer.getFrameIndex(window.name); var $ = layui.$, + element = layui.element, form = layui.form; - - AjaxPostUtil.request({url:reqBasePath + "exexplain004", params: {type: 1}, type: 'json', callback: function(j){ - if(j.returnCode == 0){ - $(".layui-colla-title").html(j.bean.title); - $(".layui-colla-content").html(j.bean.content); - }else{ - winui.window.msg(j.returnMessage, {icon: 2,time: 2000}); - } - }}); + + // 根据类型获取部分功能的使用说明 + systemCommonUtil.queryExplainMationByType(1, function(json){ + $(".layui-colla-title").html(json.bean.title); + $(".layui-colla-content").html(json.bean.content); + }); + element.init(); var editor = CodeMirror.fromTextArea(document.getElementById("modelContent"), { mode : "text/x-java", // 模式 diff --git a/code-doc/src/main/resources/template/js/codemodel/codemodeledit.js b/code-doc/src/main/resources/template/js/codemodel/codemodeledit.js index bc855428c28e522b3bf3acb9525fd7ecf0184205..efe2d0e7e458c48b44e1daeabfbf3d31d5521050 100644 --- a/code-doc/src/main/resources/template/js/codemodel/codemodeledit.js +++ b/code-doc/src/main/resources/template/js/codemodel/codemodeledit.js @@ -23,14 +23,11 @@ layui.config({ ajaxSendLoadBefore: function(hdb){ }, ajaxSendAfter:function(json){ - AjaxPostUtil.request({url:reqBasePath + "exexplain004", params: {type: 1}, type: 'json', callback: function(j){ - if(j.returnCode == 0){ - $(".layui-colla-title").html(j.bean.title); - $(".layui-colla-content").html(j.bean.content); - }else{ - winui.window.msg(j.returnMessage, {icon: 2,time: 2000}); - } - }}); + // 根据类型获取部分功能的使用说明 + systemCommonUtil.queryExplainMationByType(1, function(json){ + $(".layui-colla-title").html(json.bean.title); + $(".layui-colla-content").html(json.bean.content); + }); element.init(); editor = CodeMirror.fromTextArea(document.getElementById("modelContent"), { diff --git a/dsform/src/main/resources/template/js/dsformcontent/dsformcontentadd.js b/dsform/src/main/resources/template/js/dsformcontent/dsformcontentadd.js index ea43082b26e0a70591753d47653e6d11da90368a..99b0f7a6be523d6c17920eb6afd576ba4ddd0af9 100644 --- a/dsform/src/main/resources/template/js/dsformcontent/dsformcontentadd.js +++ b/dsform/src/main/resources/template/js/dsformcontent/dsformcontentadd.js @@ -6,24 +6,22 @@ layui.config({ version: skyeyeVersion }).extend({ window: 'js/winui.window' -}).define(['window', 'table', 'jquery', 'winui'], function (exports) { +}).define(['window', 'table', 'jquery', 'winui', 'element'], function (exports) { winui.renderColor(); layui.use(['form', 'codemirror', 'xml', 'clike', 'css', 'htmlmixed', 'javascript', 'nginx', 'solr', 'sql', 'vue'], function (form) { var index = parent.layer.getFrameIndex(window.name); var $ = layui.$, + element = layui.element, form = layui.form; - - //表单内容列表 - AjaxPostUtil.request({url:reqBasePath + "exexplain004", params:{type: 2}, type: 'json', callback: function(j){ - if(j.returnCode == 0){ - $("#exexplaintodsformcontentTitle").html(j.bean.title); - $("#exexplaintodsformcontentContent").html(j.bean.content); - }else{ - winui.window.msg(j.returnMessage, {icon: 2,time: 2000}); - } - }}); - + + // 根据类型获取部分功能的使用说明 + systemCommonUtil.queryExplainMationByType(2, function(json) { + $(".layui-colla-title").html(json.bean.title); + $(".layui-colla-content").html(json.bean.content); + }); + element.init(); + //是否关联数据 form.on('switch(linkedData)', function (data) { //关联数据值 @@ -203,11 +201,10 @@ layui.config({ return false; }); - //取消 + // 取消 $("body").on("click", "#cancle", function(){ parent.layer.close(index); }); }); - }); \ No newline at end of file diff --git a/dsform/src/main/resources/template/js/dsformcontent/dsformcontentedit.js b/dsform/src/main/resources/template/js/dsformcontent/dsformcontentedit.js index d739c74575dc5e29b2ee88430df74e2d525cb624..756496fd87f94c09e9e82ec8f50a721e1dfeb975 100644 --- a/dsform/src/main/resources/template/js/dsformcontent/dsformcontentedit.js +++ b/dsform/src/main/resources/template/js/dsformcontent/dsformcontentedit.js @@ -6,12 +6,13 @@ layui.config({ version: skyeyeVersion }).extend({ window: 'js/winui.window' -}).define(['window', 'table', 'jquery', 'winui'], function (exports) { +}).define(['window', 'table', 'jquery', 'winui', 'element'], function (exports) { winui.renderColor(); layui.use(['form', 'codemirror', 'xml', 'clike', 'css', 'htmlmixed', 'javascript', 'nginx', 'solr', 'sql', 'vue'], function (form) { var index = parent.layer.getFrameIndex(window.name); var $ = layui.$, + element = layui.element, form = layui.form; var htmlEditor, jsEditor; @@ -42,16 +43,14 @@ layui.config({ } }); }, - ajaxSendAfter:function(json){ - AjaxPostUtil.request({url:reqBasePath + "exexplain004", params:{type: 2}, type: 'json', callback: function(j){ - if(j.returnCode == 0){ - $("#exexplaintodsformcontentTitle").html(j.bean.title); - $("#exexplaintodsformcontentContent").html(j.bean.content); - }else{ - winui.window.msg(j.returnMessage, {icon: 2,time: 2000}); - } - }}); - + ajaxSendAfter: function(json) { + // 根据类型获取部分功能的使用说明 + systemCommonUtil.queryExplainMationByType(2, function(json){ + $(".layui-colla-title").html(json.bean.title); + $(".layui-colla-content").html(json.bean.content); + }); + element.init(); + htmlEditor = CodeMirror.fromTextArea(document.getElementById("htmlContent"), { mode : "xml", // 模式 theme : "eclipse", // CSS样式选择 diff --git a/dsform/src/main/resources/template/js/dsformdisplaytemplate/dsformdisplaytemplateadd.js b/dsform/src/main/resources/template/js/dsformdisplaytemplate/dsformdisplaytemplateadd.js index 4c9a0f765a94fcee8b736a6d28fec8fff139a712..c043c2a0e50ac68a9542ac7a25a4e6b4e2bae3c6 100644 --- a/dsform/src/main/resources/template/js/dsformdisplaytemplate/dsformdisplaytemplateadd.js +++ b/dsform/src/main/resources/template/js/dsformdisplaytemplate/dsformdisplaytemplateadd.js @@ -9,16 +9,13 @@ layui.config({ var index = parent.layer.getFrameIndex(window.name); var $ = layui.$, form = layui.form; - - AjaxPostUtil.request({url:reqBasePath + "exexplain004", params:{type: 3}, type: 'json', callback: function(j){ - if(j.returnCode == 0){ - $("#exexplaintodsformdisplaytemplateTitle").html(j.bean.title); - $("#exexplaintodsformdisplaytemplateContent").html(j.bean.content); - }else{ - winui.window.msg(j.returnMessage, {icon: 2,time: 2000}); - } - }}); - + + // 根据类型获取部分功能的使用说明 + systemCommonUtil.queryExplainMationByType(3, function(json){ + $("#exexplaintodsformdisplaytemplateTitle").html(json.bean.title); + $("#exexplaintodsformdisplaytemplateContent").html(json.bean.content); + }); + var templateContent = CodeMirror.fromTextArea(document.getElementById("templateContent"), { mode : "xml", // 模式 theme : "eclipse", // CSS样式选择 diff --git a/dsform/src/main/resources/template/js/dsformdisplaytemplate/dsformdisplaytemplateedit.js b/dsform/src/main/resources/template/js/dsformdisplaytemplate/dsformdisplaytemplateedit.js index 067977492ed6eb5b9a7a912ec1f65f53c2115f41..47d08dc6e1fb8495a91f089f3f1c272e4a90cfd8 100644 --- a/dsform/src/main/resources/template/js/dsformdisplaytemplate/dsformdisplaytemplateedit.js +++ b/dsform/src/main/resources/template/js/dsformdisplaytemplate/dsformdisplaytemplateedit.js @@ -35,16 +35,12 @@ layui.config({ matchingLanguage(); form.render(); - //模板规范说明 - AjaxPostUtil.request({url:reqBasePath + "exexplain004", params:{type: 3}, type: 'json', callback: function(j){ - if(j.returnCode == 0){ - $("#exexplaintodsformdisplaytemplateTitle").html(j.bean.title); - $("#exexplaintodsformdisplaytemplateContent").html(j.bean.content); - }else{ - winui.window.msg(j.returnMessage, {icon: 2,time: 2000}); - } - }}); - + // 根据类型获取部分功能的使用说明 + systemCommonUtil.queryExplainMationByType(3, function(json){ + $("#exexplaintodsformdisplaytemplateTitle").html(json.bean.title); + $("#exexplaintodsformdisplaytemplateContent").html(json.bean.content); + }); + form.on('submit(formEditBean)', function (data) { if (winui.verifyForm(data.elem)) { var params = { diff --git a/dsform/src/main/resources/template/tpl/dsFormPage/dsFormPageDesign.html b/dsform/src/main/resources/template/tpl/dsFormPage/dsFormPageDesign.html index 381b8f96b67b3e42e9e95e397382e87834be8dc6..e626abefb4814adbfe49a4390a93e977873a7a10 100644 --- a/dsform/src/main/resources/template/tpl/dsFormPage/dsFormPageDesign.html +++ b/dsform/src/main/resources/template/tpl/dsFormPage/dsFormPageDesign.html @@ -69,6 +69,8 @@ position: fixed; width: 320px; right: 0px; + padding-right: 5px; + padding-top: 5px; } .droppable-active { background-color: #eaeaf6!important; diff --git a/dsform/src/main/resources/template/tpl/dsformcontent/dsformcontentadd.html b/dsform/src/main/resources/template/tpl/dsformcontent/dsformcontentadd.html index 26812c90f87ba6f59519798ad731ab999442c22d..b2409097a834078b2e144945f6d47b7807183804 100644 --- a/dsform/src/main/resources/template/tpl/dsformcontent/dsformcontentadd.html +++ b/dsform/src/main/resources/template/tpl/dsformcontent/dsformcontentadd.html @@ -10,11 +10,14 @@