@leafer-in/position 2.3.2 → 2.3.4

package/dist/position.cjs

@@ -12,7 +12,15 @@ function positionType(defaultValue) {
     return draw.decorateLeafAttr(defaultValue, key => draw.attr({
         set(value) {
             if (this.__setAttr(key, value)) {
-                if (value) this.waitParentChange(positionParentChange);
+                if (value) {
+                    if (value.id) {
+                        const data = this.__;
+                        if (!data.__usePositionNode) {
+                            data.__usePositionNode = true;
+                            this.__updatePositionLayout = this.__updatePositionLayout.bind(this);
+                        }
+                    } else this.waitParentChange(positionParentChange);
+                }
                 draw.doBoundsType(this);
             }
         }
@@ -26,46 +34,72 @@ draw.UI.addAttr("position", false, positionType);
 const tempPoint = draw.getPointData();
 
 draw.UI.prototype.__updatePositionLayout = function() {
-    let sizeChanged;
-    const {leaferIsCreated: leaferIsCreated, position: position, boxBounds: boxBounds} = this, parentBox = this.parent.boxBounds;
-    const {width: parentWidth, height: parentHeight} = parentBox, {width: width, height: height} = boxBounds;
+    const {leaferIsCreated: leaferIsCreated, position: position, positionNode: positionNode, boxBounds: boxBounds, parent: parent} = this, {width: width, height: height} = boxBounds;
+    let parentBox = parent.boxBounds, align, sizeChanged;
+    if (positionNode) {
+        if (!positionNode.parent || positionNode.destroyed) return false;
+        this.__extraUpdate();
+    }
     if (leaferIsCreated) this.leafer.created = false;
     if (draw.isString(position)) {
-        draw.AlignHelper.toPoint(position, boxBounds, parentBox, tempPoint, true);
-        this.set(tempPoint);
+        align = position;
     } else {
         let {left: left, top: top, right: right, bottom: bottom} = position;
-        const hasLeft = !draw.isUndefined(left), hasTop = !draw.isUndefined(top);
-        if (hasLeft) {
-            left = draw.UnitConvert.number(left, parentWidth);
-            this.x = left;
-        }
-        if (!draw.isUndefined(right)) {
-            right = draw.UnitConvert.number(right, parentWidth);
-            if (hasLeft) this.resizeWidth(parentWidth - left - right), sizeChanged = true; else this.x = parentWidth - width - right;
-        }
-        if (hasTop) {
-            top = draw.UnitConvert.number(top, parentHeight);
-            this.y = top;
-        }
-        if (!draw.isUndefined(bottom)) {
-            bottom = draw.UnitConvert.number(bottom, parentHeight);
-            if (position.top !== undefined) this.resizeHeight(parentHeight - top - bottom), 
-            sizeChanged = true; else this.y = parentHeight - height - bottom;
+        if (positionNode) parentBox = positionNode.getBounds("box", positionNode.parent === parent ? "local" : parent);
+        if (position.align) {
+            align = position.align;
+        } else {
+            const {x: parentX, y: parentY, width: parentWidth, height: parentHeight} = parentBox;
+            const hasLeft = !draw.isUndefined(left), hasTop = !draw.isUndefined(top);
+            if (hasLeft) {
+                left = draw.UnitConvert.number(left, parentWidth);
+                this.x = parentX + left;
+            }
+            if (!draw.isUndefined(right)) {
+                right = draw.UnitConvert.number(right, parentWidth);
+                if (hasLeft) this.resizeWidth(parentWidth - left - right), sizeChanged = true; else this.x = parentX + parentWidth - width - right;
+            }
+            if (hasTop) {
+                top = draw.UnitConvert.number(top, parentHeight);
+                this.y = parentY + top;
+            }
+            if (!draw.isUndefined(bottom)) {
+                bottom = draw.UnitConvert.number(bottom, parentHeight);
+                if (position.top !== undefined) this.resizeHeight(parentHeight - top - bottom), 
+                sizeChanged = true; else this.y = parentY + parentHeight - height - bottom;
+            }
         }
     }
+    if (align) {
+        draw.AlignHelper.toPoint(align, boxBounds, parentBox, tempPoint, false);
+        this.set(tempPoint);
+    }
     if (leaferIsCreated) this.leafer.created = true;
+    draw.LeafHelper.updateAllMatrix(this);
+    this.isBranch ? draw.BranchHelper.updateBounds(this) : draw.LeafHelper.updateBounds(this);
     return sizeChanged;
 };
 
+draw.LeafHelper.listenPositionNode = function(leaf) {
+    const {position: position, positionNode: positionNode} = leaf;
+    if (draw.isObject(position) && position.id) leaf.positionNode = draw.isString(position.id) ? leaf.app.findId(position.id) : position.id; else if (leaf.positionNode) leaf.positionNode = undefined;
+    if (positionNode !== leaf.positionNode) {
+        if (positionNode) positionNode.off(positionNode.parent === leaf.parent ? draw.BoundsEvent.LOCAL : draw.BoundsEvent.WORLD, leaf.__updatePositionLayout);
+        if (leaf.positionNode) {
+            leaf.positionNode.on(leaf.positionNode.parent === leaf.parent ? draw.BoundsEvent.LOCAL : draw.BoundsEvent.WORLD, leaf.__updatePositionLayout);
+            draw.LeafHelper.updateBounds(leaf.positionNode);
+        }
+        leaf.__updatePositionLayout();
+        if (!leaf.positionNode) leaf.__.__usePositionNode = undefined;
+    }
+};
+
 draw.LeafHelper.updatePositionLayout = function(leaf) {
     let hasPosition;
     leaf.children.forEach(item => {
-        if (item.position) {
+        if (item.position && !item.position.id) {
             hasPosition = true;
             item.__updatePositionLayout();
-            draw.LeafHelper.updateAllMatrix(item);
-            item.isBranch ? draw.BranchHelper.updateBounds(item) : draw.LeafHelper.updateBounds(item);
         }
     });
     leaf.__hasPosition = hasPosition;

package/dist/position.esm.js

@@ -1,4 +1,4 @@
-import { decorateLeafAttr, attr, doBoundsType, Plugin, UI, getPointData, isString, AlignHelper, isUndefined, UnitConvert, LeafHelper, BranchHelper } from "@leafer-ui/draw";
+import { decorateLeafAttr, attr, doBoundsType, Plugin, UI, getPointData, isString, isUndefined, UnitConvert, AlignHelper, LeafHelper, BranchHelper, isObject, BoundsEvent } from "@leafer-ui/draw";
 
 import "@leafer-in/resize";
 
@@ -10,7 +10,15 @@ function positionType(defaultValue) {
     return decorateLeafAttr(defaultValue, key => attr({
         set(value) {
             if (this.__setAttr(key, value)) {
-                if (value) this.waitParentChange(positionParentChange);
+                if (value) {
+                    if (value.id) {
+                        const data = this.__;
+                        if (!data.__usePositionNode) {
+                            data.__usePositionNode = true;
+                            this.__updatePositionLayout = this.__updatePositionLayout.bind(this);
+                        }
+                    } else this.waitParentChange(positionParentChange);
+                }
                 doBoundsType(this);
             }
         }
@@ -24,46 +32,72 @@ UI.addAttr("position", false, positionType);
 const tempPoint = getPointData();
 
 UI.prototype.__updatePositionLayout = function() {
-    let sizeChanged;
-    const {leaferIsCreated: leaferIsCreated, position: position, boxBounds: boxBounds} = this, parentBox = this.parent.boxBounds;
-    const {width: parentWidth, height: parentHeight} = parentBox, {width: width, height: height} = boxBounds;
+    const {leaferIsCreated: leaferIsCreated, position: position, positionNode: positionNode, boxBounds: boxBounds, parent: parent} = this, {width: width, height: height} = boxBounds;
+    let parentBox = parent.boxBounds, align, sizeChanged;
+    if (positionNode) {
+        if (!positionNode.parent || positionNode.destroyed) return false;
+        this.__extraUpdate();
+    }
     if (leaferIsCreated) this.leafer.created = false;
     if (isString(position)) {
-        AlignHelper.toPoint(position, boxBounds, parentBox, tempPoint, true);
-        this.set(tempPoint);
+        align = position;
     } else {
         let {left: left, top: top, right: right, bottom: bottom} = position;
-        const hasLeft = !isUndefined(left), hasTop = !isUndefined(top);
-        if (hasLeft) {
-            left = UnitConvert.number(left, parentWidth);
-            this.x = left;
-        }
-        if (!isUndefined(right)) {
-            right = UnitConvert.number(right, parentWidth);
-            if (hasLeft) this.resizeWidth(parentWidth - left - right), sizeChanged = true; else this.x = parentWidth - width - right;
-        }
-        if (hasTop) {
-            top = UnitConvert.number(top, parentHeight);
-            this.y = top;
-        }
-        if (!isUndefined(bottom)) {
-            bottom = UnitConvert.number(bottom, parentHeight);
-            if (position.top !== undefined) this.resizeHeight(parentHeight - top - bottom), 
-            sizeChanged = true; else this.y = parentHeight - height - bottom;
+        if (positionNode) parentBox = positionNode.getBounds("box", positionNode.parent === parent ? "local" : parent);
+        if (position.align) {
+            align = position.align;
+        } else {
+            const {x: parentX, y: parentY, width: parentWidth, height: parentHeight} = parentBox;
+            const hasLeft = !isUndefined(left), hasTop = !isUndefined(top);
+            if (hasLeft) {
+                left = UnitConvert.number(left, parentWidth);
+                this.x = parentX + left;
+            }
+            if (!isUndefined(right)) {
+                right = UnitConvert.number(right, parentWidth);
+                if (hasLeft) this.resizeWidth(parentWidth - left - right), sizeChanged = true; else this.x = parentX + parentWidth - width - right;
+            }
+            if (hasTop) {
+                top = UnitConvert.number(top, parentHeight);
+                this.y = parentY + top;
+            }
+            if (!isUndefined(bottom)) {
+                bottom = UnitConvert.number(bottom, parentHeight);
+                if (position.top !== undefined) this.resizeHeight(parentHeight - top - bottom), 
+                sizeChanged = true; else this.y = parentY + parentHeight - height - bottom;
+            }
         }
     }
+    if (align) {
+        AlignHelper.toPoint(align, boxBounds, parentBox, tempPoint, false);
+        this.set(tempPoint);
+    }
     if (leaferIsCreated) this.leafer.created = true;
+    LeafHelper.updateAllMatrix(this);
+    this.isBranch ? BranchHelper.updateBounds(this) : LeafHelper.updateBounds(this);
     return sizeChanged;
 };
 
+LeafHelper.listenPositionNode = function(leaf) {
+    const {position: position, positionNode: positionNode} = leaf;
+    if (isObject(position) && position.id) leaf.positionNode = isString(position.id) ? leaf.app.findId(position.id) : position.id; else if (leaf.positionNode) leaf.positionNode = undefined;
+    if (positionNode !== leaf.positionNode) {
+        if (positionNode) positionNode.off(positionNode.parent === leaf.parent ? BoundsEvent.LOCAL : BoundsEvent.WORLD, leaf.__updatePositionLayout);
+        if (leaf.positionNode) {
+            leaf.positionNode.on(leaf.positionNode.parent === leaf.parent ? BoundsEvent.LOCAL : BoundsEvent.WORLD, leaf.__updatePositionLayout);
+            LeafHelper.updateBounds(leaf.positionNode);
+        }
+        leaf.__updatePositionLayout();
+        if (!leaf.positionNode) leaf.__.__usePositionNode = undefined;
+    }
+};
+
 LeafHelper.updatePositionLayout = function(leaf) {
     let hasPosition;
     leaf.children.forEach(item => {
-        if (item.position) {
+        if (item.position && !item.position.id) {
             hasPosition = true;
             item.__updatePositionLayout();
-            LeafHelper.updateAllMatrix(item);
-            item.isBranch ? BranchHelper.updateBounds(item) : LeafHelper.updateBounds(item);
         }
     });
     leaf.__hasPosition = hasPosition;

package/dist/position.esm.min.js

@@ -1,2 +1,2 @@
-import{decorateLeafAttr as t,attr as i,doBoundsType as e,Plugin as o,UI as s,getPointData as n,isString as r,AlignHelper as a,isUndefined as h,UnitConvert as u,LeafHelper as d,BranchHelper as p}from"@leafer-ui/draw";import"@leafer-in/resize";function f(t){t.__hasPosition=!0}o.add("position","resize"),s.addAttr("position",!1,function(o){return t(o,t=>i({set(i){this.__setAttr(t,i)&&(i&&this.waitParentChange(f),e(this))}}))});const l=n();s.prototype.__updatePositionLayout=function(){let t;const{leaferIsCreated:i,position:e,boxBounds:o}=this,s=this.parent.boxBounds,{width:n,height:d}=s,{width:p,height:f}=o;if(i&&(this.leafer.created=!1),r(e))a.toPoint(e,o,s,l,!0),this.set(l);else{let{left:i,top:o,right:s,bottom:r}=e;const a=!h(i),l=!h(o);a&&(i=u.number(i,n),this.x=i),h(s)||(s=u.number(s,n),a?(this.resizeWidth(n-i-s),t=!0):this.x=n-p-s),l&&(o=u.number(o,d),this.y=o),h(r)||(r=u.number(r,d),void 0!==e.top?(this.resizeHeight(d-o-r),t=!0):this.y=d-f-r)}return i&&(this.leafer.created=!0),t},d.updatePositionLayout=function(t){let i;t.children.forEach(t=>{t.position&&(i=!0,t.__updatePositionLayout(),d.updateAllMatrix(t),t.isBranch?p.updateBounds(t):d.updateBounds(t))}),t.__hasPosition=i};
+import{decorateLeafAttr as t,attr as i,doBoundsType as o,Plugin as e,UI as s,getPointData as n,isString as d,isUndefined as a,UnitConvert as p,AlignHelper as r,LeafHelper as u,BranchHelper as h,isObject as _,BoundsEvent as f}from"@leafer-ui/draw";import"@leafer-in/resize";function l(t){t.__hasPosition=!0}e.add("position","resize"),s.addAttr("position",!1,function(e){return t(e,t=>i({set(i){if(this.__setAttr(t,i)){if(i)if(i.id){const t=this.__;t.__usePositionNode||(t.__usePositionNode=!0,this.__updatePositionLayout=this.__updatePositionLayout.bind(this))}else this.waitParentChange(l);o(this)}}}))});const c=n();s.prototype.__updatePositionLayout=function(){const{leaferIsCreated:t,position:i,positionNode:o,boxBounds:e,parent:s}=this,{width:n,height:_}=e;let f,l,P=s.boxBounds;if(o){if(!o.parent||o.destroyed)return!1;this.__extraUpdate()}if(t&&(this.leafer.created=!1),d(i))f=i;else{let{left:t,top:e,right:d,bottom:r}=i;if(o&&(P=o.getBounds("box",o.parent===s?"local":s)),i.align)f=i.align;else{const{x:o,y:s,width:u,height:h}=P,f=!a(t),c=!a(e);f&&(t=p.number(t,u),this.x=o+t),a(d)||(d=p.number(d,u),f?(this.resizeWidth(u-t-d),l=!0):this.x=o+u-n-d),c&&(e=p.number(e,h),this.y=s+e),a(r)||(r=p.number(r,h),void 0!==i.top?(this.resizeHeight(h-e-r),l=!0):this.y=s+h-_-r)}}return f&&(r.toPoint(f,e,P,c,!1),this.set(c)),t&&(this.leafer.created=!0),u.updateAllMatrix(this),this.isBranch?h.updateBounds(this):u.updateBounds(this),l},u.listenPositionNode=function(t){const{position:i,positionNode:o}=t;_(i)&&i.id?t.positionNode=d(i.id)?t.app.findId(i.id):i.id:t.positionNode&&(t.positionNode=void 0),o!==t.positionNode&&(o&&o.off(o.parent===t.parent?f.LOCAL:f.WORLD,t.__updatePositionLayout),t.positionNode&&(t.positionNode.on(t.positionNode.parent===t.parent?f.LOCAL:f.WORLD,t.__updatePositionLayout),u.updateBounds(t.positionNode)),t.__updatePositionLayout(),t.positionNode||(t.__.__usePositionNode=void 0))},u.updatePositionLayout=function(t){let i;t.children.forEach(t=>{t.position&&!t.position.id&&(i=!0,t.__updatePositionLayout())}),t.__hasPosition=i};
 //# sourceMappingURL=position.esm.min.js.map

package/dist/position.esm.min.js.map

@@ -1 +1 @@
-{"version":3,"file":"position.esm.min.js","sources":["../../../../../../src/in/packages/position/src/decorate.ts","../../../../../../src/in/packages/position/src/index.ts"],"sourcesContent":["import { attr, decorateLeafAttr, doBoundsType } from '@leafer-ui/draw'\nimport { ILeaf, IValue } from '@leafer/interface'\n\n\nfunction positionParentChange(parent: ILeaf) {\n    parent.__hasPosition = true\n}\n\nexport function positionType(defaultValue?: IValue) {\n    return decorateLeafAttr(defaultValue, (key: string) => attr({\n        set(value: IValue) {\n            if (this.__setAttr(key, value)) {\n                if (value) this.waitParentChange(positionParentChange)\n                doBoundsType(this)\n            }\n        }\n    }))\n}","import { UI, Plugin, UnitConvert, isUndefined, LeafHelper, BranchHelper, isString, AlignHelper, getPointData } from '@leafer-ui/draw'\n\nimport '@leafer-in/resize'\n\nimport { positionType } from './decorate'\n\n\nPlugin.add('position', 'resize')\n\n\n// addAttr\nUI.addAttr('position', false, positionType)\n\n\nconst tempPoint = getPointData()\n\nUI.prototype.__updatePositionLayout = function (): boolean {\n\n    let sizeChanged: boolean\n    const { leaferIsCreated, position, boxBounds } = this, parentBox = this.parent.boxBounds\n    const { width: parentWidth, height: parentHeight } = parentBox, { width, height } = boxBounds\n\n    if (leaferIsCreated) this.leafer.created = false // 拦截布局更新通知，进行手动更新布局\n\n    if (isString(position)) {\n\n        AlignHelper.toPoint(position, boxBounds, parentBox, tempPoint, true)\n        this.set(tempPoint)\n\n    } else {\n\n        let { left, top, right, bottom } = position\n        const hasLeft = !isUndefined(left), hasTop = !isUndefined(top)\n\n        // 布局\n        if (hasLeft) {\n            left = UnitConvert.number(left, parentWidth)\n            this.x = left\n        }\n\n        if (!isUndefined(right)) {\n            right = UnitConvert.number(right, parentWidth)\n\n            if (hasLeft) this.resizeWidth(parentWidth - (left as number) - right), sizeChanged = true\n            else this.x = parentWidth - width - right\n\n        }\n\n        if (hasTop) {\n            top = UnitConvert.number(top, parentHeight)\n            this.y = top\n        }\n\n        if (!isUndefined(bottom)) {\n            bottom = UnitConvert.number(bottom, parentHeight)\n\n            if (position.top !== undefined) this.resizeHeight(parentHeight - (top as number) - bottom), sizeChanged = true\n            else this.y = parentHeight - height - bottom\n        }\n    }\n\n\n    if (leaferIsCreated) this.leafer.created = true\n    return sizeChanged\n}\n\nLeafHelper.updatePositionLayout = function (leaf: UI): void {\n    let hasPosition\n    leaf.children.forEach(item => {\n        if (item.position) {\n            hasPosition = true\n            item.__updatePositionLayout()\n            LeafHelper.updateAllMatrix(item)\n            item.isBranch ? BranchHelper.updateBounds(item) : LeafHelper.updateBounds(item)\n        }\n    })\n    leaf.__hasPosition = hasPosition\n}\n"],"names":["positionParentChange","parent","__hasPosition","Plugin","add","UI","addAttr","defaultValue","decorateLeafAttr","key","attr","set","value","this","__setAttr","waitParentChange","doBoundsType","tempPoint","getPointData","prototype","__updatePositionLayout","sizeChanged","leaferIsCreated","position","boxBounds","parentBox","width","parentWidth","height","parentHeight","leafer","created","isString","AlignHelper","toPoint","left","top","right","bottom","hasLeft","isUndefined","hasTop","UnitConvert","number","x","resizeWidth","y","undefined","resizeHeight","LeafHelper","updatePositionLayout","leaf","hasPosition","children","forEach","item","updateAllMatrix","isBranch","BranchHelper","updateBounds"],"mappings":"kPAIA,SAASA,EAAqBC,GAC1BA,EAAOC,eAAgB,CAC3B,CCCAC,EAAOC,IAAI,WAAY,UAIvBC,EAAGC,QAAQ,YAAY,EDHjB,SAAuBC,GACzB,OAAOC,EAAiBD,EAAeE,GAAgBC,EAAK,CACxD,GAAAC,CAAIC,GACIC,KAAKC,UAAUL,EAAKG,KAChBA,GAAOC,KAAKE,iBAAiBf,GACjCgB,EAAaH,MAErB,IAER,GCHA,MAAMI,EAAYC,IAElBb,EAAGc,UAAUC,uBAAyB,WAElC,IAAIC,EACJ,MAAMC,gBAAEA,EAAeC,SAAEA,EAAQC,UAAEA,GAAcX,KAAMY,EAAYZ,KAAKZ,OAAOuB,WACvEE,MAAOC,EAAaC,OAAQC,GAAiBJ,GAAWC,MAAEA,EAAKE,OAAEA,GAAWJ,EAIpF,GAFIF,IAAiBT,KAAKiB,OAAOC,SAAU,GAEvCC,EAAST,GAETU,EAAYC,QAAQX,EAAUC,EAAWC,EAAWR,GAAW,GAC/DJ,KAAKF,IAAIM,OAEN,CAEH,IAAIkB,KAAEA,EAAIC,IAAEA,EAAGC,MAAEA,EAAKC,OAAEA,GAAWf,EACnC,MAAMgB,GAAWC,EAAYL,GAAOM,GAAUD,EAAYJ,GAGtDG,IACAJ,EAAOO,EAAYC,OAAOR,EAAMR,GAChCd,KAAK+B,EAAIT,GAGRK,EAAYH,KACbA,EAAQK,EAAYC,OAAON,EAAOV,GAE9BY,GAAS1B,KAAKgC,YAAYlB,EAAeQ,EAAkBE,GAAQhB,GAAc,GAChFR,KAAK+B,EAAIjB,EAAcD,EAAQW,GAIpCI,IACAL,EAAMM,EAAYC,OAAOP,EAAKP,GAC9BhB,KAAKiC,EAAIV,GAGRI,EAAYF,KACbA,EAASI,EAAYC,OAAOL,EAAQT,QAEfkB,IAAjBxB,EAASa,KAAmBvB,KAAKmC,aAAanB,EAAgBO,EAAiBE,GAASjB,GAAc,GACrGR,KAAKiC,EAAIjB,EAAeD,EAASU,EAE9C,CAIA,OADIhB,IAAiBT,KAAKiB,OAAOC,SAAU,GACpCV,CACX,EAEA4B,EAAWC,qBAAuB,SAAUC,GACxC,IAAIC,EACJD,EAAKE,SAASC,QAAQC,IACdA,EAAKhC,WACL6B,GAAc,EACdG,EAAKnC,yBACL6B,EAAWO,gBAAgBD,GAC3BA,EAAKE,SAAWC,EAAaC,aAAaJ,GAAQN,EAAWU,aAAaJ,MAGlFJ,EAAKjD,cAAgBkD,CACzB"}
+{"version":3,"file":"position.esm.min.js","sources":["../../../../../../src/in/packages/position/src/decorate.ts","../../../../../../src/in/packages/position/src/index.ts"],"sourcesContent":["import { attr, decorateLeafAttr, doBoundsType } from '@leafer-ui/draw'\nimport { ILeaf, IValue, IInset } from '@leafer-ui/interface'\n\n\nfunction positionParentChange(parent: ILeaf) {\n    parent.__hasPosition = true\n}\n\nexport function positionType(defaultValue?: IValue) {\n    return decorateLeafAttr(defaultValue, (key: string) => attr({\n        set(value: IValue) {\n            if (this.__setAttr(key, value)) {\n                if (value) {\n                    if ((value as IInset).id) {\n                        const data = this.__\n                        if (!data.__usePositionNode) {\n                            data.__usePositionNode = true\n                            this.__updatePositionLayout = this.__updatePositionLayout.bind(this)\n                        }\n                    } else this.waitParentChange(positionParentChange)\n                }\n                doBoundsType(this)\n            }\n        }\n    }))\n}","import { IDirection, IInset } from '@leafer-ui/interface'\nimport { UI, Plugin, UnitConvert, isUndefined, LeafHelper, BranchHelper, isString, AlignHelper, getPointData, isObject, BoundsEvent } from '@leafer-ui/draw'\n\nimport '@leafer-in/resize'\n\nimport { positionType } from './decorate'\n\n\nPlugin.add('position', 'resize')\n\n\n// addAttr\nUI.addAttr('position', false, positionType)\n\n\nconst tempPoint = getPointData()\n\nUI.prototype.__updatePositionLayout = function (): boolean {\n\n    const { leaferIsCreated, position, positionNode, boxBounds, parent } = this, { width, height } = boxBounds\n    let parentBox = parent.boxBounds, align: IDirection, sizeChanged: boolean\n\n    if (positionNode) {\n        if (!positionNode.parent || positionNode.destroyed) return false\n        this.__extraUpdate()\n    }\n\n    if (leaferIsCreated) this.leafer.created = false // 拦截布局更新通知，进行手动更新布局\n\n    if (isString(position)) {\n\n        align = position\n\n    } else {\n\n        let { left, top, right, bottom } = position\n\n        if (positionNode) parentBox = positionNode.getBounds('box', positionNode.parent === parent ? 'local' : parent)\n\n        if (position.align) {\n\n            align = position.align\n\n        } else {\n\n            const { x: parentX, y: parentY, width: parentWidth, height: parentHeight } = parentBox\n\n            const hasLeft = !isUndefined(left), hasTop = !isUndefined(top)\n\n            // 布局\n            if (hasLeft) {\n                left = UnitConvert.number(left, parentWidth)\n                this.x = parentX + left\n            }\n\n            if (!isUndefined(right)) {\n                right = UnitConvert.number(right, parentWidth)\n\n                if (hasLeft) this.resizeWidth(parentWidth - (left as number) - right), sizeChanged = true\n                else this.x = parentX + parentWidth - width - right\n\n            }\n\n            if (hasTop) {\n                top = UnitConvert.number(top, parentHeight)\n                this.y = parentY + top\n            }\n\n            if (!isUndefined(bottom)) {\n                bottom = UnitConvert.number(bottom, parentHeight)\n\n                if (position.top !== undefined) this.resizeHeight(parentHeight - (top as number) - bottom), sizeChanged = true\n                else this.y = parentY + parentHeight - height - bottom\n            }\n        }\n\n    }\n\n    if (align) {\n        AlignHelper.toPoint(align, boxBounds, parentBox, tempPoint, false)\n        this.set(tempPoint)\n    }\n\n    if (leaferIsCreated) this.leafer.created = true\n\n    LeafHelper.updateAllMatrix(this)\n    this.isBranch ? BranchHelper.updateBounds(this) : LeafHelper.updateBounds(this)\n\n    return sizeChanged\n}\n\n// 监听相对元素\nLeafHelper.listenPositionNode = function (leaf: UI): void {\n    const { position, positionNode } = leaf\n\n    if (isObject(position) && position.id) leaf.positionNode = isString(position.id) ? leaf.app.findId(position.id) : position.id\n    else if (leaf.positionNode) leaf.positionNode = undefined\n\n    if (positionNode !== leaf.positionNode) {\n        if (positionNode) positionNode.off(positionNode.parent === leaf.parent ? BoundsEvent.LOCAL : BoundsEvent.WORLD, leaf.__updatePositionLayout) // leaf.__updatePositionLayout 在属性装饰器中已经绑定\n        if (leaf.positionNode) {\n            leaf.positionNode.on(leaf.positionNode.parent === leaf.parent ? BoundsEvent.LOCAL : BoundsEvent.WORLD, leaf.__updatePositionLayout)\n            LeafHelper.updateBounds(leaf.positionNode)\n        }\n        leaf.__updatePositionLayout()\n        if (!leaf.positionNode) leaf.__.__usePositionNode = undefined\n    }\n}\n\n// 更新子级\nLeafHelper.updatePositionLayout = function (leaf: UI): void {\n    let hasPosition\n    leaf.children.forEach(item => {\n        if (item.position && !(item.position as IInset).id) {\n            hasPosition = true\n            item.__updatePositionLayout()\n        }\n    })\n    leaf.__hasPosition = hasPosition\n}\n"],"names":["positionParentChange","parent","__hasPosition","Plugin","add","UI","addAttr","defaultValue","decorateLeafAttr","key","attr","set","value","this","__setAttr","id","data","__","__usePositionNode","__updatePositionLayout","bind","waitParentChange","doBoundsType","tempPoint","getPointData","prototype","leaferIsCreated","position","positionNode","boxBounds","width","height","align","sizeChanged","parentBox","destroyed","__extraUpdate","leafer","created","isString","left","top","right","bottom","getBounds","x","parentX","y","parentY","parentWidth","parentHeight","hasLeft","isUndefined","hasTop","UnitConvert","number","resizeWidth","undefined","resizeHeight","AlignHelper","toPoint","LeafHelper","updateAllMatrix","isBranch","BranchHelper","updateBounds","listenPositionNode","leaf","isObject","app","findId","off","BoundsEvent","LOCAL","WORLD","on","updatePositionLayout","hasPosition","children","forEach","item"],"mappings":"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"}

package/dist/position.js

@@ -7,7 +7,15 @@
         return draw.decorateLeafAttr(defaultValue, key => draw.attr({
             set(value) {
                 if (this.__setAttr(key, value)) {
-                    if (value) this.waitParentChange(positionParentChange);
+                    if (value) {
+                        if (value.id) {
+                            const data = this.__;
+                            if (!data.__usePositionNode) {
+                                data.__usePositionNode = true;
+                                this.__updatePositionLayout = this.__updatePositionLayout.bind(this);
+                            }
+                        } else this.waitParentChange(positionParentChange);
+                    }
                     draw.doBoundsType(this);
                 }
             }
@@ -17,45 +25,70 @@
     draw.UI.addAttr("position", false, positionType);
     const tempPoint = draw.getPointData();
     draw.UI.prototype.__updatePositionLayout = function() {
-        let sizeChanged;
-        const {leaferIsCreated: leaferIsCreated, position: position, boxBounds: boxBounds} = this, parentBox = this.parent.boxBounds;
-        const {width: parentWidth, height: parentHeight} = parentBox, {width: width, height: height} = boxBounds;
+        const {leaferIsCreated: leaferIsCreated, position: position, positionNode: positionNode, boxBounds: boxBounds, parent: parent} = this, {width: width, height: height} = boxBounds;
+        let parentBox = parent.boxBounds, align, sizeChanged;
+        if (positionNode) {
+            if (!positionNode.parent || positionNode.destroyed) return false;
+            this.__extraUpdate();
+        }
         if (leaferIsCreated) this.leafer.created = false;
         if (draw.isString(position)) {
-            draw.AlignHelper.toPoint(position, boxBounds, parentBox, tempPoint, true);
-            this.set(tempPoint);
+            align = position;
         } else {
             let {left: left, top: top, right: right, bottom: bottom} = position;
-            const hasLeft = !draw.isUndefined(left), hasTop = !draw.isUndefined(top);
-            if (hasLeft) {
-                left = draw.UnitConvert.number(left, parentWidth);
-                this.x = left;
-            }
-            if (!draw.isUndefined(right)) {
-                right = draw.UnitConvert.number(right, parentWidth);
-                if (hasLeft) this.resizeWidth(parentWidth - left - right), sizeChanged = true; else this.x = parentWidth - width - right;
-            }
-            if (hasTop) {
-                top = draw.UnitConvert.number(top, parentHeight);
-                this.y = top;
-            }
-            if (!draw.isUndefined(bottom)) {
-                bottom = draw.UnitConvert.number(bottom, parentHeight);
-                if (position.top !== undefined) this.resizeHeight(parentHeight - top - bottom), 
-                sizeChanged = true; else this.y = parentHeight - height - bottom;
+            if (positionNode) parentBox = positionNode.getBounds("box", positionNode.parent === parent ? "local" : parent);
+            if (position.align) {
+                align = position.align;
+            } else {
+                const {x: parentX, y: parentY, width: parentWidth, height: parentHeight} = parentBox;
+                const hasLeft = !draw.isUndefined(left), hasTop = !draw.isUndefined(top);
+                if (hasLeft) {
+                    left = draw.UnitConvert.number(left, parentWidth);
+                    this.x = parentX + left;
+                }
+                if (!draw.isUndefined(right)) {
+                    right = draw.UnitConvert.number(right, parentWidth);
+                    if (hasLeft) this.resizeWidth(parentWidth - left - right), sizeChanged = true; else this.x = parentX + parentWidth - width - right;
+                }
+                if (hasTop) {
+                    top = draw.UnitConvert.number(top, parentHeight);
+                    this.y = parentY + top;
+                }
+                if (!draw.isUndefined(bottom)) {
+                    bottom = draw.UnitConvert.number(bottom, parentHeight);
+                    if (position.top !== undefined) this.resizeHeight(parentHeight - top - bottom), 
+                    sizeChanged = true; else this.y = parentY + parentHeight - height - bottom;
+                }
             }
         }
+        if (align) {
+            draw.AlignHelper.toPoint(align, boxBounds, parentBox, tempPoint, false);
+            this.set(tempPoint);
+        }
         if (leaferIsCreated) this.leafer.created = true;
+        draw.LeafHelper.updateAllMatrix(this);
+        this.isBranch ? draw.BranchHelper.updateBounds(this) : draw.LeafHelper.updateBounds(this);
         return sizeChanged;
     };
+    draw.LeafHelper.listenPositionNode = function(leaf) {
+        const {position: position, positionNode: positionNode} = leaf;
+        if (draw.isObject(position) && position.id) leaf.positionNode = draw.isString(position.id) ? leaf.app.findId(position.id) : position.id; else if (leaf.positionNode) leaf.positionNode = undefined;
+        if (positionNode !== leaf.positionNode) {
+            if (positionNode) positionNode.off(positionNode.parent === leaf.parent ? draw.BoundsEvent.LOCAL : draw.BoundsEvent.WORLD, leaf.__updatePositionLayout);
+            if (leaf.positionNode) {
+                leaf.positionNode.on(leaf.positionNode.parent === leaf.parent ? draw.BoundsEvent.LOCAL : draw.BoundsEvent.WORLD, leaf.__updatePositionLayout);
+                draw.LeafHelper.updateBounds(leaf.positionNode);
+            }
+            leaf.__updatePositionLayout();
+            if (!leaf.positionNode) leaf.__.__usePositionNode = undefined;
+        }
+    };
     draw.LeafHelper.updatePositionLayout = function(leaf) {
         let hasPosition;
         leaf.children.forEach(item => {
-            if (item.position) {
+            if (item.position && !item.position.id) {
                 hasPosition = true;
                 item.__updatePositionLayout();
-                draw.LeafHelper.updateAllMatrix(item);
-                item.isBranch ? draw.BranchHelper.updateBounds(item) : draw.LeafHelper.updateBounds(item);
             }
         });
         leaf.__hasPosition = hasPosition;

package/dist/position.min.cjs

@@ -1,2 +1,2 @@
-"use strict";var t=require("@leafer-ui/draw");function e(t){t.__hasPosition=!0}require("@leafer-in/resize"),t.Plugin.add("position","resize"),t.UI.addAttr("position",!1,function(i){return t.decorateLeafAttr(i,i=>t.attr({set(n){this.__setAttr(i,n)&&(n&&this.waitParentChange(e),t.doBoundsType(this))}}))});const i=t.getPointData();t.UI.prototype.__updatePositionLayout=function(){let e;const{leaferIsCreated:n,position:o,boxBounds:r}=this,s=this.parent.boxBounds,{width:a,height:d}=s,{width:h,height:u}=r;if(n&&(this.leafer.created=!1),t.isString(o))t.AlignHelper.toPoint(o,r,s,i,!0),this.set(i);else{let{left:i,top:n,right:r,bottom:s}=o;const p=!t.isUndefined(i),f=!t.isUndefined(n);p&&(i=t.UnitConvert.number(i,a),this.x=i),t.isUndefined(r)||(r=t.UnitConvert.number(r,a),p?(this.resizeWidth(a-i-r),e=!0):this.x=a-h-r),f&&(n=t.UnitConvert.number(n,d),this.y=n),t.isUndefined(s)||(s=t.UnitConvert.number(s,d),void 0!==o.top?(this.resizeHeight(d-n-s),e=!0):this.y=d-u-s)}return n&&(this.leafer.created=!0),e},t.LeafHelper.updatePositionLayout=function(e){let i;e.children.forEach(e=>{e.position&&(i=!0,e.__updatePositionLayout(),t.LeafHelper.updateAllMatrix(e),e.isBranch?t.BranchHelper.updateBounds(e):t.LeafHelper.updateBounds(e))}),e.__hasPosition=i};
+"use strict";var t=require("@leafer-ui/draw");function i(t){t.__hasPosition=!0}require("@leafer-in/resize"),t.Plugin.add("position","resize"),t.UI.addAttr("position",!1,function(e){return t.decorateLeafAttr(e,e=>t.attr({set(o){if(this.__setAttr(e,o)){if(o)if(o.id){const t=this.__;t.__usePositionNode||(t.__usePositionNode=!0,this.__updatePositionLayout=this.__updatePositionLayout.bind(this))}else this.waitParentChange(i);t.doBoundsType(this)}}}))});const e=t.getPointData();t.UI.prototype.__updatePositionLayout=function(){const{leaferIsCreated:i,position:o,positionNode:n,boxBounds:s,parent:d}=this,{width:a,height:r}=s;let p,u,h=d.boxBounds;if(n){if(!n.parent||n.destroyed)return!1;this.__extraUpdate()}if(i&&(this.leafer.created=!1),t.isString(o))p=o;else{let{left:i,top:e,right:s,bottom:f}=o;if(n&&(h=n.getBounds("box",n.parent===d?"local":d)),o.align)p=o.align;else{const{x:n,y:d,width:p,height:_}=h,l=!t.isUndefined(i),c=!t.isUndefined(e);l&&(i=t.UnitConvert.number(i,p),this.x=n+i),t.isUndefined(s)||(s=t.UnitConvert.number(s,p),l?(this.resizeWidth(p-i-s),u=!0):this.x=n+p-a-s),c&&(e=t.UnitConvert.number(e,_),this.y=d+e),t.isUndefined(f)||(f=t.UnitConvert.number(f,_),void 0!==o.top?(this.resizeHeight(_-e-f),u=!0):this.y=d+_-r-f)}}return p&&(t.AlignHelper.toPoint(p,s,h,e,!1),this.set(e)),i&&(this.leafer.created=!0),t.LeafHelper.updateAllMatrix(this),this.isBranch?t.BranchHelper.updateBounds(this):t.LeafHelper.updateBounds(this),u},t.LeafHelper.listenPositionNode=function(i){const{position:e,positionNode:o}=i;t.isObject(e)&&e.id?i.positionNode=t.isString(e.id)?i.app.findId(e.id):e.id:i.positionNode&&(i.positionNode=void 0),o!==i.positionNode&&(o&&o.off(o.parent===i.parent?t.BoundsEvent.LOCAL:t.BoundsEvent.WORLD,i.__updatePositionLayout),i.positionNode&&(i.positionNode.on(i.positionNode.parent===i.parent?t.BoundsEvent.LOCAL:t.BoundsEvent.WORLD,i.__updatePositionLayout),t.LeafHelper.updateBounds(i.positionNode)),i.__updatePositionLayout(),i.positionNode||(i.__.__usePositionNode=void 0))},t.LeafHelper.updatePositionLayout=function(t){let i;t.children.forEach(t=>{t.position&&!t.position.id&&(i=!0,t.__updatePositionLayout())}),t.__hasPosition=i};
 //# sourceMappingURL=position.min.cjs.map

package/dist/position.min.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"position.min.cjs","sources":["../../../../../../src/in/packages/position/src/decorate.ts","../../../../../../src/in/packages/position/src/index.ts"],"sourcesContent":["import { attr, decorateLeafAttr, doBoundsType } from '@leafer-ui/draw'\nimport { ILeaf, IValue } from '@leafer/interface'\n\n\nfunction positionParentChange(parent: ILeaf) {\n    parent.__hasPosition = true\n}\n\nexport function positionType(defaultValue?: IValue) {\n    return decorateLeafAttr(defaultValue, (key: string) => attr({\n        set(value: IValue) {\n            if (this.__setAttr(key, value)) {\n                if (value) this.waitParentChange(positionParentChange)\n                doBoundsType(this)\n            }\n        }\n    }))\n}","import { UI, Plugin, UnitConvert, isUndefined, LeafHelper, BranchHelper, isString, AlignHelper, getPointData } from '@leafer-ui/draw'\n\nimport '@leafer-in/resize'\n\nimport { positionType } from './decorate'\n\n\nPlugin.add('position', 'resize')\n\n\n// addAttr\nUI.addAttr('position', false, positionType)\n\n\nconst tempPoint = getPointData()\n\nUI.prototype.__updatePositionLayout = function (): boolean {\n\n    let sizeChanged: boolean\n    const { leaferIsCreated, position, boxBounds } = this, parentBox = this.parent.boxBounds\n    const { width: parentWidth, height: parentHeight } = parentBox, { width, height } = boxBounds\n\n    if (leaferIsCreated) this.leafer.created = false // 拦截布局更新通知，进行手动更新布局\n\n    if (isString(position)) {\n\n        AlignHelper.toPoint(position, boxBounds, parentBox, tempPoint, true)\n        this.set(tempPoint)\n\n    } else {\n\n        let { left, top, right, bottom } = position\n        const hasLeft = !isUndefined(left), hasTop = !isUndefined(top)\n\n        // 布局\n        if (hasLeft) {\n            left = UnitConvert.number(left, parentWidth)\n            this.x = left\n        }\n\n        if (!isUndefined(right)) {\n            right = UnitConvert.number(right, parentWidth)\n\n            if (hasLeft) this.resizeWidth(parentWidth - (left as number) - right), sizeChanged = true\n            else this.x = parentWidth - width - right\n\n        }\n\n        if (hasTop) {\n            top = UnitConvert.number(top, parentHeight)\n            this.y = top\n        }\n\n        if (!isUndefined(bottom)) {\n            bottom = UnitConvert.number(bottom, parentHeight)\n\n            if (position.top !== undefined) this.resizeHeight(parentHeight - (top as number) - bottom), sizeChanged = true\n            else this.y = parentHeight - height - bottom\n        }\n    }\n\n\n    if (leaferIsCreated) this.leafer.created = true\n    return sizeChanged\n}\n\nLeafHelper.updatePositionLayout = function (leaf: UI): void {\n    let hasPosition\n    leaf.children.forEach(item => {\n        if (item.position) {\n            hasPosition = true\n            item.__updatePositionLayout()\n            LeafHelper.updateAllMatrix(item)\n            item.isBranch ? BranchHelper.updateBounds(item) : LeafHelper.updateBounds(item)\n        }\n    })\n    leaf.__hasPosition = hasPosition\n}\n"],"names":["positionParentChange","parent","__hasPosition","Plugin","add","UI","addAttr","defaultValue","decorateLeafAttr","key","attr","set","value","this","__setAttr","waitParentChange","doBoundsType","tempPoint","getPointData","prototype","__updatePositionLayout","sizeChanged","leaferIsCreated","position","boxBounds","parentBox","width","parentWidth","height","parentHeight","leafer","created","isString","AlignHelper","toPoint","left","top","right","bottom","hasLeft","isUndefined","hasTop","UnitConvert","number","x","resizeWidth","y","undefined","resizeHeight","LeafHelper","updatePositionLayout","leaf","hasPosition","children","forEach","item","updateAllMatrix","isBranch","BranchHelper","updateBounds"],"mappings":"8CAIA,SAASA,EAAqBC,GAC1BA,EAAOC,eAAgB,CAC3B,8BCCAC,EAAAA,OAAOC,IAAI,WAAY,UAIvBC,EAAAA,GAAGC,QAAQ,YAAY,EDHjB,SAAuBC,GACzB,OAAOC,mBAAiBD,EAAeE,GAAgBC,EAAAA,KAAK,CACxD,GAAAC,CAAIC,GACIC,KAAKC,UAAUL,EAAKG,KAChBA,GAAOC,KAAKE,iBAAiBf,GACjCgB,EAAAA,aAAaH,MAErB,IAER,GCHA,MAAMI,EAAYC,EAAAA,eAElBb,EAAAA,GAAGc,UAAUC,uBAAyB,WAElC,IAAIC,EACJ,MAAMC,gBAAEA,EAAeC,SAAEA,EAAQC,UAAEA,GAAcX,KAAMY,EAAYZ,KAAKZ,OAAOuB,WACvEE,MAAOC,EAAaC,OAAQC,GAAiBJ,GAAWC,MAAEA,EAAKE,OAAEA,GAAWJ,EAIpF,GAFIF,IAAiBT,KAAKiB,OAAOC,SAAU,GAEvCC,EAAAA,SAAST,GAETU,EAAAA,YAAYC,QAAQX,EAAUC,EAAWC,EAAWR,GAAW,GAC/DJ,KAAKF,IAAIM,OAEN,CAEH,IAAIkB,KAAEA,EAAIC,IAAEA,EAAGC,MAAEA,EAAKC,OAAEA,GAAWf,EACnC,MAAMgB,GAAWC,cAAYL,GAAOM,GAAUD,EAAAA,YAAYJ,GAGtDG,IACAJ,EAAOO,EAAAA,YAAYC,OAAOR,EAAMR,GAChCd,KAAK+B,EAAIT,GAGRK,EAAAA,YAAYH,KACbA,EAAQK,EAAAA,YAAYC,OAAON,EAAOV,GAE9BY,GAAS1B,KAAKgC,YAAYlB,EAAeQ,EAAkBE,GAAQhB,GAAc,GAChFR,KAAK+B,EAAIjB,EAAcD,EAAQW,GAIpCI,IACAL,EAAMM,EAAAA,YAAYC,OAAOP,EAAKP,GAC9BhB,KAAKiC,EAAIV,GAGRI,EAAAA,YAAYF,KACbA,EAASI,EAAAA,YAAYC,OAAOL,EAAQT,QAEfkB,IAAjBxB,EAASa,KAAmBvB,KAAKmC,aAAanB,EAAgBO,EAAiBE,GAASjB,GAAc,GACrGR,KAAKiC,EAAIjB,EAAeD,EAASU,EAE9C,CAIA,OADIhB,IAAiBT,KAAKiB,OAAOC,SAAU,GACpCV,CACX,EAEA4B,EAAAA,WAAWC,qBAAuB,SAAUC,GACxC,IAAIC,EACJD,EAAKE,SAASC,QAAQC,IACdA,EAAKhC,WACL6B,GAAc,EACdG,EAAKnC,yBACL6B,EAAAA,WAAWO,gBAAgBD,GAC3BA,EAAKE,SAAWC,EAAAA,aAAaC,aAAaJ,GAAQN,EAAAA,WAAWU,aAAaJ,MAGlFJ,EAAKjD,cAAgBkD,CACzB"}
+{"version":3,"file":"position.min.cjs","sources":["../../../../../../src/in/packages/position/src/decorate.ts","../../../../../../src/in/packages/position/src/index.ts"],"sourcesContent":["import { attr, decorateLeafAttr, doBoundsType } from '@leafer-ui/draw'\nimport { ILeaf, IValue, IInset } from '@leafer-ui/interface'\n\n\nfunction positionParentChange(parent: ILeaf) {\n    parent.__hasPosition = true\n}\n\nexport function positionType(defaultValue?: IValue) {\n    return decorateLeafAttr(defaultValue, (key: string) => attr({\n        set(value: IValue) {\n            if (this.__setAttr(key, value)) {\n                if (value) {\n                    if ((value as IInset).id) {\n                        const data = this.__\n                        if (!data.__usePositionNode) {\n                            data.__usePositionNode = true\n                            this.__updatePositionLayout = this.__updatePositionLayout.bind(this)\n                        }\n                    } else this.waitParentChange(positionParentChange)\n                }\n                doBoundsType(this)\n            }\n        }\n    }))\n}","import { IDirection, IInset } from '@leafer-ui/interface'\nimport { UI, Plugin, UnitConvert, isUndefined, LeafHelper, BranchHelper, isString, AlignHelper, getPointData, isObject, BoundsEvent } from '@leafer-ui/draw'\n\nimport '@leafer-in/resize'\n\nimport { positionType } from './decorate'\n\n\nPlugin.add('position', 'resize')\n\n\n// addAttr\nUI.addAttr('position', false, positionType)\n\n\nconst tempPoint = getPointData()\n\nUI.prototype.__updatePositionLayout = function (): boolean {\n\n    const { leaferIsCreated, position, positionNode, boxBounds, parent } = this, { width, height } = boxBounds\n    let parentBox = parent.boxBounds, align: IDirection, sizeChanged: boolean\n\n    if (positionNode) {\n        if (!positionNode.parent || positionNode.destroyed) return false\n        this.__extraUpdate()\n    }\n\n    if (leaferIsCreated) this.leafer.created = false // 拦截布局更新通知，进行手动更新布局\n\n    if (isString(position)) {\n\n        align = position\n\n    } else {\n\n        let { left, top, right, bottom } = position\n\n        if (positionNode) parentBox = positionNode.getBounds('box', positionNode.parent === parent ? 'local' : parent)\n\n        if (position.align) {\n\n            align = position.align\n\n        } else {\n\n            const { x: parentX, y: parentY, width: parentWidth, height: parentHeight } = parentBox\n\n            const hasLeft = !isUndefined(left), hasTop = !isUndefined(top)\n\n            // 布局\n            if (hasLeft) {\n                left = UnitConvert.number(left, parentWidth)\n                this.x = parentX + left\n            }\n\n            if (!isUndefined(right)) {\n                right = UnitConvert.number(right, parentWidth)\n\n                if (hasLeft) this.resizeWidth(parentWidth - (left as number) - right), sizeChanged = true\n                else this.x = parentX + parentWidth - width - right\n\n            }\n\n            if (hasTop) {\n                top = UnitConvert.number(top, parentHeight)\n                this.y = parentY + top\n            }\n\n            if (!isUndefined(bottom)) {\n                bottom = UnitConvert.number(bottom, parentHeight)\n\n                if (position.top !== undefined) this.resizeHeight(parentHeight - (top as number) - bottom), sizeChanged = true\n                else this.y = parentY + parentHeight - height - bottom\n            }\n        }\n\n    }\n\n    if (align) {\n        AlignHelper.toPoint(align, boxBounds, parentBox, tempPoint, false)\n        this.set(tempPoint)\n    }\n\n    if (leaferIsCreated) this.leafer.created = true\n\n    LeafHelper.updateAllMatrix(this)\n    this.isBranch ? BranchHelper.updateBounds(this) : LeafHelper.updateBounds(this)\n\n    return sizeChanged\n}\n\n// 监听相对元素\nLeafHelper.listenPositionNode = function (leaf: UI): void {\n    const { position, positionNode } = leaf\n\n    if (isObject(position) && position.id) leaf.positionNode = isString(position.id) ? leaf.app.findId(position.id) : position.id\n    else if (leaf.positionNode) leaf.positionNode = undefined\n\n    if (positionNode !== leaf.positionNode) {\n        if (positionNode) positionNode.off(positionNode.parent === leaf.parent ? BoundsEvent.LOCAL : BoundsEvent.WORLD, leaf.__updatePositionLayout) // leaf.__updatePositionLayout 在属性装饰器中已经绑定\n        if (leaf.positionNode) {\n            leaf.positionNode.on(leaf.positionNode.parent === leaf.parent ? BoundsEvent.LOCAL : BoundsEvent.WORLD, leaf.__updatePositionLayout)\n            LeafHelper.updateBounds(leaf.positionNode)\n        }\n        leaf.__updatePositionLayout()\n        if (!leaf.positionNode) leaf.__.__usePositionNode = undefined\n    }\n}\n\n// 更新子级\nLeafHelper.updatePositionLayout = function (leaf: UI): void {\n    let hasPosition\n    leaf.children.forEach(item => {\n        if (item.position && !(item.position as IInset).id) {\n            hasPosition = true\n            item.__updatePositionLayout()\n        }\n    })\n    leaf.__hasPosition = hasPosition\n}\n"],"names":["positionParentChange","parent","__hasPosition","Plugin","add","UI","addAttr","defaultValue","decorateLeafAttr","key","attr","set","value","this","__setAttr","id","data","__","__usePositionNode","__updatePositionLayout","bind","waitParentChange","doBoundsType","tempPoint","getPointData","prototype","leaferIsCreated","position","positionNode","boxBounds","width","height","align","sizeChanged","parentBox","destroyed","__extraUpdate","leafer","created","isString","left","top","right","bottom","getBounds","x","parentX","y","parentY","parentWidth","parentHeight","hasLeft","isUndefined","hasTop","UnitConvert","number","resizeWidth","undefined","resizeHeight","AlignHelper","toPoint","LeafHelper","updateAllMatrix","isBranch","BranchHelper","updateBounds","listenPositionNode","leaf","isObject","app","findId","off","BoundsEvent","LOCAL","WORLD","on","updatePositionLayout","hasPosition","children","forEach","item"],"mappings":"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"}

package/dist/position.min.js

@@ -1,2 +1,2 @@
-!function(t){"use strict";function e(t){t.__hasPosition=!0}t.Plugin.add("position","resize"),t.UI.addAttr("position",!1,function(i){return t.decorateLeafAttr(i,i=>t.attr({set(n){this.__setAttr(i,n)&&(n&&this.waitParentChange(e),t.doBoundsType(this))}}))});const i=t.getPointData();t.UI.prototype.__updatePositionLayout=function(){let e;const{leaferIsCreated:n,position:o,boxBounds:s}=this,r=this.parent.boxBounds,{width:a,height:d}=r,{width:h,height:u}=s;if(n&&(this.leafer.created=!1),t.isString(o))t.AlignHelper.toPoint(o,s,r,i,!0),this.set(i);else{let{left:i,top:n,right:s,bottom:r}=o;const p=!t.isUndefined(i),f=!t.isUndefined(n);p&&(i=t.UnitConvert.number(i,a),this.x=i),t.isUndefined(s)||(s=t.UnitConvert.number(s,a),p?(this.resizeWidth(a-i-s),e=!0):this.x=a-h-s),f&&(n=t.UnitConvert.number(n,d),this.y=n),t.isUndefined(r)||(r=t.UnitConvert.number(r,d),void 0!==o.top?(this.resizeHeight(d-n-r),e=!0):this.y=d-u-r)}return n&&(this.leafer.created=!0),e},t.LeafHelper.updatePositionLayout=function(e){let i;e.children.forEach(e=>{e.position&&(i=!0,e.__updatePositionLayout(),t.LeafHelper.updateAllMatrix(e),e.isBranch?t.BranchHelper.updateBounds(e):t.LeafHelper.updateBounds(e))}),e.__hasPosition=i}}(LeaferUI);
+!function(t){"use strict";function i(t){t.__hasPosition=!0}t.Plugin.add("position","resize"),t.UI.addAttr("position",!1,function(o){return t.decorateLeafAttr(o,o=>t.attr({set(e){if(this.__setAttr(o,e)){if(e)if(e.id){const t=this.__;t.__usePositionNode||(t.__usePositionNode=!0,this.__updatePositionLayout=this.__updatePositionLayout.bind(this))}else this.waitParentChange(i);t.doBoundsType(this)}}}))});const o=t.getPointData();t.UI.prototype.__updatePositionLayout=function(){const{leaferIsCreated:i,position:e,positionNode:n,boxBounds:s,parent:d}=this,{width:a,height:r}=s;let p,u,h=d.boxBounds;if(n){if(!n.parent||n.destroyed)return!1;this.__extraUpdate()}if(i&&(this.leafer.created=!1),t.isString(e))p=e;else{let{left:i,top:o,right:s,bottom:f}=e;if(n&&(h=n.getBounds("box",n.parent===d?"local":d)),e.align)p=e.align;else{const{x:n,y:d,width:p,height:_}=h,l=!t.isUndefined(i),c=!t.isUndefined(o);l&&(i=t.UnitConvert.number(i,p),this.x=n+i),t.isUndefined(s)||(s=t.UnitConvert.number(s,p),l?(this.resizeWidth(p-i-s),u=!0):this.x=n+p-a-s),c&&(o=t.UnitConvert.number(o,_),this.y=d+o),t.isUndefined(f)||(f=t.UnitConvert.number(f,_),void 0!==e.top?(this.resizeHeight(_-o-f),u=!0):this.y=d+_-r-f)}}return p&&(t.AlignHelper.toPoint(p,s,h,o,!1),this.set(o)),i&&(this.leafer.created=!0),t.LeafHelper.updateAllMatrix(this),this.isBranch?t.BranchHelper.updateBounds(this):t.LeafHelper.updateBounds(this),u},t.LeafHelper.listenPositionNode=function(i){const{position:o,positionNode:e}=i;t.isObject(o)&&o.id?i.positionNode=t.isString(o.id)?i.app.findId(o.id):o.id:i.positionNode&&(i.positionNode=void 0),e!==i.positionNode&&(e&&e.off(e.parent===i.parent?t.BoundsEvent.LOCAL:t.BoundsEvent.WORLD,i.__updatePositionLayout),i.positionNode&&(i.positionNode.on(i.positionNode.parent===i.parent?t.BoundsEvent.LOCAL:t.BoundsEvent.WORLD,i.__updatePositionLayout),t.LeafHelper.updateBounds(i.positionNode)),i.__updatePositionLayout(),i.positionNode||(i.__.__usePositionNode=void 0))},t.LeafHelper.updatePositionLayout=function(t){let i;t.children.forEach(t=>{t.position&&!t.position.id&&(i=!0,t.__updatePositionLayout())}),t.__hasPosition=i}}(LeaferUI);
 //# sourceMappingURL=position.min.js.map

package/dist/position.min.js.map

@@ -1 +1 @@
-{"version":3,"file":"position.min.js","sources":["../../../../../../src/in/packages/position/src/decorate.ts","../../../../../../src/in/packages/position/src/index.ts"],"sourcesContent":["import { attr, decorateLeafAttr, doBoundsType } from '@leafer-ui/draw'\nimport { ILeaf, IValue } from '@leafer/interface'\n\n\nfunction positionParentChange(parent: ILeaf) {\n    parent.__hasPosition = true\n}\n\nexport function positionType(defaultValue?: IValue) {\n    return decorateLeafAttr(defaultValue, (key: string) => attr({\n        set(value: IValue) {\n            if (this.__setAttr(key, value)) {\n                if (value) this.waitParentChange(positionParentChange)\n                doBoundsType(this)\n            }\n        }\n    }))\n}","import { UI, Plugin, UnitConvert, isUndefined, LeafHelper, BranchHelper, isString, AlignHelper, getPointData } from '@leafer-ui/draw'\n\nimport '@leafer-in/resize'\n\nimport { positionType } from './decorate'\n\n\nPlugin.add('position', 'resize')\n\n\n// addAttr\nUI.addAttr('position', false, positionType)\n\n\nconst tempPoint = getPointData()\n\nUI.prototype.__updatePositionLayout = function (): boolean {\n\n    let sizeChanged: boolean\n    const { leaferIsCreated, position, boxBounds } = this, parentBox = this.parent.boxBounds\n    const { width: parentWidth, height: parentHeight } = parentBox, { width, height } = boxBounds\n\n    if (leaferIsCreated) this.leafer.created = false // 拦截布局更新通知，进行手动更新布局\n\n    if (isString(position)) {\n\n        AlignHelper.toPoint(position, boxBounds, parentBox, tempPoint, true)\n        this.set(tempPoint)\n\n    } else {\n\n        let { left, top, right, bottom } = position\n        const hasLeft = !isUndefined(left), hasTop = !isUndefined(top)\n\n        // 布局\n        if (hasLeft) {\n            left = UnitConvert.number(left, parentWidth)\n            this.x = left\n        }\n\n        if (!isUndefined(right)) {\n            right = UnitConvert.number(right, parentWidth)\n\n            if (hasLeft) this.resizeWidth(parentWidth - (left as number) - right), sizeChanged = true\n            else this.x = parentWidth - width - right\n\n        }\n\n        if (hasTop) {\n            top = UnitConvert.number(top, parentHeight)\n            this.y = top\n        }\n\n        if (!isUndefined(bottom)) {\n            bottom = UnitConvert.number(bottom, parentHeight)\n\n            if (position.top !== undefined) this.resizeHeight(parentHeight - (top as number) - bottom), sizeChanged = true\n            else this.y = parentHeight - height - bottom\n        }\n    }\n\n\n    if (leaferIsCreated) this.leafer.created = true\n    return sizeChanged\n}\n\nLeafHelper.updatePositionLayout = function (leaf: UI): void {\n    let hasPosition\n    leaf.children.forEach(item => {\n        if (item.position) {\n            hasPosition = true\n            item.__updatePositionLayout()\n            LeafHelper.updateAllMatrix(item)\n            item.isBranch ? BranchHelper.updateBounds(item) : LeafHelper.updateBounds(item)\n        }\n    })\n    leaf.__hasPosition = hasPosition\n}\n"],"names":["positionParentChange","parent","__hasPosition","Plugin","add","UI","addAttr","defaultValue","decorateLeafAttr","key","attr","set","value","this","__setAttr","waitParentChange","doBoundsType","tempPoint","getPointData","prototype","__updatePositionLayout","sizeChanged","leaferIsCreated","position","boxBounds","parentBox","width","parentWidth","height","parentHeight","leafer","created","isString","AlignHelper","toPoint","left","top","right","bottom","hasLeft","isUndefined","hasTop","UnitConvert","number","x","resizeWidth","y","undefined","resizeHeight","LeafHelper","updatePositionLayout","leaf","hasPosition","children","forEach","item","updateAllMatrix","isBranch","BranchHelper","updateBounds"],"mappings":"0BAIA,SAASA,EAAqBC,GAC1BA,EAAOC,eAAgB,CAC3B,CCCAC,EAAAA,OAAOC,IAAI,WAAY,UAIvBC,EAAAA,GAAGC,QAAQ,YAAY,EDHjB,SAAuBC,GACzB,OAAOC,mBAAiBD,EAAeE,GAAgBC,EAAAA,KAAK,CACxD,GAAAC,CAAIC,GACIC,KAAKC,UAAUL,EAAKG,KAChBA,GAAOC,KAAKE,iBAAiBf,GACjCgB,EAAAA,aAAaH,MAErB,IAER,GCHA,MAAMI,EAAYC,EAAAA,eAElBb,EAAAA,GAAGc,UAAUC,uBAAyB,WAElC,IAAIC,EACJ,MAAMC,gBAAEA,EAAeC,SAAEA,EAAQC,UAAEA,GAAcX,KAAMY,EAAYZ,KAAKZ,OAAOuB,WACvEE,MAAOC,EAAaC,OAAQC,GAAiBJ,GAAWC,MAAEA,EAAKE,OAAEA,GAAWJ,EAIpF,GAFIF,IAAiBT,KAAKiB,OAAOC,SAAU,GAEvCC,EAAAA,SAAST,GAETU,EAAAA,YAAYC,QAAQX,EAAUC,EAAWC,EAAWR,GAAW,GAC/DJ,KAAKF,IAAIM,OAEN,CAEH,IAAIkB,KAAEA,EAAIC,IAAEA,EAAGC,MAAEA,EAAKC,OAAEA,GAAWf,EACnC,MAAMgB,GAAWC,cAAYL,GAAOM,GAAUD,EAAAA,YAAYJ,GAGtDG,IACAJ,EAAOO,EAAAA,YAAYC,OAAOR,EAAMR,GAChCd,KAAK+B,EAAIT,GAGRK,EAAAA,YAAYH,KACbA,EAAQK,EAAAA,YAAYC,OAAON,EAAOV,GAE9BY,GAAS1B,KAAKgC,YAAYlB,EAAeQ,EAAkBE,GAAQhB,GAAc,GAChFR,KAAK+B,EAAIjB,EAAcD,EAAQW,GAIpCI,IACAL,EAAMM,EAAAA,YAAYC,OAAOP,EAAKP,GAC9BhB,KAAKiC,EAAIV,GAGRI,EAAAA,YAAYF,KACbA,EAASI,EAAAA,YAAYC,OAAOL,EAAQT,QAEfkB,IAAjBxB,EAASa,KAAmBvB,KAAKmC,aAAanB,EAAgBO,EAAiBE,GAASjB,GAAc,GACrGR,KAAKiC,EAAIjB,EAAeD,EAASU,EAE9C,CAIA,OADIhB,IAAiBT,KAAKiB,OAAOC,SAAU,GACpCV,CACX,EAEA4B,EAAAA,WAAWC,qBAAuB,SAAUC,GACxC,IAAIC,EACJD,EAAKE,SAASC,QAAQC,IACdA,EAAKhC,WACL6B,GAAc,EACdG,EAAKnC,yBACL6B,EAAAA,WAAWO,gBAAgBD,GAC3BA,EAAKE,SAAWC,EAAAA,aAAaC,aAAaJ,GAAQN,EAAAA,WAAWU,aAAaJ,MAGlFJ,EAAKjD,cAAgBkD,CACzB"}
+{"version":3,"file":"position.min.js","sources":["../../../../../../src/in/packages/position/src/decorate.ts","../../../../../../src/in/packages/position/src/index.ts"],"sourcesContent":["import { attr, decorateLeafAttr, doBoundsType } from '@leafer-ui/draw'\nimport { ILeaf, IValue, IInset } from '@leafer-ui/interface'\n\n\nfunction positionParentChange(parent: ILeaf) {\n    parent.__hasPosition = true\n}\n\nexport function positionType(defaultValue?: IValue) {\n    return decorateLeafAttr(defaultValue, (key: string) => attr({\n        set(value: IValue) {\n            if (this.__setAttr(key, value)) {\n                if (value) {\n                    if ((value as IInset).id) {\n                        const data = this.__\n                        if (!data.__usePositionNode) {\n                            data.__usePositionNode = true\n                            this.__updatePositionLayout = this.__updatePositionLayout.bind(this)\n                        }\n                    } else this.waitParentChange(positionParentChange)\n                }\n                doBoundsType(this)\n            }\n        }\n    }))\n}","import { IDirection, IInset } from '@leafer-ui/interface'\nimport { UI, Plugin, UnitConvert, isUndefined, LeafHelper, BranchHelper, isString, AlignHelper, getPointData, isObject, BoundsEvent } from '@leafer-ui/draw'\n\nimport '@leafer-in/resize'\n\nimport { positionType } from './decorate'\n\n\nPlugin.add('position', 'resize')\n\n\n// addAttr\nUI.addAttr('position', false, positionType)\n\n\nconst tempPoint = getPointData()\n\nUI.prototype.__updatePositionLayout = function (): boolean {\n\n    const { leaferIsCreated, position, positionNode, boxBounds, parent } = this, { width, height } = boxBounds\n    let parentBox = parent.boxBounds, align: IDirection, sizeChanged: boolean\n\n    if (positionNode) {\n        if (!positionNode.parent || positionNode.destroyed) return false\n        this.__extraUpdate()\n    }\n\n    if (leaferIsCreated) this.leafer.created = false // 拦截布局更新通知，进行手动更新布局\n\n    if (isString(position)) {\n\n        align = position\n\n    } else {\n\n        let { left, top, right, bottom } = position\n\n        if (positionNode) parentBox = positionNode.getBounds('box', positionNode.parent === parent ? 'local' : parent)\n\n        if (position.align) {\n\n            align = position.align\n\n        } else {\n\n            const { x: parentX, y: parentY, width: parentWidth, height: parentHeight } = parentBox\n\n            const hasLeft = !isUndefined(left), hasTop = !isUndefined(top)\n\n            // 布局\n            if (hasLeft) {\n                left = UnitConvert.number(left, parentWidth)\n                this.x = parentX + left\n            }\n\n            if (!isUndefined(right)) {\n                right = UnitConvert.number(right, parentWidth)\n\n                if (hasLeft) this.resizeWidth(parentWidth - (left as number) - right), sizeChanged = true\n                else this.x = parentX + parentWidth - width - right\n\n            }\n\n            if (hasTop) {\n                top = UnitConvert.number(top, parentHeight)\n                this.y = parentY + top\n            }\n\n            if (!isUndefined(bottom)) {\n                bottom = UnitConvert.number(bottom, parentHeight)\n\n                if (position.top !== undefined) this.resizeHeight(parentHeight - (top as number) - bottom), sizeChanged = true\n                else this.y = parentY + parentHeight - height - bottom\n            }\n        }\n\n    }\n\n    if (align) {\n        AlignHelper.toPoint(align, boxBounds, parentBox, tempPoint, false)\n        this.set(tempPoint)\n    }\n\n    if (leaferIsCreated) this.leafer.created = true\n\n    LeafHelper.updateAllMatrix(this)\n    this.isBranch ? BranchHelper.updateBounds(this) : LeafHelper.updateBounds(this)\n\n    return sizeChanged\n}\n\n// 监听相对元素\nLeafHelper.listenPositionNode = function (leaf: UI): void {\n    const { position, positionNode } = leaf\n\n    if (isObject(position) && position.id) leaf.positionNode = isString(position.id) ? leaf.app.findId(position.id) : position.id\n    else if (leaf.positionNode) leaf.positionNode = undefined\n\n    if (positionNode !== leaf.positionNode) {\n        if (positionNode) positionNode.off(positionNode.parent === leaf.parent ? BoundsEvent.LOCAL : BoundsEvent.WORLD, leaf.__updatePositionLayout) // leaf.__updatePositionLayout 在属性装饰器中已经绑定\n        if (leaf.positionNode) {\n            leaf.positionNode.on(leaf.positionNode.parent === leaf.parent ? BoundsEvent.LOCAL : BoundsEvent.WORLD, leaf.__updatePositionLayout)\n            LeafHelper.updateBounds(leaf.positionNode)\n        }\n        leaf.__updatePositionLayout()\n        if (!leaf.positionNode) leaf.__.__usePositionNode = undefined\n    }\n}\n\n// 更新子级\nLeafHelper.updatePositionLayout = function (leaf: UI): void {\n    let hasPosition\n    leaf.children.forEach(item => {\n        if (item.position && !(item.position as IInset).id) {\n            hasPosition = true\n            item.__updatePositionLayout()\n        }\n    })\n    leaf.__hasPosition = hasPosition\n}\n"],"names":["positionParentChange","parent","__hasPosition","Plugin","add","UI","addAttr","defaultValue","decorateLeafAttr","key","attr","set","value","this","__setAttr","id","data","__","__usePositionNode","__updatePositionLayout","bind","waitParentChange","doBoundsType","tempPoint","getPointData","prototype","leaferIsCreated","position","positionNode","boxBounds","width","height","align","sizeChanged","parentBox","destroyed","__extraUpdate","leafer","created","isString","left","top","right","bottom","getBounds","x","parentX","y","parentY","parentWidth","parentHeight","hasLeft","isUndefined","hasTop","UnitConvert","number","resizeWidth","undefined","resizeHeight","AlignHelper","toPoint","LeafHelper","updateAllMatrix","isBranch","BranchHelper","updateBounds","listenPositionNode","leaf","isObject","app","findId","off","BoundsEvent","LOCAL","WORLD","on","updatePositionLayout","hasPosition","children","forEach","item"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer-in/position",
-  "version": "2.3.2",
+  "version": "2.3.4",
   "description": "@leafer-in/position",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -34,9 +34,9 @@
     "leaferjs"
   ],
   "peerDependencies": {
-    "@leafer-ui/draw": "^2.3.2",
-    "@leafer-in/resize": "^2.3.2",
-    "@leafer-ui/interface": "^2.3.2",
-    "@leafer-in/interface": "^2.3.2"
+    "@leafer-ui/draw": "^2.3.4",
+    "@leafer-in/resize": "^2.3.4",
+    "@leafer-ui/interface": "^2.3.4",
+    "@leafer-in/interface": "^2.3.4"
   }
 }

package/src/decorate.ts

@@ -1,5 +1,5 @@
 import { attr, decorateLeafAttr, doBoundsType } from '@leafer-ui/draw'
-import { ILeaf, IValue } from '@leafer/interface'
+import { ILeaf, IValue, IInset } from '@leafer-ui/interface'
 
 
 function positionParentChange(parent: ILeaf) {
@@ -10,7 +10,15 @@ export function positionType(defaultValue?: IValue) {
     return decorateLeafAttr(defaultValue, (key: string) => attr({
         set(value: IValue) {
             if (this.__setAttr(key, value)) {
-                if (value) this.waitParentChange(positionParentChange)
+                if (value) {
+                    if ((value as IInset).id) {
+                        const data = this.__
+                        if (!data.__usePositionNode) {
+                            data.__usePositionNode = true
+                            this.__updatePositionLayout = this.__updatePositionLayout.bind(this)
+                        }
+                    } else this.waitParentChange(positionParentChange)
+                }
                 doBoundsType(this)
             }
         }

package/src/index.ts

@@ -1,4 +1,5 @@
-import { UI, Plugin, UnitConvert, isUndefined, LeafHelper, BranchHelper, isString, AlignHelper, getPointData } from '@leafer-ui/draw'
+import { IDirection, IInset } from '@leafer-ui/interface'
+import { UI, Plugin, UnitConvert, isUndefined, LeafHelper, BranchHelper, isString, AlignHelper, getPointData, isObject, BoundsEvent } from '@leafer-ui/draw'
 
 import '@leafer-in/resize'
 
@@ -16,62 +17,103 @@ const tempPoint = getPointData()
 
 UI.prototype.__updatePositionLayout = function (): boolean {
 
-    let sizeChanged: boolean
-    const { leaferIsCreated, position, boxBounds } = this, parentBox = this.parent.boxBounds
-    const { width: parentWidth, height: parentHeight } = parentBox, { width, height } = boxBounds
+    const { leaferIsCreated, position, positionNode, boxBounds, parent } = this, { width, height } = boxBounds
+    let parentBox = parent.boxBounds, align: IDirection, sizeChanged: boolean
+
+    if (positionNode) {
+        if (!positionNode.parent || positionNode.destroyed) return false
+        this.__extraUpdate()
+    }
 
     if (leaferIsCreated) this.leafer.created = false // 拦截布局更新通知，进行手动更新布局
 
     if (isString(position)) {
 
-        AlignHelper.toPoint(position, boxBounds, parentBox, tempPoint, true)
-        this.set(tempPoint)
+        align = position
 
     } else {
 
         let { left, top, right, bottom } = position
-        const hasLeft = !isUndefined(left), hasTop = !isUndefined(top)
 
-        // 布局
-        if (hasLeft) {
-            left = UnitConvert.number(left, parentWidth)
-            this.x = left
-        }
+        if (positionNode) parentBox = positionNode.getBounds('box', positionNode.parent === parent ? 'local' : parent)
 
-        if (!isUndefined(right)) {
-            right = UnitConvert.number(right, parentWidth)
+        if (position.align) {
 
-            if (hasLeft) this.resizeWidth(parentWidth - (left as number) - right), sizeChanged = true
-            else this.x = parentWidth - width - right
+            align = position.align
 
-        }
+        } else {
 
-        if (hasTop) {
-            top = UnitConvert.number(top, parentHeight)
-            this.y = top
-        }
+            const { x: parentX, y: parentY, width: parentWidth, height: parentHeight } = parentBox
+
+            const hasLeft = !isUndefined(left), hasTop = !isUndefined(top)
+
+            // 布局
+            if (hasLeft) {
+                left = UnitConvert.number(left, parentWidth)
+                this.x = parentX + left
+            }
+
+            if (!isUndefined(right)) {
+                right = UnitConvert.number(right, parentWidth)
+
+                if (hasLeft) this.resizeWidth(parentWidth - (left as number) - right), sizeChanged = true
+                else this.x = parentX + parentWidth - width - right
+
+            }
+
+            if (hasTop) {
+                top = UnitConvert.number(top, parentHeight)
+                this.y = parentY + top
+            }
 
-        if (!isUndefined(bottom)) {
-            bottom = UnitConvert.number(bottom, parentHeight)
+            if (!isUndefined(bottom)) {
+                bottom = UnitConvert.number(bottom, parentHeight)
 
-            if (position.top !== undefined) this.resizeHeight(parentHeight - (top as number) - bottom), sizeChanged = true
-            else this.y = parentHeight - height - bottom
+                if (position.top !== undefined) this.resizeHeight(parentHeight - (top as number) - bottom), sizeChanged = true
+                else this.y = parentY + parentHeight - height - bottom
+            }
         }
+
     }
 
+    if (align) {
+        AlignHelper.toPoint(align, boxBounds, parentBox, tempPoint, false)
+        this.set(tempPoint)
+    }
 
     if (leaferIsCreated) this.leafer.created = true
+
+    LeafHelper.updateAllMatrix(this)
+    this.isBranch ? BranchHelper.updateBounds(this) : LeafHelper.updateBounds(this)
+
     return sizeChanged
 }
 
+// 监听相对元素
+LeafHelper.listenPositionNode = function (leaf: UI): void {
+    const { position, positionNode } = leaf
+
+    if (isObject(position) && position.id) leaf.positionNode = isString(position.id) ? leaf.app.findId(position.id) : position.id
+    else if (leaf.positionNode) leaf.positionNode = undefined
+
+    if (positionNode !== leaf.positionNode) {
+        if (positionNode) positionNode.off(positionNode.parent === leaf.parent ? BoundsEvent.LOCAL : BoundsEvent.WORLD, leaf.__updatePositionLayout) // leaf.__updatePositionLayout 在属性装饰器中已经绑定
+        if (leaf.positionNode) {
+            leaf.positionNode.on(leaf.positionNode.parent === leaf.parent ? BoundsEvent.LOCAL : BoundsEvent.WORLD, leaf.__updatePositionLayout)
+            LeafHelper.updateBounds(leaf.positionNode)
+        }
+        leaf.__updatePositionLayout()
+        if (!leaf.positionNode) leaf.__.__usePositionNode = undefined
+    }
+}
+
+// 更新子级
 LeafHelper.updatePositionLayout = function (leaf: UI): void {
     let hasPosition
     leaf.children.forEach(item => {
-        if (item.position) {
+        if (item.position && !(item.position as IInset).id) {
             hasPosition = true
             item.__updatePositionLayout()
-            LeafHelper.updateAllMatrix(item)
-            item.isBranch ? BranchHelper.updateBounds(item) : LeafHelper.updateBounds(item)
         }
     })
     leaf.__hasPosition = hasPosition