Merge branch 'dev' of ssh://10.10.100.21/source/smartschool-platform into dev

frontend/pc-web/app.json

@@ -307,8 +307,23 @@
      * Settings specific to testing builds.
      */
     "testing": {
+        "output": {
+            "appCache": {
+                "enable": true,
+                "path": "cache.appcache"
+            }
+        },
+        "loader": {
+            "cache": "${build.timestamp}"
+        },
+        "cache": {
+            "enable": true
+        },
+        "compressor": {
+            "type": "yui"
+        },
         "server": {
-            "basePath": "https://saas-test-api.usoftchina.com",
+            "basePath": "https://school-api.ydyhz.com",
             "urlPattern": "^\/api\/"
         }
     },
@@ -321,7 +336,7 @@
             "delay": 250
         },
         "server": {
-            "basePath": "https://school-api.ubtob.com",
+            "basePath": "http://10.1.80.47:9520",
             "urlPattern": "^\/api\/"
         }
     },

frontend/pc-web/app/view/basic/school/SchoolInfo.js

@@ -51,7 +51,8 @@ Ext.define('school.view.basic.school.SchoolInfo', {
                 bind: '{schoolName}',
                 fieldLabel: "学校名称",
                 allowBlank: false,
-                columnWidth: 1
+                columnWidth: 1,
+                maxLength: 100
             }, {
                 xtype: "textfield",
                 name: 'school_phone',
@@ -64,7 +65,8 @@ Ext.define('school.view.basic.school.SchoolInfo', {
                 bind: '{schoolAddress}',
                 fieldLabel: "学校地址",
                 allowBlank: true,
-                columnWidth: 1
+                columnWidth: 1,
+                maxLength: 200
             }, {
                 xtype: 'combobox',
                 name: 'school_status',
@@ -104,7 +106,8 @@ Ext.define('school.view.basic.school.SchoolInfo', {
                 name: 'school_remarks',
                 bind: '{schoolRemarks}',
                 fieldLabel: '备注',
-                columnWidth: 1
+                columnWidth: 1,
+                maxLength: 250
             }]
         });
         this.callParent();

frontend/pc-web/package.json

@@ -6,7 +6,8 @@
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "dev": "sencha app watch",
-    "build": "sencha app build --production"
+    "build": "sencha app build --production",
+    "cloud": "sencha app build --testing"
   },
   "keywords": [
     "saas"