@10yun/cv-mobile-ui 0.5.44 → 0.5.45

package/uview-plus/components/u-cate-tab/u-cate-tab.vue

@@ -1,3 +1,3 @@
-<template>
  <view class="u-cate-tab">
    <view class="u-cate-tab__wrap">
      <scroll-view
        class="u-cate-tab__view u-cate-tab__menu-scroll-view"
        scroll-y
        scroll-with-animation
        :scroll-top="scrollTop"
        :scroll-into-view="itemId"
      >
        <view
          v-for="(item, index) in tabList"
          :key="index"
          class="u-cate-tab__item"
          :class="[innerCurrent == index ? 'u-cate-tab__item-active' : '']"
          @tap.stop="swichMenu(index)"
        >
          <slot name="tabItem" :item="item"></slot>
          <text v-if="!$slots['tabItem']" class="u-line-1">{{ item[tabKeyName] }}</text>
        </view>
      </scroll-view>
      <scroll-view
        :scroll-top="scrollRightTop"
        scroll-with-animation
        scroll-y
        class="u-cate-tab__right-box"
        @scroll="rightScroll"
      >
        <view class="u-cate-tab__page-view">
          <view class="u-cate-tab__page-item" :id="'item' + index" v-for="(item, index) in tabList" :key="index">
            <slot name="itemList" :item="item"></slot>
            <template v-if="!$slots['itemList']">
              <view class="item-title">
                <text>{{ item[tabKeyName] }}</text>
              </view>
              <view class="item-container">
                <template v-for="(item1, index1) in item.children" :key="index1">
                  <slot name="pageItem" :pageItem="item1">
                    <view class="thumb-box">
                      <image class="item-menu-image" :src="item1.icon" mode=""></image>
                      <view class="item-menu-name">{{ item1[itemKeyName] }}</view>
                    </view>
                  </slot>
                </template>
              </view>
            </template>
          </view>
        </view>
      </scroll-view>
    </view>
  </view>
  name: 'up-cate-tab',
  props: {
    tabList: {
      type: Array,
      default: () => {
        return [];
      }
    },
    tabKeyName: {
      type: String,
      default: 'name'
    },
    itemKeyName: {
      type: String,
      default: 'name'
    },
    current: {
      type: Number,
      default: 0
    }
  },
  watch: {
    tabList() {
      this.getMenuItemTop();
    }
  },
  emits: ['update:current'],
  data() {
    return {
      scrollTop: 0, //tab标题的滚动条位置
      oldScrollTop: 0,
      innerCurrent: 0, // 预设当前项的值
      menuHeight: 0, // 左边菜单的高度
      menuItemHeight: 0, // 左边菜单item的高度
      itemId: '', // 栏目右边scroll-view用于滚动的id
      menuItemPos: [],
      rects: [],
      arr: [],
      scrollRightTop: 0, // 右边栏目scroll-view的滚动条高度
      timer: null // 定时器
    };
  },
  onMounted() {
    this.innerCurrent = this.current;
    this.leftMenuStatus(this.innerCurrent);
    this.getMenuItemTop();
  },
  watch: {
    current(nval) {
      this.innerCurrent = nval;
      this.leftMenuStatus(this.innerCurrent);
    }
  },
  methods: {
    // 点击左边的栏目切换
    async swichMenu(index) {
      if (this.arr.length == 0) {
        await this.getMenuItemTop();
      }
      if (index == this.innerCurrent) return;
      this.scrollRightTop = this.oldScrollTop;
      this.$nextTick(function () {
        this.scrollRightTop = this.arr[index];
        this.innerCurrent = index;
        this.leftMenuStatus(index);
        this.$emit('update:current', index);
      });
    },
    // 获取一个目标元素的高度
    getElRect(elClass, dataVal) {
      new Promise((resolve, reject) => {
        const query = uni.createSelectorQuery().in(this);
        query
          .select('.' + elClass)
          .fields(
            {
              size: true
            },
            (res) => {
              // 如果节点尚未生成，res值为null，循环调用执行
              if (!res) {
                setTimeout(() => {
                  this.getElRect(elClass);
                }, 10);
                return;
              }
              this[dataVal] = res.height;
              resolve();
            }
          )
          .exec();
      });
    },
    // 观测元素相交状态
    async observer() {
      this.tabList.map((val, index) => {
        let observer = uni.createIntersectionObserver(this);
        // 检测右边scroll-view的id为itemxx的元素与u-cate-tab__right-box的相交状态
        // 如果跟.u-cate-tab__right-box底部相交，就动态设置左边栏目的活动状态
        observer
          .relativeTo('.u-cate-tab__right-box', {
            top: 0
          })
          .observe('#item' + index, (res) => {
            if (res.intersectionRatio > 0) {
              let id = res.id.substring(4);
              this.leftMenuStatus(id);
            }
          });
      });
    },
    // 设置左边菜单的滚动状态
    async leftMenuStatus(index) {
      this.innerCurrent = index;
      this.$emit('update:current', index);
      // 如果为0，意味着尚未初始化
      if (this.menuHeight == 0 || this.menuItemHeight == 0) {
        await this.getElRect('u-cate-tab__menu-scroll-view', 'menuHeight');
        await this.getElRect('u-cate-tab__item', 'menuItemHeight');
      }
      // 将菜单活动item垂直居中
      this.scrollTop = index * this.menuItemHeight + this.menuItemHeight / 2 - this.menuHeight / 2;
    },
    // 获取右边菜单每个item到顶部的距离
    getMenuItemTop() {
      new Promise((resolve) => {
        let selectorQuery = uni.createSelectorQuery().in(this);
        selectorQuery
          .selectAll('.u-cate-tab__page-item')
          .boundingClientRect((rects) => {
            // 如果节点尚未生成，rects值为[](因为用selectAll，所以返回的是数组)，循环调用执行
            if (!rects.length) {
              setTimeout(() => {
                this.getMenuItemTop();
              }, 10);
              return;
            }
            this.rects = rects;
            rects.forEach((rect) => {
              // 这里减去rects[0].top，是因为第一项顶部可能不是贴到导航栏(比如有个搜索框的情况)
              this.arr.push(rect.top - rects[0].top);
              resolve();
            });
          })
          .exec();
      });
    },
    // 右边菜单滚动
    async rightScroll(e) {
      this.oldScrollTop = e.detail.scrollTop;
      // console.log(e.detail.scrollTop)
      // console.log(JSON.stringify(this.arr))
      if (this.arr.length == 0) {
        await this.getMenuItemTop();
      }
      if (this.timer) return;
      if (!this.menuHeight) {
        await this.getElRect('u-cate-tab__menu-scroll-view', 'menuHeight');
      }
      setTimeout(() => {
        // 节流
        this.timer = null;
        // scrollHeight为右边菜单垂直中点位置
        let scrollHeight = e.detail.scrollTop + 1;
        // console.log(e.detail.scrollTop)
        for (let i = 0; i < this.arr.length; i++) {
          let height1 = this.arr[i];
          let height2 = this.arr[i + 1];
          // console.log('i', i)
          // console.log('height1', height1)
          // console.log('height2', height2)
          // 如果不存在height2，意味着数据循环已经到了最后一个，设置左边菜单为最后一项即可
          if (!height2 || (scrollHeight >= height1 && scrollHeight <= height2)) {
            // console.log('scrollHeight', scrollHeight)
            // console.log('height1', height1)
            // console.log('height2', height2)
            this.leftMenuStatus(i);
            return;
          }
        }
      }, 10);
    }
  }
+<template>
  <view class="u-cate-tab" :style="{ height: addUnit(height) }">
    <view class="u-cate-tab__wrap">
      <scroll-view
        class="u-cate-tab__view u-cate-tab__menu-scroll-view"
        scroll-y
        scroll-with-animation
        :scroll-top="scrollTop"
        :scroll-into-view="itemId"
      >
        <view
          v-for="(item, index) in tabList"
          :key="index"
          class="u-cate-tab__item"
          :class="[innerCurrent == index ? 'u-cate-tab__item-active' : '']"
          @tap.stop="swichMenu(index)"
        >
          <slot name="tabItem" :item="item"></slot>
          <text v-if="!$slots['tabItem']" class="u-line-1">{{ item[tabKeyName] }}</text>
        </view>
      </scroll-view>
      <scroll-view
        :scroll-top="scrollRightTop"
        scroll-with-animation
        :scroll-into-view="scrollIntoView"
        scroll-y
        class="u-cate-tab__right-box"
        @scroll="rightScroll"
      >
        <view class="u-cate-tab__right-top">
          <slot name="rightTop" :tabList="tabList"></slot>
        </view>
        <view class="u-cate-tab__page-view">
          <template :key="index" v-for="(item, index) in tabList">
            <view
              v-if="mode == 'follow' || (mode == 'tab' && index == innerCurrent)"
              class="u-cate-tab__page-item"
              :id="'item' + index"
            >
              <slot name="itemList" :item="item"></slot>
              <template v-if="!$slots['itemList']">
                <view class="item-title">
                  <text>{{ item[tabKeyName] }}</text>
                </view>
                <view class="item-container">
                  <template v-for="(item1, index1) in item.children" :key="index1">
                    <slot name="pageItem" :pageItem="item1">
                      <view class="thumb-box">
                        <image class="item-menu-image" :src="item1.icon" mode=""></image>
                        <view class="item-menu-name">{{ item1[itemKeyName] }}</view>
                      </view>
                    </slot>
                  </template>
                </view>
              </template>
            </view>
          </template>
        </view>
      </scroll-view>
    </view>
  </view>
  name: 'up-cate-tab',
  props: {
    mode: {
      type: String,
      default: 'follow' // follo跟随联动, tab单一显示。
    },
    height: {
      type: String,
      default: '100%'
    },
    tabList: {
      type: Array,
      default: () => {
        return [];
      }
    },
    tabKeyName: {
      type: String,
      default: 'name'
    },
    itemKeyName: {
      type: String,
      default: 'name'
    },
    current: {
      type: Number,
      default: 0
    }
  },
  watch: {
    tabList: {
      deep: true,
      handler(newVal, oldVal) {
        // this.observer();
        sleep(30);
        this.getMenuItemTop();
        this.leftMenuStatus(this.innerCurrent);
      }
    },
    current(nval) {
      this.innerCurrent = nval;
      this.leftMenuStatus(this.innerCurrent);
    },
    height() {
      // console.log('height change');
      this.getMenuItemTop();
      this.leftMenuStatus(this.innerCurrent);
    }
  },
  emits: ['update:current'],
  data() {
    return {
      scrollTop: 0, //tab标题的滚动条位置
      scrollIntoView: '', // 滚动至哪个元素
      oldScrollTop: 0,
      innerCurrent: 0, // 预设当前项的值
      menuHeight: 0, // 左边菜单的高度
      menuItemHeight: 0, // 左边菜单item的高度
      itemId: '', // 栏目右边scroll-view用于滚动的id
      menuItemPos: [],
      rects: [],
      arr: [],
      scrollRightTop: 0, // 右边栏目scroll-view的滚动条高度
      timer: null // 定时器
    };
  },
  mounted() {
    // this.observer();
    this.innerCurrent = this.current;
    this.leftMenuStatus(this.innerCurrent);
    this.getMenuItemTop();
  },
  methods: {
    addUnit,
    // 点击左边的栏目切换
    async swichMenu(index) {
      if (this.mode == 'follow') {
        if (this.arr.length == 0) {
          await this.getMenuItemTop();
        }
        this.scrollIntoView = 'item' + index;
      }
      if (index == this.innerCurrent) return;
      this.$nextTick(function () {
        this.innerCurrent = index;
        this.$emit('update:current', index);
      });
    },
    // 获取一个目标元素的高度
    getElRect(elClass, dataVal) {
      return new Promise((resolve, reject) => {
        const query = uni.createSelectorQuery().in(this);
        query
          .select('.' + elClass)
          .fields(
            {
              size: true
            },
            (res) => {
              // 如果节点尚未生成，res值为null，循环调用执行
              if (!res) {
                setTimeout(() => {
                  this.getElRect(elClass);
                }, 10);
                return;
              }
              this[dataVal] = res.height;
              resolve();
            }
          )
          .exec();
      });
    },
    // 观测元素相交状态
    async observer() {
      await this.$nextTick();
      // 清除之前的观察器
      if (this._observerList) {
        this._observerList.forEach((observer) => {
          observer.disconnect();
        });
      }
      this._observerList = [];
      this.tabList.map((val, index) => {
        let observer = uni.createIntersectionObserver(this);
        this._observerList.push(observer);
        // 检测相交状态
        observer
          .relativeTo('.u-cate-tab__right-box', {
            top: 10
          })
          .observe('#item' + index, (res) => {
            if (res.intersectionRatio > 0) {
              console.log('res', res);
              // 修复：确保正确获取索引
              let id = res.id ? res.id.substring(4) : index;
              this.leftMenuStatus(parseInt(id));
            }
          });
      });
    },
    // 设置左边菜单的滚动状态
    async leftMenuStatus(index) {
      this.innerCurrent = index;
      this.$emit('update:current', index);
      // 如果为0，意味着尚未初始化
      if (this.menuHeight == 0 || this.menuItemHeight == 0) {
        await this.getElRect('u-cate-tab__menu-scroll-view', 'menuHeight');
        await this.getElRect('u-cate-tab__item', 'menuItemHeight');
      }
      // console.log(this.menuHeight, this.menuItemHeight)
      // 将菜单活动item垂直居中
      this.scrollTop = index * this.menuItemHeight + this.menuItemHeight / 2 - this.menuHeight / 2;
    },
    // 获取右边菜单每个item到顶部的距离
    async getMenuItemTop() {
      // await this.$nextTick();
      // console.log('getMenuItemTop')
      return new Promise((resolve) => {
        let selectorQuery = uni.createSelectorQuery().in(this);
        selectorQuery
          .selectAll('.u-cate-tab__page-item')
          .boundingClientRect((rects) => {
            // 如果节点尚未生成，rects值为[](因为用selectAll，所以返回的是数组)，循环调用执行
            if (!rects.length) {
              setTimeout(() => {
                this.getMenuItemTop();
              }, 100);
              return;
            }
            // console.log(rects)
            this.rects = rects;
            this.arr = [];
            rects.forEach((rect) => {
              // 这里减去rects[0].top，是因为第一项顶部可能不是贴到导航栏(比如有个搜索框的情况)
              this.arr.push(rect.top - rects[0].top);
            });
            // console.log(this.arr)
            resolve();
          })
          .exec();
      });
    },
    // 右边菜单滚动
    async rightScroll(e) {
      if (this.mode !== 'follow') return;
      this.oldScrollTop = e.detail.scrollTop;
      // console.log(e.detail.scrollTop)
      // console.log(JSON.stringify(this.arr))
      if (this.arr.length == 0) {
        await this.getMenuItemTop();
      }
      if (this.timer) return;
      if (!this.menuHeight) {
        await this.getElRect('u-cate-tab__menu-scroll-view', 'menuHeight');
      }
      setTimeout(() => {
        // 节流
        this.timer = null;
        // scrollHeight为右边菜单垂直中点位置
        let scrollHeight = e.detail.scrollTop + 1;
        // console.log(e.detail.scrollTop)
        for (let i = 0; i < this.arr.length; i++) {
          let height1 = this.arr[i];
          let height2 = this.arr[i + 1];
          // console.log('i', i)
          // console.log('height1', height1)
          // console.log('height2', height2)
          // 如果不存在height2，意味着数据循环已经到了最后一个，设置左边菜单为最后一项即可
          if (!height2 || (scrollHeight >= height1 && scrollHeight <= height2)) {
            // console.log('scrollHeight', scrollHeight)
            // console.log('height1', height1)
            // console.log('height2', height2)
            this.leftMenuStatus(i);
            return;
          }
        }
      }, 100);
    }
  }
 @import './style.css';
 </style>

package/uview-plus/components/u-cell/_doc/readme.md

@@ -4,7 +4,7 @@
 
 u-cell单元格一般用于一组列表的情况，比如个人中心页，设置页等。
 
-## [查看文档](https://ijry.github.io/uview-plus/components/cell.html)
+## [查看文档](https://uview-plus.jiangruyi.com/components/cell.html)
 
 ## [更多组件, 请查看 `u-ui` 组件库](https://ext.dcloud.net.cn/plugin?name=u--ui)
 (请勿下载插件zip)
@@ -13,7 +13,7 @@ u-cell单元格一般用于一组列表的情况，比如个人中心页，设
 	<img src="https://wuui.cn/intr.png">
 </a>
 
-**如使用过程中有任何问题，或者您对u-ui有一些好的建议。<br>欢迎加入 [u-ui 交流群](https://ijry.github.io/uview-plus/components/qqFeedBack.html)**
+**如使用过程中有任何问题，或者您对u-ui有一些好的建议。<br>欢迎加入 [u-ui 交流群](https://uview-plus.jiangruyi.com/components/qqFeedBack.html)**
 
 
 

package/uview-plus/components/u-cell/style.css

@@ -1,29 +1,3 @@
-/* #ifndef APP-NVUE */
-.u-empty,
-.u-empty__wrap,
-.u-tabs,
-.u-tabs__wrapper,
-.u-tabs__wrapper__scroll-view-wrapper,
-.u-tabs__wrapper__scroll-view,
-.u-tabs__wrapper__nav,
-.u-tabs__wrapper__nav__line,
-.up-empty,
-.up-empty__wrap,
-.up-tabs,
-.up-tabs__wrapper,
-.up-tabs__wrapper__scroll-view-wrapper,
-.up-tabs__wrapper__scroll-view,
-.up-tabs__wrapper__nav,
-.up-tabs__wrapper__nav__line {
-  display: flex;
-  flex-direction: column;
-  flex-shrink: 0;
-  flex-grow: 0;
-  flex-basis: auto;
-  align-items: stretch;
-  align-content: flex-start;
-}
-/* #endif */
 .u-cell__body {
   /* #ifndef APP-NVUE */
   display: flex;

package/uview-plus/components/u-cell/style.scss

@@ -1,5 +1,3 @@
-@import '../../libs/css/components.scss';
-
 $u-cell-padding: 13px 15px !default;
 $u-cell-font-size: 15px !default;
 $u-cell-line-height: 24px !default;

package/uview-plus/components/u-cell-group/style.css

@@ -1,29 +1,3 @@
-/* #ifndef APP-NVUE */
-.u-empty,
-.u-empty__wrap,
-.u-tabs,
-.u-tabs__wrapper,
-.u-tabs__wrapper__scroll-view-wrapper,
-.u-tabs__wrapper__scroll-view,
-.u-tabs__wrapper__nav,
-.u-tabs__wrapper__nav__line,
-.up-empty,
-.up-empty__wrap,
-.up-tabs,
-.up-tabs__wrapper,
-.up-tabs__wrapper__scroll-view-wrapper,
-.up-tabs__wrapper__scroll-view,
-.up-tabs__wrapper__nav,
-.up-tabs__wrapper__nav__line {
-  display: flex;
-  flex-direction: column;
-  flex-shrink: 0;
-  flex-grow: 0;
-  flex-basis: auto;
-  align-items: stretch;
-  align-content: flex-start;
-}
-/* #endif */
 .u-cell-group {
   flex: 1;
 }

package/uview-plus/components/u-cell-group/style.scss

@@ -1,5 +1,3 @@
-@import '../../libs/css/components.scss';
-
 $u-cell-group-title-padding: 16px 16px 8px !default;
 $u-cell-group-title-font-size: 15px !default;
 $u-cell-group-title-line-height: 16px !default;

package/uview-plus/components/u-checkbox/_doc/readme.md

@@ -4,7 +4,7 @@
 
 复选框组件一般用于需要多个选择的场景，该组件功能完整，使用方便。
 
-## [查看文档](https://ijry.github.io/uview-plus/components/checkbox.html)
+## [查看文档](https://uview-plus.jiangruyi.com/components/checkbox.html)
 
 ## [更多组件, 请查看 `u-ui` 组件库](https://ext.dcloud.net.cn/plugin?name=u--ui)
 (请勿下载插件zip)
@@ -13,7 +13,7 @@
 	<img src="https://wuui.cn/intr.png">
 </a>
 
-**如使用过程中有任何问题，或者您对u-ui有一些好的建议。<br>欢迎加入 [u-ui 交流群](https://ijry.github.io/uview-plus/components/qqFeedBack.html)**
+**如使用过程中有任何问题，或者您对u-ui有一些好的建议。<br>欢迎加入 [u-ui 交流群](https://uview-plus.jiangruyi.com/components/qqFeedBack.html)**
 
 
 

package/uview-plus/components/u-checkbox/style.css

@@ -1,29 +1,3 @@
-/* #ifndef APP-NVUE */
-.u-empty,
-.u-empty__wrap,
-.u-tabs,
-.u-tabs__wrapper,
-.u-tabs__wrapper__scroll-view-wrapper,
-.u-tabs__wrapper__scroll-view,
-.u-tabs__wrapper__nav,
-.u-tabs__wrapper__nav__line,
-.up-empty,
-.up-empty__wrap,
-.up-tabs,
-.up-tabs__wrapper,
-.up-tabs__wrapper__scroll-view-wrapper,
-.up-tabs__wrapper__scroll-view,
-.up-tabs__wrapper__nav,
-.up-tabs__wrapper__nav__line {
-  display: flex;
-  flex-direction: column;
-  flex-shrink: 0;
-  flex-grow: 0;
-  flex-basis: auto;
-  align-items: stretch;
-  align-content: flex-start;
-}
-/* #endif */
 .u-checkbox {
   /* #ifndef APP-NVUE */
   /* #ifndef APP-NVUE */
@@ -65,11 +39,13 @@
   border-color: #c8c9cc;
   border-style: solid;
   /* #ifdef MP-TOUTIAO */
-  /* #endif */
 }
 .u-checkbox__icon-wrap__icon {
   line-height: 0;
 }
+.u-checkbox__icon-wrap {
+  /* #endif */
+}
 .u-checkbox__icon-wrap--circle {
   border-radius: 100%;
 }

package/uview-plus/components/u-checkbox/style.scss

@@ -1,4 +1,3 @@
-@import '../../libs/css/components.scss';
 $u-checkbox-icon-wrap-margin-right: 6px !default;
 $u-checkbox-icon-wrap-font-size: 6px !default;
 $u-checkbox-icon-wrap-border-width: 1px !default;