pixuireactcomponents 1.3.80 → 1.3.82

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "pixuireactcomponents",
-    "version": "1.3.80",
+    "version": "1.3.82",
     "description": "pixui react components",
     "main": "index.js",
     "scripts": {
@@ -12,7 +12,6 @@
     "dependencies": {
         "animate.css": "^3.7.2",
         "babel-plugin-transform-decorators-legacy": "^1.3.5",
-        "cheerio": "1.0.0-rc.12",
         "cpx": "^1.5.0",
         "gamelet-pixui-frame": "0.4.9",
         "google-protobuf": "^3.8.0",

package/src/components/tools/assetCache.d.ts

@@ -6,8 +6,15 @@ export declare namespace assetCache {
      * 缓存url资源到本地
      * @param url 资源url
      * @param force 是否强制缓存，如果为true，会强制重新下载并覆盖本地缓存
-     * @returns 返回本地缓存文件路径
+     * @returns 返回本地缓存文件路径，成功后resolve资源的本地路径，失败后reject函数的url参数
      */
     const cache: (url: string, force?: boolean, retryTimes?: number) => Promise<string>;
+    /**
+     *
+     * @param url 资源url
+     * @param responseType responseType
+     * @param retryTimes 重试次数
+     * @returns 下载成功是，返回xhr.response，否则返回空字符串
+     */
     const download: (url: string, responseType: 'arraybuffer' | 'json' | 'text', retryTimes?: number) => Promise<string>;
 }

package/src/components/tools/assetCache.js

@@ -62,7 +62,7 @@ export var assetCache;
      * 缓存url资源到本地
      * @param url 资源url
      * @param force 是否强制缓存，如果为true，会强制重新下载并覆盖本地缓存
-     * @returns 返回本地缓存文件路径
+     * @returns 返回本地缓存文件路径，成功后resolve资源的本地路径，失败后reject函数的url参数
      */
     assetCache.cache = function (url, force, retryTimes) {
         if (retryTimes === void 0) { retryTimes = 3; }
@@ -78,8 +78,7 @@ export var assetCache;
                                 case 0:
                                     if (!isJssdkEnv()) {
                                         console.log('非jssdk环境');
-                                        reject();
-                                        return [2 /*return*/];
+                                        reject(url);
                                     }
                                     lib = LibMgr.getInstance().getMainLib();
                                     return [4 /*yield*/, getLocalPath(url)];
@@ -89,7 +88,6 @@ export var assetCache;
                                         if (lib.fileExists(localPath)) {
                                             console.log('cacheAsset file exist', localPath);
                                             resolve(localPath);
-                                            return [2 /*return*/];
                                         }
                                     }
                                     xhr = new XMLHttpRequest();
@@ -110,7 +108,7 @@ export var assetCache;
                                                     assetCache.cache(url, force, retryTimes - 1).then(resolve, reject);
                                                 }
                                                 else {
-                                                    reject();
+                                                    reject(url);
                                                 }
                                             }
                                             return [2 /*return*/];
@@ -123,7 +121,7 @@ export var assetCache;
                                             assetCache.cache(url, force, retryTimes - 1).then(resolve, reject);
                                         }
                                         else {
-                                            reject();
+                                            reject(url);
                                         }
                                     };
                                     xhr.send();
@@ -134,6 +132,13 @@ export var assetCache;
             });
         });
     };
+    /**
+     *
+     * @param url 资源url
+     * @param responseType responseType
+     * @param retryTimes 重试次数
+     * @returns 下载成功是，返回xhr.response，否则返回空字符串
+     */
     assetCache.download = function (url, responseType, retryTimes) {
         if (retryTimes === void 0) { retryTimes = 3; }
         console.log('download---', url);
@@ -153,7 +158,7 @@ export var assetCache;
                             assetCache.download(url, responseType, retryTimes - 1).then(resolve, reject);
                         }
                         else {
-                            reject();
+                            reject('');
                         }
                     }
                     return [2 /*return*/];
@@ -166,7 +171,7 @@ export var assetCache;
                     assetCache.download(url, responseType, retryTimes - 1).then(resolve, reject);
                 }
                 else {
-                    reject();
+                    reject('');
                 }
             };
             xhr.send();

package/src/components/tools/tools.d.ts

@@ -5,17 +5,4 @@ export declare namespace tools {
      * 哈希生成一个长度20的字符串
      */
     const getHashStr: (str: string) => string;
-    /**
-     * 旧的富文本组件，请使用ConvertRichTextToPixuiStyle
-     * @param str
-     * @returns
-     */
-    const convertRichText: (str: string) => string;
-    /**
-     * 富文本组件，将富文本转换成pixui的innerHtml可以使用的格式
-     * @param str 管理端下发的富文本
-     * @param aLabelData 返回的富文本中的a标签的跳转数据，[id:string]:jumpdata
-     * @returns pixui的innerHtml可以使用的格式
-     */
-    const convertRichTextToPixuiStyle: (str: string, aLabelData?: object[]) => string;
 }

package/src/components/tools/tools.js

@@ -36,7 +36,6 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 import { GameletAPI } from 'gamelet-pixui-frame';
 import { sha1 } from './Sha1';
-import * as cheerio from 'cheerio';
 export var tools;
 (function (tools) {
     tools.writeCookie = function (key, value) {
@@ -77,194 +76,4 @@ export var tools;
     tools.getHashStr = function (str) {
         return sha1(str).substring(0, 20);
     };
-    /**
-     * 旧的富文本组件，请使用ConvertRichTextToPixuiStyle
-     * @param str
-     * @returns
-     */
-    tools.convertRichText = function (str) {
-        var res = str
-            .replaceAll(/<img([^>]*)>/g, '<img$1></img>') //传过来的这两个标签会少结束标签
-            .replaceAll(/<h[1,2,3,4,5,6]><br><\/h[1,2,3,4,5,6]>/g, '<br /><div style = "width:50px;height:15px;" ></div>')
-            .replaceAll(/<p><br><\/p>/g, '<br /><div style = "width:50px;height:15px;" ></div>')
-            .replaceAll(/<p/g, '<text')
-            .replaceAll(/<\/p>/g, '</text>') //包text否则会丢break word
-            .replaceAll(/<span/g, '<text')
-            .replaceAll(/<\/span>/g, '</text>') //包text否则会丢break word
-            .replaceAll(/&nbsp;/g, ' '); //单一行只有nbsp的时候，会整个解析不出来，pixui innerHtml bug
-        for (var i = 1; i <= 6; i++) {
-            res = res.replaceAll(/(<h${i}\s[^>]*>)([^<]*)(<\/h${i}>)/g, '$1<text>$2</text>$3'); //h1-h6的内容包 text
-        }
-        res = res.replaceAll(/<br>/g, '<br /><div style = "width:50px;height:15px;" ></div>');
-        for (var i = 1; i < 10; i++) {
-            res = res.replaceAll("class=\"ql-indent-".concat(i, "\""), " style=\"padding-left: ".concat(i * 2, "rem;\""));
-        }
-        return res;
-    };
-    /**
-     * 富文本组件，将富文本转换成pixui的innerHtml可以使用的格式
-     * @param str 管理端下发的富文本
-     * @param aLabelData 返回的富文本中的a标签的跳转数据，[id:string]:jumpdata
-     * @returns pixui的innerHtml可以使用的格式
-     */
-    tools.convertRichTextToPixuiStyle = function (str, aLabelData) {
-        var $ = cheerio.load(str, null, false);
-        var _loop_1 = function (i) {
-            var indent = "ql-indent-".concat(i);
-            var extStyle = "padding-left: ".concat(i * 2, "rem;");
-            $(".".concat(indent)).each(function () {
-                var oriStyle = $(this).attr('style') || '';
-                $(this).attr('style', "".concat(oriStyle, " ").concat(extStyle));
-                $(this).removeClass(indent);
-            });
-        };
-        //合并ql-indent class到style中
-        for (var i = 1; i <= 10; i++) {
-            _loop_1(i);
-        }
-        //每个 p 节点后添加一个 br 节点
-        $('p').each(function () {
-            $(this).after('<br>');
-        });
-        //将所有的<p><br></p>改成<br>,否则之后 br 会被套在 div 里失效
-        $('p').each(function () {
-            if (($(this).html() || '').trim() === '<br>') {
-                $(this).replaceWith('<br>');
-            }
-        });
-        //找到所有的文字节点，外层包裹text标签
-        $('*').each(function () {
-            $(this)
-                .contents()
-                .each(function () {
-                if (this.type === 'text') {
-                    var text = this.data.trim();
-                    if (text.length > 0) {
-                        $(this).replaceWith("<text style=\"word-break: break-word;flex-shrink: 0;\">".concat(text, "</text>"));
-                    }
-                }
-            });
-        });
-        //将strong em u s标签替换成text标签
-        $('strong').each(function () {
-            var html = $(this).html();
-            var style = $(this).attr('style') || '';
-            $(this).replaceWith("<text style=\"".concat(style, " font-weight: bold;flex-shrink: 0;\">").concat(html, "</text>"));
-        });
-        $('em').each(function () {
-            var html = $(this).html();
-            var style = $(this).attr('style') || '';
-            $(this).replaceWith("<text style=\"".concat(style, " font-style: italic;flex-shrink: 0;\">").concat(html, "</text>"));
-        });
-        $('u').each(function () {
-            var html = $(this).html();
-            var style = $(this).attr('style') || '';
-            $(this).replaceWith("<text style=\"".concat(style, " text-decoration: underline;flex-shrink: 0;\">").concat(html, "</text>"));
-        });
-        $('s').each(function () {
-            var html = $(this).html();
-            var style = $(this).attr('style') || '';
-            $(this).replaceWith("<text style=\"".concat(style, " text-decoration: line-through;flex-shrink: 0;\">").concat(html, "</text>"));
-        });
-        $('span').each(function () {
-            var html = $(this).html();
-            var style = $(this).attr('style') || '';
-            $(this).replaceWith("<text style=\"".concat(style, " flex-shrink: 0;\">").concat(html, "</text>"));
-        });
-        //p换成div
-        $('p').each(function () {
-            var html = $(this).html();
-            var style = $(this).attr('style') || '';
-            $(this).replaceWith("<div style=\"".concat(style, " ;flex-shrink: 0;\">").concat(html, "</div>"));
-        });
-        //pixui 连续的 br 会被吃掉，用 div 占位
-        $('br').each(function () {
-            $(this).replaceWith("<br><div style = \"width:50px; height:15px; flex-shrink: 0;\" />");
-        });
-        //补充 flex-shrink: 0
-        ['h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'a', 'img'].forEach(function (tag) {
-            $("".concat(tag)).each(function () {
-                var style = $(this).attr('style') || '';
-                $(this).attr('style', "".concat(style, " flex-shrink: 0;"));
-            });
-        });
-        //将嵌套的text节点合并，同时合并内外的style
-        while ($('text > text').length > 0) {
-            $('text').each(function () {
-                var $this = $(this);
-                var parentStyle = $this.attr('style') || '';
-                $this.children('text').each(function () {
-                    var $child = $(this);
-                    var childStyle = $child.attr('style') || '';
-                    // 合并style属性
-                    var mergedStyle = "".concat(parentStyle, "; ").concat(childStyle);
-                    // 更新子元素的style属性
-                    $child.attr('style', mergedStyle);
-                });
-                //去掉父节点
-                if ($this.children('text').length > 0) {
-                    $this.replaceWith($this.html() || '');
-                }
-            });
-        }
-        //去除空的text节点
-        $('text').each(function () {
-            var t = $(this).html() || '';
-            if (t.trim() == '') {
-                $(this).remove();
-            }
-        });
-        //!!并列的text节点在父节点为flexDirection:row时无法正确换行，将其修改为div，外层再包一个text节点
-        ['h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'div'].map(function (tag) {
-            $("".concat(tag)).each(function () {
-                $(this)
-                    .children('text')
-                    .each(function () {
-                    var text = $(this).html();
-                    var style = $(this).attr('style') || '';
-                    $(this).replaceWith("<div style=\"".concat(style, "\">").concat(text, "</div>"));
-                });
-                var taghtml = $(this).html();
-                var tagstyle = $(this).attr('style') || '';
-                //自己的子节点外套一个text，自己不变
-                $(this).replaceWith("<".concat(tag, " style=\"").concat(tagstyle, "\"><text>").concat(taghtml, "</text></").concat(tag, ">"));
-            });
-        });
-        //pixui 的 line-height只在 text 上生效，所以将所有的 div 上的 line-height 转移到父 text 上
-        //当前的结构为 div > text > div,只处理一层就行
-        //遍历每个 text 的子 div，将其中最大的 line-height 转移到 text 上
-        $('text').each(function () {
-            var $text = $(this);
-            var maxLineHeight = 0;
-            $text.children('div').each(function () {
-                var lineHeight = $(this).css('line-height') || '0';
-                var lineHeightNum = parseInt(lineHeight);
-                if (lineHeightNum > maxLineHeight) {
-                    maxLineHeight = lineHeightNum;
-                }
-                // $(this).css('line-height', '0');
-            });
-            if (maxLineHeight > 0) {
-                // pixui 中的实际显示的距离与网页中实际显示的距离差距较大，暂时*5rem
-                $text.css('line-height', maxLineHeight * 5 + 'rem');
-            }
-        });
-        if (aLabelData) {
-            $('a').each(function (i, ele) {
-                var id = "PA_RichTextATagId_".concat(i);
-                $(this).attr('id', id);
-                aLabelData[id] = $(this).attr('href');
-                $(this).attr('href', '');
-            });
-        }
-        //手动处理标签的结尾符
-        var res = $.html();
-        res = res
-            .replaceAll(/<br>/g, '<br />')
-            .replaceAll(/<img([^>]+)>/g, '<img$1 />')
-            .replaceAll(/&nbsp;/g, ' ');
-        // console.log('rrrr', res);
-        res = "<div style=\"display:flex;flex-direction:column;width:100%;\">".concat(res, "</div>");
-        return res;
-    };
 })(tools || (tools = {}));