@10yun/cv-mobile-ui 0.5.19 → 0.5.21

package/other/uParse/wxParse.vue

@@ -0,0 +1,196 @@
+<!--**
+ * forked from：https://github.com/F-loat/mpvue-wxParse
+ *
+ * github地址: https://github.com/dcloudio/uParse
+ *
+ * uni-app框架下 富文本解析
+ * 
+ */-->
+<template>
+  <!--基础元素-->
+  <div class="wxParse" :class="className" :style="'user-select:' + userSelect" v-if="!loading">
+    <block v-for="(node, index) of nodes" :key="index">
+      <wxParseTemplate :node="node" />
+    </block>
+  </div>
+</template>
+<script>
+import HtmlToJson from './libs/html2json';
+import wxParseTemplate from './components/wxParseTemplate0';
+export default {
+  name: 'wxParse',
+  props: {
+    // user-select:none;
+    userSelect: {
+      type: String,
+      default: 'none' //none |text| all | element
+    },
+    imgOptions: {
+      type: [Object, Boolean],
+      default: function () {
+        return {
+          loop: false,
+          indicator: 'number',
+          longPressActions: false
+        };
+      }
+    },
+    loading: {
+      type: Boolean,
+      default: false
+    },
+    className: {
+      type: String,
+      default: ''
+    },
+    content: {
+      type: String,
+      default: ''
+    },
+    noData: {
+      type: String,
+      default: ''
+    },
+    startHandler: {
+      type: Function,
+      default() {
+        return (node) => {
+          node.attr.class = null;
+          node.attr.style = null;
+        };
+      }
+    },
+    endHandler: {
+      type: Function,
+      default: null
+    },
+    charsHandler: {
+      type: Function,
+      default: null
+    },
+    imageProp: {
+      type: Object,
+      default() {
+        return {
+          mode: 'aspectFit',
+          padding: 0,
+          lazyLoad: false,
+          domain: ''
+        };
+      }
+    }
+  },
+  components: {
+    wxParseTemplate
+  },
+  data() {
+    return {
+      nodes: {},
+      imageUrls: [],
+      wxParseWidth: {
+        value: 0
+      }
+    };
+  },
+  computed: {},
+  mounted() {
+    this.setHtml();
+  },
+  methods: {
+    setHtml() {
+      this.getWidth().then((data) => {
+        this.wxParseWidth.value = data;
+      });
+      let { content, noData, imageProp, startHandler, endHandler, charsHandler } = this;
+      let parseData = content || noData;
+      let customHandler = {
+        start: startHandler,
+        end: endHandler,
+        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);
+      });
+    },
+    getWidth() {
+      return new Promise((res, rej) => {
+        // #ifndef MP-ALIPAY || MP-BAIDU
+        uni
+          .createSelectorQuery()
+          .in(this)
+          .select('.wxParse')
+          .fields(
+            {
+              size: true,
+              scrollOffset: true
+            },
+            (data) => {
+              res(data.width);
+            }
+          )
+          .exec();
+        // #endif
+        // #ifdef MP-BAIDU
+        return new Promise((res, rej) => {
+          swan
+            .createSelectorQuery()
+            .select('.wxParse')
+            .boundingClientRect(function (rect) {
+              res(rect.width);
+            })
+            .exec();
+        });
+        // #endif
+        // #ifdef MP-ALIPAY
+        my.createSelectorQuery()
+          .select('.wxParse')
+          .boundingClientRect()
+          .exec((ret) => {
+            res(ret[0].width);
+          });
+        // #endif
+      });
+    },
+    navigate(href, $event, attr) {
+      console.log(href, attr);
+      this.$emit('navigate', href, $event);
+    },
+    preview(src, $event) {
+      if (!this.imageUrls.length || typeof this.imgOptions === 'boolean') {
+      } else {
+        uni.previewImage({
+          current: src,
+          urls: this.imageUrls,
+          loop: this.imgOptions.loop,
+          indicator: this.imgOptions.indicator,
+          longPressActions: this.imgOptions.longPressActions
+        });
+      }
+      this.$emit('preview', src, $event);
+    },
+    removeImageUrl(src) {
+      const { imageUrls } = this;
+      imageUrls.splice(imageUrls.indexOf(src), 1);
+    }
+  },
+  // 父组件中提供
+  provide() {
+    return {
+      parseWidth: this.wxParseWidth,
+      parseSelect: this.userSelect
+      // 提示：provide 和 inject 绑定并不是可响应的。这是刻意为之的。然而，如果你传入了一个可监听的对象，那么其对象的属性还是可响应的。
+    };
+  },
+  watch: {
+    content() {
+      this.setHtml();
+    }
+  }
+};
+</script>

package/package.json

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

package/plugins/map/amqp-wx.js

@@ -0,0 +1,173 @@
+import amap from './lib/amap-wx.js';
+// 地铁颜色图
+const line = {
+  '1号线': '#C43B33',
+  '2号线': '#016299',
+  '4号线/大兴线': '#008E9C',
+  '5号线': '#A42380',
+  '6号线': '#D09900',
+  '7号线': '#F2C172',
+  '8号线': '#009D6A',
+  '9号线': '#8FC41E',
+  '10号线': '#009DBE',
+  '13号线': '#F9E701',
+  '14号线东段': '#D4A7A2',
+  '14号线西段': '#D4A7A2',
+  '15号线': '#5D2D69',
+  八通线: '#C33A32',
+  昌平线: '#DE82B1',
+  亦庄线: '#E40177',
+  房山线: '#E66021',
+  机场线: '#A29BBC'
+};
+
+// 150500:地铁站 ,150700:公交站 , 190700:地名地址
+const typecode = [
+  {
+    id: '150500',
+    icon: 'icon-ditie'
+  },
+  {
+    id: '150700',
+    icon: 'icon-gongjiao'
+  },
+  {
+    id: '190700',
+    icon: 'icon-gonglu'
+  }
+];
+
+const util = {
+  key: 'b526b09b86cd2996e7732be8ab8c4430',
+  /**
+   * 初始化高德地图api
+   */
+  mapInit() {
+    return new amap.AMapWX({
+      key: this.key
+    });
+  },
+  // 服务状态吗
+  typecode,
+  /**
+   * 获取地图颜色
+   */
+  lineColor(name) {
+    if (line[name]) {
+      return line[name];
+    } else {
+      return '#ccc';
+    }
+  },
+  /**
+   * 关键字颜色变化
+   */
+  serachNmme(val, name) {
+    let namestr = new RegExp(val);
+    let nameresult = `<div style="font-size: 14px;color: #333;line-height: 1.5;">
+		    ${name.replace(namestr, "<span style='color:#66ccff;'>" + val + '</span>')}
+		    </div>`.trim();
+
+    return nameresult;
+  },
+  /**
+   *  地址转地铁线路
+   */
+  addressToLine(address, type) {
+    let addr = address.split(';');
+    let dt = '';
+    addr.forEach((elm) => {
+      let color = '#cccccc';
+      if (type === typecode[0].id) {
+        color = this.lineColor(elm);
+      } else if (type === typecode[1].id) {
+        color = '#4075cb';
+      }
+      let style =
+        'margin:5px 0;margin-right:5px;padding:0 5px;background:' + color + ';font-size:12px;color:#fff;border-radius:3px;';
+      dt += `<div style=\'${style}\'>${elm}</div>`;
+    });
+    return `<div style="display:flex;flex-wrap: wrap;">${dt}</div>`;
+  },
+  /**
+   * 数据处理
+   */
+  dataHandle(item, val) {
+    // 改变字体颜色
+    if (val) {
+      item.nameNodes = util.serachNmme(val, item.name);
+    } else {
+      item.nameNodes = `<div style="font-size: 14px;color: #333;line-height: 1.5;">${item.name}</div>`;
+    }
+    // 地址解析 地铁
+    if (item.typecode === util.typecode[0].id || item.typecode === util.typecode[1].id) {
+      item.addressNodes = util.addressToLine(item.address, item.typecode);
+      if (item.typecode === util.typecode[0].id) {
+        item.icon = util.typecode[0].icon;
+      } else if (item.typecode === util.typecode[1].id) {
+        item.icon = util.typecode[1].icon;
+      }
+    } else {
+      item.addressNodes = `<span>${item.district}${item.address.length > 0 ? '·' + item.address : ''}</span>`.trim();
+      item.icon = 'icon-weizhi';
+    }
+
+    if (item.location && item.location.length === 0) {
+      item.icon = 'icon-sousuo';
+    }
+
+    return item;
+  },
+  /**
+   * 存储历史数据
+   * val [string | object]需要存储的内容
+   */
+  setHistory(val) {
+    let searchHistory = uni.getStorageSync('search:history');
+    if (!searchHistory) searchHistory = [];
+    let serachData = {};
+    if (typeof val === 'string') {
+      serachData = {
+        adcode: [],
+        address: [],
+        city: [],
+        district: [],
+        id: [],
+        location: [],
+        name: val,
+        typecode: []
+      };
+    } else {
+      serachData = val;
+    }
+
+    // 判断数组是否存在，如果存在，那么将放到最前面
+    for (var i = 0; i < searchHistory.length; i++) {
+      if (searchHistory[i].name === serachData.name) {
+        searchHistory.splice(i, 1);
+        break;
+      }
+    }
+
+    searchHistory.unshift(util.dataHandle(serachData));
+    uni.setStorage({
+      key: 'search:history',
+      data: searchHistory,
+      success: function () {
+        // console.log('success');
+      }
+    });
+  },
+  getHistory() {},
+  removeHistory() {
+    uni.removeStorage({
+      key: 'search:history',
+      success: function (res) {
+        console.log('success');
+      }
+    });
+    return [];
+  }
+};
+
+export default util;

package/{uni-ui/lib/mpvueGestureLock/index.vue → ui-cv/components/cv-draw-gesture-lock/cv-draw-gesture-lock.vue}

@@ -48,8 +48,11 @@
 </template>
 <script>
 import GestureLock from './gestureLock';
+import mpMixin from '../../libs/mixin/mpMixin.js';
+import mixin from '../../libs/mixin/mixin.js';
 export default {
-  name: 'index',
+  mixins: [mpMixin, mixin],
+  name: 'cvDrawGestureLock',
   props: {
     /**
      * 容器宽度

package/ui-cv/components/cv-draw-gesture-lock/gestureLock.js

@@ -0,0 +1,169 @@
+class GestureLock {
+  constructor(containerWidth, cycleRadius) {
+    this.containerWidth = containerWidth; // 容器宽度
+    this.cycleRadius = cycleRadius; // 圆的半径
+
+    this.circleArray = []; // 全部圆的对象数组
+    this.checkPoints = []; // 选中的圆的对象数组
+    this.lineArray = []; // 已激活锁之间的线段数组
+    this.lastCheckPoint = 0; // 最后一个激活的锁
+    this.offsetX = 0; // 容器的 X 偏移
+    this.offsetY = 0; // 容器的 Y 偏移
+    this.activeLine = {}; // 最后一个激活的锁与当前位置之间的线段
+
+    this.windowWidth = wx.getSystemInfoSync().windowWidth; // 窗口大小(用于rpx 和 px 转换)
+
+    this.initCircleArray();
+  }
+
+  // 初始化 画布上的 9个圆
+  initCircleArray() {
+    const cycleMargin = (this.containerWidth - 6 * this.cycleRadius) / 6;
+    let count = 0;
+    for (let i = 0; i < 3; i++) {
+      for (let j = 0; j < 3; j++) {
+        count++;
+        this.circleArray.push({
+          count: count,
+          x: this.rpxTopx((cycleMargin + this.cycleRadius) * (j * 2 + 1)),
+          y: this.rpxTopx((cycleMargin + this.cycleRadius) * (i * 2 + 1)),
+          radius: this.rpxTopx(this.cycleRadius),
+          check: false,
+          style: {
+            left: (cycleMargin + this.cycleRadius) * (j * 2 + 1) - this.cycleRadius + 'rpx',
+            top: (cycleMargin + this.cycleRadius) * (i * 2 + 1) - this.cycleRadius + 'rpx',
+            width: this.cycleRadius * 2 + 'rpx'
+          }
+        });
+      }
+    }
+  }
+
+  onTouchStart(e) {
+    this.setOffset(e);
+    this.checkTouch({
+      x: e.touches[0].pageX - this.offsetX,
+      y: e.touches[0].pageY - this.offsetY
+    });
+  }
+
+  onTouchMove(e) {
+    this.moveDraw(e);
+  }
+
+  onTouchEnd(e) {
+    const checkPoints = this.checkPoints;
+    this.reset();
+    return checkPoints;
+  }
+
+  // 初始化 偏移量
+  setOffset(e) {
+    this.offsetX = e.currentTarget.offsetLeft;
+    this.offsetY = e.currentTarget.offsetTop;
+  }
+
+  // 检测当时 触摸位置是否位于 锁上
+  checkTouch({ x, y }) {
+    for (let i = 0; i < this.circleArray.length; i++) {
+      let point = this.circleArray[i];
+      if (this.isPointInCycle(x, y, point.x, point.y, point.radius)) {
+        if (!point.check) {
+          this.checkPoints.push(point.count);
+          if (this.lastCheckPoint != 0) {
+            // 已激活锁之间的线段
+            const line = this.drawLine(this.lastCheckPoint, point);
+            this.lineArray.push(line);
+          }
+          this.lastCheckPoint = point;
+        }
+        point.check = true;
+        return;
+      }
+    }
+  }
+
+  // 画线 - 返回 样式 对象
+  drawLine(start, end) {
+    const width = this.getPointDis(start.x, start.y, end.x, end.y);
+    const rotate = this.getAngle(start, end);
+
+    return {
+      activeLeft: start.x + 'px',
+      activeTop: start.y + 'px',
+      activeWidth: width + 'px',
+      activeRotate: rotate + 'deg'
+    };
+  }
+
+  // 获取 画线的 角度
+  getAngle(start, end) {
+    var diff_x = end.x - start.x,
+      diff_y = end.y - start.y;
+    if (diff_x >= 0) {
+      return (360 * Math.atan(diff_y / diff_x)) / (2 * Math.PI);
+    } else {
+      return 180 + (360 * Math.atan(diff_y / diff_x)) / (2 * Math.PI);
+    }
+  }
+
+  // 判断 当前点是否位于 锁内
+  isPointInCycle(x, y, circleX, circleY, radius) {
+    return this.getPointDis(x, y, circleX, circleY) < radius ? true : false;
+  }
+
+  // 获取两点之间距离
+  getPointDis(ax, ay, bx, by) {
+    return Math.sqrt(Math.pow(ax - bx, 2) + Math.pow(ay - by, 2));
+  }
+
+  // 移动 绘制
+  moveDraw(e) {
+    // 画经过的圆
+    const x = e.touches[0].pageX - this.offsetX;
+    const y = e.touches[0].pageY - this.offsetY;
+    this.checkTouch({
+      x,
+      y
+    });
+
+    // 画 最后一个激活的锁与当前位置之间的线段
+    this.activeLine = this.drawLine(this.lastCheckPoint, {
+      x,
+      y
+    });
+  }
+
+  // 使 画布 恢复初始状态
+  reset() {
+    this.circleArray.forEach((item) => {
+      item.check = false;
+    });
+    this.checkPoints = [];
+    this.lineArray = [];
+    this.activeLine = {};
+    this.lastCheckPoint = 0;
+  }
+
+  // 获取 最后一个激活的锁与当前位置之间的线段
+  getActiveLine() {
+    return this.activeLine;
+  }
+
+  // 获取 圆对象数组
+  getCycleArray() {
+    return this.circleArray;
+  }
+
+  // 获取 已激活锁之间的线段
+  getLineArray() {
+    return this.lineArray;
+  }
+
+  // 将 RPX 转换成 PX
+  rpxTopx(rpx) {
+    return (rpx / 750) * this.windowWidth;
+  }
+}
+
+export default GestureLock;

package/{uni-ui/lib/mpvueGestureLock → ui-cv/components/cv-draw-gesture-lock}/style.css

@@ -1,4 +1,3 @@
-
 .gesture-lock {
   margin: 0 auto;
   position: relative;

package/{uni-ui/lib/mpvue-citypicker → ui-cv/components/cv-geo-region}/style.css

@@ -1,4 +1,3 @@
-
 .pickerMask {
   position: fixed;
   z-index: 1000;

package/ui-cv/components/cv-grid-item/cv-grid-item.vue

@@ -19,7 +19,7 @@ import mpMixin from '../../libs/mixin/mpMixin.js';
 import mixin from '../../libs/mixin/mixin.js';
 export default {
   mixins: [mpMixin, mixin],
-  name: 'cvNavCol',
+  name: 'cvGridItem',
   emits: ['click'],
   inject: {
     cvGroupCol: {