diff --git a/apps/web-antd/src/api/im/friend/request/index.ts b/apps/web-antd/src/api/im/friend/request/index.ts
index 3d9aac695..e57e4a5f2 100644
--- a/apps/web-antd/src/api/im/friend/request/index.ts
+++ b/apps/web-antd/src/api/im/friend/request/index.ts
@@ -55,7 +55,7 @@ export function refuseFriendRequest(
 /** 查询「我相关」的好友申请列表（游标分页：传 maxId 加载更多） */
 export function getMyFriendRequestList(limit: number, maxId?: number) {
   const params: Record<string, number> = { limit };
-  if (maxId !== null) {
+  if (maxId != null) {
     params.maxId = maxId;
   }
   return requestClient.get<ImFriendRequestApi.FriendRequestRespVO[]>(
diff --git a/apps/web-antd/src/api/iot/thingmodel/index.ts b/apps/web-antd/src/api/iot/thingmodel/index.ts
index 755e8d30a..0ccf1f069 100644
--- a/apps/web-antd/src/api/iot/thingmodel/index.ts
+++ b/apps/web-antd/src/api/iot/thingmodel/index.ts
@@ -52,6 +52,7 @@ export namespace ThingModelApi {
     name?: string;
     required?: boolean;
     type?: string;
+    dataType?: string;
     description?: string;
     outputParams?: Param[];
     method?: string;
diff --git a/apps/web-antd/src/views/bpm/components/bpmn-process-designer/package/designer/ProcessDesigner.vue b/apps/web-antd/src/views/bpm/components/bpmn-process-designer/package/designer/ProcessDesigner.vue
index a56a608d5..f3d9e112d 100644
--- a/apps/web-antd/src/views/bpm/components/bpmn-process-designer/package/designer/ProcessDesigner.vue
+++ b/apps/web-antd/src/views/bpm/components/bpmn-process-designer/package/designer/ProcessDesigner.vue
@@ -395,15 +395,14 @@ const setEncoded = (type: string, data: string) => {
 };
 
 // 加载本地文件
-const importLocalFile = () => {
+const importLocalFile = async () => {
   const file = refFile.value.files[0];
-  const reader = new FileReader();
-  reader.text(file);
-  reader.addEventListener('load', function () {
-    const xmlStr = this.result;
-    createNewDiagram(xmlStr);
-    emit('save', xmlStr);
-  });
+  if (!file) {
+    return;
+  }
+  const xmlStr = await file.text();
+  createNewDiagram(xmlStr);
+  emit('save', xmlStr);
 };
 /* ------------------------------------------------ refs methods ------------------------------------------------------ */
 const downloadProcessAsXml = () => {
diff --git a/apps/web-antd/src/views/bpm/components/bpmn-process-designer/package/penal/custom-config/components/BoundaryEventTimer.vue b/apps/web-antd/src/views/bpm/components/bpmn-process-designer/package/penal/custom-config/components/BoundaryEventTimer.vue
index 25a6ebd38..4e78e29fe 100644
--- a/apps/web-antd/src/views/bpm/components/bpmn-process-designer/package/penal/custom-config/components/BoundaryEventTimer.vue
+++ b/apps/web-antd/src/views/bpm/components/bpmn-process-designer/package/penal/custom-config/components/BoundaryEventTimer.vue
@@ -264,7 +264,6 @@ watch(
               class="mr-2 mt-0.5"
               v-model:value="timeDuration"
               :min="1"
-              controls-position="right"
               @change="
                 () => {
                   updateTimeModdle();
diff --git a/apps/web-antd/src/views/bpm/components/bpmn-process-designer/package/penal/listeners/UserTaskListeners.vue b/apps/web-antd/src/views/bpm/components/bpmn-process-designer/package/penal/listeners/UserTaskListeners.vue
index 294aa0728..3ee29c1a2 100644
--- a/apps/web-antd/src/views/bpm/components/bpmn-process-designer/package/penal/listeners/UserTaskListeners.vue
+++ b/apps/web-antd/src/views/bpm/components/bpmn-process-designer/package/penal/listeners/UserTaskListeners.vue
@@ -239,9 +239,7 @@ const selectProcessListener = (listener: any) => {
     ) ?? [];
   updateElementExtensions(
     bpmnElement,
-    otherExtensionList.value
-      ? [...otherExtensionList.value, ...bpmnElementListeners.value]
-      : undefined,
+    [...otherExtensionList.value, ...bpmnElementListeners.value],
   );
 };
 
diff --git a/apps/web-antd/src/views/bpm/components/simple-process-design/components/nodes-config/child-process-node-config.vue b/apps/web-antd/src/views/bpm/components/simple-process-design/components/nodes-config/child-process-node-config.vue
index 3463bab9b..61c87a3c5 100644
--- a/apps/web-antd/src/views/bpm/components/simple-process-design/components/nodes-config/child-process-node-config.vue
+++ b/apps/web-antd/src/views/bpm/components/simple-process-design/components/nodes-config/child-process-node-config.vue
@@ -689,7 +689,6 @@ onMounted(async () => {
                     class="w-24"
                     v-model:value="configForm.timeDuration"
                     :min="1"
-                    controls-position="right"
                   />
                 </FormItem>
               </Col>
diff --git a/apps/web-antd/src/views/bpm/components/simple-process-design/components/nodes-config/copy-task-node-config.vue b/apps/web-antd/src/views/bpm/components/simple-process-design/components/nodes-config/copy-task-node-config.vue
index 4ec6500bb..37ee99781 100644
--- a/apps/web-antd/src/views/bpm/components/simple-process-design/components/nodes-config/copy-task-node-config.vue
+++ b/apps/web-antd/src/views/bpm/components/simple-process-design/components/nodes-config/copy-task-node-config.vue
@@ -264,7 +264,7 @@ defineExpose({ showCopyTaskNodeConfig }); // 暴露方法给父组件
             >
               <Select
                 v-model:value="configForm.roleIds"
-                clearable
+                allow-clear
                 mode="multiple"
               >
                 <SelectOption
@@ -311,7 +311,7 @@ defineExpose({ showCopyTaskNodeConfig }); // 暴露方法给父组件
             >
               <Select
                 v-model:value="configForm.postIds"
-                clearable
+                allow-clear
                 mode="multiple"
               >
                 <SelectOption
@@ -331,7 +331,7 @@ defineExpose({ showCopyTaskNodeConfig }); // 暴露方法给父组件
             >
               <Select
                 v-model:value="configForm.userIds"
-                clearable
+                allow-clear
                 mode="multiple"
               >
                 <SelectOption
@@ -353,7 +353,7 @@ defineExpose({ showCopyTaskNodeConfig }); // 暴露方法给父组件
             >
               <Select
                 v-model:value="configForm.userGroups"
-                clearable
+                allow-clear
                 mode="multiple"
               >
                 <SelectOption
@@ -373,7 +373,7 @@ defineExpose({ showCopyTaskNodeConfig }); // 暴露方法给父组件
               label="表单内用户字段"
               name="formUser"
             >
-              <Select v-model:value="configForm.formUser" clearable>
+              <Select v-model:value="configForm.formUser" allow-clear>
                 <SelectOption
                   v-for="(item, idx) in userFieldOnFormOptions"
                   :key="idx"
@@ -393,7 +393,7 @@ defineExpose({ showCopyTaskNodeConfig }); // 暴露方法给父组件
               label="表单内部门字段"
               name="formDept"
             >
-              <Select v-model:value="configForm.formDept" clearable>
+              <Select v-model:value="configForm.formDept" allow-clear>
                 <SelectOption
                   v-for="(item, idx) in deptFieldOnFormOptions"
                   :key="idx"
@@ -419,7 +419,7 @@ defineExpose({ showCopyTaskNodeConfig }); // 暴露方法给父组件
               :label="deptLevelLabel!"
               name="deptLevel"
             >
-              <Select v-model:value="configForm.deptLevel" clearable>
+              <Select v-model:value="configForm.deptLevel" allow-clear>
                 <SelectOption
                   v-for="(item, index) in MULTI_LEVEL_DEPT"
                   :key="index"
@@ -437,7 +437,7 @@ defineExpose({ showCopyTaskNodeConfig }); // 暴露方法给父组件
               label="流程表达式"
               name="expression"
             >
-              <Textarea v-model:value="configForm.expression" clearable />
+              <Textarea v-model:value="configForm.expression" allow-clear />
             </FormItem>
           </Form>
         </div>
diff --git a/apps/web-antd/src/views/bpm/components/simple-process-design/components/nodes-config/trigger-node-config.vue b/apps/web-antd/src/views/bpm/components/simple-process-design/components/nodes-config/trigger-node-config.vue
index 658c61143..403a7932c 100644
--- a/apps/web-antd/src/views/bpm/components/simple-process-design/components/nodes-config/trigger-node-config.vue
+++ b/apps/web-antd/src/views/bpm/components/simple-process-design/components/nodes-config/trigger-node-config.vue
@@ -259,14 +259,14 @@ function updateFormFieldKey(
 ) {
   if (!formSetting?.updateFormFields || !newKey) return;
   const value = formSetting.updateFormFields[oldKey];
-  delete formSetting.updateFormFields.oldKey;
+  delete formSetting.updateFormFields[oldKey];
   formSetting.updateFormFields[String(newKey)] = value;
 }
 
 /** 删除修改字段设置项 */
 function deleteFormFieldSetting(formSetting: FormTriggerSetting, key: string) {
   if (!formSetting?.updateFormFields) return;
-  delete formSetting.updateFormFields.key;
+  delete formSetting.updateFormFields[key];
 }
 
 /** 保存配置 */
diff --git a/apps/web-antd/src/views/bpm/components/simple-process-design/components/nodes-config/user-task-node-config.vue b/apps/web-antd/src/views/bpm/components/simple-process-design/components/nodes-config/user-task-node-config.vue
index 98373821a..9c807593a 100644
--- a/apps/web-antd/src/views/bpm/components/simple-process-design/components/nodes-config/user-task-node-config.vue
+++ b/apps/web-antd/src/views/bpm/components/simple-process-design/components/nodes-config/user-task-node-config.vue
@@ -698,7 +698,7 @@ onMounted(() => {
             >
               <Select
                 v-model:value="configForm.roleIds"
-                clearable
+                allow-clear
                 mode="multiple"
               >
                 <SelectOption
@@ -745,7 +745,7 @@ onMounted(() => {
             >
               <Select
                 v-model:value="configForm.postIds"
-                clearable
+                allow-clear
                 mode="multiple"
               >
                 <SelectOption
@@ -765,7 +765,7 @@ onMounted(() => {
             >
               <Select
                 v-model:value="configForm.userIds"
-                clearable
+                allow-clear
                 mode="multiple"
               >
                 <SelectOption
@@ -787,7 +787,7 @@ onMounted(() => {
             >
               <Select
                 v-model:value="configForm.userGroups"
-                clearable
+                allow-clear
                 mode="multiple"
               >
                 <SelectOption
@@ -807,7 +807,7 @@ onMounted(() => {
               label="表单内用户字段"
               name="formUser"
             >
-              <Select v-model:value="configForm.formUser" clearable>
+              <Select v-model:value="configForm.formUser" allow-clear>
                 <SelectOption
                   v-for="(item, idx) in userFieldOnFormOptions"
                   :key="idx"
@@ -827,7 +827,7 @@ onMounted(() => {
               label="表单内部门字段"
               name="formDept"
             >
-              <Select v-model:value="configForm.formDept" clearable>
+              <Select v-model:value="configForm.formDept" allow-clear>
                 <SelectOption
                   v-for="(item, idx) in deptFieldOnFormOptions"
                   :key="idx"
@@ -853,7 +853,7 @@ onMounted(() => {
               :label="deptLevelLabel!"
               name="deptLevel"
             >
-              <Select v-model:value="configForm.deptLevel" clearable>
+              <Select v-model:value="configForm.deptLevel" allow-clear>
                 <SelectOption
                   v-for="(item, index) in MULTI_LEVEL_DEPT"
                   :key="index"
@@ -944,7 +944,7 @@ onMounted(() => {
                 label="驳回节点"
                 name="returnNodeId"
               >
-                <Select v-model:value="configForm.returnNodeId" clearable>
+                <Select v-model:value="configForm.returnNodeId" allow-clear>
                   <SelectOption
                     v-for="item in returnTaskList"
                     :key="item.id"
@@ -1015,7 +1015,6 @@ onMounted(() => {
                         class="mr-2 mt-0.5"
                         v-model:value="configForm.timeDuration"
                         :min="1"
-                        controls-position="right"
                       />
                     </FormItem>
                   </Col>
@@ -1088,7 +1087,7 @@ onMounted(() => {
             >
               <Select
                 v-model:value="configForm.assignEmptyHandlerUserIds"
-                clearable
+                allow-clear
                 mode="multiple"
               >
                 <SelectOption
diff --git a/apps/web-antd/src/views/bpm/model/modules/category-draggable-model.vue b/apps/web-antd/src/views/bpm/model/modules/category-draggable-model.vue
index eda48eb81..b93cf3458 100644
--- a/apps/web-antd/src/views/bpm/model/modules/category-draggable-model.vue
+++ b/apps/web-antd/src/views/bpm/model/modules/category-draggable-model.vue
@@ -139,11 +139,14 @@ function handleModelSort() {
         disabled: false,
         onEnd: ({ newDraggableIndex, oldDraggableIndex }) => {
           if (oldDraggableIndex !== newDraggableIndex) {
-            modelList.value.splice(
-              newDraggableIndex ?? 0,
-              0,
-              modelList.value.splice(oldDraggableIndex ?? 0, 1)[0],
+            const [movedModel] = modelList.value.splice(
+              oldDraggableIndex ?? 0,
+              1,
             );
+            if (!movedModel) {
+              return;
+            }
+            modelList.value.splice(newDraggableIndex ?? 0, 0, movedModel);
           }
         },
       },
diff --git a/apps/web-antd/src/views/bpm/processInstance/detail/index.vue b/apps/web-antd/src/views/bpm/processInstance/detail/index.vue
index f4d8288a7..aa6488f4c 100644
--- a/apps/web-antd/src/views/bpm/processInstance/detail/index.vue
+++ b/apps/web-antd/src/views/bpm/processInstance/detail/index.vue
@@ -9,7 +9,7 @@ import {
   BpmFieldPermissionType,
   BpmModelFormType,
   BpmModelType,
-  BpmProcessInstanceStatus,
+  BpmTaskStatusEnum,
   DICT_TYPE,
 } from '@vben/constants';
 import {
@@ -34,7 +34,7 @@ import { registerComponent } from '#/utils';
 
 import ProcessInstanceBpmnViewer from './modules/bpm-viewer.vue';
 import ProcessInstanceOperationButton from './modules/operation-button.vue';
-import ProcessssPrint from './modules/process-print.vue';
+import ProcessPrint from './modules/process-print.vue';
 import ProcessInstanceSimpleViewer from './modules/simple-bpm-viewer.vue';
 import BpmProcessInstanceTaskList from './modules/task-list.vue';
 import ProcessInstanceTimeline from './modules/time-line.vue';
@@ -61,10 +61,13 @@ const auditIconsMap: {
     | typeof SvgBpmRejectIcon
     | typeof SvgBpmRunningIcon;
 } = {
-  [BpmProcessInstanceStatus.RUNNING]: SvgBpmRunningIcon,
-  [BpmProcessInstanceStatus.APPROVE]: SvgBpmApproveIcon,
-  [BpmProcessInstanceStatus.REJECT]: SvgBpmRejectIcon,
-  [BpmProcessInstanceStatus.CANCEL]: SvgBpmCancelIcon,
+  [BpmTaskStatusEnum.RUNNING]: SvgBpmRunningIcon,
+  [BpmTaskStatusEnum.APPROVE]: SvgBpmApproveIcon,
+  [BpmTaskStatusEnum.REJECT]: SvgBpmRejectIcon,
+  [BpmTaskStatusEnum.CANCEL]: SvgBpmCancelIcon,
+  [BpmTaskStatusEnum.APPROVING]: SvgBpmApproveIcon,
+  [BpmTaskStatusEnum.RETURN]: SvgBpmRejectIcon,
+  [BpmTaskStatusEnum.WAIT]: SvgBpmRunningIcon,
 };
 const activityNodes = ref<BpmProcessInstanceApi.ApprovalNodeInfo[]>([]); // 审批节点信息
 const userOptions = ref<SystemUserApi.User[]>([]); // 用户列表
@@ -189,7 +192,7 @@ const refresh = () => {
 };
 
 const [PrintModal, printModalApi] = useVbenModal({
-  connectedComponent: ProcessssPrint,
+  connectedComponent: ProcessPrint,
   destroyOnClose: true,
 });
 
diff --git a/apps/web-antd/src/views/im/home/components/picker/conversation-picker-panel.vue b/apps/web-antd/src/views/im/home/components/picker/conversation-picker-panel.vue
index 960a40fb7..767128b01 100644
--- a/apps/web-antd/src/views/im/home/components/picker/conversation-picker-panel.vue
+++ b/apps/web-antd/src/views/im/home/components/picker/conversation-picker-panel.vue
@@ -81,7 +81,7 @@ const recentForwardConversations = computed(() =>
     .map((key) => byKey.value.get(key))
     .filter(
       (c): c is Conversation =>
-        c !== null && !hideSet.value.has(getConversationKey(c)),
+        c != null && !hideSet.value.has(getConversationKey(c)),
     ),
 );
 
@@ -96,7 +96,7 @@ const selectedConversations = computed(() =>
     .map((key) => byKey.value.get(key))
     .filter(
       (conversation): conversation is Conversation =>
-        conversation !== null &&
+        conversation != null &&
         !hideSet.value.has(getConversationKey(conversation)),
     ),
 );
diff --git a/apps/web-antd/src/views/im/home/pages/contact/friend-request-detail.vue b/apps/web-antd/src/views/im/home/pages/contact/friend-request-detail.vue
index 2b1d85b02..53c2f9282 100644
--- a/apps/web-antd/src/views/im/home/pages/contact/friend-request-detail.vue
+++ b/apps/web-antd/src/views/im/home/pages/contact/friend-request-detail.vue
@@ -12,7 +12,7 @@ import { Button, Input, message } from 'ant-design-vue';
 import { getCurrentUserId } from '#/views/im/utils/auth';
 
 import { ImFriendRequestHandleResult } from '../../../utils/constants';
-import { UserAvatar } from '../../components/user';
+import { UserAvatar, UserInfo } from '../../components/user';
 import { useFriendStore } from '../../store/friendStore';
 
 defineOptions({ name: 'ImContactFriendRequestDetail' });
diff --git a/apps/web-antd/src/views/im/home/pages/conversation/components/conversation/conversation-group-side.vue b/apps/web-antd/src/views/im/home/pages/conversation/components/conversation/conversation-group-side.vue
index 4757c7d24..6ceef33e7 100644
--- a/apps/web-antd/src/views/im/home/pages/conversation/components/conversation/conversation-group-side.vue
+++ b/apps/web-antd/src/views/im/home/pages/conversation/components/conversation/conversation-group-side.vue
@@ -95,12 +95,12 @@ const myId = computed(() => getCurrentUserId());
 /** 历史退群群：禁所有群操作入口（邀请 / 移出 / 改资料 / 禁言 / 审批 / 退出等），只保留展示；props.group 是 GroupLite 无 joinStatus，回 store 取全量 */
 const isQuitGroup = computed(() => {
   const id = props.group?.id;
-  return id !== null && isGroupQuit(groupStore.getGroup(id));
+  return id != null && isGroupQuit(groupStore.getGroup(id));
 });
 const isOwner = computed(
   () =>
     !isQuitGroup.value &&
-    props.group !== null &&
+    props.group != null &&
     props.group.ownerId === myId.value,
 );
 /** 当前用户在群里的角色（来自 props.members 的 me 行）；用于判定是否可移出他人 */
diff --git a/apps/web-antd/src/views/im/home/pages/conversation/components/conversation/conversation-item.vue b/apps/web-antd/src/views/im/home/pages/conversation/components/conversation/conversation-item.vue
index 36d85b434..6c38ee84c 100644
--- a/apps/web-antd/src/views/im/home/pages/conversation/components/conversation/conversation-item.vue
+++ b/apps/web-antd/src/views/im/home/pages/conversation/components/conversation/conversation-item.vue
@@ -86,7 +86,7 @@ const showSendName = computed(() => {
     return false;
   }
   const lastType = props.conversation.lastMessageType;
-  return lastType !== null && isNormalMessage(lastType);
+  return lastType != null && isNormalMessage(lastType);
 });
 
 /** 列表展示文案：草稿优先（对齐微信 PC：有草稿时盖掉最后一条预览）→ 撤回实时算 → lastContent 兜底 */
@@ -96,7 +96,7 @@ const lastContentDisplay = computed(() => {
   }
   if (
     props.conversation.lastMessageType === ImContentType.RECALL &&
-    props.conversation.lastSenderId !== null
+    props.conversation.lastSenderId != null
   ) {
     return buildRecallTip(
       props.conversation.lastSenderId,
diff --git a/apps/web-antd/src/views/im/home/pages/conversation/components/message/message-item.vue b/apps/web-antd/src/views/im/home/pages/conversation/components/message/message-item.vue
index 622ddca4a..e58691790 100644
--- a/apps/web-antd/src/views/im/home/pages/conversation/components/message/message-item.vue
+++ b/apps/web-antd/src/views/im/home/pages/conversation/components/message/message-item.vue
@@ -251,7 +251,7 @@ const redialRtcCall = inject(IM_RTC_REDIAL_KEY);
 /** 私聊 RTC_CALL_END 气泡点击：用同款 mediaType 重拨 */
 function handleRtcCallBubbleClick() {
   const mediaType = rtcCallEndPrivatePayload.value?.mediaType;
-  if (mediaType === null) {
+  if (mediaType == null) {
     return;
   }
   redialRtcCall?.(mediaType);
diff --git a/apps/web-antd/src/views/im/manager/group/components/select-dialog.vue b/apps/web-antd/src/views/im/manager/group/components/select-dialog.vue
index d9c97f589..35c95dbb4 100644
--- a/apps/web-antd/src/views/im/manager/group/components/select-dialog.vue
+++ b/apps/web-antd/src/views/im/manager/group/components/select-dialog.vue
@@ -243,7 +243,7 @@ function handleConfirm() {
     message.warning(multiple.value ? '请至少选择一条数据' : '请选择一条数据');
     return;
   }
-  emit('selected', multiple.value ? rows : [rows[0]]);
+  emit('selected', multiple.value ? rows : [rows[0]!]);
   open.value = false;
 }
 
diff --git a/apps/web-antd/src/views/im/manager/group/components/select.vue b/apps/web-antd/src/views/im/manager/group/components/select.vue
index 4a131eea0..6903c2bdc 100644
--- a/apps/web-antd/src/views/im/manager/group/components/select.vue
+++ b/apps/web-antd/src/views/im/manager/group/components/select.vue
@@ -47,13 +47,13 @@ const showClear = computed(() => {
     props.allowClear &&
     !props.disabled &&
     hovering.value &&
-    props.modelValue !== null
+    props.modelValue != null
   );
 });
 
 /** 根据编号查询群信息（用于编辑回显） */
 async function resolveItemById(id: number | undefined) {
-  if (id === null) {
+  if (id == null) {
     selectedItem.value = undefined;
     return;
   }
@@ -83,7 +83,7 @@ function handleClick(event: MouseEvent) {
     clearSelected();
     return;
   }
-  dialogRef.value?.open(props.modelValue === null ? [] : [props.modelValue]);
+  dialogRef.value?.open(props.modelValue == null ? [] : [props.modelValue]);
 }
 
 /** 弹窗选中回调 */
diff --git a/apps/web-antd/src/views/im/utils/pull.ts b/apps/web-antd/src/views/im/utils/pull.ts
index 5fd531b9a..76c9af1ec 100644
--- a/apps/web-antd/src/views/im/utils/pull.ts
+++ b/apps/web-antd/src/views/im/utils/pull.ts
@@ -55,7 +55,7 @@ export async function runIncrementalPull<T extends PullRecord>(
   const storedCursor = await getPullCursor(cursorKey);
   const highWater = { ...storedCursor };
   let cursor =
-    storedCursor.lastUpdateTime === null
+    storedCursor.lastUpdateTime == null
       ? {}
       : {
           lastUpdateTime: Math.max(
@@ -89,12 +89,12 @@ export async function runIncrementalPull<T extends PullRecord>(
       if (!last) {
         return;
       }
-      if (last.updateTime === null) {
+      if (last.updateTime == null) {
         return;
       }
       cursor = { lastUpdateTime: last.updateTime, lastId: last.id };
       if (
-        highWater.lastUpdateTime === null ||
+        highWater.lastUpdateTime == null ||
         cursor.lastUpdateTime > highWater.lastUpdateTime ||
         (cursor.lastUpdateTime === highWater.lastUpdateTime &&
           cursor.lastId > (highWater.lastId ?? 0))
@@ -154,14 +154,14 @@ export async function runMinIdPull<T extends { id?: number }>(options: {
     // 本批最大消息 id 作为下次游标；无有效 id 则本批 apply 后停（无法继续翻页）
     const validIds = list
       .map((record) => record.id)
-      .filter((id): id is number => id !== null);
+      .filter((id): id is number => id != null);
     const nextMinId = validIds.length > 0 ? Math.max(...validIds) : undefined;
     // applyPage 返回 false：本页未落地（如入库失败），不推进游标并终止，避免漏消息
     if ((await applyPage(list, nextMinId)) === false) {
       return;
     }
     // 无有效 id，或游标没前进（后端契约是 id > minId，理论不会出现）：停，防御死翻
-    if (nextMinId === null || nextMinId <= minId) {
+    if (nextMinId == null || nextMinId <= minId) {
       return;
     }
     minId = nextMinId;
diff --git a/apps/web-antd/src/views/infra/webSocket/index.vue b/apps/web-antd/src/views/infra/webSocket/index.vue
index bcb7ccc27..80238ebc5 100644
--- a/apps/web-antd/src/views/infra/webSocket/index.vue
+++ b/apps/web-antd/src/views/infra/webSocket/index.vue
@@ -228,7 +228,7 @@ onMounted(async () => {
           placeholder="请选择接收人"
           :disabled="!getIsOpen"
         >
-          <Select.Option key="" value="" label="所有人">
+          <Select.Option key="all" value="all" label="所有人">
             <div class="flex items-center">
               <Avatar size="small" class="mr-2">全</Avatar>
               <span>所有人</span>
diff --git a/apps/web-antd/src/views/mall/product/spu/components/spu-showcase.vue b/apps/web-antd/src/views/mall/product/spu/components/spu-showcase.vue
index 32b4f91a5..f9a08cef6 100644
--- a/apps/web-antd/src/views/mall/product/spu/components/spu-showcase.vue
+++ b/apps/web-antd/src/views/mall/product/spu/components/spu-showcase.vue
@@ -45,8 +45,12 @@ const canAdd = computed(() => {
 watch(
   () => props.modelValue,
   async (newValue) => {
-    // oxlint-disable-next-line unicorn/no-nested-ternary
-    const ids = Array.isArray(newValue) ? newValue : newValue ? [newValue] : [];
+    let ids: number[] = [];
+    if (Array.isArray(newValue)) {
+      ids = newValue;
+    } else if (newValue) {
+      ids = [newValue];
+    }
     if (ids.length === 0) {
       productSpus.value = [];
       return;
@@ -54,7 +58,7 @@ watch(
     // 只有商品发生变化时才重新查询
     if (
       productSpus.value.length === 0 ||
-      productSpus.value.some((spu) => !ids.includes(spu.id))
+      productSpus.value.some((spu) => spu.id == null || !ids.includes(spu.id))
     ) {
       productSpus.value = await getSpuDetailList(ids);
     }
diff --git a/apps/web-antd/src/views/mall/promotion/combination/components/showcase.vue b/apps/web-antd/src/views/mall/promotion/combination/components/showcase.vue
index c43833d52..41834033b 100644
--- a/apps/web-antd/src/views/mall/promotion/combination/components/showcase.vue
+++ b/apps/web-antd/src/views/mall/promotion/combination/components/showcase.vue
@@ -46,8 +46,12 @@ const canAdd = computed(() => {
 watch(
   () => props.modelValue,
   async (newValue) => {
-    // oxlint-disable-next-line unicorn/no-nested-ternary
-    const ids = Array.isArray(newValue) ? newValue : newValue ? [newValue] : [];
+    let ids: number[] = [];
+    if (Array.isArray(newValue)) {
+      ids = newValue;
+    } else if (newValue) {
+      ids = [newValue];
+    }
     if (ids.length === 0) {
       activityList.value = [];
       return;
@@ -55,7 +59,9 @@ watch(
     // 只有活动发生变化时才重新查询
     if (
       activityList.value.length === 0 ||
-      activityList.value.some((activity) => !ids.includes(activity.id))
+      activityList.value.some(
+        (activity) => activity.id == null || !ids.includes(activity.id),
+      )
     ) {
       activityList.value = await getCombinationActivityListByIds(ids);
     }
diff --git a/apps/web-antd/src/views/mall/promotion/seckill/components/showcase.vue b/apps/web-antd/src/views/mall/promotion/seckill/components/showcase.vue
index 22e4f05f8..c0fcbf126 100644
--- a/apps/web-antd/src/views/mall/promotion/seckill/components/showcase.vue
+++ b/apps/web-antd/src/views/mall/promotion/seckill/components/showcase.vue
@@ -45,8 +45,12 @@ const canAdd = computed(() => {
 watch(
   () => props.modelValue,
   async (newValue) => {
-    // oxlint-disable-next-line unicorn/no-nested-ternary
-    const ids = Array.isArray(newValue) ? newValue : newValue ? [newValue] : [];
+    let ids: number[] = [];
+    if (Array.isArray(newValue)) {
+      ids = newValue;
+    } else if (newValue) {
+      ids = [newValue];
+    }
     if (ids.length === 0) {
       activityList.value = [];
       return;
@@ -54,7 +58,9 @@ watch(
     // 只有活动发生变化时才重新查询
     if (
       activityList.value.length === 0 ||
-      activityList.value.some((activity) => !ids.includes(activity.id))
+      activityList.value.some(
+        (activity) => activity.id == null || !ids.includes(activity.id),
+      )
     ) {
       activityList.value = await getSeckillActivityListByIds(ids as number[]);
     }
diff --git a/apps/web-antd/src/views/mes/md/client/components/select-dialog.vue b/apps/web-antd/src/views/mes/md/client/components/select-dialog.vue
index 744cd540f..828d94d10 100644
--- a/apps/web-antd/src/views/mes/md/client/components/select-dialog.vue
+++ b/apps/web-antd/src/views/mes/md/client/components/select-dialog.vue
@@ -41,8 +41,8 @@ function getMultipleSelectedRows() {
   ] as MesMdClientApi.Client[];
   records.forEach((row) => {
     const rowId = row.id;
-    if (!rowId) {
-      selectedMap.set(rowId as number, row);
+    if (rowId !== undefined && rowId !== null) {
+      selectedMap.set(rowId, row);
     }
   });
   return [...selectedMap.values()];
diff --git a/apps/web-antd/src/views/mes/md/item/components/select-dialog.vue b/apps/web-antd/src/views/mes/md/item/components/select-dialog.vue
index d66d610c5..6671ea46c 100644
--- a/apps/web-antd/src/views/mes/md/item/components/select-dialog.vue
+++ b/apps/web-antd/src/views/mes/md/item/components/select-dialog.vue
@@ -42,8 +42,8 @@ function getMultipleSelectedRows() {
   ] as MesMdItemApi.Item[];
   records.forEach((row) => {
     const rowId = row.id;
-    if (!rowId) {
-      selectedMap.set(rowId as number, row);
+    if (rowId !== undefined && rowId !== null) {
+      selectedMap.set(rowId, row);
     }
   });
   return [...selectedMap.values()];
diff --git a/apps/web-antd/src/views/mes/md/vendor/components/select-dialog.vue b/apps/web-antd/src/views/mes/md/vendor/components/select-dialog.vue
index e4acd0b92..3ffa0eae1 100644
--- a/apps/web-antd/src/views/mes/md/vendor/components/select-dialog.vue
+++ b/apps/web-antd/src/views/mes/md/vendor/components/select-dialog.vue
@@ -41,8 +41,8 @@ function getMultipleSelectedRows() {
   ] as MesMdVendorApi.Vendor[];
   records.forEach((row) => {
     const rowId = row.id;
-    if (!rowId) {
-      selectedMap.set(rowId as number, row);
+    if (rowId !== undefined && rowId !== null) {
+      selectedMap.set(rowId, row);
     }
   });
   return [...selectedMap.values()];
diff --git a/apps/web-antd/src/views/mes/tm/tool/components/select-dialog.vue b/apps/web-antd/src/views/mes/tm/tool/components/select-dialog.vue
index dcbccb59e..a283e1498 100644
--- a/apps/web-antd/src/views/mes/tm/tool/components/select-dialog.vue
+++ b/apps/web-antd/src/views/mes/tm/tool/components/select-dialog.vue
@@ -36,8 +36,8 @@ function getMultipleSelectedRows() {
   ] as MesTmToolApi.Tool[];
   records.forEach((row) => {
     const rowId = row.id;
-    if (!rowId) {
-      selectedMap.set(rowId as number, row);
+    if (rowId !== undefined && rowId !== null) {
+      selectedMap.set(rowId, row);
     }
   });
   return [...selectedMap.values()];
diff --git a/apps/web-antd/src/views/mes/wm/itemreceipt/modules/line-list.vue b/apps/web-antd/src/views/mes/wm/itemreceipt/modules/line-list.vue
index d5ca6c59d..4a7335bbd 100644
--- a/apps/web-antd/src/views/mes/wm/itemreceipt/modules/line-list.vue
+++ b/apps/web-antd/src/views/mes/wm/itemreceipt/modules/line-list.vue
@@ -54,7 +54,7 @@ const [DetailFormModal, detailFormModalApi] = useVbenModal({
 function handleRefresh() {
   for (const id of Object.keys(detailMap)) {
     const key = Number(id);
-    delete detailMap.key;
+    delete detailMap[key];
   }
   gridApi.query();
 }
diff --git a/apps/web-antd/src/views/mes/wm/outsourceissue/modules/line-list.vue b/apps/web-antd/src/views/mes/wm/outsourceissue/modules/line-list.vue
index f8144762f..bac3f088d 100644
--- a/apps/web-antd/src/views/mes/wm/outsourceissue/modules/line-list.vue
+++ b/apps/web-antd/src/views/mes/wm/outsourceissue/modules/line-list.vue
@@ -52,7 +52,7 @@ const [DetailFormModal, detailFormModalApi] = useVbenModal({
 function handleRefresh() {
   for (const id of Object.keys(detailMap)) {
     const key = Number(id);
-    delete detailMap.key;
+    delete detailMap[key];
   }
   gridApi.query();
 }
diff --git a/apps/web-antd/src/views/mes/wm/outsourcereceipt/modules/line-list.vue b/apps/web-antd/src/views/mes/wm/outsourcereceipt/modules/line-list.vue
index b010c082e..43e0371a0 100644
--- a/apps/web-antd/src/views/mes/wm/outsourcereceipt/modules/line-list.vue
+++ b/apps/web-antd/src/views/mes/wm/outsourcereceipt/modules/line-list.vue
@@ -53,7 +53,7 @@ const [DetailFormModal, detailFormModalApi] = useVbenModal({
 function handleRefresh() {
   for (const id of Object.keys(detailMap)) {
     const key = Number(id);
-    delete detailMap.key;
+    delete detailMap[key];
   }
   gridApi.query();
 }
diff --git a/apps/web-antd/src/views/mes/wm/productissue/modules/line-list.vue b/apps/web-antd/src/views/mes/wm/productissue/modules/line-list.vue
index 51cb475e6..8ca8a2424 100644
--- a/apps/web-antd/src/views/mes/wm/productissue/modules/line-list.vue
+++ b/apps/web-antd/src/views/mes/wm/productissue/modules/line-list.vue
@@ -52,7 +52,7 @@ const [DetailFormModal, detailFormModalApi] = useVbenModal({
 function handleRefresh() {
   for (const id of Object.keys(detailMap)) {
     const key = Number(id);
-    delete detailMap.key;
+    delete detailMap[key];
   }
   gridApi.query();
 }
diff --git a/apps/web-antd/src/views/mes/wm/productreceipt/modules/line-list.vue b/apps/web-antd/src/views/mes/wm/productreceipt/modules/line-list.vue
index 812dbd712..2c923cf4f 100644
--- a/apps/web-antd/src/views/mes/wm/productreceipt/modules/line-list.vue
+++ b/apps/web-antd/src/views/mes/wm/productreceipt/modules/line-list.vue
@@ -55,7 +55,7 @@ const [DetailFormModal, detailFormModalApi] = useVbenModal({
 function handleRefresh() {
   for (const id of Object.keys(detailMap)) {
     const key = Number(id);
-    delete detailMap.key;
+    delete detailMap[key];
   }
   gridApi.query();
 }
diff --git a/apps/web-antd/src/views/mes/wm/productsales/modules/line-list.vue b/apps/web-antd/src/views/mes/wm/productsales/modules/line-list.vue
index 85d26a0bb..fc4a42b69 100644
--- a/apps/web-antd/src/views/mes/wm/productsales/modules/line-list.vue
+++ b/apps/web-antd/src/views/mes/wm/productsales/modules/line-list.vue
@@ -53,7 +53,7 @@ const [DetailFormModal, detailFormModalApi] = useVbenModal({
 function handleRefresh() {
   for (const id of Object.keys(detailMap)) {
     const key = Number(id);
-    delete detailMap.key;
+    delete detailMap[key];
   }
   gridApi.query();
 }
diff --git a/apps/web-antd/src/views/mes/wm/returnissue/modules/line-list.vue b/apps/web-antd/src/views/mes/wm/returnissue/modules/line-list.vue
index 423cb362f..b17b61334 100644
--- a/apps/web-antd/src/views/mes/wm/returnissue/modules/line-list.vue
+++ b/apps/web-antd/src/views/mes/wm/returnissue/modules/line-list.vue
@@ -55,7 +55,7 @@ const [DetailFormModal, detailFormModalApi] = useVbenModal({
 function handleRefresh() {
   for (const id of Object.keys(detailMap)) {
     const key = Number(id);
-    delete detailMap.key;
+    delete detailMap[key];
   }
   gridApi.query();
 }
diff --git a/apps/web-antd/src/views/mes/wm/returnsales/modules/line-list.vue b/apps/web-antd/src/views/mes/wm/returnsales/modules/line-list.vue
index b45897cf6..229b85852 100644
--- a/apps/web-antd/src/views/mes/wm/returnsales/modules/line-list.vue
+++ b/apps/web-antd/src/views/mes/wm/returnsales/modules/line-list.vue
@@ -55,7 +55,7 @@ const [DetailFormModal, detailFormModalApi] = useVbenModal({
 function handleRefresh() {
   for (const id of Object.keys(detailMap)) {
     const key = Number(id);
-    delete detailMap.key;
+    delete detailMap[key];
   }
   gridApi.query();
 }
diff --git a/apps/web-antd/src/views/mes/wm/returnvendor/modules/line-list.vue b/apps/web-antd/src/views/mes/wm/returnvendor/modules/line-list.vue
index ecfaaa0bb..6ea7c1035 100644
--- a/apps/web-antd/src/views/mes/wm/returnvendor/modules/line-list.vue
+++ b/apps/web-antd/src/views/mes/wm/returnvendor/modules/line-list.vue
@@ -54,7 +54,7 @@ const [DetailFormModal, detailFormModalApi] = useVbenModal({
 function handleRefresh() {
   for (const id of Object.keys(detailMap)) {
     const key = Number(id);
-    delete detailMap.key;
+    delete detailMap[key];
   }
   gridApi.query();
 }
diff --git a/apps/web-antd/src/views/mes/wm/stocktaking/plan/components/condition-value-input.vue b/apps/web-antd/src/views/mes/wm/stocktaking/plan/components/condition-value-input.vue
index 15a257097..c0efa3afd 100644
--- a/apps/web-antd/src/views/mes/wm/stocktaking/plan/components/condition-value-input.vue
+++ b/apps/web-antd/src/views/mes/wm/stocktaking/plan/components/condition-value-input.vue
@@ -77,7 +77,7 @@ function handleQualityStatusChange(value?: number) {
   emit('update:modelValue', undefined);
   emit('valueChange', {
     valueId: undefined,
-    valueCode: value === null ? '' : String(value),
+    valueCode: value === undefined || value === null ? '' : String(value),
     valueName: selected?.label || '',
   });
 }
@@ -109,14 +109,15 @@ async function loadCascadeData() {
       : undefined;
     return;
   }
-  if (!props.modelValue) {
+  const valueId = props.modelValue;
+  if (valueId === undefined || valueId === null) {
     return;
   }
   if (props.type === MesWmStockTakingParamTypeEnum.LOCATION) {
-    const location = await getWarehouseLocation(props.modelValue);
+    const location = await getWarehouseLocation(valueId);
     locationWarehouseId.value = location?.warehouseId;
   } else if (props.type === MesWmStockTakingParamTypeEnum.AREA) {
-    const area = await getWarehouseArea(props.modelValue);
+    const area = await getWarehouseArea(valueId);
     areaWarehouseId.value = area?.warehouseId;
     areaLocationId.value = area?.locationId;
   }
diff --git a/apps/web-antd/src/views/mes/wm/transfer/modules/line-list.vue b/apps/web-antd/src/views/mes/wm/transfer/modules/line-list.vue
index a081094ac..fb0c75e09 100644
--- a/apps/web-antd/src/views/mes/wm/transfer/modules/line-list.vue
+++ b/apps/web-antd/src/views/mes/wm/transfer/modules/line-list.vue
@@ -52,7 +52,7 @@ const [DetailFormModal, detailFormModalApi] = useVbenModal({
 function handleRefresh() {
   for (const id of Object.keys(detailMap)) {
     const key = Number(id);
-    delete detailMap.key;
+    delete detailMap[key];
   }
   gridApi.query();
 }
diff --git a/apps/web-antd/src/views/mp/material/modules/UploadFile.vue b/apps/web-antd/src/views/mp/material/modules/UploadFile.vue
index 19e229977..5c9270d9a 100644
--- a/apps/web-antd/src/views/mp/material/modules/UploadFile.vue
+++ b/apps/web-antd/src/views/mp/material/modules/UploadFile.vue
@@ -20,7 +20,7 @@ import {
 const props = defineProps<{ type: UploadType }>();
 
 const emit = defineEmits<{
-  uploaded: [v: Promise<void>];
+  uploaded: [];
 }>();
 
 const accountId = inject<number>('accountId');
diff --git a/apps/web-antd/src/views/mp/material/modules/UploadVideo.vue b/apps/web-antd/src/views/mp/material/modules/UploadVideo.vue
index 2c5a30261..6daa92576 100644
--- a/apps/web-antd/src/views/mp/material/modules/UploadVideo.vue
+++ b/apps/web-antd/src/views/mp/material/modules/UploadVideo.vue
@@ -30,7 +30,7 @@ withDefaults(
 
 const emit = defineEmits<{
   'update:open': [v: boolean];
-  uploaded: [v: Promise<void>];
+  uploaded: [];
 }>();
 
 const accountId = inject<number>('accountId');
diff --git a/apps/web-antd/src/views/mp/menu/modules/editor.vue b/apps/web-antd/src/views/mp/menu/modules/editor.vue
index 9412ffc1a..651d33cde 100644
--- a/apps/web-antd/src/views/mp/menu/modules/editor.vue
+++ b/apps/web-antd/src/views/mp/menu/modules/editor.vue
@@ -24,7 +24,7 @@ const props = defineProps<{
 }>();
 
 const emit = defineEmits<{
-  (e: 'delete', v: Promise<void>): void;
+  (e: 'delete'): void;
   (e: 'update:modelValue', v: any): void;
 }>();
 
diff --git a/apps/web-antd/src/views/wms/order/check/index.vue b/apps/web-antd/src/views/wms/order/check/index.vue
index d633cc1ad..b9321d7ec 100644
--- a/apps/web-antd/src/views/wms/order/check/index.vue
+++ b/apps/web-antd/src/views/wms/order/check/index.vue
@@ -68,7 +68,7 @@ const [DetailModal, detailModalApi] = useVbenModal({
 function clearDetailMap() {
   for (const id of Object.keys(detailMap)) {
     const key = Number(id);
-    delete detailMap.key;
+    delete detailMap[key];
   }
 }
 
@@ -107,8 +107,11 @@ async function handleExpandChange(
     return;
   }
   const key = row.id;
-  delete detailMap.key;
-  detailMap[row.id!] = await getCheckOrderDetailListByOrderId(row.id!);
+  if (key == null) {
+    return;
+  }
+  delete detailMap[key];
+  detailMap[key] = await getCheckOrderDetailListByOrderId(key);
 }
 
 /** 判断盘库单是否可修改 */
diff --git a/apps/web-antd/src/views/wms/order/movement/index.vue b/apps/web-antd/src/views/wms/order/movement/index.vue
index 0202445f9..958342f06 100644
--- a/apps/web-antd/src/views/wms/order/movement/index.vue
+++ b/apps/web-antd/src/views/wms/order/movement/index.vue
@@ -61,7 +61,7 @@ const [DetailModal, detailModalApi] = useVbenModal({
 function clearDetailMap() {
   for (const id of Object.keys(detailMap)) {
     const key = Number(id);
-    delete detailMap.key;
+    delete detailMap[key];
   }
 }
 
@@ -107,8 +107,11 @@ async function handleExpandChange(
     return;
   }
   const key = row.id;
-  delete detailMap.key;
-  detailMap[row.id!] = await getMovementOrderDetailListByOrderId(row.id!);
+  if (key == null) {
+    return;
+  }
+  delete detailMap[key];
+  detailMap[key] = await getMovementOrderDetailListByOrderId(key);
 }
 
 /** 判断移库单是否可修改 */
diff --git a/apps/web-antd/src/views/wms/order/receipt/index.vue b/apps/web-antd/src/views/wms/order/receipt/index.vue
index e78e56b22..3c49b376e 100644
--- a/apps/web-antd/src/views/wms/order/receipt/index.vue
+++ b/apps/web-antd/src/views/wms/order/receipt/index.vue
@@ -61,7 +61,7 @@ const [DetailModal, detailModalApi] = useVbenModal({
 function clearDetailMap() {
   for (const id of Object.keys(detailMap)) {
     const key = Number(id);
-    delete detailMap.key;
+    delete detailMap[key];
   }
 }
 
@@ -107,8 +107,11 @@ async function handleExpandChange(
     return;
   }
   const key = row.id;
-  delete detailMap.key;
-  detailMap[row.id!] = await getReceiptOrderDetailListByOrderId(row.id!);
+  if (key == null) {
+    return;
+  }
+  delete detailMap[key];
+  detailMap[key] = await getReceiptOrderDetailListByOrderId(key);
 }
 
 /** 判断入库单是否可修改 */
diff --git a/apps/web-antd/src/views/wms/order/shipment/index.vue b/apps/web-antd/src/views/wms/order/shipment/index.vue
index a3d0b38aa..0e9e41be1 100644
--- a/apps/web-antd/src/views/wms/order/shipment/index.vue
+++ b/apps/web-antd/src/views/wms/order/shipment/index.vue
@@ -61,7 +61,7 @@ const [DetailModal, detailModalApi] = useVbenModal({
 function clearDetailMap() {
   for (const id of Object.keys(detailMap)) {
     const key = Number(id);
-    delete detailMap.key;
+    delete detailMap[key];
   }
 }
 
@@ -107,8 +107,11 @@ async function handleExpandChange(
     return;
   }
   const key = row.id;
-  delete detailMap.key;
-  detailMap[row.id!] = await getShipmentOrderDetailListByOrderId(row.id!);
+  if (key == null) {
+    return;
+  }
+  delete detailMap[key];
+  detailMap[key] = await getShipmentOrderDetailListByOrderId(key);
 }
 
 /** 判断出库单是否可修改 */
diff --git a/apps/web-antdv-next/package.json b/apps/web-antdv-next/package.json
index 89894ed58..257e584dc 100644
--- a/apps/web-antdv-next/package.json
+++ b/apps/web-antdv-next/package.json
@@ -20,7 +20,7 @@
     "build:analyze": "pnpm vite build --mode analyze",
     "dev": "pnpm vite --mode development",
     "preview": "vite preview",
-    "#typecheck": "cross-env NODE_OPTIONS=--max-old-space-size=8192 vue-tsc --noEmit --skipLibCheck --incremental --tsBuildInfoFile node_modules/.cache/vue-tsc/tsconfig.tsbuildinfo"
+    "typecheck": "cross-env NODE_OPTIONS=--max-old-space-size=8192 vue-tsc --noEmit --skipLibCheck --incremental --tsBuildInfoFile node_modules/.cache/vue-tsc/tsconfig.tsbuildinfo"
   },
   "imports": {
     "#/*": "./src/*"
diff --git a/apps/web-antdv-next/src/api/bpm/processInstance/index.ts b/apps/web-antdv-next/src/api/bpm/processInstance/index.ts
index 8ed2116c5..f8442c35c 100644
--- a/apps/web-antdv-next/src/api/bpm/processInstance/index.ts
+++ b/apps/web-antdv-next/src/api/bpm/processInstance/index.ts
@@ -79,11 +79,11 @@ export namespace BpmProcessInstanceApi {
   export interface ApprovalTaskInfo {
     id: number;
     assigneeUser: User;
-    attachments?: string[];
     ownerUser: User;
     reason: string;
     signPicUrl: string;
     status: number;
+    attachments?: string[];
   }
 
   /** 抄送流程实例 */
diff --git a/apps/web-antdv-next/src/api/im/friend/request/index.ts b/apps/web-antdv-next/src/api/im/friend/request/index.ts
index 3d9aac695..e57e4a5f2 100644
--- a/apps/web-antdv-next/src/api/im/friend/request/index.ts
+++ b/apps/web-antdv-next/src/api/im/friend/request/index.ts
@@ -55,7 +55,7 @@ export function refuseFriendRequest(
 /** 查询「我相关」的好友申请列表（游标分页：传 maxId 加载更多） */
 export function getMyFriendRequestList(limit: number, maxId?: number) {
   const params: Record<string, number> = { limit };
-  if (maxId !== null) {
+  if (maxId != null) {
     params.maxId = maxId;
   }
   return requestClient.get<ImFriendRequestApi.FriendRequestRespVO[]>(
diff --git a/apps/web-antdv-next/src/api/iot/thingmodel/index.ts b/apps/web-antdv-next/src/api/iot/thingmodel/index.ts
index d12e35936..36ec794ea 100644
--- a/apps/web-antdv-next/src/api/iot/thingmodel/index.ts
+++ b/apps/web-antdv-next/src/api/iot/thingmodel/index.ts
@@ -54,6 +54,7 @@ export namespace ThingModelApi {
     name?: string;
     required?: boolean;
     type?: string;
+    dataType?: string;
     description?: string;
     outputParams?: Param[];
     method?: string;
@@ -113,37 +114,41 @@ export namespace ThingModelApi {
 
 /** 生成「必填 + 数字」类校验器：拼到 size / length / 枚举值上 */
 function buildRequiredNumberValidator(label: string) {
-  return (_rule: any, value: any) => {
+  return (_rule: any, value: any, callback: any) => {
     if (isEmpty(value)) {
-      return Promise.reject(new Error(`${label}不能为空`));
+      callback(new Error(`${label}不能为空`));
+      return;
     }
     if (Number.isNaN(Number(value))) {
-      return Promise.reject(new Error(`${label}必须是数字`));
+      callback(new Error(`${label}必须是数字`));
+      return;
     }
-    return Promise.resolve();
+    callback();
   };
 }
 
 /** 生成「标识符样式」名称校验器：开头需为中文 / 英文 / 数字，整体仅允许中文、英文、数字、下划线、短划线，长度 ≤ 20 */
 export function buildIdentifierLikeNameValidator(label: string) {
-  return (_rule: any, value: string) => {
+  return (_rule: any, value: string, callback: any) => {
     if (isEmpty(value)) {
-      return Promise.reject(new Error(`${label}不能为空`));
+      callback(new Error(`${label}不能为空`));
+      return;
     }
     if (!/^[一-龥A-Za-z0-9]/.test(value)) {
-      return Promise.reject(
-        new Error(`${label}必须以中文、英文字母或数字开头`),
-      );
+      callback(new Error(`${label}必须以中文、英文字母或数字开头`));
+      return;
     }
     if (!/^[一-龥A-Za-z0-9][\w一-龥-]*$/.test(value)) {
-      return Promise.reject(
+      callback(
         new Error(`${label}只能包含中文、英文字母、数字、下划线和短划线`),
       );
+      return;
     }
     if (value.length > 20) {
-      return Promise.reject(new Error(`${label}长度不能超过 20 个字符`));
+      callback(new Error(`${label}长度不能超过 20 个字符`));
+      return;
     }
-    return Promise.resolve();
+    callback();
   };
 }
 
@@ -167,7 +172,7 @@ export const ThingModelFormRules: Record<string, FormItemRule[]> = {
       trigger: 'blur',
     },
     {
-      validator: (_rule: any, value: string) => {
+      validator: (_rule: any, value: string, callback: any) => {
         const reservedKeywords = [
           'set',
           'get',
@@ -178,16 +183,18 @@ export const ThingModelFormRules: Record<string, FormItemRule[]> = {
           'value',
         ];
         if (reservedKeywords.includes(value)) {
-          return Promise.reject(
+          callback(
             new Error(
               'set, get, post, property, event, time, value 是系统保留字段，不能用于标识符定义',
             ),
           );
+          return;
         }
         if (/^\d+$/.test(value)) {
-          return Promise.reject(new Error('标识符不能是纯数字'));
+          callback(new Error('标识符不能是纯数字'));
+          return;
         }
-        return Promise.resolve();
+        callback();
       },
       trigger: 'blur',
     },
diff --git a/apps/web-antdv-next/src/views/bpm/components/bpmn-process-designer/package/designer/ProcessDesigner.vue b/apps/web-antdv-next/src/views/bpm/components/bpmn-process-designer/package/designer/ProcessDesigner.vue
index 7e33778cf..9d65875b7 100644
--- a/apps/web-antdv-next/src/views/bpm/components/bpmn-process-designer/package/designer/ProcessDesigner.vue
+++ b/apps/web-antdv-next/src/views/bpm/components/bpmn-process-designer/package/designer/ProcessDesigner.vue
@@ -395,15 +395,14 @@ const setEncoded = (type: string, data: string) => {
 };
 
 // 加载本地文件
-const importLocalFile = () => {
+const importLocalFile = async () => {
   const file = refFile.value.files[0];
-  const reader = new FileReader();
-  reader.text(file);
-  reader.addEventListener('load', function () {
-    const xmlStr = this.result;
-    createNewDiagram(xmlStr);
-    emit('save', xmlStr);
-  });
+  if (!file) {
+    return;
+  }
+  const xmlStr = await file.text();
+  createNewDiagram(xmlStr);
+  emit('save', xmlStr);
 };
 /* ------------------------------------------------ refs methods ------------------------------------------------------ */
 const downloadProcessAsXml = () => {
diff --git a/apps/web-antdv-next/src/views/bpm/components/bpmn-process-designer/package/penal/custom-config/components/BoundaryEventTimer.vue b/apps/web-antdv-next/src/views/bpm/components/bpmn-process-designer/package/penal/custom-config/components/BoundaryEventTimer.vue
index 368dd5799..03aac5635 100644
--- a/apps/web-antdv-next/src/views/bpm/components/bpmn-process-designer/package/penal/custom-config/components/BoundaryEventTimer.vue
+++ b/apps/web-antdv-next/src/views/bpm/components/bpmn-process-designer/package/penal/custom-config/components/BoundaryEventTimer.vue
@@ -263,7 +263,6 @@ watch(
               class="mr-2 mt-0.5"
               v-model:value="timeDuration"
               :min="1"
-              controls-position="right"
               @change="
                 () => {
                   updateTimeModdle();
diff --git a/apps/web-antdv-next/src/views/bpm/components/bpmn-process-designer/package/penal/listeners/UserTaskListeners.vue b/apps/web-antdv-next/src/views/bpm/components/bpmn-process-designer/package/penal/listeners/UserTaskListeners.vue
index e29fd62ed..4ea0011b4 100644
--- a/apps/web-antdv-next/src/views/bpm/components/bpmn-process-designer/package/penal/listeners/UserTaskListeners.vue
+++ b/apps/web-antdv-next/src/views/bpm/components/bpmn-process-designer/package/penal/listeners/UserTaskListeners.vue
@@ -231,9 +231,7 @@ const selectProcessListener = (listener: any) => {
     ) ?? [];
   updateElementExtensions(
     bpmnElement,
-    otherExtensionList.value
-      ? [...otherExtensionList.value, ...bpmnElementListeners.value]
-      : undefined,
+    [...otherExtensionList.value, ...bpmnElementListeners.value],
   );
 };
 
diff --git a/apps/web-antdv-next/src/views/bpm/components/simple-process-design/components/nodes-config/child-process-node-config.vue b/apps/web-antdv-next/src/views/bpm/components/simple-process-design/components/nodes-config/child-process-node-config.vue
index f66b16853..a433c9a5a 100644
--- a/apps/web-antdv-next/src/views/bpm/components/simple-process-design/components/nodes-config/child-process-node-config.vue
+++ b/apps/web-antdv-next/src/views/bpm/components/simple-process-design/components/nodes-config/child-process-node-config.vue
@@ -673,7 +673,6 @@ onMounted(async () => {
                     class="w-24"
                     v-model:value="configForm.timeDuration"
                     :min="1"
-                    controls-position="right"
                   />
                 </FormItem>
               </Col>
diff --git a/apps/web-antdv-next/src/views/bpm/components/simple-process-design/components/nodes-config/copy-task-node-config.vue b/apps/web-antdv-next/src/views/bpm/components/simple-process-design/components/nodes-config/copy-task-node-config.vue
index 69b85ea57..b5f571903 100644
--- a/apps/web-antdv-next/src/views/bpm/components/simple-process-design/components/nodes-config/copy-task-node-config.vue
+++ b/apps/web-antdv-next/src/views/bpm/components/simple-process-design/components/nodes-config/copy-task-node-config.vue
@@ -402,7 +402,7 @@ defineExpose({ showCopyTaskNodeConfig }); // 暴露方法给父组件
               label="流程表达式"
               name="expression"
             >
-              <TextArea v-model:value="configForm.expression" clearable />
+              <TextArea v-model:value="configForm.expression" allow-clear />
             </FormItem>
           </Form>
         </div>
diff --git a/apps/web-antdv-next/src/views/bpm/components/simple-process-design/components/nodes-config/trigger-node-config.vue b/apps/web-antdv-next/src/views/bpm/components/simple-process-design/components/nodes-config/trigger-node-config.vue
index 2bb33304e..84f9e0d23 100644
--- a/apps/web-antdv-next/src/views/bpm/components/simple-process-design/components/nodes-config/trigger-node-config.vue
+++ b/apps/web-antdv-next/src/views/bpm/components/simple-process-design/components/nodes-config/trigger-node-config.vue
@@ -258,14 +258,14 @@ function updateFormFieldKey(
 ) {
   if (!formSetting?.updateFormFields || !newKey) return;
   const value = formSetting.updateFormFields[oldKey];
-  delete formSetting.updateFormFields.oldKey;
+  delete formSetting.updateFormFields[oldKey];
   formSetting.updateFormFields[String(newKey)] = value;
 }
 
 /** 删除修改字段设置项 */
 function deleteFormFieldSetting(formSetting: FormTriggerSetting, key: string) {
   if (!formSetting?.updateFormFields) return;
-  delete formSetting.updateFormFields.key;
+  delete formSetting.updateFormFields[key];
 }
 
 /** 保存配置 */
diff --git a/apps/web-antdv-next/src/views/bpm/components/simple-process-design/components/nodes-config/user-task-node-config.vue b/apps/web-antdv-next/src/views/bpm/components/simple-process-design/components/nodes-config/user-task-node-config.vue
index fb47df1d8..6b4d73bca 100644
--- a/apps/web-antdv-next/src/views/bpm/components/simple-process-design/components/nodes-config/user-task-node-config.vue
+++ b/apps/web-antdv-next/src/views/bpm/components/simple-process-design/components/nodes-config/user-task-node-config.vue
@@ -980,7 +980,6 @@ onMounted(() => {
                         class="mr-2 mt-0.5"
                         v-model:value="configForm.timeDuration"
                         :min="1"
-                        controls-position="right"
                       />
                     </FormItem>
                   </Col>
diff --git a/apps/web-antdv-next/src/views/bpm/model/form/modules/basic-info.vue b/apps/web-antdv-next/src/views/bpm/model/form/modules/basic-info.vue
index 35139a19d..82ca508f9 100644
--- a/apps/web-antdv-next/src/views/bpm/model/form/modules/basic-info.vue
+++ b/apps/web-antdv-next/src/views/bpm/model/form/modules/basic-info.vue
@@ -135,6 +135,7 @@ function openStartDeptSelect() {
 
 /** 处理部门选择确认 */
 function handleDeptSelectConfirm(depts: SystemDeptApi.Dept[]) {
+  selectedStartDepts.value = depts;
   modelData.value = {
     ...modelData.value,
     startDeptIds: depts.map((d) => d.id),
diff --git a/apps/web-antdv-next/src/views/bpm/processInstance/detail/index.vue b/apps/web-antdv-next/src/views/bpm/processInstance/detail/index.vue
index 9a11e8696..9df0dff13 100644
--- a/apps/web-antdv-next/src/views/bpm/processInstance/detail/index.vue
+++ b/apps/web-antdv-next/src/views/bpm/processInstance/detail/index.vue
@@ -9,7 +9,7 @@ import {
   BpmFieldPermissionType,
   BpmModelFormType,
   BpmModelType,
-  BpmProcessInstanceStatus,
+  BpmTaskStatusEnum,
   DICT_TYPE,
 } from '@vben/constants';
 import {
@@ -34,7 +34,7 @@ import { registerComponent } from '#/utils';
 
 import ProcessInstanceBpmnViewer from './modules/bpm-viewer.vue';
 import ProcessInstanceOperationButton from './modules/operation-button.vue';
-import ProcessssPrint from './modules/process-print.vue';
+import ProcessPrint from './modules/process-print.vue';
 import ProcessInstanceSimpleViewer from './modules/simple-bpm-viewer.vue';
 import BpmProcessInstanceTaskList from './modules/task-list.vue';
 import ProcessInstanceTimeline from './modules/time-line.vue';
@@ -61,10 +61,13 @@ const auditIconsMap: {
     | typeof SvgBpmRejectIcon
     | typeof SvgBpmRunningIcon;
 } = {
-  [BpmProcessInstanceStatus.RUNNING]: SvgBpmRunningIcon,
-  [BpmProcessInstanceStatus.APPROVE]: SvgBpmApproveIcon,
-  [BpmProcessInstanceStatus.REJECT]: SvgBpmRejectIcon,
-  [BpmProcessInstanceStatus.CANCEL]: SvgBpmCancelIcon,
+  [BpmTaskStatusEnum.RUNNING]: SvgBpmRunningIcon,
+  [BpmTaskStatusEnum.APPROVE]: SvgBpmApproveIcon,
+  [BpmTaskStatusEnum.REJECT]: SvgBpmRejectIcon,
+  [BpmTaskStatusEnum.CANCEL]: SvgBpmCancelIcon,
+  [BpmTaskStatusEnum.APPROVING]: SvgBpmApproveIcon,
+  [BpmTaskStatusEnum.RETURN]: SvgBpmRejectIcon,
+  [BpmTaskStatusEnum.WAIT]: SvgBpmRunningIcon,
 };
 const activityNodes = ref<BpmProcessInstanceApi.ApprovalNodeInfo[]>([]); // 审批节点信息
 const userOptions = ref<SystemUserApi.User[]>([]); // 用户列表
@@ -189,7 +192,7 @@ const refresh = () => {
 };
 
 const [PrintModal, printModalApi] = useVbenModal({
-  connectedComponent: ProcessssPrint,
+  connectedComponent: ProcessPrint,
   destroyOnClose: true,
 });
 
diff --git a/apps/web-antdv-next/src/views/bpm/processInstance/detail/modules/operation-button.vue b/apps/web-antdv-next/src/views/bpm/processInstance/detail/modules/operation-button.vue
index eda036ae8..947a09f2f 100644
--- a/apps/web-antdv-next/src/views/bpm/processInstance/detail/modules/operation-button.vue
+++ b/apps/web-antdv-next/src/views/bpm/processInstance/detail/modules/operation-button.vue
@@ -94,6 +94,24 @@ const popOverVisible: any = ref({
   deleteSign: false,
 }); // 气泡卡是否展示
 const returnList = ref([] as any); // 退回节点
+const APPROVAL_ATTACHMENT_FILE_TYPES = [
+  'doc',
+  'docx',
+  'xls',
+  'xlsx',
+  'ppt',
+  'pptx',
+  'txt',
+  'pdf',
+  'jpg',
+  'jpeg',
+  'png',
+  'gif',
+  'bmp',
+  'webp',
+];
+const APPROVAL_ATTACHMENT_FILE_SIZE = 5;
+const APPROVAL_ATTACHMENT_DIRECTORY = 'bpm/task-attachment';
 
 /** 创建流程表达式 */
 function openSignatureModal() {
@@ -901,8 +919,12 @@ defineExpose({ loadTodoTask });
               <FormItem label="上传附件/图片" name="attachments">
                 <FileUpload
                   v-model:value="approveReasonForm.attachments"
+                  :accept="APPROVAL_ATTACHMENT_FILE_TYPES"
+                  :directory="APPROVAL_ATTACHMENT_DIRECTORY"
                   :max-number="10"
+                  :max-size="APPROVAL_ATTACHMENT_FILE_SIZE"
                   :multiple="true"
+                  :show-description="true"
                   :show-download-icon="false"
                   help-text="支持多文件/图片上传"
                   @preview="handleFilePreview"
@@ -968,8 +990,12 @@ defineExpose({ loadTodoTask });
               <FormItem label="上传附件/图片" name="attachments">
                 <FileUpload
                   v-model:value="rejectReasonForm.attachments"
+                  :accept="APPROVAL_ATTACHMENT_FILE_TYPES"
+                  :directory="APPROVAL_ATTACHMENT_DIRECTORY"
                   :max-number="10"
+                  :max-size="APPROVAL_ATTACHMENT_FILE_SIZE"
                   :multiple="true"
+                  :show-description="true"
                   help-text="支持多文件/图片上传"
                   @preview="handleFilePreview"
                 />
diff --git a/apps/web-antdv-next/src/views/bpm/processInstance/detail/modules/process-print.vue b/apps/web-antdv-next/src/views/bpm/processInstance/detail/modules/process-print.vue
index d6de9d765..544d494c6 100644
--- a/apps/web-antdv-next/src/views/bpm/processInstance/detail/modules/process-print.vue
+++ b/apps/web-antdv-next/src/views/bpm/processInstance/detail/modules/process-print.vue
@@ -2,7 +2,7 @@
 import type { BpmProcessInstanceApi } from '#/api/bpm/processInstance';
 import type { SystemAreaApi } from '#/api/system/area';
 
-import { computed, ref } from 'vue';
+import { computed, ref, shallowRef } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
 import { DICT_TYPE } from '@vben/constants';
@@ -19,6 +19,7 @@ import { getAreaTree } from '#/api/system/area';
 import { getSimpleDeptList } from '#/api/system/dept';
 import { getSimpleUserList } from '#/api/system/user';
 import { decodeFields } from '#/components/form-create';
+import { registerComponent } from '#/utils';
 
 const userStore = useUserStore();
 
@@ -54,6 +55,7 @@ const userName = computed(() => userStore.userInfo?.nickname ?? '');
 const printTime = ref(formatDate(new Date(), 'YYYY-MM-DD HH:mm'));
 const formFields = ref<FormFieldItem[]>([]);
 const printDataMap = ref<Record<string, string>>({});
+const BusinessFormComponent = shallowRef<any>();
 
 /** 打印配置 */
 const printObj = ref({
@@ -93,6 +95,17 @@ async function fetchPrintData(id: string) {
   printTime.value = formatDate(new Date(), 'YYYY-MM-DD HH:mm');
   initPrintDataMap();
   await parseFormFields();
+  initBusinessFormComponent();
+}
+
+/** 初始化业务表单组件 */
+function initBusinessFormComponent() {
+  const businessFormPath =
+    printData.value?.processInstance.processDefinition?.formCustomViewPath ||
+    '';
+  BusinessFormComponent.value = businessFormPath
+    ? registerComponent(businessFormPath)
+    : undefined;
 }
 
 /** 解析表单字段 */
@@ -595,6 +608,22 @@ function getPrintTemplateHTML() {
                 <div v-html="item.html"></div>
               </td>
             </tr>
+          </tbody>
+        </table>
+        <!-- 业务表单：独立成块渲染，不嵌入表格单元格，避免宽度与分页受限 -->
+        <div
+          v-if="BusinessFormComponent && formFields.length === 0"
+          class="mt-3"
+        >
+          <component
+            :is="BusinessFormComponent"
+            :id="printData.processInstance.businessKey"
+            :readonly="true"
+            :print-mode="true"
+          />
+        </div>
+        <table class="mt-3 w-full border-collapse">
+          <tbody>
             <tr>
               <td
                 class="w-full border border-black p-1.5 text-center"
diff --git a/apps/web-antdv-next/src/views/bpm/processInstance/detail/modules/time-line.vue b/apps/web-antdv-next/src/views/bpm/processInstance/detail/modules/time-line.vue
index e33f24f54..da30a2dea 100644
--- a/apps/web-antdv-next/src/views/bpm/processInstance/detail/modules/time-line.vue
+++ b/apps/web-antdv-next/src/views/bpm/processInstance/detail/modules/time-line.vue
@@ -206,7 +206,7 @@ function shouldShowCustomUserSelect(
 /** 判断是否需要显示审批意见和附件 */
 function shouldShowReasonAndAttachment(task: any, nodeType: BpmNodeTypeEnum) {
   return (
-    (task.reason || task.attachments?.length > 0) &&
+    Boolean(task.reason || task.attachments?.length > 0) &&
     [BpmNodeTypeEnum.START_USER_NODE, BpmNodeTypeEnum.USER_TASK_NODE].includes(
       nodeType,
     )
@@ -214,11 +214,17 @@ function shouldShowReasonAndAttachment(task: any, nodeType: BpmNodeTypeEnum) {
 }
 
 function getAttachmentName(url: string) {
-  return decodeURIComponent(url.slice(url.lastIndexOf('/') + 1));
+  const cleanUrl = url.split(/[?#]/)[0] || '';
+  const fileName = cleanUrl.slice(cleanUrl.lastIndexOf('/') + 1);
+  try {
+    return decodeURIComponent(fileName);
+  } catch {
+    return fileName;
+  }
 }
 
 function isImageAttachment(url: string) {
-  const ext = url.split('.').pop()?.toLowerCase();
+  const ext = url.split(/[?#]/)[0]?.split('.').pop()?.toLowerCase();
   return ['bmp', 'gif', 'jpeg', 'jpg', 'png', 'webp'].includes(ext || '');
 }
 
diff --git a/apps/web-antdv-next/src/views/crm/business/detail/index.vue b/apps/web-antdv-next/src/views/crm/business/detail/index.vue
index 166d897f7..00260c353 100644
--- a/apps/web-antdv-next/src/views/crm/business/detail/index.vue
+++ b/apps/web-antdv-next/src/views/crm/business/detail/index.vue
@@ -8,13 +8,14 @@ import { useRoute, useRouter } from 'vue-router';
 import { Page, useVbenModal } from '@vben/common-ui';
 import { useTabs } from '@vben/hooks';
 
-import { Button, Card, TabPane, Tabs } from 'antdv-next';
+import { Card, TabPane, Tabs } from 'antdv-next';
 
 import { getBusiness } from '#/api/crm/business';
 import { getOperateLogPage } from '#/api/crm/operateLog';
 import { BizTypeEnum } from '#/api/crm/permission';
 import { useDescription } from '#/components/description';
 import { OperateLog } from '#/components/operate-log';
+import { ACTION_ICON, TableAction } from '#/components/table-action';
 import { $t } from '#/locales';
 import { ContactDetailsList } from '#/views/crm/contact/components';
 import { ContractDetailsList } from '#/views/crm/contract/components';
@@ -108,27 +109,36 @@ onMounted(() => {
     <TransferModal @success="getBusinessDetail" />
     <UpStatusModal @success="getBusinessDetail" />
     <template #extra>
-      <div class="flex items-center gap-2">
-        <Button
-          v-if="permissionListRef?.validateWrite"
-          type="primary"
-          @click="handleEdit"
-        >
-          {{ $t('ui.actionTitle.edit') }}
-        </Button>
-        <Button
-          v-if="permissionListRef?.validateWrite"
-          @click="handleUpdateStatus"
-        >
-          变更商机状态
-        </Button>
-        <Button
-          v-if="permissionListRef?.validateOwnerUser"
-          @click="handleTransfer"
-        >
-          转移
-        </Button>
-      </div>
+      <TableAction
+        :actions="[
+          {
+            label: '返回',
+            type: 'default',
+            icon: 'lucide:arrow-left',
+            onClick: handleBack,
+          },
+          {
+            label: $t('ui.actionTitle.edit'),
+            type: 'primary',
+            icon: ACTION_ICON.EDIT,
+            auth: ['crm:business:update'],
+            ifShow: permissionListRef?.validateWrite,
+            onClick: handleEdit,
+          },
+          {
+            label: '变更商机状态',
+            type: 'primary',
+            ifShow: permissionListRef?.validateWrite,
+            onClick: handleUpdateStatus,
+          },
+          {
+            label: '转移',
+            type: 'primary',
+            ifShow: permissionListRef?.validateOwnerUser,
+            onClick: handleTransfer,
+          },
+        ]"
+      />
     </template>
     <Card class="min-h-[10%]">
       <Descriptions :data="business" />
diff --git a/apps/web-antdv-next/src/views/crm/contract/config/data.ts b/apps/web-antdv-next/src/views/crm/contract/config/data.ts
index ad6b5642c..0cd005495 100644
--- a/apps/web-antdv-next/src/views/crm/contract/config/data.ts
+++ b/apps/web-antdv-next/src/views/crm/contract/config/data.ts
@@ -1,5 +1,7 @@
 import type { VbenFormSchema } from '#/adapter/form';
 
+import { z } from '#/adapter/form';
+
 export const schema: VbenFormSchema[] = [
   {
     component: 'RadioGroup',
@@ -14,17 +16,17 @@ export const schema: VbenFormSchema[] = [
     defaultValue: true,
   },
   {
-    component: 'InputNumber',
+    component: 'Input',
     fieldName: 'notifyDays',
     componentProps: {
+      placeholder: '请输入天数',
       class: '!w-full',
-      min: 0,
-      precision: 0,
     },
     renderComponentContent: () => ({
       addonBefore: () => '提前',
       addonAfter: () => '天提醒',
     }),
+    rules: z.coerce.number().int().min(0, '天数不能小于 0'),
     dependencies: {
       triggerFields: ['notifyEnabled'],
       show: (values) => values.notifyEnabled,
diff --git a/apps/web-antdv-next/src/views/crm/customer/poolConfig/data.ts b/apps/web-antdv-next/src/views/crm/customer/poolConfig/data.ts
index 8c5bbadf6..e36ab0339 100644
--- a/apps/web-antdv-next/src/views/crm/customer/poolConfig/data.ts
+++ b/apps/web-antdv-next/src/views/crm/customer/poolConfig/data.ts
@@ -1,5 +1,7 @@
 import type { VbenFormSchema } from '#/adapter/form';
 
+import { z } from '#/adapter/form';
+
 export const schema: VbenFormSchema[] = [
   {
     component: 'RadioGroup',
@@ -13,33 +15,33 @@ export const schema: VbenFormSchema[] = [
     },
   },
   {
-    component: 'InputNumber',
+    component: 'Input',
     fieldName: 'contactExpireDays',
     componentProps: {
+      placeholder: '请输入天数',
       class: '!w-full',
-      min: 0,
-      precision: 0,
     },
     renderComponentContent: () => ({
       addonAfter: () => '天不跟进或',
     }),
+    rules: z.coerce.number().int().min(0, '天数不能小于 0'),
     dependencies: {
       triggerFields: ['enabled'],
       show: (value) => value.enabled,
     },
   },
   {
-    component: 'InputNumber',
+    component: 'Input',
     fieldName: 'dealExpireDays',
     renderComponentContent: () => ({
       addonBefore: () => '或',
       addonAfter: () => '天未成交',
     }),
     componentProps: {
+      placeholder: '请输入天数',
       class: '!w-full',
-      min: 0,
-      precision: 0,
     },
+    rules: z.coerce.number().int().min(0, '天数不能小于 0'),
     dependencies: {
       triggerFields: ['enabled'],
       show: (value) => value.enabled,
@@ -62,17 +64,17 @@ export const schema: VbenFormSchema[] = [
     defaultValue: false,
   },
   {
-    component: 'InputNumber',
+    component: 'Input',
     fieldName: 'notifyDays',
     componentProps: {
+      placeholder: '请输入天数',
       class: '!w-full',
-      min: 0,
-      precision: 0,
     },
     renderComponentContent: () => ({
       addonBefore: () => '提前',
       addonAfter: () => '天提醒',
     }),
+    rules: z.coerce.number().int().min(0, '天数不能小于 0'),
     dependencies: {
       triggerFields: ['notifyEnabled'],
       show: (value) => value.enabled && value.notifyEnabled,
diff --git a/apps/web-antdv-next/src/views/im/home/components/picker/conversation-picker-panel.vue b/apps/web-antdv-next/src/views/im/home/components/picker/conversation-picker-panel.vue
index 431c61c74..24d8b62ac 100644
--- a/apps/web-antdv-next/src/views/im/home/components/picker/conversation-picker-panel.vue
+++ b/apps/web-antdv-next/src/views/im/home/components/picker/conversation-picker-panel.vue
@@ -81,7 +81,7 @@ const recentForwardConversations = computed(() =>
     .map((key) => byKey.value.get(key))
     .filter(
       (c): c is Conversation =>
-        c !== null && !hideSet.value.has(getConversationKey(c)),
+        c != null && !hideSet.value.has(getConversationKey(c)),
     ),
 );
 
@@ -96,7 +96,7 @@ const selectedConversations = computed(() =>
     .map((key) => byKey.value.get(key))
     .filter(
       (conversation): conversation is Conversation =>
-        conversation !== null &&
+        conversation != null &&
         !hideSet.value.has(getConversationKey(conversation)),
     ),
 );
diff --git a/apps/web-antdv-next/src/views/im/home/pages/conversation/components/conversation/conversation-group-side.vue b/apps/web-antdv-next/src/views/im/home/pages/conversation/components/conversation/conversation-group-side.vue
index ebcb18ad8..b91e92113 100644
--- a/apps/web-antdv-next/src/views/im/home/pages/conversation/components/conversation/conversation-group-side.vue
+++ b/apps/web-antdv-next/src/views/im/home/pages/conversation/components/conversation/conversation-group-side.vue
@@ -88,12 +88,12 @@ const myId = computed(() => getCurrentUserId());
 /** 历史退群群：禁所有群操作入口（邀请 / 移出 / 改资料 / 禁言 / 审批 / 退出等），只保留展示；props.group 是 GroupLite 无 joinStatus，回 store 取全量 */
 const isQuitGroup = computed(() => {
   const id = props.group?.id;
-  return id !== null && isGroupQuit(groupStore.getGroup(id));
+  return id != null && isGroupQuit(groupStore.getGroup(id));
 });
 const isOwner = computed(
   () =>
     !isQuitGroup.value &&
-    props.group !== null &&
+    props.group != null &&
     props.group.ownerId === myId.value,
 );
 /** 当前用户在群里的角色（来自 props.members 的 me 行）；用于判定是否可移出他人 */
diff --git a/apps/web-antdv-next/src/views/im/home/pages/conversation/components/conversation/conversation-item.vue b/apps/web-antdv-next/src/views/im/home/pages/conversation/components/conversation/conversation-item.vue
index b7c4ad87d..101e0c688 100644
--- a/apps/web-antdv-next/src/views/im/home/pages/conversation/components/conversation/conversation-item.vue
+++ b/apps/web-antdv-next/src/views/im/home/pages/conversation/components/conversation/conversation-item.vue
@@ -86,7 +86,7 @@ const showSendName = computed(() => {
     return false;
   }
   const lastType = props.conversation.lastMessageType;
-  return lastType !== null && isNormalMessage(lastType);
+  return lastType != null && isNormalMessage(lastType);
 });
 
 /** 列表展示文案：草稿优先（对齐微信 PC：有草稿时盖掉最后一条预览）→ 撤回实时算 → lastContent 兜底 */
@@ -96,7 +96,7 @@ const lastContentDisplay = computed(() => {
   }
   if (
     props.conversation.lastMessageType === ImContentType.RECALL &&
-    props.conversation.lastSenderId !== null
+    props.conversation.lastSenderId != null
   ) {
     return buildRecallTip(
       props.conversation.lastSenderId,
diff --git a/apps/web-antdv-next/src/views/im/home/pages/conversation/components/message/message-item.vue b/apps/web-antdv-next/src/views/im/home/pages/conversation/components/message/message-item.vue
index 7997f7bdd..4e8dae66d 100644
--- a/apps/web-antdv-next/src/views/im/home/pages/conversation/components/message/message-item.vue
+++ b/apps/web-antdv-next/src/views/im/home/pages/conversation/components/message/message-item.vue
@@ -251,7 +251,7 @@ const redialRtcCall = inject(IM_RTC_REDIAL_KEY);
 /** 私聊 RTC_CALL_END 气泡点击：用同款 mediaType 重拨 */
 function handleRtcCallBubbleClick() {
   const mediaType = rtcCallEndPrivatePayload.value?.mediaType;
-  if (mediaType === null) {
+  if (mediaType == null) {
     return;
   }
   redialRtcCall?.(mediaType);
diff --git a/apps/web-antdv-next/src/views/im/manager/group/components/select-dialog.vue b/apps/web-antdv-next/src/views/im/manager/group/components/select-dialog.vue
index f53087045..674cafafa 100644
--- a/apps/web-antdv-next/src/views/im/manager/group/components/select-dialog.vue
+++ b/apps/web-antdv-next/src/views/im/manager/group/components/select-dialog.vue
@@ -243,7 +243,7 @@ function handleConfirm() {
     message.warning(multiple.value ? '请至少选择一条数据' : '请选择一条数据');
     return;
   }
-  emit('selected', multiple.value ? rows : [rows[0]]);
+  emit('selected', multiple.value ? rows : [rows[0]!]);
   open.value = false;
 }
 
diff --git a/apps/web-antdv-next/src/views/im/manager/group/components/select.vue b/apps/web-antdv-next/src/views/im/manager/group/components/select.vue
index a753db17f..4fe3bd2ac 100644
--- a/apps/web-antdv-next/src/views/im/manager/group/components/select.vue
+++ b/apps/web-antdv-next/src/views/im/manager/group/components/select.vue
@@ -47,13 +47,13 @@ const showClear = computed(() => {
     props.allowClear &&
     !props.disabled &&
     hovering.value &&
-    props.modelValue !== null
+    props.modelValue != null
   );
 });
 
 /** 根据编号查询群信息（用于编辑回显） */
 async function resolveItemById(id: number | undefined) {
-  if (id === null) {
+  if (id == null) {
     selectedItem.value = undefined;
     return;
   }
@@ -83,7 +83,7 @@ function handleClick(event: MouseEvent) {
     clearSelected();
     return;
   }
-  dialogRef.value?.open(props.modelValue === null ? [] : [props.modelValue]);
+  dialogRef.value?.open(props.modelValue == null ? [] : [props.modelValue]);
 }
 
 /** 弹窗选中回调 */
diff --git a/apps/web-antdv-next/src/views/im/utils/pull.ts b/apps/web-antdv-next/src/views/im/utils/pull.ts
index 5fd531b9a..76c9af1ec 100644
--- a/apps/web-antdv-next/src/views/im/utils/pull.ts
+++ b/apps/web-antdv-next/src/views/im/utils/pull.ts
@@ -55,7 +55,7 @@ export async function runIncrementalPull<T extends PullRecord>(
   const storedCursor = await getPullCursor(cursorKey);
   const highWater = { ...storedCursor };
   let cursor =
-    storedCursor.lastUpdateTime === null
+    storedCursor.lastUpdateTime == null
       ? {}
       : {
           lastUpdateTime: Math.max(
@@ -89,12 +89,12 @@ export async function runIncrementalPull<T extends PullRecord>(
       if (!last) {
         return;
       }
-      if (last.updateTime === null) {
+      if (last.updateTime == null) {
         return;
       }
       cursor = { lastUpdateTime: last.updateTime, lastId: last.id };
       if (
-        highWater.lastUpdateTime === null ||
+        highWater.lastUpdateTime == null ||
         cursor.lastUpdateTime > highWater.lastUpdateTime ||
         (cursor.lastUpdateTime === highWater.lastUpdateTime &&
           cursor.lastId > (highWater.lastId ?? 0))
@@ -154,14 +154,14 @@ export async function runMinIdPull<T extends { id?: number }>(options: {
     // 本批最大消息 id 作为下次游标；无有效 id 则本批 apply 后停（无法继续翻页）
     const validIds = list
       .map((record) => record.id)
-      .filter((id): id is number => id !== null);
+      .filter((id): id is number => id != null);
     const nextMinId = validIds.length > 0 ? Math.max(...validIds) : undefined;
     // applyPage 返回 false：本页未落地（如入库失败），不推进游标并终止，避免漏消息
     if ((await applyPage(list, nextMinId)) === false) {
       return;
     }
     // 无有效 id，或游标没前进（后端契约是 id > minId，理论不会出现）：停，防御死翻
-    if (nextMinId === null || nextMinId <= minId) {
+    if (nextMinId == null || nextMinId <= minId) {
       return;
     }
     minId = nextMinId;
diff --git a/apps/web-antdv-next/src/views/iot/device/device/detail/modules/simulator.vue b/apps/web-antdv-next/src/views/iot/device/device/detail/modules/simulator.vue
index f3f711f69..69c2d8982 100644
--- a/apps/web-antdv-next/src/views/iot/device/device/detail/modules/simulator.vue
+++ b/apps/web-antdv-next/src/views/iot/device/device/detail/modules/simulator.vue
@@ -587,7 +587,7 @@ watch([activeTab, upstreamTab, downstreamTab], () => {
                       >
                         <template #bodyCell="{ column, record }">
                           <template v-if="column.key === 'dataType'">
-                            {{ record.dataType ?? '-' }}
+                            {{ record.event?.dataType ?? '-' }}
                           </template>
                           <template v-else-if="column.key === 'dataDefinition'">
                             <DataDefinition :data="record" />
diff --git a/apps/web-antdv-next/src/views/iot/thingmodel/modules/data-specs/number.vue b/apps/web-antdv-next/src/views/iot/thingmodel/modules/data-specs/number.vue
index 86a3b5fd8..89d068678 100644
--- a/apps/web-antdv-next/src/views/iot/thingmodel/modules/data-specs/number.vue
+++ b/apps/web-antdv-next/src/views/iot/thingmodel/modules/data-specs/number.vue
@@ -128,7 +128,7 @@ function validateStep(_rule: any, _value: any) {
       @change="unitChange"
       :options="[
         ...unitOptions.map((item) => ({
-          label: `{{ \`${item.label}-${item.value}\` }}`,
+          label: `${item.label}-${item.value}`,
           value: `${item.label}-${item.value}`,
         })),
       ]"
diff --git a/apps/web-antdv-next/src/views/iot/thingmodel/modules/property.vue b/apps/web-antdv-next/src/views/iot/thingmodel/modules/property.vue
index f2a1a472c..66580cc2d 100644
--- a/apps/web-antdv-next/src/views/iot/thingmodel/modules/property.vue
+++ b/apps/web-antdv-next/src/views/iot/thingmodel/modules/property.vue
@@ -113,7 +113,7 @@ if (!props.isStructDataSpecs && !props.isParams) {
       @change="handleChange"
       :options="[
         ...dataTypeOptions.map((option) => ({
-          label: `{{ \`${option.value}(${option.label})\` }}`,
+          label: `${option.value}(${option.label})`,
           value: option.value,
         })),
       ]"
diff --git a/apps/web-antdv-next/src/views/mall/product/spu/components/spu-showcase.vue b/apps/web-antdv-next/src/views/mall/product/spu/components/spu-showcase.vue
index f25afeb5c..c124c613b 100644
--- a/apps/web-antdv-next/src/views/mall/product/spu/components/spu-showcase.vue
+++ b/apps/web-antdv-next/src/views/mall/product/spu/components/spu-showcase.vue
@@ -45,8 +45,12 @@ const canAdd = computed(() => {
 watch(
   () => props.modelValue,
   async (newValue) => {
-    // oxlint-disable-next-line unicorn/no-nested-ternary
-    const ids = Array.isArray(newValue) ? newValue : newValue ? [newValue] : [];
+    let ids: number[] = [];
+    if (Array.isArray(newValue)) {
+      ids = newValue;
+    } else if (newValue) {
+      ids = [newValue];
+    }
     if (ids.length === 0) {
       productSpus.value = [];
       return;
@@ -54,7 +58,7 @@ watch(
     // 只有商品发生变化时才重新查询
     if (
       productSpus.value.length === 0 ||
-      productSpus.value.some((spu) => !ids.includes(spu.id))
+      productSpus.value.some((spu) => spu.id == null || !ids.includes(spu.id))
     ) {
       productSpus.value = await getSpuDetailList(ids);
     }
diff --git a/apps/web-antdv-next/src/views/mall/promotion/combination/components/showcase.vue b/apps/web-antdv-next/src/views/mall/promotion/combination/components/showcase.vue
index 420548fb1..908133c07 100644
--- a/apps/web-antdv-next/src/views/mall/promotion/combination/components/showcase.vue
+++ b/apps/web-antdv-next/src/views/mall/promotion/combination/components/showcase.vue
@@ -46,8 +46,12 @@ const canAdd = computed(() => {
 watch(
   () => props.modelValue,
   async (newValue) => {
-    // oxlint-disable-next-line unicorn/no-nested-ternary
-    const ids = Array.isArray(newValue) ? newValue : newValue ? [newValue] : [];
+    let ids: number[] = [];
+    if (Array.isArray(newValue)) {
+      ids = newValue;
+    } else if (newValue) {
+      ids = [newValue];
+    }
     if (ids.length === 0) {
       activityList.value = [];
       return;
@@ -55,7 +59,9 @@ watch(
     // 只有活动发生变化时才重新查询
     if (
       activityList.value.length === 0 ||
-      activityList.value.some((activity) => !ids.includes(activity.id))
+      activityList.value.some(
+        (activity) => activity.id == null || !ids.includes(activity.id),
+      )
     ) {
       activityList.value = await getCombinationActivityListByIds(ids);
     }
diff --git a/apps/web-antdv-next/src/views/mall/promotion/components/diy-editor/components/component-container.vue b/apps/web-antdv-next/src/views/mall/promotion/components/diy-editor/components/component-container.vue
index fdf1f00d1..bb444b338 100644
--- a/apps/web-antdv-next/src/views/mall/promotion/components/diy-editor/components/component-container.vue
+++ b/apps/web-antdv-next/src/views/mall/promotion/components/diy-editor/components/component-container.vue
@@ -7,7 +7,7 @@ import { IconifyIcon } from '@vben/icons';
 
 import { Button } from 'antdv-next';
 
-import { VerticalSpace } from '#/views/mall/promotion/components';
+import { VerticalButtonGroup } from '#/views/mall/promotion/components';
 
 import { components } from './mobile';
 
@@ -108,7 +108,7 @@ const handleDeleteComponent = () => {
         class="component-toolbar"
         v-if="showToolbar && component.name && active"
       >
-        <VerticalSpace size="small">
+        <VerticalButtonGroup size="small">
           <Button
             :disabled="!canMoveUp"
             type="primary"
@@ -163,7 +163,7 @@ const handleDeleteComponent = () => {
           >
             <IconifyIcon icon="lucide:trash-2" />
           </Button>
-        </VerticalSpace>
+        </VerticalButtonGroup>
       </div>
     </div>
   </div>
diff --git a/apps/web-antdv-next/src/views/mall/promotion/components/diy-editor/components/mobile/product-card/index.vue b/apps/web-antdv-next/src/views/mall/promotion/components/diy-editor/components/mobile/product-card/index.vue
index 256570049..fcfbde3f2 100644
--- a/apps/web-antdv-next/src/views/mall/promotion/components/diy-editor/components/mobile/product-card/index.vue
+++ b/apps/web-antdv-next/src/views/mall/promotion/components/diy-editor/components/mobile/product-card/index.vue
@@ -99,7 +99,7 @@ function calculateWidth() {
         :class="[
           {
             'w-full': property.layoutType !== 'oneColSmallImg',
-            'w-[calc(100vh-140px-16px)]':
+            'w-[calc(100%-140px-16px)]':
               property.layoutType === 'oneColSmallImg',
           },
         ]"
diff --git a/apps/web-antdv-next/src/views/mall/promotion/components/diy-editor/index.vue b/apps/web-antdv-next/src/views/mall/promotion/components/diy-editor/index.vue
index 6306f4d72..61400ce9c 100644
--- a/apps/web-antdv-next/src/views/mall/promotion/components/diy-editor/index.vue
+++ b/apps/web-antdv-next/src/views/mall/promotion/components/diy-editor/index.vue
@@ -7,7 +7,7 @@ import { Page, useVbenModal } from '@vben/common-ui';
 import { IconifyIcon } from '@vben/icons';
 import { cloneDeep, isEmpty, isString } from '@vben/utils';
 
-import { Button, Card, Col, QRCode, Row, Tag, Tooltip } from 'antdv-next';
+import { Button, Card, Col, QRCode, Row, Space, Tag, Tooltip } from 'antdv-next';
 import draggable from 'vuedraggable';
 
 import statusBarImg from '#/assets/imgs/diy/statusBar.png';
diff --git a/apps/web-antdv-next/src/views/mall/promotion/components/index.ts b/apps/web-antdv-next/src/views/mall/promotion/components/index.ts
index 80ace7ce5..6dbe001fe 100644
--- a/apps/web-antdv-next/src/views/mall/promotion/components/index.ts
+++ b/apps/web-antdv-next/src/views/mall/promotion/components/index.ts
@@ -7,4 +7,4 @@ export { default as Draggable } from './draggable/index.vue';
 export { default as InputWithColor } from './input-with-color/index.vue';
 
 export { default as MagicCubeEditor } from './magic-cube-editor/index.vue';
-export { default as VerticalSpace } from './vertical-button-group/index.vue';
+export { default as VerticalButtonGroup } from './vertical-button-group/index.vue';
diff --git a/apps/web-antdv-next/src/views/mall/promotion/components/vertical-button-group/index.vue b/apps/web-antdv-next/src/views/mall/promotion/components/vertical-button-group/index.vue
index 737630f2c..15caace51 100644
--- a/apps/web-antdv-next/src/views/mall/promotion/components/vertical-button-group/index.vue
+++ b/apps/web-antdv-next/src/views/mall/promotion/components/vertical-button-group/index.vue
@@ -1,11 +1,11 @@
 <script setup lang="ts">
-import { SpaceCompact } from 'antdv-next';
+import { Space, SpaceCompact } from 'antdv-next';
 
 /**
  * 垂直按钮组
  * Ant Design Vue 的按钮组，通过 Space 实现垂直布局
  */
-defineOptions({ name: 'VerticalSpace' });
+defineOptions({ name: 'VerticalButtonGroup' });
 </script>
 
 <template>
diff --git a/apps/web-antdv-next/src/views/mes/wm/itemreceipt/modules/line-list.vue b/apps/web-antdv-next/src/views/mes/wm/itemreceipt/modules/line-list.vue
index 7a6889a15..ead0e0c90 100644
--- a/apps/web-antdv-next/src/views/mes/wm/itemreceipt/modules/line-list.vue
+++ b/apps/web-antdv-next/src/views/mes/wm/itemreceipt/modules/line-list.vue
@@ -54,7 +54,7 @@ const [DetailFormModal, detailFormModalApi] = useVbenModal({
 function handleRefresh() {
   for (const id of Object.keys(detailMap)) {
     const key = Number(id);
-    delete detailMap.key;
+    delete detailMap[key];
   }
   gridApi.query();
 }
diff --git a/apps/web-antdv-next/src/views/mes/wm/outsourceissue/modules/line-list.vue b/apps/web-antdv-next/src/views/mes/wm/outsourceissue/modules/line-list.vue
index e5b1dbae9..5efa9bf1b 100644
--- a/apps/web-antdv-next/src/views/mes/wm/outsourceissue/modules/line-list.vue
+++ b/apps/web-antdv-next/src/views/mes/wm/outsourceissue/modules/line-list.vue
@@ -52,7 +52,7 @@ const [DetailFormModal, detailFormModalApi] = useVbenModal({
 function handleRefresh() {
   for (const id of Object.keys(detailMap)) {
     const key = Number(id);
-    delete detailMap.key;
+    delete detailMap[key];
   }
   gridApi.query();
 }
diff --git a/apps/web-antdv-next/src/views/mes/wm/outsourcereceipt/modules/line-list.vue b/apps/web-antdv-next/src/views/mes/wm/outsourcereceipt/modules/line-list.vue
index 131b4cf64..2bafc308c 100644
--- a/apps/web-antdv-next/src/views/mes/wm/outsourcereceipt/modules/line-list.vue
+++ b/apps/web-antdv-next/src/views/mes/wm/outsourcereceipt/modules/line-list.vue
@@ -53,7 +53,7 @@ const [DetailFormModal, detailFormModalApi] = useVbenModal({
 function handleRefresh() {
   for (const id of Object.keys(detailMap)) {
     const key = Number(id);
-    delete detailMap.key;
+    delete detailMap[key];
   }
   gridApi.query();
 }
diff --git a/apps/web-antdv-next/src/views/mes/wm/productissue/modules/line-list.vue b/apps/web-antdv-next/src/views/mes/wm/productissue/modules/line-list.vue
index 628a323e0..da694bc72 100644
--- a/apps/web-antdv-next/src/views/mes/wm/productissue/modules/line-list.vue
+++ b/apps/web-antdv-next/src/views/mes/wm/productissue/modules/line-list.vue
@@ -52,7 +52,7 @@ const [DetailFormModal, detailFormModalApi] = useVbenModal({
 function handleRefresh() {
   for (const id of Object.keys(detailMap)) {
     const key = Number(id);
-    delete detailMap.key;
+    delete detailMap[key];
   }
   gridApi.query();
 }
diff --git a/apps/web-antdv-next/src/views/mes/wm/productreceipt/modules/line-list.vue b/apps/web-antdv-next/src/views/mes/wm/productreceipt/modules/line-list.vue
index 8a17df20f..6e32e9004 100644
--- a/apps/web-antdv-next/src/views/mes/wm/productreceipt/modules/line-list.vue
+++ b/apps/web-antdv-next/src/views/mes/wm/productreceipt/modules/line-list.vue
@@ -55,7 +55,7 @@ const [DetailFormModal, detailFormModalApi] = useVbenModal({
 function handleRefresh() {
   for (const id of Object.keys(detailMap)) {
     const key = Number(id);
-    delete detailMap.key;
+    delete detailMap[key];
   }
   gridApi.query();
 }
diff --git a/apps/web-antdv-next/src/views/mes/wm/productsales/modules/line-list.vue b/apps/web-antdv-next/src/views/mes/wm/productsales/modules/line-list.vue
index ad05a3a40..2fff30329 100644
--- a/apps/web-antdv-next/src/views/mes/wm/productsales/modules/line-list.vue
+++ b/apps/web-antdv-next/src/views/mes/wm/productsales/modules/line-list.vue
@@ -53,7 +53,7 @@ const [DetailFormModal, detailFormModalApi] = useVbenModal({
 function handleRefresh() {
   for (const id of Object.keys(detailMap)) {
     const key = Number(id);
-    delete detailMap.key;
+    delete detailMap[key];
   }
   gridApi.query();
 }
diff --git a/apps/web-antdv-next/src/views/mes/wm/returnissue/modules/line-list.vue b/apps/web-antdv-next/src/views/mes/wm/returnissue/modules/line-list.vue
index 0a9430718..a57767181 100644
--- a/apps/web-antdv-next/src/views/mes/wm/returnissue/modules/line-list.vue
+++ b/apps/web-antdv-next/src/views/mes/wm/returnissue/modules/line-list.vue
@@ -55,7 +55,7 @@ const [DetailFormModal, detailFormModalApi] = useVbenModal({
 function handleRefresh() {
   for (const id of Object.keys(detailMap)) {
     const key = Number(id);
-    delete detailMap.key;
+    delete detailMap[key];
   }
   gridApi.query();
 }
diff --git a/apps/web-antdv-next/src/views/mes/wm/returnsales/modules/line-list.vue b/apps/web-antdv-next/src/views/mes/wm/returnsales/modules/line-list.vue
index 55eee56a4..4a3c93a7f 100644
--- a/apps/web-antdv-next/src/views/mes/wm/returnsales/modules/line-list.vue
+++ b/apps/web-antdv-next/src/views/mes/wm/returnsales/modules/line-list.vue
@@ -55,7 +55,7 @@ const [DetailFormModal, detailFormModalApi] = useVbenModal({
 function handleRefresh() {
   for (const id of Object.keys(detailMap)) {
     const key = Number(id);
-    delete detailMap.key;
+    delete detailMap[key];
   }
   gridApi.query();
 }
diff --git a/apps/web-antdv-next/src/views/mes/wm/returnvendor/modules/line-list.vue b/apps/web-antdv-next/src/views/mes/wm/returnvendor/modules/line-list.vue
index 4d0a3fc52..177afa6bc 100644
--- a/apps/web-antdv-next/src/views/mes/wm/returnvendor/modules/line-list.vue
+++ b/apps/web-antdv-next/src/views/mes/wm/returnvendor/modules/line-list.vue
@@ -54,7 +54,7 @@ const [DetailFormModal, detailFormModalApi] = useVbenModal({
 function handleRefresh() {
   for (const id of Object.keys(detailMap)) {
     const key = Number(id);
-    delete detailMap.key;
+    delete detailMap[key];
   }
   gridApi.query();
 }
diff --git a/apps/web-antdv-next/src/views/mes/wm/transfer/modules/line-list.vue b/apps/web-antdv-next/src/views/mes/wm/transfer/modules/line-list.vue
index 1a76f0704..107947da5 100644
--- a/apps/web-antdv-next/src/views/mes/wm/transfer/modules/line-list.vue
+++ b/apps/web-antdv-next/src/views/mes/wm/transfer/modules/line-list.vue
@@ -52,7 +52,7 @@ const [DetailFormModal, detailFormModalApi] = useVbenModal({
 function handleRefresh() {
   for (const id of Object.keys(detailMap)) {
     const key = Number(id);
-    delete detailMap.key;
+    delete detailMap[key];
   }
   gridApi.query();
 }
diff --git a/apps/web-antdv-next/src/views/mp/components/wx-msg/msg-event.vue b/apps/web-antdv-next/src/views/mp/components/wx-msg/msg-event.vue
index e94736e0c..bfe3b1f4b 100644
--- a/apps/web-antdv-next/src/views/mp/components/wx-msg/msg-event.vue
+++ b/apps/web-antdv-next/src/views/mp/components/wx-msg/msg-event.vue
@@ -44,6 +44,9 @@ defineProps<{
     <div v-else-if="item.event === 'location_select'">
       <Tag>选择地理位置</Tag>
     </div>
+    <div v-else-if="item.event === 'SCAN'">
+      <Tag>扫码</Tag>
+    </div>
     <div v-else>
       <Tag color="error">未知事件类型</Tag>
     </div>
diff --git a/apps/web-antdv-next/src/views/mp/draft/modules/news-form.vue b/apps/web-antdv-next/src/views/mp/draft/modules/news-form.vue
index 9b254d658..823abf657 100644
--- a/apps/web-antdv-next/src/views/mp/draft/modules/news-form.vue
+++ b/apps/web-antdv-next/src/views/mp/draft/modules/news-form.vue
@@ -6,7 +6,16 @@ import { computed, ref } from 'vue';
 import { confirm } from '@vben/common-ui';
 import { IconifyIcon } from '@vben/icons';
 
-import { Button, Col, Input, Layout, Row, TextArea } from 'antdv-next';
+import {
+  Button,
+  Col,
+  Input,
+  Layout,
+  LayoutContent,
+  LayoutSider,
+  Row,
+  TextArea,
+} from 'antdv-next';
 
 import { createEmptyNewsItem } from '#/api/mp/draft';
 import { Tinymce as RichTextArea } from '#/components/tinymce';
diff --git a/apps/web-antdv-next/src/views/mp/material/modules/UploadFile.vue b/apps/web-antdv-next/src/views/mp/material/modules/UploadFile.vue
index 65f67e3a1..e90a290e1 100644
--- a/apps/web-antdv-next/src/views/mp/material/modules/UploadFile.vue
+++ b/apps/web-antdv-next/src/views/mp/material/modules/UploadFile.vue
@@ -20,7 +20,7 @@ import {
 const props = defineProps<{ type: UploadType }>();
 
 const emit = defineEmits<{
-  uploaded: [v: Promise<void>];
+  uploaded: [];
 }>();
 
 const accountId = inject<number>('accountId');
diff --git a/apps/web-antdv-next/src/views/mp/material/modules/UploadVideo.vue b/apps/web-antdv-next/src/views/mp/material/modules/UploadVideo.vue
index b54965375..928b25e69 100644
--- a/apps/web-antdv-next/src/views/mp/material/modules/UploadVideo.vue
+++ b/apps/web-antdv-next/src/views/mp/material/modules/UploadVideo.vue
@@ -32,7 +32,7 @@ withDefaults(
 
 const emit = defineEmits<{
   'update:open': [v: boolean];
-  uploaded: [v: Promise<void>];
+  uploaded: [];
 }>();
 
 const accountId = inject<number>('accountId');
diff --git a/apps/web-antdv-next/src/views/mp/menu/modules/editor.vue b/apps/web-antdv-next/src/views/mp/menu/modules/editor.vue
index 564340f23..9b72de559 100644
--- a/apps/web-antdv-next/src/views/mp/menu/modules/editor.vue
+++ b/apps/web-antdv-next/src/views/mp/menu/modules/editor.vue
@@ -16,7 +16,7 @@ const props = defineProps<{
 }>();
 
 const emit = defineEmits<{
-  (e: 'delete', v: Promise<void>): void;
+  (e: 'delete'): void;
   (e: 'update:modelValue', v: any): void;
 }>();
 
diff --git a/apps/web-antdv-next/src/views/pay/cashier/index.vue b/apps/web-antdv-next/src/views/pay/cashier/index.vue
index 619f42f48..7d7a12e65 100644
--- a/apps/web-antdv-next/src/views/pay/cashier/index.vue
+++ b/apps/web-antdv-next/src/views/pay/cashier/index.vue
@@ -13,7 +13,15 @@ import {
 import { useTabs } from '@vben/hooks';
 import { fenToYuan, formatDate } from '@vben/utils';
 
-import { Button, Card, Descriptions, Input, message, QRCode } from 'antdv-next';
+import {
+  Button,
+  Card,
+  Descriptions,
+  DescriptionsItem,
+  Input,
+  message,
+  QRCode,
+} from 'antdv-next';
 
 import { getOrder, submitOrder } from '#/api/pay/order';
 
@@ -205,6 +213,7 @@ function displayQrCode(channelCode: string, data: any) {
     url: data.displayContent,
     visible: true,
   };
+  modalApi.open();
 }
 
 /** 提交支付后（App） */
diff --git a/apps/web-antdv-next/src/views/system/user/modules/dept-tree.vue b/apps/web-antdv-next/src/views/system/user/modules/dept-tree.vue
deleted file mode 100644
index 6dca1ca21..000000000
--- a/apps/web-antdv-next/src/views/system/user/modules/dept-tree.vue
+++ /dev/null
@@ -1,85 +0,0 @@
-<script lang="ts" setup>
-import type { SystemDeptApi } from '#/api/system/dept';
-
-import { onMounted, ref } from 'vue';
-
-import { IconifyIcon } from '@vben/icons';
-import { handleTree } from '@vben/utils';
-
-import { Input, Spin, Tree } from 'antdv-next';
-
-import { getSimpleDeptList } from '#/api/system/dept';
-
-const emit = defineEmits(['select']);
-const deptList = ref<SystemDeptApi.Dept[]>([]); // 部门列表
-const deptTree = ref<any[]>([]); // 部门树
-const expandedKeys = ref<number[]>([]); // 展开的节点
-const loading = ref(false); // 加载状态
-const searchValue = ref(''); // 搜索值
-
-/** 处理搜索逻辑 */
-function handleSearch(e: any) {
-  const value = e.target.value;
-  searchValue.value = value;
-  const filteredList = value
-    ? deptList.value.filter((item) =>
-        item.name.toLowerCase().includes(value.toLowerCase()),
-      )
-    : deptList.value;
-  deptTree.value = handleTree(filteredList);
-  // 展开所有节点
-  expandedKeys.value = deptTree.value.map((node) => node.id!);
-}
-
-/** 选中部门 */
-function handleSelect(selectedNodeKeys: any[], info: any) {
-  const selectedKey = selectedNodeKeys[0] ?? info.node?.id ?? info.node?.key;
-  const dept = info.selected
-    ? deptList.value.find((item) => String(item.id) === String(selectedKey))
-    : undefined;
-  emit('select', dept);
-}
-
-/** 初始化 */
-onMounted(async () => {
-  try {
-    loading.value = true;
-    const data = await getSimpleDeptList();
-    deptList.value = data;
-    deptTree.value = handleTree(data);
-  } catch (error) {
-    console.error('获取部门数据失败', error);
-  } finally {
-    loading.value = false;
-  }
-});
-</script>
-
-<template>
-  <div>
-    <Input
-      placeholder="搜索部门"
-      allow-clear
-      v-model:value="searchValue"
-      @change="handleSearch"
-      class="w-full"
-    >
-      <template #prefix>
-        <IconifyIcon icon="lucide:search" class="size-4" />
-      </template>
-    </Input>
-    <Spin :spinning="loading" :classes="{ root: 'w-full' }">
-      <Tree
-        @select="handleSelect"
-        v-if="deptTree.length > 0"
-        class="pt-2"
-        :tree-data="deptTree"
-        :default-expand-all="true"
-        :field-names="{ title: 'name', key: 'id', children: 'children' }"
-      />
-      <div v-else-if="!loading" class="py-4 text-center text-gray-500">
-        暂无数据
-      </div>
-    </Spin>
-  </div>
-</template>
diff --git a/apps/web-antdv-next/src/views/wms/order/check/index.vue b/apps/web-antdv-next/src/views/wms/order/check/index.vue
index 8416dc44f..ed0e7f645 100644
--- a/apps/web-antdv-next/src/views/wms/order/check/index.vue
+++ b/apps/web-antdv-next/src/views/wms/order/check/index.vue
@@ -68,7 +68,7 @@ const [DetailModal, detailModalApi] = useVbenModal({
 function clearDetailMap() {
   for (const id of Object.keys(detailMap)) {
     const key = Number(id);
-    delete detailMap.key;
+    delete detailMap[key];
   }
 }
 
@@ -107,8 +107,11 @@ async function handleExpandChange(
     return;
   }
   const key = row.id;
-  delete detailMap.key;
-  detailMap[row.id!] = await getCheckOrderDetailListByOrderId(row.id!);
+  if (key == null) {
+    return;
+  }
+  delete detailMap[key];
+  detailMap[key] = await getCheckOrderDetailListByOrderId(key);
 }
 
 /** 判断盘库单是否可修改 */
diff --git a/apps/web-antdv-next/src/views/wms/order/movement/index.vue b/apps/web-antdv-next/src/views/wms/order/movement/index.vue
index cf8ed3a26..2c82ca18d 100644
--- a/apps/web-antdv-next/src/views/wms/order/movement/index.vue
+++ b/apps/web-antdv-next/src/views/wms/order/movement/index.vue
@@ -61,7 +61,7 @@ const [DetailModal, detailModalApi] = useVbenModal({
 function clearDetailMap() {
   for (const id of Object.keys(detailMap)) {
     const key = Number(id);
-    delete detailMap.key;
+    delete detailMap[key];
   }
 }
 
@@ -107,8 +107,11 @@ async function handleExpandChange(
     return;
   }
   const key = row.id;
-  delete detailMap.key;
-  detailMap[row.id!] = await getMovementOrderDetailListByOrderId(row.id!);
+  if (key == null) {
+    return;
+  }
+  delete detailMap[key];
+  detailMap[key] = await getMovementOrderDetailListByOrderId(key);
 }
 
 /** 判断移库单是否可修改 */
diff --git a/apps/web-antdv-next/src/views/wms/order/receipt/index.vue b/apps/web-antdv-next/src/views/wms/order/receipt/index.vue
index 9a4445750..89f5121ec 100644
--- a/apps/web-antdv-next/src/views/wms/order/receipt/index.vue
+++ b/apps/web-antdv-next/src/views/wms/order/receipt/index.vue
@@ -61,7 +61,7 @@ const [DetailModal, detailModalApi] = useVbenModal({
 function clearDetailMap() {
   for (const id of Object.keys(detailMap)) {
     const key = Number(id);
-    delete detailMap.key;
+    delete detailMap[key];
   }
 }
 
@@ -107,8 +107,11 @@ async function handleExpandChange(
     return;
   }
   const key = row.id;
-  delete detailMap.key;
-  detailMap[row.id!] = await getReceiptOrderDetailListByOrderId(row.id!);
+  if (key == null) {
+    return;
+  }
+  delete detailMap[key];
+  detailMap[key] = await getReceiptOrderDetailListByOrderId(key);
 }
 
 /** 判断入库单是否可修改 */
diff --git a/apps/web-antdv-next/src/views/wms/order/shipment/index.vue b/apps/web-antdv-next/src/views/wms/order/shipment/index.vue
index 86e6a0a0c..40155e3bc 100644
--- a/apps/web-antdv-next/src/views/wms/order/shipment/index.vue
+++ b/apps/web-antdv-next/src/views/wms/order/shipment/index.vue
@@ -61,7 +61,7 @@ const [DetailModal, detailModalApi] = useVbenModal({
 function clearDetailMap() {
   for (const id of Object.keys(detailMap)) {
     const key = Number(id);
-    delete detailMap.key;
+    delete detailMap[key];
   }
 }
 
@@ -107,8 +107,11 @@ async function handleExpandChange(
     return;
   }
   const key = row.id;
-  delete detailMap.key;
-  detailMap[row.id!] = await getShipmentOrderDetailListByOrderId(row.id!);
+  if (key == null) {
+    return;
+  }
+  delete detailMap[key];
+  detailMap[key] = await getShipmentOrderDetailListByOrderId(key);
 }
 
 /** 判断出库单是否可修改 */
diff --git a/apps/web-ele/src/api/im/friend/request/index.ts b/apps/web-ele/src/api/im/friend/request/index.ts
index 3d9aac695..e57e4a5f2 100644
--- a/apps/web-ele/src/api/im/friend/request/index.ts
+++ b/apps/web-ele/src/api/im/friend/request/index.ts
@@ -55,7 +55,7 @@ export function refuseFriendRequest(
 /** 查询「我相关」的好友申请列表（游标分页：传 maxId 加载更多） */
 export function getMyFriendRequestList(limit: number, maxId?: number) {
   const params: Record<string, number> = { limit };
-  if (maxId !== null) {
+  if (maxId != null) {
     params.maxId = maxId;
   }
   return requestClient.get<ImFriendRequestApi.FriendRequestRespVO[]>(
diff --git a/apps/web-ele/src/api/iot/thingmodel/index.ts b/apps/web-ele/src/api/iot/thingmodel/index.ts
index 80f605b3f..b4b173518 100644
--- a/apps/web-ele/src/api/iot/thingmodel/index.ts
+++ b/apps/web-ele/src/api/iot/thingmodel/index.ts
@@ -52,6 +52,7 @@ export namespace ThingModelApi {
     name?: string;
     required?: boolean;
     type?: string;
+    dataType?: string;
     description?: string;
     outputParams?: Param[];
     method?: string;
diff --git a/apps/web-ele/src/views/bpm/components/bpmn-process-designer/package/designer/ProcessDesigner.vue b/apps/web-ele/src/views/bpm/components/bpmn-process-designer/package/designer/ProcessDesigner.vue
index e55eded30..51b9d13e4 100644
--- a/apps/web-ele/src/views/bpm/components/bpmn-process-designer/package/designer/ProcessDesigner.vue
+++ b/apps/web-ele/src/views/bpm/components/bpmn-process-designer/package/designer/ProcessDesigner.vue
@@ -402,15 +402,14 @@ const setEncoded = (type: string, data: string) => {
 };
 
 // 加载本地文件
-const importLocalFile = () => {
+const importLocalFile = async () => {
   const file = refFile.value.files[0];
-  const reader = new FileReader();
-  reader.text(file);
-  reader.addEventListener('load', function () {
-    const xmlStr = this.result;
-    createNewDiagram(xmlStr);
-    emit('save', xmlStr);
-  });
+  if (!file) {
+    return;
+  }
+  const xmlStr = await file.text();
+  createNewDiagram(xmlStr);
+  emit('save', xmlStr);
 };
 /* ------------------------------------------------ refs methods ------------------------------------------------------ */
 const downloadProcessAsXml = () => {
diff --git a/apps/web-ele/src/views/bpm/components/bpmn-process-designer/package/penal/form/ElementForm.vue b/apps/web-ele/src/views/bpm/components/bpmn-process-designer/package/penal/form/ElementForm.vue
index cadafb638..11993bd26 100644
--- a/apps/web-ele/src/views/bpm/components/bpmn-process-designer/package/penal/form/ElementForm.vue
+++ b/apps/web-ele/src/views/bpm/components/bpmn-process-designer/package/penal/form/ElementForm.vue
@@ -1,4 +1,3 @@
-<!-- eslint-disable no-unused-vars -->
 <script lang="ts" setup>
 import { computed, inject, nextTick, onMounted, ref, toRaw, watch } from 'vue';
 
@@ -24,26 +23,7 @@ const prefix = inject('prefix');
 
 const formKey = ref<number | string | undefined>(undefined);
 const businessKey = ref('');
-const optionModelTitle = ref('');
 const fieldList = ref<any[]>([]);
-const formFieldForm = ref<any>({});
-const fieldType = ref({
-  long: '长整型',
-  string: '字符串',
-  boolean: '布尔类',
-  date: '日期类',
-  enum: '枚举类',
-  custom: '自定义类型',
-});
-const formFieldIndex = ref(-1); // 编辑中的字段， -1 为新增
-const formFieldOptionIndex = ref(-1); // 编辑中的字段配置项， -1 为新增
-const fieldModelVisible = ref(false);
-const fieldOptionModelVisible = ref(false);
-const fieldOptionForm = ref<any>({}); // 当前激活的字段配置项数据
-const fieldOptionType = ref(''); // 当前激活的字段配置项弹窗 类型
-const fieldEnumList = ref<any[]>([]); // 枚举值列表
-const fieldConstraintsList = ref<any[]>([]); // 约束条件列表
-const fieldPropertiesList = ref<any[]>([]); // 绑定属性列表
 const bpmnELement = ref();
 const elExtensionElements = ref();
 const formData = ref();
@@ -94,180 +74,6 @@ const _updateElementBusinessKey = () => {
     },
   );
 };
-// 根据类型调整字段type
-// @ts-expect-error unused
-const _changeFieldTypeType = (type: any) => {
-  formFieldForm.value.type = type === 'custom' ? '' : type;
-};
-
-// 打开字段详情侧边栏
-// @ts-expect-error unused
-const _openFieldForm = (field: any, index: any) => {
-  formFieldIndex.value = index;
-  if (index === -1) {
-    formFieldForm.value = {};
-    // 初始化枚举值列表
-    fieldEnumList.value = [];
-    // 初始化约束条件列表
-    fieldConstraintsList.value = [];
-    // 初始化自定义属性列表
-    fieldPropertiesList.value = [];
-  } else {
-    const FieldObject = formData.value.fields[index];
-    formFieldForm.value = cloneDeep(field);
-    // 设置自定义类型
-    // this.$set(this.formFieldForm, "typeType", !this.fieldType[field.type] ? "custom" : field.type);
-    formFieldForm.value.typeType = fieldType.value[
-      field.type as keyof typeof fieldType.value
-    ]
-      ? field.type
-      : 'custom';
-    // 初始化枚举值列表
-    field.type === 'enum' &&
-      (fieldEnumList.value = cloneDeep(FieldObject?.values || []));
-    // 初始化约束条件列表
-    fieldConstraintsList.value = cloneDeep(
-      FieldObject?.validation?.constraints || [],
-    );
-    // 初始化自定义属性列表
-    fieldPropertiesList.value = cloneDeep(
-      FieldObject?.properties?.values || [],
-    );
-  }
-  fieldModelVisible.value = true;
-};
-// 打开字段 某个 配置项 弹窗
-// @ts-expect-error unused
-const _openFieldOptionForm = (option: any, index: any, type: any) => {
-  fieldOptionModelVisible.value = true;
-  fieldOptionType.value = type;
-  formFieldOptionIndex.value = index;
-  if (type === 'property') {
-    fieldOptionForm.value = option ? cloneDeep(option) : {};
-    return (optionModelTitle.value = '属性配置');
-  }
-  if (type === 'enum') {
-    fieldOptionForm.value = option ? cloneDeep(option) : {};
-    return (optionModelTitle.value = '枚举值配置');
-  }
-  fieldOptionForm.value = option ? cloneDeep(option) : {};
-  return (optionModelTitle.value = '约束条件配置');
-};
-
-// 保存字段 某个 配置项
-// @ts-expect-error unused
-const _saveFieldOption = () => {
-  if (formFieldOptionIndex.value === -1) {
-    if (fieldOptionType.value === 'property') {
-      fieldPropertiesList.value.push(fieldOptionForm.value);
-    }
-    if (fieldOptionType.value === 'constraint') {
-      fieldConstraintsList.value.push(fieldOptionForm.value);
-    }
-    if (fieldOptionType.value === 'enum') {
-      fieldEnumList.value.push(fieldOptionForm.value);
-    }
-  } else {
-    fieldOptionType.value === 'property' &&
-      fieldPropertiesList.value.splice(
-        formFieldOptionIndex.value,
-        1,
-        fieldOptionForm.value,
-      );
-    fieldOptionType.value === 'constraint' &&
-      fieldConstraintsList.value.splice(
-        formFieldOptionIndex.value,
-        1,
-        fieldOptionForm.value,
-      );
-    fieldOptionType.value === 'enum' &&
-      fieldEnumList.value.splice(
-        formFieldOptionIndex.value,
-        1,
-        fieldOptionForm.value,
-      );
-  }
-  fieldOptionModelVisible.value = false;
-  fieldOptionForm.value = {};
-};
-// 保存字段配置
-// @ts-expect-error unused
-const _saveField = () => {
-  const { id, type, label, defaultValue, datePattern } = formFieldForm.value;
-  const Field = bpmnInstances().moddle.create(`${prefix}:FormField`, {
-    id,
-    type,
-    label,
-  });
-  defaultValue && (Field.defaultValue = defaultValue);
-  datePattern && (Field.datePattern = datePattern);
-  // 构建属性
-  if (fieldPropertiesList.value && fieldPropertiesList.value.length > 0) {
-    const fieldPropertyList = fieldPropertiesList.value.map((fp: any) => {
-      return bpmnInstances().moddle.create(`${prefix}:Property`, {
-        id: fp.id,
-        value: fp.value,
-      });
-    });
-    Field.properties = bpmnInstances().moddle.create(`${prefix}:Properties`, {
-      values: fieldPropertyList,
-    });
-  }
-  // 构建校验规则
-  if (fieldConstraintsList.value && fieldConstraintsList.value.length > 0) {
-    const fieldConstraintList = fieldConstraintsList.value.map((fc: any) => {
-      return bpmnInstances().moddle.create(`${prefix}:Constraint`, {
-        name: fc.name,
-        config: fc.config,
-      });
-    });
-    Field.validation = bpmnInstances().moddle.create(`${prefix}:Validation`, {
-      constraints: fieldConstraintList,
-    });
-  }
-  // 构建枚举值
-  if (fieldEnumList.value && fieldEnumList.value.length > 0) {
-    Field.values = fieldEnumList.value.map((fe: any) => {
-      return bpmnInstances().moddle.create(`${prefix}:Value`, {
-        name: fe.name,
-        id: fe.id,
-      });
-    });
-  }
-  // 更新数组 与 表单配置实例
-  if (formFieldIndex.value === -1) {
-    fieldList.value.push(formFieldForm.value);
-    formData.value.fields.push(Field);
-  } else {
-    fieldList.value.splice(formFieldIndex.value, 1, formFieldForm.value);
-    formData.value.fields.splice(formFieldIndex.value, 1, Field);
-  }
-  updateElementExtensions();
-  fieldModelVisible.value = false;
-};
-
-// 移除某个 字段的 配置项
-// @ts-expect-error unused
-const _removeFieldOptionItem = (_option: any, index: any, type: any) => {
-  // console.log(option, 'option')
-  if (type === 'property') {
-    fieldPropertiesList.value.splice(index, 1);
-    return;
-  }
-  if (type === 'enum') {
-    fieldEnumList.value.splice(index, 1);
-    return;
-  }
-  fieldConstraintsList.value.splice(index, 1);
-};
-// 移除 字段
-// @ts-expect-error unused
-const _removeField = (field: any, index: any) => {
-  console.warn(field, 'field');
-  fieldList.value.splice(index, 1);
-  formData.value.fields.splice(index, 1);
-  updateElementExtensions();
-};
 
 const updateElementExtensions = () => {
   // 更新回扩展元素
diff --git a/apps/web-ele/src/views/bpm/components/bpmn-process-designer/package/penal/listeners/UserTaskListeners.vue b/apps/web-ele/src/views/bpm/components/bpmn-process-designer/package/penal/listeners/UserTaskListeners.vue
index a7c0883dc..a38cde32f 100644
--- a/apps/web-ele/src/views/bpm/components/bpmn-process-designer/package/penal/listeners/UserTaskListeners.vue
+++ b/apps/web-ele/src/views/bpm/components/bpmn-process-designer/package/penal/listeners/UserTaskListeners.vue
@@ -239,9 +239,7 @@ const selectProcessListener = (listener: any) => {
     ) ?? [];
   updateElementExtensions(
     bpmnElement,
-    otherExtensionList.value
-      ? [...otherExtensionList.value, ...bpmnElementListeners.value]
-      : undefined,
+    [...otherExtensionList.value, ...bpmnElementListeners.value],
   );
 };
 
diff --git a/apps/web-ele/src/views/bpm/components/bpmn-process-designer/package/penal/task/task-components/UserTask.vue b/apps/web-ele/src/views/bpm/components/bpmn-process-designer/package/penal/task/task-components/UserTask.vue
index d9f8fd7fc..066c04759 100644
--- a/apps/web-ele/src/views/bpm/components/bpmn-process-designer/package/penal/task/task-components/UserTask.vue
+++ b/apps/web-ele/src/views/bpm/components/bpmn-process-designer/package/penal/task/task-components/UserTask.vue
@@ -126,51 +126,56 @@ const resetTaskForm = () => {
     (ex: any) => ex.$type === `${prefix}:CandidateParam`,
   )?.value;
   if (candidateParamStr && candidateParamStr.length > 0) {
-    if (userTaskForm.value.candidateStrategy === CandidateStrategy.EXPRESSION) {
-      // 特殊：流程表达式，只有一个 input 输入框
-      // @ts-expect-error: expression strategy stores a scalar in an array-shaped field
-      userTaskForm.value.candidateParam = [candidateParamStr];
-    } else if (
-      userTaskForm.value.candidateStrategy ===
-      CandidateStrategy.MULTI_LEVEL_DEPT_LEADER
-    ) {
-      // 特殊：多级不部门负责人，需要通过'|'分割
-      userTaskForm.value.candidateParam = candidateParamStr
-        .split('|')[0]
-        .split(',')
-        .map((item: any) => {
-          // 如果数字超出了最大安全整数范围，则将其作为字符串处理
-          const num = Number(item);
-          return num > Number.MAX_SAFE_INTEGER || num < -Number.MAX_SAFE_INTEGER
-            ? item
-            : num;
-        });
-      deptLevel.value = +candidateParamStr.split('|')[1];
-    } else if (
-      userTaskForm.value.candidateStrategy ===
-        CandidateStrategy.START_USER_DEPT_LEADER ||
-      userTaskForm.value.candidateStrategy ===
-        CandidateStrategy.START_USER_MULTI_LEVEL_DEPT_LEADER
-    ) {
-      // @ts-expect-error: dynamic candidate param shape varies by strategy
-      userTaskForm.value.candidateParam = +candidateParamStr;
-      deptLevel.value = +candidateParamStr;
-    } else if (
-      userTaskForm.value.candidateStrategy ===
-      CandidateStrategy.FORM_DEPT_LEADER
-    ) {
-      userTaskForm.value.candidateParam = candidateParamStr.split('|')[0];
-      deptLevel.value = +candidateParamStr.split('|')[1];
-    } else {
-      userTaskForm.value.candidateParam = candidateParamStr
-        .split(',')
-        .map((item: any) => {
-          // 如果数字超出了最大安全整数范围，则将其作为字符串处理
-          const num = Number(item);
-          return num > Number.MAX_SAFE_INTEGER || num < -Number.MAX_SAFE_INTEGER
-            ? item
-            : num;
-        });
+    const candidateStrategy = userTaskForm.value.candidateStrategy as
+      | CandidateStrategy
+      | undefined;
+    switch (candidateStrategy) {
+      case CandidateStrategy.EXPRESSION: {
+        // 特殊：流程表达式，只有一个 input 输入框
+        // @ts-expect-error: expression strategy stores a scalar in an array-shaped field
+        userTaskForm.value.candidateParam = [candidateParamStr];
+        break;
+      }
+      case CandidateStrategy.FORM_DEPT_LEADER: {
+        userTaskForm.value.candidateParam = candidateParamStr.split('|')[0];
+        deptLevel.value = +candidateParamStr.split('|')[1];
+        break;
+      }
+      case CandidateStrategy.MULTI_LEVEL_DEPT_LEADER: {
+        // 特殊：多级不部门负责人，需要通过'|'分割
+        userTaskForm.value.candidateParam = candidateParamStr
+          .split('|')[0]
+          .split(',')
+          .map((item: any) => {
+            // 如果数字超出了最大安全整数范围，则将其作为字符串处理
+            const num = Number(item);
+            return num > Number.MAX_SAFE_INTEGER ||
+              num < -Number.MAX_SAFE_INTEGER
+              ? item
+              : num;
+          });
+        deptLevel.value = +candidateParamStr.split('|')[1];
+        break;
+      }
+      case CandidateStrategy.START_USER_DEPT_LEADER:
+      case CandidateStrategy.START_USER_MULTI_LEVEL_DEPT_LEADER: {
+        // @ts-expect-error: dynamic candidate param shape varies by strategy
+        userTaskForm.value.candidateParam = +candidateParamStr;
+        deptLevel.value = +candidateParamStr;
+        break;
+      }
+      default: {
+        userTaskForm.value.candidateParam = candidateParamStr
+          .split(',')
+          .map((item: any) => {
+            // 如果数字超出了最大安全整数范围，则将其作为字符串处理
+            const num = Number(item);
+            return num > Number.MAX_SAFE_INTEGER ||
+              num < -Number.MAX_SAFE_INTEGER
+              ? item
+              : num;
+          });
+      }
     }
   } else {
     userTaskForm.value.candidateParam = [];
@@ -402,7 +407,6 @@ onBeforeUnmount(() => {
         :props="defaultProps"
         placeholder="加载中，请稍后"
         multiple
-        check-strictly
         show-checkbox
         @change="updateElementTask"
       />
diff --git a/apps/web-ele/src/views/bpm/components/simple-process-design/components/nodes-config/child-process-node-config.vue b/apps/web-ele/src/views/bpm/components/simple-process-design/components/nodes-config/child-process-node-config.vue
index a23f97c19..e08e63a83 100644
--- a/apps/web-ele/src/views/bpm/components/simple-process-design/components/nodes-config/child-process-node-config.vue
+++ b/apps/web-ele/src/views/bpm/components/simple-process-design/components/nodes-config/child-process-node-config.vue
@@ -9,6 +9,22 @@ import { useVbenDrawer } from '@vben/common-ui';
 import { BpmNodeTypeEnum } from '@vben/constants';
 import { IconifyIcon } from '@vben/icons';
 
+import {
+  ElButton,
+  ElDatePicker,
+  ElDivider,
+  ElForm,
+  ElFormItem,
+  ElInput,
+  ElInputNumber,
+  ElOption,
+  ElRadio,
+  ElRadioButton,
+  ElRadioGroup,
+  ElSelect,
+  ElSwitch,
+} from 'element-plus';
+
 import { getForm } from '#/api/bpm/form';
 import { getModelList } from '#/api/bpm/model';
 
@@ -442,7 +458,7 @@ onMounted(async () => {
           >
             <div class="mr-2 mt-1">
               <ElFormItem
-                :prop="['inVariables', index, 'source']"
+                :prop="`inVariables.${index}.source`"
                 :rules="{
                   required: true,
                   message: '变量不能为空',
@@ -461,7 +477,7 @@ onMounted(async () => {
             </div>
             <div class="mr-2 mt-1">
               <ElFormItem
-                :prop="['inVariables', index, 'target']"
+                :prop="`inVariables.${index}.target`"
                 :rules="{
                   required: true,
                   message: '变量不能为空',
@@ -510,7 +526,7 @@ onMounted(async () => {
           >
             <div class="mr-2 mt-1">
               <ElFormItem
-                :prop="['outVariables', index, 'source']"
+                :prop="`outVariables.${index}.source`"
                 :rules="{
                   required: true,
                   message: '变量不能为空',
@@ -529,7 +545,7 @@ onMounted(async () => {
             </div>
             <div class="mr-2 mt-1">
               <ElFormItem
-                :prop="['outVariables', index, 'target']"
+                :prop="`outVariables.${index}.target`"
                 :rules="{
                   required: true,
                   message: '变量不能为空',
diff --git a/apps/web-ele/src/views/bpm/components/simple-process-design/components/nodes-config/trigger-node-config.vue b/apps/web-ele/src/views/bpm/components/simple-process-design/components/nodes-config/trigger-node-config.vue
index b4c7c442c..ff1e53fbf 100644
--- a/apps/web-ele/src/views/bpm/components/simple-process-design/components/nodes-config/trigger-node-config.vue
+++ b/apps/web-ele/src/views/bpm/components/simple-process-design/components/nodes-config/trigger-node-config.vue
@@ -258,14 +258,14 @@ function updateFormFieldKey(
 ) {
   if (!formSetting?.updateFormFields || !newKey) return;
   const value = formSetting.updateFormFields[oldKey];
-  delete formSetting.updateFormFields.oldkey;
+  delete formSetting.updateFormFields[oldKey];
   formSetting.updateFormFields[String(newKey)] = value;
 }
 
 /** 删除修改字段设置项 */
 function deleteFormFieldSetting(formSetting: FormTriggerSetting, key: string) {
   if (!formSetting?.updateFormFields) return;
-  delete formSetting.updateFormFields.key;
+  delete formSetting.updateFormFields[key];
 }
 
 /** 保存配置 */
diff --git a/apps/web-ele/src/views/bpm/components/simple-process-design/components/nodes-config/user-task-node-config.vue b/apps/web-ele/src/views/bpm/components/simple-process-design/components/nodes-config/user-task-node-config.vue
index 455bc19c3..dd477578f 100644
--- a/apps/web-ele/src/views/bpm/components/simple-process-design/components/nodes-config/user-task-node-config.vue
+++ b/apps/web-ele/src/views/bpm/components/simple-process-design/components/nodes-config/user-task-node-config.vue
@@ -700,7 +700,7 @@ onMounted(() => {
                   v-for="item in roleOptions"
                   :key="item.id"
                   :label="item.name"
-                  :value="item.id"
+                  :value="item.id!"
                 />
               </ElSelect>
             </ElFormItem>
@@ -738,7 +738,7 @@ onMounted(() => {
                   v-for="item in postOptions"
                   :key="item.id"
                   :label="item.name"
-                  :value="item.id"
+                  :value="item.id!"
                 />
               </ElSelect>
             </ElFormItem>
@@ -752,7 +752,7 @@ onMounted(() => {
                   v-for="item in userOptions"
                   :key="item.id"
                   :label="item.nickname"
-                  :value="item.id"
+                  :value="item.id!"
                 />
               </ElSelect>
             </ElFormItem>
@@ -1035,7 +1035,7 @@ onMounted(() => {
                   v-for="item in userOptions"
                   :key="item.id"
                   :label="item.nickname"
-                  :value="item.id"
+                  :value="item.id!"
                 />
               </ElSelect>
             </ElFormItem>
diff --git a/apps/web-ele/src/views/bpm/model/form/modules/custom-print-template.vue b/apps/web-ele/src/views/bpm/model/form/modules/custom-print-template.vue
index 0f5821523..43fba3a1f 100644
--- a/apps/web-ele/src/views/bpm/model/form/modules/custom-print-template.vue
+++ b/apps/web-ele/src/views/bpm/model/form/modules/custom-print-template.vue
@@ -103,7 +103,7 @@ onBeforeUnmount(() => {
     <div class="mb-3">
       <ElAlert
         title="输入 @ 可选择插入流程选项和表单选项"
-        type="primary"
+        type="info"
         show-icon
       />
     </div>
diff --git a/apps/web-ele/src/views/bpm/processInstance/create/modules/form.vue b/apps/web-ele/src/views/bpm/processInstance/create/modules/form.vue
index 7b00ab85e..d129622a9 100644
--- a/apps/web-ele/src/views/bpm/processInstance/create/modules/form.vue
+++ b/apps/web-ele/src/views/bpm/processInstance/create/modules/form.vue
@@ -177,8 +177,6 @@ async function initProcessInfo(row: any, formVariables?: any) {
     await router.push({
       path: row.formCustomCreatePath,
     });
-    // 返回选择流程
-    emit('cancel');
   }
 }
 
diff --git a/apps/web-ele/src/views/bpm/processInstance/detail/modules/signature.vue b/apps/web-ele/src/views/bpm/processInstance/detail/modules/signature.vue
index c89cbbcb9..e670c801d 100644
--- a/apps/web-ele/src/views/bpm/processInstance/detail/modules/signature.vue
+++ b/apps/web-ele/src/views/bpm/processInstance/detail/modules/signature.vue
@@ -5,6 +5,7 @@ import { useVbenModal } from '@vben/common-ui';
 import { IconifyIcon } from '@vben/icons';
 import { base64ToFile } from '@vben/utils';
 
+import { ElButton, ElTooltip } from 'element-plus';
 import Vue3Signature from 'vue3-signature';
 
 import { uploadFile } from '#/api/infra/file';
diff --git a/apps/web-ele/src/views/bpm/processInstance/detail/modules/task-list.vue b/apps/web-ele/src/views/bpm/processInstance/detail/modules/task-list.vue
index b522d119d..af0b2d5fe 100644
--- a/apps/web-ele/src/views/bpm/processInstance/detail/modules/task-list.vue
+++ b/apps/web-ele/src/views/bpm/processInstance/detail/modules/task-list.vue
@@ -9,6 +9,7 @@ import { DICT_TYPE } from '@vben/constants';
 import { IconifyIcon } from '@vben/icons';
 
 import FormCreate from '@form-create/element-ui';
+import { ElButton } from 'element-plus';
 
 import { useVbenVxeGrid } from '#/adapter/vxe-table';
 import { getTaskListByProcessInstanceId } from '#/api/bpm/task';
diff --git a/apps/web-ele/src/views/erp/stock/check/modules/item-form.vue b/apps/web-ele/src/views/erp/stock/check/modules/item-form.vue
index 545c1a6f3..0474714cf 100644
--- a/apps/web-ele/src/views/erp/stock/check/modules/item-form.vue
+++ b/apps/web-ele/src/views/erp/stock/check/modules/item-form.vue
@@ -10,7 +10,7 @@ import {
   erpPriceMultiply,
 } from '@vben/utils';
 
-import { ElInput, ElInputNumber, ElSelect } from 'element-plus';
+import { ElInput, ElInputNumber, ElOption, ElSelect } from 'element-plus';
 
 import { TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
 import { getProductSimpleList } from '#/api/erp/product/product';
@@ -219,26 +219,36 @@ onMounted(async () => {
     <template #warehouseId="{ row }">
       <ElSelect
         v-model="row.warehouseId"
-        :options="warehouseOptions"
-        :props="{ label: 'name', value: 'id' }"
         class="w-full"
         placeholder="请选择仓库"
         filterable
         :disabled="disabled"
         @change="handleWarehouseChange($event, row)"
-      />
+      >
+        <ElOption
+          v-for="warehouse in warehouseOptions"
+          :key="warehouse.id"
+          :label="warehouse.name"
+          :value="warehouse.id!"
+        />
+      </ElSelect>
     </template>
     <template #productId="{ row }">
       <ElSelect
         v-model="row.productId"
-        :options="productOptions"
-        :props="{ label: 'name', value: 'id' }"
         class="w-full"
         placeholder="请选择产品"
         filterable
         :disabled="disabled"
         @change="handleProductChange($event, row)"
-      />
+      >
+        <ElOption
+          v-for="product in productOptions"
+          :key="product.id"
+          :label="product.name"
+          :value="product.id!"
+        />
+      </ElSelect>
     </template>
     <template #actualCount="{ row }">
       <ElInputNumber
diff --git a/apps/web-ele/src/views/erp/stock/in/modules/item-form.vue b/apps/web-ele/src/views/erp/stock/in/modules/item-form.vue
index 2fa34310e..46fa9fb55 100644
--- a/apps/web-ele/src/views/erp/stock/in/modules/item-form.vue
+++ b/apps/web-ele/src/views/erp/stock/in/modules/item-form.vue
@@ -10,7 +10,7 @@ import {
   erpPriceMultiply,
 } from '@vben/utils';
 
-import { ElInput, ElInputNumber, ElSelect } from 'element-plus';
+import { ElInput, ElInputNumber, ElOption, ElSelect } from 'element-plus';
 
 import { TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
 import { getProductSimpleList } from '#/api/erp/product/product';
@@ -208,26 +208,36 @@ onMounted(async () => {
     <template #warehouseId="{ row }">
       <ElSelect
         v-model="row.warehouseId"
-        :options="warehouseOptions"
-        :props="{ label: 'name', value: 'id' }"
         class="w-full"
         placeholder="请选择仓库"
         filterable
         :disabled="disabled"
         @change="handleWarehouseChange($event, row)"
-      />
+      >
+        <ElOption
+          v-for="warehouse in warehouseOptions"
+          :key="warehouse.id"
+          :label="warehouse.name"
+          :value="warehouse.id!"
+        />
+      </ElSelect>
     </template>
     <template #productId="{ row }">
       <ElSelect
         v-model="row.productId"
-        :options="productOptions"
-        :props="{ label: 'name', value: 'id' }"
         class="w-full"
         placeholder="请选择产品"
         filterable
         :disabled="disabled"
         @change="handleProductChange($event, row)"
-      />
+      >
+        <ElOption
+          v-for="product in productOptions"
+          :key="product.id"
+          :label="product.name"
+          :value="product.id!"
+        />
+      </ElSelect>
     </template>
     <template #count="{ row }">
       <ElInputNumber
diff --git a/apps/web-ele/src/views/erp/stock/move/modules/item-form.vue b/apps/web-ele/src/views/erp/stock/move/modules/item-form.vue
index 8b3764c62..c1b5c1171 100644
--- a/apps/web-ele/src/views/erp/stock/move/modules/item-form.vue
+++ b/apps/web-ele/src/views/erp/stock/move/modules/item-form.vue
@@ -10,7 +10,7 @@ import {
   erpPriceMultiply,
 } from '@vben/utils';
 
-import { ElInput, ElInputNumber, ElSelect } from 'element-plus';
+import { ElInput, ElInputNumber, ElOption, ElSelect } from 'element-plus';
 
 import { TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
 import { getProductSimpleList } from '#/api/erp/product/product';
@@ -216,38 +216,53 @@ onMounted(async () => {
     <template #fromWarehouseId="{ row }">
       <ElSelect
         v-model="row.fromWarehouseId"
-        :options="warehouseOptions"
-        :props="{ label: 'name', value: 'id' }"
         class="w-full"
         placeholder="请选择调出仓库"
         filterable
         :disabled="disabled"
         @change="handleFromWarehouseChange($event, row)"
-      />
+      >
+        <ElOption
+          v-for="warehouse in warehouseOptions"
+          :key="warehouse.id"
+          :label="warehouse.name"
+          :value="warehouse.id!"
+        />
+      </ElSelect>
     </template>
     <template #toWarehouseId="{ row }">
       <ElSelect
         v-model="row.toWarehouseId"
-        :options="warehouseOptions"
-        :props="{ label: 'name', value: 'id' }"
         class="w-full"
         placeholder="请选择调入仓库"
         filterable
         :disabled="disabled"
         @change="handleToWarehouseChange($event, row)"
-      />
+      >
+        <ElOption
+          v-for="warehouse in warehouseOptions"
+          :key="warehouse.id"
+          :label="warehouse.name"
+          :value="warehouse.id!"
+        />
+      </ElSelect>
     </template>
     <template #productId="{ row }">
       <ElSelect
         v-model="row.productId"
-        :options="productOptions"
-        :props="{ label: 'name', value: 'id' }"
         class="w-full"
         placeholder="请选择产品"
         filterable
         :disabled="disabled"
         @change="handleProductChange($event, row)"
-      />
+      >
+        <ElOption
+          v-for="product in productOptions"
+          :key="product.id"
+          :label="product.name"
+          :value="product.id!"
+        />
+      </ElSelect>
     </template>
     <template #count="{ row }">
       <ElInputNumber
diff --git a/apps/web-ele/src/views/erp/stock/out/modules/item-form.vue b/apps/web-ele/src/views/erp/stock/out/modules/item-form.vue
index 5aa4f9afe..956b1c44f 100644
--- a/apps/web-ele/src/views/erp/stock/out/modules/item-form.vue
+++ b/apps/web-ele/src/views/erp/stock/out/modules/item-form.vue
@@ -10,7 +10,7 @@ import {
   erpPriceMultiply,
 } from '@vben/utils';
 
-import { ElInput, ElInputNumber, ElSelect } from 'element-plus';
+import { ElInput, ElInputNumber, ElOption, ElSelect } from 'element-plus';
 
 import { TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
 import { getProductSimpleList } from '#/api/erp/product/product';
@@ -206,26 +206,36 @@ onMounted(async () => {
     <template #warehouseId="{ row }">
       <ElSelect
         v-model="row.warehouseId"
-        :options="warehouseOptions"
-        :props="{ label: 'name', value: 'id' }"
         class="w-full"
         placeholder="请选择仓库"
         filterable
         :disabled="disabled"
         @change="handleWarehouseChange($event, row)"
-      />
+      >
+        <ElOption
+          v-for="warehouse in warehouseOptions"
+          :key="warehouse.id"
+          :label="warehouse.name"
+          :value="warehouse.id!"
+        />
+      </ElSelect>
     </template>
     <template #productId="{ row }">
       <ElSelect
         v-model="row.productId"
-        :options="productOptions"
-        :props="{ label: 'name', value: 'id' }"
         class="w-full"
         placeholder="请选择产品"
         filterable
         :disabled="disabled"
         @change="handleProductChange($event, row)"
-      />
+      >
+        <ElOption
+          v-for="product in productOptions"
+          :key="product.id"
+          :label="product.name"
+          :value="product.id!"
+        />
+      </ElSelect>
     </template>
     <template #count="{ row }">
       <ElInputNumber
diff --git a/apps/web-ele/src/views/im/home/components/picker/conversation-picker-panel.vue b/apps/web-ele/src/views/im/home/components/picker/conversation-picker-panel.vue
index 813141c06..70b33d0a6 100644
--- a/apps/web-ele/src/views/im/home/components/picker/conversation-picker-panel.vue
+++ b/apps/web-ele/src/views/im/home/components/picker/conversation-picker-panel.vue
@@ -81,7 +81,7 @@ const recentForwardConversations = computed(() =>
     .map((key) => byKey.value.get(key))
     .filter(
       (c): c is Conversation =>
-        c !== null && !hideSet.value.has(getConversationKey(c)),
+        c != null && !hideSet.value.has(getConversationKey(c)),
     ),
 );
 
@@ -96,7 +96,7 @@ const selectedConversations = computed(() =>
     .map((key) => byKey.value.get(key))
     .filter(
       (conversation): conversation is Conversation =>
-        conversation !== null &&
+        conversation != null &&
         !hideSet.value.has(getConversationKey(conversation)),
     ),
 );
diff --git a/apps/web-ele/src/views/im/home/pages/contact/friend-request-detail.vue b/apps/web-ele/src/views/im/home/pages/contact/friend-request-detail.vue
index 284dcfbd7..bda300ba3 100644
--- a/apps/web-ele/src/views/im/home/pages/contact/friend-request-detail.vue
+++ b/apps/web-ele/src/views/im/home/pages/contact/friend-request-detail.vue
@@ -117,6 +117,7 @@ async function handleRefuse() {
         maxlength: 255,
         placeholder: '不填则不告知对方原因',
         rows: 3,
+        type: 'textarea',
       },
       content: '',
       defaultValue: '',
diff --git a/apps/web-ele/src/views/im/home/pages/conversation/components/conversation/conversation-group-side.vue b/apps/web-ele/src/views/im/home/pages/conversation/components/conversation/conversation-group-side.vue
index 55e42548f..5277c6356 100644
--- a/apps/web-ele/src/views/im/home/pages/conversation/components/conversation/conversation-group-side.vue
+++ b/apps/web-ele/src/views/im/home/pages/conversation/components/conversation/conversation-group-side.vue
@@ -95,12 +95,12 @@ const myId = computed(() => getCurrentUserId());
 /** 历史退群群：禁所有群操作入口（邀请 / 移出 / 改资料 / 禁言 / 审批 / 退出等），只保留展示；props.group 是 GroupLite 无 joinStatus，回 store 取全量 */
 const isQuitGroup = computed(() => {
   const id = props.group?.id;
-  return id !== null && isGroupQuit(groupStore.getGroup(id));
+  return id != null && isGroupQuit(groupStore.getGroup(id));
 });
 const isOwner = computed(
   () =>
     !isQuitGroup.value &&
-    props.group !== null &&
+    props.group != null &&
     props.group.ownerId === myId.value,
 );
 /** 当前用户在群里的角色（来自 props.members 的 me 行）；用于判定是否可移出他人 */
diff --git a/apps/web-ele/src/views/im/home/pages/conversation/components/conversation/conversation-item.vue b/apps/web-ele/src/views/im/home/pages/conversation/components/conversation/conversation-item.vue
index ac7fb7d54..a0ddaf790 100644
--- a/apps/web-ele/src/views/im/home/pages/conversation/components/conversation/conversation-item.vue
+++ b/apps/web-ele/src/views/im/home/pages/conversation/components/conversation/conversation-item.vue
@@ -86,7 +86,7 @@ const showSendName = computed(() => {
     return false;
   }
   const lastType = props.conversation.lastMessageType;
-  return lastType !== null && isNormalMessage(lastType);
+  return lastType != null && isNormalMessage(lastType);
 });
 
 /** 列表展示文案：草稿优先（对齐微信 PC：有草稿时盖掉最后一条预览）→ 撤回实时算 → lastContent 兜底 */
@@ -96,7 +96,7 @@ const lastContentDisplay = computed(() => {
   }
   if (
     props.conversation.lastMessageType === ImContentType.RECALL &&
-    props.conversation.lastSenderId !== null
+    props.conversation.lastSenderId != null
   ) {
     return buildRecallTip(
       props.conversation.lastSenderId,
diff --git a/apps/web-ele/src/views/im/home/pages/conversation/components/input/message-input.vue b/apps/web-ele/src/views/im/home/pages/conversation/components/input/message-input.vue
index cf491630c..989cdf512 100644
--- a/apps/web-ele/src/views/im/home/pages/conversation/components/input/message-input.vue
+++ b/apps/web-ele/src/views/im/home/pages/conversation/components/input/message-input.vue
@@ -262,9 +262,12 @@ async function handleSend(options?: { receipt?: boolean }) {
 }
 
 /** 发送按钮下拉菜单操作 */
-function handleSendMenuClick({ key }: { key: number | string }) {
+function handleSendMenuClick(
+  command: number | string | { key: number | string },
+) {
+  const key = typeof command === 'object' ? command.key : command;
   if (key === 'receipt') {
-    handleSend({ receipt: true });
+    void handleSend({ receipt: true });
   }
 }
 
diff --git a/apps/web-ele/src/views/im/home/pages/conversation/components/message/message-item.vue b/apps/web-ele/src/views/im/home/pages/conversation/components/message/message-item.vue
index 85672fcb1..22d1a7c2b 100644
--- a/apps/web-ele/src/views/im/home/pages/conversation/components/message/message-item.vue
+++ b/apps/web-ele/src/views/im/home/pages/conversation/components/message/message-item.vue
@@ -251,7 +251,7 @@ const redialRtcCall = inject(IM_RTC_REDIAL_KEY);
 /** 私聊 RTC_CALL_END 气泡点击：用同款 mediaType 重拨 */
 function handleRtcCallBubbleClick() {
   const mediaType = rtcCallEndPrivatePayload.value?.mediaType;
-  if (mediaType === null) {
+  if (mediaType == null) {
     return;
   }
   redialRtcCall?.(mediaType);
diff --git a/apps/web-ele/src/views/im/manager/face/pack/modules/item-drawer.vue b/apps/web-ele/src/views/im/manager/face/pack/modules/item-drawer.vue
index cfc3fa19f..811961be1 100644
--- a/apps/web-ele/src/views/im/manager/face/pack/modules/item-drawer.vue
+++ b/apps/web-ele/src/views/im/manager/face/pack/modules/item-drawer.vue
@@ -150,7 +150,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
     :title="title"
     destroy-on-close
     width="65%"
-    @after-open-change="handleOpenChange"
+    @opened="handleOpenChange(true)"
   >
     <ItemFormModal @success="handleRefresh" />
     <Grid table-title="表情列表">
diff --git a/apps/web-ele/src/views/im/manager/group/components/select-dialog.vue b/apps/web-ele/src/views/im/manager/group/components/select-dialog.vue
index 122f1a000..e4bd7e9ab 100644
--- a/apps/web-ele/src/views/im/manager/group/components/select-dialog.vue
+++ b/apps/web-ele/src/views/im/manager/group/components/select-dialog.vue
@@ -243,7 +243,7 @@ function handleConfirm() {
     ElMessage.warning(multiple.value ? '请至少选择一条数据' : '请选择一条数据');
     return;
   }
-  emit('selected', multiple.value ? rows : [rows[0]]);
+  emit('selected', multiple.value ? rows : [rows[0]!]);
   open.value = false;
 }
 
diff --git a/apps/web-ele/src/views/im/manager/group/components/select.vue b/apps/web-ele/src/views/im/manager/group/components/select.vue
index 64c68d3be..a43baf2f9 100644
--- a/apps/web-ele/src/views/im/manager/group/components/select.vue
+++ b/apps/web-ele/src/views/im/manager/group/components/select.vue
@@ -47,13 +47,13 @@ const showClear = computed(() => {
     props.clearable &&
     !props.disabled &&
     hovering.value &&
-    props.modelValue !== null
+    props.modelValue != null
   );
 });
 
 /** 根据编号查询群信息（用于编辑回显） */
 async function resolveItemById(id: number | undefined) {
-  if (id === null) {
+  if (id == null) {
     selectedItem.value = undefined;
     return;
   }
@@ -83,7 +83,7 @@ function handleClick(event: MouseEvent) {
     clearSelected();
     return;
   }
-  dialogRef.value?.open(props.modelValue === null ? [] : [props.modelValue]);
+  dialogRef.value?.open(props.modelValue == null ? [] : [props.modelValue]);
 }
 
 /** 弹窗选中回调 */
diff --git a/apps/web-ele/src/views/im/utils/pull.ts b/apps/web-ele/src/views/im/utils/pull.ts
index 5fd531b9a..76c9af1ec 100644
--- a/apps/web-ele/src/views/im/utils/pull.ts
+++ b/apps/web-ele/src/views/im/utils/pull.ts
@@ -55,7 +55,7 @@ export async function runIncrementalPull<T extends PullRecord>(
   const storedCursor = await getPullCursor(cursorKey);
   const highWater = { ...storedCursor };
   let cursor =
-    storedCursor.lastUpdateTime === null
+    storedCursor.lastUpdateTime == null
       ? {}
       : {
           lastUpdateTime: Math.max(
@@ -89,12 +89,12 @@ export async function runIncrementalPull<T extends PullRecord>(
       if (!last) {
         return;
       }
-      if (last.updateTime === null) {
+      if (last.updateTime == null) {
         return;
       }
       cursor = { lastUpdateTime: last.updateTime, lastId: last.id };
       if (
-        highWater.lastUpdateTime === null ||
+        highWater.lastUpdateTime == null ||
         cursor.lastUpdateTime > highWater.lastUpdateTime ||
         (cursor.lastUpdateTime === highWater.lastUpdateTime &&
           cursor.lastId > (highWater.lastId ?? 0))
@@ -154,14 +154,14 @@ export async function runMinIdPull<T extends { id?: number }>(options: {
     // 本批最大消息 id 作为下次游标；无有效 id 则本批 apply 后停（无法继续翻页）
     const validIds = list
       .map((record) => record.id)
-      .filter((id): id is number => id !== null);
+      .filter((id): id is number => id != null);
     const nextMinId = validIds.length > 0 ? Math.max(...validIds) : undefined;
     // applyPage 返回 false：本页未落地（如入库失败），不推进游标并终止，避免漏消息
     if ((await applyPage(list, nextMinId)) === false) {
       return;
     }
     // 无有效 id，或游标没前进（后端契约是 id > minId，理论不会出现）：停，防御死翻
-    if (nextMinId === null || nextMinId <= minId) {
+    if (nextMinId == null || nextMinId <= minId) {
       return;
     }
     minId = nextMinId;
diff --git a/apps/web-ele/src/views/infra/fileConfig/index.vue b/apps/web-ele/src/views/infra/fileConfig/index.vue
index d7aabfb14..421c63d9c 100644
--- a/apps/web-ele/src/views/infra/fileConfig/index.vue
+++ b/apps/web-ele/src/views/infra/fileConfig/index.vue
@@ -49,9 +49,9 @@ async function handleMaster(row: InfraFileConfigApi.FileConfig) {
   });
   try {
     await updateFileConfigMaster(row.id!);
-    ElMessage.success($t('ui.actionMessage.operationSuccess'));
+    ElMessage.success($t('ui.actionMessage.updateSuccess'));
     handleRefresh();
-  } catch {
+  } finally {
     loadingInstance.close();
   }
 }
@@ -63,7 +63,6 @@ async function handleTest(row: InfraFileConfigApi.FileConfig) {
   });
   try {
     const response = await testFileConfig(row.id!);
-    loadingInstance.close();
     // 确认是否访问该文件
     confirm({
       title: '测试上传成功',
@@ -73,7 +72,7 @@ async function handleTest(row: InfraFileConfigApi.FileConfig) {
     }).then(() => {
       openWindow(response);
     });
-  } catch {
+  } finally {
     loadingInstance.close();
   }
 }
diff --git a/apps/web-ele/src/views/infra/webSocket/index.vue b/apps/web-ele/src/views/infra/webSocket/index.vue
index ac364c565..4e022255f 100644
--- a/apps/web-ele/src/views/infra/webSocket/index.vue
+++ b/apps/web-ele/src/views/infra/webSocket/index.vue
@@ -227,7 +227,7 @@ onMounted(async () => {
           placeholder="请选择接收人"
           :disabled="!getIsOpen"
         >
-          <ElOption key="" value="all" label="所有人">
+          <ElOption key="all" value="all" label="所有人">
             <div class="flex items-center">
               <ElAvatar size="small">全</ElAvatar>
               <span class="ml-2">所有人</span>
diff --git a/apps/web-ele/src/views/iot/alert/config/data.ts b/apps/web-ele/src/views/iot/alert/config/data.ts
index 7cb997b3a..954ac44ca 100644
--- a/apps/web-ele/src/views/iot/alert/config/data.ts
+++ b/apps/web-ele/src/views/iot/alert/config/data.ts
@@ -125,7 +125,7 @@ export function useFormSchema(): VbenFormSchema[] {
             !hasReceiveType(values, IotAlertReceiveTypeEnum.SMS) &&
             values.smsTemplateCode
           ) {
-            formApi.setFieldValue('smsTemplateCode', undefined);
+            await formApi.setFieldValue('smsTemplateCode', undefined);
           }
         },
       },
@@ -143,7 +143,7 @@ export function useFormSchema(): VbenFormSchema[] {
             !hasReceiveType(values, IotAlertReceiveTypeEnum.MAIL) &&
             values.mailTemplateCode
           ) {
-            formApi.setFieldValue('mailTemplateCode', undefined);
+            await formApi.setFieldValue('mailTemplateCode', undefined);
           }
         },
       },
@@ -162,7 +162,7 @@ export function useFormSchema(): VbenFormSchema[] {
             !hasReceiveType(values, IotAlertReceiveTypeEnum.NOTIFY) &&
             values.notifyTemplateCode
           ) {
-            formApi.setFieldValue('notifyTemplateCode', undefined);
+            await formApi.setFieldValue('notifyTemplateCode', undefined);
           }
         },
       },
diff --git a/apps/web-ele/src/views/mall/product/category/components/select.vue b/apps/web-ele/src/views/mall/product/category/components/select.vue
index 7e45dc6e2..4fc0db725 100644
--- a/apps/web-ele/src/views/mall/product/category/components/select.vue
+++ b/apps/web-ele/src/views/mall/product/category/components/select.vue
@@ -59,7 +59,7 @@ onMounted(async () => {
     }"
     :multiple="multiple"
     :show-checkbox="multiple"
-    check-strictly
+    clearable
     default-expand-all
     class="w-full"
     placeholder="请选择商品分类"
diff --git a/apps/web-ele/src/views/mall/promotion/components/diy-editor/components/component-container-property.vue b/apps/web-ele/src/views/mall/promotion/components/diy-editor/components/component-container-property.vue
index 36c8d5ca9..387c9d989 100644
--- a/apps/web-ele/src/views/mall/promotion/components/diy-editor/components/component-container-property.vue
+++ b/apps/web-ele/src/views/mall/promotion/components/diy-editor/components/component-container-property.vue
@@ -134,7 +134,7 @@ function handleSliderChange(prop: string) {
     </ElTabPane>
 
     <!-- 每个组件的通用内容 -->
-    <ElTabPane label="样式" lazy>
+    <ElTabPane label="样式">
       <ElCard header="组件样式" class="property-group">
         <ElForm :model="formData" label-width="80px">
           <ElFormItem label="组件背景" prop="bgType">
diff --git a/apps/web-ele/src/views/mall/promotion/components/diy-editor/components/mobile/coupon-card/property.vue b/apps/web-ele/src/views/mall/promotion/components/diy-editor/components/mobile/coupon-card/property.vue
index 174f767a6..a30a5313b 100644
--- a/apps/web-ele/src/views/mall/promotion/components/diy-editor/components/mobile/coupon-card/property.vue
+++ b/apps/web-ele/src/views/mall/promotion/components/diy-editor/components/mobile/coupon-card/property.vue
@@ -15,12 +15,14 @@ import { floatToFixed2 } from '@vben/utils';
 
 import { useVModel } from '@vueuse/core';
 import {
+  ElButton,
   ElCard,
   ElForm,
   ElFormItem,
   ElRadioButton,
   ElRadioGroup,
   ElSlider,
+  ElText,
   ElTooltip,
 } from 'element-plus';
 
diff --git a/apps/web-ele/src/views/mall/promotion/components/diy-editor/components/mobile/notice-bar/property.vue b/apps/web-ele/src/views/mall/promotion/components/diy-editor/components/mobile/notice-bar/property.vue
index 5fdb1f06b..d367f1745 100644
--- a/apps/web-ele/src/views/mall/promotion/components/diy-editor/components/mobile/notice-bar/property.vue
+++ b/apps/web-ele/src/views/mall/promotion/components/diy-editor/components/mobile/notice-bar/property.vue
@@ -41,7 +41,7 @@ const rules = {
       <ElFormItem label="背景颜色" prop="backgroundColor">
         <ColorInput v-model="formData.backgroundColor" />
       </ElFormItem>
-      <ElFormItem label="文字颜色" prop="文字颜色">
+      <ElFormItem label="文字颜色" prop="textColor">
         <ColorInput v-model="formData.textColor" />
       </ElFormItem>
       <ElCard header="公告内容" class="property-group" shadow="never">
diff --git a/apps/web-ele/src/views/mall/promotion/components/diy-editor/components/mobile/promotion-point/property.vue b/apps/web-ele/src/views/mall/promotion/components/diy-editor/components/mobile/promotion-point/property.vue
index 77c0b8b34..6a07d0c41 100644
--- a/apps/web-ele/src/views/mall/promotion/components/diy-editor/components/mobile/promotion-point/property.vue
+++ b/apps/web-ele/src/views/mall/promotion/components/diy-editor/components/mobile/promotion-point/property.vue
@@ -6,6 +6,7 @@ import { IconifyIcon } from '@vben/icons';
 import { useVModel } from '@vueuse/core';
 import {
   ElCard,
+  ElCheckbox,
   ElForm,
   ElFormItem,
   ElInput,
diff --git a/apps/web-ele/src/views/mall/promotion/components/diy-editor/components/mobile/title-bar/property.vue b/apps/web-ele/src/views/mall/promotion/components/diy-editor/components/mobile/title-bar/property.vue
index 9ff872301..ad163c205 100644
--- a/apps/web-ele/src/views/mall/promotion/components/diy-editor/components/mobile/title-bar/property.vue
+++ b/apps/web-ele/src/views/mall/promotion/components/diy-editor/components/mobile/title-bar/property.vue
@@ -10,6 +10,7 @@ import {
   ElForm,
   ElFormItem,
   ElInput,
+  ElRadio,
   ElRadioButton,
   ElRadioGroup,
   ElSlider,
diff --git a/apps/web-ele/src/views/mall/promotion/components/diy-editor/index.vue b/apps/web-ele/src/views/mall/promotion/components/diy-editor/index.vue
index 1e921d20e..d9c6b5175 100644
--- a/apps/web-ele/src/views/mall/promotion/components/diy-editor/index.vue
+++ b/apps/web-ele/src/views/mall/promotion/components/diy-editor/index.vue
@@ -10,6 +10,7 @@ import { cloneDeep, isEmpty, isString } from '@vben/utils';
 import { useQRCode } from '@vueuse/integrations/useQRCode';
 import {
   ElAside,
+  ElButton,
   ElCard,
   ElContainer,
   ElHeader,
diff --git a/apps/web-ele/src/views/mall/promotion/components/draggable/index.vue b/apps/web-ele/src/views/mall/promotion/components/draggable/index.vue
index 3c673a709..3d5b3afcd 100644
--- a/apps/web-ele/src/views/mall/promotion/components/draggable/index.vue
+++ b/apps/web-ele/src/views/mall/promotion/components/draggable/index.vue
@@ -81,7 +81,10 @@ const handleDelete = function (index: number) {
       </div>
     </template>
   </VueDraggable>
-  <ElTooltip :disabled="limit < 1" :content="`最多添加${limit}个`">
+  <ElTooltip
+    :disabled="limit >= Number.MAX_VALUE"
+    :content="`最多添加${limit}个`"
+  >
     <ElButton
       type="primary"
       plain
diff --git a/apps/web-ele/src/views/mall/promotion/diy/template/decorate/index.vue b/apps/web-ele/src/views/mall/promotion/diy/template/decorate/index.vue
index b2fd164c9..c3fe457d0 100644
--- a/apps/web-ele/src/views/mall/promotion/diy/template/decorate/index.vue
+++ b/apps/web-ele/src/views/mall/promotion/diy/template/decorate/index.vue
@@ -67,7 +67,7 @@ async function getPageDetail(id: any) {
     // 拼接手机预览链接
     const domain = import.meta.env.VITE_MALL_H5_DOMAIN;
     const accessStore = useAccessStore();
-    previewUrl.value = `${domain}?templateId=${formData.value.id}&${accessStore.tenantId}`;
+    previewUrl.value = `${domain}?templateId=${formData.value.id}&tenantId=${accessStore.tenantId}`;
   } finally {
     loadingInstance.close();
   }
diff --git a/apps/web-ele/src/views/mall/promotion/kefu/modules/message-list.vue b/apps/web-ele/src/views/mall/promotion/kefu/modules/message-list.vue
index 327e43ed7..40fa790b3 100644
--- a/apps/web-ele/src/views/mall/promotion/kefu/modules/message-list.vue
+++ b/apps/web-ele/src/views/mall/promotion/kefu/modules/message-list.vue
@@ -415,7 +415,7 @@ function showTime(item: MallKefuMessageApi.Message, index: number) {
             :rows="4"
             class="border-none p-2"
             placeholder="输入消息，Enter发送，Shift+Enter换行"
-            @keyup.enter="handleSendMessage"
+            @keydown.enter.exact.prevent="handleSendMessage"
             :input-style="{ boxShadow: 'none' }"
           />
         </div>
diff --git a/apps/web-ele/src/views/mall/statistics/trade/modules/trend-card.vue b/apps/web-ele/src/views/mall/statistics/trade/modules/trend-card.vue
index 40f928430..dec77aca3 100644
--- a/apps/web-ele/src/views/mall/statistics/trade/modules/trend-card.vue
+++ b/apps/web-ele/src/views/mall/statistics/trade/modules/trend-card.vue
@@ -122,7 +122,7 @@ async function handleExport() {
 </script>
 
 <template>
-  <ElCard :bordered="false" shadow="never" class="h-full">
+  <ElCard :border="false" shadow="never" class="h-full">
     <template #header>
       <div class="flex items-center justify-between">
         <span class="text-base font-medium">交易状况</span>
diff --git a/apps/web-ele/src/views/mall/trade/brokerage/user/modules/create-form.vue b/apps/web-ele/src/views/mall/trade/brokerage/user/modules/create-form.vue
index 0ceb8bc98..f559d2d7c 100644
--- a/apps/web-ele/src/views/mall/trade/brokerage/user/modules/create-form.vue
+++ b/apps/web-ele/src/views/mall/trade/brokerage/user/modules/create-form.vue
@@ -11,6 +11,7 @@ import { formatDate, isEmpty } from '@vben/utils';
 
 import {
   ElAvatar,
+  ElButton,
   ElDescriptions,
   ElDescriptionsItem,
   ElDivider,
diff --git a/apps/web-ele/src/views/mall/trade/brokerage/user/modules/update-form.vue b/apps/web-ele/src/views/mall/trade/brokerage/user/modules/update-form.vue
index f89a7e1c4..a131af203 100644
--- a/apps/web-ele/src/views/mall/trade/brokerage/user/modules/update-form.vue
+++ b/apps/web-ele/src/views/mall/trade/brokerage/user/modules/update-form.vue
@@ -11,6 +11,7 @@ import { formatDate, isEmpty } from '@vben/utils';
 
 import {
   ElAvatar,
+  ElButton,
   ElDescriptions,
   ElDescriptionsItem,
   ElDivider,
diff --git a/apps/web-ele/src/views/mall/trade/order/index.vue b/apps/web-ele/src/views/mall/trade/order/index.vue
index c19b0fdf4..33ce1c28d 100644
--- a/apps/web-ele/src/views/mall/trade/order/index.vue
+++ b/apps/web-ele/src/views/mall/trade/order/index.vue
@@ -165,7 +165,8 @@ const [Grid, gridApi] = useVbenVxeGrid({
               link: true,
               ifShow: () =>
                 row.deliveryType === DeliveryTypeEnum.EXPRESS.type &&
-                row.status === TradeOrderStatusEnum.UNDELIVERED.status,
+                (row.status === TradeOrderStatusEnum.UNDELIVERED.status ||
+                  row.status === TradeOrderStatusEnum.DELIVERED.status),
               onClick: handleDelivery.bind(null, row),
             },
             {
diff --git a/apps/web-ele/src/views/mes/cal/holiday/index.vue b/apps/web-ele/src/views/mes/cal/holiday/index.vue
index 27a6e24bd..6659507af 100644
--- a/apps/web-ele/src/views/mes/cal/holiday/index.vue
+++ b/apps/web-ele/src/views/mes/cal/holiday/index.vue
@@ -158,14 +158,22 @@ onMounted(getList);
                 {{ data.day.split('-')[2] }}
               </span>
               <ElTag
-                v-if="holidaySet.has(data.day)"
+                v-if="
+                  data.type === 'current-month' && holidaySet.has(data.day)
+                "
                 effect="dark"
                 size="small"
                 type="success"
               >
                 休
               </ElTag>
-              <ElTag v-else effect="dark" size="small">班</ElTag>
+              <ElTag
+                v-else-if="data.type === 'current-month'"
+                effect="dark"
+                size="small"
+              >
+                班
+              </ElTag>
             </div>
             <div
               class="mt-1 text-xs"
diff --git a/apps/web-ele/src/views/mes/md/workstation/modules/form.vue b/apps/web-ele/src/views/mes/md/workstation/modules/form.vue
index d1e2511c6..372cb15d3 100644
--- a/apps/web-ele/src/views/mes/md/workstation/modules/form.vue
+++ b/apps/web-ele/src/views/mes/md/workstation/modules/form.vue
@@ -129,13 +129,13 @@ const [Modal, modalApi] = useVbenModal({
       v-model="subTabsName"
       class="mx-4 mt-4"
     >
-      <ElTabPane name="machine" label="设备资源">
+      <ElTabPane name="machine" label="设备资源" lazy>
         <MachineList :form-type="formType" :workstation-id="formData.id" />
       </ElTabPane>
-      <ElTabPane name="tool" label="工装夹具">
+      <ElTabPane name="tool" label="工装夹具" lazy>
         <ToolList :form-type="formType" :workstation-id="formData.id" />
       </ElTabPane>
-      <ElTabPane name="worker" label="人力资源">
+      <ElTabPane name="worker" label="人力资源" lazy>
         <WorkerList :form-type="formType" :workstation-id="formData.id" />
       </ElTabPane>
     </ElTabs>
diff --git a/apps/web-ele/src/views/mes/wm/itemreceipt/modules/line-list.vue b/apps/web-ele/src/views/mes/wm/itemreceipt/modules/line-list.vue
index 1c79a016b..caa7b76b3 100644
--- a/apps/web-ele/src/views/mes/wm/itemreceipt/modules/line-list.vue
+++ b/apps/web-ele/src/views/mes/wm/itemreceipt/modules/line-list.vue
@@ -54,7 +54,7 @@ const [DetailFormModal, detailFormModalApi] = useVbenModal({
 function handleRefresh() {
   for (const id of Object.keys(detailMap)) {
     const key = Number(id);
-    delete detailMap.key;
+    delete detailMap[key];
   }
   gridApi.query();
 }
diff --git a/apps/web-ele/src/views/mes/wm/outsourceissue/modules/line-list.vue b/apps/web-ele/src/views/mes/wm/outsourceissue/modules/line-list.vue
index 3edd198a7..a8273cf62 100644
--- a/apps/web-ele/src/views/mes/wm/outsourceissue/modules/line-list.vue
+++ b/apps/web-ele/src/views/mes/wm/outsourceissue/modules/line-list.vue
@@ -52,7 +52,7 @@ const [DetailFormModal, detailFormModalApi] = useVbenModal({
 function handleRefresh() {
   for (const id of Object.keys(detailMap)) {
     const key = Number(id);
-    delete detailMap.key;
+    delete detailMap[key];
   }
   gridApi.query();
 }
diff --git a/apps/web-ele/src/views/mes/wm/outsourcereceipt/modules/line-list.vue b/apps/web-ele/src/views/mes/wm/outsourcereceipt/modules/line-list.vue
index 5f9d310c4..e33213bc7 100644
--- a/apps/web-ele/src/views/mes/wm/outsourcereceipt/modules/line-list.vue
+++ b/apps/web-ele/src/views/mes/wm/outsourcereceipt/modules/line-list.vue
@@ -53,7 +53,7 @@ const [DetailFormModal, detailFormModalApi] = useVbenModal({
 function handleRefresh() {
   for (const id of Object.keys(detailMap)) {
     const key = Number(id);
-    delete detailMap.key;
+    delete detailMap[key];
   }
   gridApi.query();
 }
diff --git a/apps/web-ele/src/views/mes/wm/productissue/modules/line-list.vue b/apps/web-ele/src/views/mes/wm/productissue/modules/line-list.vue
index 7f08e1a1a..8cbaeb2df 100644
--- a/apps/web-ele/src/views/mes/wm/productissue/modules/line-list.vue
+++ b/apps/web-ele/src/views/mes/wm/productissue/modules/line-list.vue
@@ -52,7 +52,7 @@ const [DetailFormModal, detailFormModalApi] = useVbenModal({
 function handleRefresh() {
   for (const id of Object.keys(detailMap)) {
     const key = Number(id);
-    delete detailMap.key;
+    delete detailMap[key];
   }
   gridApi.query();
 }
diff --git a/apps/web-ele/src/views/mes/wm/productreceipt/modules/line-list.vue b/apps/web-ele/src/views/mes/wm/productreceipt/modules/line-list.vue
index 2ee341c57..68edbbf56 100644
--- a/apps/web-ele/src/views/mes/wm/productreceipt/modules/line-list.vue
+++ b/apps/web-ele/src/views/mes/wm/productreceipt/modules/line-list.vue
@@ -55,7 +55,7 @@ const [DetailFormModal, detailFormModalApi] = useVbenModal({
 function handleRefresh() {
   for (const id of Object.keys(detailMap)) {
     const key = Number(id);
-    delete detailMap.key;
+    delete detailMap[key];
   }
   gridApi.query();
 }
diff --git a/apps/web-ele/src/views/mes/wm/productsales/modules/line-list.vue b/apps/web-ele/src/views/mes/wm/productsales/modules/line-list.vue
index dff0ffbde..7533fbd1f 100644
--- a/apps/web-ele/src/views/mes/wm/productsales/modules/line-list.vue
+++ b/apps/web-ele/src/views/mes/wm/productsales/modules/line-list.vue
@@ -53,7 +53,7 @@ const [DetailFormModal, detailFormModalApi] = useVbenModal({
 function handleRefresh() {
   for (const id of Object.keys(detailMap)) {
     const key = Number(id);
-    delete detailMap.key;
+    delete detailMap[key];
   }
   gridApi.query();
 }
diff --git a/apps/web-ele/src/views/mes/wm/returnissue/modules/line-list.vue b/apps/web-ele/src/views/mes/wm/returnissue/modules/line-list.vue
index d629b4837..6bb0aa882 100644
--- a/apps/web-ele/src/views/mes/wm/returnissue/modules/line-list.vue
+++ b/apps/web-ele/src/views/mes/wm/returnissue/modules/line-list.vue
@@ -55,7 +55,7 @@ const [DetailFormModal, detailFormModalApi] = useVbenModal({
 function handleRefresh() {
   for (const id of Object.keys(detailMap)) {
     const key = Number(id);
-    delete detailMap.key;
+    delete detailMap[key];
   }
   gridApi.query();
 }
diff --git a/apps/web-ele/src/views/mes/wm/returnsales/modules/line-list.vue b/apps/web-ele/src/views/mes/wm/returnsales/modules/line-list.vue
index 62ac8264b..a8e5649f4 100644
--- a/apps/web-ele/src/views/mes/wm/returnsales/modules/line-list.vue
+++ b/apps/web-ele/src/views/mes/wm/returnsales/modules/line-list.vue
@@ -55,7 +55,7 @@ const [DetailFormModal, detailFormModalApi] = useVbenModal({
 function handleRefresh() {
   for (const id of Object.keys(detailMap)) {
     const key = Number(id);
-    delete detailMap.key;
+    delete detailMap[key];
   }
   gridApi.query();
 }
diff --git a/apps/web-ele/src/views/mes/wm/returnvendor/modules/line-list.vue b/apps/web-ele/src/views/mes/wm/returnvendor/modules/line-list.vue
index 0d4c5cefa..058926ca5 100644
--- a/apps/web-ele/src/views/mes/wm/returnvendor/modules/line-list.vue
+++ b/apps/web-ele/src/views/mes/wm/returnvendor/modules/line-list.vue
@@ -54,7 +54,7 @@ const [DetailFormModal, detailFormModalApi] = useVbenModal({
 function handleRefresh() {
   for (const id of Object.keys(detailMap)) {
     const key = Number(id);
-    delete detailMap.key;
+    delete detailMap[key];
   }
   gridApi.query();
 }
diff --git a/apps/web-ele/src/views/mes/wm/stocktaking/plan/components/condition-value-input.vue b/apps/web-ele/src/views/mes/wm/stocktaking/plan/components/condition-value-input.vue
index 7e6d951eb..adafb7ac8 100644
--- a/apps/web-ele/src/views/mes/wm/stocktaking/plan/components/condition-value-input.vue
+++ b/apps/web-ele/src/views/mes/wm/stocktaking/plan/components/condition-value-input.vue
@@ -77,7 +77,7 @@ function handleQualityStatusChange(value?: number) {
   emit('update:modelValue', undefined);
   emit('valueChange', {
     valueId: undefined,
-    valueCode: value === null ? '' : String(value),
+    valueCode: value === undefined || value === null ? '' : String(value),
     valueName: selected?.label || '',
   });
 }
@@ -109,14 +109,15 @@ async function loadCascadeData() {
       : undefined;
     return;
   }
-  if (props.modelValue === null) {
+  const valueId = props.modelValue;
+  if (valueId === undefined || valueId === null) {
     return;
   }
   if (props.type === MesWmStockTakingParamTypeEnum.LOCATION) {
-    const location = await getWarehouseLocation(props.modelValue as number);
+    const location = await getWarehouseLocation(valueId);
     locationWarehouseId.value = location?.warehouseId;
   } else if (props.type === MesWmStockTakingParamTypeEnum.AREA) {
-    const area = await getWarehouseArea(props.modelValue as number);
+    const area = await getWarehouseArea(valueId);
     areaWarehouseId.value = area?.warehouseId;
     areaLocationId.value = area?.locationId;
   }
diff --git a/apps/web-ele/src/views/mes/wm/transfer/modules/line-list.vue b/apps/web-ele/src/views/mes/wm/transfer/modules/line-list.vue
index c186b014a..a99a73dc5 100644
--- a/apps/web-ele/src/views/mes/wm/transfer/modules/line-list.vue
+++ b/apps/web-ele/src/views/mes/wm/transfer/modules/line-list.vue
@@ -52,7 +52,7 @@ const [DetailFormModal, detailFormModalApi] = useVbenModal({
 function handleRefresh() {
   for (const id of Object.keys(detailMap)) {
     const key = Number(id);
-    delete detailMap.key;
+    delete detailMap[key];
   }
   gridApi.query();
 }
diff --git a/apps/web-ele/src/views/mp/components/wx-msg/msg.vue b/apps/web-ele/src/views/mp/components/wx-msg/msg.vue
index 1a9ab5058..0892ddb00 100644
--- a/apps/web-ele/src/views/mp/components/wx-msg/msg.vue
+++ b/apps/web-ele/src/views/mp/components/wx-msg/msg.vue
@@ -30,7 +30,7 @@ withDefaults(
     <div v-else-if="item.type === MpMsgType.Text">{{ item.content }}</div>
 
     <div v-else-if="item.type === MpMsgType.Voice">
-      <WxVideoPlayer :url="item.mediaUrl" :content="item.recognition" />
+      <WxVoicePlayer :url="item.mediaUrl" :content="item.recognition" />
     </div>
 
     <div v-else-if="item.type === MpMsgType.Image">
@@ -43,7 +43,7 @@ withDefaults(
       v-else-if="item.type === MpMsgType.Video || item.type === 'shortvideo'"
       class="text-center"
     >
-      <WxVoicePlayer :url="item.mediaUrl" />
+      <WxVideoPlayer :url="item.mediaUrl" />
     </div>
 
     <div v-else-if="item.type === MpMsgType.Link" class="flex-1">
diff --git a/apps/web-ele/src/views/mp/components/wx-reply/tab-music.vue b/apps/web-ele/src/views/mp/components/wx-reply/tab-music.vue
index 728609d60..b4190b460 100644
--- a/apps/web-ele/src/views/mp/components/wx-reply/tab-music.vue
+++ b/apps/web-ele/src/views/mp/components/wx-reply/tab-music.vue
@@ -133,14 +133,30 @@ function selectMaterial(item: any) {
         </ElDialog>
       </ElCol>
       <ElCol :span="18">
-        <ElInput v-model="reply.title" placeholder="请输入标题" />
+        <ElInput
+          :model-value="reply.title || undefined"
+          placeholder="请输入标题"
+          @update:model-value="(val) => (reply.title = val || null)"
+        />
         <div class="my-5"></div>
-        <ElInput v-model="reply.description" placeholder="请输入描述" />
+        <ElInput
+          :model-value="reply.description || undefined"
+          placeholder="请输入描述"
+          @update:model-value="(val) => (reply.description = val || null)"
+        />
       </ElCol>
     </ElRow>
     <div class="my-5"></div>
-    <ElInput v-model="reply.musicUrl" placeholder="请输入音乐链接" />
+    <ElInput
+      :model-value="reply.musicUrl || undefined"
+      placeholder="请输入音乐链接"
+      @update:model-value="(val) => (reply.musicUrl = val || null)"
+    />
     <div class="my-5"></div>
-    <ElInput v-model="reply.hqMusicUrl" placeholder="请输入高质量音乐链接" />
+    <ElInput
+      :model-value="reply.hqMusicUrl || undefined"
+      placeholder="请输入高质量音乐链接"
+      @update:model-value="(val) => (reply.hqMusicUrl = val || null)"
+    />
   </div>
 </template>
diff --git a/apps/web-ele/src/views/mp/components/wx-reply/tab-text.vue b/apps/web-ele/src/views/mp/components/wx-reply/tab-text.vue
index e75319cb5..6e43f9b7d 100644
--- a/apps/web-ele/src/views/mp/components/wx-reply/tab-text.vue
+++ b/apps/web-ele/src/views/mp/components/wx-reply/tab-text.vue
@@ -12,10 +12,10 @@ const emit = defineEmits<{
 }>();
 
 const content = computed({
-  get: () => props.modelValue,
-  set: (val: null | string) => {
-    emit('update:modelValue', val);
-    emit('input', val);
+  get: () => props.modelValue ?? '',
+  set: (val: string) => {
+    emit('update:modelValue', val || null);
+    emit('input', val || null);
   },
 });
 </script>
diff --git a/apps/web-ele/src/views/mp/components/wx-reply/tab-video.vue b/apps/web-ele/src/views/mp/components/wx-reply/tab-video.vue
index 13be72953..57187519b 100644
--- a/apps/web-ele/src/views/mp/components/wx-reply/tab-video.vue
+++ b/apps/web-ele/src/views/mp/components/wx-reply/tab-video.vue
@@ -91,11 +91,17 @@ function selectMaterial(item: any) {
 <template>
   <div>
     <ElRow>
-      <ElInput v-model="reply.title" class="mb-[2%]" placeholder="请输入标题" />
+      <ElInput
+        :model-value="reply.title || undefined"
+        class="mb-[2%]"
+        placeholder="请输入标题"
+        @update:model-value="(val) => (reply.title = val || null)"
+      />
       <ElInput
         class="mb-[2%]"
-        v-model="reply.description"
+        :model-value="reply.description || undefined"
         placeholder="请输入描述"
+        @update:model-value="(val) => (reply.description = val || null)"
       />
       <ElRow class="w-full pt-[10px] text-center" justify="center">
         <VideoPlayer v-if="reply.url" :url="reply.url" />
diff --git a/apps/web-ele/src/views/mp/components/wx-reply/wx-reply.vue b/apps/web-ele/src/views/mp/components/wx-reply/wx-reply.vue
index f80decea0..fd66f66ba 100644
--- a/apps/web-ele/src/views/mp/components/wx-reply/wx-reply.vue
+++ b/apps/web-ele/src/views/mp/components/wx-reply/wx-reply.vue
@@ -113,7 +113,7 @@ defineExpose({
 </script>
 
 <template>
-  <ElTabs type="border-card" v-model="reply.type" @tab-change="clear">
+  <ElTabs type="border-card" v-model="currentTab">
     <!-- 类型 1：文本 -->
     <ElTabPane :name="ReplyType.Text">
       <template #label>
diff --git a/apps/web-ele/src/views/mp/material/modules/UploadFile.vue b/apps/web-ele/src/views/mp/material/modules/UploadFile.vue
index ce6806727..d38428ba2 100644
--- a/apps/web-ele/src/views/mp/material/modules/UploadFile.vue
+++ b/apps/web-ele/src/views/mp/material/modules/UploadFile.vue
@@ -20,7 +20,7 @@ import {
 const props = defineProps<{ type: UploadType }>();
 
 const emit = defineEmits<{
-  uploaded: [v: Promise<void>];
+  uploaded: [];
 }>();
 
 const accountId = inject<number>('accountId');
diff --git a/apps/web-ele/src/views/mp/material/modules/UploadVideo.vue b/apps/web-ele/src/views/mp/material/modules/UploadVideo.vue
index 421bd4cf8..aa606f5b8 100644
--- a/apps/web-ele/src/views/mp/material/modules/UploadVideo.vue
+++ b/apps/web-ele/src/views/mp/material/modules/UploadVideo.vue
@@ -31,7 +31,7 @@ withDefaults(
 
 const emit = defineEmits<{
   'update:open': [v: boolean];
-  uploaded: [v: Promise<void>];
+  uploaded: [];
 }>();
 
 const accountId = inject<number>('accountId');
diff --git a/apps/web-ele/src/views/mp/menu/modules/editor.vue b/apps/web-ele/src/views/mp/menu/modules/editor.vue
index c8777a614..2c8f98911 100644
--- a/apps/web-ele/src/views/mp/menu/modules/editor.vue
+++ b/apps/web-ele/src/views/mp/menu/modules/editor.vue
@@ -25,7 +25,7 @@ const props = defineProps<{
 }>();
 
 const emit = defineEmits<{
-  (e: 'delete', v: Promise<void>): void;
+  (e: 'delete'): void;
   (e: 'update:modelValue', v: any): void;
 }>();
 
diff --git a/apps/web-ele/src/views/pay/cashier/index.vue b/apps/web-ele/src/views/pay/cashier/index.vue
index ed5d450b9..724aec6cf 100644
--- a/apps/web-ele/src/views/pay/cashier/index.vue
+++ b/apps/web-ele/src/views/pay/cashier/index.vue
@@ -13,11 +13,12 @@ import {
 import { useTabs } from '@vben/hooks';
 import { fenToYuan, formatDate } from '@vben/utils';
 
+import { useQRCode } from '@vueuse/integrations/useQRCode';
 import {
   ElButton,
   ElCard,
   ElDescriptions,
-  ElImage,
+  ElDescriptionsItem,
   ElInput,
   ElMessage,
 } from 'element-plus';
@@ -48,6 +49,10 @@ const qrCode = ref({
   url: '',
   visible: false,
 });
+const qrCodeImage = useQRCode(() => qrCode.value.url, {
+  errorCorrectionLevel: 'H',
+  margin: 4,
+});
 
 /** 展示形式：条形码 */
 const barCode = ref({
@@ -212,6 +217,7 @@ function displayQrCode(channelCode: string, data: any) {
     url: data.displayContent,
     visible: true,
   };
+  modalApi.open();
 }
 
 /** 提交支付后（App） */
@@ -307,24 +313,24 @@ onBeforeUnmount(() => {
   <Page auto-content-height>
     <ElCard class="mt-4">
       <ElDescriptions :column="3" :title="payOrder?.subject ?? '商品详情'">
-        <ElDescriptions.Item label="支付单号">
+        <ElDescriptionsItem label="支付单号">
           {{ payOrder?.id }}
-        </ElDescriptions.Item>
-        <ElDescriptions.Item label="商品标题">
+        </ElDescriptionsItem>
+        <ElDescriptionsItem label="商品标题">
           {{ payOrder?.subject }}
-        </ElDescriptions.Item>
-        <ElDescriptions.Item label="商品内容">
+        </ElDescriptionsItem>
+        <ElDescriptionsItem label="商品内容">
           {{ payOrder?.body }}
-        </ElDescriptions.Item>
-        <ElDescriptions.Item label="支付金额">
+        </ElDescriptionsItem>
+        <ElDescriptionsItem label="支付金额">
           {{ `￥${fenToYuan(payOrder?.price || 0)}` }}
-        </ElDescriptions.Item>
-        <ElDescriptions.Item label="创建时间">
+        </ElDescriptionsItem>
+        <ElDescriptionsItem label="创建时间">
           {{ formatDate(payOrder?.createTime) }}
-        </ElDescriptions.Item>
-        <ElDescriptions.Item label="过期时间">
+        </ElDescriptionsItem>
+        <ElDescriptionsItem label="过期时间">
           {{ formatDate(payOrder?.expireTime) }}
-        </ElDescriptions.Item>
+        </ElDescriptionsItem>
       </ElDescriptions>
     </ElCard>
     <ElCard title="选择支付宝支付" class="mt-4">
@@ -373,10 +379,15 @@ onBeforeUnmount(() => {
       </div>
     </ElCard>
     <Modal class="w-2/5" :title="title">
-      <ElImage v-if="qrCode.visible" :src="qrCode.url" />
+      <img
+        v-if="qrCode.visible"
+        :src="qrCodeImage"
+        alt="支付二维码"
+        class="max-w-full"
+      />
       <ElInput
         v-if="barCode.visible"
-        v-model:value="barCode.value"
+        v-model="barCode.value"
         placeholder="请输入条形码"
         required
       />
diff --git a/apps/web-ele/src/views/system/dept/components/select-modal.vue b/apps/web-ele/src/views/system/dept/components/select-modal.vue
index bcb91098b..ac7c9536a 100644
--- a/apps/web-ele/src/views/system/dept/components/select-modal.vue
+++ b/apps/web-ele/src/views/system/dept/components/select-modal.vue
@@ -40,10 +40,9 @@ const treeRef = ref(); // Tree 组件引用
 
 const [Modal, modalApi] = useVbenModal({
   async onConfirm() {
-    // 获取选中的部门ID
-    const selectedIds: number[] = props.checkStrictly
-      ? treeRef.value?.getCheckedKeys() || []
-      : selectedDeptIds.value;
+    // 获取选中的部门ID（selectedDeptIds 由 handleCheck 实时维护，
+    // 严格/非严格模式下均与树勾选状态一致，无需依赖 treeRef 是否已挂载）
+    const selectedIds: number[] = selectedDeptIds.value;
 
     const deptArray = deptData.value.filter((dept) =>
       selectedIds.includes(dept.id!),
@@ -102,6 +101,9 @@ function handleCheck(
     if (lastSelectedId) {
       selectedDeptIds.value = [lastSelectedId];
       treeRef.value?.setCheckedKeys([lastSelectedId]);
+    } else {
+      selectedDeptIds.value = [];
+      treeRef.value?.setCheckedKeys([]);
     }
   }
 }
diff --git a/apps/web-ele/src/views/system/dept/index.vue b/apps/web-ele/src/views/system/dept/index.vue
index 0d3e39c87..04a4493c3 100644
--- a/apps/web-ele/src/views/system/dept/index.vue
+++ b/apps/web-ele/src/views/system/dept/index.vue
@@ -181,6 +181,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
               auth: ['system:dept:delete'],
               disabled: row.children && row.children.length > 0,
               popConfirm: {
+                disabled: row.children && row.children.length > 0,
                 title: $t('ui.actionMessage.deleteConfirm', [row.name]),
                 confirm: handleDelete.bind(null, row),
               },
diff --git a/apps/web-ele/src/views/system/dict/data.ts b/apps/web-ele/src/views/system/dict/data.ts
index a8fe7c683..ccbf836ca 100644
--- a/apps/web-ele/src/views/system/dict/data.ts
+++ b/apps/web-ele/src/views/system/dict/data.ts
@@ -325,11 +325,13 @@ export function useDataGridColumns(): VxeTableGridOptions['columns'] {
       field: 'colorType',
       title: '颜色类型',
       minWidth: 120,
+      slots: { default: 'colorType' },
     },
     {
       field: 'cssClass',
       title: 'CSS Class',
       minWidth: 120,
+      slots: { default: 'cssClass' },
     },
     {
       title: '创建时间',
diff --git a/apps/web-ele/src/views/system/dict/modules/data-grid.vue b/apps/web-ele/src/views/system/dict/modules/data-grid.vue
index 54053c386..501137288 100644
--- a/apps/web-ele/src/views/system/dict/modules/data-grid.vue
+++ b/apps/web-ele/src/views/system/dict/modules/data-grid.vue
@@ -7,7 +7,7 @@ import { ref, watch } from 'vue';
 import { confirm, useVbenModal } from '@vben/common-ui';
 import { downloadFileFromBlobPart, isEmpty } from '@vben/utils';
 
-import { ElLoading, ElMessage } from 'element-plus';
+import { ElLoading, ElMessage, ElTag } from 'element-plus';
 
 import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
 import {
@@ -172,6 +172,12 @@ watch(
           ]"
         />
       </template>
+      <template #colorType="{ row }">
+        <ElTag :color="row.colorType">{{ row.colorType }}</ElTag>
+      </template>
+      <template #cssClass="{ row }">
+        <ElTag :color="row.cssClass">{{ row.cssClass }}</ElTag>
+      </template>
       <template #actions="{ row }">
         <TableAction
           :actions="[
diff --git a/apps/web-ele/src/views/system/menu/data.ts b/apps/web-ele/src/views/system/menu/data.ts
index 67c0ce56a..9300d1695 100644
--- a/apps/web-ele/src/views/system/menu/data.ts
+++ b/apps/web-ele/src/views/system/menu/data.ts
@@ -174,7 +174,7 @@ export function useFormSchema(): VbenFormSchema[] {
             };
           };
           const results = queryString
-            ? options.filter(() => createFilter(queryString))
+            ? options.filter(createFilter(queryString))
             : options;
           cb(results);
         },
diff --git a/apps/web-ele/src/views/system/user/components/select-modal.vue b/apps/web-ele/src/views/system/user/components/select-modal.vue
index e2315f0a8..5e1c378dd 100644
--- a/apps/web-ele/src/views/system/user/components/select-modal.vue
+++ b/apps/web-ele/src/views/system/user/components/select-modal.vue
@@ -2,7 +2,7 @@
 import type { SystemDeptApi } from '#/api/system/dept';
 import type { SystemUserApi } from '#/api/system/user';
 
-import { computed, ref } from 'vue';
+import { computed, ref, watch } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
 import { handleTree } from '@vben/utils';
@@ -65,6 +65,7 @@ const deptSearchKeys = ref('');
 // 用户数据管理
 const userList = ref<SystemUserApi.User[]>([]); // 存储所有已知用户
 const selectedUserIds = ref<number[]>([]);
+const transferRef = ref<any>();
 
 const [Modal, modalApi] = useVbenModal({
   onCancel: handleCancel,
@@ -272,12 +273,24 @@ async function handleLeftPaginationChange(page: number) {
   await loadUserData(page, leftListState.value.pagination.pageSize);
 }
 
+/** 处理左侧每页条数变化 */
+async function handleLeftPageSizeChange(pageSize: number) {
+  await loadUserData(1, pageSize);
+}
+
 /** 处理右侧分页变化 */
 function handleRightPaginationChange(page: number) {
   rightListState.value.pagination.current = page;
   updateRightListData();
 }
 
+/** 处理右侧每页条数变化 */
+function handleRightPageSizeChange(pageSize: number) {
+  rightListState.value.pagination.current = 1;
+  rightListState.value.pagination.pageSize = pageSize;
+  updateRightListData();
+}
+
 /** 处理用户选择变化 */
 function handleUserChange(
   value: (number | string)[],
@@ -290,6 +303,41 @@ function handleUserChange(
   updateRightListData();
 }
 
+async function handleLeftUserSearch(query: string) {
+  leftListState.value.searchValue = query;
+  leftListState.value.pagination.current = 1;
+  await loadUserData(1, leftListState.value.pagination.pageSize);
+}
+
+function handleRightUserSearch(query: string) {
+  rightListState.value.searchValue = query;
+  rightListState.value.pagination.current = 1;
+  updateRightListData();
+}
+
+function getTransferPanelQuery(panel: any) {
+  const panelInstance = panel?.value ?? panel;
+  return panelInstance?.query?.value ?? panelInstance?.query ?? '';
+}
+
+watch(
+  () => getTransferPanelQuery(transferRef.value?.leftPanel),
+  (query) => {
+    if (query !== leftListState.value.searchValue) {
+      void handleLeftUserSearch(query);
+    }
+  },
+);
+
+watch(
+  () => getTransferPanelQuery(transferRef.value?.rightPanel),
+  (query) => {
+    if (query !== rightListState.value.searchValue) {
+      handleRightUserSearch(query);
+    }
+  },
+);
+
 /** 重置数据 */
 function resetData() {
   userList.value = [];
@@ -430,6 +478,7 @@ function processDeptNode(node: any): DeptTreeNode {
       </ElCol>
       <ElCol :span="18">
         <ElTransfer
+          ref="transferRef"
           v-model="selectedUserIds"
           :data="transferDataSource"
           :titles="['未选', '已选']"
@@ -450,6 +499,7 @@ function processDeptNode(node: any): DeptTreeNode {
             layout="total, sizes, prev, pager, next"
             small
             @current-change="handleLeftPaginationChange"
+            @size-change="handleLeftPageSizeChange"
           />
           <ElPagination
             v-model:current-page="rightListState.pagination.current"
@@ -459,6 +509,7 @@ function processDeptNode(node: any): DeptTreeNode {
             layout="total, sizes, prev, pager, next"
             small
             @current-change="handleRightPaginationChange"
+            @size-change="handleRightPageSizeChange"
           />
         </div>
       </ElCol>
diff --git a/apps/web-ele/src/views/wms/order/check/index.vue b/apps/web-ele/src/views/wms/order/check/index.vue
index 0c80d00a0..b3d950dd6 100644
--- a/apps/web-ele/src/views/wms/order/check/index.vue
+++ b/apps/web-ele/src/views/wms/order/check/index.vue
@@ -68,7 +68,7 @@ const [DetailModal, detailModalApi] = useVbenModal({
 function clearDetailMap() {
   for (const id of Object.keys(detailMap)) {
     const key = Number(id);
-    delete detailMap.key;
+    delete detailMap[key];
   }
 }
 
@@ -107,8 +107,11 @@ async function handleExpandChange(
     return;
   }
   const key = row.id;
-  delete detailMap.key;
-  detailMap[row.id!] = await getCheckOrderDetailListByOrderId(row.id!);
+  if (key == null) {
+    return;
+  }
+  delete detailMap[key];
+  detailMap[key] = await getCheckOrderDetailListByOrderId(key);
 }
 
 /** 判断盘库单是否可修改 */
diff --git a/apps/web-ele/src/views/wms/order/movement/index.vue b/apps/web-ele/src/views/wms/order/movement/index.vue
index b4840eb24..75211d5ea 100644
--- a/apps/web-ele/src/views/wms/order/movement/index.vue
+++ b/apps/web-ele/src/views/wms/order/movement/index.vue
@@ -61,7 +61,7 @@ const [DetailModal, detailModalApi] = useVbenModal({
 function clearDetailMap() {
   for (const id of Object.keys(detailMap)) {
     const key = Number(id);
-    delete detailMap.key;
+    delete detailMap[key];
   }
 }
 
@@ -107,8 +107,11 @@ async function handleExpandChange(
     return;
   }
   const key = row.id;
-  delete detailMap.key;
-  detailMap[row.id!] = await getMovementOrderDetailListByOrderId(row.id!);
+  if (key == null) {
+    return;
+  }
+  delete detailMap[key];
+  detailMap[key] = await getMovementOrderDetailListByOrderId(key);
 }
 
 /** 判断移库单是否可修改 */
diff --git a/apps/web-ele/src/views/wms/order/receipt/index.vue b/apps/web-ele/src/views/wms/order/receipt/index.vue
index d5bf59fca..6045de050 100644
--- a/apps/web-ele/src/views/wms/order/receipt/index.vue
+++ b/apps/web-ele/src/views/wms/order/receipt/index.vue
@@ -61,7 +61,7 @@ const [DetailModal, detailModalApi] = useVbenModal({
 function clearDetailMap() {
   for (const id of Object.keys(detailMap)) {
     const key = Number(id);
-    delete detailMap.key;
+    delete detailMap[key];
   }
 }
 
@@ -107,8 +107,11 @@ async function handleExpandChange(
     return;
   }
   const key = row.id;
-  delete detailMap.key;
-  detailMap[row.id!] = await getReceiptOrderDetailListByOrderId(row.id!);
+  if (key == null) {
+    return;
+  }
+  delete detailMap[key];
+  detailMap[key] = await getReceiptOrderDetailListByOrderId(key);
 }
 
 /** 判断入库单是否可修改 */
diff --git a/apps/web-ele/src/views/wms/order/shipment/index.vue b/apps/web-ele/src/views/wms/order/shipment/index.vue
index dd13a12c4..fd9e63ab3 100644
--- a/apps/web-ele/src/views/wms/order/shipment/index.vue
+++ b/apps/web-ele/src/views/wms/order/shipment/index.vue
@@ -61,7 +61,7 @@ const [DetailModal, detailModalApi] = useVbenModal({
 function clearDetailMap() {
   for (const id of Object.keys(detailMap)) {
     const key = Number(id);
-    delete detailMap.key;
+    delete detailMap[key];
   }
 }
 
@@ -107,8 +107,11 @@ async function handleExpandChange(
     return;
   }
   const key = row.id;
-  delete detailMap.key;
-  detailMap[row.id!] = await getShipmentOrderDetailListByOrderId(row.id!);
+  if (key == null) {
+    return;
+  }
+  delete detailMap[key];
+  detailMap[key] = await getShipmentOrderDetailListByOrderId(key);
 }
 
 /** 判断出库单是否可修改 */
diff --git a/packages/@core/base/shared/src/utils/download.ts b/packages/@core/base/shared/src/utils/download.ts
index 2f45f6ccf..06de28e7f 100644
--- a/packages/@core/base/shared/src/utils/download.ts
+++ b/packages/@core/base/shared/src/utils/download.ts
@@ -141,14 +141,21 @@ export function downloadFileFromBlobPart({
 export function dataURLtoBlob(base64Buf: string): Blob {
   const arr = base64Buf.split(',');
   const typeItem = arr[0];
+  const dataItem = arr[1];
+  if (!typeItem || !dataItem) {
+    throw new Error('无效的 base64 数据');
+  }
 
-  const mime = typeItem!.match(/:(.*?);/)![1];
+  const mime = typeItem.match(/:(.*?);/)?.[1];
+  if (!mime) {
+    throw new Error('无法解析 base64 类型信息');
+  }
 
-  const bstr = window.atob(arr[1]!);
+  const bstr = window.atob(dataItem);
   let n = bstr.length;
   const u8arr = new Uint8Array(n);
   while (n--) {
-    u8arr[n] = bstr.codePointAt(n)!;
+    u8arr[n] = bstr.codePointAt(n) ?? 0;
   }
   return new Blob([u8arr], { type: mime });
 }
@@ -222,7 +229,7 @@ export function base64ToFile(base64: string, fileName: string): File {
     // 优化的 Uint8Array 填充逻辑
     for (let i = 0; i < n; i++) {
       // 使用 charCodeAt() 获取字符对应的字节值（Base64 解码后的字符串是字节级别的）
-      u8arr[i] = bstr.codePointAt(i);
+      u8arr[i] = bstr.codePointAt(i) ?? 0;
     }
 
     // 返回 File 文件对象