@10yun/cv-mobile-ui 0.5.55 → 0.5.57

package/other/{u-parse-2019 → u-parse}/libs/html2json.js

@@ -54,8 +54,8 @@ function getScreenInfo() {
   const screen = {};
   uni.getSystemInfo({
     success: (res) => {
-      // screen.width = res.windowWidth;
-      screen.width = (res.windowWidth * 710) / 750;
+      screen.width = res.windowWidth;
+      // screen.width = (res.windowWidth * 710) / 750;
       screen.height = res.windowHeight;
     }
   });

package/other/{uParse → u-parse}/libs/wxDiscode.js

@@ -109,7 +109,7 @@ function strcharacterDiscode(str) {
   str = str.replace(/&lt;/g, '<');
   str = str.replace(/&gt;/g, '>');
   str = str.replace(/&#8226;/g, '•');
-  str = str.replace(/&nbsp;/g, ' ');
+  // str = str.replace(/&nbsp;/g, ' ');
   return str;
 }
 

package/other/u-parse/readme.md

@@ -0,0 +1,102 @@
+## uParse 适用于 uni-app/mpvue 的富文本解析组件
+
+> 支持 Html、Markdown 解析，Fork自: [mpvue-wxParse](https://github.com/F-loat/mpvue-wxParse)
+
+
+## 属性
+
+| 名称             | 类型          | 默认值        | 描述               |
+| -----------------|--------------- | ------------- | ----------------  |
+| loading          | Boolean        | false         | 数据加载状态       |
+| className        | String         | —             | 自定义 class 名称  |
+| content          | String         | —             | 渲染内容           |
+| noData           | String         | 数据不能为空   | 空数据时的渲染展示  |
+| startHandler     | Function       | 见源码         | 自定义 parser 函数 |
+| endHandler       | Function       | null          | 自定义 parser 函数 |
+| charsHandler     | Function       | null          | 自定义 parser 函数 |
+| imageProp        | Object         | 见下文        | 图片相关参数        |
+
+### 自定义 parser 函数具体介绍
+
+* 传入的参数为当前节点 `node` 对象及解析结果 `results` 对象，例如 `startHandler(node, results)`
+* 无需返回值，通过对传入的参数直接操作来完成需要的改动
+* 自定义函数会在原解析函数处理之后执行
+
+### imageProp 对象具体属性
+
+| 名称              | 类型           | 默认值        | 描述                |
+| -----------------|--------------- | ------------- | ------------------ |
+| mode             | String         | 'aspectFit'   | 图片裁剪、缩放的模式 |
+| padding          | Number         | 0             | 图片内边距          |
+| lazyLoad         | Boolean        | false         | 图片懒加载          |
+| domain           | String         | ''            | 图片服务域名        |
+
+## 事件
+
+| 名称             | 参数              | 描述              |
+| -----------------|----------------- | ----------------  |
+| preview          | 图片地址，原始事件 | 预览图片时触发     |
+| navigate         | 链接地址，原始事件 | 点击链接时触发     |
+
+## 基本使用方法
+
+
+``` vue
+<template>
+  <div>
+    <u-parse :content="article" @preview="preview" @navigate="navigate" />
+  </div>
+</template>
+
+<script>
+import uParse from '@/components/u-parse/u-parse.vue'
+
+export default {
+  components: {
+    uParse
+  },
+  data () {
+    return {
+      article: '<div>我是HTML代码</div>'
+    }
+  },
+  methods: {
+    preview(src, e) {
+      // do something
+    },
+    navigate(href, e) {
+      // do something
+    }
+  }
+}
+</script>
+
+<style>
+@import url("@/components/u-parse/u-parse.css");
+</style>
+```
+
+
+## 渲染 Markdown
+
+> 先将 markdown 转换为 html 即可
+
+```
+npm install marked
+```
+
+``` js
+import marked from 'marked'
+import uParse from '@/components/u-parse/u-parse.vue'
+
+export default {
+  components: {
+    uParse
+  },
+  data () {
+    return {
+      article: marked(`#hello, markdown!`)
+    }
+  }
+}
+```

package/other/{u-parse-2019 → u-parse}/u-parse.vue

@@ -5,7 +5,6 @@
  *
  * for: uni-app框架下 富文本解析
  */-->
-
 <template>
   <!--基础元素-->
   <div class="wxParse" :class="className" v-if="!loading">
@@ -14,11 +13,9 @@
     </block>
   </div>
 </template>
-
 <script>
 import HtmlToJson from './libs/html2json';
 import wxParseTemplate from './components/wxParseTemplate0';
-
 export default {
   name: 'wxParse',
   emits: ['navigate', 'preview'],
@@ -87,6 +84,7 @@ export default {
       };
       const results = HtmlToJson(parseData, customHandler, imageProp, this);
       this.imageUrls = results.imageUrls;
+      console.log(results);
       return results.nodes;
     }
   },
@@ -109,6 +107,3 @@ export default {
   }
 };
 </script>
-<style>
-@import 'u-parse.css';
-</style>

package/other/u-parse2026/libs/html2json.js

@@ -54,8 +54,8 @@ function getScreenInfo() {
   const screen = {};
   uni.getSystemInfo({
     success: (res) => {
-      // screen.width = res.windowWidth;
-      screen.width = (res.windowWidth * 710) / 750;
+      screen.width = res.windowWidth;
+      // screen.width = (res.windowWidth * 710) / 750;
       screen.height = res.windowHeight;
     }
   });

package/other/u-parse2026/libs/wxDiscode.js

@@ -109,7 +109,7 @@ function strcharacterDiscode(str) {
   str = str.replace(/&lt;/g, '<');
   str = str.replace(/&gt;/g, '>');
   str = str.replace(/&#8226;/g, '•');
-  str = str.replace(/&nbsp;/g, ' ');
+  // str = str.replace(/&nbsp;/g, ' ');
   return str;
 }
 

package/other/u-parse2026/u-parse.css

@@ -24,6 +24,7 @@
 
 .wxParse view,
 .wxParse uni-view {
+  word-break: hyphenate;
   word-break: break-word;
 }
 

package/other/u-parse2026/u-parse.vue

@@ -5,7 +5,6 @@
  *
  * for: uni-app框架下 富文本解析
  */-->
-
 <template>
   <!--基础元素-->
   <div class="wxParse" :class="className" v-if="!loading">
@@ -14,11 +13,9 @@
     </block>
   </div>
 </template>
-
 <script>
 import HtmlToJson from './libs/html2json';
 import wxParseTemplate from './components/wxParseTemplate0';
-
 export default {
   name: 'wxParse',
   emits: ['navigate', 'preview'],
@@ -87,6 +84,7 @@ export default {
       };
       const results = HtmlToJson(parseData, customHandler, imageProp, this);
       this.imageUrls = results.imageUrls;
+      console.log(results);
       return results.nodes;
     }
   },

package/other/uParse2/components/wxParseAudio.vue

@@ -0,0 +1 @@
+<template>
  <!-- #ifndef VUE3 -->
  <!-- '<audio/>' 组件不再维护，建议使用能力更强的 'uni.createInnerAudioContext' 接口 有时间再改-->
  <!--增加audio标签支持-->
  <audio
    :id="node.attr.id"
    :class="node.classStr"
    :style="node.styleStr"
    :src="node.attr.src"
    :loop="node.attr.loop"
    :poster="node.attr.poster"
    :name="node.attr.name"
    :author="node.attr.author"
    controls
  ></audio>
  <!-- #endif -->
  <!-- #ifdef VUE3 -->
  <view></view>
  <!-- #endif -->
  name: 'wxParseAudio',
  props: {
    node: {
      type: Object,
      default() {
        return {};
      }
    }
  }

package/other/{uParse → uParse2}/components/wxParseImg.vue

@@ -48,13 +48,13 @@ export default {
       const { width, height } = e.mp.detail;
       const recal = this.wxAutoImageCal(width, height);
       const { imageheight, imageWidth } = recal;
-      const { padding, mode } = this.node.attr; 
-      //删除padding
+      const { padding, mode } = this.node.attr; //删除padding
+      
       // const { mode } = this.node.attr;
       const { styleStr } = this.node;
       const imageHeightStyle = mode === 'widthFix' ? '' : `height: ${imageheight}px;`;
-      this.newStyleStr = `${styleStr}; ${imageHeightStyle}; width: ${imageWidth}px; padding: 0 ${+padding}px;`; 
-      //删除padding
+      this.newStyleStr = `${styleStr}; ${imageHeightStyle}; width: ${imageWidth}px; padding: 0 ${+padding}px;`; //删除padding
+      
       // this.newStyleStr = `${styleStr}; ${imageHeightStyle}; width: ${imageWidth}px;`;
     },
     // 计算视觉优先的图片宽高

package/other/{uParse → uParse2}/components/wxParseTable.vue

@@ -1,7 +1,7 @@
 <template>
-  <div class="tablebox">
+  <view class="wxTable" @tap="wxParseTableTap">
     <rich-text :nodes="nodes" :class="node.classStr" :style="'user-select:' + parseSelect"></rich-text>
-  </div>
+  </view>
 </template>
 <script>
 export default {
@@ -24,6 +24,14 @@ export default {
     this.nodes = this.loadNode([this.node]);
   },
   methods: {
+    wxParseTableTap(e) {
+      let parent = this.$parent;
+      while (!parent.preview || typeof parent.preview !== 'function') {
+        // TODO 遍历获取父节点执行方法
+        parent = parent.$parent;
+      }
+      parent.preview('', e);
+    },
     loadNode(node) {
       let obj = [];
       for (let children of node) {
@@ -32,10 +40,14 @@ export default {
             name: children.tag,
             attrs: {
               class: children.classStr
-              // style: children.styleStr,
             },
             children: children.nodes ? this.loadNode(children.nodes) : []
           };
+          if (children.tag === 'img') {
+            t.attrs.src = children.attr.src;
+            t.attrs.mode = children.attr.mode;
+            t.attrs.alt = children.attr.alt;
+          }
           obj.push(t);
         } else if (children.node == 'text') {
           obj.push({
@@ -49,6 +61,3 @@ export default {
   }
 };
 </script>
-<style>
-@import './style.css';
-</style>

package/other/{uParse → uParse2}/components/wxParseTemplate0.vue

@@ -52,23 +52,24 @@
   <!-- <block v-else-if="node.node == 'text'">{{node.text}}</block> -->
 </template>
 <script>
-// #ifdef APP-PLUS | H5
+// #ifndef VUE3
+// #ifdef APP-PLUS || H5
 import wxParseTemplate from './wxParseTemplate0';
 // #endif
 // #ifdef MP
 import wxParseTemplate from './wxParseTemplate1';
 // #endif
+// #endif
+// #ifdef VUE3
+import wxParseTemplate from './wxParseTemplate1';
+// #endif
 import wxParseImg from './wxParseImg';
 import wxParseVideo from './wxParseVideo';
 import wxParseAudio from './wxParseAudio';
 import wxParseTable from './wxParseTable';
+
 export default {
-  // #ifdef APP-PLUS | H5
   name: 'wxParseTemplate',
-  // #endif
-  // #ifdef MP
-  name: 'wxParseTemplate0',
-  // #endif
   props: {
     node: {}
   },

package/other/{uParse → uParse2}/components/wxParseTemplate1.vue

@@ -5,6 +5,7 @@
     <button v-if="node.tag == 'button'" type="default" size="mini" :class="node.classStr" :style="node.styleStr">
       <wx-parse-template :node="node" />
     </button>
+
     <!--a类型-->
     <view
       v-else-if="node.tag == 'a'"
@@ -17,14 +18,17 @@
         <wx-parse-template :node="node" />
       </block>
     </view>
+
     <!--li类型-->
     <view v-else-if="node.tag == 'li'" :class="node.classStr" :style="node.styleStr">
       <block v-for="(node, index) of node.nodes" :key="index">
         <wx-parse-template :node="node" />
       </block>
     </view>
+
     <!--table类型-->
     <wx-parse-table v-else-if="node.tag == 'table'" :class="node.classStr" :style="node.styleStr" :node="node" />
+
     <!--br类型-->
     <!-- #ifndef H5 -->
     <text v-else-if="node.tag == 'br'">\n</text>
@@ -32,10 +36,13 @@
     <!-- #ifdef H5 -->
     <br v-else-if="node.tag == 'br'" />
     <!-- #endif -->
+
     <!--video类型-->
     <wx-parse-video :node="node" v-else-if="node.tag == 'video'" />
+
     <!--audio类型-->
     <wx-parse-audio :node="node" v-else-if="node.tag == 'audio'" />
+
     <!--img类型-->
     <wx-parse-img :node="node" v-else-if="node.tag == 'img'" :style="node.styleStr" />
     <!--其他标签-->
@@ -45,15 +52,18 @@
       </block>
     </view>
   </block>
+
   <!--判断是否是文本节点-->
   <block v-else-if="node.node == 'text'">{{ node.text }}</block>
 </template>
+
 <script>
 import wxParseTemplate from './wxParseTemplate2';
 import wxParseImg from './wxParseImg';
 import wxParseVideo from './wxParseVideo';
 import wxParseAudio from './wxParseAudio';
 import wxParseTable from './wxParseTable';
+
 export default {
   name: 'wxParseTemplate1',
   props: {

package/other/{uParse → uParse2}/libs/html2json.js

@@ -54,8 +54,8 @@ function getScreenInfo() {
   const screen = {};
   uni.getSystemInfo({
     success: (res) => {
-      // screen.width = res.windowWidth;
-      screen.width = (res.windowWidth * 710) / 750;
+      screen.width = res.windowWidth;
+      // screen.width = (res.windowWidth * 710) / 750;
       screen.height = res.windowHeight;
     }
   });

package/other/{u-parse-2019 → uParse2}/libs/wxDiscode.js

@@ -109,7 +109,7 @@ function strcharacterDiscode(str) {
   str = str.replace(/&lt;/g, '<');
   str = str.replace(/&gt;/g, '>');
   str = str.replace(/&#8226;/g, '•');
-  str = str.replace(/&nbsp;/g, ' ');
+  // str = str.replace(/&nbsp;/g, ' ');
   return str;
 }
 

package/other/{uParse/wxParse.css → uParse2/u-parse.css}

@@ -9,7 +9,7 @@
  * detail : http://weappdev.com/t/wxparse-alpha0-1-html-markdown/184
  */
 /**
- * 请在全局下引入该文件，@import '/static/wxParse.css';
+ * 请在全局下引入该文件，@import 'u-parse.css';
  */
 .wxParse {
   user-select: none;
@@ -18,7 +18,7 @@
   color: #333;
   line-height: 1.5;
   font-size: 1em;
-  text-align: justify; /* //左右两端对齐 */
+  text-align: justify;
 }
 .wxParse view,
 .wxParse uni-view {
@@ -27,7 +27,6 @@
 .wxParse .p {
   padding-bottom: 0.5em;
   clear: both;
-  /* letter-spacing: 0;//字间距 */
 }
 .wxParse .inline {
   display: inline;
@@ -143,6 +142,7 @@
 
 .wxParse .a {
   color: #576b95;
+  color: deepskyblue;
 }
 
 .wxParse .video {
@@ -221,7 +221,7 @@
 .wxParse .figure {
   overflow: hidden;
 }
-.wxParse .tablebox {
+.wxParse .wxTable {
   overflow: auto;
   background-color: #f5f5f5;
   background: #f5f5f5;

package/other/{uParse/wxParse.vue → uParse2/u-parse.vue}

@@ -4,26 +4,30 @@
  * github地址: https://github.com/dcloudio/uParse
  *
  * uni-app框架下 富文本解析
+ * 全局引入css文件，@import '/.../wxParse.css';
  * 
  */-->
+
 <template>
   <!--基础元素-->
-  <div class="wxParse" :class="className" :style="'user-select:' + userSelect" v-if="!loading">
+  <div class="wxParse" :class="className" :style="'user-select:' + userSelect">
     <block v-for="(node, index) of nodes" :key="index">
-      <wxParseTemplate :node="node" />
+      <wxParseTemplate :node="node" v-if="!loading" />
     </block>
   </div>
 </template>
+
 <script>
 import HtmlToJson from './libs/html2json';
 import wxParseTemplate from './components/wxParseTemplate0';
 export default {
   name: 'wxParse',
+  emits: ['navigate', 'preview'],
   props: {
     // user-select:none;
     userSelect: {
       type: String,
-      default: 'none' //none |text| all | element
+      default: 'text' //none |text| all | element
     },
     imgOptions: {
       type: [Object, Boolean],
@@ -49,7 +53,7 @@ export default {
     },
     noData: {
       type: String,
-      default: ''
+      default: '<text></text>'
     },
     startHandler: {
       type: Function,
@@ -109,14 +113,18 @@ export default {
         chars: charsHandler
       };
       let results = HtmlToJson(parseData, customHandler, imageProp, this);
+
       this.imageUrls = results.imageUrls;
-      // this.nodes = results.nodes;
       this.nodes = [];
-      results.nodes.forEach((item) => {
-        setTimeout(() => {
-          this.nodes.push(item);
-        }, 0);
-      });
+      setTimeout(() => {
+        this.nodes = results.nodes;
+      }, 20);
+
+      // results.nodes.forEach((item) => {
+      // 	setTimeout(() => {
+      // 		this.nodes.push(item)
+      // 	}, 0);
+      // })
     },
     getWidth() {
       return new Promise((res, rej) => {
@@ -158,7 +166,6 @@ export default {
       });
     },
     navigate(href, $event, attr) {
-      console.log(href, attr);
       this.$emit('navigate', href, $event);
     },
     preview(src, $event) {