@dolphinweex/weex-harmony 0.1.34 → 0.1.36

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dolphinweex/weex-harmony",
-  "version": "0.1.34",
+  "version": "0.1.36",
   "description": "weex harmony adapter",
   "main": "index.js",
   "files": [

package/src/components/midea-scene-card-drag-list-view.vue

@@ -48,7 +48,7 @@
               :style="applyNormalAttribute(item.itemView)"
               class="grid-box"
               :class="{ shaking: data.isEditing }"
-              @click.stop="(e) => itemViewClick(e, item, index)"
+              @click.stop.prevent="(e) => itemViewClick(e, item, index)"
             >
               <div class="flexBox">
                 <img
@@ -396,8 +396,8 @@ export default {
       if (item.selectIcon.visibility) {
         item.itemView.isSelected = !item.itemView.isSelected;
       }
-      e.preventDefault();
-      e.stopPropagation();
+      e && e.preventDefault();
+      e && e.stopPropagation();
       const target = {
         ...item.itemView,
         id: String(item.itemView.id),
@@ -683,7 +683,7 @@ export default {
     activateDragMode(index) {
       console.log('长按触发，进入编辑模式');
       // 进入编辑模式
-
+      
       if (this.data.isEditing) {
         // 设置当前拖拽索引
         this.draggingIndex = index;
@@ -699,23 +699,32 @@ export default {
         const element = document.querySelectorAll('.grid-item')[index];
         if (element) {
           const rect = element.getBoundingClientRect();
-          // 计算触摸点相对于元素左上角的偏移
+          const containerRect = this.$el.getBoundingClientRect();
+          
+          // 计算相对于父容器的偏移
           this.touchOffsetX = this.touchStartX - rect.left;
           this.touchOffsetY = this.touchStartY - rect.top;
 
-          // 设置克隆元素的初始位置
-          this.dragCloneX = rect.left;
-          this.dragCloneY = rect.top;
+          // 设置克隆元素的初始位置（相对于父容器）
+          this.dragCloneX = rect.left - containerRect.left;
+          this.dragCloneY = rect.top - containerRect.top;
           this.isDragClone = true;
 
           requestAnimationFrame(() => {
-            this.dragCloneX = this.touchStartX - this.touchOffsetX;
-            this.dragCloneY = this.touchStartY - this.touchOffsetY;
+            const relativeX = this.touchStartX - containerRect.left - this.touchOffsetX;
+            const relativeY = this.touchStartY - containerRect.top - this.touchOffsetY;
+            this.dragCloneX = relativeX;
+            this.dragCloneY = relativeY;
           });
 
           console.log('拖拽克隆已创建');
         }
       }
+      if(!this.data.isEditing){
+          setTimeout(()=>{
+          this.selectIconClick(null, this.data.list[index], index)
+        },100)
+      }
       this.data.isEditing = true;
       this.$emit('onEditStateChanged', true);
       this.longPressTimer = null;
@@ -733,7 +742,6 @@ export default {
     onTouchMove(e) {
       if (!this.isTouchDragging) return;
 
-      // 确保在拖拽模式下阻止所有事件传播
       if (this.isTouchDragging && this.data.isEditing) {
         if (e.oriEvent) {
           e.oriEvent.preventDefault();
@@ -743,17 +751,16 @@ export default {
       }
 
       const touch = e.changedTouches[0];
+      const containerRect = this.$el.getBoundingClientRect();
 
-      // 更新目标位置而非直接设置
-      this.targetTouchX = touch.pageX;
-      this.targetTouchY = touch.pageY;
+      // 更新目标位置（相对于父容器）
+      this.targetTouchX = touch.pageX - containerRect.left;
+      this.targetTouchY = touch.pageY - containerRect.top;
 
-      // 启动平滑动画（如果尚未启动）
       if (!this.animationFrameId) {
         this.animationFrameId = requestAnimationFrame(this.updateDragPosition);
       }
 
-      // 简化的交换逻辑
       this.handleSwapLogic(touch.pageX, touch.pageY);
     },
 
@@ -811,21 +818,16 @@ export default {
 
     // 平滑更新拖拽位置的方法
     updateDragPosition() {
-      const easing = 0.6; // 增加缓动系数，让拖拽更跟手
-      this.dragCloneX +=
-        (this.targetTouchX - this.touchOffsetX - this.dragCloneX) * easing;
-      this.dragCloneY +=
-        (this.targetTouchY - this.touchOffsetY - this.dragCloneY) * easing;
-      if (
-        Math.abs(this.dragCloneX - (this.targetTouchX - this.touchOffsetX)) <
-        0.5
-      )
-        this.dragCloneX = this.targetTouchX - this.touchOffsetX;
-      if (
-        Math.abs(this.dragCloneY - (this.targetTouchY - this.touchOffsetY)) <
-        0.5
-      )
-        this.dragCloneY = this.targetTouchY - this.touchOffsetY;
+      const easing = 0.6;
+      const targetX = this.targetTouchX - this.touchOffsetX;
+      const targetY = this.targetTouchY - this.touchOffsetY;
+
+      this.dragCloneX += (targetX - this.dragCloneX) * easing;
+      this.dragCloneY += (targetY - this.dragCloneY) * easing;
+
+      if (Math.abs(this.dragCloneX - targetX) < 0.5) this.dragCloneX = targetX;
+      if (Math.abs(this.dragCloneY - targetY) < 0.5) this.dragCloneY = targetY;
+
       this.animationFrameId = requestAnimationFrame(this.updateDragPosition);
     },
 
@@ -846,7 +848,11 @@ export default {
         this.isTouchDragging = false;
         this.isDragClone = false;
         this.hoverIndex = null;
-        this.draggingIndex = null;
+
+        // 使用延时来重置拖拽索引，避免与点击事件冲突
+        setTimeout(() => {
+          this.draggingIndex = null;
+        }, 100);
       }
     },
 
@@ -1023,10 +1029,12 @@ button {
 .outer-container {
   width: 100%;
   position: relative;
+  transform-style: preserve-3d;
 }
 
 .items-container {
   width: 100%;
+  position: relative;
 }
 
 .grid-items-wrapper {