@dolphinweex/weex-harmony 0.1.25 → 0.1.26

package/package.json

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

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

@@ -200,6 +200,10 @@ export default {
       lastBestTarget: null,
       targetChangeTime: null,
       pendingTarget: null,
+      weexListInnerEl: null,
+      weexRefreshEl: null,
+      originListInnerStyle: null,
+      originRefreshStyle: null,
     };
   },
   computed: {
@@ -242,6 +246,28 @@ export default {
     },
   },
   methods: {
+    searchDom(){
+      //在 slider组件内部时 阻止默认行为和冒泡都无法在长按的时候 阻止其滚动行为 只能查找去禁止
+      const currentEl = this.$el;
+      let parentEl = currentEl.parentElement;
+      let searchDepth = 0; // 搜索深度计数器
+      while (parentEl && !parentEl.classList.contains('weex-list-inner') && searchDepth < 5) {
+        parentEl = parentEl.parentElement;
+        searchDepth++; 
+      }
+      
+      if (parentEl) {
+        this.weexListInnerEl = parentEl;
+        this.originListInnerStyle = parentEl.style.touchAction || '';
+        
+        // 在weex-list-inner中查找weex-refresh子元素
+        const refreshEl = parentEl.querySelector('.weex-refresh');
+        if (refreshEl) {
+          this.weexRefreshEl = refreshEl;
+          this.originRefreshStyle = refreshEl.style.height || '';
+        }
+      }
+    },
     updateListItem(data) {
       console.log('updateListItem收到数据:', JSON.stringify(data));
       const id = data.itemView.id;
@@ -251,14 +277,16 @@ export default {
       const dataIndex = this.data.list.findIndex(
         (item) => item.itemView.id === id
       );
-
+      // 更新原始数据以确保watch能触发
+      if (dataIndex !== -1) {
+        // 使用Vue的$set确保响应式更新
+        this.$set(this.data.list, dataIndex, JSON.parse(JSON.stringify(data)));
+      }
       if (index === -1) {
         return;
       }
 
-      // 保存更新前的可见性状态用于比较
-      const oldVisibility = this.processedList[index].actionButton.visibility;
-      const newVisibility = data.actionButton.visibility;
+    
 
       // 检查是否有动画URL的变化
       const oldBgAnimUrl = this.processedList[index].bgAnimView.animUrl || '';
@@ -266,7 +294,6 @@ export default {
         this.processedList[index].loadingAnimView.animUrl || '';
       const oldFrontAnimUrl =
         this.processedList[index].frontAnimView.animUrl || '';
-
       const newBgAnimUrl = data.bgAnimView.animUrl || '';
       const newLoadingAnimUrl = data.loadingAnimView.animUrl || '';
       const newFrontAnimUrl = data.frontAnimView.animUrl || '';
@@ -614,7 +641,6 @@ export default {
 
     // 检查长按过程中的移动
     checkLongPressMove(e) {
-      this.data.isEditing && e.oriEvent.stopPropagation()
       if (!this.data.isEditable) {
         return;
       }
@@ -624,7 +650,6 @@ export default {
         this.onTouchMove(e);
         return;
       }
-
       const moveX = Math.abs(touch.pageX - this.touchStartX);
       const moveY = Math.abs(touch.pageY - this.touchStartY);
 
@@ -640,20 +665,14 @@ export default {
       if (moveX > this.scrollThreshold || moveY > this.scrollThreshold) {
         this.cancelLongPress();
       }
+      this.data.isEditing && e.oriEvent.stopPropagation()
+      this.data.isEditing && e.oriEvent.preventDefault()
 
-      // 不阻止默认行为，允许滚动
     },
 
     // 激活拖拽模式
     activateDragMode(index) {
       console.log('长按触发，进入编辑模式');
-      // 进入编辑模式
-      this.data.isEditing = true;
-      this.$emit('onEditStateChanged', true);
-      // 设置当前拖拽索引
-      this.draggingIndex = index;
-      this.isTouchDragging = true;
-
       // 此时添加阻止默认行为的事件监听，但只影响拖拽状态下的行为
       document.addEventListener('touchmove', this.onTouchMove, {
         passive: false, // 只有在拖拽模式下才阻止默认行为
@@ -661,38 +680,50 @@ export default {
       document.addEventListener('touchend', this.onTouchEnd, {
         passive: true,
       });
+      if (this.data.isEditing) {
+        // 设置当前拖拽索引
+        this.draggingIndex = index;
+        this.isTouchDragging = true;
+
+        // 使用存储的固定宽高
+        this.draggedItemRect = {
+          width: this.fixedItemWidth,
+          height: this.fixedItemHeight,
+        };
+
+        // 获取当前元素位置用于计算偏移
+        const element = document.querySelectorAll('.grid-item')[index];
+        if (element) {
+          const rect = element.getBoundingClientRect();
+          // 计算触摸点相对于元素左上角的偏移
+          this.touchOffsetX = this.touchStartX - rect.left;
+          this.touchOffsetY = this.touchStartY - rect.top;
+
+          // 设置克隆元素的初始位置
+          this.dragCloneX = rect.left;
+          this.dragCloneY = rect.top;
+
+          // 显示拖拽克隆
+          this.isDragClone = true;
+
+          // 立即执行一次定位以确保初始位置准确
+          requestAnimationFrame(() => {
+            this.dragCloneX = this.touchStartX - this.touchOffsetX;
+            this.dragCloneY = this.touchStartY - this.touchOffsetY;
+          });
 
-      // 使用存储的固定宽高
-      this.draggedItemRect = {
-        width: this.fixedItemWidth,
-        height: this.fixedItemHeight,
-      };
-
-      // 获取当前元素位置用于计算偏移
-      const element = document.querySelectorAll('.grid-item')[index];
-      if (element) {
-        const rect = element.getBoundingClientRect();
-        // 计算触摸点相对于元素左上角的偏移
-        this.touchOffsetX = this.touchStartX - rect.left;
-        this.touchOffsetY = this.touchStartY - rect.top;
-
-        // 设置克隆元素的初始位置
-        this.dragCloneX = rect.left;
-        this.dragCloneY = rect.top;
-
-        // 显示拖拽克隆
-        this.isDragClone = true;
-
-        // 立即执行一次定位以确保初始位置准确
-        requestAnimationFrame(() => {
-          this.dragCloneX = this.touchStartX - this.touchOffsetX;
-          this.dragCloneY = this.touchStartY - this.touchOffsetY;
-        });
+          console.log('拖拽克隆已创建');
+        }
 
-        console.log('拖拽克隆已创建');
+        this.longPressTimer = null;
+      }
+        // 进入编辑模式
+        if (!this.data.isEditing) {
+        // 设置编辑状态并隐藏weex-refresh
+        this.data.isEditing = true;
+        this.$emit('onEditStateChanged', true);
+        this.applyDragModeStyles(); // 应用编辑模式样式（隐藏refresh）
       }
-
-      this.longPressTimer = null;
     },
 
     // 取消长按计时器
@@ -822,6 +853,8 @@ export default {
         this.draggingIndex = bestTarget;
         this.lastSwapTime = now;
       }
+      this.data.isEditing && e.oriEvent.stopPropagation()
+      this.data.isEditing && e.oriEvent.preventDefault()
     },
 
     // 新增：平滑更新拖拽位置的方法
@@ -877,6 +910,12 @@ export default {
         this.isDragClone = false;
         this.hoverIndex = null;
         this.draggingIndex = null;
+        
+        // 如果不再拖拽，恢复touch-action（但保持refresh隐藏，因为仍在编辑状态）
+        const elements = this.findParentElements();
+        if (elements.listInner) {
+          elements.listInner.style.touchAction = this.originListInnerStyle;
+        }
       }
     },
 
@@ -884,6 +923,9 @@ export default {
     onTouchEnd(e) {
       console.log('全局触摸结束');
 
+      // 恢复拖拽模式前的样式
+      this.restoreDragModeStyles();
+      
       // 移除全局事件监听
       document.removeEventListener('touchmove', this.onTouchMove, {
         passive: false,
@@ -1155,6 +1197,40 @@ export default {
       // 这里可以添加将来的处理逻辑
       return false;
     },
+
+    // 查找父级元素和refresh元素
+    findParentElements() {
+      // 返回存储的元素引用
+      return {
+        listInner: this.weexListInnerEl,
+        refresh: this.weexRefreshEl
+      };
+    },
+    
+    // 进入拖拽模式时应用样式
+    applyDragModeStyles() {
+      const elements = this.findParentElements();
+      
+      // 设置weex-list-inner的touch-action: none（只在拖拽时）
+      if (elements.listInner && this.isTouchDragging) {
+        elements.listInner.style.touchAction = 'none';
+      }
+    },
+    
+    // 退出拖拽模式时恢复样式
+    restoreDragModeStyles() {
+      const elements = this.findParentElements();
+      
+      // 恢复weex-list-inner的touch-action（只在拖拽时修改）
+      if (elements.listInner && this.isTouchDragging) {
+        elements.listInner.style.touchAction = this.originListInnerStyle;
+      }
+      
+      // 如果不在编辑状态，恢复weex-refresh的display
+      if (elements.refresh && !this.data.isEditing) {
+        elements.refresh.style.display = 'flex';
+      }
+    },
   },
   watch: {
     // 监听初始数据变化
@@ -1281,6 +1357,20 @@ export default {
       },
       deep: true,
     },
+    // 添加对编辑状态的监听
+    'data.isEditing': {
+      handler(newValue) {
+        const elements = this.findParentElements();
+        if (elements.refresh) {
+          if (newValue) {
+            elements.refresh.style.maxHeight = '0px';
+          } else {
+            elements.refresh.style.maxHeight = '999px'
+          }
+        }
+      },
+      immediate: true
+    },
   },
   mounted() {
     console.log(this.data, 'djdjdjdjdjdjdj');
@@ -1289,6 +1379,8 @@ export default {
     // 获取并存储固定宽高
     this.updateFixedItemSize();
 
+    this.searchDom()
+
     // 监听窗口大小变化，更新grid-box宽度
     window.addEventListener('resize', () => {
       this.updateGridBoxWidth();