js_ryl 1.0.33 → 1.0.34

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "js_ryl",
-  "version": "1.0.33",
+  "version": "1.0.34",
   "private": false,
   "description": "自定义通用js",
   "author": "renyuliang <785788909@qq.com>",

package/src/App.vue

@@ -57,6 +57,7 @@ import verCode from "./verCode";
 import filterTable from "./filterTable";
 import getMonthDays from "./getMonthDays";
 import emoji from "./emoji";
+import emojiToUnicode from "./emojiToUnicode";
 import highLight from "./highLight";
 import flyToCart from "./flyToCart";
 import downExcel from "./downExcel";
@@ -174,6 +175,8 @@ export default {
     const emojiEx = "A0 [u+1BE4] U+1F600 \\u{1F602} U+123456";
     const output = emoji(emojiEx);
     console.log(output);
+    const sssttt = 'A0 ᯤ 😀 😂 U+123456'
+    console.log(emojiToUnicode(sssttt))
 
   },
   methods: {

package/src/base64Img/index.js

@@ -1,53 +1,50 @@
 // 处理字符串中的base64图片上传和替换
-export default function base64Img(content, apiUrl, token, data) {
-    // 匹配所有 base64 图片（支持多种格式）
+export default function base64Img(content, apiUrl, token, data, callback = function () { }) {
     const base64Regex = /<img [^>]*src=['"](data:image[^'"]+base64,[^'"]+)['"][^>]*>/gi;
     let match;
     const replacements = [];
 
-    // 第一步：收集所有需要替换的 base64 数据
     while ((match = base64Regex.exec(content)) !== null) {
         replacements.push({
-        original: match[1],
-        base64: match[1]
+            original: match[1],
+            base64: match[1]
         });
     }
 
-    // 第二步：并行上传所有图片
     if (replacements.length > 0) {
         const uploadPromises = replacements.map((replacement) => {
-        return fetch(apiUrl, {
-            method: "POST",
-            headers: {
-            "Authorization": "Bearer " + token,
-            "Content-Type": "application/json"
-            },
-            body: JSON.stringify({image: replacement.base64,...data})
-        })
-        .then(res => res.json())
-        .then(data => {
-            if (data.code === 200) {
-            replacement.url = data.data.url;
-            }
-            return replacement;
-        })
-        .catch(error => {
-            console.error('上传图片失败:', error);
-            return replacement;
-        });
+            return fetch(apiUrl, {
+                method: "POST",
+                headers: {
+                    "Authorization": "Bearer " + token,
+                    "Content-Type": "application/json"
+                },
+                body: JSON.stringify({ image: replacement.base64, ...data })
+            })
+                .then(res => res.json())
+                .then(result => {
+                    if (result.code === 200) {
+                        replacement.url = result.data.url;
+                    } else {
+                        callback(replacement.original, result.msg);
+                    }
+                    return replacement;
+                })
+                .catch(error => {
+                    callback(replacement.original, error);
+                    return replacement;
+                });
         });
 
-        // 等待所有上传完成
         return Promise.all(uploadPromises)
-        .then(results => {
-            // 第三步：替换所有 base64 为图片 URL
-            results.forEach((result) => {
-            if (result.url) {
-                content = content.replace(result.original, result.url);
-            }
+            .then(results => {
+                results.forEach((result) => {
+                    if (result.url) {
+                        content = content.replace(result.original, result.url);
+                    }
+                });
+                return content;
             });
-            return content;
-        });
     }
 
     return Promise.resolve(content);

package/src/emoji/index.js

@@ -1,4 +1,4 @@
-// 主转换函数
+// 主转换函数-- unicode转化emoji表情
 export default function emoji(str) {
     // 支持多种 Unicode 表示格式：U+xxxx, [u+xxxx], \u{xxxx}
     const regex = /U\+([0-9A-Fa-f]{4,6})|\[u\+([0-9A-Fa-f]{4,6})\]|\\u\{([0-9A-Fa-f]{4,6})\}/g;

package/src/emojiToUnicode/index.js

@@ -0,0 +1,10 @@
+// 将字符串中的emoji表情转为unicode
+export default function emojiToUnicode(msg) {
+    const rex =
+      /[\u{1f300}-\u{1f5ff}\u{1f900}-\u{1f9ff}\u{1f600}-\u{1f64f}\u{1f680}-\u{1f6ff}\u{2600}-\u{26ff}\u{2700}-\u{27bf}\u{1f1e6}-\u{1f1ff}\u{1f191}-\u{1f251}\u{1f004}\u{1f0cf}\u{1f170}-\u{1f171}\u{1f17e}-\u{1f17f}\u{1f18e}\u{3030}\u{2b50}\u{2b55}\u{2934}-\u{2935}\u{2b05}-\u{2b07}\u{2b1b}-\u{2b1c}\u{3297}\u{3299}\u{303d}\u{00a9}\u{00ae}\u{2122}\u{23f3}\u{24c2}\u{23e9}-\u{23ef}\u{25b6}\u{23f8}-\u{23fa}]/gu;
+    const updated = msg.replace(
+      rex,
+      (match) => `[u+${match.codePointAt(0).toString(16)}]`
+    );1
+    return updated;
+}

package/src/index.js

@@ -19,8 +19,10 @@ import verCode from "./verCode";
 import filterTable from "./filterTable";
 // 获取当前年份中，指定月份的天数
 import getMonthDays from "./getMonthDays";
-// emoji表情转化
+// unicode转化emoji表情
 import emoji from "./emoji";
+// 将字符串中的emoji表情转为unicode
+import emojiToUnicode from "./emojiToUnicode";
 // 高亮显示搜索匹配的文字
 import highLight from "./highLight";
 // 飞入购物车效果
@@ -29,7 +31,7 @@ import flyToCart from "./flyToCart";
 import downExcel from "./downExcel";
 // 处理base64的图片为链接
 import base64Img from "./base64Img";
-// 处理base64的图片为链接
+// 字符串参数处理
 import getParamsUtil from "./getParamsUtil";
 
 export default {
@@ -44,6 +46,7 @@ export default {
   filterTable,
   getMonthDays,
   emoji,
+  emojiToUnicode,
   highLight,
   flyToCart,
   downExcel,