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 @@
-
-
+
+
+

+
+ +
+
-
-
模板内容
diff --git a/dsform/src/main/resources/template/tpl/dsformcontent/dsformcontenteditTemplate.tpl b/dsform/src/main/resources/template/tpl/dsformcontent/dsformcontenteditTemplate.tpl index b89f7f3c3d7712a3502ba40a242cfac73dc256f2..f77bc94b3720fedc8d1d45a44da184b16f22df3f 100644 --- a/dsform/src/main/resources/template/tpl/dsformcontent/dsformcontenteditTemplate.tpl +++ b/dsform/src/main/resources/template/tpl/dsformcontent/dsformcontenteditTemplate.tpl @@ -1,8 +1,11 @@ {{#bean}} -
-
-
-
+
+
+

+
+ +
+
模板内容
diff --git a/rmprogram/src/main/resources/template/js/rmproperty/rmpropertyadd.js b/rmprogram/src/main/resources/template/js/rmproperty/rmpropertyadd.js index ffb81563de8e085941276503998976e66e16f122..9d1f2351e0fb1d1e6b64a1d8fa9c120efc361cd8 100644 --- a/rmprogram/src/main/resources/template/js/rmproperty/rmpropertyadd.js +++ b/rmprogram/src/main/resources/template/js/rmproperty/rmpropertyadd.js @@ -14,16 +14,13 @@ layui.config({ form.render(); $("#dataShowModel").hide(); - - AjaxPostUtil.request({url:reqBasePath + "exexplain004", params:{type: 4}, type: 'json', callback: function(j){ - if(j.returnCode == 0){ - $("#exexplaintormpropertyTitle").html(j.bean.title); - $("#exexplaintormpropertyContent").html(j.bean.content); - }else{ - winui.window.msg(j.returnMessage, {icon: 2,time: 2000}); - } - }}); - + + // 根据类型获取部分功能的使用说明 + systemCommonUtil.queryExplainMationByType(4, function(json){ + $("#exexplaintormpropertyTitle").html(json.bean.title); + $("#exexplaintormpropertyContent").html(json.bean.content); + }); + var htmlModelContent = CodeMirror.fromTextArea(document.getElementById("htmlModelContent"), { mode : "xml", // 模式 theme : "eclipse", // CSS样式选择 diff --git a/rmprogram/src/main/resources/template/js/rmproperty/rmpropertyedit.js b/rmprogram/src/main/resources/template/js/rmproperty/rmpropertyedit.js index 5073424e61a7277e367cd3a6943bb17ac12baad8..f851a8674ccd86ed6b05f7a09afb477f45d7a4bd 100644 --- a/rmprogram/src/main/resources/template/js/rmproperty/rmpropertyedit.js +++ b/rmprogram/src/main/resources/template/js/rmproperty/rmpropertyedit.js @@ -149,17 +149,13 @@ layui.config({ form.render('select'); } }); - - //展示规范说明 - AjaxPostUtil.request({url:reqBasePath + "exexplain004", params:{type: 4}, type: 'json', callback: function(j){ - if(j.returnCode == 0){ - $("#exexplaintormpropertyTitle").html(j.bean.title); - $("#exexplaintormpropertyContent").html(j.bean.content); - }else{ - winui.window.msg(j.returnMessage, {icon: 2,time: 2000}); - } - }}); - + + // 根据类型获取部分功能的使用说明 + systemCommonUtil.queryExplainMationByType(4, function(json){ + $("#exexplaintormpropertyTitle").html(json.bean.title); + $("#exexplaintormpropertyContent").html(json.bean.content); + }); + form.on('select(selectParent)', function(data){ AjaxPostUtil.request({url: flowableBasePath + "dsform007", params:{rowId: data.value}, type: 'json', callback: function(json){ if(json.returnCode == 0){ diff --git a/userauth/src/main/resources/template/js/exexplain/exexplaintocodemodel.js b/userauth/src/main/resources/template/js/exExplain/exExplainDesign.js similarity index 66% rename from userauth/src/main/resources/template/js/exexplain/exexplaintocodemodel.js rename to userauth/src/main/resources/template/js/exExplain/exExplainDesign.js index d9b9acb494092938de8226f6bdeb25389f6d3e54..1268abde41f1263dbf85a9a343c4f5632f94d414 100644 --- a/userauth/src/main/resources/template/js/exexplain/exexplaintocodemodel.js +++ b/userauth/src/main/resources/template/js/exExplain/exExplainDesign.js @@ -1,8 +1,6 @@ var rowId = ""; -var type = 1; - layui.config({ base: basePath, version: skyeyeVersion @@ -15,8 +13,10 @@ layui.config({ var $ = layui.$, form = layui.form; + var type = GetUrlParam("type"); + var ue - AjaxPostUtil.request({url:reqBasePath + "exexplain002", params: {type: type}, type: 'json', callback: function(json){ + AjaxPostUtil.request({url: reqBasePath + "exexplain002", params: {type: type}, type: 'json', callback: function(json) { if(json.returnCode == 0){ if(!isNull(json.bean)){ rowId = json.bean.id; @@ -29,7 +29,7 @@ layui.config({ }); matchingLanguage(); }else{ - winui.window.msg(json.returnMessage, {icon: 2,time: 2000}); + winui.window.msg(json.returnMessage, {icon: 2, time: 2000}); } }}); @@ -37,7 +37,7 @@ layui.config({ form.on('submit(formAddBean)', function (data) { if (winui.verifyForm(data.elem)) { if(isNull(ue.getContent())){ - winui.window.msg('请输入内容。', {icon: 2,time: 2000}); + winui.window.msg('请输入内容。', {icon: 2, time: 2000}); }else{ var params = { title: $("#title").val(), @@ -45,21 +45,21 @@ layui.config({ type: type }; if(isNull(rowId)){ - AjaxPostUtil.request({url:reqBasePath + "exexplain001", params:params, type: 'json', callback: function(json){ + AjaxPostUtil.request({url: reqBasePath + "exexplain001", params: params, type: 'json', callback: function(json) { if(json.returnCode == 0){ rowId = json.bean.id; - winui.window.msg(systemLanguage["com.skyeye.addOperationSuccessMsg"][languageType], {icon: 1,time: 2000}); + winui.window.msg(systemLanguage["com.skyeye.addOperationSuccessMsg"][languageType], {icon: 1, time: 2000}); }else{ - winui.window.msg(json.returnMessage, {icon: 2,time: 2000}); + winui.window.msg(json.returnMessage, {icon: 2, time: 2000}); } }}); }else{ params.rowId = rowId; - AjaxPostUtil.request({url:reqBasePath + "exexplain003", params:params, type: 'json', callback: function(json){ + AjaxPostUtil.request({url: reqBasePath + "exexplain003", params: params, type: 'json', callback: function(json) { if(json.returnCode == 0){ - winui.window.msg(systemLanguage["com.skyeye.addOperationSuccessMsg"][languageType], {icon: 1,time: 2000}); + winui.window.msg(systemLanguage["com.skyeye.addOperationSuccessMsg"][languageType], {icon: 1, time: 2000}); }else{ - winui.window.msg(json.returnMessage, {icon: 2,time: 2000}); + winui.window.msg(json.returnMessage, {icon: 2, time: 2000}); } }}); } diff --git a/userauth/src/main/resources/template/js/exexplain/exexplaintodsformcontent.js b/userauth/src/main/resources/template/js/exexplain/exexplaintodsformcontent.js deleted file mode 100644 index 377c3768f2bf97f61c0428e73e80a60bb4b6b18f..0000000000000000000000000000000000000000 --- a/userauth/src/main/resources/template/js/exexplain/exexplaintodsformcontent.js +++ /dev/null @@ -1,88 +0,0 @@ - -var rowId = ""; - -var type = 2; - -layui.config({ - base: basePath, - version: skyeyeVersion -}).extend({ - window: 'js/winui.window', -}).define(['window', 'table', 'jquery', 'winui'], function (exports) { - winui.renderColor(); - layui.use(['form', 'layedit'], function (form) { - var index = parent.layer.getFrameIndex(window.name); - var $ = layui.$, - form = layui.form, - layedit = layui.layedit; - - var layContent; - - AjaxPostUtil.request({url:reqBasePath + "exexplain002", params: {type: type}, type: 'json', callback: function(json){ - if(json.returnCode == 0){ - if(!isNull(json.bean)){ - rowId = json.bean.id; - $("#title").val(json.bean.title); - $("#content").val(json.bean.content); - } - layContent = layedit.build('content', { - tool: [ - 'strong' //加粗 - ,'italic' //斜体 - ,'underline' //下划线 - ,'del' //删除线 - ,'|' //分割线 - ,'left' //左对齐 - ,'center' //居中对齐 - ,'right' //右对齐 - ,'link' //超链接 - ,'unlink' //清除链接 - ,'face' //表情 - ] - }); - matchingLanguage(); - }else{ - winui.window.msg(json.returnMessage, {icon: 2,time: 2000}); - } - }}); - - form.render(); - - form.on('submit(formAddBean)', function (data) { - - if (winui.verifyForm(data.elem)) { - if(isNull(layedit.getContent(layContent))){ - winui.window.msg('请输入内容。', {icon: 2,time: 2000}); - }else{ - var params = { - title: $("#title").val(), - content: encodeURI(layedit.getContent(layContent)), - type: type - }; - if(isNull(rowId)){ - AjaxPostUtil.request({url:reqBasePath + "exexplain001", params:params, type: 'json', callback: function(json){ - if(json.returnCode == 0){ - rowId = json.bean.id; - winui.window.msg(systemLanguage["com.skyeye.addOperationSuccessMsg"][languageType], {icon: 1,time: 2000}); - }else{ - winui.window.msg(json.returnMessage, {icon: 2,time: 2000}); - } - }}); - }else{ - params.rowId = rowId; - AjaxPostUtil.request({url:reqBasePath + "exexplain003", params:params, type: 'json', callback: function(json){ - if(json.returnCode == 0){ - winui.window.msg(systemLanguage["com.skyeye.addOperationSuccessMsg"][languageType], {icon: 1,time: 2000}); - }else{ - winui.window.msg(json.returnMessage, {icon: 2,time: 2000}); - } - }}); - } - } - } - return false; - }); - - }); - -}); \ No newline at end of file diff --git a/userauth/src/main/resources/template/js/exexplain/exexplaintodsformdisplaytemplate.js b/userauth/src/main/resources/template/js/exexplain/exexplaintodsformdisplaytemplate.js deleted file mode 100644 index 9b1af8c4601b978d8eb20c02f62faef943f90ef0..0000000000000000000000000000000000000000 --- a/userauth/src/main/resources/template/js/exexplain/exexplaintodsformdisplaytemplate.js +++ /dev/null @@ -1,88 +0,0 @@ - -var rowId = ""; - -var type = 3; - -layui.config({ - base: basePath, - version: skyeyeVersion -}).extend({ - window: 'js/winui.window', -}).define(['window', 'table', 'jquery', 'winui'], function (exports) { - winui.renderColor(); - layui.use(['form', 'layedit'], function (form) { - var index = parent.layer.getFrameIndex(window.name); - var $ = layui.$, - form = layui.form, - layedit = layui.layedit; - - var layContent; - - AjaxPostUtil.request({url:reqBasePath + "exexplain002", params:{type: type}, type: 'json', callback: function(json){ - if(json.returnCode == 0){ - if(!isNull(json.bean)){ - rowId = json.bean.id; - $("#title").val(json.bean.title); - $("#content").val(json.bean.content); - } - layContent = layedit.build('content', { - tool: [ - 'strong' //加粗 - ,'italic' //斜体 - ,'underline' //下划线 - ,'del' //删除线 - ,'|' //分割线 - ,'left' //左对齐 - ,'center' //居中对齐 - ,'right' //右对齐 - ,'link' //超链接 - ,'unlink' //清除链接 - ,'face' //表情 - ] - }); - matchingLanguage(); - }else{ - winui.window.msg(json.returnMessage, {icon: 2,time: 2000}); - } - }}); - - form.render(); - - form.on('submit(formAddBean)', function (data) { - - if (winui.verifyForm(data.elem)) { - if(isNull(layedit.getContent(layContent))){ - winui.window.msg('请输入内容。', {icon: 2,time: 2000}); - }else{ - var params = { - title: $("#title").val(), - content: encodeURI(layedit.getContent(layContent)), - type: type - }; - if(isNull(rowId)){ - AjaxPostUtil.request({url:reqBasePath + "exexplain001", params:params, type: 'json', callback: function(json){ - if(json.returnCode == 0){ - rowId = json.bean.id; - winui.window.msg(systemLanguage["com.skyeye.addOperationSuccessMsg"][languageType], {icon: 1,time: 2000}); - }else{ - winui.window.msg(json.returnMessage, {icon: 2,time: 2000}); - } - }}); - }else{ - params.rowId = rowId; - AjaxPostUtil.request({url:reqBasePath + "exexplain003", params:params, type: 'json', callback: function(json){ - if(json.returnCode == 0){ - winui.window.msg(systemLanguage["com.skyeye.addOperationSuccessMsg"][languageType], {icon: 1,time: 2000}); - }else{ - winui.window.msg(json.returnMessage, {icon: 2,time: 2000}); - } - }}); - } - } - } - return false; - }); - - }); - -}); \ No newline at end of file diff --git a/userauth/src/main/resources/template/js/exexplain/exexplaintormproperty.js b/userauth/src/main/resources/template/js/exexplain/exexplaintormproperty.js deleted file mode 100644 index 6735296df3bc434d5d2549dd41efeadd9e8c6183..0000000000000000000000000000000000000000 --- a/userauth/src/main/resources/template/js/exexplain/exexplaintormproperty.js +++ /dev/null @@ -1,88 +0,0 @@ - -var rowId = ""; - -var type = 4; - -layui.config({ - base: basePath, - version: skyeyeVersion -}).extend({ - window: 'js/winui.window' -}).define(['window', 'table', 'jquery', 'winui'], function (exports) { - winui.renderColor(); - layui.use(['form', 'layedit'], function (form) { - var index = parent.layer.getFrameIndex(window.name); - var $ = layui.$, - form = layui.form, - layedit = layui.layedit; - - var layContent; - - AjaxPostUtil.request({url:reqBasePath + "exexplain002", params:{type: type}, type: 'json', callback: function(json){ - if(json.returnCode == 0){ - if(!isNull(json.bean)){ - rowId = json.bean.id; - $("#title").val(json.bean.title); - $("#content").val(json.bean.content); - } - layContent = layedit.build('content', { - tool: [ - 'strong' //加粗 - ,'italic' //斜体 - ,'underline' //下划线 - ,'del' //删除线 - ,'|' //分割线 - ,'left' //左对齐 - ,'center' //居中对齐 - ,'right' //右对齐 - ,'link' //超链接 - ,'unlink' //清除链接 - ,'face' //表情 - ,'code' - ] - }); - matchingLanguage(); - }else{ - winui.window.msg(json.returnMessage, {icon: 2,time: 2000}); - } - }}); - - form.render(); - - form.on('submit(formAddBean)', function (data) { - if (winui.verifyForm(data.elem)) { - if(isNull(layedit.getContent(layContent))){ - winui.window.msg('请输入内容。', {icon: 2,time: 2000}); - }else{ - var params = { - title: $("#title").val(), - content: encodeURI(layedit.getContent(layContent)), - type: type - }; - if(isNull(rowId)){ - AjaxPostUtil.request({url:reqBasePath + "exexplain001", params:params, type: 'json', callback: function(json){ - if(json.returnCode == 0){ - rowId = json.bean.id; - winui.window.msg(systemLanguage["com.skyeye.addOperationSuccessMsg"][languageType], {icon: 1,time: 2000}); - }else{ - winui.window.msg(json.returnMessage, {icon: 2,time: 2000}); - } - }}); - }else{ - params.rowId = rowId; - AjaxPostUtil.request({url:reqBasePath + "exexplain003", params:params, type: 'json', callback: function(json){ - if(json.returnCode == 0){ - winui.window.msg(systemLanguage["com.skyeye.addOperationSuccessMsg"][languageType], {icon: 1,time: 2000}); - }else{ - winui.window.msg(json.returnMessage, {icon: 2,time: 2000}); - } - }}); - } - } - } - return false; - }); - - }); - -}); \ No newline at end of file diff --git a/userauth/src/main/resources/template/tpl/exexplain/exexplaintocodemodel.html b/userauth/src/main/resources/template/tpl/exExplain/exExplainDesign.html similarity index 95% rename from userauth/src/main/resources/template/tpl/exexplain/exexplaintocodemodel.html rename to userauth/src/main/resources/template/tpl/exExplain/exExplainDesign.html index 8eb8b2490c346985b408ec975f237246c9d6e139..73ea5f5f6f8d33ebb513e5756d42db216777d2a3 100644 --- a/userauth/src/main/resources/template/tpl/exexplain/exexplaintocodemodel.html +++ b/userauth/src/main/resources/template/tpl/exExplain/exExplainDesign.html @@ -34,7 +34,7 @@ \ No newline at end of file diff --git a/userauth/src/main/resources/template/tpl/exexplain/exexplaintodsformcontent.html b/userauth/src/main/resources/template/tpl/exexplain/exexplaintodsformcontent.html deleted file mode 100644 index f665bb9c2f89d549c4b0a978edcfb597d548db51..0000000000000000000000000000000000000000 --- a/userauth/src/main/resources/template/tpl/exexplain/exexplaintodsformcontent.html +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - -
- -
- -
- -
-
-
- -
- -
-
-
-
- -
-
- -
- - - - - \ No newline at end of file diff --git a/userauth/src/main/resources/template/tpl/exexplain/exexplaintodsformdisplaytemplate.html b/userauth/src/main/resources/template/tpl/exexplain/exexplaintodsformdisplaytemplate.html deleted file mode 100644 index e7042d0ce39626e4b781d2b901458497c2f10769..0000000000000000000000000000000000000000 --- a/userauth/src/main/resources/template/tpl/exexplain/exexplaintodsformdisplaytemplate.html +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - -
-
-
- -
- -
-
-
- -
- -
-
-
-
- -
-
-
-
- - - - - \ No newline at end of file diff --git a/userauth/src/main/resources/template/tpl/exexplain/exexplaintormproperty.html b/userauth/src/main/resources/template/tpl/exexplain/exexplaintormproperty.html deleted file mode 100644 index bdee99533d19b608ba1fe81eb7995cb83ed43e54..0000000000000000000000000000000000000000 --- a/userauth/src/main/resources/template/tpl/exexplain/exexplaintormproperty.html +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - -
-
-
- -
- -
-
-
- -
- -
-
-
-
- -
-
-
-
- - - - - \ No newline at end of file diff --git a/web/src/main/resources/template/assets/lib/layui/customer/systemCommonUtil.js b/web/src/main/resources/template/assets/lib/layui/customer/systemCommonUtil.js index 25d1cf4487d5b18733fba394db00201e0fd0ce1d..91d51a02ada6af870e72c9f5d81c28abfe7e5908 100644 --- a/web/src/main/resources/template/assets/lib/layui/customer/systemCommonUtil.js +++ b/web/src/main/resources/template/assets/lib/layui/customer/systemCommonUtil.js @@ -310,9 +310,12 @@ var systemCommonUtil = { * @param url */ getHasVersionUrl: function (url) { - // 判断是否有问号 - url += (url.indexOf("?") == -1 ? "?" : "&"); - url = url + 'v='+ skyeyeVersion; + var versionStr = 'v='+ skyeyeVersion; + if(url.indexOf(versionStr) == -1) { + // 判断是否有问号 + url += (url.indexOf("?") == -1 ? "?" : "&"); + url = url + versionStr; + } return url; }, @@ -337,13 +340,30 @@ var systemCommonUtil = { "probationPeriod": {"id": 4, "name": "试用期(用于未转正的员工)"}, "retire": {"id": 5, "name": "退休"} }, - getSysUserStaffStateList: function (){ var list = []; $.each(systemCommonUtil.sysUserStaffState, function (key, value){ list.push(value); }); return list; - } + }, + + /** + * 根据类型获取部分功能的使用说明 + * + * @param type 类型 1.代码生成器模板介绍 2.动态表单内容项说明介绍 3.动态表单数据展示模板说明介绍 4.小程序标签属性说明介绍 + * @param callback 回调函数 + */ + queryExplainMationByType: function (type, callback) { + AjaxPostUtil.request({url: reqBasePath + "queryExExplainMationToShow", params: {type: type}, type: 'json', method: "GET", callback: function(json) { + if(json.returnCode == 0) { + if(typeof(callback) == "function") { + callback(json); + } + } else { + winui.window.msg(json.returnMessage, {icon: 2, time: 2000}); + } + }, async: false}); + }, }; \ No newline at end of file