From 349c4d715c179a083d8cb26b48b72915ee668d6d Mon Sep 17 00:00:00 2001
From: "jlj05024111@163.com" <jlj05024111@163.com>
Date: Fri, 14 Nov 2025 17:15:08 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E7=A7=BB=E5=8A=A8=E7=AB=AF?=
 =?UTF-8?q?=E5=A4=9A=E6=95=B0=E6=8D=AE=E9=83=A8=E4=BB=B6=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E8=A1=A8=E8=BF=9B=E8=A1=8C=E5=88=86=E7=BB=84=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E4=B8=8D=E9=A2=9D=E5=A4=96=E5=86=8D=E8=A1=A5=E5=85=85=E6=9C=AA?=
 =?UTF-8?q?=E5=88=86=E7=BB=84=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/runtime/CHANGELOG.md                       |  1 +
 .../control/md-ctrl/md-ctrl.controller.ts           | 13 -------------
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/packages/runtime/CHANGELOG.md b/packages/runtime/CHANGELOG.md
index bba2dfe918f..de1d673bce1 100644
--- a/packages/runtime/CHANGELOG.md
+++ b/packages/runtime/CHANGELOG.md
@@ -16,6 +16,7 @@
 
 ### Changed
 
+- 移动端多数据部件代码表进行分组时，不额外再补充未分组情况
 - 调整移动端分页导航面板部件刷新逻辑，与移动端数据关系分页部件刷新保持一致
 
 ### Fixed
diff --git a/packages/runtime/src/controller/control/md-ctrl/md-ctrl.controller.ts b/packages/runtime/src/controller/control/md-ctrl/md-ctrl.controller.ts
index ece9812d2e1..428cb5e04ad 100644
--- a/packages/runtime/src/controller/control/md-ctrl/md-ctrl.controller.ts
+++ b/packages/runtime/src/controller/control/md-ctrl/md-ctrl.controller.ts
@@ -397,11 +397,6 @@ export class MDCtrlController
     }
     const { items } = this.state;
     const groupMap: Map<string | number, MobMDCtrlRowState[]> = new Map();
-    const unclassified: IMDControlGroupState = {
-      key: createUUID(),
-      caption: ibiz.i18n.t('runtime.controller.common.md.unclassified'),
-      children: [],
-    };
     this.groupCodeListItems!.forEach(item => {
       groupMap.set(item.value, []);
     });
@@ -410,11 +405,6 @@ export class MDCtrlController
       const groupArr = groupMap.get(groupVal);
       if (groupArr) {
         groupArr.push(new MobMDCtrlRowState(item as ControlVO, this));
-      } else {
-        // 分组无值默认归为未分类
-        unclassified.children.push(
-          new MobMDCtrlRowState(item as ControlVO, this),
-        );
       }
     });
 
@@ -430,9 +420,6 @@ export class MDCtrlController
         children: arr,
       });
     });
-
-    // 将未分类放到最后
-    if (unclassified.children.length) groups.push(unclassified);
     this.state.groups = groups;
   }
 
-- 
Gitee


From c388097edc2d04007358047b371dd0536e646630 Mon Sep 17 00:00:00 2001
From: "jlj05024111@163.com" <jlj05024111@163.com>
Date: Fri, 14 Nov 2025 17:18:25 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E9=9D=A2=E6=9D=BF=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7=E9=A1=B9=E7=82=B9=E5=87=BB=E6=97=B6=EF=BC=8C=E5=A6=82?=
 =?UTF-8?q?=E6=9E=9C=E7=BC=96=E8=BE=91=E5=99=A8=E7=8A=B6=E6=80=81=E4=B8=8D?=
 =?UTF-8?q?=E6=98=AF=E5=8F=AA=E8=AF=BB=E6=88=96=E8=80=85=E7=A6=81=E7=94=A8?=
 =?UTF-8?q?=EF=BC=8C=E5=8F=88=E6=88=96=E8=80=85=E7=BC=96=E8=BE=91=E5=99=A8?=
 =?UTF-8?q?=E4=B8=BA=E5=8F=AF=E6=8A=9B=E5=87=BA=E5=80=BC=E5=8F=98=E6=9B=B4?=
 =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E7=9A=84=E7=BC=96=E8=BE=91=E5=99=A8=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E7=82=B9=E5=87=BB=E4=BA=8B=E4=BB=B6=E4=B8=8D=E5=BE=80?=
 =?UTF-8?q?=E4=B8=8A=E5=86=92=E6=B3=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/vue3-util/CHANGELOG.md               |  4 +++
 .../panel-field/panel-field.controller.ts     | 30 +++++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/packages/vue3-util/CHANGELOG.md b/packages/vue3-util/CHANGELOG.md
index cec5aea3d0d..9fa9b4d6758 100644
--- a/packages/vue3-util/CHANGELOG.md
+++ b/packages/vue3-util/CHANGELOG.md
@@ -7,6 +7,10 @@
 
 ## [Unreleased]
 
+### Changed
+
+- 面板属性项点击时，如果编辑器状态不是只读或者禁用，又或者编辑器为可抛出值变更事件的编辑器时，点击事件不往上冒泡
+
 ## [0.7.41-alpha.34] - 2025-11-04
 
 ### Changed
diff --git a/packages/vue3-util/src/panel-component/panel-field/panel-field.controller.ts b/packages/vue3-util/src/panel-component/panel-field/panel-field.controller.ts
index 967dccb9236..5d80bdc26a9 100644
--- a/packages/vue3-util/src/panel-component/panel-field/panel-field.controller.ts
+++ b/packages/vue3-util/src/panel-component/panel-field/panel-field.controller.ts
@@ -228,4 +228,34 @@ export class PanelFieldController
       event,
     });
   }
+
+  /**
+   * @description 点击事件
+   * @param {MouseEvent} [event]
+   * @memberof PanelFieldController
+   */
+  onClick(event?: MouseEvent): void {
+    // 在移动端环境下，仅在以下情况下可向上冒泡
+    // 只读，禁用态时
+    // 或者编辑器不会抛值
+    if (ibiz.env.isMob) {
+      const disableEdit = this.state.readonly || this.state.disabled;
+      const enableClickType = [
+        'SPAN',
+        'SPAN_LINK',
+        'RAW',
+        'MOB2DBARCODEREADER',
+        'FIELD_CAROUSEL_PICTURE',
+        'FIELD_IMAGE_PICTURE_ONE',
+      ];
+      if (
+        !disableEdit &&
+        this.editor?.model.editorType &&
+        !enableClickType.includes(this.editor.model.editorType)
+      ) {
+        event?.stopPropagation();
+      }
+    }
+    super.onClick(event);
+  }
 }
-- 
Gitee