joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	src/jmap/transformHandle.js
This commit is contained in:
ival 2019-07-19 18:02:22 +08:00
commit fa02c97851
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package.json
View File

@ -16,7 +16,6 @@
}, },
"dependencies": { "dependencies": {
"axios": "0.18.0", "axios": "0.18.0",
"echarts": "^4.2.1",
"element-ui": "2.7.2", "element-ui": "2.7.2",
"js-cookie": "2.2.0", "js-cookie": "2.2.0",
"js-md5": "^0.7.3", "js-md5": "^0.7.3",
@ -32,7 +31,8 @@
"vue-router": "3.0.6", "vue-router": "3.0.6",
"vuedraggable": "^2.20.0", "vuedraggable": "^2.20.0",
"vuex": "3.1.0", "vuex": "3.1.0",
"xlsx": "^0.14.2" "xlsx": "^0.14.2",
"zrender": "^4.0.4"
}, },
"devDependencies": { "devDependencies": {
"@babel/core": "7.0.0", "@babel/core": "7.0.0",

6
src/jmap/transformHandle.js
View File

@ -21,13 +21,13 @@ function createBoundingRect(view) {
} }
class TransformHandle { class TransformHandle {
constructor(painter) { constructor(painter, zr) {
this.$painter = painter; this.$painter = painter;
this.$zr = zr;
this.parentLevel = this.$painter.getParentLevel(); this.parentLevel = this.$painter.getParentLevel();
this.rect = { x: 0, y: 0, width: 0, height: 0 }; this.rect = { x: 0, y: 0, width: this.$zr.getWidth(), height: this.$zr.getHeight() };
this.transform = createTransform({ scaleRate: 1, offsetX: 0, offsetY: 0 }); this.transform = createTransform({ scaleRate: 1, offsetX: 0, offsetY: 0 });
} }