Merge branch 'ww' into 'main'

fix: BUG in teambition

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

@@ -25,7 +25,7 @@ export const step1Schemas: FormSchema[] = [
     colProps: { span: 14 },
     colProps: { span: 14 },
     componentProps: {
     componentProps: {
       placeholder: '设备名称',
       placeholder: '设备名称',
-      maxLength: 30,
+      maxLength: 255,
     },
     },
   },
   },
   {
   {
@@ -34,6 +34,9 @@ export const step1Schemas: FormSchema[] = [
     component: 'Input',
     component: 'Input',
     labelWidth: 60,
     labelWidth: 60,
     colProps: { span: 10 },
     colProps: { span: 10 },
+    componentProps: {
+      maxLength: 255,
+    },
   },
   },
   {
   {
     field: 'sn',
     field: 'sn',

@@ -8,6 +8,8 @@ import moment from 'moment';
 import { h } from 'vue';
 import { h } from 'vue';
 import { Button } from 'ant-design-vue';
 import { Button } from 'ant-design-vue';
 import { TypeEnum } from './data';
 import { TypeEnum } from './data';
+import { PageEnum } from '/@/enums/pageEnum';
+import { useGo } from '/@/hooks/web/usePage';
 
 
 // 设备详情的描述
 // 设备详情的描述
 export const descSchema = (emit: EmitType): DescItem[] => {
 export const descSchema = (emit: EmitType): DescItem[] => {
@@ -27,11 +29,15 @@ export const descSchema = (emit: EmitType): DescItem[] => {
     {
     {
       field: 'deviceProfile.name',
       field: 'deviceProfile.name',
       label: '产品',
       label: '产品',
-      render(val, data) {
-        if (TypeEnum.SENSOR !== data.deviceType) return val;
+      render(val) {
+        const go = useGo();
         return h(
         return h(
           Button,
           Button,
-          { type: 'link', style: { padding: 0 }, onClick: () => emit('open-gateway-device', data) },
+          {
+            type: 'link',
+            style: { padding: 0 },
+            onClick: () => go(PageEnum.DEVICE_PROFILE + '?name=' + String(val)),
+          },
           { default: () => val }
           { default: () => val }
         );
         );
       },
       },
@@ -40,6 +46,14 @@ export const descSchema = (emit: EmitType): DescItem[] => {
       field: 'gatewayName',
       field: 'gatewayName',
       label: '所属网关',
       label: '所属网关',
       show: (data) => !!data.gatewayName,
       show: (data) => !!data.gatewayName,
+      render(val, data) {
+        if (TypeEnum.SENSOR !== data.deviceType) return val;
+        return h(
+          Button,
+          { type: 'link', style: { padding: 0 }, onClick: () => emit('open-gateway-device', data) },
+          { default: () => val }
+        );
+      },
     },
     },
     {
     {
       field: 'deviceType',
       field: 'deviceType',

@@ -47,8 +47,8 @@
           </div>
           </div>
         </BasicModal>
         </BasicModal>
       </div>
       </div>
-      <Description @register="register" class="mt-4" :data="deviceDetail" /> </div
-    >设备Topic
+      <Description @register="register" class="mt-4" :data="deviceDetail" />
+    </div>
     <div class="mt-4">
     <div class="mt-4">
       <a-button type="primary" class="mr-4" @click="copyTbDeviceId">复制设备ID</a-button>
       <a-button type="primary" class="mr-4" @click="copyTbDeviceId">复制设备ID</a-button>
       <a-button type="primary" class="mr-4" @click="copyDeviceToken">复制访问令牌</a-button>
       <a-button type="primary" class="mr-4" @click="copyDeviceToken">复制访问令牌</a-button>

@@ -292,5 +292,6 @@
 <style>
 <style>
   .history-modal .ant-input-number {
   .history-modal .ant-input-number {
     min-width: 0 !important;
     min-width: 0 !important;
+    width: 100% !important;
   }
   }
 </style>
 </style>

@@ -2,14 +2,14 @@
   import { BasicForm, useForm } from '/@/components/Form';
   import { BasicForm, useForm } from '/@/components/Form';
   import { defaultSchemas, SchemaFiled } from './config';
   import { defaultSchemas, SchemaFiled } from './config';
   import { onMounted } from 'vue';
   import { onMounted } from 'vue';
+  import { useGridLayout } from '/@/hooks/component/useGridLayout';
+  import { ColEx } from '/@/components/Form/src/types';
 
 
   const emit = defineEmits(['register']);
   const emit = defineEmits(['register']);
   const [register, method] = useForm({
   const [register, method] = useForm({
     schemas: defaultSchemas,
     schemas: defaultSchemas,
     labelWidth: 120,
     labelWidth: 120,
-    baseColProps: {
-      span: 5,
-    },
+    baseColProps: useGridLayout(2, 3, 4) as unknown as ColEx,
     fieldMapToTime: [
     fieldMapToTime: [
       [SchemaFiled.DATE_RANGE, [SchemaFiled.START_TS, SchemaFiled.END_TS], 'YYYY-MM-DD HH:mm:ss'],
       [SchemaFiled.DATE_RANGE, [SchemaFiled.START_TS, SchemaFiled.END_TS], 'YYYY-MM-DD HH:mm:ss'],
     ],
     ],

@@ -43,6 +43,7 @@
       width="70%"
       width="70%"
       :minHeight="400"
       :minHeight="400"
       :footer="null"
       :footer="null"
+      wrap-class-name="history-trend-model"
       :canFullscreen="false"
       :canFullscreen="false"
       @cancel="handleCancelModal"
       @cancel="handleCancelModal"
     >
     >
@@ -218,8 +219,8 @@
         });
         });
 
 
         markerList.forEach((record) => {
         markerList.forEach((record) => {
-          unref(BMapInstance).addOverlay(record.marker);
-          unref(BMapInstance).addOverlay(record.label);
+          unref(BMapInstance)?.addOverlay(record.marker);
+          unref(BMapInstance)?.addOverlay(record.label);
           const isAlarmStatus = !!record.alarmStatus;
           const isAlarmStatus = !!record.alarmStatus;
           if (isAlarmStatus) {
           if (isAlarmStatus) {
             const alarmStatusClassName = 'device-status__alarm';
             const alarmStatusClassName = 'device-status__alarm';
@@ -487,6 +488,11 @@
   }
   }
 </style>
 </style>
 <style>
 <style>
+  .history-trend-model .ant-input-number {
+    min-width: 0 !important;
+    width: 100% !important;
+  }
+
   .device-status__alarm {
   .device-status__alarm {
     transform-origin: 10px 15px;
     transform-origin: 10px 15px;
     animation: 0.5s linear 0s infinite alternate Scale;
     animation: 0.5s linear 0s infinite alternate Scale;

@@ -2,6 +2,7 @@
   <BasicModal
   <BasicModal
     title="物模型TSL"
     title="物模型TSL"
     :maskClosable="false"
     :maskClosable="false"
+    destroyOnClose
     v-bind="$attrs"
     v-bind="$attrs"
     width="55rem"
     width="55rem"
     @register="register"
     @register="register"

@@ -28,9 +28,10 @@
         </template>
         </template>
       </Tabs>
       </Tabs>
     </div>
     </div>
-    <div>
+    <div class="relative">
       <Spin :spinning="loading">
       <Spin :spinning="loading">
         <div id="jsoneditor" ref="jsoneditorEl"></div>
         <div id="jsoneditor" ref="jsoneditorEl"></div>
+        <div class="absolute top-0 left-0 w-full h-full"></div>
       </Spin>
       </Spin>
     </div>
     </div>
   </div>
   </div>

@@ -216,10 +216,15 @@
 <template>
 <template>
   <div class="w-full h-full flex justify-center items-center flex-col p-2">
   <div class="w-full h-full flex justify-center items-center flex-col p-2">
     <div
     <div
-      class="w-full flex"
+      class="w-full flex justify-end"
       v-if="props.layout?.componentType === FrontComponent.MAP_COMPONENT_TRACK_HISTORY"
       v-if="props.layout?.componentType === FrontComponent.MAP_COMPONENT_TRACK_HISTORY"
     >
     >
-      <Button type="text" class="!px-2 flex-auto !text-left truncate" @click="handleTrackSwitch">
+      <Button
+        v-if="!random"
+        type="text"
+        class="!px-2 flex-auto !text-left truncate"
+        @click="handleTrackSwitch"
+      >
         <div class="w-full truncate text-gray-500 flex items-center">
         <div class="w-full truncate text-gray-500 flex items-center">
           <ClockCircleOutlined />
           <ClockCircleOutlined />
           <span class="mx-1">历史</span>
           <span class="mx-1">历史</span>