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

fix: 修复弱引用问题

Browse Source
This commit is contained in:
dongqing 2020-01-17 15:07:06 +08:00
parent 6f11493310
commit 9f808fb67a
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
painter.js
View File

@ -42,7 +42,7 @@ Component({
type: Object, type: Object,
observer: function (newVal, oldVal) { observer: function (newVal, oldVal) {
if (!this.isEmpty(newVal)) { if (!this.isEmpty(newVal)) {
this.initDancePalette(newVal); this.initDancePalette(JSON.parse(JSON.stringify(newVal)));
} }
}, },
}, },
@ -270,7 +270,7 @@ Component({
} }
if (newVal && newVal.url && doView.url && newVal.url !== doView.url) { if (newVal && newVal.url && doView.url && newVal.url !== doView.url) {
downloader.download(newVal.url, this.properties.LRU).then((path) => { downloader.download(newVal.url, this.properties.LRU).then((path) => {
if (newVal.url.startsWith('https')) { if (newVal.url.startsWith('https') && !newVal.url.startsWith('https://store/')) {
doView.originUrl = newVal.url doView.originUrl = newVal.url
} }
doView.url = path; doView.url = path;
@ -309,7 +309,7 @@ Component({
pen.paint((callbackInfo) => { pen.paint((callbackInfo) => {
callback && callback(callbackInfo); callback && callback(callbackInfo);
this.triggerEvent('viewUpdate', { this.triggerEvent('viewUpdate', {
view: this.touchedView view: this.touchedView && JSON.parse(JSON.stringify(this.touchedView))
}); });
}, true, this.movingCache); }, true, this.movingCache);
} else { } else {
@ -320,7 +320,7 @@ Component({
pen.paint((callbackInfo) => { pen.paint((callbackInfo) => {
callback && callback(callbackInfo); callback && callback(callbackInfo);
this.triggerEvent('viewUpdate', { this.triggerEvent('viewUpdate', {
view: this.touchedView view: this.touchedView && JSON.parse(JSON.stringify(this.touchedView))
}); });
}) })
} }
@ -426,7 +426,7 @@ Component({
this.touchedView = touchAble[i].view this.touchedView = touchAble[i].view
this.findedIndex = touchAble[i].index this.findedIndex = touchAble[i].index
this.triggerEvent('viewClicked', { this.triggerEvent('viewClicked', {
view: this.touchedView view: this.touchedView && JSON.parse(JSON.stringify(this.touchedView))
}) })
} }
} }
@ -435,7 +435,7 @@ Component({
this.frontContext.draw(); this.frontContext.draw();
if (isDelete) { if (isDelete) {
this.triggerEvent('touchEnd', { this.triggerEvent('touchEnd', {
view: this.currentPalette.views[deleteIndex], view: this.currentPalette.views[deleteIndex] && JSON.parse(JSON.stringify(this.currentPalette.views[deleteIndex])),
index: deleteIndex, index: deleteIndex,
type: 'delete' type: 'delete'
}) })
@ -523,7 +523,7 @@ Component({
!this.isScale && this.onClick(e) !this.isScale && this.onClick(e)
} else if (this.touchedView && !this.isEmpty(this.touchedView)) { } else if (this.touchedView && !this.isEmpty(this.touchedView)) {
this.triggerEvent('touchEnd', { this.triggerEvent('touchEnd', {
view: this.touchedView, view: this.touchedView && JSON.parse(JSON.stringify(this.touchedView))
}) })
} }
this.hasMove = false this.hasMove = false
@ -709,7 +709,9 @@ Component({
preCount++; preCount++;
/* eslint-disable no-loop-func */ /* eslint-disable no-loop-func */
downloader.download(view.url, this.properties.LRU).then((path) => { downloader.download(view.url, this.properties.LRU).then((path) => {
view.originUrl = view.url; if (view.url.startsWith('https') && !view.url.startsWith('https://store/')) {
view.originUrl = view.url;
}
view.url = path; view.url = path;
wx.getImageInfo({ wx.getImageInfo({
src: path, src: path,
@ -835,4 +837,4 @@ function setStringPrototype(screenK, scale) {
} }
return res; return res;
}; };
} }