uview-plus 3.6.28 → 3.7.0

package/components/u-dragsort/u-dragsort.vue

@@ -1,13 +1,23 @@
 <template>
     <view class="u-dragsort"
-        :class="[direction == 'horizontal' ? 'u-dragsort--horizontal' : '', direction == 'vertical' ? 'u-dragsort--vertical' : '', direction == 'all' ? 'u-dragsort--all' : '']">
-        <movable-area class="u-dragsort-area" :style="movableAreaStyle">
+        :class="[direction == 'horizontal' ? 'u-dragsort--horizontal' : '', direction == 'vertical' ? 'u-dragsort--vertical' : '', direction == 'all' ? 'u-dragsort--all' : '']"
+        :style="movableAreaStyle"
+        >
+        <movable-area class="u-dragsort-area">
             <movable-view v-for="(item, index) in list" :key="item.id" :id="`u-dragsort-item-${index}`"
-                class="u-dragsort-item" :class="{ 'dragging': dragIndex === index }"
+                class="u-dragsort-item" :class="{ 'dragging': dragIndex === index, disabled: !draggable || item.draggable === false }"
                 :direction="direction === 'all' ? 'all' : direction" :x="item.x" :y="item.y" :inertia="false"
-                :disabled="!draggable || (item.draggable === false)" @change="onChange(index, $event)"
-                @touchstart="onTouchStart(index)" @touchend="onTouchEnd" @touchcancel="onTouchEnd">
+                :disabled="!draggable || dragIndex === -1 || item.draggable === false" @change="onChange(index, $event)"
+                @touchstart="onTouchStart(index, $event)" @touchend="onTouchEnd" @touchcancel="onTouchEnd" @touchmove="onTouchMove">
                 <view class="u-dragsort-item-content">
+                    <view
+                        class="ui-dragSort-item-handler"
+                        v-if="$slots.handler"
+                        data-action="handler"
+                        @touchstart="onTouchStart(index, $event)"
+                    >
+                        <slot name="handler" :item="item" :index="index"></slot>
+                    </view>
                     <slot :item="item" :index="index">
                         {{ item.label }}
                     </slot>
@@ -39,6 +49,10 @@ export default {
             type: Boolean,
             default: true
         },
+        vibrate: {
+            type: Boolean,
+            default: true
+        },
         direction: {
             type: String,
             default: 'vertical',
@@ -54,11 +68,11 @@ export default {
         return {
             list: [],
             dragIndex: -1,
-            itemHeight: 40,
-            itemWidth: 80,
+            sortChanged: false,
+            itemHeight: 0,
+            itemWidth: 0,
             areaWidth: 0, // 可拖动区域宽度
             areaHeight: 0, // 可拖动区域高度
-            originalPositions: [], // 保存原始位置
             currentPosition: {
                 x: 0,
                 y: 0
@@ -69,21 +83,21 @@ export default {
         movableAreaStyle() {
             if (this.direction === 'vertical') {
                 return {
-                    height: `${this.list.length * this.itemHeight}px`,
+                    height: this.itemHeight ? `${this.list.length * this.itemHeight}px` : 'auto',
                     width: '100%'
-                };
+                }
             } else if (this.direction === 'horizontal') {
                 return {
-                    height: `${this.itemHeight}px`,
-                    width: `${this.list.length * this.itemWidth}px`
-                };
+                    height: this.itemHeight ? `${this.itemHeight}px` : 'auto',
+                    width: this.itemWidth ? `${this.list.length * this.itemWidth}px` : 'auto'
+                }
             } else {
                 // all模式，计算网格布局所需的高度
-                const rows = Math.ceil(this.list.length / this.columns);
+                const rows = Math.ceil(this.list.length / this.columns)
                 return {
-                    height: `${rows * this.itemHeight}px`,
+                    height: this.itemHeight ? `${rows * this.itemHeight}px` : 'auto',
                     width: '100%'
-                };
+                }
             }
         }
     },
@@ -98,37 +112,29 @@ export default {
         initList() {
             // 初始化列表项的位置
             this.list = this.initialList.map((item, index) => {
-                let x = 0, y = 0;
+                let x
+                let y
 
-                if (this.direction === 'horizontal') {
-                    x = index * this.itemWidth;
-                    y = 0;
-                } else if (this.direction === 'vertical') {
-                    x = 0;
-                    y = index * this.itemHeight;
-                } else {
+                if (this.direction === 'horizontal' && this.itemWidth) {
+                    x = index * this.itemWidth
+                    y = 0
+                } else if (this.direction === 'vertical' && this.itemHeight) {
+                    x = 0
+                    y = index * this.itemHeight
+                } else if (this.itemWidth && this.itemHeight) {
                     // all模式，网格布局
-                    const col = index % this.columns;
-                    const row = Math.floor(index / this.columns);
-                    x = col * this.itemWidth;
-                    y = row * this.itemHeight;
+                    const col = index % this.columns
+                    const row = Math.floor(index / this.columns)
+                    x = col * this.itemWidth
+                    y = row * this.itemHeight
                 }
 
                 return {
                     ...item,
                     x,
                     y
-                };
-            });
-            // 保存初始位置
-            this.saveOriginalPositions();
-        },
-        saveOriginalPositions() {
-            // 保存当前位置作为原始位置
-            this.originalPositions = this.list.map(item => ({
-                x: item.x,
-                y: item.y
-            }));
+                }
+            })
         },
         async calculateItemSize() {
             // 计算项目尺寸
@@ -144,8 +150,6 @@ export default {
 
                             // 更新所有项目的位置
                             this.updatePositions();
-                            // 保存原始位置
-                            this.saveOriginalPositions();
                         }
                         resolve(res);
                     })
@@ -169,16 +173,12 @@ export default {
                     .exec();
             });
         },
-        updatePositions() {
+        updatePositions(isDragging) {
             // 更新所有项目的位置
             this.list = this.list.map((item, index) => {
                 // 当前正在拖动的项目保持拖动位置不动，避免抖动
-                if (this.dragIndex === index) {
-                    return {
-                        ...item,
-                        x: this.currentPosition.x,
-                        y: this.currentPosition.y
-                    }
+                if (isDragging && this.dragIndex === index) {
+                    return item
                 }
 
                 if (this.direction === 'vertical') {
@@ -208,10 +208,21 @@ export default {
                 }
             })
         },
-        onTouchStart(index) {
+        onTouchStart(index, e) {
+            if (this.$slots.handler && e.currentTarget.dataset.action !== 'handler') {
+                return
+            }
+            if (this.list[index]?.draggable === false) return;
+            if (this.timer) clearTimeout(this.timer);
+            this.sortChanged = false;
             this.dragIndex = index;
-            // 保存当前位置作为原始位置
-            this.saveOriginalPositions();
+        },
+        onTouchMove(e) {
+            if (this.dragIndex !== -1) {
+                // 目前只对H5生效, 如果该组件放置在开启了下拉刷新的scroll-view中, 向下拖动item还是会触发下拉刷新
+                e.stopPropagation()
+                e.preventDefault()
+            }
         },
         onChange(index, event) {
             if (!event.detail.source || event.detail.source !== 'touch') return;
@@ -265,21 +276,22 @@ export default {
             const movedItem = this.list.splice(fromIndex, 1)[0];
             this.list.splice(toIndex, 0, movedItem);
 
-            // 震动反馈
-            if (uni.vibrateShort) {
-                uni.vibrateShort();
-            }
-
             // 更新当前拖拽项目的新索引
             this.dragIndex = toIndex;
+            this.sortChanged = true;
 
             // 更新所有项目的位置
-            this.updatePositions();
+            this.updatePositions(true);
 
-            // 保存当前位置作为原始位置
-            this.saveOriginalPositions();
+            // 震动反馈
+            if (this.vibrate && uni.vibrateShort) {
+                uni.vibrateShort({ type: 'light' });
+            }
         },
         onTouchEnd() {
+            // 未发生位移
+            if (this.dragIndex === -1) return
+
             // 0.001是为了解决拖动过快等某些极限场景下位置还原不生效问题
             if (this.direction === 'horizontal') {
                 this.list[this.dragIndex].x = this.currentPosition.x + 0.001;
@@ -290,12 +302,14 @@ export default {
 
             // 重置到位置，需要延迟触发动，否则无效。
             sleep(50).then(() => {
-                this.list.forEach((item, index) => {
-                    item.x = this.originalPositions[index].x;
-                    item.y = this.originalPositions[index].y;
-                });
-                this.dragIndex = -1;
-                this.$emit('drag-end', [...this.list]);
+                this.updatePositions();
+                if (this.sortChanged) {
+                    this.$emit('drag-end', [...this.list]);
+                    this.sortChanged = false;
+                }
+                this.timer = setTimeout(() => {
+                    this.dragIndex = -1
+                }, 600)
             });
         }
     },
@@ -306,7 +320,7 @@ export default {
                     this.initList();
                 });
             },
-            deep: true
+            // deep: true
         },
         direction: {
             handler() {
@@ -323,7 +337,6 @@ export default {
                     this.$nextTick(() => {
                         this.initList();
                         this.updatePositions();
-                        this.saveOriginalPositions();
                     });
                 }
             }
@@ -335,15 +348,19 @@ export default {
 <style scoped lang="scss">
 .u-dragsort {
     width: 100%;
+    height: auto;
 
     .u-dragsort-area {
         width: 100%;
+        height: 100%;
         position: relative;
     }
 
     .u-dragsort-item {
         position: absolute;
         width: 100%;
+        transition: box-shadow 0.45s ease-out;
+        cursor: pointer;
 
         &.dragging {
             z-index: 1000;
@@ -351,6 +368,7 @@ export default {
         }
 
         .u-dragsort-item-content {
+            position: relative;
             padding: 0;
             box-sizing: border-box;
         }
@@ -366,7 +384,6 @@ export default {
         .u-dragsort-area {
             display: flex;
             white-space: nowrap;
-            height: auto;
         }
 
         .u-dragsort-item {
@@ -376,10 +393,6 @@ export default {
     }
 
     &.u-dragsort--all {
-        .u-dragsort-area {
-            height: auto;
-        }
-
         .u-dragsort-item {
             width: auto;
             height: auto;

package/components/u-empty/empty.js

@@ -1,11 +1,11 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 17:03:27
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/empty.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/empty.js
  */
 export default {
     // empty组件

package/components/u-form/form.js

@@ -1,11 +1,11 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 17:03:49
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/form.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/form.js
  */
 export default {
     // form 组件

package/components/u-form-item/formItem.js

@@ -1,11 +1,11 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 17:04:32
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/formItem.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/formItem.js
  */
 export default {
     // formItem 组件

package/components/u-gap/gap.js

@@ -1,11 +1,11 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 17:05:25
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/gap.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/gap.js
  */
 export default {
     // gap组件

package/components/u-grid/grid.js

@@ -1,11 +1,11 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 17:05:57
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/grid.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/grid.js
  */
 export default {
     // grid组件

package/components/u-grid/u-grid.vue

@@ -107,7 +107,7 @@
 		/* #ifndef APP-NVUE */
 		display: grid !important;
 		grid-gap: v-bind(gap);
-		grid-template-columns: repeat(v-bind(col), 1fr);
+		grid-template-columns: repeat(v-bind(col), minmax(0, 1fr));
 		/* #endif */
 	}
 </style>

package/components/u-grid-item/gridItem.js

@@ -1,11 +1,11 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 17:06:13
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/gridItem.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/gridItem.js
  */
 export default {
     // grid-item组件

package/components/u-icon/icon.js

@@ -1,11 +1,11 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 18:00:14
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/icon.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/icon.js
  */
 import config from '../../libs/config/config'
 

package/components/u-image/image.js

@@ -1,11 +1,11 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 17:01:51
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/image.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/image.js
  */
 export default {
     // image组件

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

@@ -1,11 +1,11 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 17:13:15
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/indexAnchor.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/indexAnchor.js
  */
 export default {
     // indexAnchor 组件

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

@@ -1,11 +1,11 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 17:13:35
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/indexList.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/indexList.js
  */
 export default {
     // indexList 组件

package/components/u-input/input.js

@@ -1,7 +1,7 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
  * @LastAuthor   : jry
  * @lastTime     : 2025-08-20 10:21:55

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

@@ -322,14 +322,17 @@ export default {
                 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
+					
+					//change方法需要放在下面，否则会引起change先触发，model后变化的异常
+					this.$emit("change", value);
+					
                 }
 
                 // 尝试调用u-form的验证方法

package/components/u-keyboard/keyboard.js

@@ -1,11 +1,11 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 17:07:49
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/keyboard.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/keyboard.js
  */
 import { t } from '../../libs/i18n'
 export default {

package/components/u-line/line.js

@@ -1,11 +1,11 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 17:04:49
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/line.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/line.js
  */
 export default {
     // line组件

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

@@ -1,11 +1,11 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 17:14:11
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/lineProgress.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/lineProgress.js
  */
 export default {
     // lineProgress 组件

package/components/u-link/link.js

@@ -1,11 +1,11 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 17:45:36
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/link.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/link.js
  */
 import config from '../../libs/config/config'
 import { t } from '../../libs/i18n'

package/components/u-list/list.js

@@ -1,11 +1,11 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 17:14:53
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/list.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/list.js
  */
 export default {
     // list 组件

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

@@ -114,7 +114,7 @@
 			this.anchors = []
 		},
 		mounted() {},
-		emits: ["scroll", "scrolltolower", "scrolltoupper",
+		emits: ["scroll", "scrolltolower", "scroll-to-lower", "scrolltoupper", "scroll-to-upper",
 			"refresherpulling", "refresherrefresh", "refresherrestore", "refresherabort"],
 		methods: {
 			updateOffsetFromChild(top) {
@@ -145,6 +145,8 @@
 			scrolltolower(e) {
 				sleep(30).then(() => {
 					this.$emit('scrolltolower')
+					// 支付宝小程序奇怪无法触发scrolltolowerhttps://github.com/ijry/uview-plus/issues/422
+					this.$emit('scroll-to-lower')
 				})
 			},
 			// #ifndef APP-NVUE
@@ -152,6 +154,7 @@
 			scrolltoupper(e) {
 				sleep(30).then(() => {
 					this.$emit('scrolltoupper')
+					this.$emit('scroll-to-upper')
 					// 这一句很重要，能绝对保证在性功能障碍的webview，滚动条到顶时，取消偏移值，让页面置顶
 					this.offset = 0
 				})

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

@@ -1,11 +1,11 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 17:15:40
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/listItem.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/listItem.js
  */
 export default {
     // listItem 组件

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

@@ -1,11 +1,11 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 17:45:47
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/loadingIcon.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/loadingIcon.js
  */
 import config from '../../libs/config/config'