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

package/uview-plus/components/u-number-box/props.js

@@ -1,119 +1,140 @@
-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: {
     // 步进器标识符，在change回调返回
     name: {
       type: [String, Number],
-      default: defprops.numberBox.name
+      default: () => defProps.numberBox.name
     },
     // #ifdef VUE2
     // 用于双向绑定的值，初始化时设置设为默认min值(最小值)
     value: {
       type: [String, Number],
-      default: defprops.numberBox.value
+      default: () => defProps.numberBox.value
     },
     // #endif
     // #ifdef VUE3
     // 用于双向绑定的值，初始化时设置设为默认min值(最小值)
     modelValue: {
       type: [String, Number],
-      default: defprops.numberBox.value
+      default: () => defProps.numberBox.value
     },
     // #endif
     // 最小值
     min: {
       type: [String, Number],
-      default: defprops.numberBox.min
+      default: () => defProps.numberBox.min
     },
     // 最大值
     max: {
       type: [String, Number],
-      default: defprops.numberBox.max
+      default: () => defProps.numberBox.max
     },
     // 加减的步长，可为小数
     step: {
       type: [String, Number],
-      default: defprops.numberBox.step
+      default: () => defProps.numberBox.step
     },
     // 是否只允许输入整数
     integer: {
       type: Boolean,
-      default: defprops.numberBox.integer
+      default: () => defProps.numberBox.integer
     },
     // 是否禁用，包括输入框，加减按钮
     disabled: {
       type: Boolean,
-      default: defprops.numberBox.disabled
+      default: () => defProps.numberBox.disabled
     },
     // 是否禁用输入框
     disabledInput: {
       type: Boolean,
-      default: defprops.numberBox.disabledInput
+      default: () => defProps.numberBox.disabledInput
     },
     // 是否开启异步变更，开启后需要手动控制输入值
     asyncChange: {
       type: Boolean,
-      default: defprops.numberBox.asyncChange
+      default: () => defProps.numberBox.asyncChange
     },
     // 输入框宽度，单位为px
     inputWidth: {
       type: [String, Number],
-      default: defprops.numberBox.inputWidth
+      default: () => defProps.numberBox.inputWidth
     },
     // 是否显示减少按钮
     showMinus: {
       type: Boolean,
-      default: defprops.numberBox.showMinus
+      default: () => defProps.numberBox.showMinus
     },
     // 是否显示增加按钮
     showPlus: {
       type: Boolean,
-      default: defprops.numberBox.showPlus
+      default: () => defProps.numberBox.showPlus
     },
     // 显示的小数位数
     decimalLength: {
       type: [String, Number, null],
-      default: defprops.numberBox.decimalLength
+      default: () => defProps.numberBox.decimalLength
     },
     // 是否开启长按加减手势
     longPress: {
       type: Boolean,
-      default: defprops.numberBox.longPress
+      default: () => defProps.numberBox.longPress
     },
     // 输入框文字和加减按钮图标的颜色
     color: {
       type: String,
-      default: defprops.numberBox.color
+      default: () => defProps.numberBox.color
+    },
+    // 按钮宽度
+    buttonWidth: {
+      type: [String, Number],
+      default: () => defProps.numberBox.buttonWidth
     },
     // 按钮大小，宽高等于此值，单位px，输入框高度和此值保持一致
     buttonSize: {
       type: [String, Number],
-      default: defprops.numberBox.buttonSize
+      default: () => defProps.numberBox.buttonSize
+    },
+    // 按钮圆角
+    buttonRadius: {
+      type: [String],
+      default: () => defProps.numberBox.buttonRadius
     },
     // 输入框和按钮的背景颜色
     bgColor: {
       type: String,
-      default: defprops.numberBox.bgColor
+      default: () => defProps.numberBox.bgColor
+    },
+    // 输入框背景颜色
+    inputBgColor: {
+      type: String,
+      default: () => defProps.numberBox.inputBgColor
     },
     // 指定光标于键盘的距离，避免键盘遮挡输入框，单位px
     cursorSpacing: {
       type: [String, Number],
-      default: defprops.numberBox.cursorSpacing
+      default: () => defProps.numberBox.cursorSpacing
     },
     // 是否禁用增加按钮
     disablePlus: {
       type: Boolean,
-      default: defprops.numberBox.disablePlus
+      default: () => defProps.numberBox.disablePlus
     },
     // 是否禁用减少按钮
     disableMinus: {
       type: Boolean,
-      default: defprops.numberBox.disableMinus
+      default: () => defProps.numberBox.disableMinus
     },
     // 加减按钮图标的样式
     iconStyle: {
       type: [Object, String],
-      default: defprops.numberBox.iconStyle
+      default: () => defProps.numberBox.iconStyle
+    },
+    // 迷你模式
+    miniMode: {
+      type: Boolean,
+      default: () => defProps.numberBox.miniMode
     }
   }
-};
+});

package/uview-plus/components/u-number-box/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;
@@ -64,4 +79,4 @@ view, scroll-view, swiper-item {
 .u-number-box__input--disabled {
   color: #c8c9cc;
   background-color: #f2f3f5;
-}
+}

package/uview-plus/components/u-number-box/u-number-box.vue

@@ -1,17 +1,17 @@
 <template>
   <view class="u-number-box">
     <view
-      class="u-number-box__slot"
+      class="u-number-box__slot cursor-pointer"
       @tap.stop="clickHandler('minus')"
       @touchstart="onTouchStart('minus')"
       @touchend.stop="clearTimeout"
-      v-if="showMinus && $slots.minus"
+      v-if="showMinus && !hideMinus && $slots.minus"
     >
       <slot name="minus" />
     </view>
     <view
-      v-else-if="showMinus"
-      class="u-number-box__minus"
+      v-else-if="showMinus && !hideMinus"
+      class="u-number-box__minus cursor-pointer"
       @tap.stop="clickHandler('minus')"
       @touchstart="onTouchStart('minus')"
       @touchend.stop="clearTimeout"
@@ -22,22 +22,40 @@
     >
       <u-icon name="minus" :color="isDisabled('minus') ? '#c8c9cc' : '#323233'" size="15" bold :customStyle="iconStyle"></u-icon>
     </view>
-    <slot name="input">
-      <input
-        :disabled="disabledInput || disabled"
-        :cursor-spacing="getCursorSpacing"
-        :class="{ 'u-number-box__input--disabled': disabled || disabledInput }"
-        v-model="currentValue"
-        class="u-number-box__input"
-        @blur="onBlur"
-        @focus="onFocus"
-        @input="onInput"
-        type="number"
-        :style="[inputStyle]"
-      />
-    </slot>
+    <template v-if="!hideMinus">
+      <slot name="input">
+        <!-- #ifdef MP-WEIXIN -->
+        <input
+          :disabled="disabledInput || disabled"
+          :cursor-spacing="getCursorSpacing"
+          :class="{ 'u-number-box__input--disabled': disabled || disabledInput }"
+          :value="currentValue"
+          class="u-number-box__input"
+          @blur="onBlur"
+          @focus="onFocus"
+          @input="onInput"
+          type="number"
+          :style="[inputStyle]"
+        />
+        <!-- #endif -->
+        <!-- #ifndef MP-WEIXIN -->
+        <input
+          :disabled="disabledInput || disabled"
+          :cursor-spacing="getCursorSpacing"
+          :class="{ 'u-number-box__input--disabled': disabled || disabledInput }"
+          v-model="currentValue"
+          class="u-number-box__input"
+          @blur="onBlur"
+          @focus="onFocus"
+          @input="onInput"
+          type="number"
+          :style="[inputStyle]"
+        />
+        <!-- #endif -->
+      </slot>
+    </template>
     <view
-      class="u-number-box__slot"
+      class="u-number-box__slot cursor-pointer"
       @tap.stop="clickHandler('plus')"
       @touchstart="onTouchStart('plus')"
       @touchend.stop="clearTimeout"
@@ -47,7 +65,7 @@
     </view>
     <view
       v-else-if="showPlus"
-      class="u-number-box__plus"
+      class="u-number-box__plus cursor-pointer"
       @tap.stop="clickHandler('plus')"
       @touchstart="onTouchStart('plus')"
       @touchend.stop="clearTimeout"
@@ -61,13 +79,14 @@
   </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 { getPx, addUnit } from '../../libs/function/index';
 /**
  * numberBox 步进器
  * @description 该组件一般用于商城购物选择物品数量的场景。
- * @tutorial https://uviewui.com/components/numberBox.html
+ * @tutorial https://uview-plus.jiangruyi.com/components/numberBox.html
  * @property {String | Number}	name			步进器标识符，在change回调返回
  * @property {String | Number}	value			用于双向绑定的值，初始化时设置设为默认min值(最小值)  （默认 0 ）
  * @property {String | Number}	min				最小值 （默认 1 ）
@@ -122,25 +141,33 @@ export default {
     // #endif
     // #ifdef VUE3
     // 监听v-mode的变化，重新初始化内部的值
-    modelValue(n) {
-      if (n !== this.currentValue) {
-        this.currentValue = this.format(this.modelValue);
-      }
+    modelValue: {
+      handler: function (newV, oldV) {
+        if (newV !== this.currentValue) {
+          this.currentValue = this.format(this.modelValue);
+        }
+      },
+      immediate: true
     }
     // #endif
   },
   computed: {
+    hideMinus() {
+      return this.currentValue == 0 && this.miniMode == true;
+    },
     getCursorSpacing() {
       // 判断传入的单位，如果为px单位，需要转成px
-      return uni.$u.getPx(this.cursorSpacing);
+      return getPx(this.cursorSpacing);
     },
     // 按钮的样式
     buttonStyle() {
       return (type) => {
         const style = {
           backgroundColor: this.bgColor,
-          height: uni.$u.addUnit(this.buttonSize),
-          color: this.color
+          width: addUnit(this.buttonWidth),
+          height: addUnit(this.buttonSize),
+          color: this.color,
+          borderRadius: this.buttonRadius
         };
         if (this.isDisabled(type)) {
           style.backgroundColor = '#f7f8fa';
@@ -153,9 +180,9 @@ export default {
       const disabled = this.disabled || this.disabledInput;
       const style = {
         color: this.color,
-        backgroundColor: this.bgColor,
-        height: uni.$u.addUnit(this.buttonSize),
-        width: uni.$u.addUnit(this.inputWidth)
+        backgroundColor: this.inputBgColor || this.bgColor,
+        height: addUnit(this.buttonSize),
+        width: addUnit(this.inputWidth)
       };
       return style;
     },
@@ -217,6 +244,7 @@ export default {
       const val = this.format(this.currentValue);
       if (val !== this.currentValue) {
         this.currentValue = val;
+        this.emitChange(val);
       }
     },
     // 判断是否出于禁止操作状态
@@ -257,8 +285,14 @@ export default {
     onInput(e) {
       const { value = '' } = e.detail || {};
       // 为空返回
-      if (value === '') return;
+      if (value === '') {
+        // 为空自动设为最小值
+        this.emitChange(this.min);
+        return;
+      }
       let formatted = this.filter(value);
+      // https://github.com/ijry/uview-plus/issues/613
+      this.emitChange(value);
       // 最大允许的小数长度
       if (this.decimalLength !== null && formatted.indexOf('.') !== -1) {
         const pair = formatted.split('.');
@@ -266,6 +300,9 @@ export default {
       }
       formatted = this.format(formatted);
       this.emitChange(formatted);
+      // #ifdef MP-WEIXIN
+      return formatted;
+      // #endif
     },
     // 发出change事件
     emitChange(value) {

package/uview-plus/components/u-number-keyboard/props.js

@@ -1,20 +1,21 @@
-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: {
     // 键盘的类型，number-数字键盘，card-身份证键盘
     mode: {
       type: String,
-      default: defprops.numberKeyboard.value
+      default: () => defProps.numberKeyboard.value
     },
     // 是否显示键盘的"."符号
     dotDisabled: {
       type: Boolean,
-      default: defprops.numberKeyboard.dotDisabled
+      default: () => defProps.numberKeyboard.dotDisabled
     },
     // 是否打乱键盘按键的顺序
     random: {
       type: Boolean,
-      default: defprops.numberKeyboard.random
+      default: () => defProps.numberKeyboard.random
     }
   }
-};
+});

package/uview-plus/components/u-number-keyboard/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;
@@ -16,7 +31,7 @@ view, scroll-view, swiper-item {
   flex-direction: row;
   flex-direction: row;
   justify-content: space-around;
-  background-color: #e0e4e6;
+  background-color: rgb(224, 228, 230);
   flex-wrap: wrap;
   padding: 8px 10rpx 8px 10rpx;
 }
@@ -49,8 +64,8 @@ view, scroll-view, swiper-item {
   color: var(--u-main-color);
 }
 .u-keyboard__button-wrapper__button--gray {
-  background-color: #c8cad2;
+  background-color: rgb(200, 202, 210);
 }
 .u-hover-class {
   background-color: #bbbcc6;
-}
+}

package/uview-plus/components/u-number-keyboard/u-number-keyboard.vue

@@ -25,9 +25,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 { randomArray } from '../../libs/function/index';
 /**
  * keyboard 键盘组件
  * @description
@@ -40,6 +41,7 @@ import mixin from '../../libs/mixin/mixin.js';
  * @example
  */
 export default {
+  name: 'u-number-keyboard',
   mixins: [mpMixin, mixin, props],
   data() {
     return {
@@ -57,19 +59,19 @@ export default {
         if (!this.random) {
           return [1, 2, 3, 4, 5, 6, 7, 8, 9, 0];
         } else {
-          return uni.$u.randomArray([1, 2, 3, 4, 5, 6, 7, 8, 9, 0]);
+          return randomArray([1, 2, 3, 4, 5, 6, 7, 8, 9, 0]);
         }
       } else if (!this.dotDisabled && this.mode == 'number') {
         if (!this.random) {
           return [1, 2, 3, 4, 5, 6, 7, 8, 9, this.dot, 0];
         } else {
-          return uni.$u.randomArray([1, 2, 3, 4, 5, 6, 7, 8, 9, this.dot, 0]);
+          return randomArray([1, 2, 3, 4, 5, 6, 7, 8, 9, this.dot, 0]);
         }
       } else if (this.mode == 'card') {
         if (!this.random) {
           return [1, 2, 3, 4, 5, 6, 7, 8, 9, this.cardX, 0];
         } else {
-          return uni.$u.randomArray([1, 2, 3, 4, 5, 6, 7, 8, 9, this.cardX, 0]);
+          return randomArray([1, 2, 3, 4, 5, 6, 7, 8, 9, this.cardX, 0]);
         }
       }
     },
@@ -90,6 +92,7 @@ export default {
     }
   },
   created() {},
+  emits: ['backspace', 'change'],
   methods: {
     // 点击退格键
     backspaceClick() {

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

@@ -1,25 +1,26 @@
-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: {
     // 是否显示遮罩
     show: {
       type: Boolean,
-      default: defprops.overlay.show
+      default: () => defProps.overlay.show
     },
     // 层级z-index
     zIndex: {
       type: [String, Number],
-      default: defprops.overlay.zIndex
+      default: () => defProps.overlay.zIndex
     },
     // 遮罩的过渡时间，单位为ms
     duration: {
       type: [String, Number],
-      default: defprops.overlay.duration
+      default: () => defProps.overlay.duration
     },
     // 不透明度值，当做rgba的第四个参数
     opacity: {
       type: [String, Number],
-      default: defprops.overlay.opacity
+      default: () => defProps.overlay.opacity
     }
   }
-};
+});

package/uview-plus/components/u-overlay/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;
@@ -16,4 +31,4 @@ view, scroll-view, swiper-item {
   width: 100%;
   height: 100%;
   background-color: rgba(0, 0, 0, 0.7);
-}
+}

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

@@ -1,12 +1,20 @@
 <template>
-  <u-transition :show="show" custom-class="u-overlay" :duration="duration" :custom-style="overlayStyle" @click="clickHandler">
+  <u-transition
+    :show="show"
+    custom-class="u-overlay"
+    :duration="duration"
+    :custom-style="overlayStyle"
+    @click="clickHandler"
+    @touchmove.stop.prevent="noop"
+  >
     <slot />
   </u-transition>
 </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 { addStyle, deepMerge } from '../../libs/function/index';
 /**
  * overlay 遮罩
  * @description 创建一个遮罩层，用于强调特定的页面元素，并阻止用户对遮罩下层的内容进行操作，一般用于弹窗场景
@@ -33,9 +41,10 @@ export default {
         bottom: 0,
         'background-color': `rgba(0, 0, 0, ${this.opacity})`
       };
-      return uni.$u.deepMerge(style, uni.$u.addStyle(this.customStyle));
+      return deepMerge(style, addStyle(this.customStyle));
     }
   },
+  emits: ['click'],
   methods: {
     clickHandler() {
       this.$emit('click');

package/uview-plus/components/u-parse/node/node.vue

@@ -120,7 +120,7 @@ export default {
     return {
       ctrl: {},
       // #ifdef MP-WEIXIN
-      isiOS: uni.getSystemInfoSync().system.includes('iOS')
+      isiOS: uni.getDeviceInfo().system.includes('iOS')
       // #endif
     }
   },
@@ -165,7 +165,7 @@ export default {
     }
     // #endif
   },
-  beforeDestroy () {
+  beforeUnmount () {
     // #ifdef H5 || APP-PLUS
     if (this.observer) {
       this.observer.disconnect()
@@ -223,7 +223,7 @@ export default {
       // #ifdef H5 || APP-PLUS
       node.attrs.src = node.attrs.src || node.attrs['data-src']
       // #endif
-      this.root.$emit('imgtap', node.attrs)
+      this.root.$emit('imgTap', node.attrs)
       // 自动预览图片
       if (this.root.previewImg) {
         uni.previewImage({
@@ -313,7 +313,7 @@ export default {
       const node = e.currentTarget ? this.childs[e.currentTarget.dataset.i] : {}
       const attrs = node.attrs || e
       const href = attrs.href
-      this.root.$emit('linktap', Object.assign({
+      this.root.$emit('linkTap', Object.assign({
         innerText: this.root.getText(node.children || []) // 链接内的文本内容
       }, attrs))
       if (href) {
@@ -398,7 +398,9 @@ export default {
 ._a {
   padding: 1.5px 0 1.5px 0;
   color: #366092;
+  /* #ifndef APP-NVUE */
   word-break: break-all;
+  /* #endif */
 }
 /* a 标签点击态效果 */
 ._hover {
@@ -412,7 +414,9 @@ export default {
 }
 /* 内部样式 */
 ._block {
+  /* #ifndef APP-NVUE */
   display: block;
+  /* #endif */
 }
 ._b,
 ._strong {
@@ -449,7 +453,9 @@ export default {
 ._h4,
 ._h5,
 ._h6 {
+  /* #ifndef APP-NVUE */
   display: block;
+  /* #endif */
   font-weight: bold;
 }
 ._image {
@@ -466,7 +472,9 @@ export default {
 }
 ._ol,
 ._ul {
+  /* #ifndef APP-NVUE */
   display: block;
+  /* #endif */
   padding-left: 40px;
   margin: 1em 0;
 }