@10yun/cv-mobile-ui 0.5.57 → 0.5.58

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@10yun/cv-mobile-ui",
-  "version": "0.5.57",
+  "version": "0.5.58",
   "description": "十云cvjs移动端ui，适用uniapp",
   "homepage": "http://cvjs.cn/cv-mobile-ui/",
   "license": "Apache-2.0",

package/ui-cv/components/cv-dialog-bottom/cv-dialog-bottom.vue

@@ -1,14 +1,12 @@
 <template>
-  <view class="cv-dialog-bottom">
-    <view class="cu-modal bottom-modal" :class="show ? 'show' : ''">
-      <view class="cu-dialog">
-        <view class="cu-bar bg-white">
-          <view class="action text-blue" @tap="cancel">取消</view>
-          <view class="action text-green" @tap="confirm">确定</view>
-        </view>
-        <view class="cv-dialog-body" :style="bodyClass">
-          <slot name="default" />
-        </view>
+  <view class="cv-dialog-bottom__wrap" :class="show ? 'show' : ''">
+    <view class="cv-dialog-bottom__box">
+      <view class="cv-dialog-bottom__bar">
+        <view class="action cv-dialog-bottom__bar-left" @tap="cancel">取消</view>
+        <view class="action cv-dialog-bottom__bar-right" @tap="confirm">确定</view>
+      </view>
+      <view class="cv-dialog-bottom__body" :style="bodyClass">
+        <slot name="default" />
       </view>
     </view>
   </view>
@@ -49,10 +47,7 @@ export default {
 };
 </script>
 <style>
-.cu-modal.bottom-modal {
-  margin-bottom: -552px;
-}
-.cu-modal {
+.cv-dialog-bottom__wrap {
   position: fixed;
   top: 0;
   right: 0;
@@ -69,32 +64,26 @@ export default {
   background: rgba(0, 0, 0, 0.6);
   transition: all 0.3s ease-in-out 0s;
   pointer-events: none;
+  margin-bottom: -552px;
 }
-.cu-modal.bottom-modal.show {
-  margin-bottom: 0;
+.cv-dialog-bottom__wrap::before {
+  vertical-align: bottom;
 }
-.cu-modal.show {
+.cv-dialog-bottom__wrap::before {
+  content: '\200B';
+  display: inline-block;
+  height: 100%;
+}
+.cv-dialog-bottom__wrap.show {
   opacity: 1;
   transition-duration: 0.3s;
   transform: scale(1);
   overflow-x: hidden;
   overflow-y: auto;
   pointer-events: auto;
+  margin-bottom: 0;
 }
-.cu-modal.bottom-modal::before {
-  vertical-align: bottom;
-}
-.cu-modal::before {
-  content: '\200B';
-  display: inline-block;
-  height: 100%;
-  vertical-align: middle;
-}
-.cu-modal.bottom-modal .cu-dialog {
-  width: 100%;
-  border-radius: 0;
-}
-.cu-dialog {
+.cv-dialog-bottom__box {
   position: relative;
   display: inline-block;
   vertical-align: middle;
@@ -102,15 +91,14 @@ export default {
   margin-right: auto;
   width: 375px;
   max-width: 100%;
+  width: 100%;
   background-color: #f8f8f8;
-  border-radius: 5px;
+  border-radius: 0;
+  border-top-left-radius: 15px;
+  border-top-right-radius: 15px;
   overflow: hidden;
 }
-.bg-white {
-  background-color: #ffffff;
-  color: #666666;
-}
-.cu-bar {
+.cv-dialog-bottom__bar {
   display: flex;
   position: relative;
   -webkit-box-align: center;
@@ -120,19 +108,14 @@ export default {
   -webkit-box-pack: justify;
   -webkit-justify-content: space-between;
   justify-content: space-between;
+  background-color: #ffffff;
+  color: #666666;
 }
-.cu-modal .cu-dialog > .cu-bar:first-child .action {
+.cv-dialog-bottom__bar-left {
   min-width: 55px;
-  margin-right: 0;
   min-height: 45px;
-}
-.cu-bar .action:first-child {
+  margin-right: 0;
   margin-left: 16px;
-}
-.cu-bar .action:last-child {
-  margin-right: 16px !important;
-}
-.cu-bar .action {
   display: flex;
   -webkit-box-align: center;
   -webkit-align-items: center;
@@ -142,17 +125,13 @@ export default {
   -webkit-justify-content: center;
   justify-content: center;
   max-width: 100%;
-  font-size: 16px;
-}
-.text-green {
-  color: #39b54a;
+  color: #0081ff;
 }
-.cu-modal .cu-dialog > .cu-bar:first-child .action {
+.cv-dialog-bottom__bar-right {
   min-width: 55px;
-  margin-right: 0;
   min-height: 45px;
-}
-.cu-bar .action {
+  margin-right: 16px;
+  font-size: 16px;
   display: flex;
   -webkit-box-align: center;
   -webkit-align-items: center;
@@ -162,11 +141,9 @@ export default {
   -webkit-justify-content: center;
   justify-content: center;
   max-width: 100%;
+  color: #39b54a;
 }
-.text-blue {
-  color: #0081ff;
-}
-.cv-dialog-body {
+.cv-dialog-bottom__body {
   padding-top: 10px;
   max-height: 500px;
   overflow: auto;

package/ui-cv/components/cv-dialog-full/cv-dialog-full.vue

@@ -1,11 +1,12 @@
 <template>
-  <view class="cv-dialog-bottom cv-modal bottom-modal" :class="show ? 'show' : ''">
-    <view class="cv-dialog">
-      <view class="cv-bar bg-white">
-        <view class="action text-blue" @tap="cancel">取消</view>
-        <view class="action text-green" @tap="confirm">确定</view>
+  <view class="cv-dialog-full__wrap" :class="localShow ? 'show' : ''">
+    <view class="cv-dialog-full__box">
+      <view class="cv-dialog-full__bar">
+        <view class="cv-dialog-full__bar-left" v-if="showLeft" @tap="cancel">取消</view>
+        <view class="cv-dialog-full__bar-title"><slot name="title">{{ title }}</slot></view>
+        <view class="cv-dialog-full__bar-right" v-if="showRight" @tap="confirm">确定</view>
       </view>
-      <view class="cv-dialog-body" :style="bodyClass">
+      <view class="cv-dialog-full__body" :style="bodyClass">
         <slot name="default" />
       </view>
     </view>
@@ -26,14 +27,34 @@ export default {
     bodyClass: {
       type: [String],
       default: ''
+    },
+    showLeft: {
+      type: Boolean,
+      default: true
+    },
+    showRight: {
+      type: Boolean,
+      default: true
+    },
+    title: {
+      type: [String],
+      default: ''
     }
   },
   watch: {},
   data() {
-    return {};
+    return {
+      localShow: false
+    };
   },
   created() {},
   methods: {
+    open() {
+      this.localShow = true;
+    },
+    close() {
+      this.localShow = false;
+    },
     confirm() {
       this.onConfirm(true);
     },
@@ -47,15 +68,12 @@ export default {
 };
 </script>
 <style>
-.cv-modal.bottom-modal {
-  left: 100%;
-}
-.cv-modal {
+.cv-dialog-full__wrap {
   width: 100%;
   position: fixed;
   top: 0;
   bottom: 0;
-  left: 0;
+  left: 100%;
   z-index: 999;
   opacity: 0;
   outline: 0;
@@ -66,47 +84,36 @@ export default {
   transition: all 0.2s ease-in-out 0s;
   pointer-events: none;
 }
-.cv-modal.bottom-modal.show {
+.cv-dialog-full__wrap.show {
   left: 0;
-}
-.cv-modal.show {
   opacity: 1;
   transition-duration: 0.2s;
   overflow-x: hidden;
   overflow-y: auto;
   pointer-events: auto;
 }
-.cv-modal.bottom-modal::before {
-  vertical-align: bottom;
-}
-.cv-modal::before {
+.cv-dialog-full__wrap::before {
   content: '\200B';
   display: inline-block;
   height: 100%;
   vertical-align: middle;
+  vertical-align: bottom;
 }
-.cv-modal.bottom-modal .cv-dialog {
+.cv-dialog-full__wrap .cv-dialog {
   width: 100%;
   border-radius: 0;
   height: 100%;
 }
-.cv-dialog {
-  position: relative;
+.cv-dialog-full__box {
   display: inline-block;
   vertical-align: middle;
-  margin-left: auto;
-  margin-right: auto;
-  width: 375px;
+  width: 100%;
   max-width: 100%;
   background-color: #f8f8f8;
-  border-radius: 5px;
   overflow: hidden;
+  height: 100%;
 }
-.bg-white {
-  background-color: #ffffff;
-  color: #666666;
-}
-.cv-bar {
+.cv-dialog-full__bar {
   display: flex;
   position: relative;
   align-items: center;
@@ -114,49 +121,35 @@ export default {
   -webkit-box-pack: justify;
   -webkit-justify-content: space-between;
   justify-content: space-between;
+  background-color: #ffffff;
+  color: #666666;
+  padding: 0 10px;
+  font-size: 15px;
 }
-.cv-modal .cv-dialog > .cv-bar:first-child .action {
-  min-width: 55px;
-  margin-right: 0;
-  min-height: 45px;
-}
-.cv-bar .action:first-child {
-  margin-left: 16px;
-}
-.cv-bar .action:last-child {
-  margin-right: 16px !important;
+.cv-dialog-full__bar-title {
+  flex: 1;
+  display: flex;
+  justify-content: center;
+  font-size: 15px;
+  font-weight: 400;
 }
-.cv-bar .action {
+.cv-dialog-full__bar-left {
   display: flex;
   align-items: center;
-  height: 100%;
   justify-content: center;
-  max-width: 100%;
-  font-size: 16px;
-}
-.text-green {
-  color: #39b54a;
-}
-.cv-modal .cv-dialog > .cv-bar:first-child .action {
   min-width: 55px;
-  margin-right: 0;
-  min-height: 45px;
+  color: #0081ff;
 }
-.cv-bar .action {
+.cv-dialog-full__bar-right {
   display: flex;
   align-items: center;
-  height: 100%;
-  -webkit-box-pack: center;
-  -webkit-justify-content: center;
   justify-content: center;
-  max-width: 100%;
-}
-.text-blue {
-  color: #0081ff;
+  min-width: 55px;
+  color: #39b54a;
 }
-.cv-dialog-body {
+.cv-dialog-full__body {
   padding: 10px;
-  height: calc(100% - 45px - 20px);
+  height: calc(100% - 45px);
   overflow: auto;
   background-color: #fff;
 }

package/ui-cv/components/cv-dialog-share/share.vue

@@ -6,16 +6,7 @@
     @touchmove.stop.prevent="stopPrevent"
     :style="{ backgroundColor: backgroundColor }"
   >
-    <view
-      class="mask-content"
-      @click.stop.prevent="stopPrevent"
-      :style="[
-        {
-          height: config.height,
-          transform: transform
-        }
-      ]"
-    >
+    <view class="mask-content" @click.stop.prevent="stopPrevent" :style="[{ height: config.height, transform: transform }]">
       <scroll-view class="view-content" scroll-y>
         <view class="share-header">分享到</view>
         <view class="share-list">

package/ui-cv/components/cv-dialog-share/tui-share.vue

@@ -1,5 +1,5 @@
 <template>
-  <view class="container">
+  <view class="up-share-container">
     <text class="up-share-title">分享到</text>
     <view class="up-share-list">
       <view class="up-share-item" hover-class="up-hover" :hover-stay-time="150" v-for="(item, index) in shareList" :key="index">
@@ -41,7 +41,7 @@ export default {
 };
 </script>
 <style scoped>
-.container {
+.up-share-container {
   padding: 0;
   background-color: #e8e8e8;
 }

package/ui-cv/components/cv-filter-hm/cv-filter-hm.vue

@@ -4,9 +4,9 @@
       <template v-for="(item, index) in menu" :key="index">
         <view class="first-menu" :class="{ on: showPage == index }" @tap="togglePage(index)">
           <text class="name" :style="{ color: color }">{{ item.name }}</text>
-          <!-- <cv-icons type="arrow-type1-up" size="12" class="arrows" v-if="statusList[index].isActive" />
-          <cv-icons type="arrow-type1-down" size="12" class="arrows" v-if="!statusList[index].isActive" /> -->
-          <cv-icons type="arrow-type1-down" size="12" color="#aaa" :style="'transform:rotate(' + triangleDeg[index] + 'deg);'" />
+          <!-- <cv-icons type="arrowUp" size="12" class="arrows" v-if="statusList[index].isActive" />
+          <cv-icons type="arrowDown" size="12" class="arrows" v-if="!statusList[index].isActive" /> -->
+          <cv-icons type="arrowDown" size="12" color="#aaa" :style="'transform:rotate(' + triangleDeg[index] + 'deg);'" />
         </view>
       </template>
     </view>
@@ -212,8 +212,8 @@ export default {
         this.defaultActive.length > 0
           ? this.defaultActive
           : this.activeMenuArr.length > 0
-          ? this.activeMenuArr
-          : tmpMenuActiveArr;
+            ? this.activeMenuArr
+            : tmpMenuActiveArr;
       this.defaultActive = [];
       this.activeMenuArr = JSON.parse(JSON.stringify(tmpMenuActiveArr));
       this.shadowActiveMenuArr = JSON.parse(JSON.stringify(tmpMenuActiveArr));
@@ -641,7 +641,9 @@ export default {
   height: 13px;
   align-items: center;
   justify-content: center;
-  transition: transform 0.2s linear, color 0.2s linear;
+  transition:
+    transform 0.2s linear,
+    color 0.2s linear;
 }
 .sub-menu-class {
   width: 100%;

package/ui-cv/components/cv-icons/cv-icons.vue

@@ -1,12 +1,8 @@
-<!-- <text :style="{ color: color, 'font-size': size + 'px' }" class="cv-icons" :class="rotate ? 'cv-icons-turn' : ''">
+<!-- <text :style="mergeIconStyle" class="cv-icons" :class="rotate ? 'cv-icons-turn' : ''">
   {{ icons[type] }}
 </text> -->
 <template>
-  <text
-    :style="{ color: color, 'font-size': size + 'px' }"
-    class="cv-icon"
-    :class="rotate ? 'cv-icons-turn' : 'cv-icon-' + type"
-  ></text>
+  <text :style="mergeIconStyle" class="cv-icon" :class="rotate ? 'cv-icons-turn' : 'cv-icon-' + type"></text>
 </template>
 
 <script>
@@ -44,6 +40,21 @@ export default {
       }
     }
   },
+  computed: {
+    mergeIconStyle() {
+      let sizePx = '';
+      if (typeof this.size === 'string' && (this.size.includes('px') || this.size.includes('rpx'))) {
+        sizePx = this.size;
+      } else {
+        sizePx = `${parseFloat(this.size)}px`;
+      }
+      return {
+        color: this.color,
+        height: sizePx,
+        'font-size': sizePx
+      };
+    }
+  },
   data() {
     return {
       // icons: icons

package/ui-cv/components/cv-upload-image/demo.vue

@@ -34,7 +34,7 @@
           </view>
         </view>
       </view>
-      <cv-upload-image layout="more" maxlength="9" v-model="imageList" :src="imageList" :upApiFunc="upApiFunc" />
+      <cv-upload-image layout="more" maxlength="9" v-model="imageList" :src="imageList" />
       <view class="uni-list list-pd">
         <view class="uni-list-cell cell-pd">
           <view class="uni-uploader">

package/uview-plus/components/u-button/props-old.js

@@ -0,0 +1,159 @@
+import { defineMixin } from '../../libs/vue';
+import defProps from '../../libs/config/props.js';
+export const props = defineMixin({
+  props: {
+    // 是否细边框
+    hairline: {
+      type: Boolean,
+      default: () => defProps.button.hairline
+    },
+    // 按钮的预置样式，info，primary，error，warning，success
+    type: {
+      type: String,
+      default: () => defProps.button.type
+    },
+    // 按钮尺寸，large，normal，small，mini
+    size: {
+      type: String,
+      default: () => defProps.button.size
+    },
+    // 按钮形状，circle（两边为半圆），square（带圆角）
+    shape: {
+      type: String,
+      default: () => defProps.button.shape
+    },
+    // 按钮是否镂空
+    plain: {
+      type: Boolean,
+      default: () => defProps.button.plain
+    },
+    // 是否禁止状态
+    disabled: {
+      type: Boolean,
+      default: () => defProps.button.disabled
+    },
+    // 是否加载中
+    loading: {
+      type: Boolean,
+      default: () => defProps.button.loading
+    },
+    // 加载中提示文字
+    loadingText: {
+      type: [String, Number],
+      default: () => defProps.button.loadingText
+    },
+    // 加载状态图标类型
+    loadingMode: {
+      type: String,
+      default: () => defProps.button.loadingMode
+    },
+    // 加载图标大小
+    loadingSize: {
+      type: [String, Number],
+      default: () => defProps.button.loadingSize
+    },
+    // 开放能力，具体请看uniapp稳定关于button组件部分说明
+    // https://uniapp.dcloud.io/component/button
+    openType: {
+      type: String,
+      default: () => defProps.button.openType
+    },
+    // 用于 <form> 组件，点击分别会触发 <form> 组件的 submit/reset 事件
+    // 取值为submit（提交表单），reset（重置表单）
+    formType: {
+      type: String,
+      default: () => defProps.button.formType
+    },
+    // 打开 APP 时，向 APP 传递的参数，open-type=launchApp时有效
+    // 只微信小程序、QQ小程序有效
+    appParameter: {
+      type: String,
+      default: () => defProps.button.appParameter
+    },
+    // 指定是否阻止本节点的祖先节点出现点击态，微信小程序有效
+    hoverStopPropagation: {
+      type: Boolean,
+      default: () => defProps.button.hoverStopPropagation
+    },
+    // 指定返回用户信息的语言，zh_CN 简体中文，zh_TW 繁体中文，en 英文。只微信小程序有效
+    lang: {
+      type: String,
+      default: () => defProps.button.lang
+    },
+    // 会话来源，open-type="contact"时有效。只微信小程序有效
+    sessionFrom: {
+      type: String,
+      default: () => defProps.button.sessionFrom
+    },
+    // 会话内消息卡片标题，open-type="contact"时有效
+    // 默认当前标题，只微信小程序有效
+    sendMessageTitle: {
+      type: String,
+      default: () => defProps.button.sendMessageTitle
+    },
+    // 会话内消息卡片点击跳转小程序路径，open-type="contact"时有效
+    // 默认当前分享路径，只微信小程序有效
+    sendMessagePath: {
+      type: String,
+      default: () => defProps.button.sendMessagePath
+    },
+    // 会话内消息卡片图片，open-type="contact"时有效
+    // 默认当前页面截图，只微信小程序有效
+    sendMessageImg: {
+      type: String,
+      default: () => defProps.button.sendMessageImg
+    },
+    // 是否显示会话内消息卡片，设置此参数为 true，用户进入客服会话会在右下角显示"可能要发送的小程序"提示，
+    // 用户点击后可以快速发送小程序消息，open-type="contact"时有效
+    showMessageCard: {
+      type: Boolean,
+      default: () => defProps.button.showMessageCard
+    },
+    // 额外传参参数，用于小程序的data-xxx属性，通过target.dataset.name获取
+    dataName: {
+      type: String,
+      default: () => defProps.button.dataName
+    },
+    // 节流，一定时间内只能触发一次
+    throttleTime: {
+      type: [String, Number],
+      default: () => defProps.button.throttleTime
+    },
+    // 按住后多久出现点击态，单位毫秒
+    hoverStartTime: {
+      type: [String, Number],
+      default: () => defProps.button.hoverStartTime
+    },
+    // 手指松开后点击态保留时间，单位毫秒
+    hoverStayTime: {
+      type: [String, Number],
+      default: () => defProps.button.hoverStayTime
+    },
+    // 按钮文字，之所以通过props传入，是因为slot传入的话
+    // nvue中无法控制文字的样式
+    text: {
+      type: [String, Number],
+      default: () => defProps.button.text
+    },
+    // 按钮图标
+    icon: {
+      type: String,
+      default: () => defProps.button.icon
+    },
+    // 按钮图标
+    iconColor: {
+      type: String,
+      default: () => defProps.button.icon
+    },
+    // 按钮颜色，支持传入linear-gradient渐变色
+    color: {
+      type: String,
+      default: () => defProps.button.color
+    },
+    // 停止冒泡
+    stop: {
+      type: Boolean,
+      default: () => defProps.button.stop
+    }
+  }
+});

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

@@ -2,6 +2,13 @@ import { defineMixin } from '../../libs/vue';
 import defProps from '../../libs/config/props.js';
 export const props = defineMixin({
   props: {
+    /**
+     * 自动加载禁用
+     */
+    autoLoading: {
+      type: Boolean,
+      default: false
+    },
     // 是否细边框
     hairline: {
       type: Boolean,