Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient

src/jmap/constant/deviceRender.js

@@ -14,99 +14,88 @@ deviceRender[deviceType.Section] = {
 	progressive: 2
 };
 
-/** Signal渲染配置*/
-deviceRender[deviceType.Signal] = {
-	zlevel: 1,
-	progressive: 3
-};
-
 /** Switch渲染配置*/
 deviceRender[deviceType.Switch] = {
-	zlevel: 3,
+	zlevel: 2,
 	progressive: 5
 };
 
+/** Signal渲染配置*/
+deviceRender[deviceType.Signal] = {
+	zlevel: 2,
+	progressive: 3
+};
+
 /** Station渲染配置*/
 deviceRender[deviceType.Station] = {
-	zlevel: 1,
+	zlevel: 4,
 	progressive: 4
 };
 
 /** StationStand渲染配置*/
 deviceRender[deviceType.StationStand] = {
-	zlevel: 1,
+	zlevel: 4,
 	progressive: 5
 };
 
 /** StationControl渲染配置*/
 deviceRender[deviceType.StationControl] = {
-	zlevel: 1,
+	zlevel: 5,
 	progressive: 4
 };
 
 /** ImageControl渲染配置*/
 deviceRender[deviceType.ImageControl] = {
-	zlevel: 1,
+	zlevel: 5,
 	progressive: 5
 };
 
 /** ZcControl渲染配置*/
 deviceRender[deviceType.ZcControl] = {
-	zlevel: 1,
+	zlevel: 5,
 	progressive: 6
 };
 
 /** LcControl渲染配置*/
 deviceRender[deviceType.LcControl] = {
-	zlevel: 1,
+	zlevel: 5,
 	progressive: 6
 };
 
 /** LimitControl渲染配置*/
 deviceRender[deviceType.LimitControl] = {
-	zlevel: 1,
+	zlevel: 5,
 	progressive: 5
 };
 
 /** StationDelayUnlock渲染配置*/
 deviceRender[deviceType.StationDelayUnlock] = {
-	zlevel: 1,
+	zlevel: 6,
 	progressive: 6
 };
 
 /** Train渲染配置*/
 deviceRender[deviceType.Train] = {
-	zlevel: 1,
+	zlevel: 7,
 	progressive: 9
 };
 
 /** TrainWindow渲染配置*/
 deviceRender[deviceType.TrainWindow] = {
-	zlevel: 1,
+	zlevel: 6,
 	progressive: 8
 };
 
 /** Line渲染配置*/
 deviceRender[deviceType.Line] = {
-	zlevel: 1,
+	zlevel: 9,
 	progressive: 7
 };
 
 /** Text渲染配置*/
 deviceRender[deviceType.Text] = {
-	zlevel: 1,
+	zlevel: 9,
 	progressive: 7
 };
 
-/** TrainWindow渲染配置*/
-deviceRender[deviceType.TrainWindow] = {
-	zlevel: 5,
-	progressive: 4
-};
-/** Train渲染配置*/
-deviceRender[deviceType.TRain] = {
-	zlevel: 6,
-	progressive: 4
-};
-
 export default deviceRender;

src/jmap/map.js

@@ -133,12 +133,14 @@ class Jmap {
 		const options = this.pullBack(opts);
 		this.$options.update(options);
 		this.$painter.updateTransform(this.$options);
-		if (this.methods.optionsUpdate instanceof Function) { this.methods.optionsUpdate(); }
+
 		if (this.$options.disabled == true) {
 			this.$mouseController.disable();
 		} else {
 			this.$mouseController.enable(opts);
 		}
+
+		if (this.methods.optionsUpdate instanceof Function) { this.methods.optionsUpdate(); }
 	}
 
 	setLevelVisible(list, show) {

src/jmap/transformHandle.js

@@ -1,10 +1,10 @@
 // import Group from 'zrender/src/container/Group';
 import * as matrix from 'zrender/src/core/matrix';
 
-function createTransform(zoom) {
+function createTransform(opts) {
 	let transform = matrix.create();
-	transform = matrix.scale(matrix.create(), transform, [zoom.scaleRate, zoom.scaleRate]);
-	transform = matrix.translate(matrix.create(), transform, [-zoom.offsetX, -zoom.offsetY]);
+	transform = matrix.scale(matrix.create(), transform, [opts.scaleRate, opts.scaleRate]);
+	transform = matrix.translate(matrix.create(), transform, [-opts.offsetX, -opts.offsetY]);
 	return transform;
 }