@focus-teach/ui 1.0.56 → 1.0.58

package/package.json

@@ -2,7 +2,7 @@
   "name": "@focus-teach/ui",
   "packageName": "ui",
   "publishName": "@focus-teach/ui",
-  "version": "1.0.56",
+  "version": "1.0.58",
   "private": false,
   "main": "lib/ui.umd.min.js",
   "scripts": {
@@ -26,8 +26,9 @@
     "lodash": "^4.17.21",
     "md5": "^2.3.0",
     "qs": "^6.10.1",
-    "sass": "1.26.5",
+    "sass": "^1.26.5",
     "sass-loader": "^10.1.1",
+    "terser-webpack-plugin": "^3.0.3",
     "underscore": "^1.13.1",
     "vue": "^2.6.10",
     "vue-infinite-scroll": "^2.0.2",

package/utils/index.js

@@ -63,7 +63,7 @@ export function handleNestU (strHtml) {
   //u标签嵌套u标签的情况，合成一个u标签
   for (let i = 0; i < uElements.length; i++) {
     let currentU = uElements[i]
-    console.log('filterUHtmlByZeroWidthSpace',currentU.outerHTML.match(/&ZeroWidthSpace;/g),currentU,currentU.outerHTML)
+    // console.log('filterUHtmlByZeroWidthSpace',currentU.outerHTML.match(/&ZeroWidthSpace;/g),currentU,currentU.outerHTML)
     //u标签中有引文,隔开，处理成多个隔开的u标签
     // currentU.outerHTML  = currentU.innerHTML.replace(/,/g,'</u><span>,</span><u>')
     //去除u标签中的0宽字符&ZeroWidthSpace
@@ -75,13 +75,13 @@ export function handleNestU (strHtml) {
     // }
     // $(currentU).html(`${filterUHtmlByZeroWidthSpace}`);
     let parentNodeName = currentU.parentNode?.nodeName
-    console.log('parentU',parentNodeName)
+    // console.log('parentU',parentNodeName)
     //父节点不是u标签代表是一级u标签且一级u标签下有u标签,将一级U标签中的嵌套u去掉合成一个u，判断是否有8个及以上的空格
     let isNestU = currentU.querySelectorAll('u')
-    console.log('isNestU',isNestU)
+    // console.log('isNestU',isNestU)
     if (parentNodeName && parentNodeName !== 'U' && isNestU.length > 0) {
       let filterUHtml = currentU.innerHTML.replace(/<u[^>]*>/g,'').replace(/<\/u>/g,'')
-      console.log('filterUHtml',filterUHtml)
+      // console.log('filterUHtml',filterUHtml)
       $(currentU).html(`${filterUHtml}`);
       strHtml = $str.html()
       //if ((filterUHtml.match(/&nbsp;/g) || []).length >=8) {
@@ -95,13 +95,13 @@ export function handleNestU (strHtml) {
       // 将下一个兄弟元素的内容添加到当前元素中
       $(currentU).append($(currentU).next().html());
       $(currentU).next().remove();
-      console.log('ffff',$(currentU).next().html(),$str.html())
+      // console.log('ffff',$(currentU).next().html(),$str.html())
       strHtml = $str.html()
     }
     //下一个节点是文本且是_________且下划线后面无任意字符的情况,合成一个u标签,  前一个节点是___________且下划线前面无任意字符的情况
     let regexbyNext_ = /^(_){1,}/;
     let regexbyPrev_ = /(_){1,}$/;
-    console.log('dffdsd',currentU.previousSibling?.textContent, currentU.nextSibling?.nodeType,currentU.nextSibling?.textContent)
+    // console.log('dffdsd',currentU.previousSibling?.textContent, currentU.nextSibling?.nodeType,currentU.nextSibling?.textContent)
     let isPrevNodeText = (currentU.previousSibling?.nodeType === 3 && regexbyPrev_.test(currentU.previousSibling?.textContent))
     let isNextNodeText = (currentU.nextSibling?.nodeType === 3 && regexbyNext_.test(currentU.nextSibling?.textContent));
     if (isNextNodeText || isPrevNodeText) {
@@ -116,7 +116,7 @@ export function handleNestU (strHtml) {
       currentU.parentNode.removeChild(isNextNodeText?currentU.nextSibling:currentU.previousSibling)  //删掉前面或后面的第一个___
       isNextNodeText?$(currentU).after(lastText):$(currentU).before(lastText)//将后面的文本加到当前u的后面
       strHtml = $str.html()
-      console.log('uContentBY_',uContentBY_)
+      // console.log('uContentBY_',uContentBY_)
     }
   }
   //处理（）换行的情况   
@@ -214,21 +214,37 @@ export function matchUnderline(strHtml,isHandle) {
   }
 }
 //获取元素下的所有文本节点
-export function getAllTextNodes(node) {
-  let textNodes = [];
-  let regexby_ = /(_){4,}/;
-  node.childNodes.forEach(child => {
-      if (child.nodeType === Node.TEXT_NODE) {
-        // if (regexby_.test(child.textContent)) {
-        //   child.textContent = `<u data-attr-blank=空${index+1}>${('&nbsp;').repeat(child.textContent.length*2)}</u>`;
-        // }
-           textNodes.push(child);
-      } else if (child.nodeType === Node.ELEMENT_NODE) {
-        getAllTextNodes(child)
-           textNodes = textNodes.concat(getAllTextNodes(child));
-      }
-  });
-  return textNodes;
+export function getAllTextNodes(root) {
+    // 1. 创建 TreeWalker 对象
+    const walker = document.createTreeWalker(
+      root,           // 要遍历的根节点
+      NodeFilter.SHOW_TEXT,  // 只显示文本节点 
+      null,           // 不使用过滤器
+      false           // 不扩展实体引用
+    );
+    // 2. 存储文本节点的数组
+    const textNodes = [];
+    let node;
+    // 3. 遍历所有文本节点
+    while (node = walker.nextNode()) {
+      textNodes.push(node);
+    }
+    // 4. 返回文本节点数组
+    return textNodes;
+  // let textNodes = [];
+  // let regexby_ = /(_){4,}/;
+  // node.childNodes.forEach(child => {
+  //     if (child.nodeType === Node.TEXT_NODE) {
+  //       // if (regexby_.test(child.textContent)) {
+  //       //   child.textContent = `<u data-attr-blank=空${index+1}>${('&nbsp;').repeat(child.textContent.length*2)}</u>`;
+  //       // }
+  //          textNodes.push(child);
+  //     } else if (child.nodeType === Node.ELEMENT_NODE) {
+  //       getAllTextNodes(child)
+  //          textNodes = textNodes.concat(getAllTextNodes(child));
+  //     }
+  // });
+  // return textNodes;
 }
 
 //匹配四个及以上的空格并返回html