open/PainterCore
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #203 from Kujiale-Mobile/heidao

Browse Source 
fix: 优化css覆盖机制
This commit is contained in:
Chris 2019-11-29 18:09:44 +08:00 committed by GitHub
commit d117fbd522
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/pen.js
View File

@ -355,11 +355,6 @@ export default class Painter {
view.rect.minWidth = view.css.fontSize.toPx() + pd[1] + pd[3]; view.rect.minWidth = view.css.fontSize.toPx() + pd[1] + pd[3];
} }
view.css.bottom = undefined
view.css.right = undefined
view.css.left = `${view.rect.x}px`
view.css.top = `${view.rect.y}px`
this.ctx.rotate(angle); this.ctx.rotate(angle);
if (!notClip && view.css && view.css.borderRadius && view.type !== 'rect') { if (!notClip && view.css && view.css.borderRadius && view.type !== 'rect') {
this._doClip(view.css.borderRadius, width, height, view.css.borderStyle); this._doClip(view.css.borderRadius, width, height, view.css.borderStyle);

9
painter.js
View File

@ -68,7 +68,7 @@ Component({
if (newVal) { if (newVal) {
this.doAction(newVal, (callbackInfo) => { this.doAction(newVal, (callbackInfo) => {
this.movingCache = callbackInfo this.movingCache = callbackInfo
}) }, false, true)
} }
}, },
}, },
@ -225,7 +225,7 @@ Component({
return deleteArea return deleteArea
}, },
doAction(action, callback, isMoving) { doAction(action, callback, isMoving, overwrite) {
let newVal = null let newVal = null
if (action) { if (action) {
newVal = action.view newVal = action.view
@ -252,7 +252,9 @@ Component({
return return
} }
if (newVal && newVal.css) { if (newVal && newVal.css) {
if (Array.isArray(doView.css) && Array.isArray(newVal.css)) { if (overwrite) {
doView.css = newVal.css
} else if (Array.isArray(doView.css) && Array.isArray(newVal.css)) {
doView.css = Object.assign({}, ...doView.css, ...newVal.css) doView.css = Object.assign({}, ...doView.css, ...newVal.css)
} else if (Array.isArray(doView.css)) { } else if (Array.isArray(doView.css)) {
doView.css = Object.assign({}, ...doView.css, newVal.css) doView.css = Object.assign({}, ...doView.css, newVal.css)
@ -618,6 +620,7 @@ Component({
views: [] views: []
}).paint(); }).paint();
}); });
this.touchedView = {};
}, },
startPaint() { startPaint() {