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

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

@@ -1 +1 @@
-<template>
  <uvForm
    ref="uForm"
    :model="model"
    :rules="rules"
    :errorType="errorType"
    :borderBottom="borderBottom"
    :labelPosition="labelPosition"
    :labelWidth="labelWidth"
    :labelAlign="labelAlign"
    :labelStyle="labelStyle"
    :customStyle="customStyle"
  >
    <slot />
  </uvForm>
 * 此组件存在的理由是，在nvue下，u-form被uni-app官方占用了，u-form在nvue中相当于form组件
 * 所以在nvue下，取名为u--form，内部其实还是u-form.vue，只不过做一层中转
 */
  // #ifdef MP-WEIXIN
  name: 'u-form',
  // #endif
  // #ifndef MP-WEIXIN
  name: 'u--form',
  // #endif
  mixins: [mpMixin, props, mixin],
  components: {
    uvForm
  },
  created() {
    this.children = [];
  },
  methods: {
    // 手动设置校验的规则，如果规则中有函数的话，微信小程序中会过滤掉，所以只能手动调用设置规则
    setRules(rules) {
      this.$refs.uForm.setRules(rules);
    },
    validate() {
      /**
       * 在微信小程序中，通过this.$parent拿到的父组件是u--form，而不是其内嵌的u-form
       * 导致在u-form组件中，拿不到对应的children数组，从而校验无效，所以这里每次调用u-form组件中的
       * 对应方法的时候，在小程序中都先将u--form的children赋值给u-form中的children
       */
      // #ifdef MP-WEIXIN
      this.setMpData();
      // #endif
      return this.$refs.uForm.validate();
    },
    validateField(value, callback) {
      // #ifdef MP-WEIXIN
      this.setMpData();
      // #endif
      return this.$refs.uForm.validateField(value, callback);
    },
    resetFields() {
      // #ifdef MP-WEIXIN
      this.setMpData();
      // #endif
      return this.$refs.uForm.resetFields();
    },
    clearValidate(props) {
      // #ifdef MP-WEIXIN
      this.setMpData();
      // #endif
      return this.$refs.uForm.clearValidate(props);
    },
    setMpData() {
      this.$refs.uForm.children = this.children;
    }
  }
+<template>
  <uvForm
    ref="uForm"
    :model="model"
    :rules="rules"
    :errorType="errorType"
    :borderBottom="borderBottom"
    :labelPosition="labelPosition"
    :labelWidth="labelWidth"
    :labelAlign="labelAlign"
    :labelStyle="labelStyle"
    :customStyle="customStyle"
  >
    <slot />
  </uvForm>
 * 此组件存在的理由是，在nvue下，u-form被uni-app官方占用了，u-form在nvue中相当于form组件
 * 所以在nvue下，取名为u--form，内部其实还是u-form.vue，只不过做一层中转
 */
  // #ifdef MP-WEIXIN
  name: 'u-form',
  // #endif
  // #ifndef MP-WEIXIN
  name: 'u--form',
  // #endif
  mixins: [mpMixin, props, mixin],
  components: {
    uvForm
  },
  created() {
    this.children = [];
  },
  methods: {
    // 手动设置校验的规则，如果规则中有函数的话，微信小程序中会过滤掉，所以只能手动调用设置规则
    setRules(rules) {
      this.$refs.uForm.setRules(rules);
    },
    /**
     * 校验全部数据
     * @param {Object} options
     * @param {Boolean} options.showErrorMsg -是否显示校验信息，
     */
    validate(options) {
      /**
       * 在微信小程序中，通过this.$parent拿到的父组件是u--form，而不是其内嵌的u-form
       * 导致在u-form组件中，拿不到对应的children数组，从而校验无效，所以这里每次调用u-form组件中的
       * 对应方法的时候，在小程序中都先将u--form的children赋值给u-form中的children
       */
      // #ifdef MP-WEIXIN
      this.setMpData();
      // #endif
      return this.$refs.uForm.validate(options);
    },
    validateField(value, callback) {
      // #ifdef MP-WEIXIN
      this.setMpData();
      // #endif
      return this.$refs.uForm.validateField(value, callback);
    },
    resetFields() {
      // #ifdef MP-WEIXIN
      this.setMpData();
      // #endif
      return this.$refs.uForm.resetFields();
    },
    clearValidate(props) {
      // #ifdef MP-WEIXIN
      this.setMpData();
      // #endif
      return this.$refs.uForm.clearValidate(props);
    },
    setMpData() {
      this.$refs.uForm.children = this.children;
    }
  }

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

@@ -1 +1 @@
-<template>
  <uvImage
    :src="src"
    :mode="mode"
    :width="width"
    :height="height"
    :shape="shape"
    :radius="radius"
    :lazyLoad="lazyLoad"
    :showMenuByLongpress="showMenuByLongpress"
    :loadingIcon="loadingIcon"
    :errorIcon="errorIcon"
    :showLoading="showLoading"
    :showError="showError"
    :fade="fade"
    :webp="webp"
    :duration="duration"
    :bgColor="bgColor"
    :customStyle="customStyle"
    @click="$emit('click')"
    @error="$emit('error')"
    @load="$emit('load')"
  >
    <template v-slot:loading>
      <slot name="loading"></slot>
    </template>
    <template v-slot:error>
      <slot name="error"></slot>
    </template>
  </uvImage>
 * 此组件存在的理由是，在nvue下，u-image被uni-app官方占用了，u-image在nvue中相当于image组件
 * 所以在nvue下，取名为u--image，内部其实还是u-iamge.vue，只不过做一层中转
 */
  name: 'u--image',
  mixins: [mpMixin, props, mixin],
  components: {
    uvImage
  },
  emits: ['click', 'error', 'load']
+<template>
  <uvImage
    :src="src"
    :mode="mode"
    :width="width"
    :height="height"
    :shape="shape"
    :radius="radius"
    :lazyLoad="lazyLoad"
    :showMenuByLongpress="showMenuByLongpress"
    :loadingIcon="loadingIcon"
    :errorIcon="errorIcon"
    :showLoading="showLoading"
    :showError="showError"
    :fade="fade"
    :webp="webp"
    :duration="duration"
    :bgColor="bgColor"
    :customStyle="customStyle"
    @click="$emit('click')"
    @error="$emit('error')"
    @load="$emit('load')"
  >
    <template v-slot:loading>
      <slot name="loading"></slot>
    </template>
    <template v-slot:error>
      <slot name="error"></slot>
    </template>
  </uvImage>
 * 此组件存在的理由是，在nvue下，u-image被uni-app官方占用了，u-image在nvue中相当于image组件
 * 所以在nvue下，取名为u--image，内部其实还是u-iamge.vue，只不过做一层中转
 */
  name: 'u--image',
  mixins: [mpMixin, props, mixin],
  components: {
    uvImage
  },
  emits: ['click', 'error', 'load']

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

@@ -4,6 +4,6 @@
 		<!-- #endif -->
 		<!-- #ifdef VUE3 -->
 		@update:modelValue="e => $emit('update:modelValue', e)"
-		<!-- #endif -->
-	import mpMixin from '../../libs/mixin/mpMixin.js';
-	import mixin from '../../libs/mixin/mixin.js';
+		<!-- #endif -->
+	import { mpMixin } from '../../libs/mixin/mpMixin';
+	import { mixin } from '../../libs/mixin/mixin';

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

@@ -1 +1 @@
-<template>
  <uvText
    :type="type"
    :show="show"
    :text="text"
    :prefixIcon="prefixIcon"
    :suffixIcon="suffixIcon"
    :mode="mode"
    :href="href"
    :format="format"
    :call="call"
    :openType="openType"
    :bold="bold"
    :block="block"
    :lines="lines"
    :color="color"
    :decoration="decoration"
    :size="size"
    :iconStyle="iconStyle"
    :margin="margin"
    :lineHeight="lineHeight"
    :align="align"
    :wordWrap="wordWrap"
    :customStyle="customStyle"
  ></uvText>
 * 此组件存在的理由是，在nvue下，u-text被uni-app官方占用了，u-text在nvue中相当于input组件
 * 所以在nvue下，取名为u--input，内部其实还是u-text.vue，只不过做一层中转
 * 不使用v-bind="$attrs"，而是分开独立写传参，是因为微信小程序不支持此写法
 */
  name: 'u--text',
  mixins: [mpMixin, mixin, props],
  components: {
    uvText
  }
+<template>
  <uvText
    :type="type"
    :show="show"
    :text="text"
    :prefixIcon="prefixIcon"
    :suffixIcon="suffixIcon"
    :mode="mode"
    :href="href"
    :format="format"
    :call="call"
    :openType="openType"
    :bold="bold"
    :block="block"
    :lines="lines"
    :color="color"
    :decoration="decoration"
    :size="size"
    :iconStyle="iconStyle"
    :margin="margin"
    :lineHeight="lineHeight"
    :align="align"
    :wordWrap="wordWrap"
    :customStyle="customStyle"
  ></uvText>
 * 此组件存在的理由是，在nvue下，u-text被uni-app官方占用了，u-text在nvue中相当于input组件
 * 所以在nvue下，取名为u--input，内部其实还是u-text.vue，只不过做一层中转
 * 不使用v-bind="$attrs"，而是分开独立写传参，是因为微信小程序不支持此写法
 */
  name: 'u--text',
  mixins: [mpMixin, mixin, props],
  components: {
    uvText
  }

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

@@ -1 +1 @@
-<template>
  <uvTextarea
    :value="value"
    :modelValue="modelValue"
    :placeholder="placeholder"
    :height="height"
    :confirmType="confirmType"
    :disabled="disabled"
    :count="count"
    :focus="focus"
    :autoHeight="autoHeight"
    :fixed="fixed"
    :cursorSpacing="cursorSpacing"
    :cursor="cursor"
    :showConfirmBar="showConfirmBar"
    :selectionStart="selectionStart"
    :selectionEnd="selectionEnd"
    :adjustPosition="adjustPosition"
    :disableDefaultPadding="disableDefaultPadding"
    :holdKeyboard="holdKeyboard"
    :maxlength="maxlength"
    :border="border"
    :customStyle="customStyle"
    :formatter="formatter"
    :ignoreCompositionEvent="ignoreCompositionEvent"
    @input="(e) => $emit('input', e)"
    @update:modelValue="(e) => $emit('update:modelValue', e)"
  ></uvTextarea>
 * 此组件存在的理由是，在nvue下，u--textarea被uni-app官方占用了，u-textarea在nvue中相当于textarea组件
 * 所以在nvue下，取名为u--textarea，内部其实还是u-textarea.vue，只不过做一层中转
 */
  name: 'u--textarea',
  mixins: [mpMixin, props, mixin],
  components: {
    uvTextarea
  }
+<template>
  <uvTextarea
    :value="value"
    :modelValue="modelValue"
    :placeholder="placeholder"
    :height="height"
    :confirmType="confirmType"
    :disabled="disabled"
    :count="count"
    :focus="focus"
    :autoHeight="autoHeight"
    :fixed="fixed"
    :cursorSpacing="cursorSpacing"
    :cursor="cursor"
    :showConfirmBar="showConfirmBar"
    :selectionStart="selectionStart"
    :selectionEnd="selectionEnd"
    :adjustPosition="adjustPosition"
    :disableDefaultPadding="disableDefaultPadding"
    :holdKeyboard="holdKeyboard"
    :maxlength="maxlength"
    :border="border"
    :customStyle="customStyle"
    :formatter="formatter"
    :ignoreCompositionEvent="ignoreCompositionEvent"
    @input="(e) => $emit('input', e)"
    @update:modelValue="(e) => $emit('update:modelValue', e)"
  ></uvTextarea>
 * 此组件存在的理由是，在nvue下，u--textarea被uni-app官方占用了，u-textarea在nvue中相当于textarea组件
 * 所以在nvue下，取名为u--textarea，内部其实还是u-textarea.vue，只不过做一层中转
 */
  name: 'u--textarea',
  mixins: [mpMixin, props, mixin],
  components: {
    uvTextarea
  }

package/uview-plus/{libs/config/props → components/u-action-sheet}/actionSheet.js

@@ -13,13 +13,14 @@ export default {
         show: false,
         title: '',
         description: '',
-        actions: () => [],
+        actions: [],
         index: '',
         cancelText: '',
         closeOnClickAction: true,
         safeAreaInsetBottom: true,
         openType: '',
         closeOnClickOverlay: true,
-        round: 0
+        round: 0,
+        wrapMaxHeight: '600px'
     }
 }

package/uview-plus/components/u-action-sheet/props.js

@@ -1,55 +1,62 @@
-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: {
     // 操作菜单是否展示 （默认false）
     show: {
       type: Boolean,
-      default: defprops.actionSheet.show
+      default: () => defProps.actionSheet.show
     },
     // 标题
     title: {
       type: String,
-      default: defprops.actionSheet.title
+      default: () => defProps.actionSheet.title
     },
     // 选项上方的描述信息
     description: {
       type: String,
-      default: defprops.actionSheet.description
+      default: () => defProps.actionSheet.description
     },
     // 数据
     actions: {
       type: Array,
-      default: defprops.actionSheet.actions
+      default: () => defProps.actionSheet.actions
     },
     // 取消按钮的文字，不为空时显示按钮
     cancelText: {
       type: String,
-      default: defprops.actionSheet.cancelText
+      default: () => defProps.actionSheet.cancelText
     },
     // 点击某个菜单项时是否关闭弹窗
     closeOnClickAction: {
       type: Boolean,
-      default: defprops.actionSheet.closeOnClickAction
+      default: () => defProps.actionSheet.closeOnClickAction
     },
     // 处理底部安全区（默认true）
     safeAreaInsetBottom: {
       type: Boolean,
-      default: defprops.actionSheet.safeAreaInsetBottom
+      default: () => defProps.actionSheet.safeAreaInsetBottom
     },
     // 小程序的打开方式
     openType: {
       type: String,
-      default: defprops.actionSheet.openType
+      default: () => defProps.actionSheet.openType
     },
     // 点击遮罩是否允许关闭 (默认true)
     closeOnClickOverlay: {
       type: Boolean,
-      default: defprops.actionSheet.closeOnClickOverlay
+      default: () => defProps.actionSheet.closeOnClickOverlay
     },
     // 圆角值
     round: {
       type: [Boolean, String, Number],
-      default: defprops.actionSheet.round
+      default: () => defProps.actionSheet.round
+    },
+    // 选项区域最大高度
+    wrapMaxHeight: {
+      type: [String],
+      default: () => defProps.actionSheet.wrapMaxHeight
     }
   }
-};
+});

package/uview-plus/components/u-action-sheet/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;
@@ -37,7 +52,7 @@ view, scroll-view, swiper-item {
   text-align: center;
 }
 .u-action-sheet__item-wrap__item {
-  padding: 15px;
+  padding: 17px;
   /* #ifndef APP-NVUE */
   display: flex;
   /* #endif */
@@ -61,8 +76,7 @@ view, scroll-view, swiper-item {
   font-size: 16px;
   color: var(--u-content-color);
   text-align: center;
-  padding: 16px;
 }
 .u-action-sheet--hover {
-  background-color: #f2f3f5;
+  background-color: rgb(242, 243, 245);
 }

package/uview-plus/components/u-action-sheet/style.scss

@@ -8,7 +8,7 @@ $u-action-sheet-header-icon-wrap-top: 15px !default;
 $u-action-sheet-description-font-size: 13px !default;
 $u-action-sheet-description-color: 14px !default;
 $u-action-sheet-description-margin: 18px 15px !default;
-$u-action-sheet-item-wrap-item-padding: 15px !default;
+$u-action-sheet-item-wrap-item-padding: 17px !default;
 $u-action-sheet-item-wrap-name-font-size: 16px !default;
 $u-action-sheet-item-wrap-subname-font-size: 13px !default;
 $u-action-sheet-item-wrap-subname-color: #c0c4cc !default;
@@ -75,7 +75,7 @@ $u-action-sheet-cancel-text-hover-background-color: rgb(242, 243, 245) !default;
     font-size: $u-action-sheet-cancel-text-font-size;
     color: $u-action-sheet-cancel-text-color;
     text-align: center;
-    padding: $u-action-sheet-cancel-text-font-size;
+    // padding: $u-action-sheet-cancel-text-font-size;
   }
 
   &--hover {

package/uview-plus/components/u-action-sheet/u-action-sheet.vue

@@ -20,7 +20,7 @@
       </text>
       <slot>
         <u-line v-if="description"></u-line>
-        <view class="u-action-sheet__item-wrap">
+        <scroll-view scroll-y class="u-action-sheet__item-wrap" :style="{ maxHeight: wrapMaxHeight }">
           <view :key="index" v-for="(item, index) in actions">
             <!-- #ifdef MP -->
             <button
@@ -60,23 +60,27 @@
             <!-- #endif -->
             <u-line v-if="index !== actions.length - 1"></u-line>
           </view>
-        </view>
+        </scroll-view>
       </slot>
       <u-gap bgColor="#eaeaec" height="6" v-if="cancelText"></u-gap>
-      <view hover-class="u-action-sheet--hover">
-        <text @touchmove.stop.prevent :hover-stay-time="150" v-if="cancelText" class="u-action-sheet__cancel-text" @tap="cancel">
-          {{ cancelText }}
-        </text>
+      <view
+        class="u-action-sheet__item-wrap__item u-action-sheet__cancel"
+        hover-class="u-action-sheet--hover"
+        @tap="cancel"
+        v-if="cancelText"
+      >
+        <text @touchmove.stop.prevent :hover-stay-time="150" class="u-action-sheet__cancel-text">{{ cancelText }}</text>
       </view>
     </view>
   </u-popup>
 </template>
 <script>
-import openType from '../../libs/mixin/openType';
-import button from '../../libs/mixin/button';
-import props from './props.js';
-import mpMixin from '../../libs/mixin/mpMixin.js';
-import mixin from '../../libs/mixin/mixin.js';
+import { openType } from '../../libs/mixin/openType';
+import { buttonMixin } from '../../libs/mixin/button';
+import { props } from './props';
+import { mpMixin } from '../../libs/mixin/mpMixin';
+import { mixin } from '../../libs/mixin/mixin';
+import { addUnit } from '../../libs/function/index';
 /**
  * ActionSheet 操作菜单
  * @description 本组件用于从底部弹出一个操作菜单，供用户选择并返回结果。本组件功能类似于uni的uni.showActionSheetAPI，配置更加灵活，所有平台都表现一致。
@@ -113,7 +117,7 @@ import mixin from '../../libs/mixin/mixin.js';
 export default {
   name: 'u-action-sheet',
   // 一些props参数和methods方法，通过mixin混入，因为其他文件也会用到
-  mixins: [openType, button, mixin, props],
+  mixins: [openType, buttonMixin, mixin, props],
   data() {
     return {};
   },
@@ -123,22 +127,25 @@ export default {
       return (index) => {
         let style = {};
         if (this.actions[index].color) style.color = this.actions[index].color;
-        if (this.actions[index].fontSize) style.fontSize = uni.$u.addUnit(this.actions[index].fontSize);
+        if (this.actions[index].fontSize) style.fontSize = addUnit(this.actions[index].fontSize);
         // 选项被禁用的样式
         if (this.actions[index].disabled) style.color = '#c0c4cc';
         return style;
       };
     }
   },
+  emits: ['close', 'select', 'update:show'],
   methods: {
     closeHandler() {
       // 允许点击遮罩关闭时，才发出close事件
       if (this.closeOnClickOverlay) {
+        this.$emit('update:show', false);
         this.$emit('close');
       }
     },
     // 点击取消按钮
     cancel() {
+      this.$emit('update:show', false);
       this.$emit('close');
     },
     selectHandler(index) {
@@ -146,6 +153,7 @@ export default {
       if (item && !item.disabled && !item.loading) {
         this.$emit('select', item);
         if (this.closeOnClickAction) {
+          this.$emit('update:show', false);
           this.$emit('close');
         }
       }

package/uview-plus/components/u-action-sheet-data/style.css

@@ -0,0 +1,10 @@
+.u-action-sheet-data__trigger {
+  position: relative;
+}
+.u-action-sheet-data__trigger__cover {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+}

package/uview-plus/components/u-action-sheet-data/style.scss

@@ -0,0 +1,12 @@
+.u-action-sheet-data {
+  &__trigger {
+    position: relative;
+    &__cover {
+      position: absolute;
+      top: 0;
+      left: 0;
+      right: 0;
+      bottom: 0;
+    }
+  }
+}