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

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

@@ -1,10 +1,11 @@
 <template>
-  <text class="u-link" @tap.stop="openLink" :style="[linkStyle, $u.addStyle(customStyle)]">{{ text }}</text>
+  <text class="u-link" @tap.stop="openLink" :style="[linkStyle, addStyle(customStyle)]">{{ text }}</text>
 </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, addUnit, getPx, toast } from '../../libs/function/index';
 /**
  * link 超链接
  * @description 该组件为超链接组件，在不同平台有不同表现形式：在APP平台会通过plus环境打开内置浏览器，在小程序中把链接复制到粘贴板，同时提示信息，在H5中通过window.open打开链接。
@@ -27,9 +28,9 @@ export default {
     linkStyle() {
       const style = {
         color: this.color,
-        fontSize: uni.$u.addUnit(this.fontSize),
+        fontSize: addUnit(this.fontSize),
         // line-height设置为比字体大小多2px
-        lineHeight: uni.$u.addUnit(uni.$u.getPx(this.fontSize) + 2),
+        lineHeight: addUnit(getPx(this.fontSize) + 2),
         textDecoration: this.underLine ? 'underline' : 'none'
       };
       // if (this.underLine) {
@@ -39,7 +40,9 @@ export default {
       return style;
     }
   },
+  emits: ['click'],
   methods: {
+    addStyle,
     openLink() {
       // #ifdef APP-PLUS
       plus.runtime.openURL(this.href);
@@ -53,7 +56,7 @@ export default {
         success: () => {
           uni.hideToast();
           this.$nextTick(() => {
-            uni.$u.toast(this.mpTips);
+            toast(this.mpTips);
           });
         }
       });

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

@@ -1,76 +1,101 @@
-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: {
     // 控制是否出现滚动条，仅nvue有效
     showScrollbar: {
       type: Boolean,
-      default: defprops.list.showScrollbar
+      default: () => defProps.list.showScrollbar
     },
     // 距底部多少时触发scrolltolower事件
     lowerThreshold: {
       type: [String, Number],
-      default: defprops.list.lowerThreshold
+      default: () => defProps.list.lowerThreshold
     },
     // 距顶部多少时触发scrolltoupper事件，非nvue有效
     upperThreshold: {
       type: [String, Number],
-      default: defprops.list.upperThreshold
+      default: () => defProps.list.upperThreshold
     },
     // 设置竖向滚动条位置
     scrollTop: {
       type: [String, Number],
-      default: defprops.list.scrollTop
+      default: () => defProps.list.scrollTop
     },
     // 控制 onscroll 事件触发的频率，仅nvue有效
     offsetAccuracy: {
       type: [String, Number],
-      default: defprops.list.offsetAccuracy
+      default: () => defProps.list.offsetAccuracy
     },
     // 启用 flexbox 布局。开启后，当前节点声明了display: flex就会成为flex container，并作用于其孩子节点，仅微信小程序有效
     enableFlex: {
       type: Boolean,
-      default: defprops.list.enableFlex
+      default: () => defProps.list.enableFlex
     },
     // 是否按分页模式显示List，默认值false
     pagingEnabled: {
       type: Boolean,
-      default: defprops.list.pagingEnabled
+      default: () => defProps.list.pagingEnabled
     },
     // 是否允许List滚动
     scrollable: {
       type: Boolean,
-      default: defprops.list.scrollable
+      default: () => defProps.list.scrollable
     },
     // 值应为某子元素id（id不能以数字开头）
     scrollIntoView: {
       type: String,
-      default: defprops.list.scrollIntoView
+      default: () => defProps.list.scrollIntoView
     },
     // 在设置滚动条位置时使用动画过渡
     scrollWithAnimation: {
       type: Boolean,
-      default: defprops.list.scrollWithAnimation
+      default: () => defProps.list.scrollWithAnimation
     },
     // iOS点击顶部状态栏、安卓双击标题栏时，滚动条返回顶部，只对微信小程序有效
     enableBackToTop: {
       type: Boolean,
-      default: defprops.list.enableBackToTop
+      default: () => defProps.list.enableBackToTop
     },
     // 列表的高度
     height: {
       type: [String, Number],
-      default: defprops.list.height
+      default: () => defProps.list.height
     },
     // 列表宽度
     width: {
       type: [String, Number],
-      default: defprops.list.width
+      default: () => defProps.list.width
     },
     // 列表前后预渲染的屏数，1代表一个屏幕的高度，1.5代表1个半屏幕高度
     preLoadScreen: {
       type: [String, Number],
-      default: defprops.list.preLoadScreen
+      default: () => defProps.list.preLoadScreen
+    },
+    // 开启自定义下拉刷新
+    refresherEnabled: {
+      type: Boolean,
+      default: () => false
+    },
+    // 设置自定义下拉刷新阈值
+    refresherThreshold: {
+      type: Number,
+      default: () => 45
+    },
+    // 设置自定义下拉刷新默认样式，支持设置 black，white，none，none 表示不使用默认样式
+    refresherDefaultStyle: {
+      type: String,
+      default: () => 'black'
+    },
+    // 设置自定义下拉刷新区域背景颜色
+    refresherBackground: {
+      type: String,
+      default: () => '#FFF'
+    },
+    // 设置当前下拉刷新状态，true 表示下拉刷新已经被触发，false 表示下拉刷新未被触发
+    refresherTriggered: {
+      type: Boolean,
+      default: () => false
     }
-    // vue下，是否开启虚拟列表
   }
-};
+});

package/uview-plus/components/u-list/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;
@@ -14,4 +29,4 @@ view, scroll-view, swiper-item {
   display: flex;
   /* #endif */
   flex-direction: column;
-}
+}

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

@@ -28,6 +28,16 @@
     @scroll="onScroll"
     @scrolltolower="scrolltolower"
     @scrolltoupper="scrolltoupper"
+    :refresher-enabled="refresherEnabled"
+    :refresher-threshold="refresherThreshold"
+    :refresher-default-style="refresherDefaultStyle"
+    :refresher-background="refresherBackground"
+    :refresher-triggered="refresherTriggered"
+    @refresherpulling="refresherpulling"
+    @refresherrefresh="refresherrefresh"
+    @refresherrestore="refresherrestore"
+    @refresherabort="refresherabort"
+    :scroll-anchoring="true"
   >
     <view>
       <slot />
@@ -36,9 +46,10 @@
   <!-- #endif -->
 </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, sleep, getWindowInfo } from '../../libs/function/index';
 // #ifdef APP-NVUE
 const dom = uni.requireNativePlugin('dom');
 // #endif
@@ -78,18 +89,17 @@ export default {
       innerScrollTop: 0,
       // vue下，scroll-view在上拉加载时的偏移值
       offset: 0,
-      sys: uni.$u.sys()
+      sys: getWindowInfo()
     };
   },
   computed: {
     listStyle() {
-      const style = {},
-        addUnit = uni.$u.addUnit;
+      const style = {};
       if (this.width != 0) style.width = addUnit(this.width);
       if (this.height != 0) style.height = addUnit(this.height);
       // 如果没有定义列表高度，则默认使用屏幕高度
       if (!style.height) style.height = addUnit(this.sys.windowHeight, 'px');
-      return uni.$u.deepMerge(style, uni.$u.addStyle(this.customStyle));
+      return deepMerge(style, addStyle(this.customStyle));
     }
   },
   provide() {
@@ -103,6 +113,15 @@ export default {
     this.anchors = [];
   },
   mounted() {},
+  emits: [
+    'scroll',
+    'scrolltolower',
+    'scrolltoupper',
+    'refresherpulling',
+    'refresherrefresh',
+    'refresherrestore',
+    'refresherabort'
+  ],
   methods: {
     updateOffsetFromChild(top) {
       this.offset = top;
@@ -116,7 +135,7 @@ export default {
       scrollTop = e.detail.scrollTop;
       // #endif
       this.innerScrollTop = scrollTop;
-      this.$emit('scroll', Math.abs(scrollTop));
+      this.$emit('scroll', scrollTop);
     },
     scrollIntoViewById(id) {
       // #ifdef APP-NVUE
@@ -130,18 +149,30 @@ export default {
     },
     // 滚动到底部触发事件
     scrolltolower(e) {
-      uni.$u.sleep(30).then(() => {
+      sleep(30).then(() => {
         this.$emit('scrolltolower');
       });
     },
     // #ifndef APP-NVUE
     // 滚动到底部时触发，非nvue有效
     scrolltoupper(e) {
-      uni.$u.sleep(30).then(() => {
+      sleep(30).then(() => {
         this.$emit('scrolltoupper');
         // 这一句很重要，能绝对保证在性功能障碍的webview，滚动条到顶时，取消偏移值，让页面置顶
         this.offset = 0;
       });
+    },
+    refresherpulling(e) {
+      this.$emit('refresherpulling', e);
+    },
+    refresherrefresh(e) {
+      this.$emit('refresherrefresh', e);
+    },
+    refresherrestore(e) {
+      this.$emit('refresherrestore', e);
+    },
+    refresherabort(e) {
+      this.$emit('refresherabort', e);
     }
     // #endif
   }

package/uview-plus/components/u-list-item/props.js

@@ -1,10 +1,11 @@
-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: {
     // 用于滚动到指定item
     anchor: {
       type: [String, Number],
-      default: defprops.listItem.anchor
+      default: () => defProps.listItem.anchor
     }
   }
-};
+});

package/uview-plus/components/u-list-item/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;
@@ -8,4 +23,4 @@ view, scroll-view, swiper-item {
   align-items: stretch;
   align-content: flex-start;
 }
-/* #endif */
+/* #endif */

package/uview-plus/components/u-list-item/u-list-item.vue

@@ -10,9 +10,10 @@
   <!-- #endif -->
 </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 { getWindowInfo } from '../../libs/function/index';
 // #ifdef APP-NVUE
 const dom = uni.requireNativePlugin('dom');
 // #endif
@@ -32,7 +33,7 @@ export default {
       rect: {},
       index: 0,
       show: true,
-      sys: uni.$u.sys()
+      sys: getWindowInfo()
     };
   },
   computed: {},

package/uview-plus/{libs/config/props → components/u-loading-icon}/loadingIcon.js

@@ -7,7 +7,7 @@
  * @lastTime     : 2021-08-20 17:45:47
  * @FilePath     : /u-view2.0/uview-ui/libs/config/props/loadingIcon.js
  */
-import config from '../config'
+import config from '../../libs/config/config'
 
 const {
     color

package/uview-plus/components/u-loading-icon/props.js

@@ -1,60 +1,61 @@
-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.loadingIcon.show
+      default: () => defProps.loadingIcon.show
     },
     // 颜色
     color: {
       type: String,
-      default: defprops.loadingIcon.color
+      default: () => defProps.loadingIcon.color
     },
     // 提示文字颜色
     textColor: {
       type: String,
-      default: defprops.loadingIcon.textColor
+      default: () => defProps.loadingIcon.textColor
     },
     // 文字和图标是否垂直排列
     vertical: {
       type: Boolean,
-      default: defprops.loadingIcon.vertical
+      default: () => defProps.loadingIcon.vertical
     },
     // 模式选择，circle-圆形，spinner-花朵形，semicircle-半圆形
     mode: {
       type: String,
-      default: defprops.loadingIcon.mode
+      default: () => defProps.loadingIcon.mode
     },
     // 图标大小，单位默认px
     size: {
       type: [String, Number],
-      default: defprops.loadingIcon.size
+      default: () => defProps.loadingIcon.size
     },
     // 文字大小
     textSize: {
       type: [String, Number],
-      default: defprops.loadingIcon.textSize
+      default: () => defProps.loadingIcon.textSize
     },
     // 文字内容
     text: {
       type: [String, Number],
-      default: defprops.loadingIcon.text
+      default: () => defProps.loadingIcon.text
     },
     // 动画模式
     timingFunction: {
       type: String,
-      default: defprops.loadingIcon.timingFunction
+      default: () => defProps.loadingIcon.timingFunction
     },
     // 动画执行周期时间
     duration: {
       type: [String, Number],
-      default: defprops.loadingIcon.duration
+      default: () => defProps.loadingIcon.duration
     },
     // mode=circle时的暗边颜色
     inactiveColor: {
       type: String,
-      default: defprops.loadingIcon.inactiveColor
+      default: () => defProps.loadingIcon.inactiveColor
     }
   }
-};
+});

package/uview-plus/components/u-loading-icon/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;
@@ -10,8 +25,7 @@ view, scroll-view, swiper-item {
 }
 /* #endif */
 .u-loading-icon {
-  /* #ifndef APP-NVUE */
-  /* #endif */
+  display: flex;
   flex-direction: row;
   align-items: center;
   justify-content: center;
@@ -81,13 +95,15 @@ view, scroll-view, swiper-item {
   height: 100%;
 }
 .u-loading-icon__dot:before {
+  /* #ifndef APP-NVUE */
   display: block;
+  /* #endif */
   width: 2px;
   height: 25%;
   margin: 0 auto;
   background-color: currentColor;
   border-radius: 40%;
-  content: ' ';
+  content: " ";
 }
 .u-loading-icon__dot:nth-of-type(1) {
   transform: rotate(30deg);
@@ -145,4 +161,4 @@ view, scroll-view, swiper-item {
     transform: rotate(1turn);
   }
 }
-/* #endif */
+/* #endif */

package/uview-plus/components/u-loading-icon/style.scss

@@ -39,9 +39,7 @@ $u-loading-icon-dot-before-background-color: currentColor !default;
 $u-loading-icon-dot-before-border-radius: 40% !default;
 
 .u-loading-icon {
-  /* #ifndef APP-NVUE */
-  // display: inline-flex;
-  /* #endif */
+  display: flex;
   flex-direction: row;
   align-items: center;
   justify-content: center;
@@ -122,7 +120,9 @@ $u-loading-icon-dot-before-border-radius: 40% !default;
     height: $u-loading-icon-dot-height;
 
     &:before {
+      /* #ifndef APP-NVUE */
       display: block;
+      /* #endif */
       width: $u-loading-icon-dot-before-width;
       height: $u-loading-icon-dot-before-height;
       margin: $u-loading-icon-dot-before-margin;