diff --git a/apps/web-antd/package.json b/apps/web-antd/package.json
index 904f69a77..a3ae11913 100644
--- a/apps/web-antd/package.json
+++ b/apps/web-antd/package.json
@@ -60,6 +60,7 @@
     "pinia": "catalog:",
     "steady-xml": "catalog:",
     "tinymce": "catalog:",
+    "tyme4ts": "catalog:",
     "video.js": "catalog:",
     "vue": "catalog:",
     "vue-dompurify-html": "catalog:",
diff --git a/apps/web-antd/src/api/mes/dv/checkplan/machinery/index.ts b/apps/web-antd/src/api/mes/dv/checkplan/machinery/index.ts
index 7e4d517c7..240533975 100644
--- a/apps/web-antd/src/api/mes/dv/checkplan/machinery/index.ts
+++ b/apps/web-antd/src/api/mes/dv/checkplan/machinery/index.ts
@@ -16,7 +16,9 @@ export namespace MesDvCheckPlanMachineryApi {
 
 /** 查询指定方案的设备列表 */
 export function getCheckPlanMachineryListByPlan(planId: number) {
-  return requestClient.get<MesDvCheckPlanMachineryApi.CheckPlanMachinery[]>(`/mes/dv/check-plan-machinery/list-by-plan?planId=${planId}`);
+  return requestClient.get<MesDvCheckPlanMachineryApi.CheckPlanMachinery[]>(
+    `/mes/dv/check-plan-machinery/list-by-plan?planId=${planId}`,
+  );
 }
 
 /** 新增方案设备关联 */
diff --git a/apps/web-antd/src/api/mes/md/autocode/rule/index.ts b/apps/web-antd/src/api/mes/md/autocode/rule/index.ts
index be4d81f2f..7a2950360 100644
--- a/apps/web-antd/src/api/mes/md/autocode/rule/index.ts
+++ b/apps/web-antd/src/api/mes/md/autocode/rule/index.ts
@@ -54,7 +54,5 @@ export function deleteAutoCodeRule(id: number) {
 
 /** 导出编码规则 */
 export function exportAutoCodeRule(params: PageParam) {
-  return requestClient.download('/mes/md/auto-code-rule/export-excel', {
-    params,
-  });
+  return requestClient.download('/mes/md/auto-code-rule/export-excel', { params });
 }
diff --git a/apps/web-antd/src/api/mes/md/item/index.ts b/apps/web-antd/src/api/mes/md/item/index.ts
index f2a23c0e6..9d3b107f8 100644
--- a/apps/web-antd/src/api/mes/md/item/index.ts
+++ b/apps/web-antd/src/api/mes/md/item/index.ts
@@ -34,9 +34,7 @@ export namespace MesMdItemApi {
 
 /** 查询物料产品分页 */
 export function getItemPage(params: PageParam) {
-  return requestClient.get<PageResult<MesMdItemApi.Item>>('/mes/md/item/page', {
-    params,
-  });
+  return requestClient.get<PageResult<MesMdItemApi.Item>>('/mes/md/item/page', { params });
 }
 
 /** 查询物料产品详情 */
diff --git a/apps/web-antd/src/views/iot/device/device/detail/index.vue b/apps/web-antd/src/views/iot/device/device/detail/index.vue
index 26457759e..4d7c29889 100644
--- a/apps/web-antd/src/views/iot/device/device/detail/index.vue
+++ b/apps/web-antd/src/views/iot/device/device/detail/index.vue
@@ -97,7 +97,7 @@ onMounted(async () => {
     <Tabs v-model:active-key="activeTab" class="mt-4">
       <Tabs.TabPane key="info" tab="设备信息">
         <DeviceDetailsInfo
-          v-if="activeTab === 'info'"
+          v-if="activeTab === 'info' && device.id"
           :device="device"
           :product="product"
         />
@@ -127,7 +127,7 @@ onMounted(async () => {
       </Tabs.TabPane>
       <Tabs.TabPane key="simulator" tab="模拟设备">
         <DeviceDetailsSimulator
-          v-if="activeTab === 'simulator'"
+          v-if="activeTab === 'simulator' && device.id"
           :device="device"
           :product="product"
           :thing-model-list="thingModelList"
@@ -135,7 +135,7 @@ onMounted(async () => {
       </Tabs.TabPane>
       <Tabs.TabPane key="config" tab="设备配置">
         <DeviceDetailConfig
-          v-if="activeTab === 'config'"
+          v-if="activeTab === 'config' && device.id"
           :device="device"
           @success="() => getDeviceData(id)"
         />
@@ -151,7 +151,7 @@ onMounted(async () => {
         tab="Modbus 配置"
       >
         <DeviceModbusConfig
-          v-if="activeTab === 'modbus'"
+          v-if="activeTab === 'modbus' && device.id"
           :device="device"
           :product="product"
           :thing-model-list="thingModelList"
diff --git a/apps/web-antd/src/views/iot/device/device/detail/modules/thing-model-property-history.vue b/apps/web-antd/src/views/iot/device/device/detail/modules/thing-model-property-history.vue
index 73fc51173..bb2d59819 100644
--- a/apps/web-antd/src/views/iot/device/device/detail/modules/thing-model-property-history.vue
+++ b/apps/web-antd/src/views/iot/device/device/detail/modules/thing-model-property-history.vue
@@ -33,7 +33,7 @@ defineProps<{ deviceId: number }>();
 const dialogVisible = ref(false); // 弹窗的是否展示
 const loading = ref(false);
 const viewMode = ref<'chart' | 'list'>('chart'); // 视图模式状态
-const list = ref<IotDeviceApi.DevicePropertyDetail[]>([]); // 列表的数据
+const list = ref<Array<IotDeviceApi.DeviceProperty & { _rowKey: string }>>([]); // 列表的数据
 const total = ref(0); // 总数据量
 const thingModelDataType = ref<string>(''); // 物模型数据类型
 const propertyIdentifier = ref<string>(''); // 属性标识符
@@ -151,9 +151,11 @@ const paginationConfig = computed(() => ({
 async function getList() {
   loading.value = true;
   try {
-    // 后端直接返回数组
     const data = await getHistoryDevicePropertyList(queryParams);
-    list.value = (data || []) as IotDeviceApi.DevicePropertyDetail[];
+    list.value = (data || []).map((item, idx) => ({
+      ...item,
+      _rowKey: `${item.updateTime ?? ''}-${idx}`, // 后端直接返回数组，仅含 value/updateTime，给每行补 _rowKey 保证唯一
+    }));
     total.value = list.value.length;
 
     // 如果是图表模式且支持图表展示，等待渲染图表
@@ -438,7 +440,7 @@ defineExpose({ open }); // 提供 open 方法，用于打开弹窗
             :data-source="list"
             :pagination="paginationConfig"
             :scroll="{ y: 500 }"
-            row-key="updateTime"
+            row-key="_rowKey"
             size="small"
           >
             <template #bodyCell="{ column, record }">
diff --git a/apps/web-antd/src/views/iot/device/device/modules/import-form.vue b/apps/web-antd/src/views/iot/device/device/modules/import-form.vue
index 7bce20327..3d844abcf 100644
--- a/apps/web-antd/src/views/iot/device/device/modules/import-form.vue
+++ b/apps/web-antd/src/views/iot/device/device/modules/import-form.vue
@@ -75,6 +75,11 @@ const [Modal, modalApi] = useVbenModal({
 
 /** 上传前 */
 function beforeUpload(file: FileType) {
+  const fileName = file.name?.toLowerCase() ?? '';
+  if (!fileName.endsWith('.xls') && !fileName.endsWith('.xlsx')) {
+    message.error('只能上传 Excel 文件（.xls / .xlsx）');
+    return Upload.LIST_IGNORE;
+  }
   formApi.setFieldValue('file', file);
   return false;
 }
diff --git a/apps/web-antd/src/views/iot/device/group/index.vue b/apps/web-antd/src/views/iot/device/group/index.vue
index 5815ac515..095203830 100644
--- a/apps/web-antd/src/views/iot/device/group/index.vue
+++ b/apps/web-antd/src/views/iot/device/group/index.vue
@@ -35,6 +35,10 @@ function handleEdit(row: IotDeviceGroupApi.DeviceGroup) {
 
 /** 删除设备分组 */
 async function handleDelete(row: IotDeviceGroupApi.DeviceGroup) {
+  if (row.deviceCount && row.deviceCount > 0) {
+    message.warning(`分组「${row.name}」下存在 ${row.deviceCount} 台设备，无法删除`);
+    return;
+  }
   const hideLoading = message.loading({
     content: $t('ui.actionMessage.deleting', [row.name]),
     duration: 0,
diff --git a/apps/web-antd/src/views/iot/product/product/modules/card-view.vue b/apps/web-antd/src/views/iot/product/product/modules/card-view.vue
index 189f4bcd9..2f3cf796f 100644
--- a/apps/web-antd/src/views/iot/product/product/modules/card-view.vue
+++ b/apps/web-antd/src/views/iot/product/product/modules/card-view.vue
@@ -4,6 +4,7 @@ import { onMounted, ref } from 'vue';
 import { useAccess } from '@vben/access';
 import { DICT_TYPE, ProductStatusEnum } from '@vben/constants';
 import { IconifyIcon } from '@vben/icons';
+import { isHttpUrl } from '@vben/utils';
 
 import {
   Button,
@@ -117,7 +118,14 @@ onMounted(() => {
               <div
                 class="flex size-9 shrink-0 items-center justify-center rounded-lg bg-gradient-to-br from-[#40a9ff] to-[#1890ff] text-white"
               >
+                <img
+                  v-if="isHttpUrl(item.icon)"
+                  :src="item.icon"
+                  alt=""
+                  class="size-6 object-contain"
+                />
                 <IconifyIcon
+                  v-else
                   :icon="item.icon || 'lucide:box'"
                   class="text-xl"
                 />
diff --git a/apps/web-antd/src/views/iot/rule/data/sink/config/components/key-value-editor.vue b/apps/web-antd/src/views/iot/rule/data/sink/config/components/key-value-editor.vue
index d8d7cdab7..e929aa577 100644
--- a/apps/web-antd/src/views/iot/rule/data/sink/config/components/key-value-editor.vue
+++ b/apps/web-antd/src/views/iot/rule/data/sink/config/components/key-value-editor.vue
@@ -16,15 +16,18 @@ const props = defineProps<{
 const emit = defineEmits(['update:modelValue']);
 
 interface KeyValueItem {
+  _uid: number;
   key: string;
   value: string;
 }
 
+let uidCounter = 0;
 const items = ref<KeyValueItem[]>([]); // 内部 key-value 项列表
 
 /** 添加项目 */
 function addItem() {
-  items.value.push({ key: '', value: '' });
+  uidCounter += 1;
+  items.value.push({ _uid: uidCounter, key: '', value: '' });
   updateModelValue();
 }
 
@@ -54,16 +57,16 @@ watch(
     if (isEmpty(val) || !isEmpty(items.value)) {
       return;
     }
-    items.value = Object.entries(props.modelValue).map(([key, value]) => ({
-      key,
-      value,
-    }));
+    items.value = Object.entries(props.modelValue).map(([key, value]) => {
+      uidCounter += 1;
+      return { _uid: uidCounter, key, value };
+    });
   },
 );
 </script>
 
 <template>
-  <div v-for="(item, index) in items" :key="index" class="mb-2 flex w-full">
+  <div v-for="(item, index) in items" :key="item._uid" class="mb-2 flex w-full">
     <Input v-model:value="item.key" class="mr-2" placeholder="键" />
     <Input v-model:value="item.value" placeholder="值" />
     <Button class="ml-2" type="link" danger @click="removeItem(index)">
diff --git a/apps/web-antd/src/views/iot/rule/data/sink/config/database-config-form.vue b/apps/web-antd/src/views/iot/rule/data/sink/config/database-config-form.vue
index 5a20739b4..93c854f07 100644
--- a/apps/web-antd/src/views/iot/rule/data/sink/config/database-config-form.vue
+++ b/apps/web-antd/src/views/iot/rule/data/sink/config/database-config-form.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { onMounted, ref } from 'vue';
+import { onBeforeUnmount, onMounted, ref } from 'vue';
 
 import { IconifyIcon } from '@vben/icons';
 import { isEmpty } from '@vben/utils';
@@ -30,14 +30,28 @@ const config = useVModel(props, 'modelValue', emit);
 const showSqlTip = ref(false);
 const copied = ref(false);
 const { copy } = useClipboard();
+let copyResetTimer: null | ReturnType<typeof setTimeout> = null;
 
 async function handleCopySql() {
   await copy(TABLE_SQL);
   copied.value = true;
   message.success('建表 SQL 已复制到剪贴板');
-  setTimeout(() => (copied.value = false), 2000);
+  if (copyResetTimer) {
+    clearTimeout(copyResetTimer);
+  }
+  copyResetTimer = setTimeout(() => {
+    copied.value = false;
+    copyResetTimer = null;
+  }, 2000);
 }
 
+onBeforeUnmount(() => {
+  if (copyResetTimer) {
+    clearTimeout(copyResetTimer);
+    copyResetTimer = null;
+  }
+});
+
 onMounted(() => {
   if (!isEmpty(config.value)) {
     return;
diff --git a/apps/web-antd/src/views/iot/rule/scene/form/configs/main-condition-inner-config.vue b/apps/web-antd/src/views/iot/rule/scene/form/configs/main-condition-inner-config.vue
index f1a63c0e3..4a8fd533f 100644
--- a/apps/web-antd/src/views/iot/rule/scene/form/configs/main-condition-inner-config.vue
+++ b/apps/web-antd/src/views/iot/rule/scene/form/configs/main-condition-inner-config.vue
@@ -124,15 +124,24 @@ function handleTriggerTypeChange(type: number) {
 
 /** 处理产品变化事件 */
 function handleProductChange() {
-  // 产品变化时清空设备和属性
-  condition.value.deviceId = undefined;
-  condition.value.identifier = '';
+  const trigger = condition.value;
+  trigger.deviceId = undefined;
+  trigger.identifier = '';
+  trigger.operator = undefined;
+  // 主条件比较值字段是 Trigger.value（不是 TriggerCondition.param）
+  trigger.value = '';
+  propertyType.value = '';
+  propertyConfig.value = null;
 }
 
 /** 处理设备变化事件 */
 function handleDeviceChange() {
-  // 设备变化时清空属性
-  condition.value.identifier = '';
+  const trigger = condition.value;
+  trigger.identifier = '';
+  trigger.operator = undefined;
+  trigger.value = '';
+  propertyType.value = '';
+  propertyConfig.value = null;
 }
 
 /**
diff --git a/apps/web-antd/src/views/iot/rule/scene/form/selectors/device-selector.vue b/apps/web-antd/src/views/iot/rule/scene/form/selectors/device-selector.vue
index ceefc0ab0..acd2d6298 100644
--- a/apps/web-antd/src/views/iot/rule/scene/form/selectors/device-selector.vue
+++ b/apps/web-antd/src/views/iot/rule/scene/form/selectors/device-selector.vue
@@ -55,16 +55,26 @@ async function getDeviceList() {
 // 监听产品变化
 watch(
   () => props.productId,
-  (newProductId) => {
-    if (newProductId) {
-      getDeviceList();
-    } else {
+  async (newProductId, oldProductId) => {
+    if (!newProductId) {
       deviceList.value = [];
-      // 清空当前选择的设备
-      if (props.modelValue) {
+      if (props.modelValue !== undefined && props.modelValue !== null) {
         emit('update:modelValue', undefined);
         emit('change', undefined);
       }
+      return;
+    }
+    await getDeviceList();
+    // 切换到新 productId 时，旧 deviceId 不在新列表里则清空
+    if (
+      oldProductId !== undefined &&
+      oldProductId !== newProductId &&
+      props.modelValue !== undefined &&
+      props.modelValue !== null &&
+      !deviceList.value.some((d: any) => d.id === props.modelValue)
+    ) {
+      emit('update:modelValue', undefined);
+      emit('change', undefined);
     }
   },
   { immediate: true },
diff --git a/apps/web-antd/src/views/iot/rule/scene/index.vue b/apps/web-antd/src/views/iot/rule/scene/index.vue
index 3260bea5e..8245b2090 100644
--- a/apps/web-antd/src/views/iot/rule/scene/index.vue
+++ b/apps/web-antd/src/views/iot/rule/scene/index.vue
@@ -182,10 +182,10 @@ function getNextExecutionTime(row: RuleSceneApi.SceneRule): Date | null {
     : null;
 }
 
-/** 基于当前页列表刷新统计数据 */
-function updateStatistics(rows: RuleSceneApi.SceneRule[]) {
+/** 刷新规则统计卡片数据 */
+function updateStatistics(rows: RuleSceneApi.SceneRule[], total?: number) {
   statistics.value = {
-    total: rows.length,
+    total: total ?? rows.length,
     enabled: rows.filter((item) => item.status === CommonStatusEnum.ENABLE)
       .length,
     disabled: rows.filter((item) => item.status === CommonStatusEnum.DISABLE)
@@ -210,7 +210,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
             pageSize: page.pageSize,
             ...formValues,
           });
-          updateStatistics(result.list || []);
+          updateStatistics(result.list || [], result.total);
           return result;
         },
       },
diff --git a/apps/web-antd/src/views/iot/thingmodel/modules/data-specs/array.vue b/apps/web-antd/src/views/iot/thingmodel/modules/data-specs/array.vue
index 1e88342b9..1c411a109 100644
--- a/apps/web-antd/src/views/iot/thingmodel/modules/data-specs/array.vue
+++ b/apps/web-antd/src/views/iot/thingmodel/modules/data-specs/array.vue
@@ -29,7 +29,8 @@ const childDataTypeOptions = getDataTypeOptions().filter(
 const dataSpecs = useVModel(props, 'modelValue', emits) as Ref<any>;
 
 /** 元素类型切到 struct 时，初始化 dataSpecsList 占位 */
-function handleChange(val: any) {
+function handleChange(e: any) {
+  const val = e?.target?.value ?? e;
   if (val !== IoTDataSpecsDataTypeEnum.STRUCT) {
     return;
   }
diff --git a/apps/web-antd/src/views/iot/thingmodel/modules/form.vue b/apps/web-antd/src/views/iot/thingmodel/modules/form.vue
index 581946898..4e07657ee 100644
--- a/apps/web-antd/src/views/iot/thingmodel/modules/form.vue
+++ b/apps/web-antd/src/views/iot/thingmodel/modules/form.vue
@@ -231,7 +231,11 @@ function removeDataSpecs(val: any) {
         label="标识符"
         name="identifier"
       >
-        <Input v-model:value="formData.identifier" placeholder="请输入标识符" />
+        <Input
+          v-model:value="formData.identifier"
+          :disabled="formData.id != null"
+          placeholder="请输入标识符"
+        />
       </Form.Item>
       <!-- 属性配置 -->
       <ThingModelProperty
diff --git a/apps/web-antd/src/views/mes/md/client/components/md-client-select-dialog.vue b/apps/web-antd/src/views/mes/md/client/components/md-client-select-dialog.vue
index c90d1cc42..d539892f3 100644
--- a/apps/web-antd/src/views/mes/md/client/components/md-client-select-dialog.vue
+++ b/apps/web-antd/src/views/mes/md/client/components/md-client-select-dialog.vue
@@ -47,13 +47,33 @@ async function waitTableReady(): Promise<void> {
   if (preSelectedIds.value.length === 0) {
     return;
   }
-  if (!multiple.value) {
-    const selected = checked && row ? [row] : [];
-    selectedRows.value = selected;
-    await syncSingleSelection(selected[0]);
-    return;
+  for (let index = 0; index < MAX_TABLE_READY_FRAMES; index += 1) {
+    if (queryFinished.value) {
+      const rows = getTableRows();
+      if (latestQueryRows.value.length === 0 && rows.length === 0) {
+        return;
+      }
+      if (latestQueryRows.value.length > 0 && rows.length > 0) {
+        return;
+      }
+    }
+    await waitNextFrame();
   }
-  selectedRows.value = records;
+}
+
+/** 获取多选记录，包含 VXE reserve 跨页记录 */
+function getMultipleSelectedRows() {
+  const selectedMap = new Map<number, MesMdClientApi.Client>();
+  const records = [
+    ...(gridApi.grid.getCheckboxReserveRecords?.() ?? []),
+    ...(gridApi.grid.getCheckboxRecords?.() ?? []),
+  ] as MesMdClientApi.Client[];
+  records.forEach((row) => {
+    if (row.id != null) {
+      selectedMap.set(row.id, row);
+    }
+  });
+  return [...selectedMap.values()];
 }
 
 /** 处理勾选变化 */
diff --git a/apps/web-ele/package.json b/apps/web-ele/package.json
index d842d8261..93e86be9e 100644
--- a/apps/web-ele/package.json
+++ b/apps/web-ele/package.json
@@ -60,6 +60,7 @@
     "pinia": "catalog:",
     "steady-xml": "catalog:",
     "tinymce": "catalog:",
+    "tyme4ts": "catalog:",
     "video.js": "catalog:",
     "vue": "catalog:",
     "vue-dompurify-html": "catalog:",
diff --git a/apps/web-ele/src/api/mes/dv/checkplan/machinery/index.ts b/apps/web-ele/src/api/mes/dv/checkplan/machinery/index.ts
index 7e4d517c7..240533975 100644
--- a/apps/web-ele/src/api/mes/dv/checkplan/machinery/index.ts
+++ b/apps/web-ele/src/api/mes/dv/checkplan/machinery/index.ts
@@ -16,7 +16,9 @@ export namespace MesDvCheckPlanMachineryApi {
 
 /** 查询指定方案的设备列表 */
 export function getCheckPlanMachineryListByPlan(planId: number) {
-  return requestClient.get<MesDvCheckPlanMachineryApi.CheckPlanMachinery[]>(`/mes/dv/check-plan-machinery/list-by-plan?planId=${planId}`);
+  return requestClient.get<MesDvCheckPlanMachineryApi.CheckPlanMachinery[]>(
+    `/mes/dv/check-plan-machinery/list-by-plan?planId=${planId}`,
+  );
 }
 
 /** 新增方案设备关联 */
diff --git a/apps/web-ele/src/api/mes/dv/checkplan/subject/index.ts b/apps/web-ele/src/api/mes/dv/checkplan/subject/index.ts
index 827228f50..1656dc361 100644
--- a/apps/web-ele/src/api/mes/dv/checkplan/subject/index.ts
+++ b/apps/web-ele/src/api/mes/dv/checkplan/subject/index.ts
@@ -17,7 +17,9 @@ export namespace MesDvCheckPlanSubjectApi {
 
 /** 查询指定方案的项目列表 */
 export function getCheckPlanSubjectListByPlan(planId: number) {
-  return requestClient.get<MesDvCheckPlanSubjectApi.CheckPlanSubject[]>(`/mes/dv/check-plan-subject/list-by-plan?planId=${planId}`);
+  return requestClient.get<MesDvCheckPlanSubjectApi.CheckPlanSubject[]>(
+    `/mes/dv/check-plan-subject/list-by-plan?planId=${planId}`,
+  );
 }
 
 /** 新增方案项目关联 */
diff --git a/apps/web-ele/src/api/mes/md/autocode/rule/index.ts b/apps/web-ele/src/api/mes/md/autocode/rule/index.ts
index d33e6e0fc..6955e7304 100644
--- a/apps/web-ele/src/api/mes/md/autocode/rule/index.ts
+++ b/apps/web-ele/src/api/mes/md/autocode/rule/index.ts
@@ -51,7 +51,5 @@ export function deleteAutoCodeRule(id: number) {
 
 /** 导出编码规则 */
 export function exportAutoCodeRule(params: PageParam) {
-  return requestClient.download('/mes/md/auto-code-rule/export-excel', {
-    params,
-  });
+  return requestClient.download('/mes/md/auto-code-rule/export-excel', { params });
 }
diff --git a/apps/web-ele/src/api/mes/md/item/index.ts b/apps/web-ele/src/api/mes/md/item/index.ts
index f2a23c0e6..9d3b107f8 100644
--- a/apps/web-ele/src/api/mes/md/item/index.ts
+++ b/apps/web-ele/src/api/mes/md/item/index.ts
@@ -34,9 +34,7 @@ export namespace MesMdItemApi {
 
 /** 查询物料产品分页 */
 export function getItemPage(params: PageParam) {
-  return requestClient.get<PageResult<MesMdItemApi.Item>>('/mes/md/item/page', {
-    params,
-  });
+  return requestClient.get<PageResult<MesMdItemApi.Item>>('/mes/md/item/page', { params });
 }
 
 /** 查询物料产品详情 */
diff --git a/apps/web-ele/src/api/mes/tm/tool/type/index.ts b/apps/web-ele/src/api/mes/tm/tool/type/index.ts
index cced608cc..7ef6b2c59 100644
--- a/apps/web-ele/src/api/mes/tm/tool/type/index.ts
+++ b/apps/web-ele/src/api/mes/tm/tool/type/index.ts
@@ -18,22 +18,35 @@ export namespace MesTmToolTypeApi {
 
 /** 查询工具类型分页 */
 export function getToolTypePage(params: PageParam) {
-  return requestClient.get<PageResult<MesTmToolTypeApi.ToolType>>(
-    '/mes/tm/tool-type/page',
-    { params },
-  );
+  return requestClient.get<PageResult<MesTmToolTypeApi.ToolType>>('/mes/tm/tool-type/page', { params });
 }
 
 /** 查询工具类型精简列表 */
 export function getToolTypeSimpleList() {
-  return requestClient.get<MesTmToolTypeApi.ToolType[]>(
-    '/mes/tm/tool-type/simple-list',
-  );
+  return requestClient.get<MesTmToolTypeApi.ToolType[]>('/mes/tm/tool-type/simple-list');
 }
 
 /** 查询工具类型详情 */
 export function getToolType(id: number) {
-  return requestClient.get<MesTmToolTypeApi.ToolType>(
-    `/mes/tm/tool-type/get?id=${id}`,
-  );
+  return requestClient.get<MesTmToolTypeApi.ToolType>(`/mes/tm/tool-type/get?id=${id}`);
+}
+
+/** 新增工具类型 */
+export function createToolType(data: MesTmToolTypeApi.ToolType) {
+  return requestClient.post('/mes/tm/tool-type/create', data);
+}
+
+/** 修改工具类型 */
+export function updateToolType(data: MesTmToolTypeApi.ToolType) {
+  return requestClient.put('/mes/tm/tool-type/update', data);
+}
+
+/** 删除工具类型 */
+export function deleteToolType(id: number) {
+  return requestClient.delete(`/mes/tm/tool-type/delete?id=${id}`);
+}
+
+/** 导出工具类型 */
+export function exportToolType(params: any) {
+  return requestClient.download('/mes/tm/tool-type/export-excel', { params });
 }
diff --git a/apps/web-ele/src/views/iot/device/device/detail/index.vue b/apps/web-ele/src/views/iot/device/device/detail/index.vue
index 7173de87b..9718f0097 100644
--- a/apps/web-ele/src/views/iot/device/device/detail/index.vue
+++ b/apps/web-ele/src/views/iot/device/device/detail/index.vue
@@ -97,7 +97,7 @@ onMounted(async () => {
     <ElTabs v-model="activeTab" class="mt-4">
       <ElTabPane name="info" label="设备信息">
         <DeviceDetailsInfo
-          v-if="activeTab === 'info'"
+          v-if="activeTab === 'info' && device.id"
           :device="device"
           :product="product"
         />
@@ -127,7 +127,7 @@ onMounted(async () => {
       </ElTabPane>
       <ElTabPane name="simulator" label="模拟设备">
         <DeviceDetailsSimulator
-          v-if="activeTab === 'simulator'"
+          v-if="activeTab === 'simulator' && device.id"
           :device="device"
           :product="product"
           :thing-model-list="thingModelList"
@@ -135,7 +135,7 @@ onMounted(async () => {
       </ElTabPane>
       <ElTabPane name="config" label="设备配置">
         <DeviceDetailConfig
-          v-if="activeTab === 'config'"
+          v-if="activeTab === 'config' && device.id"
           :device="device"
           @success="() => getDeviceData(id)"
         />
@@ -151,7 +151,7 @@ onMounted(async () => {
         label="Modbus 配置"
       >
         <DeviceModbusConfig
-          v-if="activeTab === 'modbus'"
+          v-if="activeTab === 'modbus' && device.id"
           :device="device"
           :product="product"
           :thing-model-list="thingModelList"
diff --git a/apps/web-ele/src/views/iot/device/device/detail/modules/thing-model-property-history.vue b/apps/web-ele/src/views/iot/device/device/detail/modules/thing-model-property-history.vue
index 1a5fedde3..545c5a392 100644
--- a/apps/web-ele/src/views/iot/device/device/detail/modules/thing-model-property-history.vue
+++ b/apps/web-ele/src/views/iot/device/device/detail/modules/thing-model-property-history.vue
@@ -33,7 +33,7 @@ defineProps<{ deviceId: number }>();
 const dialogVisible = ref(false); // 弹窗的是否展示
 const loading = ref(false);
 const viewMode = ref<'chart' | 'list'>('chart'); // 视图模式状态
-const list = ref<IotDeviceApi.DevicePropertyDetail[]>([]); // 列表的数据
+const list = ref<Array<IotDeviceApi.DeviceProperty & { _rowKey: string }>>([]); // 列表的数据
 const total = ref(0); // 总数据量
 const thingModelDataType = ref<string>(''); // 物模型数据类型
 const propertyIdentifier = ref<string>(''); // 属性标识符
@@ -118,9 +118,12 @@ function formatDateRangeWithTime(dates: [string, string]): [string, string] {
 async function getList() {
   loading.value = true;
   try {
-    // 后端直接返回数组
+    // 后端直接返回数组，仅含 value/updateTime，给每行补 _rowKey 保证唯一
     const data = await getHistoryDevicePropertyList(queryParams);
-    list.value = (data || []) as IotDeviceApi.DevicePropertyDetail[];
+    list.value = (data || []).map((item, idx) => ({
+      ...item,
+      _rowKey: `${item.updateTime ?? ''}-${idx}`,
+    }));
     total.value = list.value.length;
 
     // 如果是图表模式且支持图表展示，等待渲染图表
@@ -396,7 +399,7 @@ defineExpose({ open }); // 提供 open 方法，用于打开弹窗
           <ElTable
             :data="list"
             :max-height="500"
-            row-key="updateTime"
+            row-key="_rowKey"
             size="small"
           >
             <ElTableColumn label="序号" width="80" align="center" type="index" />
diff --git a/apps/web-ele/src/views/iot/device/device/modules/import-form.vue b/apps/web-ele/src/views/iot/device/device/modules/import-form.vue
index 82fe188a6..1a472d5a7 100644
--- a/apps/web-ele/src/views/iot/device/device/modules/import-form.vue
+++ b/apps/web-ele/src/views/iot/device/device/modules/import-form.vue
@@ -73,6 +73,11 @@ const [Modal, modalApi] = useVbenModal({
 
 /** 上传前 */
 function beforeUpload(file: File) {
+  const fileName = file.name?.toLowerCase() ?? '';
+  if (!fileName.endsWith('.xls') && !fileName.endsWith('.xlsx')) {
+    ElMessage.error('只能上传 Excel 文件（.xls / .xlsx）');
+    return false;
+  }
   formApi.setFieldValue('file', file);
   return false;
 }
diff --git a/apps/web-ele/src/views/iot/device/group/index.vue b/apps/web-ele/src/views/iot/device/group/index.vue
index ad64bdad5..60b30663c 100644
--- a/apps/web-ele/src/views/iot/device/group/index.vue
+++ b/apps/web-ele/src/views/iot/device/group/index.vue
@@ -35,6 +35,10 @@ function handleEdit(row: IotDeviceGroupApi.DeviceGroup) {
 
 /** 删除设备分组 */
 async function handleDelete(row: IotDeviceGroupApi.DeviceGroup) {
+  if (row.deviceCount && row.deviceCount > 0) {
+    ElMessage.warning(`分组「${row.name}」下存在 ${row.deviceCount} 台设备，无法删除`);
+    return;
+  }
   const loadingInstance = ElLoading.service({
     text: $t('ui.actionMessage.deleting', [row.name]),
   });
diff --git a/apps/web-ele/src/views/iot/home/modules/device-map-card.vue b/apps/web-ele/src/views/iot/home/modules/device-map-card.vue
index 5e8cec8ae..46bbc5759 100644
--- a/apps/web-ele/src/views/iot/home/modules/device-map-card.vue
+++ b/apps/web-ele/src/views/iot/home/modules/device-map-card.vue
@@ -111,19 +111,20 @@ function initMap() {
       // 信息窗口打开后绑定链接点击事件
       infoWindow.addEventListener('open', () => {
         setTimeout(() => {
-          const link = document.querySelector('.device-link');
-          if (link) {
-            link.addEventListener('click', (e) => {
-              e.preventDefault();
-              const deviceId = (e.target as HTMLElement).dataset.id;
-              if (deviceId) {
-                router.push({
-                  name: 'IoTDeviceDetail',
-                  params: { id: deviceId },
-                });
-              }
-            });
+          const link = document.querySelector('.BMap_bubble_content .device-link');
+          if (!link) {
+            return;
           }
+          link.addEventListener('click', (e) => {
+            e.preventDefault();
+            const deviceId = (e.target as HTMLElement).dataset.id;
+            if (deviceId) {
+              router.push({
+                name: 'IoTDeviceDetail',
+                params: { id: deviceId },
+              });
+            }
+          });
         }, 100);
       });
 
diff --git a/apps/web-ele/src/views/iot/product/product/modules/card-view.vue b/apps/web-ele/src/views/iot/product/product/modules/card-view.vue
index 48e820adc..966e87eee 100644
--- a/apps/web-ele/src/views/iot/product/product/modules/card-view.vue
+++ b/apps/web-ele/src/views/iot/product/product/modules/card-view.vue
@@ -4,6 +4,7 @@ import { onMounted, ref } from 'vue';
 import { useAccess } from '@vben/access';
 import { DICT_TYPE, ProductStatusEnum } from '@vben/constants';
 import { IconifyIcon } from '@vben/icons';
+import { isHttpUrl } from '@vben/utils';
 
 import {
   ElButton,
@@ -111,7 +112,14 @@ onMounted(() => {
               <div
                 class="flex size-9 shrink-0 items-center justify-center rounded-lg bg-gradient-to-br from-[#40a9ff] to-[#1890ff] text-white"
               >
+                <img
+                  v-if="isHttpUrl(item.icon)"
+                  :src="item.icon"
+                  alt=""
+                  class="size-6 object-contain"
+                />
                 <IconifyIcon
+                  v-else
                   :icon="item.icon || 'lucide:box'"
                   class="text-xl"
                 />
diff --git a/apps/web-ele/src/views/iot/rule/data/sink/config/components/key-value-editor.vue b/apps/web-ele/src/views/iot/rule/data/sink/config/components/key-value-editor.vue
index 1982a009b..cc7a51748 100644
--- a/apps/web-ele/src/views/iot/rule/data/sink/config/components/key-value-editor.vue
+++ b/apps/web-ele/src/views/iot/rule/data/sink/config/components/key-value-editor.vue
@@ -16,15 +16,18 @@ const props = defineProps<{
 const emit = defineEmits(['update:modelValue']);
 
 interface KeyValueItem {
+  _uid: number;
   key: string;
   value: string;
 }
 
+let uidCounter = 0;
 const items = ref<KeyValueItem[]>([]); // 内部 key-value 项列表
 
 /** 添加项目 */
 function addItem() {
-  items.value.push({ key: '', value: '' });
+  uidCounter += 1;
+  items.value.push({ _uid: uidCounter, key: '', value: '' });
   updateModelValue();
 }
 
@@ -54,16 +57,16 @@ watch(
     if (isEmpty(val) || !isEmpty(items.value)) {
       return;
     }
-    items.value = Object.entries(props.modelValue).map(([key, value]) => ({
-      key,
-      value,
-    }));
+    items.value = Object.entries(props.modelValue).map(([key, value]) => {
+      uidCounter += 1;
+      return { _uid: uidCounter, key, value };
+    });
   },
 );
 </script>
 
 <template>
-  <div v-for="(item, index) in items" :key="index" class="mb-2 flex w-full">
+  <div v-for="(item, index) in items" :key="item._uid" class="mb-2 flex w-full">
     <ElInput v-model="item.key" class="mr-2" placeholder="键" />
     <ElInput v-model="item.value" placeholder="值" />
     <ElButton class="ml-2" type="danger" link @click="removeItem(index)">
diff --git a/apps/web-ele/src/views/iot/rule/data/sink/config/database-config-form.vue b/apps/web-ele/src/views/iot/rule/data/sink/config/database-config-form.vue
index 4e2e8c4a6..6bd6d9966 100644
--- a/apps/web-ele/src/views/iot/rule/data/sink/config/database-config-form.vue
+++ b/apps/web-ele/src/views/iot/rule/data/sink/config/database-config-form.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { onMounted, ref } from 'vue';
+import { onBeforeUnmount, onMounted, ref } from 'vue';
 
 import { IconifyIcon } from '@vben/icons';
 import { isEmpty } from '@vben/utils';
@@ -30,14 +30,28 @@ const config = useVModel(props, 'modelValue', emit);
 const showSqlTip = ref(false);
 const copied = ref(false);
 const { copy } = useClipboard();
+let copyResetTimer: null | ReturnType<typeof setTimeout> = null;
 
 async function handleCopySql() {
   await copy(TABLE_SQL);
   copied.value = true;
   ElMessage.success('建表 SQL 已复制到剪贴板');
-  setTimeout(() => (copied.value = false), 2000);
+  if (copyResetTimer) {
+    clearTimeout(copyResetTimer);
+  }
+  copyResetTimer = setTimeout(() => {
+    copied.value = false;
+    copyResetTimer = null;
+  }, 2000);
 }
 
+onBeforeUnmount(() => {
+  if (copyResetTimer) {
+    clearTimeout(copyResetTimer);
+    copyResetTimer = null;
+  }
+});
+
 onMounted(() => {
   if (!isEmpty(config.value)) {
     return;
diff --git a/apps/web-ele/src/views/iot/rule/scene/form/configs/main-condition-inner-config.vue b/apps/web-ele/src/views/iot/rule/scene/form/configs/main-condition-inner-config.vue
index 3f0081c75..28e02b04a 100644
--- a/apps/web-ele/src/views/iot/rule/scene/form/configs/main-condition-inner-config.vue
+++ b/apps/web-ele/src/views/iot/rule/scene/form/configs/main-condition-inner-config.vue
@@ -131,15 +131,24 @@ function handleTriggerTypeChange(type: number) {
 
 /** 处理产品变化事件 */
 function handleProductChange() {
-  // 产品变化时清空设备和属性
-  condition.value.deviceId = undefined;
-  condition.value.identifier = '';
+  const trigger = condition.value;
+  trigger.deviceId = undefined;
+  trigger.identifier = '';
+  trigger.operator = undefined;
+  // 主条件比较值字段是 Trigger.value（不是 TriggerCondition.param）
+  trigger.value = '';
+  propertyType.value = '';
+  propertyConfig.value = null;
 }
 
 /** 处理设备变化事件 */
 function handleDeviceChange() {
-  // 设备变化时清空属性
-  condition.value.identifier = '';
+  const trigger = condition.value;
+  trigger.identifier = '';
+  trigger.operator = undefined;
+  trigger.value = '';
+  propertyType.value = '';
+  propertyConfig.value = null;
 }
 
 /**
diff --git a/apps/web-ele/src/views/iot/rule/scene/form/selectors/device-selector.vue b/apps/web-ele/src/views/iot/rule/scene/form/selectors/device-selector.vue
index e7da76d00..9d0088a10 100644
--- a/apps/web-ele/src/views/iot/rule/scene/form/selectors/device-selector.vue
+++ b/apps/web-ele/src/views/iot/rule/scene/form/selectors/device-selector.vue
@@ -60,16 +60,26 @@ async function getDeviceList() {
 // 监听产品变化
 watch(
   () => props.productId,
-  (newProductId) => {
-    if (newProductId) {
-      getDeviceList();
-    } else {
+  async (newProductId, oldProductId) => {
+    if (!newProductId) {
       deviceList.value = [];
-      // 清空当前选择的设备
-      if (props.modelValue) {
+      if (props.modelValue !== undefined && props.modelValue !== null) {
         emit('update:modelValue', undefined);
         emit('change', undefined);
       }
+      return;
+    }
+    await getDeviceList();
+    // 切换到新 productId 时，旧 deviceId 不在新列表里则清空
+    if (
+      oldProductId !== undefined &&
+      oldProductId !== newProductId &&
+      props.modelValue !== undefined &&
+      props.modelValue !== null &&
+      !deviceList.value.some((d: any) => d.id === props.modelValue)
+    ) {
+      emit('update:modelValue', undefined);
+      emit('change', undefined);
     }
   },
   { immediate: true },
diff --git a/apps/web-ele/src/views/iot/rule/scene/index.vue b/apps/web-ele/src/views/iot/rule/scene/index.vue
index d6b85d2f8..bc8bc758b 100644
--- a/apps/web-ele/src/views/iot/rule/scene/index.vue
+++ b/apps/web-ele/src/views/iot/rule/scene/index.vue
@@ -186,10 +186,10 @@ function getNextExecutionTime(row: RuleSceneApi.SceneRule): Date | null {
     : null;
 }
 
-/** 基于当前页列表刷新统计数据 */
-function updateStatistics(rows: RuleSceneApi.SceneRule[]) {
+/** 刷新规则统计卡片数据 */
+function updateStatistics(rows: RuleSceneApi.SceneRule[], total?: number) {
   statistics.value = {
-    total: rows.length,
+    total: total ?? rows.length,
     enabled: rows.filter((item) => item.status === CommonStatusEnum.ENABLE)
       .length,
     disabled: rows.filter((item) => item.status === CommonStatusEnum.DISABLE)
@@ -214,7 +214,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
             pageSize: page.pageSize,
             ...formValues,
           });
-          updateStatistics(result.list || []);
+          updateStatistics(result.list || [], result.total);
           return result;
         },
       },
diff --git a/apps/web-ele/src/views/iot/thingmodel/modules/form.vue b/apps/web-ele/src/views/iot/thingmodel/modules/form.vue
index bc38954a5..02b422edf 100644
--- a/apps/web-ele/src/views/iot/thingmodel/modules/form.vue
+++ b/apps/web-ele/src/views/iot/thingmodel/modules/form.vue
@@ -237,7 +237,11 @@ function removeDataSpecs(val: any) {
         label="标识符"
         prop="identifier"
       >
-        <ElInput v-model="formData.identifier" placeholder="请输入标识符" />
+        <ElInput
+          v-model="formData.identifier"
+          :disabled="formData.id != null"
+          placeholder="请输入标识符"
+        />
       </ElFormItem>
       <!-- 属性配置 -->
       <ThingModelProperty
diff --git a/packages/@core/base/shared/src/utils/date.ts b/packages/@core/base/shared/src/utils/date.ts
index f0426460c..a2d2941fe 100644
--- a/packages/@core/base/shared/src/utils/date.ts
+++ b/packages/@core/base/shared/src/utils/date.ts
@@ -97,3 +97,22 @@ export const setCurrentTimezone = (timezone?: string) => {
 export const getCurrentTimezone = () => {
   return currentTimezone;
 };
+
+/**
+ * 把 antd TimePicker / DatePicker `@update:value` 回传的值统一成字符串。
+ *
+ * antd 在设置了 `value-format` 后实际只会回传字符串，
+ * 但 `@update:value` 的类型仍包含 `Dayjs`，调用方需要做一次类型归一。
+ *
+ * - 空值（null / undefined / '' / 0）返回 ''
+ * - 已经是字符串：原样返回（保持 `value-format` 已格式化的结果）
+ * - 兜底的 Dayjs：调用 `.format()` 转默认 ISO 字符串
+ */
+export function formatDayjs(
+  value: dayjs.Dayjs | null | string | undefined,
+): string {
+  if (!value) {
+    return '';
+  }
+  return typeof value === 'string' ? value : value.format();
+}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 7d4dd8716..bae928de3 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -831,6 +831,9 @@ importers:
       tinymce:
         specifier: 'catalog:'
         version: 7.9.2
+      tyme4ts:
+        specifier: ^1.5.0
+        version: 1.5.0
       video.js:
         specifier: 'catalog:'
         version: 7.21.7
@@ -1083,6 +1086,9 @@ importers:
       tinymce:
         specifier: 'catalog:'
         version: 7.9.2
+      tyme4ts:
+        specifier: ^1.5.0
+        version: 1.5.0
       video.js:
         specifier: 'catalog:'
         version: 7.21.7
@@ -11536,6 +11542,9 @@ packages:
   tw-animate-css@1.4.0:
     resolution: {integrity: sha512-7bziOlRqH0hJx80h/3mbicLW7o8qLsH5+RaLR2t+OHM3D0JlWGODQKQ4cxbK7WlvmUxpcj6Kgu6EKqjrGFe3QQ==}
 
+  tyme4ts@1.5.0:
+    resolution: {integrity: sha512-SqmlNyDtYb3bsnSkjX8lxyMcCt9xBaBkF8xWs/2ORiysWXftEoTGHEi/zxWEJ8s7aANe5veMcLcOuMK6Z+kzbw==}
+
   type-check@0.4.0:
     resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==}
     engines: {node: '>= 0.8.0'}
@@ -22397,6 +22406,8 @@ snapshots:
 
   tw-animate-css@1.4.0: {}
 
+  tyme4ts@1.5.0: {}
+
   type-check@0.4.0:
     dependencies:
       prelude-ls: 1.2.1
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index ad9a84d14..e460307bd 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -194,6 +194,7 @@ catalog:
   tsdown: ^0.21.7
   turbo: ^2.9.6
   tw-animate-css: ^1.4.0
+  tyme4ts: ^1.5.0
   typescript: ^6.0.2
   unplugin-dts: ^1.0.0-beta.6
   unplugin-element-plus: ^0.11.2