pref: 调整设备列表第一页表单的设备名称和SN

@@ -19,31 +19,35 @@ export const step1Schemas: FormSchema[] = [
     component: 'Input',
     component: 'Input',
   },
   },
   {
   {
-    field: 'name',
-    label: '设备名称',
-    required: true,
-    component: 'Input',
-    colProps: { span: 14 },
-    componentProps: {
-      placeholder: '设备名称',
-      maxLength: 36,
-    },
-  },
-  {
     field: 'alias',
     field: 'alias',
     label: '别名 ',
     label: '别名 ',
     component: 'Input',
     component: 'Input',
-    labelWidth: 60,
-    colProps: { span: 10 },
     componentProps: {
     componentProps: {
       maxLength: 255,
       maxLength: 255,
     },
     },
   },
   },
   {
   {
-    field: 'sn',
-    label: 'SN码',
+    field: 'name',
+    label: '设备名称/SN码',
     component: 'Input',
     component: 'Input',
-    required: true,
+    dynamicRules: () => {
+      return [
+        {
+          required: true,
+          validator: (_, value) => {
+            // 支持英文字母、数字、下划线（_）、中划线（-）、点号（.）、半角冒号（:）和特殊字符@，长度限制为4~32个字符
+            const reg = /^[A-Za-z0-9_\( \)\-\@\:\.]+$/;
+            const strLength = String(value).length as number;
+            if (!reg.test(value) || strLength > 32 || strLength < 4) {
+              return Promise.reject(
+                '请输入支持英文字母、数字、下划线（_）、中划线（-）、点号（.）、半角冒号（:）和特殊字符@，长度限制为4~32个字符'
+              );
+            }
+            return Promise.resolve();
+          },
+        },
+      ];
+    },
     slot: 'snCode',
     slot: 'snCode',
   },
   },
   {
   {

@@ -5,6 +5,7 @@ import { DeviceTypeEnum, DeviceState, DeviceRecord } from '/@/api/device/model/d
 import { deviceProfile } from '/@/api/device/deviceManager';
 import { deviceProfile } from '/@/api/device/deviceManager';
 import { h } from 'vue';
 import { h } from 'vue';
 import { Tag } from 'ant-design-vue';
 import { Tag } from 'ant-design-vue';
+import { handeleCopy } from '../../profiles/step/topic';
 
 
 // 表格列数据
 // 表格列数据
 export const columns: BasicColumn[] = [
 export const columns: BasicColumn[] = [
@@ -24,9 +25,19 @@ export const columns: BasicColumn[] = [
     dataIndex: 'name',
     dataIndex: 'name',
     title: '设备名称/设备SN',
     title: '设备名称/设备SN',
     width: 200,
     width: 200,
-    align: 'left',
     slots: { customRender: 'name', title: 'deviceTitle' },
     slots: { customRender: 'name', title: 'deviceTitle' },
-    ellipsis: true,
+    customRender: ({ record }) => {
+      return h(
+        'span',
+        {
+          style: { cursor: 'pointer', color: '#377dff' },
+          onClick: () => {
+            handeleCopy(record.name || record.alias);
+          },
+        },
+        record.name || record.alias
+      );
+    },
   },
   },
   {
   {
     title: '设备类型',
     title: '设备类型',

@@ -140,8 +140,8 @@
             confirmLoading: true,
             confirmLoading: true,
           });
           });
           if (unref(isUpdate)) {
           if (unref(isUpdate)) {
-            console.log(currentDeviceData);
             const editData = {
             const editData = {
+              sn: 'XXXX',
               ...unref(stepState),
               ...unref(stepState),
               customerId: currentDeviceData.customerId,
               customerId: currentDeviceData.customerId,
               deviceInfo: {
               deviceInfo: {
@@ -152,6 +152,7 @@
             await createOrEditDevice(editData);
             await createOrEditDevice(editData);
           } else {
           } else {
             const createData = {
             const createData = {
+              sn: 'XXXX',
               ...unref(stepState),
               ...unref(stepState),
               deviceInfo: {
               deviceInfo: {
                 avatar: DeviceStep1Ref.value?.devicePic,
                 avatar: DeviceStep1Ref.value?.devicePic,

@@ -363,7 +363,7 @@
       const generateSN = async () => {
       const generateSN = async () => {
         const data = await generateSNCode();
         const data = await generateSNCode();
         setFieldsValue({
         setFieldsValue({
-          sn: data,
+          name: data,
         });
         });
       };
       };
 
 

@@ -62,18 +62,6 @@
             </Popover>
             </Popover>
           </div>
           </div>
         </template>
         </template>
-        <template #name="{ record }">
-          <div>
-            <Tooltip :title="record.alias || record.name" placement="topRight">
-              {{ record.alias || record.name.slice(0, 13) }}
-            </Tooltip>
-          </div>
-          <Tooltip title="设备SN码" placement="topRight">
-            <a-button type="link" @click="copySN(record.sn)" style="padding: 0">
-              {{ record.sn }}
-            </a-button>
-          </Tooltip>
-        </template>
         <template #deviceProfile="{ record }">
         <template #deviceProfile="{ record }">
           <Tag.CheckableTag
           <Tag.CheckableTag
             @click="goDeviceProfile(record.deviceProfile.name)"
             @click="goDeviceProfile(record.deviceProfile.name)"
@@ -201,7 +189,7 @@
   } from '/@/api/device/model/deviceModel';
   } from '/@/api/device/model/deviceModel';
   import { BasicTable, useTable, TableAction, TableImg } from '/@/components/Table';
   import { BasicTable, useTable, TableAction, TableImg } from '/@/components/Table';
   import { columns, searchFormSchema } from './config/device.data';
   import { columns, searchFormSchema } from './config/device.data';
-  import { Tag, Tooltip, Popover, Popconfirm, Button } from 'ant-design-vue';
+  import { Tag, Popover, Popconfirm, Button } from 'ant-design-vue';
   import {
   import {
     deleteDevice,
     deleteDevice,
     devicePage,
     devicePage,
@@ -244,7 +232,6 @@
       DeviceDetailDrawer,
       DeviceDetailDrawer,
       CustomerModal,
       CustomerModal,
       TableImg,
       TableImg,
-      Tooltip,
       QuestionCircleOutlined,
       QuestionCircleOutlined,
       Popover,
       Popover,
       Authority,
       Authority,

@@ -4,7 +4,7 @@ import { useCopyToClipboard } from '/@/hooks/web/useCopyToClipboard';
 import { useMessage } from '/@/hooks/web/useMessage';
 import { useMessage } from '/@/hooks/web/useMessage';
 const { createMessage } = useMessage();
 const { createMessage } = useMessage();
 
 
-const handeleCopy = (e) => {
+export const handeleCopy = (e) => {
   const { isSuccessRef } = useCopyToClipboard(JSON.parse(JSON.stringify(unref(e), null, 2)));
   const { isSuccessRef } = useCopyToClipboard(JSON.parse(JSON.stringify(unref(e), null, 2)));
   unref(isSuccessRef);
   unref(isSuccessRef);
   createMessage.success('复制成功！');
   createMessage.success('复制成功！');