From 91f73e7c49ce685a7e975c0ee09ef2cdf6a8de2b Mon Sep 17 00:00:00 2001
From: ckcz123 <ckcz123@126.com>
Date: Tue, 26 May 2020 21:40:48 +0800
Subject: [PATCH] Fix bugs

---
 _server/MotaAction.g4 | 2 +-
 libs/control.js       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/_server/MotaAction.g4 b/_server/MotaAction.g4
index 17deeb44..b0258f0b 100644
--- a/_server/MotaAction.g4
+++ b/_server/MotaAction.g4
@@ -203,7 +203,7 @@ IntString_0 = IntString_0 ? (', "number": '+IntString_0) : '';
 EvalString_0 = EvalString_0 ? (', "money": "'+EvalString_0+'"') : '';
 EvalString_1 = EvalString_1 ? (', "sell": "'+EvalString_1+'"') : '';
 if (!EvalString_0 && !EvalString_1) throw "买入金额和卖出金额至少需要填写一个";
-EvalString_2 = EvalString_2 ? (', "condition": "'+EvalString_3+'"') : '';
+EvalString_2 = EvalString_2 ? (', "condition": "'+EvalString_2+'"') : '';
 var code = '{"id": "' + IdString_0 + '"' + IntString_0 + EvalString_0 + EvalString_1 + EvalString_2 + '},\n';
 return code;
 */;
diff --git a/libs/control.js b/libs/control.js
index 2f599c52..a78fd56e 100644
--- a/libs/control.js
+++ b/libs/control.js
@@ -2780,7 +2780,7 @@ control.prototype._resize_statusBar = function (obj) {
     statusBar.style.borderBottom = core.domStyle.isVertical ? '' : obj.border;
     // 自绘状态栏
     if (core.domStyle.isVertical) {
-        core.dom.statusCanvas.style.width = obj.CANVAS_WIDTH + "px";
+        core.dom.statusCanvas.style.width = obj.CANVAS_WIDTH * core.domStyle.scale + "px";
         core.dom.statusCanvas.width = obj.CANVAS_WIDTH;
         core.dom.statusCanvas.style.height = obj.statusBarHeightInVertical - 3 + "px";
         core.dom.statusCanvas.height = obj.col * 32 + 9;