Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test

src/iscs/iscs.js

@@ -33,7 +33,8 @@ class Iscs {
         const height = opts.config.height;
         this.isAllowDragging = false;
         this.$iscsZr = zrender.init(opts.dom, Object.assign({ renderer, devicePixelRatio, width, height }, opts.config));
-        this.$options = new Options(Object.assign({ scaleRate: 1, offsetX: 0, offsetY: 0 }, opts.options || {})); // 缩放
+		this.$iscsZr.dom.setAttribute('tabIndex', -1);
+		this.$options = new Options(Object.assign({ scaleRate: 1, offsetX: 0, offsetY: 0 }, opts.options || {})); // 缩放
         this.$mouseController = new MouseController(this);
 
         this.$mouseController.enable();

src/iscs/keyboardController.js

@@ -19,7 +19,8 @@ class KeyboardController extends Eventful {
                 opts = opts || {};
                 this._keyOnDownUp = opts.keyOnDownUp || true;
 
-                dom.addEventListener('keyup', keydownHandle, false);
+				dom.addEventListener('keyup', keydownHandle, false);
+				dom.focus();
             };
 
             this.disable = function () {

src/jmap/keyboardController.js

@@ -22,6 +22,7 @@ class KeyboardController extends Eventful {
 
                	dom.addEventListener('keydown', keydownHandle, false);
 				dom.addEventListener('keyup', keyupHandle, false);
+				dom.focus();
             };
 
             this.disable = function () {

src/jmap/map.js

@@ -44,7 +44,7 @@ class Jlmap {
         this.zoomOnMouseWheel = opts.options.zoomOnMouseWheel;
 
         this.$zr = zrender.init(opts.dom, deepAssign({ renderer, devicePixelRatio, width, height }, opts.config));
-
+		this.$zr.dom.setAttribute('tabIndex', -1);
         this.$options = new Options(deepAssign({ scaleRate: 1, offsetX: 0, offsetY: 0 }, opts.options || {}), (dataZoom) => { this.$mouseController.trigger(this.events.DataZoom, dataZoom); }); // 缩放
         this.$painter = new Painter(this);
         this.$painter.updateZrSize({width: this.$zr.getWidth(), height: this.$zr.getHeight()});

src/jmapNew/keyboardController.js

@@ -20,7 +20,8 @@ class KeyboardController extends Eventful {
                 opts = opts || {};
                 this._keyOnDownUp = opts.keyOnDownUp || true;
 
-                dom.addEventListener('keyup', keydownHandle, false);
+				dom.addEventListener('keyup', keydownHandle, false);
+				dom.focus();
             };
 
             this.disable = function () {

src/jmapNew/map.js

@@ -54,6 +54,7 @@ class Jlmap {
         this.previewOrMapDraw = opts.showConfig.previewOrMapDraw;
 
         this.$zr = zrender.init(opts.dom, deepAssign({ renderer, devicePixelRatio, width, height }, opts.config));
+		this.$zr.dom.setAttribute('tabIndex', -1);
 
         this.$options = new Options(deepAssign({ scaleRate: 1, offsetX: 0, offsetY: 0 }, opts.options || {}), (dataZoom) => { this.$mouseController.trigger(this.events.DataZoom, dataZoom); }); // 缩放
         this.$painter = new Painter(this);

src/router/index_Common.js

@@ -197,6 +197,11 @@ export const constantRoutes = [
         hidden: true
     },
     // 设计平台登录
+    {
+        path: '/design',
+        redirect: '/design/login',
+        hidden: true
+    },
     {
         path: '/design/login',
         component: Login,