uview-plus 3.5.5 → 3.5.15

package/components/u-datetime-picker/datetimePicker.js

@@ -39,5 +39,6 @@ export default {
         disabledColor: '',
         placeholder: t("up.common.pleaseChoose"),
         inputProps: {},
+        pageInline: false
     }
 }

package/components/u-datetime-picker/props.js

@@ -163,6 +163,11 @@ export const props = defineMixin({
         defaultIndex: {
             type: Array,
             default: () => defProps.datetimePicker.defaultIndex
+        },
+        // 是否页面内展示
+        pageInline:{
+            type: Boolean,
+            default: () => defProps.datetimePicker.pageInline
         }
     }
 })

package/components/u-datetime-picker/u-datetime-picker.vue

@@ -9,13 +9,13 @@
 					v-model="inputValue"
 					v-bind="inputPropsInner"
 				></up-input>
-				<div class="input-cover">
-				</div>
+				<view class="input-cover">
+				</view>
 			</slot>
         </view>
         <u-picker
             ref="picker"
-            :show="show || (hasInput && showByClickInput)"
+            :show="pageInline || show || (hasInput && showByClickInput)"
             :popupMode="popupMode"
             :closeOnClickOverlay="closeOnClickOverlay"
             :columns="columns"
@@ -29,6 +29,7 @@
             :cancelColor="cancelColor"
             :confirmColor="confirmColor"
             :toolbarRightSlot="toolbarRightSlot"
+			:pageInline="pageInline"
             @close="close"
             @cancel="cancel"
             @confirm="confirm"

package/components/u-input/props.js

@@ -44,7 +44,12 @@ export const props = defineMixin({
 		// 是否显示清除控件
 		clearable: {
 			type: Boolean,
-			default: () => defProps.input.clearable
+			default: false
+		},
+		// 是否仅在聚焦时显示清除控件
+		onlyClearableOnFocused: {
+			type: Boolean,
+			default: true
 		},
 		// 是否密码类型
 		password: {

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

@@ -205,8 +205,15 @@ export default {
         },
         // 是否显示清除控件
         isShowClear() {
-            const { clearable, readonly, focused, innerValue } = this;
-            return !!clearable && !readonly && !!focused && innerValue !== "";
+            const { clearable, readonly, focused, innerValue, onlyClearableOnFocused } = this;
+            if (!clearable || readonly) {
+                return false;
+            }
+            if (onlyClearableOnFocused) {
+                return !!focused && innerValue !== "";
+            } else {
+                return innerValue !== "";
+            }
         },
         // 组件的类名
         inputClass() {

package/components/u-pdf-reader/props.js

@@ -0,0 +1,19 @@
+export default {
+    props: {
+        // PDF文件地址
+        src: {
+            type: String,
+            default: ''
+        },
+        // 组件高度
+        height: {
+            type: String,
+            default: '700px'
+        },
+        // pdfjs资源域名
+        baseUrl: {
+            type: String,
+            default: 'https://uview-plus.jiangruyi.com/h5'
+        }
+    }
+}

package/components/u-pdf-reader/u-pdf-reader.vue

@@ -0,0 +1,52 @@
+<template>
+	<view class="up-pdf-reader" :style="{ height: height }">
+		<web-view :fullscreen="false"
+			:src="viewerUrl" :style="{ width: '750rpx', height: height }"
+            :webview-styles="{ width: '750rpx', height: height }"
+			frameborder="0"
+		></web-view>
+	</view>
+</template>
+
+<script>
+	import props from './props.js';
+
+	/**
+	 * pdfReader PDF阅读器
+	 * @description 基于pdf.js的PDF阅读器组件
+	 * @tutorial https://uview-plus.jiangruyi.com/components/pdfReader.html
+	 * @property {String}			src				PDF文件地址
+	 * @property {String}	        height			组件高度，默认为'700px'
+	 * @property {String}			pdfjsDomain		pdfjs资源域名，默认为'https://uview-plus.jiangruyi.com/h5'
+	 * @example <up-pdf-reader src="https://example.com/file.pdf"></up-pdf-reader>
+	 */
+	export default {
+		name: 'up-pdf-reader',
+		mixins: [props],
+        data() {
+            return {
+                baseUrlInner: 'https://uview-plus.jiangruyi.com/h5',
+                viewerUrl: ''
+            }
+        },
+        watch: {
+            baseUrl: function (val) {
+                this.baseUrl = val;
+            },
+            src: function (val) {
+                this.viewerUrl = `${this.baseUrlInner}/static/pdfjs/web/viewer.html?file=` + encodeURIComponent(val);
+            }
+        },
+        mounted() {
+            if (this.baseUrl) {
+                this.baseUrlInner = this.baseUrl;
+            }
+            this.viewerUrl = `${this.baseUrlInner}/static/pdfjs/web/viewer.html?file=` + encodeURIComponent(this.src);
+		}
+	}
+</script>
+
+<style lang="scss" scoped>	
+	.up-pdf-reader {
+	}
+</style>

package/components/u-picker/picker.js

@@ -36,6 +36,7 @@ export default {
         bgColor: '',
         round: 0,
         duration: 300,
-        overlayOpacity: 0.5
+        overlayOpacity: 0.5,
+        pageInline: false
     }
 }

package/components/u-picker/props.js

@@ -142,6 +142,11 @@ export const props = defineMixin({
         overlayOpacity: {
             type: [Number, String],
             default: () => defProps.picker.overlayOpacity
-        }
+        },
+        // 是否页面内展示
+        pageInline:{
+			type: Boolean,
+			default: () => defProps.picker.pageInline
+		}
     }
 })

package/components/u-picker/u-picker.vue

@@ -11,7 +11,7 @@
 				v-model="inputLabel"
 				v-bind="inputPropsInner">
 			</up-input>
-			<div class="input-cover"></div>
+			<view class="input-cover"></view>
 		</view>
 		<u-popup
 			:show="show || (hasInput && showByClickInput)"
@@ -20,6 +20,7 @@
 			:bgColor="bgColor"
 			:round="round"
 			:duration="duration"
+			:pageInline="pageInline"
 			:overlayOpacity="overlayOpacity"
 			@close="closeHandler"
 		>

package/components/u-popup/props.js

@@ -80,7 +80,7 @@ export const props = defineMixin({
         // 是否页面内展示
         pageInline:{
 			type: Boolean,
-			default: defProps.popup.pageInline
-		},
+			default: () => defProps.popup.pageInline
+		}
     }
 })