修改评卷参数记忆功能的bug

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/model/Marker.java

@@ -90,7 +90,7 @@ public class Marker implements Serializable {
     /**
      * 个性化评卷参数设置
      */
-    @Column(name = "mark_setting", nullable = true, length = 255)
+    @Column(name = "mark_setting", nullable = true, columnDefinition = "text")
     private String markSetting;
 
     @Transient

stmms-web/src/main/java/cn/com/qmth/stmms/mark/MarkController.java

@@ -6,6 +6,7 @@ import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
 
+import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -430,7 +431,8 @@ public class MarkController extends BaseController {
     public JSONObject updateSetting(HttpServletRequest request, @RequestParam String setting) {
         Marker marker = RequestUtils.getWebUser(request).getMarker();
         JSONObject result = new JSONObject();
-        markerService.updateMarkSetting(marker.getId(), StringUtils.trimToNull(setting));
+        markerService.updateMarkSetting(marker.getId(),
+                StringEscapeUtils.unescapeHtml(StringUtils.trimToNull(setting)));
         result.accumulate("success", true);
         return result;
     }

stmms-web/src/main/webapp/static/mark-new/js/modules/single-image-view.js

@@ -114,7 +114,7 @@ SingleImageView.prototype.render = function() {
 
 SingleImageView.prototype.reloadImage = function(scaleAddon) {
     if (this.image != undefined) {
-        var scale = 1.0
+        var scale = this.scale;
         if (scaleAddon != undefined) {
             scale += scaleAddon;
         }

stmms-web/src/main/webapp/static/mark-new/js/modules/thumbnail.js

@@ -65,6 +65,9 @@ Thumbnail.prototype.init = function() {
     });
     this.container.header.find('#close-button').click(function() {
         self.toggle(false);
+        self.markControl.trigger('mark.setting.change', {
+            'thumbnail.show': false
+        });
     });
 
     this.control = getDom(this.control_dom, this.markControl).appendTo(this.markControl.container.assistant);

stmms-web/src/main/webapp/static/mark-track/js/modules/single-image-view.js

@@ -99,7 +99,7 @@ SingleImageView.prototype.render = function() {
 
 SingleImageView.prototype.reloadImage = function(scaleAddon) {
     if (this.image != undefined) {
-        var scale = 1.0
+        var scale = this.scale;
         if (scaleAddon != undefined) {
             scale += scaleAddon;
         }