fanruan
/
fineui
4
1
Fork 3
Code Issues 1 Pull Requests Releases Wiki Activity
Browse Source

Revert "无JIRA layout 的updateChildren过程中传递context" 

This reverts commit f0750f646f.
master
翠屏山最速下山传说 3 months ago
parent
df79823d5a
commit
1cc207c31c
1 changed files with 68 additions and 86 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 154
      packages/fineui/src/core/wrapper/layout.js

154
packages/fineui/src/core/wrapper/layout.js
Unescape View File

@ -1,17 +1,4 @@
import {
isNull,
isFunction,
each,
stripEL,
keys,
isArray,
contains,
isKey,
isOdd,
isWidget,
isNotNull,
has
} from "../2.base";
import { isNull, isFunction, each, stripEL, keys, isArray, contains, isKey, isOdd, isWidget, isNotNull, has } from "../2.base";
import { Widget } from "../4.widget";
import { _lazyCreateWidget, Providers } from "../5.inject";
import { shortcut } from "../decorator";
@ -78,38 +65,38 @@ export class Layout extends Widget {
_init4Scroll() {
switch (this.options.scrollable) {
case true:
case "xy":
this.element.css("overflow", "auto");
return;
case false:
this.element.css("overflow", "hidden");
return;
case "x":
this.element.css({
"overflow-x": "auto",
"overflow-y": "hidden",
});
return;
case "y":
this.element.css({
"overflow-x": "hidden",
"overflow-y": "auto",
});
return;
default :
break;
case true:
case "xy":
this.element.css("overflow", "auto");
return;
case false:
this.element.css("overflow", "hidden");
return;
case "x":
this.element.css({
"overflow-x": "auto",
"overflow-y": "hidden",
});
return;
case "y":
this.element.css({
"overflow-x": "hidden",
"overflow-y": "auto",
});
return;
default :
break;
}
if (this.options.scrollx) {
this.element.css({
"overflow-x": "auto",
"overflow-y": "hidden",
});
return;
}
if (this.options.scrolly) {
@ -162,7 +149,7 @@ export class Layout extends Widget {
} else {
w = this.getWidgetByName(this._getChildName(i));
}
return w;
}
@ -176,7 +163,7 @@ export class Layout extends Widget {
}
});
});
return this._addElement(i, item, context, w);
}
@ -188,7 +175,7 @@ export class Layout extends Widget {
if (item instanceof Widget) {
item = item.options;
}
return item;
}
@ -203,19 +190,19 @@ export class Layout extends Widget {
}
const className = Object.prototype.toString.call(a);
switch (className) {
case "[object RegExp]":
case "[object String]":
return `${a}` === `${b}`;
case "[object Number]":
if (+a !== +a) {
return +b !== +b;
}
return +a === 0 ? 1 / +a === 1 / b : +a === +b;
case "[object Date]":
case "[object Boolean]":
return +a === +b;
default:
case "[object RegExp]":
case "[object String]":
return `${a}` === `${b}`;
case "[object Number]":
if (+a !== +a) {
return +b !== +b;
}
return +a === 0 ? 1 / +a === 1 / b : +a === +b;
case "[object Date]":
case "[object Boolean]":
return +a === +b;
default:
}
const areArrays = className === "[object Array]";
@ -265,10 +252,10 @@ export class Layout extends Widget {
}
aStack.pop();
bStack.pop();
return true;
};
return eq(item1, item2);
}
@ -277,9 +264,9 @@ export class Layout extends Widget {
}
// 不依赖于this.options.items进行更新
_updateItemAt(oldIndex, newIndex, item, context) {
_updateItemAt(oldIndex, newIndex, item) {
const del = this._children[this._getChildName(oldIndex)];
const w = this._newElement(newIndex, item, context);
const w = this._newElement(newIndex, item);
// 需要有个地方临时存一下新建的组件，否则如果直接使用newIndex的话，newIndex位置的元素可能会被用到
this._children[`${this._getChildName(newIndex)}-temp`] = w;
const nextSibling = del.element.next();
@ -290,7 +277,7 @@ export class Layout extends Widget {
}
del._destroy();
w._mount();
return true;
}
@ -327,47 +314,42 @@ export class Layout extends Widget {
if (Providers.getProvider(SystemProvider.xtype).getLayoutOptimize()) {
return ((!item.type && item.el) ? ((item._lgap || 0) + (item.lgap || 0)) : item._lgap) || 0;
}
return (item._lgap || 0) + (item.lgap || 0);
}
_optimiseItemRgap(item) {
if (Providers.getProvider(SystemProvider.xtype).getLayoutOptimize()) {
return ((!item.type && item.el) ? ((item._rgap || 0) + (item.rgap || 0)) : item._rgap) || 0;
}
return (item._rgap || 0) + (item.rgap || 0);
}
_optimiseItemTgap(item) {
if (Providers.getProvider(SystemProvider.xtype).getLayoutOptimize()) {
return ((!item.type && item.el) ? ((item._tgap || 0) + (item.tgap || 0)) : item._tgap) || 0;
}
return (item._tgap || 0) + (item.tgap || 0);
}
_optimiseItemBgap(item) {
if (Providers.getProvider(SystemProvider.xtype).getLayoutOptimize()) {
return ((!item.type && item.el) ? ((item._bgap || 0) + (item.bgap || 0)) : item._bgap) || 0;
}
return (item._bgap || 0) + (item.bgap || 0);
}
_optimiseItemHgap(item) {
if (Providers.getProvider(SystemProvider.xtype).getLayoutOptimize()) {
return ((!item.type && item.el) ? ((item._hgap || 0) + (item.hgap || 0)) : item._hgap) || 0;
}
return (item._hgap || 0) + (item.hgap || 0);
}
_optimiseItemVgap(item) {
if (Providers.getProvider(SystemProvider.xtype).getLayoutOptimize()) {
return ((!item.type && item.el) ? ((item._vgap || 0) + (item.vgap || 0)) : item._vgap) || 0;
}
return (item._vgap || 0) + (item.vgap || 0);
}
@ -468,7 +450,7 @@ export class Layout extends Widget {
w.element.prependTo(this._getWrapper());
}
w._mount();
return w;
}
@ -497,7 +479,7 @@ export class Layout extends Widget {
if (!child || !child.shouldUpdate) {
return null;
}
return child.shouldUpdate(this._getOptions(item));
}
@ -550,7 +532,7 @@ export class Layout extends Widget {
value = value.concat(v);
}
});
return value;
}
@ -570,19 +552,19 @@ export class Layout extends Widget {
});
}
patchItem(oldVnode, vnode, oldIndex, newIndex, context) {
patchItem(oldVnode, vnode, oldIndex, newIndex) {
const shouldUpdate = this.shouldUpdateItem(oldIndex, vnode);
const child = this._children[this._getChildName(oldIndex)];
if (shouldUpdate) {
this._children[`${this._getChildName(newIndex)}-temp`] = child;
return child._update(this._getOptions(vnode), shouldUpdate);
}
if (shouldUpdate === null && !this._compare(oldVnode, vnode)) {
// if (child.update) {
// return child.update(this._getOptions(vnode));
// }
return this._updateItemAt(oldIndex, newIndex, vnode, context);
return this._updateItemAt(oldIndex, newIndex, vnode);
}
}
@ -665,7 +647,7 @@ export class Layout extends Widget {
findIndex = i;
}
}
return [found, findIndex];
};
@ -683,26 +665,26 @@ export class Layout extends Widget {
} else if (isNull(oldEndVnode)) {
oldEndVnode = oldCh[--oldEndIdx];
} else if (sameVnode(oldStartVnode, newStartVnode, oldStartIdx, newStartIdx)) {
const willUpdate = this.patchItem(oldStartVnode, newStartVnode, oldStartIdx, newStartIdx, context);
const willUpdate = this.patchItem(oldStartVnode, newStartVnode, oldStartIdx, newStartIdx);
updated = willUpdate || updated;
children[isNull(oldStartVnode.key) ? oldStartIdx : oldStartVnode.key] = willUpdate ? this._children[`${this._getChildName(newStartIdx)}-temp`] : this._children[this._getChildName(oldStartIdx)];
oldStartVnode = oldCh[++oldStartIdx];
newStartVnode = newCh[++newStartIdx];
} else if (sameVnode(oldEndVnode, newEndVnode, oldEndIdx, newEndIdx)) {
const willUpdate = this.patchItem(oldEndVnode, newEndVnode, oldEndIdx, newEndIdx, context);
const willUpdate = this.patchItem(oldEndVnode, newEndVnode, oldEndIdx, newEndIdx);
updated = willUpdate || updated;
children[isNull(oldEndVnode.key) ? oldEndIdx : oldEndVnode.key] = willUpdate ? this._children[`${this._getChildName(newEndIdx)}-temp`] : this._children[this._getChildName(oldEndIdx)];
oldEndVnode = oldCh[--oldEndIdx];
newEndVnode = newCh[--newEndIdx];
} else if (sameVnode(oldStartVnode, newEndVnode)) {
const willUpdate = this.patchItem(oldStartVnode, newEndVnode, oldStartIdx, newStartIdx, context);
const willUpdate = this.patchItem(oldStartVnode, newEndVnode, oldStartIdx, newStartIdx);
updated = willUpdate || updated;
children[isNull(oldStartVnode.key) ? oldStartIdx : oldStartVnode.key] = willUpdate ? this._children[`${this._getChildName(newStartIdx)}-temp`] : this._children[this._getChildName(oldStartIdx)];
insertBefore(oldStartVnode, oldEndVnode, true);
oldStartVnode = oldCh[++oldStartIdx];
newEndVnode = newCh[--newEndIdx];
} else if (sameVnode(oldEndVnode, newStartVnode)) {
const willUpdate = this.patchItem(oldEndVnode, newStartVnode, oldEndIdx, newEndIdx, context);
const willUpdate = this.patchItem(oldEndVnode, newStartVnode, oldEndIdx, newEndIdx);
updated = willUpdate || updated;
children[isNull(oldEndVnode) ? oldEndIdx : oldEndVnode.key] = willUpdate ? this._children[`${this._getChildName(newEndIdx)}-temp`] : this._children[this._getChildName(oldEndIdx)];
insertBefore(oldEndVnode, oldStartVnode);
@ -715,7 +697,7 @@ export class Layout extends Widget {
insertBefore(node, oldStartVnode);
} else { // 如果新节点在旧节点区间中存在就复用一下
const sameOldIndex = sameOldVnode[1];
const willUpdate = this.patchItem(sameOldVnode[0], newStartVnode, sameOldIndex, newStartIdx, context);
const willUpdate = this.patchItem(sameOldVnode[0], newStartVnode, sameOldIndex, newStartIdx);
updated = willUpdate || updated;
children[isNull(sameOldVnode[0].key) ? newStartIdx : sameOldVnode[0].key] = willUpdate ? this._children[`${this._getChildName(newStartIdx)}-temp`] : this._children[this._getChildName(sameOldIndex)];
oldCh[sameOldIndex] = undefined;
@ -762,7 +744,7 @@ export class Layout extends Widget {
const context = opt.context;
const oldItems = o.items;
this.options.items = items;
return this.updateChildren(oldItems, items, context);
}
@ -826,7 +808,7 @@ export class Layout extends Widget {
items,
context: options.context,
});
return;
}
this.options.items = items;

Write Preview
Loading…
Cancel
Save