Merge branch 'ww' into 'main'

fix: device details object model do not restict device types

See merge request huang/yun-teng-iot-front!397

@@ -152,6 +152,14 @@ export const formSchemas: FormSchema[] = [
           setFieldsValue({ [FormField.UNIT_NAME]: label });
         },
         getPopupContainer: () => document.body,
+        showSearch: true,
+        filterOption: (inputValue: string, option: Record<'label' | 'value', string>) => {
+          let { label, value } = option;
+          label = label.toLowerCase();
+          value = value.toLowerCase();
+          inputValue = inputValue.toLowerCase();
+          return label.includes(inputValue) || value.includes(inputValue);
+        },
       };
     },
     ifShow: ({ values }) =>

@@ -16,7 +16,7 @@
           @open-gateway-device="handleOpenGatewayDevice"
         />
       </TabPane>
-      <TabPane v-if="deviceDetail?.deviceType !== 'GATEWAY'" key="modelOfMatter" tab="物模型">
+      <TabPane key="modelOfMatter" tab="物模型">
         <ModelOfMatter :deviceDetail="deviceDetail" />
       </TabPane>
       <!-- <TabPane key="2" tab="实时数据" v-if="deviceDetail?.deviceType !== 'GATEWAY'">
@@ -105,6 +105,7 @@
       const handleOpenGatewayDevice = (data: { gatewayId: string; tbDeviceId: string }) => {
         emit('openGatewayDeviceDetail', { id: data.gatewayId });
       };
+
       return {
         size,
         activeKey,

@@ -45,8 +45,11 @@ export const physicalColumn: BasicColumn[] = [
   },
   {
     title: '数据类型',
-    dataIndex: 'functionJson.type',
+    dataIndex: 'functionJson.dataType.type',
     width: 100,
+    format: (text: string) => {
+      return text || '--';
+    },
   },
   {
     title: '创建时间',

@@ -201,6 +201,7 @@
 
   const handleReturn = () => (isShowBtn.value = false);
   const handleEmit = () => {
+    isShowBtn.value = false;
     createMessage.success('发布成功');
   };
 

@@ -27,10 +27,6 @@
   const isUpdate = ref(false);
 
   const [register, { closeModal, setModalProps }] = useModalInner(async (data) => {
-    // const record = await getModelTsl({
-    //   functionType: FunctionType.PROPERTIES,
-    //   deviceProfileId: props.record.id,
-    // });
     setModalProps({ confirmLoading: true });
     isUpdate.value = data.isUpdate;
     setModalProps({ confirmLoading: false });

@@ -7,25 +7,31 @@
         </TypographyParagraph>
       </Typography>
     </div>
-    <div class="flex justify-between items-center">
-      <div>模型内容</div>
-      <div>
-        <Button @click="handlePremitter">
-          <template #icon>
-            <SortAscendingOutlined />
-          </template>
-          格式化
-        </Button>
-        <Button class="ml-2" @click="handleCopy">
-          <template #icon>
-            <CopyOutlined />
-          </template>
-          copy
-        </Button>
-      </div>
+    <div>
+      <Tabs type="card" v-model:active-key="activeKey" @change="handleSwitchTsl">
+        <Tabs.TabPane :key="FunctionType.PROPERTIES" tab="属性" />
+        <Tabs.TabPane :key="FunctionType.SERVICE" tab="服务" />
+        <Tabs.TabPane :key="FunctionType.EVENTS" tab="事件" />
+        <template #tabBarExtraContent>
+          <Button @click="handlePremitter">
+            <template #icon>
+              <SortAscendingOutlined />
+            </template>
+            格式化
+          </Button>
+          <Button class="ml-2" @click="handleCopy">
+            <template #icon>
+              <CopyOutlined />
+            </template>
+            copy
+          </Button>
+        </template>
+      </Tabs>
     </div>
-    <div class="mt-4">
-      <div id="jsoneditor" ref="jsoneditorRef"></div>
+    <div>
+      <Spin :spinning="loading">
+        <div id="jsoneditor" ref="jsoneditorRef"></div>
+      </Spin>
     </div>
   </div>
 </template>
@@ -36,19 +42,29 @@
   import { useMessage } from '/@/hooks/web/useMessage';
   import jsoneditor from 'jsoneditor';
   import 'jsoneditor/dist/jsoneditor.min.css';
-  import { Button, Typography, TypographyParagraph } from 'ant-design-vue';
-  import { defaultTslContent } from './config';
+  import { Button, Typography, TypographyParagraph, Tabs, Spin } from 'ant-design-vue';
+  import { FunctionType } from './config';
   import useCommon from '../hook/useCommon';
+  import { DeviceRecord } from '/@/api/device/model/deviceModel';
+  import { getModelTsl } from '/@/api/device/modelOfMatter';
+
+  const props = defineProps<{
+    record: DeviceRecord;
+  }>();
+
+  const loading = ref(false);
 
   const { createMessage } = useMessage();
 
   const { useBlockContent } = useCommon();
 
-  const jsonValue = ref(defaultTslContent);
+  const jsonValue = ref();
 
   const jsonInstance = ref();
 
-  const jsoneditorRef = ref();
+  const jsoneditorRef = ref<Recordable>();
+
+  const activeKey = ref(FunctionType.PROPERTIES);
 
   onMounted(() => {
     nextTick(() => {
@@ -89,13 +105,25 @@
   };
 
   const resetFormData = () => {
-    unref(jsonInstance).set(defaultTslContent);
+    unref(jsonInstance).set();
   };
 
   const handlePremitter = () => {
     const value = unref(jsonInstance).get();
     return unref(jsonInstance).set(value);
   };
+
+  const handleSwitchTsl = async (functionType: FunctionType) => {
+    try {
+      loading.value = true;
+      const record = await getModelTsl({ deviceProfileId: props.record.id, functionType });
+      console.log(record);
+    } catch (error) {
+    } finally {
+      loading.value = false;
+    }
+  };
+
   defineExpose({
     getFormData,
     resetFormData,

-import { buildUUID } from '/@/utils/uuid';
-
-//模拟的阿里云（属性、服务、事件）服务端格式
-export const mockData = {
-  _ppk: {},
-  events: [
-    {
-      createTs: 1668151471327,
-      custom: true,
-      eventName: 'SDK运行状态',
-      eventType: 'INFO_EVENT_TYPE',
-      identifier: 'ContentSdkStatusEvent',
-      outputData: [
-        {
-          id: buildUUID(),
-
-          custom: true,
-          dataSpecs: {
-            dataType: 'INT',
-            max: '1024',
-            min: '-1024',
-            precise: 0,
-            step: '1',
-            unit: '',
-            unitName: '无',
-          },
-          dataType: 'INT',
-          direction: 'PARAM_OUTPUT',
-          identifier: 'Status',
-          name: '状态类型值',
-          paraOrder: 0,
-        },
-        {
-          id: buildUUID(),
-
-          custom: true,
-          dataSpecs: {
-            dataType: 'TEXT',
-            length: 1024,
-          },
-          dataType: 'TEXT',
-          direction: 'PARAM_OUTPUT',
-          identifier: 'Message',
-          name: '消息内容',
-          paraOrder: 1,
-        },
-        {
-          id: buildUUID(),
-
-          custom: true,
-          dataSpecsList: [
-            {
-              id: buildUUID(),
-
-              childDataType: 'INT',
-              childName: '测试结构体回显1',
-              childSpecsDTO: {
-                dataType: 'INT',
-                max: '22',
-                min: '11',
-                step: '3',
-              },
-              custom: true,
-              dataSpecs: {
-                dataType: 'INT',
-                max: '22',
-                min: '11',
-                step: '3',
-              },
-              dataType: 'STRUCT',
-              identifier: '1',
-              isStd: 0,
-              name: '测试结构体回显1',
-            },
-            {
-              id: buildUUID(),
-
-              childDataType: 'BOOL',
-              childEnumSpecsDTO: [
-                {
-                  dataType: 'BOOL',
-                  name: 'ffg',
-                  value: 0,
-                },
-                {
-                  dataType: 'BOOL',
-                  name: 'ggg',
-                  value: 1,
-                },
-              ],
-              childName: '测试结构体回显2',
-              custom: true,
-              dataSpecsList: [
-                {
-                  dataType: 'BOOL',
-                  name: 'ffg',
-                  value: 0,
-                },
-                {
-                  dataType: 'BOOL',
-                  name: 'ggg',
-                  value: 1,
-                },
-              ],
-              dataType: 'STRUCT',
-              identifier: '3',
-              isStd: 0,
-              name: '测试结构体回显2',
-            },
-            {
-              id: buildUUID(),
-
-              childDataType: 'TEXT',
-              childName: '测试结构体回显3',
-              childSpecsDTO: {
-                dataType: 'TEXT',
-                length: 10240,
-              },
-              custom: true,
-              dataSpecs: {
-                dataType: 'TEXT',
-                length: 10240,
-              },
-              dataType: 'STRUCT',
-              identifier: '33',
-              isStd: 0,
-              name: '测试结构体回显3',
-            },
-            {
-              id: buildUUID(),
-
-              childDataType: 'DOUBLE',
-              childName: '测试结构体回显4',
-              childSpecsDTO: {
-                dataType: 'DOUBLE',
-                max: '44.0',
-                min: '33.0',
-                step: '5.0',
-                unit: 'gear',
-                unitName: '档',
-              },
-              custom: true,
-              dataSpecs: {
-                dataType: 'DOUBLE',
-                max: '44.0',
-                min: '33.0',
-                step: '5.0',
-                unit: 'gear',
-                unitName: '档',
-              },
-              dataType: 'STRUCT',
-              identifier: '4',
-              isStd: 0,
-              name: '测试结构体回显4',
-            },
-          ],
-          dataType: 'STRUCT',
-          direction: 'PARAM_OUTPUT',
-          identifier: '1',
-          name: '测试结构体回显',
-          paraOrder: 2,
-        },
-        {
-          id: buildUUID(),
-
-          custom: true,
-          dataSpecsList: [
-            {
-              dataType: 'BOOL',
-              name: 'er',
-              value: 0,
-            },
-            {
-              dataType: 'BOOL',
-              name: 'dd',
-              value: 1,
-            },
-          ],
-          dataType: 'BOOL',
-          direction: 'PARAM_OUTPUT',
-          identifier: '2212',
-          name: 'bool类型',
-          paraOrder: 3,
-        },
-      ],
-      productKey: 'hsrnXEfGFDv',
-      required: false,
-    },
-  ],
-  productKey: 'hsrnXEfGFDv',
-  properties: [
-    {
-      createTs: 1668152010679,
-      custom: true,
-      customFlag: true,
-      dataSpecsList: [
-        {
-          id: buildUUID(),
-
-          childDataType: 'TEXT',
-          childName: '测试化学需氧量text类型',
-          childSpecsDTO: {
-            dataType: 'TEXT',
-            length: 10240,
-          },
-          custom: true,
-          dataSpecs: {
-            dataType: 'TEXT',
-            length: 10240,
-          },
-          dataType: 'STRUCT',
-          identifier: 'text',
-          isStd: 0,
-          name: '测试化学需氧量text类型',
-        },
-        {
-          id: buildUUID(),
-
-          childDataType: 'INT',
-          childName: '测试化学需氧量int类型',
-          childSpecsDTO: {
-            dataType: 'INT',
-            max: '22',
-            min: '11',
-            step: '2',
-            unit: 'mm/hour',
-            unitName: '降雨量',
-          },
-          custom: true,
-          dataSpecs: {
-            dataType: 'INT',
-            max: '22',
-            min: '11',
-            step: '2',
-            unit: 'mm/hour',
-            unitName: '降雨量',
-          },
-          dataType: 'STRUCT',
-          identifier: 'ibt',
-          isStd: 0,
-          name: '测试化学需氧量int类型',
-        },
-        {
-          id: buildUUID(),
-
-          childDataType: 'BOOL',
-          childEnumSpecsDTO: [
-            {
-              dataType: 'BOOL',
-              name: '需要',
-              value: 0,
-            },
-            {
-              dataType: 'BOOL',
-              name: '不需要',
-              value: 1,
-            },
-          ],
-          childName: '测试化学需氧量bool类型',
-          custom: true,
-          dataSpecsList: [
-            {
-              dataType: 'BOOL',
-              name: '需要',
-              value: 0,
-            },
-            {
-              dataType: 'BOOL',
-              name: '不需要',
-              value: 1,
-            },
-          ],
-          dataType: 'STRUCT',
-          identifier: 'bol',
-          isStd: 0,
-          name: '测试化学需氧量bool类型',
-        },
-      ],
-      dataType: 'STRUCT',
-      description:
-        '化学需氧量COD（Chemical Oxygen Demand）是以化学方法测量水样中需要被氧化的还原性物质的量',
-      identifier: 'COD',
-      name: '化学需氧量',
-      productKey: 'hsrnXEfGFDv',
-      required: false,
-      rwFlag: 'READ_WRITE',
-      std: false,
-    },
-  ],
-  services: [
-    {
-      callType: 'SYNC',
-      createTs: 1668148397946,
-      custom: true,
-      description: '删除模型1',
-      identifier: 'DeleteModel',
-      inputParams: [
-        {
-          id: buildUUID(),
-          custom: true,
-          dataSpecs: {
-            dataType: 'TEXT',
-            length: 128,
-          },
-          dataType: 'TEXT',
-          direction: 'PARAM_INPUT',
-          identifier: 'AlgorithmID',
-          name: 'text类型',
-          paraOrder: 0,
-        },
-        {
-          id: buildUUID(),
-          custom: true,
-          dataSpecsList: [
-            {
-              id: buildUUID(),
-
-              childDataType: 'INT',
-              childName: '结构体里面1',
-              childSpecsDTO: {
-                dataType: 'INT',
-                max: '22',
-                min: '11',
-                step: '3',
-                unit: 'W/㎡',
-                unitName: '太阳总辐射',
-              },
-              custom: true,
-              dataSpecs: {
-                dataType: 'INT',
-                max: '22',
-                min: '11',
-                step: '3',
-                unit: 'W/㎡',
-                unitName: '太阳总辐射',
-              },
-              dataType: 'STRUCT',
-              identifier: '1',
-              isStd: 0,
-              name: '结构体里面1',
-            },
-            {
-              id: buildUUID(),
-
-              childDataType: 'BOOL',
-              childEnumSpecsDTO: [
-                {
-                  dataType: 'BOOL',
-                  name: '关',
-                  value: 0,
-                },
-                {
-                  dataType: 'BOOL',
-                  name: '开',
-                  value: 1,
-                },
-              ],
-              childName: '结构体里面2',
-              custom: true,
-              dataSpecsList: [
-                {
-                  dataType: 'BOOL',
-                  name: '关',
-                  value: 0,
-                },
-                {
-                  dataType: 'BOOL',
-                  name: '开',
-                  value: 1,
-                },
-              ],
-              dataType: 'STRUCT',
-              identifier: '2',
-              isStd: 0,
-              name: '结构体里面2',
-            },
-            {
-              id: buildUUID(),
-
-              childDataType: 'TEXT',
-              childName: '结构体里面3',
-              childSpecsDTO: {
-                dataType: 'TEXT',
-                length: 10240,
-              },
-              custom: true,
-              dataSpecs: {
-                dataType: 'TEXT',
-                length: 10240,
-              },
-              dataType: 'STRUCT',
-              identifier: '3',
-              isStd: 0,
-              name: '结构体里面3',
-            },
-          ],
-          dataType: 'STRUCT',
-          direction: 'PARAM_INPUT',
-          identifier: '1',
-          name: '结构体里面数据',
-          paraOrder: 1,
-        },
-        {
-          id: buildUUID(),
-
-          custom: true,
-          dataSpecsList: [
-            {
-              dataType: 'BOOL',
-              name: '开启',
-              value: 0,
-            },
-            {
-              dataType: 'BOOL',
-              name: '战斗',
-              value: 1,
-            },
-          ],
-          dataType: 'BOOL',
-          direction: 'PARAM_INPUT',
-          identifier: 'bool',
-          name: '布尔类型',
-          paraOrder: 2,
-        },
-        {
-          id: buildUUID(),
-
-          custom: true,
-          dataSpecs: {
-            dataType: 'INT',
-            max: '22',
-            min: '11',
-            step: '4',
-            unit: 'dS/m',
-            unitName: '土壤EC值',
-          },
-          dataType: 'INT',
-          direction: 'PARAM_INPUT',
-          identifier: 'int',
-          name: 'int类型',
-          paraOrder: 3,
-        },
-      ],
-      outputParams: [
-        {
-          id: buildUUID(),
-
-          custom: true,
-          dataSpecs: {
-            dataType: 'TEXT',
-            length: 10240,
-          },
-          dataType: 'TEXT',
-          direction: 'PARAM_OUTPUT',
-          identifier: '2',
-          name: '测试输出回显text类型',
-          paraOrder: 0,
-        },
-        {
-          id: buildUUID(),
-
-          custom: true,
-          dataSpecs: {
-            dataType: 'INT',
-            max: '22',
-            min: '11',
-            step: '3',
-            unit: 'W/㎡',
-            unitName: '太阳总辐射',
-          },
-          dataType: 'INT',
-          direction: 'PARAM_OUTPUT',
-          identifier: 'int',
-          name: '测试输出回显int类型',
-          paraOrder: 1,
-        },
-        {
-          id: buildUUID(),
-
-          custom: true,
-          dataSpecsList: [
-            {
-              dataType: 'BOOL',
-              name: 'd',
-              value: 0,
-            },
-            {
-              dataType: 'BOOL',
-              name: 'ff',
-              value: 1,
-            },
-          ],
-          dataType: 'BOOL',
-          direction: 'PARAM_OUTPUT',
-          identifier: 'bol',
-          name: '测试输出回显bool类型',
-          paraOrder: 2,
-        },
-        {
-          id: buildUUID(),
-
-          custom: true,
-          dataSpecsList: [
-            {
-              id: buildUUID(),
-
-              childDataType: 'INT',
-              childName: '测试输出回显结构体类型1',
-              childSpecsDTO: {
-                dataType: 'INT',
-                max: '22',
-                min: '11',
-                step: '4',
-                unit: 'mm/hour',
-                unitName: '降雨量',
-              },
-              custom: true,
-              dataSpecs: {
-                dataType: 'INT',
-                max: '22',
-                min: '11',
-                step: '4',
-                unit: 'mm/hour',
-                unitName: '降雨量',
-              },
-              dataType: 'STRUCT',
-              identifier: '1',
-              isStd: 0,
-              name: '测试输出回显结构体类型1',
-            },
-            {
-              id: buildUUID(),
-
-              childDataType: 'BOOL',
-              childEnumSpecsDTO: [
-                {
-                  dataType: 'BOOL',
-                  name: 'ff',
-                  value: 0,
-                },
-                {
-                  dataType: 'BOOL',
-                  name: 'gg',
-                  value: 1,
-                },
-              ],
-              childName: '测试输出回显结构体类型2',
-              custom: true,
-              dataSpecsList: [
-                {
-                  dataType: 'BOOL',
-                  name: 'ff',
-                  value: 0,
-                },
-                {
-                  dataType: 'BOOL',
-                  name: 'gg',
-                  value: 1,
-                },
-              ],
-              dataType: 'STRUCT',
-              identifier: '3',
-              isStd: 0,
-              name: '测试输出回显结构体类型2',
-            },
-            {
-              id: buildUUID(),
-
-              childDataType: 'TEXT',
-              childName: '测试输出回显结构体类型3',
-              childSpecsDTO: {
-                dataType: 'TEXT',
-                length: 10240,
-              },
-              custom: true,
-              dataSpecs: {
-                dataType: 'TEXT',
-                length: 10240,
-              },
-              dataType: 'STRUCT',
-              identifier: '12',
-              isStd: 0,
-              name: '测试输出回显结构体类型3',
-            },
-          ],
-          dataType: 'STRUCT',
-          direction: 'PARAM_OUTPUT',
-          identifier: 'struct',
-          name: '测试输出回显结构体类型',
-          paraOrder: 3,
-        },
-      ],
-      productKey: 'hsrnXEfGFDv',
-      required: false,
-      serviceName: '删除模型1',
-    },
-  ],
-};

@@ -65,29 +65,6 @@ const isBool = (type: string) => {
   return type === DateTypeEnum.IS_BOOL;
 };
 
-export const defaultTslContent = {
-  schema: 'https://iotx-tsl.oss-ap-southeast-1.aliyuncs.com/schema.json',
-  profile: {
-    version: '1.5',
-    productKey: 'glzlnU7azMO',
-  },
-  properties: [
-    {
-      identifier: 'LightStatus',
-      name: '工作状态',
-      accessMode: 'rw',
-      required: true,
-      dataType: {
-        type: 'bool',
-        specs: {
-          '0': '关闭',
-          '1': '打开',
-        },
-      },
-    },
-  ],
-};
-
 export const serviceSchemas = (tcpDeviceFlag: boolean): FormSchema[] => {
   return [
     {