Merge branch 'ft_local_dev' into 'main'

fix:修改Teambitin上的问题

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

@@ -80,9 +80,10 @@ export const deleteDevice = (ids: string[]) => {
  * 查询设备配置
  * @param params pageSize page name
  */
-export const deviceProfile = () => {
+export const deviceProfile = (params) => {
   return defHttp.get({
     url: DeviceManagerApi.DEVICE_PROFILE_URL_ME,
+    params,
   });
 };
 

@@ -21,7 +21,7 @@ enum ScreenManagerApi {
   // GET_ATTRBUTELIST = '/device/keys',
   GET_ATTRBUTELIST = '/device/attributes/',
   ALARM_PROFILE = '/alarm/profile/',
-  MASTER_GET_DEVICE = '/device/list/master',
+  MASTER_GET_DEVICE = '/device/list',
 }
 
 /**
@@ -125,8 +125,8 @@ export const byOrganizationIdGetMasterDevice = (params: {
 }) => {
   const { organizationId, deviceProfileId } = params;
   return defHttp.get({
-    url: `${ScreenManagerApi.MASTER_GET_DEVICE}/${organizationId}`,
-    params: { deviceProfileId },
+    url: `${ScreenManagerApi.MASTER_GET_DEVICE}`,
+    params: { deviceProfileId, organizationId },
   });
 };
 //TODO-fengtao

@@ -81,6 +81,9 @@ export const columns: BasicColumn[] = [
     title: '名称',
     dataIndex: 'name',
     width: 120,
+    format: (_text: string, record: Recordable) => {
+      return record?.alias ? record?.alias : record?.name;
+    },
   },
   {
     title: '设备状态',

@@ -447,39 +447,3 @@ export const formSchema: FormSchema[] = [
     },
   },
 ];
-
-export const topicTableColumn: BasicColumn[] = [
-  {
-    title: '功能',
-    dataIndex: 'function',
-    width: 100,
-  },
-  {
-    title: '发布主题',
-    dataIndex: 'release',
-    width: 100,
-  },
-
-  {
-    title: '订阅主题',
-    dataIndex: 'subscribe',
-    width: 100,
-  },
-  {
-    title: '平台',
-    dataIndex: 'platform',
-    width: 30,
-  },
-
-  {
-    title: '设备',
-    dataIndex: 'device',
-    width: 30,
-  },
-
-  // {
-  //   title: '描述',
-  //   dataIndex: 'description',
-  //   width: 100,
-  // },
-];

 <script lang="ts" setup>
-  import { topicTableColumn } from '../device.profile.data';
   import { BasicTable, useTable } from '/@/components/Table';
-
-  const list = [
-    {
-      function: '网关/直连设备遥测',
-      release: 'v1/devices/me/telemetry',
-      subscribe: 'v1/devices/me/telemetry',
-      platform: '订阅',
-      device: '发布',
-    },
-    {
-      function: '服务端命令下发到设备端',
-      release: 'v1/devices/me/rpc/request/$request_id',
-      subscribe: 'v1/devices/me/rpc/request/+',
-      platform: '发布',
-      device: '订阅',
-    },
-    {
-      function: '设备端响应命令到服务端',
-      release: 'v1/devices/me/rpc/response/$request_id',
-      subscribe: 'v1/devices/me/rpc/response/+',
-      platform: '订阅',
-      device: '发布',
-    },
-    {
-      function: '直连设备属性上报',
-      release: 'v1/devices/me/attributes',
-      subscribe: 'v1/devices/me/attributes',
-      platform: '订阅',
-      device: '发布',
-    },
-
-    {
-      function: '设备端请求服务端共享属性及客户端属性',
-      release: 'vv1/devices/me/attributes/response/$request_id',
-      subscribe: 'v1/devices/me/attributes/response/+',
-      platform: '订阅',
-      device: '发布',
-    },
-    {
-      function: '服务端响应共享属性集客户端属性给设备端',
-      release: 'v1/devices/me/attributes/response/$request_id',
-      subscribe: 'v1/devices/me/attributes/response/+',
-      platform: '发布',
-      device: '订阅',
-    },
-    {
-      function: '设备端请求服务端子设备共享属性及客户端属性',
-      release: 'v1/gateway/attributes/request',
-      subscribe: 'v1/gateway/attributes/request',
-      platform: '订阅',
-      device: '发布',
-    },
-    {
-      function: '服务端响应子设备共享属性及客户端属性给设备端',
-      release: 'v1/gateway/attributes/response',
-      subscribe: 'v1/gateway/attributes/response',
-      platform: '发布',
-      device: '订阅',
-    },
-    {
-      function: '设备端上报子设备客户端属性',
-      release: 'v1/gateway/attributes',
-      subscribe: 'v1/gateway/attributes',
-      platform: '订阅',
-      device: '发布',
-    },
-    {
-      function: '网关子设备遥测',
-      release: 'v1/gateway/telemetry',
-      subscribe: 'v1/gateway/telemetry',
-      platform: '订阅',
-      device: '发布',
-    },
-  ];
-
-  const dataSource = list;
+  import { list, topicTableColumn } from './topic';
 
   const [register] = useTable({
     title: 'Topic',
     showIndexColumn: false,
-    dataSource,
+    dataSource: list,
     columns: topicTableColumn,
     bordered: true,
     showTableSetting: true,

+import { BasicColumn } from '/@/components/Table/src/types/table';
+
+export const topicTableColumn: BasicColumn[] = [
+  {
+    title: '设备类型',
+    dataIndex: 'deviceType',
+    width: 50,
+    customRender: ({ text, index }: { text: any; index: number }) => {
+      const obj: any = {
+        children: text,
+        attrs: {},
+      };
+      if (index === 0) {
+        obj.attrs.rowSpan = 6;
+      }
+      if (index > 0 && index < 6) {
+        obj.attrs.rowSpan = 0;
+      }
+      if (index > 6) {
+        obj.attrs.rowSpan = 0;
+      }
+      if (index === 6) {
+        obj.attrs.rowSpan = 4;
+      }
+      return obj;
+    },
+  },
+  {
+    title: '功能',
+    dataIndex: 'function',
+    width: 100,
+  },
+  {
+    title: '发布主题',
+    dataIndex: 'release',
+    width: 120,
+  },
+  {
+    title: '订阅主题',
+    dataIndex: 'subscribe',
+    width: 120,
+  },
+  {
+    title: '平台',
+    dataIndex: 'platform',
+    width: 30,
+  },
+  {
+    title: '设备',
+    dataIndex: 'device',
+    width: 30,
+  },
+];
+
+export const list = [
+  {
+    deviceType: '网关/直连设备',
+    function: '网关/直连设备遥测',
+    release: 'v1/devices/me/telemetry',
+    subscribe: 'v1/devices/me/telemetry',
+    platform: '订阅',
+    device: '发布',
+  },
+  {
+    deviceType: '网关/直连设备',
+    function: '服务端命令下发到设备端',
+    release: 'v1/devices/me/rpc/request/$request_id',
+    subscribe: 'v1/devices/me/rpc/request/+',
+    platform: '发布',
+    device: '订阅',
+  },
+  {
+    deviceType: '网关/直连设备',
+    function: '设备端响应命令到服务端',
+    release: 'v1/devices/me/rpc/response/$request_id',
+    subscribe: 'v1/devices/me/rpc/response/+',
+    platform: '订阅',
+    device: '发布',
+  },
+  {
+    deviceType: '网关/直连设备',
+    function: '直连设备属性上报',
+    release: 'v1/devices/me/attributes',
+    subscribe: 'v1/devices/me/attributes',
+    platform: '订阅',
+    device: '发布',
+  },
+
+  {
+    deviceType: '网关/直连设备',
+    function: '设备端请求服务端共享属性及客户端属性',
+    release: 'v1/devices/me/attributes/response/$request_id',
+    subscribe: 'v1/devices/me/attributes/response/+',
+    platform: '订阅',
+    device: '发布',
+  },
+  {
+    deviceType: '网关/直连设备',
+    function: '服务端响应共享属性集客户端属性给设备端',
+    release: 'v1/devices/me/attributes/response/$request_id',
+    subscribe: 'v1/devices/me/attributes/response/+',
+    platform: '发布',
+    device: '订阅',
+  },
+  {
+    deviceType: '网关子设备',
+    function: '设备端请求服务端子设备共享属性及客户端属性',
+    release: 'v1/gateway/attributes/request',
+    subscribe: 'v1/gateway/attributes/request',
+    platform: '订阅',
+    device: '发布',
+  },
+  {
+    deviceType: '网关子设备',
+    function: '服务端响应子设备共享属性及客户端属性给设备端',
+    release: 'v1/gateway/attributes/response',
+    subscribe: 'v1/gateway/attributes/response',
+    platform: '发布',
+    device: '订阅',
+  },
+  {
+    deviceType: '网关子设备',
+    function: '设备端上报子设备客户端属性',
+    release: 'v1/gateway/attributes',
+    subscribe: 'v1/gateway/attributes',
+    platform: '订阅',
+    device: '发布',
+  },
+  {
+    deviceType: '网关子设备',
+    function: '网关子设备遥测',
+    release: 'v1/gateway/telemetry',
+    subscribe: 'v1/gateway/telemetry',
+    platform: '订阅',
+    device: '发布',
+  },
+];

@@ -131,7 +131,7 @@
         selectOptions.value = items.map((item) => {
           if (item.deviceType !== 'GATEWAY')
             return {
-              label: item.name,
+              label: item.alias ? item.alias : item.name,
               value: item.tbDeviceId,
               id: item.id,
               deviceProfileId: item.deviceProfileId,
@@ -291,7 +291,7 @@
       selectOptions.value = items.map((item) => {
         if (item.deviceType !== 'GATEWAY')
           return {
-            label: item.name,
+            label: item.alias ? item.alias : item.name,
             value: item.tbDeviceId,
             id: item.id,
             deviceProfileId: item.deviceProfileId,
@@ -316,7 +316,7 @@
         });
         return {
           ...T,
-          label: item.name,
+          label: item.alias ? item.alias : item.name,
           value: item.device,
           attributes: item.attributes,
         };

@@ -245,6 +245,7 @@
             operationType: trigger?.triggerCondition?.condition?.condition[0]?.valueType,
             detail: trigger?.triggerCondition?.alarmDetails,
             entityId: trigger?.entityId,
+            deviceType: trigger?.deviceType,
             deviceProfileId: trigger?.deviceProfileId,
             replaceValue: trigger?.triggerCondition?.condition?.spec?.predicate?.defaultValue,
             time: trigger?.triggerCondition?.condition?.spec?.predicate?.defaultValue,
@@ -325,6 +326,7 @@
             operationType: condition?.triggerCondition?.condition?.condition[0]?.valueType,
             detail: condition?.triggerCondition?.alarmDetails,
             entityId: condition?.entityId,
+            deviceType: condition?.deviceType,
             deviceProfileId: condition?.deviceProfileId,
             replaceValue: condition?.triggerCondition?.condition?.spec?.predicate?.defaultValue,
             time: condition?.triggerCondition?.condition?.spec?.predicate?.defaultValue,
@@ -397,6 +399,7 @@
             deviceId: action.deviceId,
             alarm_config: action.alarmProfileId,
             alarm_level: action.doContext.alarmLevel,
+            deviceType: action.deviceType,
           });
           // 如果是设备输出设置脚本值
           if (action.outTarget === 'DEVICE_OUT') {
@@ -436,6 +439,7 @@
                         .valueType,
                     detail: action.doContext.clearRule[index].triggerCondition.alarmDetails,
                     entityId: action.doContext.clearRule[index].entityId,
+                    deviceType: action.doContext.clearRule[index].entityId?.deviceType,
                     deviceProfileId: action.doContext.clearRule[index]?.deviceProfileId,
                     replaceValue:
                       action.doContext.clearRule[index].triggerCondition.condition.spec.predicate

@@ -193,6 +193,7 @@ export const trigger_condition_schema: FormSchema[] = [
     field: 'triggered',
     label: '',
     component: 'Select',
+    defaultValue: 'SIMPLE',
     componentProps: {
       placeholder: '请选择触发类型',
       options: [
@@ -204,14 +205,44 @@ export const trigger_condition_schema: FormSchema[] = [
     colProps: { span: 6 },
   },
   {
-    field: 'deviceProfileId',
+    field: 'deviceType',
     label: '',
     component: 'ApiSelect',
     colProps: { span: 6 },
+    defaultValue: 'SENSOR',
     componentProps: ({ formActionType }) => {
+      const { setFieldsValue } = formActionType;
+      return {
+        api: findDictItemByCode,
+        params: {
+          dictCode: 'device_type',
+        },
+        placeholder: '请选择类型',
+        labelField: 'itemText',
+        valueField: 'itemValue',
+        getPopupContainer: () => document.body,
+        onChange(e) {
+          if (e) {
+            setFieldsValue({ deviceProfileId: '' });
+          }
+        },
+      };
+    },
+  },
+  {
+    field: 'deviceProfileId',
+    label: '',
+    component: 'ApiSelect',
+    colProps: { span: 6 },
+    componentProps: ({ formActionType, formModel }) => {
       const { updateSchema, setFieldsValue } = formActionType;
+      const deviceType = formModel['deviceType'];
       return {
         api: deviceProfile,
+        params: {
+          deviceType,
+        },
+        showSearch: true,
         placeholder: '请选择产品',
         labelField: 'name',
         valueField: 'id',
@@ -372,14 +403,38 @@ export const actionSchema: FormSchema[] = [
     colProps: { span: 6 },
   },
   {
+    field: 'deviceType',
+    label: '',
+    component: 'ApiSelect',
+    colProps: { span: 6 },
+    defaultValue: 'SENSOR',
+    componentProps: () => {
+      return {
+        api: findDictItemByCode,
+        params: {
+          dictCode: 'device_type',
+        },
+        placeholder: '请选择类型',
+        labelField: 'itemText',
+        valueField: 'itemValue',
+        getPopupContainer: () => document.body,
+      };
+    },
+    ifShow: ({ values }) => isDeviceOut(values.outTarget),
+  },
+  {
     field: 'deviceProfileId',
     label: '',
     component: 'ApiSelect',
     colProps: { span: 6 },
-    componentProps: ({ formActionType }) => {
+    componentProps: ({ formActionType, formModel }) => {
       const { setFieldsValue } = formActionType;
+      const deviceType = formModel['deviceType'];
       return {
         api: deviceProfile,
+        params: {
+          deviceType,
+        },
         placeholder: '请选择产品',
         labelField: 'name',
         valueField: 'id',

@@ -18,6 +18,7 @@ export const genTriggerOrConditionData = (triggerData) => {
     timeUnit,
     replaceValue,
     deviceProfileId,
+    deviceType,
   } = triggerData;
   const mapPredicate = predicate?.map((item) => {
     return {
@@ -45,6 +46,7 @@ export const genTriggerOrConditionData = (triggerData) => {
     triggerType,
     entityType: device,
     entityId: entityId?.length ? entityId : null,
+    deviceType,
     triggerCondition: {
       alarmDetails: detail,
       condition: {
@@ -83,6 +85,7 @@ export const genActionData = (actionData) => {
     callType,
     service,
     thingsModelId,
+    deviceType,
   } = actionData;
   const clearRule = clearRules.map((item) => {
     const mapPredicate = item.predicate.map((pred) => {
@@ -117,6 +120,7 @@ export const genActionData = (actionData) => {
       triggerType: item.triggerType,
       entityType: item.device,
       entityId: item.device === 'PART' ? item.entityId : null,
+      deviceType,
       deviceProfileId: item.deviceProfileId,
       triggerCondition: {
         alarmDetails: item.detail,
@@ -138,6 +142,7 @@ export const genActionData = (actionData) => {
     {
       alarmProfileId: alarm_config,
       outTarget,
+      deviceType,
       entityType: device ?? 'ALL',
       deviceId: device === 'PART' ? deviceId : null,
       deviceProfileId,

@@ -103,7 +103,7 @@
     params: '',
     output: '',
     dataType: 'HEX',
-    saveOriginalData: 'false',
+    saveOriginalData: 'true',
   });
   const reportTypeOptions = reactive({
     typeOptions: [],
@@ -114,6 +114,10 @@
   const { clipboardRef, copiedRef } = useCopyToClipboard();
   const aceEditor = ref();
   const aceRef = ref();
+  const setDefaultRadio = (p1, p2) => {
+    scriptForm.dataType = p1;
+    scriptForm.saveOriginalData = p2;
+  };
   onMounted(async () => {
     const res: any = await findDictItemByCode({
       dictCode: 'report_data_type',
@@ -127,8 +131,6 @@
     reportTypeOptions.originalOptions = resOriginal.map((m) => {
       return { label: m.itemText, value: m.itemValue };
     });
-    scriptForm.dataType = 'HEX';
-    scriptForm.saveOriginalData = 'false';
   });
   // 初始化编辑器
   const initEditor = (jsScript?: string) => {
@@ -202,7 +204,7 @@
         setTimeout(() => {
           scriptForm.saveOriginalData = v.saveOriginalData === false ? 'false' : 'true';
           scriptForm.dataType = v.dataType;
-        }, 500);
+        }, 10);
       });
       aceEditor.value.setValue(v.convertJs);
       handleFormat();
@@ -229,6 +231,7 @@
     setFormData,
     setScriptContentData,
     setScriptOutputData,
+    setDefaultRadio,
   });
 </script>
 <style lang="less" scoped>

@@ -56,6 +56,9 @@
           ? '新增转换脚本'
           : '测试转换脚本';
       const okText = isText.value == 'test' ? '测试' : '确定';
+      if (unref(isTitle) == 'add') {
+        converScriptRef.value?.setDefaultRadio('HEX', 'true');
+      }
       if (unref(isTitle) == 'edit') {
         converScriptRef.value?.setFormData(data.record);
       }