Merge remote-tracking branch 'origin/dev' into dev

base-servers/socket/socket-api/src/main/java/com/usoftchina/saas/socket/api/SocketMessageApi.java

@@ -4,6 +4,8 @@ import com.usoftchina.saas.base.Result;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 
 /**
  * @author yingp
@@ -19,8 +21,9 @@ public interface SocketMessageApi {
      * @param message
      * @return
      */
-    @PostMapping("/message/clients/{clientId}")
-    Result sendToClient(@PathVariable("clientId") String clientId, String dest, String message);
+    @RequestMapping("/message/clients/{clientId}")
+    Result sendToClient(@PathVariable("clientId") String clientId,
+                        @RequestParam(value = "dest", required = false) String dest, String message);
 
     /**
      * 广播信息
@@ -29,6 +32,6 @@ public interface SocketMessageApi {
      * @param message
      * @return
      */
-    @PostMapping("/message/clients")
-    Result sendToAllClients(String dest, String message);
+    @RequestMapping("/message/clients")
+    Result sendToAllClients(@RequestParam(value = "dest", required = false) String dest, String message);
 }

base-servers/socket/socket-server/src/main/java/com/usoftchina/saas/socket/controller/MessageController.java

@@ -25,8 +25,9 @@ public class MessageController {
      * @param message
      * @return
      */
-    @PostMapping("/clients/{clientId}")
-    public Result sendToClient(@PathVariable String clientId, String dest, String message) {
+    @RequestMapping("/clients/{clientId}")
+    public Result sendToClient(@PathVariable String clientId,
+                               @RequestParam(value = "dest", required = false) String dest, String message) {
         /**
          * 前端使用
          * <pre>
@@ -44,8 +45,8 @@ public class MessageController {
      * @param message
      * @return
      */
-    @PostMapping("/clients")
-    public Result sendToAllClients(String dest, String message) {
+    @RequestMapping("/clients")
+    public Result sendToAllClients(@RequestParam(value = "dest", required = false) String dest, String message) {
         /**
          * 前端使用
          * <pre>

frontend/saas-web/app/Application.scss

@@ -99,8 +99,8 @@ body.launching {
 // toolbar button
 .x-btn-default-toolbar-small {
   color: #fff;
-  background-color: #308ee0;
-  border-color: #308ee0;
+  background-color: #35BAF6;
+  border-color: #35BAF6;
   min-width: 86px;
   transition: color 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
 

frontend/saas-web/app/view/document/product/FormModel.js

@@ -18,7 +18,8 @@ Ext.define('saas.view.document.product.FormModel', {
             get: function(v) {
                 var form = this.getView(),
                 detailGrid = form.down('detailGridField');
-
+                
+                form.getForm().findField('qcsz').resetOriginalValue();
                 detailGrid.setHidden(!v);
             }
         },

frontend/saas-web/app/view/document/product/FormPanel.js

@@ -375,9 +375,11 @@ Ext.define('saas.view.document.product.FormPanel', {
     listeners: {
         load: function(form, data) {
             var viewModel = form.getViewModel();
-            var store = viewModel.get('detail0').detailStore;
+            var store = viewModel.get('detail0').detailStore,
+            detailGrid = form.down('grid'),
+            trueData = detailGrid.getTrueData();
 
-            viewModel.set('qcsz', store.getCount() > 0);
+            viewModel.set('qcsz', trueData.length > 0);
         }
     }
 });