Browse Source

无jia任务 回退,暂时去不掉

research/test
jian 12 months ago
parent
commit
ee79aea110
  1. 3
      packages/fineui/src/core/4.widget.js
  2. 32
      packages/fineui/src/fix/fix.compact.js

3
packages/fineui/src/core/4.widget.js

@ -874,7 +874,7 @@ export class Widget extends OB {
this._assetMounted();
this.__destroy();
this.fireEvent(Events.UNMOUNT);
this._purgeRef(); // 子组件unmount ref置为null了,父组件拿不到ref,导致报错
// this._purgeRef(); // 子组件unmount ref置为null了,父组件拿不到ref,导致报错
this.purgeListeners();
}
@ -959,7 +959,6 @@ export class Widget extends OB {
this.fireEvent(Events.DESTROY);
this._purgeRef();
this.purgeListeners();
this.options = {};
}
}

32
packages/fineui/src/fix/fix.compact.js

@ -92,11 +92,11 @@ Fix.watch = function(model, expOrFn, cb, options) {
function() {
options && options.store && pushTarget(options.store);
let res;
try {
// try {
res = cb.apply(this, arguments);
} catch (e) {
console.error(e);
}
// } catch (e) {
// console.error(e);
// }
options && options.store && popTarget();
return res;
@ -169,11 +169,11 @@ export function createStore() {
const _init = Widget.prototype._init;
Widget.prototype._init = function() {
const needPop = createStore.call(this);
try {
// try {
_init.apply(this, arguments);
} catch (e) {
console.error(e);
}
// } catch (e) {
// console.error(e);
// }
needPop && popTarget();
};
@ -192,11 +192,11 @@ Widget.prototype.__initWatch = function() {
const unMount = Widget.prototype.__destroy;
Widget.prototype.__destroy = function() {
try {
// try {
unMount.apply(this, arguments);
} catch (e) {
console.error(e);
}
// } catch (e) {
// console.error(e);
// }
this.store && isFunction(this.store.destroy) && this.store.destroy();
each(this._watchers, (i, unwatches) => {
unwatches = isArray(unwatches) ? unwatches : [unwatches];
@ -238,11 +238,11 @@ _.each(["_render", "__afterRender", "_mount", "__afterMount"], (name) => {
(Widget.prototype[name] = function() {
this.store && pushTarget(this.store);
let res;
try {
// try {
res = old.apply(this, arguments);
} catch (e) {
console.error(e);
}
// } catch (e) {
// console.error(e);
// }
this.store && popTarget();
return res;

Loading…
Cancel
Save