pixuireactcomponents 1.1.8 → 1.1.9

package/README.md

@@ -1,3 +1,8 @@
 # 组件库
+
 本组件库目前分为2大类：ui组件和工具组件。分别参见目录ui/和目录tools。
-具体组件说明，参见对应类别目录下的md文档
+具体组件说明，参见对应类别目录下的md文档
+
+# 文档
+
+组件详情请查看https://iwiki.woa.com/pages/viewpage.action?pageId=548726653

package/package.json

@@ -1,11 +1,11 @@
 {
     "name": "pixuireactcomponents",
-    "version": "1.1.8",
+    "version": "1.1.9",
     "description": "pixui react components",
     "main": "index.js",
     "scripts": {
         "test": "echo \"Error: no test specified\" && exit 1"
     },
-    "author": "nepdai",
+    "author": "hardenzheng",
     "license": "ISC"
 }

package/ui/components/outlinetext/OutlineText.d.ts

@@ -35,18 +35,8 @@ export interface OutlineTextProps {
     alignByGeometry?: boolean;
     horizontalOverflow?: HorizontalWrapMode;
     verticalOverflow?: VerticalWrapMode;
-    color: {
-        r: number;
-        g: number;
-        b: number;
-        a: number;
-    };
-    outlineColor: {
-        r: number;
-        g: number;
-        b: number;
-        a: number;
-    };
+    color: string;
+    outlineColor: string;
     outlineDistance: {
         x: number;
         y: number;
@@ -67,18 +57,8 @@ export declare class OutlineText extends Component<OutlineTextProps, OutlineText
         alignByGeometry: boolean;
         horizontalOverflow: HorizontalWrapMode;
         verticalOverflow: VerticalWrapMode;
-        color: {
-            r: number;
-            g: number;
-            b: number;
-            a: number;
-        };
-        outlineColor: {
-            r: number;
-            g: number;
-            b: number;
-            a: number;
-        };
+        color: string;
+        outlineColor: string;
         outlineDistance: {
             x: number;
             y: number;
@@ -86,6 +66,7 @@ export declare class OutlineText extends Component<OutlineTextProps, OutlineText
     };
     componentDidUpdate(): void;
     OnLoad: (e: any) => void;
+    colorRgb(colorStr: any): any;
     updateOutlineText(): void;
     render(): h.JSX.Element;
 }

package/ui/components/outlinetext/OutlineText.js

@@ -83,6 +83,38 @@ var OutlineText = /** @class */ (function (_super) {
         console.log('componentDidUpdate');
         this.updateOutlineText();
     };
+    OutlineText.prototype.colorRgb = function (colorStr) {
+        //十六进制颜色值的正则表达式
+        var reg = /^#([0-9a-fA-f]{0,}|)$/;
+        var matchRes = colorStr.toString().toLowerCase().match(reg);
+        var transColor = '';
+        if (matchRes.length > 0)
+            transColor = matchRes[matchRes.length - 1];
+        // eslint-disable-next-line @typescript-eslint/no-array-constructor
+        var colorList = new Array();
+        while (transColor != '') {
+            var hex = '0x' + transColor.substring(0, 2);
+            colorList.push(parseInt(hex, 16));
+            transColor = transColor.substring(2, transColor.length);
+        }
+        var r, g, b, a = 1;
+        for (var i = 0; i < colorList.length; i++) {
+            if (i == 0 && colorList[i] != null && colorList[i] != undefined) {
+                r = colorList[i] / 255;
+            }
+            if (i == 1 && colorList[i] != null && colorList[i] != undefined) {
+                g = colorList[i] / 255;
+            }
+            if (i == 2 && colorList[i] != null && colorList[i] != undefined) {
+                b = colorList[i] / 255;
+            }
+            if (i == 3 && colorList[i] != null && colorList[i] != undefined) {
+                a = colorList[i] / 255;
+            }
+        }
+        var CS = window.require('csharp');
+        return CS.UnityEngine.Color(r, g, b, a);
+    };
     OutlineText.prototype.updateOutlineText = function () {
         var CS = window.require('csharp');
         this.text.text = this.props.text;
@@ -94,13 +126,13 @@ var OutlineText = /** @class */ (function (_super) {
         this.text.alignByGeometry = this.props.alignByGeometry;
         this.text.horizontalOverflow = this.props.horizontalOverflow;
         this.text.verticalOverflow = this.props.verticalOverflow;
-        this.text.color = CS.UnityEngine.Color(this.props.color.r, this.props.color.g, this.props.color.b, this.props.color.a);
-        this.outline.effectColor = new CS.UnityEngine.Color(this.props.outlineColor.r, this.props.outlineColor.g, this.props.outlineColor.b, this.props.outlineColor.a);
+        this.text.color = this.colorRgb(this.props.color);
+        this.outline.effectColor = this.colorRgb(this.props.outlineColor);
         this.outline.effectDistance = new CS.UnityEngine.Vector2(this.props.outlineDistance.x, this.props.outlineDistance.y);
     };
     OutlineText.prototype.render = function () {
         return (h("div", { style: this.props.style },
-            h("pixslot", { style: { width: '100%', heigth: '100%' }, src: 'pixui://method:placeholder', onLoad: this.OnLoad })));
+            h("pixslot", { style: { width: '100%', height: '100%' }, src: 'pixui://method:placeholder', onLoad: this.OnLoad.bind(this) })));
     };
     OutlineText.defaultProps = {
         style: defaultStyle,
@@ -113,18 +145,8 @@ var OutlineText = /** @class */ (function (_super) {
         alignByGeometry: false,
         horizontalOverflow: HorizontalWrapMode.Wrap,
         verticalOverflow: VerticalWrapMode.Truncate,
-        color: {
-            r: 1,
-            g: 1,
-            b: 1,
-            a: 1
-        },
-        outlineColor: {
-            r: 0,
-            g: 0,
-            b: 0,
-            a: 1
-        },
+        color: '#FFFFFF',
+        outlineColor: '#000000',
         outlineDistance: {
             x: 1,
             y: -1