From 72c3b1f8440a2d1dad27462916b2cbfed321603c Mon Sep 17 00:00:00 2001
From: chenjiale <cjl601523@gmail.com>
Date: Mon, 1 Dec 2025 20:11:12 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E6=A8=A1=E5=9E=8B?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=8A=9F=E8=83=BD=EF=BC=8C=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E5=8F=82=E6=95=B0=E9=80=89=E6=8B=A9=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/alert/model/models.ts                 |   3 +
 src/views/model/components/PointTransfer.vue  | 163 +++++++++++++++
 .../model/components/pointTransferHelper.ts   |  26 +++
 src/views/model/list/ModelCard.vue            | 143 ++++++++-----
 src/views/model/list/step/Step3.vue           | 192 ++++++------------
 src/views/model/list/step/data.tsx            |  48 +----
 src/views/model/train/index.vue               |  88 ++------
 7 files changed, 372 insertions(+), 291 deletions(-)
 create mode 100644 src/views/model/components/PointTransfer.vue
 create mode 100644 src/views/model/components/pointTransferHelper.ts

diff --git a/src/api/alert/model/models.ts b/src/api/alert/model/models.ts
index 90d1b33..0de2561 100644
--- a/src/api/alert/model/models.ts
+++ b/src/api/alert/model/models.ts
@@ -5,6 +5,7 @@ enum Api {
   MODEL_CARD_LIST = '/alert/model/card/list',
   MODEL_INFO = '/alert/model/info',
   MODEL_SAVE = '/alert/model/',
+  MODEL_DELETE = '/alert/model/',
   MODEL_DATA = '/alert/model/data/',
   CALCULATE_BACK = '/alert/model/data/calculate/',
   OPTIMISTIC = '/alert/optimistic',
@@ -28,6 +29,8 @@ export function modelSaveApi(params?: any) {
   return defHttp.post<number>({ url: Api.MODEL_SAVE, data: params })
 }
 
+export const modelDeleteApi = (id: number | string) => defHttp.delete<boolean>({ url: `${Api.MODEL_DELETE}${id}` })
+
 export function modelDataApi(id: any, params: any) {
   return defHttp.get<any>({ url: Api.MODEL_DATA + id, params })
 }
diff --git a/src/views/model/components/PointTransfer.vue b/src/views/model/components/PointTransfer.vue
new file mode 100644
index 0000000..5e962ce
--- /dev/null
+++ b/src/views/model/components/PointTransfer.vue
@@ -0,0 +1,163 @@
+<script lang="ts" setup>
+import type { PropType } from 'vue'
+import { computed, onMounted, ref, watch } from 'vue'
+import { Transfer } from 'ant-design-vue'
+import type { TransferItem } from 'ant-design-vue'
+import { pointListApi } from '@/api/alert/model/select'
+import { buildPointKeyFromInfo, buildPointTitle, parsePointKey } from './pointTransferHelper'
+
+interface PointTransferItem extends TransferItem {
+  key: string
+  title: string
+}
+
+const props = defineProps({
+  selectedKeys: {
+    type: Array as PropType<string[]>,
+    default: () => [],
+  },
+  listStyle: {
+    type: Object as PropType<Record<string, string>>,
+    default: () => ({
+      width: '500px',
+      height: '450px',
+    }),
+  },
+  titles: {
+    type: Array as PropType<[string, string]>,
+    default: () => ['可选测点', '已选测点'],
+  },
+  showSearch: {
+    type: Boolean,
+    default: true,
+  },
+  prefillPoints: {
+    type: Array as PropType<Array<Partial<ReturnType<typeof parsePointKey>>>>,
+    default: () => [],
+  },
+})
+
+const emit = defineEmits<{
+  (e: 'update:selectedKeys', value: string[]): void
+  (e: 'change', value: ReturnType<typeof parsePointKey>[]): void
+}>()
+
+const dataSource = ref<PointTransferItem[]>([])
+const targetKeys = ref<string[]>([...props.selectedKeys])
+
+const dataMap = computed(() => new Map(dataSource.value.map(item => [item.key, item])))
+const prefilledItems = computed<PointTransferItem[]>(() => {
+  return (props.prefillPoints || []).map((info) => {
+    const key = buildPointKeyFromInfo(info)
+    const parsed = parsePointKey(key)
+    return {
+      key,
+      title: buildPointTitle(parsed, key),
+    }
+  })
+})
+
+function mergeUnique(items: PointTransferItem[]) {
+  const map = new Map<string, PointTransferItem>()
+  items.forEach((item) => {
+    if (item.key === undefined || item.key === null)
+      return
+    const key = String(item.key)
+    if (!map.has(key))
+      map.set(key, { ...item, key })
+  })
+  dataSource.value = Array.from(map.values())
+}
+
+function ensureSelectedVisible(keys: string[]) {
+  mergeUnique(prefilledItems.value)
+  const missing: PointTransferItem[] = []
+  keys.forEach((key) => {
+    const k = String(key)
+    if (!dataMap.value.has(k)) {
+      const info = parsePointKey(k)
+      missing.push({
+        key: k,
+        title: buildPointTitle(info, k),
+      })
+    }
+  })
+  if (missing.length)
+    mergeUnique([...dataSource.value, ...missing])
+}
+
+async function fetchPoints(keyword = '') {
+  try {
+    const res = await pointListApi({ keyword })
+    const fetched = Array.isArray(res)
+      ? res.map((item: any) => {
+        const key = item?.id
+        const info = parsePointKey(key)
+        return {
+          key: String(key),
+          title: item?.name || buildPointTitle(info, String(key)),
+        }
+      })
+      : []
+    const selectedItems = targetKeys.value.map((key) => {
+      const saved = dataMap.value.get(key)
+      if (saved)
+        return saved
+      const info = parsePointKey(key)
+      return { key, title: buildPointTitle(info, key) }
+    })
+    mergeUnique([...selectedItems, ...fetched])
+  }
+  catch (error) {
+    console.error('获取测点列表失败', error)
+  }
+}
+
+watch(
+  () => props.selectedKeys,
+  (val) => {
+    targetKeys.value = [...val]
+    ensureSelectedVisible(val)
+  },
+  { immediate: true },
+)
+
+function handleChange(nextTargetKeys: string[]) {
+  targetKeys.value = nextTargetKeys
+  emit('update:selectedKeys', nextTargetKeys)
+  emit('change', nextTargetKeys.map(key => parsePointKey(key)))
+}
+
+function handleSearch(direction: 'left' | 'right', value: string) {
+  if (direction === 'left')
+    fetchPoints(value)
+}
+
+function filterOption(inputValue: string, option?: PointTransferItem) {
+  if (!option?.title)
+    return false
+  return option.title.toLowerCase().includes((inputValue || '').toLowerCase())
+}
+
+function renderItem(item: PointTransferItem) {
+  return item.title || (item as any).label || item.key
+}
+
+onMounted(() => {
+  fetchPoints()
+})
+</script>
+
+<template>
+  <Transfer
+    :target-keys="targetKeys"
+    :data-source="dataSource"
+    :titles="titles"
+    :list-style="listStyle"
+    :show-search="showSearch"
+    :filter-option="filterOption"
+    :render="renderItem"
+    @search="handleSearch"
+    @change="handleChange"
+  />
+</template>
diff --git a/src/views/model/components/pointTransferHelper.ts b/src/views/model/components/pointTransferHelper.ts
new file mode 100644
index 0000000..763eb0f
--- /dev/null
+++ b/src/views/model/components/pointTransferHelper.ts
@@ -0,0 +1,26 @@
+export interface PointKeyInfo {
+  description: string
+  pointId: string
+  unit?: string
+  Lower?: string
+  Upper?: string
+}
+
+export function parsePointKey(key: string | number | undefined | null): PointKeyInfo {
+  const safeKey = key !== undefined && key !== null ? String(key) : ''
+  const [description = '', pointId = '', unit = '', Lower = '', Upper = ''] = safeKey.split('|')
+  return { description, pointId, unit, Lower, Upper }
+}
+
+export function buildPointKeyFromInfo(info: Partial<PointKeyInfo>): string {
+  const { description = '', pointId = '', unit = '', Lower = '', Upper = '' } = info || {}
+  return [description, pointId, unit, Lower, Upper].join('|')
+}
+
+export function buildPointTitle(info: PointKeyInfo, fallback: string): string {
+  if (info.description && info.pointId)
+    return `${info.description} (${info.pointId})`
+  if (info.description)
+    return info.description
+  return fallback
+}
diff --git a/src/views/model/list/ModelCard.vue b/src/views/model/list/ModelCard.vue
index 4eca609..e828e6d 100644
--- a/src/views/model/list/ModelCard.vue
+++ b/src/views/model/list/ModelCard.vue
@@ -1,14 +1,15 @@
 <script lang="ts" setup>
-import { Card } from 'ant-design-vue'
+import { Card, Dropdown, Menu, Popconfirm } from 'ant-design-vue'
 import type { PropType } from 'vue'
 import { ref, watch } from 'vue'
 import type { ModelItem } from './data'
 import CreateModel from './CreateModel.vue'
 import Icon from '@/components/Icon/index'
-import { modelCardListApi } from '@/api/alert/model/models'
+import { modelCardListApi, modelDeleteApi } from '@/api/alert/model/models'
 import type { ModelQueryParams } from '@/api/alert/model/model/models'
 import { useGo } from '@/hooks/web/usePage'
 import { useDrawer } from '@/components/Drawer'
+import { useMessage } from '@/hooks/web/useMessage'
 
 const props = defineProps({
   loading: {
@@ -23,6 +24,7 @@ const props = defineProps({
 })
 
 const [registerDraw, { openDrawer }] = useDrawer()
+const { createMessage } = useMessage()
 
 // 点击模型卡片跳转训练页面
 const go = useGo()
@@ -32,75 +34,106 @@ function changeModel(id, version?) {
 }
 
 const modelCardList = ref<Array<ModelItem>>([])
+const lastQuery = ref<ModelQueryParams | null>(null)
 const colors = ['#8dc63f', '#dbb09e']
 const statusStr = ['未下装', '已下装']
 const icons = ['material-symbols:lock-open-right-outline', 'material-symbols:lock-outline']
 
+const buildQuery = (value: any): ModelQueryParams => ({
+  unitId: value?.unit,
+  typeId: value?.type,
+  systemId: value?.system,
+  name: value?.name,
+})
+
+async function loadModelList(value: any) {
+  const queryParams = buildQuery(value)
+  lastQuery.value = queryParams
+  const modelList = await modelCardListApi(queryParams)
+  if (!modelList) {
+    modelCardList.value = []
+    return
+  }
+  const cardList: ModelItem[] = []
+  for (const modelCard of modelList) {
+    const statusIndex = Number(modelCard.status) || 0
+    const card: ModelItem = {
+      id: modelCard.id,
+      title: modelCard.name,
+      version: modelCard.version,
+      icon: icons[statusIndex],
+      value: 1,
+      total: 1,
+      color: colors[statusIndex],
+      status: statusStr[statusIndex],
+      creator: modelCard.creator,
+      createTime: modelCard.createTime,
+      description: modelCard.name,
+      headStyle: {
+        backgroundColor: colors[statusIndex],
+        fontSize: '20px',
+      },
+      bodyStyle: {
+        borderColor: colors[statusIndex],
+        borderWidth: '1px',
+      },
+    }
+    cardList.push(card)
+  }
+  modelCardList.value = cardList
+}
+
 watch(
   () => props.selectData,
   async (value) => {
-    const queryParams: ModelQueryParams = {
-      unitId: value?.unit,
-      typeId: value?.type,
-      systemId: value?.system,
-      name: value?.name,
-    }
-    const modelList = await modelCardListApi(queryParams)
-    if (!modelList) {
-      modelCardList.value = []
-      return
-    }
-    const cardList: ModelItem[] = []
-    for (const modelCard of modelList) {
-      // modelCard.status = 0;
-      const card: ModelItem = {
-        id: modelCard.id,
-        title: modelCard.name,
-        version: modelCard.version,
-        icon: icons[modelCard.status],
-        value: 1,
-        total: 1,
-        color: colors[modelCard.status],
-        status: statusStr[modelCard.status],
-        creator: modelCard.creator,
-        createTime: modelCard.createTime,
-        description: modelCard.name,
-        headStyle: {
-          backgroundColor: colors[modelCard.status],
-          fontSize: '20px',
-        },
-        bodyStyle: {
-          borderColor: colors[modelCard.status],
-          borderWidth: '1px',
-        },
-      }
-      cardList.push(card)
-    }
-    modelCardList.value = cardList
+    await loadModelList(value)
   },
+  { immediate: true },
 )
+
+async function confirmDelete(id: number | string) {
+  await modelDeleteApi(id)
+  createMessage.success('删除成功')
+  await loadModelList(props.selectData)
+}
 </script>
 
 <template>
   <div class="enter-y">
     <div class="grid gap-4 md:grid-cols-4">
       <template v-for="item in modelCardList" :key="item.title">
-        <Card
-          size="small"
-          :loading="loading"
-          :title="item.title"
-          :hoverable="true"
-          :body-style="item.bodyStyle"
-          :head-style="item.headStyle"
-          @click="changeModel(item.id, item.version)"
-        >
-          <template #extra>
-            <Icon :icon="item.icon" :size="30" color="white" />
+        <Dropdown :trigger="['contextmenu']">
+          <Card
+            size="small"
+            :loading="loading"
+            :title="item.title"
+            :hoverable="true"
+            :body-style="item.bodyStyle"
+            :head-style="item.headStyle"
+            @click="changeModel(item.id, item.version)"
+          >
+            <template #extra>
+              <Icon :icon="item.icon" :size="30" color="white" />
+            </template>
+            <div class="grid p-2 px-5 md:grid-cols-3">
+              <span>创建人: {{ item.creator }}</span><span>创建时间: {{ item.createTime }}</span><span>模型状态: {{ item.status }}</span>
+            </div>
+          </Card>
+          <template #overlay>
+            <Menu>
+              <Menu.Item key="delete">
+                <Popconfirm
+                  title="确认删除该模型？"
+                  ok-text="删除"
+                  ok-type="danger"
+                  @confirm="() => confirmDelete(item.id)"
+                >
+                  <span>删除</span>
+                </Popconfirm>
+              </Menu.Item>
+            </Menu>
           </template>
-          <div class="grid p-2 px-5 md:grid-cols-3">
-            <span>创建人: {{ item.creator }}</span><span>创建时间: {{ item.createTime }}</span><span>模型状态: {{ item.status }}</span>
-          </div>
-        </Card>
+        </Dropdown>
       </template>
       <Card v-show="systemId != null" size="small" class="icon-card" :hoverable="true" @click="openDrawer(true)">
         <Icon icon="ic:sharp-add" :size="80" color="#a7a9a7" />
diff --git a/src/views/model/list/step/Step3.vue b/src/views/model/list/step/Step3.vue
index 943c595..64ccf1e 100644
--- a/src/views/model/list/step/Step3.vue
+++ b/src/views/model/list/step/Step3.vue
@@ -1,20 +1,19 @@
 <script lang="ts">
-import type { PropType } from "vue";
-import { computed, defineComponent, ref, toRaw, unref } from "vue";
-import { Alert, Descriptions, Divider } from "ant-design-vue";
-import type { Recordable } from "@vben/types";
-import { useDebounceFn } from "@vueuse/core";
-import { step3Schemas } from "./data";
-import { ApiSelect, BasicForm, useForm } from "@/components/Form";
-import { Button } from "@/components/Button";
-import { pointListApi } from "@/api/alert/model/select";
-import { modelSaveApi } from "@/api/alert/model/models";
+import type { PropType } from 'vue'
+import { defineComponent, ref, toRaw, watch } from 'vue'
+import { Alert, Descriptions, Divider } from 'ant-design-vue'
+import type { Recordable } from '@vben/types'
+import { step3Schemas } from './data'
+import { BasicForm, useForm } from '@/components/Form'
+import PointTransfer from '@/views/model/components/PointTransfer.vue'
+import { parsePointKey, buildPointKeyFromInfo } from '@/views/model/components/pointTransferHelper'
+import { modelSaveApi } from '@/api/alert/model/models'
+import { useMessage } from '@/hooks/web/useMessage'
 
 export default defineComponent({
   components: {
-    Button,
     BasicForm,
-    ApiSelect,
+    PointTransfer,
     [Alert.name]: Alert,
     [Divider.name]: Divider,
     [Descriptions.name]: Descriptions,
@@ -22,140 +21,92 @@ export default defineComponent({
   },
   props: {
     beforeData: {
-      type: Object as PropType<Record<string, any> | null | undefined>,
+      type: Object as PropType<Recordable | null | undefined>,
     },
     systemId: {
       type: Number,
     },
   },
-  emits: ["next", "prev"],
+  emits: ['next', 'prev'],
   setup(props, { emit }) {
-    const [
-      register,
-      { appendSchemaByField, removeSchemaByField, validate, setProps },
-    ] = useForm({
+    const { createMessage } = useMessage()
+    const selectedKeys = ref<string[]>([])
+    const [register, { validate, setProps }] = useForm({
       labelWidth: 100,
       schemas: step3Schemas,
       actionColOptions: {
         span: 14,
       },
       resetButtonOptions: {
-        text: "上一步",
+        text: '上一步',
       },
       submitButtonOptions: {
-        text: "创建模型",
+        text: '创建模型',
       },
       resetFunc: customResetFunc,
       submitFunc: customSubmitFunc,
-    });
-    const n = ref(4);
-
-    function add() {
-      appendSchemaByField(
-        [
-          {
-            field: `point${n.value}`,
-            component: "Input",
-            label: `参数${n.value}`,
-            required: true,
-            slot: "remoteSearch",
-            colProps: {
-              span: 23,
-            },
-          },
-          {
-            field: `${n.value}`,
-            component: "Input",
-            label: " ",
-            slot: "add",
-            colProps: {
-              span: 1,
-            },
-          },
-        ],
-        ""
-      );
-      n.value++;
-    }
+    })
 
-    function del(field) {
-      removeSchemaByField([`point${field}`, `${field}`]);
-      n.value--;
-    }
+    watch(
+      () => props.beforeData?.pointInfo,
+      (val) => {
+        if (Array.isArray(val))
+          selectedKeys.value = val.map(item => buildPointKeyFromInfo(item))
+      },
+      { immediate: true },
+    )
 
     async function customResetFunc() {
-      emit("prev");
+      emit('prev')
     }
 
     async function customSubmitFunc() {
       try {
-        const values = await validate();
-        const pointInfo = [];
-        for (const key in values) {
-          if (key.startsWith("point")) {
-            const point = values[key].split("|");
-            const p = {
-              description: point[0],
-              pointId: point[1],
-              unit: point[2],
-              Lower: point[3],
-              Upper: point[4],
-              dead: true,
-              limit: false,
-            };
-            pointInfo.push(p);
-          }
+        await validate()
+        if (!selectedKeys.value.length) {
+          createMessage.warning('请选择模型参数')
+          return
         }
-        const modelInfo = toRaw(props.beforeData);
-        modelInfo.pointInfo = pointInfo;
-        const modelId = await modelSaveApi(modelInfo);
+        const pointInfo = selectedKeys.value.map((key) => {
+          const point = parsePointKey(key)
+          return {
+            description: point.description,
+            pointId: point.pointId,
+            unit: point.unit,
+            Lower: point.Lower,
+            Upper: point.Upper,
+            dead: true,
+            limit: false,
+          }
+        })
+        const modelInfo = toRaw(props.beforeData) || {}
+        modelInfo.pointInfo = pointInfo
         setProps({
           submitButtonOptions: {
             loading: true,
           },
-        });
-        setTimeout(() => {
-          setProps({
-            submitButtonOptions: {
-              loading: false,
-            },
-          });
-          emit("next", modelId);
-        }, 1500);
-      } catch (error) {
-        console.error(error);
+        })
+        const modelId = await modelSaveApi(modelInfo)
+        emit('next', modelId)
       }
-    }
-
-    const keyword = ref<string>("");
-    const searchParams = computed<Recordable>(() => {
-      return { keyword: unref(keyword) };
-    });
-
-    function onSearch(value: string) {
-      keyword.value = value;
-    }
-
-    async function searchPoint(params) {
-      if (params.keyword) {
-        const data = await pointListApi(params);
-        return data;
+      catch (error) {
+        console.error(error)
+      }
+      finally {
+        setProps({
+          submitButtonOptions: {
+            loading: false,
+          },
+        })
       }
     }
 
     return {
       register,
-      del,
-      add,
-      onSearch: useDebounceFn(onSearch, 300),
-      searchParams,
-      searchPoint,
-      handleReset: () => {
-        keyword.value = "";
-      },
-    };
+      selectedKeys,
+    }
   },
-});
+})
 </script>
 
 <template>
@@ -180,30 +131,19 @@ export default defineComponent({
     </a-descriptions>
     <a-divider />
     <BasicForm @register="register">
-      <template #remoteSearch="{ model, field }">
-        <ApiSelect
-          v-model:value="model[field]"
-          :api="searchPoint"
-          show-search
-          :filter-option="false"
-          result-field="list"
-          label-field="name"
-          value-field="id"
-          :params="searchParams"
-          @search="onSearch"
+      <template #pointTransfer>
+        <PointTransfer
+          v-model:selected-keys="selectedKeys"
+          :prefill-points="beforeData?.pointInfo || []"
         />
       </template>
-      <template #add="{ field }">
-        <Button v-if="Number(field) === 0" @click="add"> + </Button>
-        <Button v-if="field > 0" @click="del(field)"> - </Button>
-      </template>
     </BasicForm>
   </div>
 </template>
 
 <style lang="less" scoped>
 .step3 {
-  width: 450px;
+  max-width: 1100px;
   margin: 0 auto;
 }
 </style>
diff --git a/src/views/model/list/step/data.tsx b/src/views/model/list/step/data.tsx
index c172830..73d0ced 100644
--- a/src/views/model/list/step/data.tsx
+++ b/src/views/model/list/step/data.tsx
@@ -83,51 +83,13 @@ export const step2Schemas: FormSchema[] = [
 
 export const step3Schemas: FormSchema[] = [
   {
-    field: 'point0',
+    field: 'pointTransfer',
     component: 'Input',
-    label: '参数1',
-    required: true,
-    slot: 'remoteSearch',
-    componentProps: {
-      style: { width: '180px' },
-    },
+    label: '参数选择',
+    slot: 'pointTransfer',
     colProps: {
-      span: 23,
-    },
-  },
-  {
-    field: 'point1',
-    component: 'Input',
-    label: '参数2',
-    required: true,
-    slot: 'remoteSearch',
-    componentProps: {
-      style: { width: '180px' },
-    },
-    colProps: {
-      span: 23,
-    },
-  },
-  {
-    field: 'point2',
-    component: 'Input',
-    label: '参数3',
-    required: true,
-    slot: 'remoteSearch',
-    componentProps: {
-      style: { width: '180px' },
-    },
-    colProps: {
-      span: 23,
-    },
-  },
-  {
-    field: '0',
-    component: 'Input',
-    label: ' ',
-    slot: 'add',
-    colProps: {
-      span: 1,
+      span: 24,
     },
+    labelWidth: 120,
   },
 ]
diff --git a/src/views/model/train/index.vue b/src/views/model/train/index.vue
index dcec6d7..75a3dea 100644
--- a/src/views/model/train/index.vue
+++ b/src/views/model/train/index.vue
@@ -25,7 +25,6 @@ import {
   Steps,
   Table,
   Tabs,
-  Transfer,
 } from 'ant-design-vue'
 import VueECharts from 'vue-echarts'
 import { pointTableSchema, sampleInfoTableSchema } from './data'
@@ -45,9 +44,10 @@ import type { AssessReportSimple } from '@/api/alert/model/model/assessReportMod
 import { getExaHistorys } from '@/api/alert/exa/index'
 import { useECharts } from '@/hooks/web/useECharts'
 import { useMessage } from '@/hooks/web/useMessage'
-import { pointListApi } from '@/api/alert/model/select'
 import { useGo } from '@/hooks/web/usePage'
 import Icon from '@/components/Icon'
+import PointTransfer from '../components/PointTransfer.vue'
+import { buildPointKeyFromInfo, parsePointKey } from '../components/pointTransferHelper'
 
 export default defineComponent({
   components: {
@@ -72,12 +72,12 @@ export default defineComponent({
     AInputNumber: InputNumber,
     AButton: Button,
     ASpin: Spin,
-    ATransfer: Transfer,
     ARow: Row,
     ACol: Col,
     ASelect: Select,
     ASpace: Space,
     Icon,
+    PointTransfer,
   },
   setup() {
     const { createMessage } = useMessage()
@@ -710,6 +710,7 @@ export default defineComponent({
       alarmname: '全工况运行',
     })
     const openEditModeModal = ref<boolean>(false)
+    const normalizeVersion = (val?: string | null) => (val ? String(val).trim().toLowerCase() : '')
 
     function openEditMode() {
       if (!canEditModel.value) {
@@ -739,46 +740,6 @@ export default defineComponent({
       selectedKeys: [],
     })
 
-    // 穿梭框数据源示例
-    const transferData = ref([]) // 穿梭框数据源
-
-    // 初始化时获取全部测点
-    async function fetchAllPoints(keyword = '') {
-      // 这里调用你的后端接口，传递 keyword
-      // const res = await fetchPointsApi({ keyword })
-      // 示例数据
-      const data = await pointListApi({ keyword })
-      console.log('Fetched points:', data)
-      transferData.value = transferData.value.filter(item => editModelForm.value.selectedKeys.includes(item.key))
-        .concat(data.map(item => ({
-          key: item.id,
-          title: item.name,
-        })))
-      console.log('Transfer data:', transferData.value)
-    }
-    onMounted(() => {
-      fetchAllPoints()
-    })
-
-    function handleTransferSearch(dir, value) {
-      if (dir === 'left') {
-        // 左侧：后端接口查询
-        fetchAllPoints(value)
-      }
-      else {
-        // 右侧：前端过滤
-        transferData.value = (model.value?.pointInfo || [])
-          .filter(item =>
-            editModelForm.value.selectedKeys.includes(`${item.description}|${item.pointId}|${item.unit}|${item.Lower}|${item.Upper}`)
-            && (`${item.description || ''}(${item.pointId})`).includes(value),
-          )
-          .map(item => ({
-            key: `${item.description}|${item.pointId}|${item.unit}|${item.Lower}|${item.Upper}`,
-            title: `${item.description || ''}  (${item.pointId})`,
-          }))
-      }
-    }
-
     function openEditModel() {
       if (!canEditModel.value) {
         createMessage.warning('非草稿版本不可修改模型')
@@ -786,12 +747,13 @@ export default defineComponent({
       }
       editModelForm.value.sampling = model.value?.sampling || 0
       editModelForm.value.rate = model.value?.rate || 0
-      editModelForm.value.selectedKeys = (model.value?.pointInfo || []).map(item => `${item.description}|${item.pointId}|${item.unit}|${item.Lower}|${item.Upper}`)
-      transferData.value = (model.value?.pointInfo || []).map(item => ({
-        key: `${item.description}|${item.pointId}|${item.unit}|${item.Lower}|${item.Upper}`,
-        title: `${item.description || ''}  (${item.pointId})`,
+      editModelForm.value.selectedKeys = (model.value?.pointInfo || []).map(item => buildPointKeyFromInfo({
+        description: item.description ?? item.Description,
+        pointId: item.pointId ?? item.PointId,
+        unit: item.unit ?? item.Unit,
+        Lower: item.Lower ?? item.lower,
+        Upper: item.Upper ?? item.upper,
       }))
-      console.log('transferData:', transferData.value)
       openEditModelModal.value = true
     }
     function handleEditModelOk() {
@@ -802,7 +764,7 @@ export default defineComponent({
       model.value.sampling = editModelForm.value.sampling
       model.value.rate = editModelForm.value.rate
       model.value.pointInfo = editModelForm.value.selectedKeys.map((key) => {
-        const [description, pointId, unit, Lower, Upper] = key.split('|')
+        const { description, pointId, unit, Lower, Upper } = parsePointKey(key)
         return {
           description,
           pointId,
@@ -828,12 +790,13 @@ export default defineComponent({
     const reportNameOptions = ref<{ label: string, value: number }[]>([])
     const reportNameSelectVisible = ref(false)
     const selectedReportNameId = ref<number | null>(null)
-    const isVTestVersion = computed(
-      () => (model.value?.Cur_Version || model.value?.version) === 'v-test',
-    )
+    const isVTestVersion = computed(() => {
+      const version = normalizeVersion(model.value?.Cur_Version || model.value?.version)
+      return version === '' || version === 'v-test'
+    })
     const canEditModel = computed(() => {
-      const version = selectedVersion.value || model.value?.Cur_Version || model.value?.version
-      return version === 'v-test'
+      const version = normalizeVersion(selectedVersion.value || model.value?.Cur_Version || model.value?.version)
+      return version === '' || version === 'v-test'
     })
     const isBottomed = computed(() => model.value?.btmState === '已下装')
     const reportColumns = [
@@ -1032,6 +995,7 @@ export default defineComponent({
     }
 
     return {
+      normalizeVersion,
       pointTable,
       model,
       selectedVersion,
@@ -1064,8 +1028,6 @@ export default defineComponent({
       clearModel,
       openEditModelModal,
       editModelForm,
-      transferData,
-      handleTransferSearch,
       openEditModel,
       handleEditModelOk,
       handleEditModelCancel,
@@ -1442,21 +1404,13 @@ export default defineComponent({
           </a-col>
         </a-row>
         <div style="display: flex; justify-content: center; margin-top: 24px;margin-bottom: 10px;">
-          <a-transfer
-            v-model:target-keys="editModelForm.selectedKeys"
-            :data-source="transferData"
-            :render="item => item.title"
-            :row-key="(item) => item.key"
-            :pagination="false"
-            :show-search="true"
-            :filter="true"
-            search-placeholder="搜索测点"
-            :titles="['可选测点', '已选测点']"
+          <PointTransfer
+            v-model:selected-keys="editModelForm.selectedKeys"
+            :prefill-points="model?.pointInfo || []"
             :list-style="{
               width: '500px',
               height: '450px',
             }"
-            @search="handleTransferSearch"
           />
         </div>
       </a-form>