@dolphinweex/weex-harmony 0.1.80 → 0.1.82

package/package.json

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

package/src/components/midea-ipc-drag-list-view.vue

@@ -22,11 +22,13 @@
          v-for="(item, index) in data.list"
          :key="item.id"
          class="grid-item"
-         :class="{
-           'being-dragged': draggingIndex === index,
-           hidden: isDragClone && draggingIndex === index,
-           disabled: item.disabled === true
-         }"
+        :class="{
+          'being-dragged': draggingIndex === index,
+          hidden: isDragClone && draggingIndex === index,
+          disabled: item.disabled === true,
+          deleted: item.deleted
+        }"
+        v-show="!item.deleted"
          :data-index="index"
          @touchstart="(e) => onTouchStart(e, index)"
          @touchmove="onTouchMove"
@@ -37,9 +39,9 @@
          <div class="box" :class="{ shaking: isEditing }">
            <div class="thumb-wrap">
              <img class="thumb" :src="item.imageSrc" alt="" />
-             <button class="delete-btn" 
-              :style="{ fontSize : data.deleteBtnSize && data.deleteBtnSize * 4  || 16 * 4 }"
-             @click.stop="onDelete(index, item)">×</button>
+            <button class="delete-btn" 
+             :style="{ fontSize : data.deleteBtnSize && data.deleteBtnSize * 4  || 16 * 4 }"
+            @click.stop="requestDelete(index, item)">×</button>
            </div>
           <div
             class="label-row"
@@ -76,11 +78,22 @@
         v-model="editInputValue"
         :placeholder="data.inputPlaceholder || ''"
       />
-        <div class="modal-actions">
-          <text class="btn cancel" @click="onEditCancel">取消</text>
-          <div class="btn-divider"></div>
-          <text class="btn confirm" @click="onEditConfirm">确认</text>
-        </div>
+      <div class="modal-actions">
+        <text class="btn cancel" @click="onEditCancel">取消</text>
+        <div class="btn-divider"></div>
+        <text class="btn confirm" @click="onEditConfirm">确认</text>
+      </div>
+    </div>
+  </div>
+  <div v-if="showDeleteConfirm" class="modal-mask">
+    <div class="modal">
+      <div class="modal-title">温馨提示</div>
+      <div class="modal-content">删除所选关注视角后，相关的智能场景将执行失败</div>
+      <div class="modal-actions">
+        <text class="btn cancel" @click="onDeleteCancel">取消</text>
+        <div class="btn-divider"></div>
+        <text class="btn confirm" @click="onDeleteConfirmAction">确定</text>
+      </div>
     </div>
   </div>
   </div>
@@ -132,6 +145,8 @@
       showEditDialog: false,
       editInputValue: '',
       editIndex: null,
+      showDeleteConfirm: false,
+      pendingDeleteIndex: null,
        scale: weex.config.env.scale
      };
    },
@@ -161,6 +176,25 @@
        if (this.isTouchDragging || this.longPressTimer || this.secondLongPressTimer) return;
        this.$emit('onClickEvent', { item, index });
      },
+  
+    requestDelete(index, item) {
+      const targetItem = this.data.list[index];
+      if (!targetItem || targetItem.deleted) return;
+      this.pendingDeleteIndex = index;
+      this.showDeleteConfirm = true;
+    },
+
+    onDeleteCancel() {
+      this.showDeleteConfirm = false;
+      this.pendingDeleteIndex = null;
+    },
+
+    onDeleteConfirmAction() {
+      if (this.pendingDeleteIndex === null) return;
+      const item = this.data.list[this.pendingDeleteIndex];
+      this.onDelete(this.pendingDeleteIndex, item);
+      this.onDeleteCancel();
+    },
 
     onEditClick(item, index) {
       // 点击编辑按钮：弹出编辑名称对话框
@@ -175,16 +209,19 @@
     },
     
     /**
-     * @description 校验并过滤输入内容：仅允许中文/英文/数字。
+     * @description 校验输入内容，仅允许中文/英文/数字，且去除前后空白。
      * @param {string} value 当前输入值
-     * @returns {string} 校验并过滤后的值
+     * @returns {{ valid: boolean, message?: string, value?: string }}
      */
-    validateAndFilterInput(value) {
-      if (!value) return '';
-      // 过滤：只保留中文、英文、数字
-      // 正则表达式：[^a-zA-Z0-9\u4e00-\u9fa5] 匹配所有非英文、非数字、非汉字的字符
-      let filteredValue = value.replace(/[^a-zA-Z0-9\u4e00-\u9fa5]/g, '');
-      return filteredValue;
+    validateLabelInput(value) {
+      const trimmedValue = (value || '').trim();
+      if (!trimmedValue) {
+        return { valid: false, message: '视角名称不能为空' };
+      }
+      if (/[^a-zA-Z0-9\u4e00-\u9fa5]/.test(trimmedValue)) {
+        return { valid: false, message: '视角名称只能输入中文、英文和数字' };
+      }
+      return { valid: true, value: trimmedValue };
     },
     
     showToast(message) {
@@ -199,20 +236,28 @@
     },
     
     onEditConfirm() {
-      const originalValue = (this.editInputValue || '').trim();
-      const newLabel = this.validateAndFilterInput(originalValue);
-      
-      // 2. 检查是否为空
-      if (!newLabel) {
-        this.showToast('不支持为空');
+      const validation = this.validateLabelInput(this.editInputValue);
+      if (!validation.valid) {
+        this.showToast(validation.message);
         return;
       }
+      const newLabel = validation.value;
+      
       // 3. 检查长度
       if (newLabel.length > 8) {
         // 长度超限：提示并阻止后续更新和关闭逻辑
         this.showToast('限8个字符以内名称，请重新输入');
         return; 
       }
+      const duplicateExists = this.data.list && this.data.list.some((it, idx) => {
+        if (idx === this.editIndex) return false;
+        if (!it || it.deleted) return false;
+        return String(it.label || '') === newLabel;
+      });
+      if (duplicateExists) {
+        this.showToast('已存在此视角');
+        return;
+      }
       if (this.editIndex !== null && this.data.list && this.data.list[this.editIndex]) {
         this.$set(this.data.list[this.editIndex], 'label', newLabel);
         // 通知外部（可选）
@@ -230,15 +275,20 @@
      * @param {object} item 列表项数据
      */
     onDelete(index, item) {
-      this.$emit('onDeleteEvent', { item, index });
-      // 默认本地也删除
-      this.data.list.splice(index, 1);
+      const currentItem = this.data.list[index];
+      if (!currentItem) return;
+      this.$emit('onDeleteEvent', { item: currentItem, index });
+      this.$set(currentItem, 'deleted', true);
       this.$nextTick(this.measureItemSize);
     },
  
      onTouchStart(e, index) {
        if (!e.changedTouches || e.changedTouches.length === 0) return;
-       this.measureItemSize();
+      const targetItem = this.data.list[index];
+      if (targetItem && targetItem.deleted) {
+        return;
+      }
+      this.measureItemSize();
        const touch = e.changedTouches[0];
        this.touchStartX = touch.pageX;
        this.touchStartY = touch.pageY;
@@ -395,7 +445,9 @@
        const gridItems = Array.from(this.$el.querySelectorAll('.grid-item'));
        let targetIndex = null;
        for (let i = 0; i < gridItems.length; i++) {
-         if (i === this.draggingIndex) continue;
+        if (i === this.draggingIndex) continue;
+        const listItem = this.data.list[i];
+        if (listItem && listItem.deleted) continue;
          const rect = gridItems[i].getBoundingClientRect();
          const centerX = (rect.left + rect.right) / 2;
          const centerY = (rect.top + rect.bottom) / 2;
@@ -421,11 +473,15 @@
     },
     getListData(callback) {
       const list = Array.isArray(this.data && this.data.list) ? this.data.list : [];
-      const arr = list.map((it) => ({
-        id: String((it && (it.id != null ? it.id : '')) || ''),
-        label: String((it && (it.label != null ? it.label : '')) || ''),
-        imageSrc: (it && it.imageSrc) || ''
-      }));
+      const arr = [];
+      list.forEach((it) => {
+        if (!it || it.deleted) return;
+        arr.push({
+          id: String((it && (it.id != null ? it.id : '')) || ''),
+          label: String((it && (it.label != null ? it.label : '')) || ''),
+          imageSrc: (it && it.imageSrc) || ''
+        });
+      });
       const payload = { listData: arr, list: arr };
       if (typeof callback === 'function') {
         try { callback(payload); } catch (e) { /* ignore */ }
@@ -512,8 +568,6 @@
   flex-direction: row;
   justify-content: center;
   gap: 8px;
-}
-.edit-icon {
 }
  .drag-clone {
    box-sizing: border-box;
@@ -539,7 +593,6 @@
   max-width: 60vw;
   background: #fff;
   border-radius: 24px;
-  padding: 16px;
   box-shadow: 0 8px 20px rgba(0,0,0,0.18);
 }
 .modal-title {
@@ -548,9 +601,18 @@
   color: #222;
   margin: 24px 0 24px 0px;
   text-align: center;
+  font-weight: 500;
+}
+.modal-content {
+  font-size: 24px;
+  color: #333;
+  text-align: center;
+  padding-bottom: 16px;
+  padding: 10px 16px;
 }
 .modal-input {
-  width: 100%;
+  width: 90%;
+  margin: 10px auto;
   box-sizing: border-box;
   border: 2px solid #e8e8e8;
   border-radius: 8px;
@@ -562,21 +624,22 @@
   border-color: #1677ff;
 }
 .modal-actions {
+  border-top:1px solid #ccc;
   margin-top: 14px;
   display: flex;
   align-items: center;
   flex-direction: row;
   width: 100%;
-  justify-content: space-around;
+  justify-content: space-evenly;
 }
 .btn {
-  padding: 12px 24px;
+  padding: 20px 24px;
   font-size: 30px;
   color:#46a2df
 }
 .btn-divider {
   width: 1px;
-  height: 32px;
-  background: #eee;
+  height: 100%;
+  background: #ccc;
 }
  </style>