@10yun/cv-mobile-ui 0.5.27 → 0.5.29

package/uview-plus/{libs/config/props → components/u-radio-group}/radioGroup.js

@@ -3,8 +3,8 @@
  * @Description  :
  * @version      : 1.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 17:03:12
+ * @LastAuthor   : CPS
+ * @lastTime     : 2024-11-05 16:01:12
  * @FilePath     : /u-view2.0/uview-ui/libs/config/props/radioGroup.js
  */
 export default {
@@ -25,6 +25,7 @@ export default {
         iconColor: '#ffffff',
         iconSize: 12,
         borderBottom: false,
-        iconPlacement: 'left'
+        iconPlacement: 'left',
+        gap: "10px"
     }
 }

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

@@ -1,5 +1,20 @@
 /* #ifndef APP-NVUE */
-view, scroll-view, swiper-item {
+.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;
@@ -23,4 +38,4 @@ view, scroll-view, swiper-item {
   display: flex;
   /* #endif */
   flex-direction: column;
-}
+}

package/uview-plus/components/u-radio-group/u-radio-group.vue

@@ -1,12 +1,13 @@
 <template>
-  <view class="u-radio-group" :class="bemClass">
+  <view class="u-radio-group" :class="bemClass" :style="radioGroupStyle">
     <slot></slot>
   </view>
 </template>
 <script>
-import props from './props.js';
-import mpMixin from '../../libs/mixin/mpMixin.js';
-import mixin from '../../libs/mixin/mixin.js';
+import { props } from './props';
+import { mpMixin } from '../../libs/mixin/mpMixin';
+import { mixin } from '../../libs/mixin/mixin';
+import { addUnit, addStyle, deepMerge } from '../../libs/function/index';
 /**
  * radioRroup 单选框父组件
  * @description 单选框用于有一个选择，用户只能选择其中一个的场景。搭配u-radio使用
@@ -27,6 +28,7 @@ import mixin from '../../libs/mixin/mixin.js';
  * @property {String | Number}				iconSize		图标的大小，单位px （默认 12 ）
  * @property {Boolean}						borderBottom	placement为row时，是否显示下边框 （默认 false ）
  * @property {String}						iconPlacement	图标与文字的对齐方式 （默认 'left' ）
+ * @property {Object}						gap				item 之间的间距
  * @property {Object}						customStyle		组件的样式，对象形式
  * @event {Function} change 任一个radio状态发生变化时触发
  * @example <u-radio-group v-model="value"></u-radio-group>
@@ -71,6 +73,12 @@ export default {
     bemClass() {
       // this.bem为一个computed变量，在mixin中
       return this.bem('radio-group', ['placement']);
+    },
+    radioGroupStyle() {
+      const style = {
+        gap: addUnit(this.gap)
+      };
+      return deepMerge(style, addStyle(this.customStyle));
     }
   },
   watch: {

package/uview-plus/components/u-rate/props.js

@@ -1,79 +1,80 @@
-import defprops from '../../libs/config/props';
-export default {
+import { defineMixin } from '../../libs/vue';
+import defProps from '../../libs/config/props.js';
+export const props = defineMixin({
   props: {
     // #ifdef VUE3
     // 用于v-model双向绑定选中的星星数量
     modelValue: {
       type: [String, Number],
-      default: defprops.rate.value
+      default: () => defProps.rate.value
     },
     // #endif
     // #ifdef VUE2
     // 用于v-model双向绑定选中的星星数量
     value: {
       type: [String, Number],
-      default: defprops.rate.value
+      default: () => defProps.rate.value
     },
     // #endif
     // 要显示的星星数量
     count: {
       type: [String, Number],
-      default: defprops.rate.count
+      default: () => defProps.rate.count
     },
     // 是否不可选中
     disabled: {
       type: Boolean,
-      default: defprops.rate.disabled
+      default: () => defProps.rate.disabled
     },
     // 是否只读
     readonly: {
       type: Boolean,
-      default: defprops.rate.readonly
+      default: () => defProps.rate.readonly
     },
     // 星星的大小，单位px
     size: {
       type: [String, Number],
-      default: defprops.rate.size
+      default: () => defProps.rate.size
     },
     // 未选中时的颜色
     inactiveColor: {
       type: String,
-      default: defprops.rate.inactiveColor
+      default: () => defProps.rate.inactiveColor
     },
     // 选中的颜色
     activeColor: {
       type: String,
-      default: defprops.rate.activeColor
+      default: () => defProps.rate.activeColor
     },
     // 星星之间的间距，单位px
     gutter: {
       type: [String, Number],
-      default: defprops.rate.gutter
+      default: () => defProps.rate.gutter
     },
     // 最少能选择的星星个数
     minCount: {
       type: [String, Number],
-      default: defprops.rate.minCount
+      default: () => defProps.rate.minCount
     },
     // 是否允许半星
     allowHalf: {
       type: Boolean,
-      default: defprops.rate.allowHalf
+      default: () => defProps.rate.allowHalf
     },
     // 选中时的图标(星星)
     activeIcon: {
       type: String,
-      default: defprops.rate.activeIcon
+      default: () => defProps.rate.activeIcon
     },
     // 未选中时的图标(星星)
     inactiveIcon: {
       type: String,
-      default: defprops.rate.inactiveIcon
+      default: () => defProps.rate.inactiveIcon
     },
     // 是否可以通过滑动手势选择评分
     touchable: {
       type: Boolean,
-      default: defprops.rate.touchable
+      default: () => defProps.rate.touchable
     }
   }
-};
+});

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

@@ -1,5 +1,20 @@
 /* #ifndef APP-NVUE */
-view, scroll-view, swiper-item {
+.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;
@@ -40,4 +55,4 @@ view, scroll-view, swiper-item {
   /* #ifndef APP-NVUE */
   box-sizing: border-box;
   /* #endif */
-}
+}

package/uview-plus/components/u-rate/u-rate.vue

@@ -1,7 +1,7 @@
 <template>
-  <view class="u-rate" :id="elId" ref="u-rate" :style="[$u.addStyle(customStyle)]">
+  <view class="u-rate" :id="elId" ref="u-rate" :style="[addStyle(customStyle)]">
     <view class="u-rate__content" @touchmove.stop="touchMove" @touchend.stop="touchEnd">
-      <view class="u-rate__content__item" v-for="(item, index) in Number(count)" :key="index" :class="[elClass]">
+      <view class="u-rate__content__item cursor-pointer" v-for="(item, index) in Number(count)" :key="index" :class="[elClass]">
         <view
           class="u-rate__content__item__icon-wrap"
           ref="u-rate__content__item__icon-wrap"
@@ -11,7 +11,7 @@
             :name="Math.floor(activeIndex) > index ? activeIcon : inactiveIcon"
             :color="disabled ? '#c8c9cc' : Math.floor(activeIndex) > index ? activeColor : inactiveColor"
             :custom-style="{
-              padding: `0 ${$u.addUnit(gutter / 2)}`
+              padding: `0 ${addUnit(gutter / 2)}`
             }"
             :size="size"
           ></u-icon>
@@ -22,7 +22,7 @@
           class="u-rate__content__item__icon-wrap u-rate__content__item__icon-wrap--half"
           :style="[
             {
-              width: $u.addUnit(rateWidth / 2)
+              width: addUnit(rateWidth / 2)
             }
           ]"
           ref="u-rate__content__item__icon-wrap"
@@ -31,7 +31,7 @@
             :name="Math.ceil(activeIndex) > index ? activeIcon : inactiveIcon"
             :color="disabled ? '#c8c9cc' : Math.ceil(activeIndex) > index ? activeColor : inactiveColor"
             :custom-style="{
-              padding: `0 ${$u.addUnit(gutter / 2)}`
+              padding: `0 ${addUnit(gutter / 2)}`
             }"
             :size="size"
           ></u-icon>
@@ -41,9 +41,10 @@
   </view>
 </template>
 <script>
-import props from './props.js';
-import mpMixin from '../../libs/mixin/mpMixin.js';
-import mixin from '../../libs/mixin/mixin.js';
+import { props } from './props';
+import { mpMixin } from '../../libs/mixin/mpMixin';
+import { mixin } from '../../libs/mixin/mixin';
+import { addUnit, addStyle, guid, sleep, range, os } from '../../libs/function/index';
 // #ifdef APP-NVUE
 const dom = weex.requireModule('dom');
 // #endif
@@ -74,8 +75,8 @@ export default {
   data() {
     return {
       // 生成一个唯一id，否则一个页面多个评分组件，会造成冲突
-      elId: uni.$u.guid(),
-      elClass: uni.$u.guid(),
+      elId: guid(),
+      elClass: guid(),
       rateBoxLeft: 0, // 评分盒子左边到屏幕左边的距离，用于滑动选择时计算距离
       // #ifdef VUE3
       activeIndex: this.modelValue,
@@ -105,15 +106,17 @@ export default {
   emits: ['update:modelValue', 'change'],
   // #endif
   methods: {
+    addStyle,
+    addUnit,
     init() {
-      uni.$u.sleep().then(() => {
+      sleep().then(() => {
         this.getRateItemRect();
         this.getRateIconWrapRect();
       });
     },
     // 获取评分组件盒子的布局信息
     async getRateItemRect() {
-      await uni.$u.sleep();
+      await sleep();
       // uView封装的获取节点的方法，详见文档
       // #ifndef APP-NVUE
       this.$uGetRect('#' + this.elId).then((res) => {
@@ -163,7 +166,7 @@ export default {
     // 通过点击，直接选中
     clickHandler(e, index) {
       // ios上，moving状态取消事件触发
-      if (uni.$u.os() === 'ios' && this.moving) {
+      if (os() === 'ios' && this.moving) {
         return;
       }
       this.preventEvent(e);
@@ -198,7 +201,7 @@ export default {
       // 判断当前操作的点的x坐标值，是否在允许的边界范围内
       const allRateWidth = this.rateWidth * this.count + this.rateBoxLeft;
       // 如果小于第一个图标的左边界，设置为最小值，如果大于所有图标的宽度，则设置为最大值
-      x = uni.$u.range(this.rateBoxLeft, allRateWidth, x) - this.rateBoxLeft;
+      x = range(this.rateBoxLeft, allRateWidth, x) - this.rateBoxLeft;
       // 滑动点相对于评分盒子左边的距离
       const distance = x;
       // 滑动的距离，相当于多少颗星星

package/uview-plus/components/u-read-more/props.js

@@ -1,35 +1,36 @@
-import defprops from '../../libs/config/props';
-export default {
+import { defineMixin } from '../../libs/vue';
+import defProps from '../../libs/config/props.js';
+export const props = defineMixin({
   props: {
     // 默认的显示占位高度
     showHeight: {
       type: [String, Number],
-      default: defprops.readMore.showHeight
+      default: () => defProps.readMore.showHeight
     },
     // 展开后是否显示"收起"按钮
     toggle: {
       type: Boolean,
-      default: defprops.readMore.toggle
+      default: () => defProps.readMore.toggle
     },
     // 关闭时的提示文字
     closeText: {
       type: String,
-      default: defprops.readMore.closeText
+      default: () => defProps.readMore.closeText
     },
     // 展开时的提示文字
     openText: {
       type: String,
-      default: defprops.readMore.openText
+      default: () => defProps.readMore.openText
     },
     // 提示的文字颜色
     color: {
       type: String,
-      default: defprops.readMore.color
+      default: () => defProps.readMore.color
     },
     // 提示文字的大小
     fontSize: {
       type: [String, Number],
-      default: defprops.readMore.fontSize
+      default: () => defProps.readMore.fontSize
     },
     // 是否显示阴影
     // 此参数不能写在props/readMore.js中进行默认配置，因为使用了条件编译，在外部js中
@@ -51,12 +52,12 @@ export default {
     // 段落首行缩进的字符个数
     textIndent: {
       type: String,
-      default: defprops.readMore.textIndent
+      default: () => defProps.readMore.textIndent
     },
     // open和close事件时，将此参数返回在回调参数中
     name: {
       type: [String, Number],
-      default: defprops.readMore.name
+      default: () => defProps.readMore.name
     }
   }
-};
+});

package/uview-plus/components/u-read-more/style.css

@@ -1,5 +1,20 @@
 /* #ifndef APP-NVUE */
-view, scroll-view, swiper-item {
+.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;
@@ -21,6 +36,7 @@ view, scroll-view, swiper-item {
   /* #endif */
   flex-direction: row;
   justify-content: center;
+  position: relative;
 }
 .u-read-more__toggle__text {
   /* #ifndef APP-NVUE */
@@ -30,4 +46,4 @@ view, scroll-view, swiper-item {
   align-items: center;
   justify-content: center;
   margin-top: 5px;
-}
+}

package/uview-plus/components/u-read-more/style.scss

@@ -1,22 +1,23 @@
-@import '../../libs/css/components.scss';
-
-.u-read-more {
-  &__content {
-    overflow: hidden;
-    color: $u-content-color;
-    font-size: 15px;
-    text-align: left;
-  }
-
-  &__toggle {
-    @include flex;
-    justify-content: center;
-
-    &__text {
-      @include flex;
-      align-items: center;
-      justify-content: center;
-      margin-top: 5px;
-    }
-  }
-}
+@import '../../libs/css/components.scss';
+
+.u-read-more {
+  &__content {
+    overflow: hidden;
+    color: $u-content-color;
+    font-size: 15px;
+    text-align: left;
+  }
+
+  &__toggle {
+    @include flex;
+    justify-content: center;
+    position: relative;
+
+    &__text {
+      @include flex;
+      align-items: center;
+      justify-content: center;
+      margin-top: 5px;
+    }
+  }
+}