@10yun/cv-mobile-ui 0.5.20 → 0.5.22

package/package.json

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

package/plugins/jumps.js

@@ -36,9 +36,10 @@ class JumpsClass {
     this.page_my = options.page_my || '';
     this.page_home = options.page_home || '';
     this.page_login = options.page_login;
+    this.page_xieyi = options.page_xieyi;
     this.storeHandle = options.storeHandle;
   }
-  jumpsPage(url, urlPm, time) {
+  jumpsPage = (url, urlPm, time) => {
     url = url || '';
     let jumpUrl = doJumpUrl(url);
     if (jumpUrl == '') {
@@ -64,8 +65,9 @@ class JumpsClass {
         }
       });
     }, time);
-  }
-  jumpsAuth(jumpUrl, urlPm, time) {
+  };
+
+  jumpsAuth = (jumpUrl, urlPm, time) => {
     jumpUrl = jumpUrl || '';
     if (jumpUrl == '') {
       uni.showToast({
@@ -82,8 +84,8 @@ class JumpsClass {
         this.jumpsPage(jumpUrl, urlPm, time);
       }
     }
-  }
-  jumpsLogin() {
+  };
+  jumpsLogin = () => {
     uni.showModal({
       content: '您还未登录，请前往登录',
       showCancel: false,
@@ -95,24 +97,67 @@ class JumpsClass {
         }
       }
     });
-  }
+  };
   // 跳转到用户页
-  jumpsMy(time) {
+  jumpsMy = (time) => {
     this.jumpsPage(this.page_my, time);
-  }
+  };
   // 跳转到主页
-  jumpsHome(time) {
+  jumpsHome = (time) => {
     this.jumpsPage(this.page_home, time);
-  }
+  };
+  /**
+   * 跳转协议
+   * @param {*} name
+   */
+  jumpsXieyi = (name) => {
+    this.jumpsPage(this.page_xieyi, {
+      // 'no': 'XY003',
+      title: name
+    });
+  };
   // 上一个页面
-  jumpsPre() {
+  jumpsPre = () => {
     let pages = getCurrentPages();
     let prePage = pages[pages.length - 2];
     // #ifdef H5
     return prePage;
     // #endif
     return prePage.$vm;
-  }
+  };
+  /**
+   * 返回页面
+   * @param {*} name
+   */
+  jumpsBack = (jumpUrl, time) => {
+    time = time || 1000;
+    let pages = getCurrentPages(); //页面栈
+    let prePage = pages[pages.length - 2]; //上一页
+    prePage.$vm.reFresh = Math.random(); //触发上一页监听器
+    setTimeout(() => {
+      uni.navigateBack(); //返回上一页
+    }, time);
+  };
 }
+export const useBindPlugin = (bindInstance, options) => {
+  const jumpsObj = new JumpsClass(options);
+
+  bindInstance.cv__jumpPage = jumpsObj.jumpsPage;
+  bindInstance.cv__jumpAuth = jumpsObj.jumpsAuth;
+  bindInstance.cv__jumpHome = jumpsObj.jumpsHome;
+  bindInstance.cv__jumpMy = jumpsObj.jumpsMy;
+  bindInstance.cv__jumpLogin = jumpsObj.jumpsLogin;
+  bindInstance.cv__jumpXieyi = jumpsObj.jumpsXieyi;
+  bindInstance.cv__jumpPre = jumpsObj.jumpsPre;
+  bindInstance.cv__jumpBack = jumpsObj.jumpsBack;
 
+  uni.cv__jumpPage = jumpsObj.jumpsPage;
+  uni.cv__jumpAuth = jumpsObj.jumpsAuth;
+  uni.cv__jumpHome = jumpsObj.jumpsHome;
+  uni.cv__jumpMy = jumpsObj.jumpsMy;
+  uni.cv__jumpLogin = jumpsObj.jumpsLogin;
+  uni.cv__jumpXieyi = jumpsObj.jumpsXieyi;
+  uni.cv__jumpPre = jumpsObj.jumpsPre;
+  uni.cv__jumpBack = jumpsObj.jumpsBack;
+};
 export default JumpsClass;

package/plugins/lbs.js

@@ -132,9 +132,10 @@ class LbsClass {
    *
    * @return {Object}
    */
-  getLocation(ip = '') {
+  getLocation = (ip = '') => {
+    const _self = this;
     return new Promise((resolve, reject) => {
-      if (!this._KEY_) {
+      if (!_self._KEY_) {
         reject('请先设置Key');
         console.error('请先设置Key');
         return false;
@@ -143,9 +144,9 @@ class LbsClass {
       if (ip) {
         formData.ip = ip;
       }
-      formData.key = this._KEY_;
+      formData.key = _self._KEY_;
 
-      if (this._TYPE_ == 'qq') {
+      if (_self._TYPE_ == 'qq') {
         formData.output = 'json';
         uni.request({
           url: '/tx_apis_map' + '/ws/location/v1/ip/',
@@ -173,7 +174,7 @@ class LbsClass {
             reject(error);
           }
         });
-      } else if (this._TYPE_ == 'amap') {
+      } else if (_self._TYPE_ == 'amap') {
         formData.output = 'JSON';
         /* 高德地图 */
         uni.request({
@@ -222,13 +223,13 @@ class LbsClass {
         });
       }
     });
-  }
+  };
   /**
    * 获取全部行政区划数据。该请求为GET请求。
    *
    * @return {Object}
    */
-  getDistrict(keyword = '') {
+  getDistrict = (keyword = '') => {
     return new Promise((resolve, reject) => {
       if (!this._KEY_) {
         reject('请先设置Key');
@@ -286,6 +287,14 @@ class LbsClass {
         });
       }
     });
-  }
+  };
+}
+
+export function useBindPlugin(bindInstance, options) {
+  const LbsObj = new LbsClass(options);
+
+  bindInstance.cv__lbsGetLocation = LbsObj.getLocation;
+
+  uni.cv__lbsGetLocation = LbsObj.getLocation;
 }
 export default LbsClass;

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: {

package/uni-ui/lib/uni-badge/uni-badge.vue

@@ -1 +1,150 @@
-<template>
  <view class="uni-badge--x">
    <slot />
    <text v-if="text" :class="classNames" :style="[positionStyle, customStyle, dotStyle]" class="uni-badge" @click="onClick()">
      {{ displayValue }}
    </text>
  </view>
 * Badge 数字角标
 * @description 数字角标一般和其它控件（列表、9宫格等）配合使用，用于进行数量提示，默认为实心灰色背景
 * @tutorial https://ext.dcloud.net.cn/plugin?id=21
 * @property {String} text 角标内容
 * @property {String} size = [normal|small] 角标内容
 * @property {String} type = [info|primary|success|warning|error] 颜色类型
 * 	@value info 灰色
 * 	@value primary 蓝色
 * 	@value success 绿色
 * 	@value warning 黄色
 * 	@value error 红色
 * @property {String} inverted = [true|false] 是否无需背景颜色
 * @property {Number} maxNum 展示封顶的数字值，超过 99 显示 99+
 * @property {String} absolute = [rightTop|rightBottom|leftBottom|leftTop] 开启绝对定位, 角标将定位到其包裹的标签的四角上
 * 	@value rightTop 右上
 * 	@value rightBottom 右下
 * 	@value leftTop 左上
 * 	@value leftBottom 左下
 * @property {Array[number]} offset	距定位角中心点的偏移量，只有存在 absolute 属性时有效，例如：[-10, -10] 表示向外偏移 10px，[10, 10] 表示向 absolute 指定的内偏移 10px
 * @property {String} isDot = [true|false] 是否显示为一个小点
 * @event {Function} click 点击 Badge 触发事件
 * @example <uni-badge text="1"></uni-badge>
 */
  name: 'UniBadge',
  emits: ['click'],
  props: {
    type: {
      type: String,
      default: 'error'
    },
    inverted: {
      type: Boolean,
      default: false
    },
    isDot: {
      type: Boolean,
      default: false
    },
    maxNum: {
      type: Number,
      default: 99
    },
    absolute: {
      type: String,
      default: ''
    },
    offset: {
      type: Array,
      default() {
        return [0, 0];
      }
    },
    text: {
      type: [String, Number],
      default: ''
    },
    size: {
      type: String,
      default: 'small'
    },
    customStyle: {
      type: Object,
      default() {
        return {};
      }
    }
  },
  data() {
    return {};
  },
  computed: {
    width() {
      return String(this.text).length * 8 + 12;
    },
    classNames() {
      const { inverted, type, size, absolute } = this;
      return [
        inverted ? 'uni-badge--' + type + '-inverted' : '',
        'uni-badge--' + type,
        'uni-badge--' + size,
        absolute ? 'uni-badge--absolute' : ''
      ].join(' ');
    },
    positionStyle() {
      if (!this.absolute) return {};
      let w = this.width / 2,
        h = 10;
      if (this.isDot) {
        w = 5;
        h = 5;
      }
      const x = `${-w + this.offset[0]}px`;
      const y = `${-h + this.offset[1]}px`;
      const whiteList = {
        rightTop: {
          right: x,
          top: y
        },
        rightBottom: {
          right: x,
          bottom: y
        },
        leftBottom: {
          left: x,
          bottom: y
        },
        leftTop: {
          left: x,
          top: y
        }
      };
      const match = whiteList[this.absolute];
      return match ? match : whiteList['rightTop'];
    },
    dotStyle() {
      if (!this.isDot) return {};
      return {
        width: '10px',
        minWidth: '0',
        height: '10px',
        padding: '0',
        borderRadius: '10px'
      };
    },
    displayValue() {
      const { isDot, text, maxNum } = this;
      return isDot ? '' : Number(text) > maxNum ? `${maxNum}+` : text;
    }
  },
  methods: {
    onClick() {
      this.$emit('click');
    }
  }
+<template>
+  <view class="uni-badge--x">
+    <slot />
+    <text v-if="text" :class="classNames" :style="[positionStyle, customStyle, dotStyle]" class="uni-badge" @click="onClick()">
+      {{ displayValue }}
+    </text>
+  </view>
+</template>
+<script>
+/**
+ * Badge 数字角标
+ * @description 数字角标一般和其它控件（列表、9宫格等）配合使用，用于进行数量提示，默认为实心灰色背景
+ * @tutorial https://ext.dcloud.net.cn/plugin?id=21
+ * @property {String} text 角标内容
+ * @property {String} size = [normal|small] 角标内容
+ * @property {String} type = [info|primary|success|warning|error] 颜色类型
+ * 	@value info 灰色
+ * 	@value primary 蓝色
+ * 	@value success 绿色
+ * 	@value warning 黄色
+ * 	@value error 红色
+ * @property {String} inverted = [true|false] 是否无需背景颜色
+ * @property {Number} maxNum 展示封顶的数字值，超过 99 显示 99+
+ * @property {String} absolute = [rightTop|rightBottom|leftBottom|leftTop] 开启绝对定位, 角标将定位到其包裹的标签的四角上
+ * 	@value rightTop 右上
+ * 	@value rightBottom 右下
+ * 	@value leftTop 左上
+ * 	@value leftBottom 左下
+ * @property {Array[number]} offset	距定位角中心点的偏移量，只有存在 absolute 属性时有效，例如：[-10, -10] 表示向外偏移 10px，[10, 10] 表示向 absolute 指定的内偏移 10px
+ * @property {String} isDot = [true|false] 是否显示为一个小点
+ * @event {Function} click 点击 Badge 触发事件
+ * @example <uni-badge text="1"></uni-badge>
+ */
+export default {
+  name: 'UniBadge',
+  emits: ['click'],
+  props: {
+    type: {
+      type: String,
+      default: 'error'
+    },
+    inverted: {
+      type: Boolean,
+      default: false
+    },
+    isDot: {
+      type: Boolean,
+      default: false
+    },
+    maxNum: {
+      type: Number,
+      default: 99
+    },
+    absolute: {
+      type: String,
+      default: ''
+    },
+    offset: {
+      type: Array,
+      default() {
+        return [0, 0];
+      }
+    },
+    text: {
+      type: [String, Number],
+      default: ''
+    },
+    size: {
+      type: String,
+      default: 'small'
+    },
+    customStyle: {
+      type: Object,
+      default() {
+        return {};
+      }
+    }
+  },
+  data() {
+    return {};
+  },
+  computed: {
+    width() {
+      return String(this.text).length * 8 + 12;
+    },
+    classNames() {
+      const { inverted, type, size, absolute } = this;
+      return [
+        inverted ? 'uni-badge--' + type + '-inverted' : '',
+        'uni-badge--' + type,
+        'uni-badge--' + size,
+        absolute ? 'uni-badge--absolute' : ''
+      ].join(' ');
+    },
+    positionStyle() {
+      if (!this.absolute) return {};
+      let w = this.width / 2,
+        h = 10;
+      if (this.isDot) {
+        w = 5;
+        h = 5;
+      }
+      const x = `${-w + this.offset[0]}px`;
+      const y = `${-h + this.offset[1]}px`;
+      const whiteList = {
+        rightTop: {
+          right: x,
+          top: y
+        },
+        rightBottom: {
+          right: x,
+          bottom: y
+        },
+        leftBottom: {
+          left: x,
+          bottom: y
+        },
+        leftTop: {
+          left: x,
+          top: y
+        }
+      };
+      const match = whiteList[this.absolute];
+      return match ? match : whiteList['rightTop'];
+    },
+    dotStyle() {
+      if (!this.isDot) return {};
+      return {
+        width: '10px',
+        minWidth: '0',
+        height: '10px',
+        padding: '0',
+        borderRadius: '10px'
+      };
+    },
+    displayValue() {
+      const { isDot, text, maxNum } = this;
+      return isDot ? '' : Number(text) > maxNum ? `${maxNum}+` : text;
+    }
+  },
+  methods: {
+    onClick() {
+      this.$emit('click');
+    }
+  }
+};
+</script>
+<style>
+@import 'style.css';
+</style>

package/uni-ui/lib/uni-breadcrumb/uni-breadcrumb.vue

@@ -1 +1,37 @@
-<template>
  <view class="uni-breadcrumb">
    <slot />
  </view>
 * Breadcrumb 面包屑导航父组件
 * @description 显示当前页面的路径，快速返回之前的任意页面
 * @tutorial https://ext.dcloud.net.cn/plugin?id=xxx
 * @property {String} separator 分隔符，默认为斜杠'/'
 * @property {String} separatorClass 图标分隔符 class
 */
  options: {
    virtualHost: true
  },
  props: {
    separator: {
      type: String,
      default: '/'
    },
    separatorClass: {
      type: String,
      default: ''
    }
  },
  provide() {
    return {
      uniBreadcrumb: this
    };
  }
+<template>
+  <view class="uni-breadcrumb">
+    <slot />
+  </view>
+</template>
+<script>
+/**
+ * Breadcrumb 面包屑导航父组件
+ * @description 显示当前页面的路径，快速返回之前的任意页面
+ * @tutorial https://ext.dcloud.net.cn/plugin?id=xxx
+ * @property {String} separator 分隔符，默认为斜杠'/'
+ * @property {String} separatorClass 图标分隔符 class
+ */
+export default {
+  options: {
+    virtualHost: true
+  },
+  props: {
+    separator: {
+      type: String,
+      default: '/'
+    },
+    separatorClass: {
+      type: String,
+      default: ''
+    }
+  },
+  provide() {
+    return {
+      uniBreadcrumb: this
+    };
+  }
+};
+</script>
+<style>
+@import 'style.css';
+</style>

package/uni-ui/lib/uni-breadcrumb-item/uni-breadcrumb-item.vue

@@ -1 +1,83 @@
-<template>
  <view class="uni-breadcrumb-item">
    <view
      :class="{
        'uni-breadcrumb-item--slot': true,
        'uni-breadcrumb-item--slot-link': to && currentPage !== to
      }"
      @click="navTo"
    >
      <slot />
    </view>
    <i v-if="separatorClass" class="uni-breadcrumb-item--separator" :class="separatorClass" />
    <text v-else class="uni-breadcrumb-item--separator">{{ separator }}</text>
  </view>
 * BreadcrumbItem 面包屑导航子组件
 * @property {String/Object} to 路由跳转页面路径/对象
 * @property {Boolean} replace 在使用 to 进行路由跳转时，启用 replace 将不会向 history 添加新记录(仅 h5 支持）
 */
  data() {
    return {
      currentPage: ''
    };
  },
  options: {
    virtualHost: true
  },
  props: {
    to: {
      type: String,
      default: ''
    },
    replace: {
      type: Boolean,
      default: false
    }
  },
  inject: {
    uniBreadcrumb: {
      from: 'uniBreadcrumb',
      default: null
    }
  },
  created() {
    const pages = getCurrentPages();
    const page = pages[pages.length - 1];
    if (page) {
      this.currentPage = `/${page.route}`;
    }
  },
  computed: {
    separator() {
      return this.uniBreadcrumb.separator;
    },
    separatorClass() {
      return this.uniBreadcrumb.separatorClass;
    }
  },
  methods: {
    navTo() {
      const { to } = this;
      if (!to || this.currentPage === to) {
        return;
      }
      if (this.replace) {
        uni.redirectTo({
          url: to
        });
      } else {
        uni.navigateTo({
          url: to
        });
      }
    }
  }
+<template>
+  <view class="uni-breadcrumb-item">
+    <view
+      :class="{
+        'uni-breadcrumb-item--slot': true,
+        'uni-breadcrumb-item--slot-link': to && currentPage !== to
+      }"
+      @click="navTo"
+    >
+      <slot />
+    </view>
+    <i v-if="separatorClass" class="uni-breadcrumb-item--separator" :class="separatorClass" />
+    <text v-else class="uni-breadcrumb-item--separator">{{ separator }}</text>
+  </view>
+</template>
+<script>
+/**
+ * BreadcrumbItem 面包屑导航子组件
+ * @property {String/Object} to 路由跳转页面路径/对象
+ * @property {Boolean} replace 在使用 to 进行路由跳转时，启用 replace 将不会向 history 添加新记录(仅 h5 支持）
+ */
+export default {
+  data() {
+    return {
+      currentPage: ''
+    };
+  },
+  options: {
+    virtualHost: true
+  },
+  props: {
+    to: {
+      type: String,
+      default: ''
+    },
+    replace: {
+      type: Boolean,
+      default: false
+    }
+  },
+  inject: {
+    uniBreadcrumb: {
+      from: 'uniBreadcrumb',
+      default: null
+    }
+  },
+  created() {
+    const pages = getCurrentPages();
+    const page = pages[pages.length - 1];
+    if (page) {
+      this.currentPage = `/${page.route}`;
+    }
+  },
+  computed: {
+    separator() {
+      return this.uniBreadcrumb.separator;
+    },
+    separatorClass() {
+      return this.uniBreadcrumb.separatorClass;
+    }
+  },
+  methods: {
+    navTo() {
+      const { to } = this;
+      if (!to || this.currentPage === to) {
+        return;
+      }
+      if (this.replace) {
+        uni.redirectTo({
+          url: to
+        });
+      } else {
+        uni.navigateTo({
+          url: to
+        });
+      }
+    }
+  }
+};
+</script>
+<style>
+@import 'style.css';
+</style>