Merge branch 'feat/object-model-enums-type' into 'main_dev'

feat: 物模型新增枚举类型

See merge request yunteng/thingskit-scada!200

-import type { FunctionType, TransportTypeEnum } from '@/enums/datasource'
+import type { DataTypeEnum, FunctionType, TransportTypeEnum } from '@/enums/datasource'
 
 
 export interface DeviceProfileItemType {
 export interface DeviceProfileItemType {
   id: string
   id: string
@@ -147,6 +147,7 @@ export interface Detail {
 export interface DataType {
 export interface DataType {
   type: string
   type: string
   specs: Specs | StructJSON[]
   specs: Specs | StructJSON[]
+  specsList: Specs[]
 }
 }
 
 
 export interface Specs {
 export interface Specs {
@@ -158,6 +159,9 @@ export interface Specs {
   length?: string
   length?: string
   min: string
   min: string
   max: string
   max: string
+  name?: string
+  value?: string
+  dataType?: DataTypeEnum
 }
 }
 
 
 export interface ValueRange {
 export interface ValueRange {

@@ -93,6 +93,27 @@ export const getFormSchemas = ({ structJSON: structJson, required, transportType
     }
     }
   }
   }
 
 
+  const createEnumSelect = ({ identifier, functionName, dataType }: StructJSON): FormSchema => {
+    const { specsList } = dataType || {}
+
+    return {
+      field: identifier,
+      label: functionName,
+      component: ComponentEnum.SELECT,
+      rules: [
+        {
+          required,
+          message: `${functionName}是必填项`,
+          type: 'number',
+        },
+      ],
+      componentProps: {
+        options: specsList,
+        fieldNames: { label: 'name', value: 'value' },
+      },
+    }
+  }
+
   const createStructJson = ({ identifier, functionName, dataType }: StructJSON): FormSchema => {
   const createStructJson = ({ identifier, functionName, dataType }: StructJSON): FormSchema => {
     return {
     return {
       field: identifier,
       field: identifier,
@@ -129,6 +150,8 @@ export const getFormSchemas = ({ structJSON: structJson, required, transportType
       schemas.push(createTCPServiceCommandInput(item))
       schemas.push(createTCPServiceCommandInput(item))
     if (type === DataTypeEnum.BOOL)
     if (type === DataTypeEnum.BOOL)
       schemas.push(createSelect(item))
       schemas.push(createSelect(item))
+    else if (type === DataTypeEnum.ENUM)
+      schemas.push(createEnumSelect(item))
     else if (type === DataTypeEnum.NUMBER_INT)
     else if (type === DataTypeEnum.NUMBER_INT)
       schemas.push(createInputNumber(item))
       schemas.push(createInputNumber(item))
     else if (type === DataTypeEnum.NUMBER_DOUBLE)
     else if (type === DataTypeEnum.NUMBER_DOUBLE)

@@ -29,7 +29,7 @@ const thingsModelFormListElMap = reactive<Record<string, { el: InstanceType<type
 const [register, formActionType] = useForm({
 const [register, formActionType] = useForm({
   schemas: getFormSchemas({ structJSON: props.inputData || [], required: props.required, transportType: props.transportType }),
   schemas: getFormSchemas({ structJSON: props.inputData || [], required: props.required, transportType: props.transportType }),
   showActionButtonGroup: false,
   showActionButtonGroup: false,
-  // labelWidth: getLabelWidth() || 80,
+  labelWidth: 100,
   labelAlign: FormLabelAlignEnum.RIGHT,
   labelAlign: FormLabelAlignEnum.RIGHT,
   layout: FormLayoutEnum.HORIZONTAL,
   layout: FormLayoutEnum.HORIZONTAL,
 })
 })
@@ -105,19 +105,34 @@ defineExpose<ComponentExposeType>({
   <Card class="!border-2 !border-dashed" :title="title">
   <Card class="!border-2 !border-dashed" :title="title">
     <BasicForm class="things-model-form" @register="register">
     <BasicForm class="things-model-form" @register="register">
       <template v-for="item in getStructFormItem" #[item.identifier]="{ model, field }" :key="item.identifier">
       <template v-for="item in getStructFormItem" #[item.identifier]="{ model, field }" :key="item.identifier">
-        <ThingsModelForm :ref="(el) => setFormElRef(el as InstanceType<typeof ThingsModelForm>, item) " v-model:value="model[field]" :input-data="(item.dataType?.specs as StructJSON[]) || []" :title="item.functionName" />
+        <ThingsModelForm
+          :ref="(el) => setFormElRef(el as InstanceType<typeof ThingsModelForm>, item)"
+          v-model:value="model[field]" :input-data="(item.dataType?.specs as StructJSON[]) || []"
+          :title="item.functionName"
+        />
       </template>
       </template>
     </BasicForm>
     </BasicForm>
   </Card>
   </Card>
 </template>
 </template>
 
 
 <style lang="less" scoped>
 <style lang="less" scoped>
-  .things-model-form {
-    :deep(.ant-input-number) {
-      width: 100%;
-    }
+.things-model-form {
+  :deep(.ant-input-number) {
+    width: 100%;
   }
   }
-  :deep(.ant-form-item-control){
-    margin-left: 6px;
+
+  :deep(.ant-form-item-label) {
+    >label {
+      display: block;
+      text-align: right;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+      overflow: hidden;
+    }
   }
   }
+}
+
+:deep(.ant-form-item-control) {
+  margin-left: 6px;
+}
 </style>
 </style>

@@ -314,6 +314,7 @@ export enum DataTypeEnum {
   STRING = 'TEXT',
   STRING = 'TEXT',
   STRUCT = 'STRUCT',
   STRUCT = 'STRUCT',
   BOOL = 'BOOL',
   BOOL = 'BOOL',
+  ENUM = 'ENUM',
 }
 }
 
 
 export enum AggregateTypeEnum {
 export enum AggregateTypeEnum {