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

base-servers/gateway-server/src/main/resources/application.yml

@@ -147,4 +147,5 @@ auth:
     - /api/school/wxSchool/taskNotify/taskDetail*
     - /api/school/wxSchool/outInRecord/inout/detail*
     - /api/device/**
+    - /api/file/download*
     - /api/school/excel/**

frontend/pc-web/app/view/Interaction/mailbox/Detail.js

@@ -69,12 +69,16 @@ Ext.define('school.view.interaction.maibox.Detail', {
                 xtype: 'textareafield',
                 name: 'mb_reply',
                 fieldLabel: '回复内容',
-                columnWidth: 1
+                columnWidth: 1,
+                allowBlank: false
             }],
             toolBtns: [{
                 xtype: 'button',
                 text: '回复',
-                handler: 'onReply'
+                handler: 'onReply',
+                bind: {
+                    disabled: '{!base.valid}'
+                }
             }, {
                 xtype: 'button',
                 text: '忽略',

frontend/pc-web/app/view/Interaction/score/Detail.js

@@ -27,7 +27,8 @@ Ext.define('school.view.interaction.score.Detail', {
             }, {
                 xtype: 'textfield',
                 name: 'si_examtitle',
-                fieldLabel: '考试标题'
+                fieldLabel: '考试标题',
+                allowBlank: false
             }, {
                 xtype: 'datefield',
                 name: 'si_examdate',

frontend/pc-web/app/view/Interaction/score/List.js

@@ -162,9 +162,11 @@ Ext.define('school.view.interaction.score.List', {
                     dataIndex: 'si_examtitle',
                     width: 200
                 }, {
+                    xtype: 'datecolumn',
                     text: '考试时间',
                     dataIndex: 'si_examdate',
-                    width: 150
+                    width: 150,
+                    formate: 'Y-m-d',
                 }, {
                     text: '考试范围',
                     dataIndex: 'si_examscope'

frontend/pc-web/app/view/core/form/field/FileField.js

@@ -160,6 +160,7 @@ Ext.define('school.view.core.form.field.FileField', {
 		me.clearAll();
 		var files = new Array();
 		var accessPath = paths.replace(/[ \[ | \" | \" | \] ]/g, '');
+		accessPath = accessPath == 'null' ? null : accessPath;
 		Ext.Ajax.request({
 			// url : 'http://10.1.80.101:9520/api/file/info',
 			url : '/api/file/info',

frontend/pc-web/app/view/core/form/field/TrashField.js

@@ -7,7 +7,8 @@ Ext.define('school.view.core.form.field.TrashField', {
 	alias : 'widget.trashfield',
     style:'margin:5px 0 0 0',
 	fieldStyle: 'background:#C6E2FF;color:#D9D9D9;',
-    autoShow: true,
+	autoShow: true,
+	maxLength: 200,
 	initComponent : function() {
 		this.callParent(arguments);
 	},
@@ -92,7 +93,8 @@ Ext.define('school.view.core.form.field.TrashField', {
 	download : function() {
         var me = this;
         var serverOptions = Ext.manifest.server;
-		window.location.href = (serverOptions.basePath.https?serverOptions.basePath.https:serverOptions.basePath) + '/api/file/download?path='+me.filepath;
+		var rul = (serverOptions.basePath.https?serverOptions.basePath.https:serverOptions.basePath) + '/api/file/download?path='+me.filepath;
+		window.open(rul);
 	},
 	showAttach : function() {
 		var me = this,src = basePath + 'common/download.action?path=' + me.realpath.replace(/\+/g, '%2B')+"&size="+me.filesize+"&fileName="+me.fileName;