Merge branch 'designtime' of http://gitlab2.dui88.com/laoqifeng/zeroing-engine into designtime

debug/engine.js

@@ -1951,12 +1951,8 @@ var tslib = {__extends: __extends,__assign: __assign,__rest: __rest,__decorate:
 	        if (!that.alignEnabled)
 	            return;
 	        var percentWidth = that.percentWidth, percentHeight = that.percentHeight, top = that.top, bottom = that.bottom, left = that.left, right = that.right, percentTop = that.percentTop, percentBottom = that.percentBottom, percentLeft = that.percentLeft, percentRight = that.percentRight, horizonCenter = that.horizonCenter, verticalCenter = that.verticalCenter;
-	        var _a = that._width, tW_Z = _a === void 0 ? 0 : _a, _b = that._height, tH_Z = _b === void 0 ? 0 : _b;
-	        if (that._instanceType == "TextFieldNode" || that._instanceType == "Label") {
-	            tW_Z = that.width;
-	            tH_Z = that.height;
-	        }
-	        var _c = (that.parent || {}), _d = _c._width, pW_Z = _d === void 0 ? 0 : _d, _e = _c._height, pH_Z = _e === void 0 ? 0 : _e;
+	        var _a = that.width, tW_Z = _a === void 0 ? 0 : _a, _b = that.height, tH_Z = _b === void 0 ? 0 : _b;
+	        var _c = (that.parent || {}), _d = _c.width, pW_Z = _d === void 0 ? 0 : _d, _e = _c.height, pH_Z = _e === void 0 ? 0 : _e;
 	        var judgePL = toBoolean(percentLeft), judgePR = toBoolean(percentRight), judgePT = toBoolean(percentTop), judgePB = toBoolean(percentBottom);
 	        var _left = judgePL ? percentLeft / 100 * pW_Z : left, _right = judgePR ? percentRight / 100 * pW_Z : right, _top = judgePT ? percentTop / 100 * pH_Z : top, _bottom = judgePB ? percentBottom / 100 * pH_Z : bottom;
 	        if (toBoolean(_left) && toBoolean(_right)) {
@@ -1966,7 +1962,7 @@ var tslib = {__extends: __extends,__assign: __assign,__rest: __rest,__decorate:
 	        else {
 	            toBoolean(percentWidth) && (tW_Z = that.width = pW_Z * percentWidth / 100);
 	            if (toBoolean(horizonCenter)) {
-	                that.x = pW_Z / 2 - tW_Z / 2 + horizonCenter;
+	                that.x = (pW_Z - tW_Z) / 2 + horizonCenter;
 	            }
 	            else if (toBoolean(_left)) {
 	                that.x = _left;
@@ -1982,7 +1978,7 @@ var tslib = {__extends: __extends,__assign: __assign,__rest: __rest,__decorate:
 	        else {
 	            toBoolean(percentHeight) && (tH_Z = that.height = pH_Z * percentHeight / 100);
 	            if (toBoolean(verticalCenter)) {
-	                that.y = pH_Z / 2 - tH_Z / 2 + verticalCenter;
+	                that.y = (pH_Z - tH_Z) / 2 + verticalCenter;
 	            }
 	            else if (toBoolean(_top)) {
 	                that.y = _top;
@@ -2004,7 +2000,7 @@ var tslib = {__extends: __extends,__assign: __assign,__rest: __rest,__decorate:
 	                    if (toBoolean(that.children[i].right))
 	                        continue;
 	                    var _x = that.children[i].x || 0;
-	                    var _w = (that._instanceType == "TextFieldNode" || that._instanceType == "Label") ? that.width : (that.children[i].__width || 0);
+	                    var _w = that.children[i].width;
 	                    (_x + _w > maxR) ? maxR = _x + _w : 0;
 	                }
 	                that.width = maxR;
@@ -2017,7 +2013,7 @@ var tslib = {__extends: __extends,__assign: __assign,__rest: __rest,__decorate:
 	                    if (toBoolean(that.children[i].bottom))
 	                        continue;
 	                    var _y = that.children[i].y || 0;
-	                    var _h = (that._instanceType == "TextFieldNode" || that._instanceType == "Label") ? that.height : (that.children[i].__height || 0);
+	                    var _h = that.children[i].height;
 	                    (_y + _h > maxB) ? maxB = _y + _h : 0;
 	                }
 	                that.height = maxB;

src/zeroing/decorators/AlignManager.ts

@@ -43,7 +43,7 @@ class AlignManager {
      */
     private align(that) {
 
-        if (!that.alignEnabled) return;  // 如果的自动对齐关闭里则啥也不干
+        if (!that.alignEnabled) return;  // 如果的自动对齐关闭则啥也不干
 
         // if(that.alignMode === ALIGN_MODE.ONCE) {    // 如果是单次对齐则一次运算之后就关闭它
         //     that.alignEnabled = false;
@@ -56,12 +56,15 @@ class AlignManager {
             horizonCenter, verticalCenter
         } = that;
 
-        let {_width: tW_Z = 0, _height: tH_Z = 0} = that;
-        if (that._instanceType == "TextFieldNode" || that._instanceType == "Label") {
-            tW_Z = that.width;
-            tH_Z = that.height;
-        }
-        const {_width: pW_Z = 0, _height: pH_Z = 0} = (that.parent || {});
+        // let {_width: tW_Z = 0, _height: tH_Z = 0} = that;
+        let {width: tW_Z = 0, height: tH_Z = 0} = that;
+        // if (that._instanceType == "TextFieldNode" || that._instanceType == "Label") {
+        //     tW_Z = that.width;
+        //     tH_Z = that.height;
+        // }
+
+        // const {_width: pW_Z = 0, _height: pH_Z = 0} = (that.parent || {});
+        const {width: pW_Z = 0, height: pH_Z = 0} = (that.parent || {});
 
         /// TODO null / 100 == 0 ?????? wtf!!!! 我裂开了
         // percentWidth /= 100;
@@ -99,7 +102,7 @@ class AlignManager {
             // 先考虑 horizonCenter 属性
             if (toBoolean(horizonCenter)) {
                 // x 值 = 父节点的中间值 - 自己宽度的一半 - 居中差值
-                that.x = pW_Z / 2 - tW_Z / 2 + horizonCenter;
+                that.x = (pW_Z - tW_Z) / 2 + horizonCenter;
 
             } else if (toBoolean(_left)) {   // 假如有 _left
 
@@ -128,7 +131,7 @@ class AlignManager {
             // 先考虑 horizonCenter 属性
             if (toBoolean(verticalCenter)) {
                 // x 值 = 父节点的中间值 - 自己高度的一半 - 居中差值
-                that.y = pH_Z / 2 - tH_Z / 2 + verticalCenter;
+                that.y = (pH_Z - tH_Z) / 2 + verticalCenter;
 
             } else if (toBoolean(_top)) {   // 假如有 _top
 
@@ -140,7 +143,6 @@ class AlignManager {
 
             }
         }
-
         that.children && that.children.forEach(v => this.align(v));
     }
 
@@ -150,7 +152,7 @@ class AlignManager {
      */
     private autoSize(that) {
 
-        const len = that.children ? that.children.length : 0
+        const len = that.children ? that.children.length : 0;
         if (len > 0) {
 
             // 检测本身的是否是可以自动宽
@@ -179,7 +181,9 @@ class AlignManager {
                 for (let i = 0; i < len; i++) {
                     if (toBoolean(that.children[i].right)) continue;    /// TODO 开启这个，忽略带 right 值的子节点
                     let _x = that.children[i].x || 0;
-                    let _w = (that._instanceType == "TextFieldNode" || that._instanceType == "Label") ? that.width : (that.children[i].__width || 0);
+                    // let _w = (that._instanceType == "TextFieldNode" || that._instanceType == "Label") ? that.width : (that.children[i].__width || 0);
+                    // let _w = that.children[i].__width || 0;
+                    let _w = that.children[i].width;
                     (_x + _w > maxR) ? maxR = _x + _w : 0;
                 }
                 that.width = maxR;
@@ -210,7 +214,9 @@ class AlignManager {
                 for (let i = 0; i < len; i++) {
                     if (toBoolean(that.children[i].bottom)) continue;   /// TODO 开启这个，忽略带 bottom 值的子节点
                     let _y = that.children[i].y || 0;
-                    let _h = (that._instanceType == "TextFieldNode" || that._instanceType == "Label") ? that.height : (that.children[i].__height || 0);
+                    // let _h = (that._instanceType == "TextFieldNode" || that._instanceType == "Label") ? that.height : (that.children[i].__height || 0);
+                    // let _h = that.children[i].__height || 0;
+                    let _h = that.children[i].height;
                     (_y + _h > maxB) ? maxB = _y + _h : 0;
                 }
                 that.height = maxB;