Merge branch 'perf/tcp-product-object-model' into 'main_dev'

perf: tcp产品创建物模型时,只可创建布尔、浮点、整型、字符串结构的物模型

See merge request yunteng/thingskit-front!1154

@@ -111,6 +111,19 @@ export const formSchemas = ({
           api: async (params: Recordable) => {
             try {
               const record = await findDictItemByCode(params);
+
+              if (isTcp) {
+                // TCP 产品 属性可创建范围
+                return record.filter((item) =>
+                  [
+                    DataTypeEnum.BOOL,
+                    DataTypeEnum.NUMBER_DOUBLE,
+                    DataTypeEnum.NUMBER_INT,
+                    DataTypeEnum.STRING,
+                  ].includes(item.itemValue as DataTypeEnum)
+                );
+              }
+
               return hasStructForm
                 ? record.filter((item) => item.itemValue !== DataTypeEnum.STRUCT)
                 : record;

+import { StructJSON } from '/@/api/device/model/modelOfMatterModel';
 import { FormSchema } from '/@/components/Form';
+import { validateTCPCustomCommand } from '/@/components/Form/src/externalCompns/components/ThingsModelForm';
+import { DataTypeEnum } from '/@/enums/objectModelEnum';
 
 const InsertString = (t, c, n) => {
   const r: string | number[] = [];
@@ -127,21 +130,33 @@ const SingleToHexBatch = (t) => {
   return r.join('\r\n');
 };
 
-const formSchemasConfig = (schemas, actionType): FormSchema[] => {
-  const { identifier, functionName } = schemas;
+const formSchemasConfig = (schemas: StructJSON, actionType: string): FormSchema[] => {
+  const { identifier, functionName, dataType } = schemas;
+
+  if (dataType?.type === DataTypeEnum.STRING) {
+    return [
+      {
+        field: identifier,
+        label: functionName!,
+        component: 'Input',
+        rules: [{ required: true, validator: validateTCPCustomCommand }],
+        componentProps: {
+          placeholder: `请输入${functionName}`,
+        },
+      },
+    ];
+  }
+
   if (actionType == '06') {
     return [
       {
         field: identifier,
-        label: functionName,
+        label: functionName!,
         component: 'InputNumber',
         rules: [{ required: true, message: '请输入正数' }],
         componentProps: {
           min: 0,
-          formatter: (e) => {
-            const value = `${e}`.replace('-', '').replace(/^(-)*(\d+)\.(\d\d).*$/, '$1$2.$3');
-            return value;
-          },
+          precision: 2,
           placeholder: `请输入正数`,
         },
       },
@@ -150,7 +165,7 @@ const formSchemasConfig = (schemas, actionType): FormSchema[] => {
     return [
       {
         field: identifier,
-        label: functionName,
+        label: functionName!,
         component: 'InputNumber',
         rules: [{ required: true, message: '请输入值' }],
         componentProps: {
@@ -165,13 +180,12 @@ const formSchemasConfig = (schemas, actionType): FormSchema[] => {
     return [
       {
         field: identifier,
-        label: functionName,
+        label: functionName!,
         component: 'InputNumber',
         rules: [{ required: true, message: '请输入值' }],
         componentProps: {
           placeholder: `请输入数字`,
-          formatter: (e) =>
-            `${e}`.replace(/\B(?=(\d{3})+(?!\d))/g, '').replace(/^(-)*(\d+)\.(\d\d).*$/, '$1$2.$3'),
+          precision: 2,
         },
       },
     ];

@@ -35,6 +35,7 @@
   const zoomFactorValue = ref<number>(1); //缩放因子
   const isShowMultiply = ref<Boolean>(false); // 只有tcp --> int和double类型才相乘缩放因子
   const deviceTransportType = ref<string>();
+  const objectDataType = ref<DataTypeEnum>();
 
   const [register] = useModalInner(async (params: ModalParamsType<DeviceModelOfMatterAttrs>) => {
     const { record } = params;
@@ -48,6 +49,7 @@
     zoomFactorValue.value = zoomFactor ? Number(zoomFactor) : 1;
     isShowMultiply.value = type == 'INT' || type == 'DOUBLE' ? true : false;
     deviceTransportType.value = transportType;
+    objectDataType.value = type;
 
     let schemas = [{ dataType: dataType, identifier, functionName: name } as StructJSON];
 
@@ -136,7 +138,12 @@
 
       const sendValue = ref({});
       //判断tcp类型 标识符是自定义还是ModBus
-      if (unref(isShowModBUS)) {
+      if (unref(objectDataType) === DataTypeEnum.STRING) {
+        const flag = await validate();
+        if (!flag) return;
+        const value = getFieldsValue()[unref(formField)];
+        sendValue.value = value;
+      } else if (unref(isShowModBUS)) {
         if (!unref(isShowActionType)) {
           createMessage.warning('当前物模型扩展描述没有填写');
           return;