架构升级

Former-commit-id: 64269f54249557388b1703999212ac24c9cb151d

src/main/resources/modules/SpringBoot/java/action/ajax/Ajax.java

@@ -43,6 +43,12 @@ import ${domain}.module.${moduleName}.rsp.${table.getCName()}GetResponse;
 <#if table.getUpdate()>
 import ${domain}.module.${moduleName}.rsp.${table.getCName()}UpdateResponse;
 </#if>
+<#list table.methods as item>
+<#if item.selected>
+import ${domain}.module.${moduleName}.req.${table.getCName()}${item.getAbbName()?default("")}Request;
+import ${domain}.module.${moduleName}.rsp.${table.getCName()}${item.getAbbName()?default("")}Response;
+</#if>
+</#list>
 
 import java.io.IOException;
 import java.util.List;
@@ -87,6 +93,14 @@ public class ${table.getCName()}Ajax{
         return ${table.getFName()}Manager.search(request, LocalData.getToken());
     }
 </#if>
+<#list table.methods as item>
+<#if item.selected>
+
+    public ${table.getCName()}${item.getAbbName()?default("")}Response ${item.name}(${table.getCName()}${item.getAbbName()?default("")}Request request) {
+        return ${table.getFName()}Manager.${item.name}(request, LocalData.getToken());
+    }
+</#if>
+</#list>
 <#if table.getHtml()>
 
     public Object template(){

src/main/resources/modules/SpringBoot/java/action/api/Api.java

@@ -2,8 +2,42 @@ package ${domain}.action.api.${module};
 
 import ${domain}.frame.auth.LocalData;
 import ${domain}.module.${module}.mgr.${table.getCName()}Manager;
-import ${domain}.module.${module}.req.*;
-import ${domain}.module.${module}.rsp.*;
+<#if table.getCreate()>
+import ${domain}.module.${moduleName}.req.${table.getCName()}CreateRequest;
+</#if>
+<#if table.getDelete()>
+import ${domain}.module.${moduleName}.req.${table.getCName()}DeleteRequest;
+</#if>
+<#if table.getFind()>
+import ${domain}.module.${moduleName}.req.${table.getCName()}FindRequest;
+</#if>
+<#if table.getGet()>
+import ${domain}.module.${moduleName}.req.${table.getCName()}GetRequest;
+</#if>
+<#if table.getUpdate()>
+import ${domain}.module.${moduleName}.req.${table.getCName()}UpdateRequest;
+</#if>
+<#if table.getCreate()>
+import ${domain}.module.${moduleName}.rsp.${table.getCName()}CreateResponse;
+</#if>
+<#if table.getDelete()>
+import ${domain}.module.${moduleName}.rsp.${table.getCName()}DeleteResponse;
+</#if>
+<#if table.getFind()>
+import ${domain}.module.${moduleName}.rsp.${table.getCName()}FindResponse;
+</#if>
+<#if table.getGet()>
+import ${domain}.module.${moduleName}.rsp.${table.getCName()}GetResponse;
+</#if>
+<#if table.getUpdate()>
+import ${domain}.module.${moduleName}.rsp.${table.getCName()}UpdateResponse;
+</#if>
+<#list table.methods as item>
+<#if item.selected>
+import ${domain}.module.${moduleName}.req.${table.getCName()}${item.getAbbName()?default("")}Request;
+import ${domain}.module.${moduleName}.rsp.${table.getCName()}${item.getAbbName()?default("")}Response;
+</#if>
+</#list>
 import org.springframework.beans.factory.annotation.Autowired;
 
 public class ${table.getCName()}Api{
@@ -46,4 +80,12 @@ public class ${table.getCName()}Api{
         return ${table.getFName()}Manager.search(request, LocalData.getToken());
     }
 </#if>
+<#list table.methods as item>
+<#if item.selected>
+
+    public ${table.getCName()}${item.getAbbName()?default("")}Response ${item.name}(${table.getCName()}${item.getAbbName()?default("")}Request request) {
+        return ${table.getFName()}Manager.${item.name}(request, LocalData.getToken());
+    }
+</#if>
+</#list>
 }

src/main/resources/modules/SpringBoot/java/module/mgr/manager.ftl

@@ -112,9 +112,9 @@ public interface ${table.getCName()}Manager {
      */
     ${table.getCName()}GetResponse get(${table.getCName()}GetRequest request, Token token);
 </#if>
-
 <#list table.methods as item>
 <#if item.selected>
+
     /**
      * ${item.note?default("")}
      *

src/main/resources/modules/SpringBoot/resources/templates/control/nav.ftl

@@ -593,12 +593,15 @@
             },
             // 全屏
             screenFull: function () {
-                var el = document.documentElement;
-                var rfs = el.requestFullScreen || el.webkitRequestFullScreen || el.mozRequestFullScreen || el.msRequestFullScreen;
-
-                //typeof rfs != "undefined" && rfs
-                if (rfs) {
-                    rfs.inputCall(el);
+                var docElm = document.documentElement;
+                if (docElm.requestFullscreen) {//W3C
+                    docElm.requestFullscreen();
+                } else if (docElm.mozRequestFullScreen) {//FireFox
+                    docElm.mozRequestFullScreen();
+                } else if (docElm.webkitRequestFullScreen) {//Chrome等
+                    docElm.webkitRequestFullScreen();
+                } else if (elem.msRequestFullscreen) {//IE11
+                    elem.msRequestFullscreen();
                 } else if (typeof window.ActiveXObject !== "undefined") {
                     //for IE，这里其实就是模拟了按下键盘的F11，使浏览器全屏
                     var wscript = new ActiveXObject("WScript.Shell");
@@ -609,12 +612,14 @@
             },
             // 取消全屏
             screenNotFull: function () {
-                var el = document;
-                var cfs = el.cancelFullScreen || el.webkitCancelFullScreen || el.mozCancelFullScreen || el.exitFullScreen;
-
-                //typeof cfs != "undefined" && cfs
-                if (cfs) {
-                    cfs.inputCall(el);
+                if (document.exitFullscreen) {//W3C
+                    document.exitFullscreen();
+                } else if (document.mozCancelFullScreen) {//FireFox
+                    document.mozCancelFullScreen();
+                } else if (document.webkitCancelFullScreen) {//Chrome等
+                    document.webkitCancelFullScreen();
+                } else if (document.msExitFullscreen) {//IE11
+                    document.msExitFullscreen();
                 } else if (typeof window.ActiveXObject !== "undefined") {
                     //for IE，这里和fullScreen相同，模拟按下F11键退出全屏
                     var wscript = new ActiveXObject("WScript.Shell");