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

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

@@ -1,47 +1,48 @@
-import defprops from '../../libs/config/props';
-export default {
-  props: {
-    containerStyle: {
-      type: String,
-      default: null
-    },
-    content: String,
-    copyLink: {
-      type: Boolean,
-      default: defprops.parse.copyLink
-    },
-    domain: String,
-    errorImg: {
-      type: String,
-      default: defprops.parse.errorImg
-    },
-    lazyLoad: {
-      type: Boolean,
-      default: defprops.parse.lazyLoad
-    },
-    loadingImg: {
-      type: String,
-      default: defprops.parse.loadingImg
-    },
-    pauseVideo: {
-      type: Boolean,
-      default: defprops.parse.pauseVideo
-    },
-    previewImg: {
-      type: Boolean,
-      default: defprops.parse.previewImg
-    },
-    scrollTable: Boolean,
-    selectable: Boolean,
-    setTitle: {
-      type: Boolean,
-      default: defprops.parse.setTitle
-    },
-    showImgMenu: {
-      type: Boolean,
-      default: defprops.parse.showImgMenu
-    },
-    tagStyle: Object,
-    useAnchor: null
-  }
-};
+import { defineMixin } from '../../libs/vue'
+import defProps from '../../libs/config/props.js'
+export const props = defineMixin({
+    props: {
+		containerStyle: {
+          type: String,
+          default: null
+		},
+        content: String,
+        copyLink: {
+		  type: Boolean,
+		  default: () => defProps.parse.copyLink
+        },
+        domain: String,
+        errorImg: {
+		  type: String,
+		  default: () => defProps.parse.errorImg
+        },
+        lazyLoad: {
+		  type: Boolean,
+		  default: () => defProps.parse.lazyLoad
+        },
+        loadingImg: {
+		  type: String,
+		  default: () => defProps.parse.loadingImg
+        },
+        pauseVideo: {
+		  type: Boolean,
+		  default: () => defProps.parse.pauseVideo
+        },
+        previewImg: {
+		  type: Boolean,
+		  default: () => defProps.parse.previewImg
+        },
+        scrollTable: Boolean,
+        selectable: Boolean,
+        setTitle: {
+		  type: Boolean,
+		  default: () => defProps.parse.setTitle
+        },
+        showImgMenu: {
+		  type: Boolean,
+		  default: () => defProps.parse.showImgMenu
+        },
+        tagStyle: Object,
+        useAnchor: null
+	  }
+}

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

@@ -36,8 +36,8 @@
  * @property {Boolean | Number} use-anchor 是否使用锚点链接
  * @event {Function} load dom 结构加载完毕时触发
  * @event {Function} ready 所有图片加载完毕时触发
- * @event {Function} imgtap 图片被点击时触发
- * @event {Function} linktap 链接被点击时触发
+ * @event {Function} imgTap 图片被点击时触发
+ * @event {Function} linkTap 链接被点击时触发
  * @event {Function} play 音视频播放时触发
  * @event {Function} error 媒体加载出错时触发
  */
@@ -107,7 +107,7 @@ export default {
     useAnchor: [Boolean, Number]
   },
   // #ifdef VUE3
-  emits: ['load', 'ready', 'imgtap', 'linktap', 'play', 'error'],
+  emits: ['load', 'ready', 'imgTap', 'linkTap', 'play', 'error'],
   // #endif
   // #ifndef APP-PLUS-NVUE
   components: {
@@ -130,7 +130,7 @@ export default {
       this.setContent(this.content);
     }
   },
-  beforeDestroy() {
+  beforeUnmount() {
     this._hook('onDetached');
   },
   methods: {
@@ -433,7 +433,7 @@ export default {
           break;
         // 图片点击
         case 'onImgTap':
-          this.$emit('imgtap', message.attrs);
+          this.$emit('imgTap', message.attrs);
           if (this.previewImg) {
             uni.previewImage({
               current: parseInt(message.attrs.i),
@@ -444,7 +444,7 @@ export default {
         // 链接点击
         case 'onLinkTap': {
           const href = message.attrs.href;
-          this.$emit('linktap', message.attrs);
+          this.$emit('linkTap', message.attrs);
           if (href) {
             // 锚点跳转
             if (href[0] === '#') {

package/uview-plus/{libs/config/props → components/u-picker}/picker.js

@@ -11,19 +11,25 @@ export default {
     // picker
     picker: {
         show: false,
+		popupMode: 'bottom',
         showToolbar: true,
         title: '',
-        columns: () => [],
+        columns: [],
         loading: false,
         itemHeight: 44,
         cancelText: '取消',
         confirmText: '确定',
         cancelColor: '#909193',
-        confirmColor: '#3c9cff',
+        confirmColor: '',
         visibleItemCount: 5,
         keyName: 'text',
         closeOnClickOverlay: false,
-        defaultIndex: () => [],
-		immediateChange: false
+        defaultIndex: [],
+		immediateChange: true,
+		zIndex: 10076,
+        disabled: false,
+        disabledColor: '',
+        placeholder: '请选择',
+        inputProps: {},
     }
 }

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

@@ -1,80 +1,122 @@
-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: {
+    modelValue: {
+      type: Array,
+      default: () => []
+    },
+    hasInput: {
+      type: Boolean,
+      default: false
+    },
+    inputProps: {
+      type: Object,
+      default: () => {
+        return {};
+      }
+    },
+    disabled: {
+      type: Boolean,
+      default: () => defProps.picker.disabled
+    },
+    disabledColor: {
+      type: String,
+      default: () => defProps.picker.disabledColor
+    },
+    placeholder: {
+      type: String,
+      default: () => defProps.picker.placeholder
+    },
     // 是否展示picker弹窗
     show: {
       type: Boolean,
-      default: defprops.picker.show
+      default: () => defProps.picker.show
+    },
+    // 弹出的方向，可选值为 top bottom right left center
+    popupMode: {
+      type: String,
+      default: () => defProps.picker.popupMode
     },
     // 是否展示顶部的操作栏
     showToolbar: {
       type: Boolean,
-      default: defprops.picker.showToolbar
+      default: () => defProps.picker.showToolbar
     },
     // 顶部标题
     title: {
       type: String,
-      default: defprops.picker.title
+      default: () => defProps.picker.title
     },
     // 对象数组，设置每一列的数据
     columns: {
       type: Array,
-      default: defprops.picker.columns
+      default: () => defProps.picker.columns
     },
     // 是否显示加载中状态
     loading: {
       type: Boolean,
-      default: defprops.picker.loading
+      default: () => defProps.picker.loading
     },
     // 各列中，单个选项的高度
     itemHeight: {
       type: [String, Number],
-      default: defprops.picker.itemHeight
+      default: () => defProps.picker.itemHeight
     },
     // 取消按钮的文字
     cancelText: {
       type: String,
-      default: defprops.picker.cancelText
+      default: () => defProps.picker.cancelText
     },
     // 确认按钮的文字
     confirmText: {
       type: String,
-      default: defprops.picker.confirmText
+      default: () => defProps.picker.confirmText
     },
     // 取消按钮的颜色
     cancelColor: {
       type: String,
-      default: defprops.picker.cancelColor
+      default: () => defProps.picker.cancelColor
     },
     // 确认按钮的颜色
     confirmColor: {
       type: String,
-      default: defprops.picker.confirmColor
+      default: () => defProps.picker.confirmColor
     },
     // 每列中可见选项的数量
     visibleItemCount: {
       type: [String, Number],
-      default: defprops.picker.visibleItemCount
+      default: () => defProps.picker.visibleItemCount
     },
     // 选项对象中，需要展示的属性键名
     keyName: {
       type: String,
-      default: defprops.picker.keyName
+      default: () => defProps.picker.keyName
     },
     // 是否允许点击遮罩关闭选择器
     closeOnClickOverlay: {
       type: Boolean,
-      default: defprops.picker.closeOnClickOverlay
+      default: () => defProps.picker.closeOnClickOverlay
     },
     // 各列的默认索引
     defaultIndex: {
       type: Array,
-      default: defprops.picker.defaultIndex
+      default: () => defProps.picker.defaultIndex
     },
     // 是否在手指松开时立即触发 change 事件。若不开启则会在滚动动画结束后触发 change 事件，只在微信2.21.1及以上有效
     immediateChange: {
       type: Boolean,
-      default: defprops.picker.immediateChange
+      default: () => defProps.picker.immediateChange
+    },
+    // 工具栏右侧插槽是否开启
+    toolbarRightSlot: {
+      type: Boolean,
+      default: false
+    },
+    // 层级
+    zIndex: {
+      type: [String, Number],
+      default: () => defProps.picker.zIndex
     }
   }
-};
+});

package/uview-plus/components/u-picker/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;
@@ -12,6 +27,18 @@ view, scroll-view, swiper-item {
 .u-picker {
   position: relative;
 }
+.u-picker-input {
+  position: relative;
+}
+.u-picker-input .input-cover {
+  opacity: 0;
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  z-index: 1;
+}
 .u-picker__view__column {
   /* #ifndef APP-NVUE */
   display: flex;
@@ -54,4 +81,4 @@ view, scroll-view, swiper-item {
   align-items: center;
   background-color: rgba(255, 255, 255, 0.87);
   z-index: 1000;
-}
+}

package/uview-plus/components/u-picker/style.scss

@@ -2,7 +2,18 @@
 
 .u-picker {
   position: relative;
-
+  &-input {
+    position: relative;
+    .input-cover {
+      opacity: 0;
+      position: absolute;
+      top: 0;
+      bottom: 0;
+      left: 0;
+      right: 0;
+      z-index: 1;
+    }
+  }
   &__view {
     &__column {
       @include flex;