uview-plus 3.2.23 → 3.3.0

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

@@ -64,9 +64,9 @@
 </template>
 
 <script>
-	import props from './props';
-	import mpMixin from '../../libs/mixin/mpMixin';
-	import mixin from '../../libs/mixin/mixin';
+	import { props } from './props';
+	import { mpMixin } from '../../libs/mixin/mpMixin';
+	import { mixin } from '../../libs/mixin/mixin';
 	import { addUnit, addStyle, deepMerge } from '../../libs/function/index';
 	/**
 	 * Image 图片

package/components/u-index-anchor/props.js

@@ -1,5 +1,6 @@
-import defProps from '../../libs/config/props.js';
-export default {
+import { defineMixin } from '../../libs/vue'
+import defProps from '../../libs/config/props.js'
+export const props = defineMixin({
     props: {
         // 列表锚点文本内容
         text: {
@@ -27,4 +28,4 @@ export default {
             default: () => defProps.indexAnchor.height
         }
     }
-}
+})

package/components/u-index-anchor/u-index-anchor.vue

@@ -24,9 +24,9 @@
 </template>
 
 <script>
-	import props from './props';
-	import mpMixin from '../../libs/mixin/mpMixin';
-	import mixin from '../../libs/mixin/mixin';
+	import { props } from './props';
+	import { mpMixin } from '../../libs/mixin/mpMixin';
+	import { mixin } from '../../libs/mixin/mixin';
 	import { addUnit, $parent, error } from '../../libs/function/index';
 	// #ifdef APP-NVUE
 	const dom = uni.requireNativePlugin('dom')

package/components/u-index-item/props.js

@@ -1,6 +1,8 @@
-// import defProps from '../../libs/config/props.js';
-export default {
+import { defineMixin } from '../../libs/vue'
+import defProps from '../../libs/config/props.js'
+
+export const props = defineMixin({
     props: {
 
     }
-}
+})

package/components/u-index-item/u-index-item.vue

@@ -15,9 +15,9 @@
 </template>
 
 <script>
-	import props from './props';
-	import mpMixin from '../../libs/mixin/mpMixin';
-	import mixin from '../../libs/mixin/mixin';
+	import { props } from './props';
+	import { mpMixin } from '../../libs/mixin/mpMixin';
+	import { mixin } from '../../libs/mixin/mixin';
 	import { sleep, error } from '../../libs/function/index';
 	// #ifdef APP-NVUE
 	// 由于weex为阿里的KPI业绩考核的产物，所以不支持百分比单位，这里需要通过dom查询组件的宽度

package/components/u-index-list/props.js

@@ -1,5 +1,6 @@
-import defProps from '../../libs/config/props.js';
-export default {
+import { defineMixin } from '../../libs/vue'
+import defProps from '../../libs/config/props.js'
+export const props = defineMixin({
     props: {
         // 右边锚点非激活的颜色
         inactiveColor: {
@@ -27,4 +28,4 @@ export default {
             default: () => defProps.indexList.customNavHeight
         }
     }
-}
+})

package/components/u-index-list/u-index-list.vue

@@ -100,9 +100,9 @@
 		}
 		return indexList;
 	}
-	import props from './props';
-	import mpMixin from '../../libs/mixin/mpMixin';
-	import mixin from '../../libs/mixin/mixin';
+	import { props } from './props';
+	import { mpMixin } from '../../libs/mixin/mpMixin';
+	import { mixin } from '../../libs/mixin/mixin';
 	import { addUnit, sys, sleep, getPx } from '../../libs/function/index';
 	// #ifdef APP-NVUE
 	// 由于weex为阿里的KPI业绩考核的产物，所以不支持百分比单位，这里需要通过dom查询组件的宽度

package/components/u-input/props.js

@@ -1,5 +1,7 @@
-import defProps from '../../libs/config/props.js';
-export default {
+import { defineMixin } from '../../libs/vue'
+import defProps from '../../libs/config/props.js'
+
+export const props = defineMixin({
 	props: {
 		// #ifdef VUE3
 		// 绑定的值
@@ -193,4 +195,4 @@ export default {
 			default: true
 		}
 	}
-}
+})

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

@@ -75,9 +75,10 @@
 </template>
 
 <script>
-import props from "./props.js";
-import mpMixin from '../../libs/mixin/mpMixin';
-import mixin from '../../libs/mixin/mixin';
+import { props } from "./props.js";
+import { mpMixin } from '../../libs/mixin/mpMixin';
+import { mixin } from '../../libs/mixin/mixin';
+import { debounce } from '../../libs/function/debounce';
 import { addStyle, addUnit, deepMerge, formValidate, $parent, sleep, os } from '../../libs/function/index';
 /**
  * Input 输入框
@@ -140,53 +141,36 @@ export default {
 			innerFormatter: value => value
         };
     },
+    created() {
+        // 格式化过滤方法
+        if (this.formatter) {
+            this.innerFormatter = this.formatter;
+        }
+    },
     watch: {
-        // #ifdef VUE3
         modelValue: {
             immediate: true,
             handler(newVal, oldVal) {
+                console.log(newVal, oldVal)
+                if (this.changeFromInner || this.innerValue === newVal) {
+                    return;
+                }
                 this.innerValue = newVal;
-                /* #ifdef H5 */
                 // 在H5中，外部value变化后，修改input中的值，不会触发@input事件，此时手动调用值变化方法
                 if (
                     this.firstChange === false &&
 					this.changeFromInner === false
                 ) {
-                    this.valueChange();
-                } else {
-					// 尝试调用up-form的验证方法
-                    if(!this.firstChange) formValidate(this, "change");
-				}
-                /* #endif */
-                this.firstChange = false;
-                // 重置changeFromInner的值为false，标识下一次引起默认为外部引起的
-                this.changeFromInner = false;
-            },
-        },
-        // #endif
-        // #ifdef VUE2
-        value: {
-            immediate: true,
-            handler(newVal, oldVal) {
-                this.innerValue = newVal;
-                /* #ifdef H5 */
-                // 在H5中，外部value变化后，修改input中的值，不会触发@input事件，此时手动调用值变化方法
-                if (
-                    this.firstChange === false &&
-                    this.changeFromInner === false
-                ) {
-                    this.valueChange();
+                    this.valueChange(this.innerValue);
                 } else {
 					// 尝试调用up-form的验证方法
                     if(!this.firstChange) formValidate(this, "change");
 				}
-                /* #endif */
                 this.firstChange = false;
                 // 重置changeFromInner的值为false，标识下一次引起默认为外部引起的
                 this.changeFromInner = false;
-            },
-        },
-        // #endif
+            }
+        }
     },
     computed: {
         // 是否显示清除控件
@@ -248,14 +232,12 @@ export default {
         // 当键盘输入时，触发input事件
         onInput(e) {
             let { value = "" } = e.detail || {};
-            // 格式化过滤方法
-            const formatter = this.formatter || this.innerFormatter
-            const formatValue = formatter(value)
             // 为了避免props的单向数据流特性，需要先将innerValue值设置为当前值，再在$nextTick中重新赋予设置后的值才有效
-            this.innerValue = value
+            this.innerValue = value;
             this.$nextTick(() => {
+                let formatValue = this.innerFormatter(value);
             	this.innerValue = formatValue;
-            	this.valueChange();
+                this.valueChange(formatValue);
             })
         },
         // 输入框失去焦点时触发
@@ -284,22 +266,25 @@ export default {
             this.$emit("keyboardheightchange", event);
         },
         // 内容发生变化，进行处理
-        valueChange() {
+        valueChange(value, isOut = false) {
             if(this.clearInput) {
                 this.innerValue = '';
                 this.clearInput = false;
             }
-            const value = this.innerValue;
             this.$nextTick(() => {
-                // #ifdef VUE3
-                this.$emit("update:modelValue", value);
-                // #endif
-                // #ifdef VUE2
-                this.$emit("input", value);
-                // #endif
-                // 标识value值的变化是由内部引起的
-                this.changeFromInner = true;
-                this.$emit("change", value);
+                if (!isOut || this.clearInput) {
+                    // 标识value值的变化是由内部引起的
+                    this.changeFromInner = true;
+                    this.$emit("change", value);
+
+                    // #ifdef VUE3
+                    this.$emit("update:modelValue", value);
+                    // #endif
+                    // #ifdef VUE2
+                    this.$emit("input", value);
+                    // #endif
+                }
+
                 // 尝试调用u-form的验证方法
                 formValidate(this, "change");
             });
@@ -309,7 +294,7 @@ export default {
             this.clearInput = true;
             this.innerValue = "";
             this.$nextTick(() => {
-                this.valueChange();
+                this.valueChange("");
                 this.$emit("clear");
             });
         },

package/components/u-keyboard/props.js

@@ -1,5 +1,6 @@
-import defProps from '../../libs/config/props.js';
-export default {
+import { defineMixin } from '../../libs/vue'
+import defProps from '../../libs/config/props.js'
+export const props = defineMixin({
     props: {
         // 键盘的类型，number-数字键盘，card-身份证键盘，car-车牌号键盘
         mode: {
@@ -82,4 +83,4 @@ export default {
             default: () => defProps.keyboard.autoChange
         }
     }
-}
+})

package/components/u-keyboard/u-keyboard.vue

@@ -68,9 +68,9 @@
 </template>
 
 <script>
-	import props from './props';
-	import mpMixin from '../../libs/mixin/mpMixin';
-	import mixin from '../../libs/mixin/mixin';
+	import { props } from './props';
+	import { mpMixin } from '../../libs/mixin/mpMixin';
+	import { mixin } from '../../libs/mixin/mixin';
 
 	/**
 	 * keyboard 键盘

package/components/u-line/props.js

@@ -1,5 +1,6 @@
-import defProps from '../../libs/config/props.js';
-export default {
+import { defineMixin } from '../../libs/vue'
+import defProps from '../../libs/config/props.js'
+export const props = defineMixin({
     props: {
         color: {
             type: String,
@@ -31,4 +32,4 @@ export default {
             default: () => defProps.line.dashed
         }
     }
-}
+})

package/components/u-line/u-line.vue

@@ -8,9 +8,9 @@
 </template>
 
 <script>
-	import props from './props';
-	import mpMixin from '../../libs/mixin/mpMixin';
-	import mixin from '../../libs/mixin/mixin';
+	import { props } from './props';
+	import { mpMixin } from '../../libs/mixin/mpMixin';
+	import { mixin } from '../../libs/mixin/mixin';
 	import { addUnit, addStyle, deepMerge } from '../../libs/function/index';
 	/**
 	 * line 线条

package/components/u-line-progress/props.js

@@ -1,5 +1,6 @@
-import defProps from '../../libs/config/props.js';
-export default {
+import { defineMixin } from '../../libs/vue'
+import defProps from '../../libs/config/props.js'
+export const props = defineMixin({
     props: {
         // 激活部分的颜色
         activeColor: {
@@ -26,4 +27,4 @@ export default {
             default: () => defProps.lineProgress.height
         }
     }
-}
+})

package/components/u-line-progress/u-line-progress.vue

@@ -24,9 +24,9 @@
 </template>
 
 <script>
-	import props from './props';
-	import mpMixin from '../../libs/mixin/mpMixin';
-	import mixin from '../../libs/mixin/mixin';
+	import { props } from './props';
+	import { mpMixin } from '../../libs/mixin/mpMixin';
+	import { mixin } from '../../libs/mixin/mixin';
 	import { addUnit, addStyle, sleep, range } from '../../libs/function/index';
 	// #ifdef APP-NVUE
 	const dom = uni.requireNativePlugin('dom')

package/components/u-link/props.js

@@ -1,5 +1,6 @@
-import defProps from '../../libs/config/props.js';
-export default {
+import { defineMixin } from '../../libs/vue'
+import defProps from '../../libs/config/props.js'
+export const props = defineMixin({
     props: {
         // 文字颜色
         color: {
@@ -37,4 +38,4 @@ export default {
             default: () => defProps.link.text
         }
     }
-}
+})

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

@@ -7,9 +7,9 @@
 </template>
 
 <script>
-	import props from './props';
-	import mpMixin from '../../libs/mixin/mpMixin';
-	import mixin from '../../libs/mixin/mixin';
+	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 超链接

package/components/u-list/props.js

@@ -1,5 +1,6 @@
-import defProps from '../../libs/config/props.js';
-export default {
+import { defineMixin } from '../../libs/vue'
+import defProps from '../../libs/config/props.js'
+export const props = defineMixin({
     props: {
         // 控制是否出现滚动条，仅nvue有效
         showScrollbar: {
@@ -95,6 +96,6 @@ export default {
         refresherTriggered: {
             type: Boolean,
             default: () => false
-        },
+        }
     }
-}
+})

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

@@ -47,9 +47,9 @@
 </template>
 
 <script>
-	import props from './props';
-	import mpMixin from '../../libs/mixin/mpMixin';
-	import mixin from '../../libs/mixin/mixin';
+	import { props } from './props';
+	import { mpMixin } from '../../libs/mixin/mpMixin';
+	import { mixin } from '../../libs/mixin/mixin';
 	import { addUnit, addStyle, deepMerge, sleep, sys } from '../../libs/function/index';
 	// #ifdef APP-NVUE
 	const dom = uni.requireNativePlugin('dom')

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

@@ -1,5 +1,6 @@
-import defProps from '../../libs/config/props.js';
-export default {
+import { defineMixin } from '../../libs/vue'
+import defProps from '../../libs/config/props.js'
+export const props = defineMixin({
     props: {
         // 用于滚动到指定item
         anchor: {
@@ -7,4 +8,4 @@ export default {
             default: () => defProps.listItem.anchor
         }
     }
-}
+})

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

@@ -16,9 +16,9 @@
 </template>
 
 <script>
-	import props from './props';
-	import mpMixin from '../../libs/mixin/mpMixin';
-	import mixin from '../../libs/mixin/mixin';
+	import { props } from './props';
+	import { mpMixin } from '../../libs/mixin/mpMixin';
+	import { mixin } from '../../libs/mixin/mixin';
 	import { sys } from '../../libs/function/index';
 	// #ifdef APP-NVUE
 	const dom = uni.requireNativePlugin('dom')

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

@@ -1,5 +1,6 @@
-import defProps from '../../libs/config/props.js';
-export default {
+import { defineMixin } from '../../libs/vue'
+import defProps from '../../libs/config/props.js'
+export const props = defineMixin({
     props: {
         // 是否显示组件
         show: {
@@ -57,4 +58,4 @@ export default {
             default: () => defProps.loadingIcon.inactiveColor
         }
     }
-}
+})

package/components/u-loading-icon/u-loading-icon.vue

@@ -58,9 +58,9 @@
 </template>
 
 <script>
-	import props from './props';
-	import mpMixin from '../../libs/mixin/mpMixin';
-	import mixin from '../../libs/mixin/mixin';
+	import { props } from './props';
+	import { mpMixin } from '../../libs/mixin/mpMixin';
+	import { mixin } from '../../libs/mixin/mixin';
 	import { addUnit, addStyle } from '../../libs/function/index';
 	import { colorGradient } from '../../libs/function/colorGradient';
 	// #ifdef APP-NVUE

package/components/u-loading-page/props.js

@@ -1,5 +1,7 @@
-import defProps from '../../libs/config/props.js';
-export default {
+import { defineMixin } from '../../libs/vue'
+import defProps from '../../libs/config/props.js'
+
+export const props = defineMixin({
     props: {
         // 提示内容
         loadingText: {
@@ -47,4 +49,4 @@ export default {
             default: () => defProps.loadingPage.loadingColor
         }
     }
-}
+})

package/components/u-loading-page/u-loading-page.vue

@@ -47,9 +47,9 @@
 </template>
 
 <script>
-import props from "./props.js";
-import mpMixin from '../../libs/mixin/mpMixin';
-import mixin from '../../libs/mixin/mixin';
+import { props } from "./props";
+import { mpMixin } from '../../libs/mixin/mpMixin';
+import { mixin } from '../../libs/mixin/mixin';
 import { addUnit } from '../../libs/function/index';
 /**
  * loadingPage 加载动画

package/components/u-loadmore/props.js

@@ -1,5 +1,6 @@
-import defProps from '../../libs/config/props.js';
-export default {
+import { defineMixin } from '../../libs/vue'
+import defProps from '../../libs/config/props.js'
+export const props = defineMixin({
     props: {
         // 组件状态，loadmore-加载前的状态，loading-加载中的状态，nomore-没有更多的状态
         status: {
@@ -92,4 +93,4 @@ export default {
             default: () => defProps.loadmore.dashed
         }
     }
-}
+})

package/components/u-loadmore/u-loadmore.vue

@@ -52,9 +52,9 @@
 </template>
 
 <script>
-	import props from './props';
-	import mpMixin from '../../libs/mixin/mpMixin';
-	import mixin from '../../libs/mixin/mixin';
+	import { props } from './props';
+	import { mpMixin } from '../../libs/mixin/mpMixin';
+	import { mixin } from '../../libs/mixin/mixin';
 	import { addUnit, addStyle } from '../../libs/function/index';
 	/**
 	 * loadmore 加载更多

package/components/u-modal/props.js

@@ -1,5 +1,6 @@
-import defProps from '../../libs/config/props.js';
-export default {
+import { defineMixin } from '../../libs/vue'
+import defProps from '../../libs/config/props.js'
+export const props = defineMixin({
     props: {
         // 是否展示modal
         show: {
@@ -82,4 +83,4 @@ export default {
             default: () => defProps.modal.confirmButtonShape
         }
     }
-}
+})

package/components/u-modal/u-modal.vue

@@ -3,6 +3,7 @@
 		mode="center"
 		:zoom="zoom"
 		:show="show"
+		:class="[customClass]"
 		:customStyle="{
 			borderRadius: '6px', 
 			overflow: 'hidden',
@@ -90,9 +91,9 @@
 </template>
 
 <script>
-	import props from './props';
-	import mpMixin from '../../libs/mixin/mpMixin';
-	import mixin from '../../libs/mixin/mixin';
+	import { props } from './props';
+	import { mpMixin } from '../../libs/mixin/mpMixin';
+	import { mixin } from '../../libs/mixin/mixin';
 	import { addUnit } from '../../libs/function/index';
 	/**
 	 * Modal 模态框

package/components/u-navbar/props.js

@@ -1,5 +1,7 @@
-import defProps from '../../libs/config/props.js';
-export default {
+import { defineMixin } from '../../libs/vue'
+import defProps from '../../libs/config/props.js'
+
+export const props = defineMixin({
 	props: {
 		// 是否开启顶部安全区适配
 		safeAreaInsetTop: {
@@ -82,4 +84,4 @@ export default {
 			default: () => defProps.navbar.titleStyle
 		}
 	}
-}
+})

package/components/u-navbar/u-navbar.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="u-navbar">
+	<view class="u-navbar" :class="[customClass]">
 		<view
 			class="u-navbar__placeholder"
 			v-if="fixed && placeholder"
@@ -73,9 +73,9 @@
 </template>
 
 <script>
-	import props from './props';
-	import mpMixin from '../../libs/mixin/mpMixin';
-	import mixin from '../../libs/mixin/mixin';
+	import { props } from './props';
+	import { mpMixin } from '../../libs/mixin/mpMixin';
+	import { mixin } from '../../libs/mixin/mixin';
 	import { addUnit, addStyle, getPx, sys } from '../../libs/function/index';
 	/**
 	 * Navbar 自定义导航栏

package/components/u-no-network/props.js

@@ -1,5 +1,6 @@
-import defProps from '../../libs/config/props.js';
-export default {
+import { defineMixin } from '../../libs/vue'
+import defProps from '../../libs/config/props.js'
+export const props = defineMixin({
     props: {
         // 页面文字提示
         tips: {
@@ -17,4 +18,4 @@ export default {
             default: () => defProps.noNetwork.image
         }
     }
-}
+})

package/components/u-no-network/u-no-network.vue

@@ -43,9 +43,9 @@
 </template>
 
 <script>
-	import props from './props';
-	import mpMixin from '../../libs/mixin/mpMixin';
-	import mixin from '../../libs/mixin/mixin';
+	import { props } from './props';
+	import { mpMixin } from '../../libs/mixin/mpMixin';
+	import { mixin } from '../../libs/mixin/mixin';
 	import { toast } from '../../libs/function/index';
 	/**
 	 * noNetwork 无网络提示