Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
This commit is contained in:
commit
40753ee679
@ -33,6 +33,7 @@ class Iscs {
|
|||||||
const height = opts.config.height;
|
const height = opts.config.height;
|
||||||
this.isAllowDragging = false;
|
this.isAllowDragging = false;
|
||||||
this.$iscsZr = zrender.init(opts.dom, Object.assign({ renderer, devicePixelRatio, width, height }, opts.config));
|
this.$iscsZr = zrender.init(opts.dom, Object.assign({ renderer, devicePixelRatio, width, height }, opts.config));
|
||||||
|
this.$iscsZr.dom.setAttribute('tabIndex', -1);
|
||||||
this.$options = new Options(Object.assign({ scaleRate: 1, offsetX: 0, offsetY: 0 }, opts.options || {})); // 缩放
|
this.$options = new Options(Object.assign({ scaleRate: 1, offsetX: 0, offsetY: 0 }, opts.options || {})); // 缩放
|
||||||
this.$mouseController = new MouseController(this);
|
this.$mouseController = new MouseController(this);
|
||||||
|
|
||||||
|
@ -20,6 +20,7 @@ class KeyboardController extends Eventful {
|
|||||||
this._keyOnDownUp = opts.keyOnDownUp || true;
|
this._keyOnDownUp = opts.keyOnDownUp || true;
|
||||||
|
|
||||||
dom.addEventListener('keyup', keydownHandle, false);
|
dom.addEventListener('keyup', keydownHandle, false);
|
||||||
|
dom.focus();
|
||||||
};
|
};
|
||||||
|
|
||||||
this.disable = function () {
|
this.disable = function () {
|
||||||
|
@ -22,6 +22,7 @@ class KeyboardController extends Eventful {
|
|||||||
|
|
||||||
dom.addEventListener('keydown', keydownHandle, false);
|
dom.addEventListener('keydown', keydownHandle, false);
|
||||||
dom.addEventListener('keyup', keyupHandle, false);
|
dom.addEventListener('keyup', keyupHandle, false);
|
||||||
|
dom.focus();
|
||||||
};
|
};
|
||||||
|
|
||||||
this.disable = function () {
|
this.disable = function () {
|
||||||
|
@ -44,7 +44,7 @@ class Jlmap {
|
|||||||
this.zoomOnMouseWheel = opts.options.zoomOnMouseWheel;
|
this.zoomOnMouseWheel = opts.options.zoomOnMouseWheel;
|
||||||
|
|
||||||
this.$zr = zrender.init(opts.dom, deepAssign({ renderer, devicePixelRatio, width, height }, opts.config));
|
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.$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 = new Painter(this);
|
||||||
this.$painter.updateZrSize({width: this.$zr.getWidth(), height: this.$zr.getHeight()});
|
this.$painter.updateZrSize({width: this.$zr.getWidth(), height: this.$zr.getHeight()});
|
||||||
|
@ -21,6 +21,7 @@ class KeyboardController extends Eventful {
|
|||||||
this._keyOnDownUp = opts.keyOnDownUp || true;
|
this._keyOnDownUp = opts.keyOnDownUp || true;
|
||||||
|
|
||||||
dom.addEventListener('keyup', keydownHandle, false);
|
dom.addEventListener('keyup', keydownHandle, false);
|
||||||
|
dom.focus();
|
||||||
};
|
};
|
||||||
|
|
||||||
this.disable = function () {
|
this.disable = function () {
|
||||||
|
@ -54,6 +54,7 @@ class Jlmap {
|
|||||||
this.previewOrMapDraw = opts.showConfig.previewOrMapDraw;
|
this.previewOrMapDraw = opts.showConfig.previewOrMapDraw;
|
||||||
|
|
||||||
this.$zr = zrender.init(opts.dom, deepAssign({ renderer, devicePixelRatio, width, height }, opts.config));
|
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.$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 = new Painter(this);
|
||||||
|
@ -197,6 +197,11 @@ export const constantRoutes = [
|
|||||||
hidden: true
|
hidden: true
|
||||||
},
|
},
|
||||||
// 设计平台登录
|
// 设计平台登录
|
||||||
|
{
|
||||||
|
path: '/design',
|
||||||
|
redirect: '/design/login',
|
||||||
|
hidden: true
|
||||||
|
},
|
||||||
{
|
{
|
||||||
path: '/design/login',
|
path: '/design/login',
|
||||||
component: Login,
|
component: Login,
|
||||||
|
Loading…
Reference in New Issue
Block a user