@dolphinweex/weex-harmony 0.1.24 → 0.1.26

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dolphinweex/weex-harmony",
-  "version": "0.1.24",
+  "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,18 +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;
-
-      if (typeof newVisibility === 'number') {
-        console.log(`按钮可见性从 ${oldVisibility} 变更为 ${newVisibility}`);
-      }
+    
 
       // 检查是否有动画URL的变化
       const oldBgAnimUrl = this.processedList[index].bgAnimView.animUrl || '';
@@ -270,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 || '';
@@ -292,7 +315,6 @@ export default {
 
       // 如果动画URL有变化，重新初始化相关的Lottie动画
       if (hasAnimUrlChanged) {
-        console.log('检测到动画URL变化，重新初始化动画');
 
         // 等待下一帧DOM更新完成后再操作
         this.$nextTick(() => {
@@ -307,7 +329,6 @@ export default {
           ];
           animKeys.forEach((key) => {
             if (this.lottieAnimations[key]) {
-              console.log(`销毁动画实例: ${key}`);
               const anim = this.lottieAnimations[key];
               try {
                 anim.removeEventListener('complete');
@@ -316,14 +337,12 @@ export default {
                 anim.removeEventListener('loaded_images');
                 anim.removeEventListener('loopComplete');
               } catch (e) {
-                console.warn(`移除事件监听器失败: ${e.message}`);
               }
               anim.destroy();
               delete this.lottieAnimations[key];
             }
           });
 
-          console.log('清理完成，开始重新初始化动画');
 
           // 延迟一点时间确保DOM完全更新
           setTimeout(() => {
@@ -372,7 +391,6 @@ export default {
       callback({ listData: data });
     },
     rightIconClick(e) {
-      console.log('rightIconClick执行，阻止事件冒泡');
       e.preventDefault();
       e.stopPropagation();
       this.$emit('onClickRightIcon', e);
@@ -406,7 +424,6 @@ export default {
       }
       e.preventDefault();
       e.stopPropagation();
-      console.log('itemViewClick');
       // 确保取消任何长按计时器
       this.cancelLongPress();
       if (this.data.isEditing) {
@@ -424,7 +441,6 @@ export default {
     },
 
     actionClick(e, item, index) {
-      console.log('actionClick执行，阻止事件冒泡');
       e.preventDefault();
       e.stopPropagation(); // 阻止事件冒泡到itemViewClick
 
@@ -443,14 +459,12 @@ export default {
 
     // 新增方法：清理除指定项目外的所有动画实例
     cleanupOtherAnimations(currentItemId) {
-      console.log('清理其他项目的动画实例，当前项目ID:', currentItemId);
 
       // 遍历所有动画实例
       Object.keys(this.lottieAnimations).forEach((key) => {
         // 检查是否为其他项目的动画
         if (!key.includes(`-${currentItemId}`)) {
           if (this.lottieAnimations[key]) {
-            console.log(`销毁其他项目的动画实例: ${key}`);
             const anim = this.lottieAnimations[key];
 
             // 移除所有事件监听器
@@ -479,7 +493,6 @@ export default {
                 const animContainer =
                   this.$refs[refName] && this.$refs[refName][0];
                 if (animContainer) {
-                  console.log(`隐藏动画容器: ${refName}`);
                   animContainer.style.display = 'none';
                 }
               });
@@ -523,7 +536,6 @@ export default {
     },
     getItemStyle(item, type) {
       const result = this.mergeDate(item[type] || {}, type);
-      console.log(type, this.applyNormalAttribute(result), 'ggg');
       return this.applyNormalAttribute(result);
     },
     mergeDate(target, type) {
@@ -599,7 +611,6 @@ export default {
       const touch = e.changedTouches[0];
       this.touchStartX = touch.pageX;
       this.touchStartY = touch.pageY;
-      console.log('开始长按ddddddddd', touch, touch.pageY, touch.pageX);
       this.longPressStartIndex = index;
       this.isScrolling = false; // 重置滚动状态
 
@@ -616,9 +627,7 @@ export default {
           items: [...this.itemsList],
         });
       }
-      console.log(
-        `准备长按: index=${index}, 触摸坐标=(${touch.pageX}, ${touch.pageY})`
-      );
+
 
       // 设置新的长按计时器
       this.longPressTimer = setTimeout(() => {
@@ -632,7 +641,6 @@ export default {
 
     // 检查长按过程中的移动
     checkLongPressMove(e) {
-      this.data.isEditing && e.oriEvent.stopPropagation()
       if (!this.data.isEditable) {
         return;
       }
@@ -642,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);
 
@@ -658,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, // 只有在拖拽模式下才阻止默认行为
@@ -679,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;
     },
 
     // 取消长按计时器
@@ -840,6 +853,8 @@ export default {
         this.draggingIndex = bestTarget;
         this.lastSwapTime = now;
       }
+      this.data.isEditing && e.oriEvent.stopPropagation()
+      this.data.isEditing && e.oriEvent.preventDefault()
     },
 
     // 新增：平滑更新拖拽位置的方法
@@ -895,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;
+        }
       }
     },
 
@@ -902,6 +923,9 @@ export default {
     onTouchEnd(e) {
       console.log('全局触摸结束');
 
+      // 恢复拖拽模式前的样式
+      this.restoreDragModeStyles();
+      
       // 移除全局事件监听
       document.removeEventListener('touchmove', this.onTouchMove, {
         passive: false,
@@ -977,12 +1001,6 @@ export default {
           // 为每个列表项初始化动画
           this.processedList.forEach((item) => {
             const itemId = item.itemView.id;
-
-            console.log('处理项目ID:', itemId);
-            console.log('loadingAnimView:', item.loadingAnimView);
-            console.log('bgAnimView:', item.bgAnimView);
-            console.log('frontAnimView:', item.frontAnimView);
-
             // 加载背景动画
             this.loadLottieAnimation(
               item.bgAnimView,
@@ -1014,27 +1032,17 @@ export default {
     // 抽取公共的loadLottieAnimation方法
     loadLottieAnimation(animView, refName, animKey, item) {
       if (!animView || !animView.animUrl) {
-        console.log(`[${animKey}] 跳过加载：animUrl不存在`);
         return;
       }
 
-      console.log(
-        `[${animKey}] 尝试初始化${refName}, animUrl:`,
-        animView.animUrl,
-        '可见性:',
-        animView.visibility
-      );
-
       const animEl = this.$refs[refName];
       if (!animEl || !animEl[0]) {
-        console.warn(`[${animKey}] 未找到${refName}的DOM引用，请检查DOM结构`);
         return;
       }
 
       try {
         // 如果已经有实例，先销毁它
         if (this.lottieAnimations[animKey]) {
-          console.log(`[${animKey}] 销毁现有的动画实例`);
           this.lottieAnimations[animKey].destroy();
           delete this.lottieAnimations[animKey];
         }
@@ -1045,33 +1053,21 @@ export default {
           animView.visibility !== 0
         ) {
           // 使用fetch方式获取动画数据
-          console.log(`[${animKey}] 开始获取动画数据:`, animView.animUrl);
           fetch(animView.animUrl)
             .then((response) => {
               if (!response.ok) {
-                console.error(
-                  `[${animKey}] 获取动画数据失败，HTTP状态码:`,
-                  response.status
-                );
                 throw new Error('Network response was not ok');
               }
-              console.log(`[${animKey}] 网络请求成功，正在解析JSON`);
               return response.json();
             })
             .then((animationData) => {
-              console.log(
-                `[${animKey}] 动画数据已加载，数据大小:`,
-                JSON.stringify(animationData).length
-              );
               // 再次检查是否已有实例（可能在fetch期间创建了）
               if (this.lottieAnimations[animKey]) {
-                console.log(`[${animKey}] 销毁fetch期间创建的动画实例`);
                 this.lottieAnimations[animKey].destroy();
                 delete this.lottieAnimations[animKey];
               }
 
               // 创建新的动画实例
-              console.log(`[${animKey}] 创建新的动画实例`);
               const anim = lottie.loadAnimation({
                 container: animEl[0],
                 renderer: 'svg',
@@ -1087,15 +1083,10 @@ export default {
               this.lottieAnimations[animKey] = anim;
 
               // 添加动画事件监听
-              anim.addEventListener('DOMLoaded', () => {
-                console.log(`[${animKey}] 动画DOM已加载完成`);
-              });
 
               anim.addEventListener('complete', () => {
-                console.log(`[${animKey}] 动画播放完成一次`);
                 // 检查是否需要销毁动画（非循环动画完成后销毁）
                 if (!item.animRepeatCount) {
-                  console.log(`[${animKey}] 非循环动画播放完成，执行销毁`);
                   // 销毁前再次检查实例是否存在
                   if (this.lottieAnimations[animKey] === anim) {
                     anim.removeEventListener('complete');
@@ -1105,7 +1096,6 @@ export default {
                     anim.removeEventListener('loopComplete');
                     anim.destroy();
                     delete this.lottieAnimations[animKey];
-                    console.log(`[${animKey}] 动画实例已销毁`);
 
                     // 查找并隐藏对应的动画容器
                     this.$nextTick(() => {
@@ -1174,23 +1164,17 @@ export default {
                             );
                           }
                         }
-                        console.log(`[${animKey}] 已清空动画URL数据`);
                       }
                     });
                   }
                 }
               });
 
-              console.log(`[${animKey}] ${refName}初始化成功`);
             })
             .catch((error) => {
-              console.error(`[${animKey}] 加载${refName}动画数据失败:`, error);
             });
-        } else {
-          console.log(`[${animKey}] ${refName}可见性为0，跳过初始化`);
-        }
+        } 
       } catch (error) {
-        console.error(`[${animKey}] ${refName}初始化失败，详细错误:`, error);
       }
     },
 
@@ -1202,23 +1186,51 @@ export default {
           const rect = gridItem.getBoundingClientRect();
           this.fixedItemWidth = rect.width;
           this.fixedItemHeight = rect.height;
-          console.log(
-            '固定宽高已更新:',
-            this.fixedItemWidth,
-            this.fixedItemHeight
-          );
         }
       });
     },
 
     // 暂未使用，但保留用于将来扩展
     leftTopIconClick(e) {
-      console.log('leftTopIconClick执行，阻止事件冒泡');
       e.preventDefault();
       e.stopPropagation();
       // 这里可以添加将来的处理逻辑
       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: {
     // 监听初始数据变化
@@ -1233,21 +1245,8 @@ export default {
     // 监听列表数据变化，自动更新处理后的数据
     'data.list': {
       handler(newList, oldList) {
-        console.log('检测到data.list变化');
         this.processedList = this.generateDataList();
         this.$nextTick(() => {
-          // 日志输出当前列表中所有按钮的可见性
-          if (this.processedList && this.processedList.length > 0) {
-            console.log('更新后的按钮可见性状态:');
-            this.processedList.forEach((item, idx) => {
-              if (item.actionButton) {
-                console.log(
-                  `项目${idx} (ID:${item.itemView.id}) 按钮可见性: ${item.actionButton.visibility}`
-                );
-              }
-            });
-          }
-
           this.updateGridBoxWidth();
           this.updateFixedItemSize();
           this.initLottieAnimations();
@@ -1297,10 +1296,6 @@ export default {
             oldList[index].bgAnimView &&
             item.bgAnimView.animUrl !== oldList[index].bgAnimView.animUrl
           ) {
-            console.log(
-              '检测到bgAnimView.animUrl变化:',
-              item.bgAnimView.animUrl
-            );
             this.$nextTick(() => {
               const itemId = item.itemView.id;
               if (this.lottieAnimations[`bg-${itemId}`]) {
@@ -1323,10 +1318,6 @@ export default {
             item.loadingAnimView.animUrl !==
               oldList[index].loadingAnimView.animUrl
           ) {
-            console.log(
-              '检测到loadingAnimView.animUrl变化:',
-              item.loadingAnimView.animUrl
-            );
             this.$nextTick(() => {
               const itemId = item.itemView.id;
               if (this.lottieAnimations[`loading-${itemId}`]) {
@@ -1348,10 +1339,6 @@ export default {
             oldList[index].frontAnimView &&
             item.frontAnimView.animUrl !== oldList[index].frontAnimView.animUrl
           ) {
-            console.log(
-              '检测到frontAnimView.animUrl变化:',
-              item.frontAnimView.animUrl
-            );
             this.$nextTick(() => {
               const itemId = item.itemView.id;
               if (this.lottieAnimations[`front-${itemId}`]) {
@@ -1370,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');
@@ -1378,6 +1379,8 @@ export default {
     // 获取并存储固定宽高
     this.updateFixedItemSize();
 
+    this.searchDom()
+
     // 监听窗口大小变化，更新grid-box宽度
     window.addEventListener('resize', () => {
       this.updateGridBoxWidth();
@@ -1411,7 +1414,6 @@ export default {
     Object.keys(this.lottieAnimations).forEach((key) => {
       const anim = this.lottieAnimations[key];
       if (anim && typeof anim.destroy === 'function') {
-        console.log(`组件销毁时清理动画: ${key}`);
         try {
           anim.removeEventListener('complete');
           anim.removeEventListener('DOMLoaded');
@@ -1419,7 +1421,6 @@ export default {
           anim.removeEventListener('loaded_images');
           anim.removeEventListener('loopComplete');
         } catch (e) {
-          console.warn(`移除事件监听器失败: ${e.message}`);
         }
         anim.destroy();
       }

package/src/transform-loader.js

@@ -343,6 +343,10 @@ module.exports = function (source) {
       script,
       styles
     } = moduleResoveRet
+    if (!template) {
+      return source
+    }
+
     const tempAst = parse(template.content)
     tempAst.forEach((node) => {
       traverseNode(node)