Merge branch 'main_dev' into 'v1.4.0_dev'

Main dev

See merge request yunteng/thingskit-front!1348

@@ -60,3 +60,8 @@ export function dateFormat(date, block) {
   });
   });
   return format;
   return format;
 }
 }
+
+// 获取上传文件后缀
+export const fileSuffix = (fileName: string) => {
+  return fileName.split('.').pop();
+};

@@ -97,3 +97,5 @@ export function isUrl(path: string): boolean {
     /(((^https?:(?:\/\/)?)(?:[-;:&=\+\$,\w]+@)?[A-Za-z0-9.-]+(?::\d+)?|(?:www.|[-;:&=\+\$,\w]+@)[A-Za-z0-9.-]+)((?:\/[\+~%\/.\w-_]*)?\??(?:[-\+=&;%@.\w_]*)#?(?:[\w]*))?)$/;
     /(((^https?:(?:\/\/)?)(?:[-;:&=\+\$,\w]+@)?[A-Za-z0-9.-]+(?::\d+)?|(?:www.|[-;:&=\+\$,\w]+@)[A-Za-z0-9.-]+)((?:\/[\+~%\/.\w-_]*)?\??(?:[-\+=&;%@.\w_]*)#?(?:[\w]*))?)$/;
   return reg.test(path);
   return reg.test(path);
 }
 }
+
+export const isXlsxFile = (name: string) => name === 'xlsx';

@@ -202,7 +202,7 @@ export const step1Schemas: FormSchema[] = [
             values?.transportType === TransportTypeEnum.TCP &&
             values?.transportType === TransportTypeEnum.TCP &&
             values?.tcpDeviceProtocol === TCPProtocolTypeEnum.MODBUS_RTU,
             values?.tcpDeviceProtocol === TCPProtocolTypeEnum.MODBUS_RTU,
           message: '地址码范围为00~FF',
           message: '地址码范围为00~FF',
-          pattern: /^[0-9A-Fa-f]{2}$/,
+          pattern: /^[0-9A-Fa-f]{1,2}$/,
         },
         },
       ];
       ];
     },
     },

@@ -14,6 +14,7 @@
   import { ColumnDataRecord, Options, UploadFileParseValue } from './type';
   import { ColumnDataRecord, Options, UploadFileParseValue } from './type';
   import { DEVICE_NAME_INDEX } from './const';
   import { DEVICE_NAME_INDEX } from './const';
   import { buildUUID } from '/@/utils/uuid';
   import { buildUUID } from '/@/utils/uuid';
+  import { useMessage } from '/@/hooks/web/useMessage';
 
 
   const props = defineProps({
   const props = defineProps({
     ...basicProps,
     ...basicProps,
@@ -29,6 +30,8 @@
 
 
   const emit = defineEmits(['update:value']);
   const emit = defineEmits(['update:value']);
 
 
+  const { createMessage } = useMessage();
+
   const columnTypeRepeatWhiteList = [
   const columnTypeRepeatWhiteList = [
     ColumTypeEnum.SERVER_ATTRIBUTE,
     ColumTypeEnum.SERVER_ATTRIBUTE,
     ColumTypeEnum.SHARED_ATTRIBUTE,
     ColumTypeEnum.SHARED_ATTRIBUTE,
@@ -104,8 +107,13 @@
     props.goPreviousStep?.();
     props.goPreviousStep?.();
   };
   };
 
 
+  const hasEmpty = (columns: Recordable[]) => {
+    return columns.some((column) => !column.type);
+  };
+
   const handleGoNextStep = () => {
   const handleGoNextStep = () => {
     const columns = getDataSource<ColumnDataRecord>().map((item) => ({ type: item.type }));
     const columns = getDataSource<ColumnDataRecord>().map((item) => ({ type: item.type }));
+    if (hasEmpty(columns)) return createMessage.error('列类型必选');
     emit('update:value', columns);
     emit('update:value', columns);
     props.goNextStep?.();
     props.goNextStep?.();
   };
   };

@@ -7,6 +7,8 @@
   import { UploadFileParseValue } from './type';
   import { UploadFileParseValue } from './type';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { readCsvFile, readXLSXFile } from './config';
   import { readCsvFile, readXLSXFile } from './config';
+  import { fileSuffix } from '/@/utils/common/compUtils';
+  import { isXlsxFile } from '/@/utils/is';
 
 
   const props = defineProps({
   const props = defineProps({
     ...basicProps,
     ...basicProps,
@@ -41,6 +43,9 @@
   };
   };
 
 
   const handleParseFile = async ({ file, onSuccess, onError }: FileRequestParams) => {
   const handleParseFile = async ({ file, onSuccess, onError }: FileRequestParams) => {
+    if (!isXlsxFile(fileSuffix(file.name)!.toLowerCase())) {
+      return createMessage.error('请检查文件类型是否正确');
+    }
     const value = await readFile(file);
     const value = await readFile(file);
     if (!value) {
     if (!value) {
       onError();
       onError();

@@ -163,7 +163,7 @@ export const useObjectFormData = ({
 }: UseObjectFormDataParamsType): DefineComponentsBasicExpose<ModelOfMatterParams> => {
 }: UseObjectFormDataParamsType): DefineComponentsBasicExpose<ModelOfMatterParams> => {
   const getTCPModbusProductFlag = computed(
   const getTCPModbusProductFlag = computed(
     () =>
     () =>
-      propsRef?.deviceRecord?.profileData.transportConfiguration.protocol ===
+      propsRef?.deviceRecord?.profileData?.transportConfiguration?.protocol ===
       TCPProtocolTypeEnum.MODBUS_RTU
       TCPProtocolTypeEnum.MODBUS_RTU
   );
   );