@10yun/cv-mobile-ui 0.5.7 → 0.5.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@10yun/cv-mobile-ui",
-  "version": "0.5.7",
+  "version": "0.5.9",
   "description": "十云cvjs移动端ui，适用uniapp",
   "author": "",
   "license": "Apache-2.0",

package/ui-cv/cv-block/cv-block.vue

@@ -1,5 +1,5 @@
 <template>
-  <view class="cv-block" v-bind:style="cvBoxStyle" @tap="onClick">
+  <view class="cv-block" v-bind:style="cvBoxStyle">
     <slot name="default" />
   </view>
 </template>
@@ -68,9 +68,6 @@ export default {
         cvBoxStyle += 'margin-bottom:' + marginBottom + 'px;';
       }
       this.cvBoxStyle = cvBoxStyle;
-    },
-    onClick() {
-      this.$emit('click');
     }
   }
 };

package/ui-cv/cv-cell/cv-cell.vue

@@ -21,7 +21,7 @@
             </view>
           </view>
         </view>
-        <view class="cv-cell-main-center" :class="url == '' && !$listeners.click ? 'cv-cell-main-center-nourl' : ''">
+        <view class="cv-cell-main-center" :class="url == '' && !$attrs.click ? 'cv-cell-main-center-nourl' : ''">
           <view class="cv-cell-main-center-intact" v-if="!subexplain">
             {{ explain }}
           </view>
@@ -34,7 +34,7 @@
             </view>
           </view>
         </view>
-        <view class="cv-cell-main-more" v-if="url || $listeners.click">
+        <view class="cv-cell-main-more" v-if="url || $attrs.click">
           <view class="cv-cell-main-more-top"></view>
           <view class="cv-cell-main-more-bottom"></view>
         </view>
@@ -48,6 +48,7 @@
 
 <script>
 export default {
+  emits: ['click'],
   name: 'cvCell',
   options: {
     addGlobalClass: true

package/ui-cv/cv-editor-parse/components/wxParseAudio.vue

@@ -1,8 +1,17 @@
 <template>
   <!-- '<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>
+  <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>
 </template>
 
 <script>
@@ -13,8 +22,8 @@ export default {
       type: Object,
       default() {
         return {};
-      },
-    },
-  },
+      }
+    }
+  }
 };
 </script>

package/ui-cv/cv-editor-parse/components/wxParseImg.vue

@@ -1,6 +1,14 @@
 <template>
-  <image :mode="node.attr.mode" lazy-load="true" :class="node.classStr" :style="newStyleStr || node.styleStr" :data-src="node.attr.src"
-    :src="node.attr.src" @tap="wxParseImgTap" @load="wxParseImgLoad" />
+  <image
+    :mode="node.attr.mode"
+    :lazy-load="node.attr.lazyLoad"
+    :class="node.classStr"
+    :style="newStyleStr || node.styleStr"
+    :data-src="node.attr.src"
+    :src="node.attr.src"
+    @tap="wxParseImgTap"
+    @load="wxParseImgLoad"
+  />
 </template>
 
 <script>
@@ -9,7 +17,7 @@ export default {
   data() {
     return {
       newStyleStr: '',
-      preview: true,
+      preview: true
     };
   },
   props: {
@@ -17,60 +25,42 @@ export default {
       type: Object,
       default() {
         return {};
-      },
-    },
+      }
+    }
   },
   methods: {
     wxParseImgTap(e) {
       if (!this.preview) return;
-      const {
-        src
-      } = e.currentTarget.dataset;
+      const { src } = e.currentTarget.dataset;
       if (!src) return;
       let parent = this.$parent;
-      while (!parent.preview || typeof parent.preview !== 'function') { // TODO 遍历获取父节点执行方法
+      while (!parent.preview || typeof parent.preview !== 'function') {
+        // TODO 遍历获取父节点执行方法
         parent = parent.$parent;
       }
       parent.preview(src, e);
     },
     // 图片视觉宽高计算函数区
     wxParseImgLoad(e) {
-      const {
-        src
-      } = e.currentTarget.dataset;
+      const { src } = e.currentTarget.dataset;
       if (!src) return;
-      const {
-        width,
-        height
-      } = e.mp.detail;
+      const { width, height } = e.mp.detail;
       const recal = this.wxAutoImageCal(width, height);
-      const {
-        imageheight,
-        imageWidth
-      } = recal;
-      const {
-        padding,
-        mode
-      } = this.node.attr;
-      const {
-        styleStr
-      } = this.node;
+      const { imageheight, imageWidth } = recal;
+      const { padding, 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;`;
     },
     // 计算视觉优先的图片宽高
     wxAutoImageCal(originalWidth, originalHeight) {
       // 获取图片的原始长宽
-      const {
-        padding
-      } = this.node.attr;
-      const windowWidth = this.node.$screen.width - (2 * padding);
+      const { padding } = this.node.attr;
+      const windowWidth = this.node.$screen.width - 2 * padding;
       const results = {};
 
       if (originalWidth < 60 || originalHeight < 60) {
-        const {
-          src
-        } = this.node.attr;
+        const { src } = this.node.attr;
         let parent = this.$parent;
         while (!parent.preview || typeof parent.preview !== 'function') {
           parent = parent.$parent;
@@ -91,7 +81,7 @@ export default {
       }
 
       return results;
-    },
-  },
+    }
+  }
 };
 </script>

package/ui-cv/cv-editor-parse/components/wxParseTable.vue

@@ -10,8 +10,8 @@ export default {
       type: Object,
       default() {
         return {};
-      },
-    },
+      }
+    }
   },
   data() {
     return {
@@ -30,21 +30,21 @@ export default {
           let t = {
             name: children.tag,
             attrs: {
-              class: children.classStr,
+              class: children.classStr
               // style: children.styleStr,
             },
             children: children.nodes ? this.loadNode(children.nodes) : []
-          }
+          };
 
-          obj.push(t)
+          obj.push(t);
         } else if (children.node == 'text') {
           obj.push({
             type: 'text',
             text: children.text
-          })
+          });
         }
       }
-      return obj
+      return obj;
     }
   }
 };

package/ui-cv/cv-editor-parse/components/wxParseTemplate0.vue

@@ -1,88 +1,105 @@
-<template>
-  <!--判断是否是标签节点-->
-  <block v-if="node.node == 'element'">
-    <!--button类型-->
-    <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'" @click="wxParseATap" :class="node.classStr" :data-href="node.attr.href" :style="node.styleStr">
-      <block v-for="(node, index) of node.nodes" :key="index">
-        <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'" :node="node" />
-
-    <!--br类型-->
-    <!-- #ifndef H5 -->
-    <text v-else-if="node.tag == 'br'">\n</text>
-    <!-- #endif -->
-    <!-- #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'" />
-
-    <!--其他标签-->
-    <view v-else :class="node.classStr" :style="node.styleStr">
-      <block v-for="(node, index) of node.nodes" :key="index">
-        <wx-parse-template :node="node" />
-      </block>
-    </view>
-  </block>
-
-  <!--判断是否是文本节点-->
-  <block v-else-if="node.node == 'text'">{{node.text}}</block>
-</template>
-
-<script>
-import wxParseTemplate from './wxParseTemplate1';
-import wxParseImg from './wxParseImg';
-import wxParseVideo from './wxParseVideo';
-import wxParseAudio from './wxParseAudio';
-import wxParseTable from './wxParseTable';
-
-export default {
-  name: 'wxParseTemplate0',
-  props: {
-    node: {},
-  },
-  components: {
-    wxParseTemplate,
-    wxParseImg,
-    wxParseVideo,
-    wxParseAudio,
-    wxParseTable
-  },
-  methods: {
-    wxParseATap(e) {
-      const {
-        href
-      } = e.currentTarget.dataset; // TODO currentTarget才有dataset
-      if (!href) return;
-      let parent = this.$parent;
-      while (!parent.preview || typeof parent.preview !== 'function') { // TODO 遍历获取父节点执行方法
-        parent = parent.$parent;
-      }
-      parent.navigate(href, e);
-    },
-  }
-};
-</script>
+<template>
+  <view>
+    <!--判断是否是标签节点-->
+    <block v-if="node.node == 'element'">
+      <block v-if="node.tag == 'button'">
+        <button type="default" size="mini">
+          <block v-for="(node, index) of node.nodes" :key="index">
+            <wx-parse-template :node="node" />
+          </block>
+        </button>
+      </block>
+
+      <!--li类型-->
+      <block v-else-if="node.tag == 'li'">
+        <view :class="node.classStr" :style="node.styleStr">
+          <block v-for="(node, index) of node.nodes" :key="index">
+            <wx-parse-template :node="node" />
+          </block>
+        </view>
+      </block>
+
+      <!--video类型-->
+      <block v-else-if="node.tag == 'video'">
+        <wx-parse-video :node="node" />
+      </block>
+
+      <!--audio类型-->
+      <block v-else-if="node.tag == 'audio'">
+        <wx-parse-audio :node="node" />
+      </block>
+
+      <!--img类型-->
+      <block v-else-if="node.tag == 'img'">
+        <wx-parse-img :node="node" />
+      </block>
+
+      <!--a类型-->
+      <block v-else-if="node.tag == 'a'">
+        <view @click="wxParseATap" :class="node.classStr" :data-href="node.attr.href" :style="node.styleStr">
+          <block v-for="(node, index) of node.nodes" :key="index">
+            <wx-parse-template :node="node" />
+          </block>
+        </view>
+      </block>
+
+      <!--table类型-->
+      <block v-else-if="node.tag == 'table'">
+        <view :class="node.classStr" class="table" :style="node.styleStr">
+          <block v-for="(node, index) of node.nodes" :key="index">
+            <wx-parse-template :node="node" />
+          </block>
+        </view>
+      </block>
+
+      <!--br类型-->
+      <block v-else-if="node.tag == 'br'">
+        <text>\n</text>
+      </block>
+
+      <!--其他标签-->
+      <block v-else>
+        <view :class="node.classStr" :style="node.styleStr">
+          <block v-for="(node, index) of node.nodes" :key="index">
+            <wx-parse-template :node="node" />
+          </block>
+        </view>
+      </block>
+    </block>
+
+    <!--判断是否是文本节点-->
+    <block v-else-if="node.node == 'text'">{{ node.text }}</block>
+  </view>
+</template>
+
+<script>
+import wxParseTemplate from './wxParseTemplate1';
+import wxParseImg from './wxParseImg';
+import wxParseVideo from './wxParseVideo';
+import wxParseAudio from './wxParseAudio';
+
+export default {
+  name: 'wxParseTemplate0',
+  props: {
+    node: {}
+  },
+  components: {
+    wxParseTemplate,
+    wxParseImg,
+    wxParseVideo,
+    wxParseAudio
+  },
+  methods: {
+    wxParseATap(e) {
+      const { href } = e.currentTarget.dataset; // TODO currentTarget才有dataset
+      if (!href) return;
+      let parent = this.$parent;
+      while (!parent.preview || typeof parent.preview !== 'function') {
+        // TODO 遍历获取父节点执行方法
+        parent = parent.$parent;
+      }
+      parent.navigate(href, e);
+    }
+  }
+};
+</script>

package/ui-cv/cv-editor-parse/components/wxParseTemplate1.vue

@@ -1,88 +1,96 @@
-<template>
-  <!--判断是否是标签节点-->
-  <block v-if="node.node == 'element'">
-    <!--button类型-->
-    <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'" @click="wxParseATap" :class="node.classStr" :data-href="node.attr.href" :style="node.styleStr">
-      <block v-for="(node, index) of node.nodes" :key="index">
-        <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>
-    <!-- #endif -->
-    <!-- #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'" />
-
-    <!--其他标签-->
-    <view v-else :class="node.classStr" :style="node.styleStr">
-      <block v-for="(node, index) of node.nodes" :key="index">
-        <wx-parse-template :node="node" />
-      </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: {
-    node: {},
-  },
-  components: {
-    wxParseTemplate,
-    wxParseImg,
-    wxParseVideo,
-    wxParseAudio,
-    wxParseTable
-  },
-  methods: {
-    wxParseATap(e) {
-      const {
-        href
-      } = e.currentTarget.dataset;
-      if (!href) return;
-      let parent = this.$parent;
-      while (!parent.preview || typeof parent.preview !== 'function') {
-        parent = parent.$parent;
-      }
-      parent.navigate(href, e);
-    },
-  },
-};
-</script>
+<template>
+  <view :class="node.tag == 'li' ? node.classStr : node.node === 'text' ? 'text' : ''">
+    <!--判断是否是标签节点-->
+    <block v-if="node.node == 'element'">
+      <block v-if="node.tag == 'button'">
+        <button type="default" size="mini">
+          <block v-for="(node, index) of node.nodes" :key="index">
+            <wx-parse-template :node="node" />
+          </block>
+        </button>
+      </block>
+
+      <!--li类型-->
+      <block v-else-if="node.tag == 'li'">
+        <!-- <view :class="node.classStr" :style="node.styleStr"> -->
+        <view :style="node.styleStr">
+          <block v-for="(node, index) of node.nodes" :key="index">
+            <wx-parse-template :node="node" />
+          </block>
+        </view>
+      </block>
+
+      <!--video类型-->
+      <block v-else-if="node.tag == 'video'">
+        <wx-parse-video :node="node" />
+      </block>
+
+      <!--audio类型-->
+      <block v-else-if="node.tag == 'audio'">
+        <wx-parse-audio :node="node" />
+      </block>
+
+      <!--img类型-->
+      <block v-else-if="node.tag == 'img'">
+        <wx-parse-img :node="node" />
+      </block>
+
+      <!--a类型-->
+      <block v-else-if="node.tag == 'a'">
+        <view @click="wxParseATap" :class="node.classStr" :data-href="node.attr.href" :style="node.styleStr">
+          <block v-for="(node, index) of node.nodes" :key="index">
+            <wx-parse-template :node="node" />
+          </block>
+        </view>
+      </block>
+
+      <!--br类型-->
+      <block v-else-if="node.tag == 'br'">
+        <text>\n</text>
+      </block>
+
+      <!--其他标签-->
+      <block v-else>
+        <view :class="node.classStr" :style="node.styleStr">
+          <block v-for="(node, index) of node.nodes" :key="index">
+            <wx-parse-template :node="node" />
+          </block>
+        </view>
+      </block>
+    </block>
+
+    <!--判断是否是文本节点-->
+    <block v-else-if="node.node == 'text'">{{ node.text }}</block>
+  </view>
+</template>
+
+<script>
+import wxParseTemplate from './wxParseTemplate2';
+import wxParseImg from './wxParseImg';
+import wxParseVideo from './wxParseVideo';
+import wxParseAudio from './wxParseAudio';
+
+export default {
+  name: 'wxParseTemplate1',
+  props: {
+    node: {}
+  },
+  components: {
+    wxParseTemplate,
+    wxParseImg,
+    wxParseVideo,
+    wxParseAudio
+  },
+  methods: {
+    wxParseATap(e) {
+      const { href } = e.currentTarget.dataset;
+      if (!href) return;
+      let parent = this.$parent;
+      while (!parent.preview || typeof parent.preview !== 'function') {
+        parent = parent.$parent;
+      }
+      parent.navigate(href, e);
+    }
+  }
+};
+</script>