Browse Source

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

heqinwei 7 years ago
parent
commit
0202537228

+ 1 - 1
base-servers/account/account-server/src/main/resources/application.yml

@@ -53,7 +53,7 @@ eureka:
   client:
   client:
     registryFetchIntervalSeconds: 5
     registryFetchIntervalSeconds: 5
     serviceUrl:
     serviceUrl:
-      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@127.0.0.1:8500/eureka/
+      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@192.168.0.181:8510/eureka/
 server:
 server:
   port: 8580
   port: 8580
   tomcat:
   tomcat:

+ 2 - 2
frontend/saas-web/app/view/core/form/FormPanel.js

@@ -421,8 +421,8 @@ Ext.define('saas.view.core.form.FormPanel', {
         var me = this;
         var me = this;
         var viewModel = me.getViewModel();
         var viewModel = me.getViewModel();
         var formItems = me.formItems;
         var formItems = me.formItems;
-        var valid = !!Ext.Array.findBy(formItems, function(f) {
-            return f.isValid();
+        var valid = !Ext.Array.findBy(formItems, function(f) {
+            return !f.isValid();
         });
         });
         var detailGrids = me.query('detailGridField');
         var detailGrids = me.query('detailGridField');