Merge branch 'dev-fix-ww' into 'main_dev'

fix: 修复teambition中BUG

See merge request yunteng/thingskit-front!569

@@ -27,30 +27,14 @@ export const step1Schemas: FormSchema[] = [
     component: 'Input',
     component: 'Input',
     componentProps: {
     componentProps: {
       maxLength: 255,
       maxLength: 255,
+      placeholder: '请输入别名',
     },
     },
   },
   },
   {
   {
     field: 'name',
     field: 'name',
     label: '设备名称',
     label: '设备名称',
     component: 'Input',
     component: 'Input',
-    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();
-          },
-        },
-      ];
-    },
+    rules: [{ required: true, message: '设备名称为必填项' }],
     slot: 'snCode',
     slot: 'snCode',
   },
   },
   {
   {
@@ -97,6 +81,7 @@ export const step1Schemas: FormSchema[] = [
           });
           });
         },
         },
         showSearch: true,
         showSearch: true,
+        placeholder: '请选择产品',
         filterOption: (inputValue: string, option: Record<'label' | 'value', string>) =>
         filterOption: (inputValue: string, option: Record<'label' | 'value', string>) =>
           option.label.includes(inputValue),
           option.label.includes(inputValue),
       };
       };
@@ -120,6 +105,17 @@ export const step1Schemas: FormSchema[] = [
     },
     },
   },
   },
   {
   {
+    field: 'code',
+    label: '设备标识',
+    required: true,
+    component: 'Input',
+    componentProps: {
+      maxLength: 255,
+      placeholder: '请输入设备标识',
+    },
+    ifShow: ({ values }) => values?.transportType === TransportTypeEnum.TCP,
+  },
+  {
     field: 'brand',
     field: 'brand',
     component: 'ApiRadioGroup',
     component: 'ApiRadioGroup',
     label: '选择厂家',
     label: '选择厂家',

@@ -28,15 +28,16 @@ export const columns: BasicColumn[] = [
     slots: { customRender: 'name', title: 'deviceTitle' },
     slots: { customRender: 'name', title: 'deviceTitle' },
     customRender: ({ record }) => {
     customRender: ({ record }) => {
       return h('div', { style: 'display:flex;flex-direction:column' }, [
       return h('div', { style: 'display:flex;flex-direction:column' }, [
+        record.alias &&
+          h(
+            'div',
+            {
+              class: 'cursor-pointer',
+            },
+            `${record.alias}`
+          ),
         h(
         h(
-          'p',
-          {
-            class: 'cursor-pointer',
-          },
-          `${record.alias}`
-        ),
-        h(
-          'p',
+          'div',
           {
           {
             class: 'cursor-pointer text-blue-500',
             class: 'cursor-pointer text-blue-500',
             onClick: () => {
             onClick: () => {

@@ -40,7 +40,7 @@
         </template>
         </template>
         <template #snCode="{ model, field }">
         <template #snCode="{ model, field }">
           <div class="flex">
           <div class="flex">
-            <Input v-model:value="model[field]" />
+            <Input v-model:value="model[field]" placeholder="请输入设备名称" />
             <a-button type="link" @click="generateSN">自动生成</a-button>
             <a-button type="link" @click="generateSN">自动生成</a-button>
           </div>
           </div>
         </template>
         </template>

@@ -428,7 +428,7 @@
           createMessage.success('删除成功');
           createMessage.success('删除成功');
           handleReload();
           handleReload();
         } catch (error) {
         } catch (error) {
-          createMessage.error('删除失败');
+          throw error;
         } finally {
         } finally {
           setLoading(false);
           setLoading(false);
         }
         }

@@ -138,7 +138,7 @@ const deviceTableColumn: BasicColumn[] = [
             },
             },
           },
           },
           [
           [
-            h('div', { class: 'truncate' }, record.alias),
+            record.alias && h('div', { class: 'truncate' }, record.alias),
             h('div', { class: 'text-blue-400 truncate' }, record.name),
             h('div', { class: 'text-blue-400 truncate' }, record.name),
           ]
           ]
         ),
         ),

@@ -294,8 +294,9 @@
   watch(
   watch(
     () => props.frontId,
     () => props.frontId,
     async (target, oldTarget) => {
     async (target, oldTarget) => {
-      if (isControlComponent(oldTarget!) && isControlComponent(target!)) return;
-      await resetFormFields();
+      if ([isControlComponent(oldTarget!), isControlComponent(target!)].some(Boolean)) {
+        await resetFormFields();
+      }
     }
     }
   );
   );
 
 

@@ -14,6 +14,7 @@
   import { useCalcGridLayout } from '../../hook/useCalcGridLayout';
   import { useCalcGridLayout } from '../../hook/useCalcGridLayout';
   import { FrontComponent } from '../../const/const';
   import { FrontComponent } from '../../const/const';
   import { frontComponentMap } from '../../components/help';
   import { frontComponentMap } from '../../components/help';
+  import { ValidateErrorEntity } from 'ant-design-vue/es/form/interface';
 
 
   interface DataComponentRouteParams extends RouteParams {
   interface DataComponentRouteParams extends RouteParams {
     id: string;
     id: string;
@@ -75,7 +76,14 @@
       unref(isEdit) ? handleUpdateComponent(value) : handleAddComponent(value);
       unref(isEdit) ? handleUpdateComponent(value) : handleAddComponent(value);
       resetForm();
       resetForm();
     } catch (error: unknown) {
     } catch (error: unknown) {
-      window.console.error(error);
+      if (
+        ((error || {}) as ValidateErrorEntity).errorFields &&
+        ((error || {}) as ValidateErrorEntity).errorFields.length
+      ) {
+        const tooltip = ((error || {}) as ValidateErrorEntity).errorFields[0];
+        createMessage.warning(tooltip.errors[0]);
+      }
+      throw error;
     }
     }
   };
   };
 
 
@@ -97,7 +105,7 @@
       closeModal();
       closeModal();
       emit('create');
       emit('create');
     } catch (error) {
     } catch (error) {
-      console.log(error);
+      throw error;
       // createMessage.error('创建失败');
       // createMessage.error('创建失败');
     } finally {
     } finally {
       changeOkLoading(false);
       changeOkLoading(false);

@@ -289,6 +289,7 @@ export const dataSourceSchema = (isEdit: boolean, frontId?: FrontComponent): For
       component: 'ApiSelect',
       component: 'ApiSelect',
       label: '命令类型',
       label: '命令类型',
       defaultValue: CommandTypeEnum.CUSTOM.toString(),
       defaultValue: CommandTypeEnum.CUSTOM.toString(),
+      rules: [{ required: true, message: '请选择命令类型' }],
       colProps: { span: 8 },
       colProps: { span: 8 },
       ifShow: ({ model }) =>
       ifShow: ({ model }) =>
         isControlComponent(frontId!) && isTcpProfile(model[DataSourceField.TRANSPORT_TYPE]),
         isControlComponent(frontId!) && isTcpProfile(model[DataSourceField.TRANSPORT_TYPE]),
@@ -347,6 +348,7 @@ export const dataSourceSchema = (isEdit: boolean, frontId?: FrontComponent): For
       component: 'Input',
       component: 'Input',
       label: '命令',
       label: '命令',
       colProps: { span: 8 },
       colProps: { span: 8 },
+      rules: [{ required: true, message: '请输入下发命令' }],
       // 是控制组件  && 自定义命令  && 传输协议为TCP
       // 是控制组件  && 自定义命令  && 传输协议为TCP
       ifShow: ({ model }) =>
       ifShow: ({ model }) =>
         isControlComponent(frontId!) &&
         isControlComponent(frontId!) &&