Merge branch 'ft' into 'main_dev'

fix: 修改Teambition上的问题

See merge request yunteng/thingskit-front!542

@@ -10,6 +10,8 @@ export type SchedueParam = {
   data?: any;
   code?: number;
   jobId?: string;
+  startTime?: number;
+  endTime?: number;
 };
 
 export interface ReportModel {

@@ -18,6 +18,7 @@
               placeholder="请选择"
               :options="selectOptions"
               @change="handleChange"
+              @dropdownVisibleChange="hanldeDropdownVisibleChange"
               allowClear
             />
           </td>
@@ -111,16 +112,20 @@
 
   // 减少
   const remove = (item, index: number) => {
-    if (tableArray.content.length !== 1) {
+    if (tableArray.content.length > 1) {
       selectOptions.value.forEach((ele) => {
         if (ele.value == item.key) {
           ele.disabled = false;
         }
       });
       tableArray.content.splice(index, 1);
+    } else {
+      resetValue();
     }
   };
 
+  const hanldeDropdownVisibleChange = () => handleChange();
+
   //Select互斥
   const handleChange = () => {
     selectOptions.value.forEach((ele) => {

@@ -18,6 +18,7 @@
               placeholder="请选择"
               :options="selectOptions"
               @change="handleChange"
+              @dropdownVisibleChange="hanldeDropdownVisibleChange"
               allowClear
             />
           </td>
@@ -111,13 +112,15 @@
 
   // 减少
   const remove = (item, index: number) => {
-    if (tableArray.content.length !== 1) {
+    if (tableArray.content.length > 1) {
       selectOptions.value.forEach((ele) => {
         if (ele.value == item.key) {
           ele.disabled = false;
         }
       });
       tableArray.content.splice(index, 1);
+    } else {
+      resetValue();
     }
   };
 
@@ -139,6 +142,8 @@
     });
   };
 
+  const hanldeDropdownVisibleChange = () => handleChange();
+
   //获取数据
   const getValue = () => {
     const assemblyData = tableArray.content.map((it) => {

@@ -6,6 +6,7 @@
         <ParamsTable ref="paramsCellTableRef" :method="method" />
         <ParamsTest
           @testParamsInterface="handleTestParamsInterface"
+          @closeTest="onCloseTest"
           ref="testParamsRequestRef"
           :data="dataMap.mapParamsObj"
         />
@@ -21,6 +22,7 @@
         <BodyTest
           v-if="bodyType !== 'none'"
           @testBodyInterface="handleTestBodyInterface"
+          @closeTest="onCloseTest"
           ref="testBodyRequestRef"
           :data="dataMap.mapBodyObj"
         />
@@ -29,6 +31,7 @@
         <HeaderTable ref="editHeaderCellTableRef" :method="method" />
         <HeaderTest
           @testHeaderInterface="handleTestHeaderInterface"
+          @closeTest="onCloseTest"
           ref="testHeaderRequestRef"
           :data="dataMap.mapHeaderObj"
         />
@@ -107,6 +110,8 @@
     excuteTestRef.value?.resetValue(true);
   };
 
+  const onCloseTest = () => excuteTestRef.value?.resetValue(true);
+
   //if-else-if-else分支优化
   const dataForTypeMap = [
     [(type) => type === 'Params', (data) => paramsCellTableRef.value?.setValue(data)],

 <template>
   <div>
     <div class="mt-8">
-      <div>
-        <Button @click="handleTest" type="primary"> 测试接口 </Button>
+      <div class="flex">
+        <Button @click="handleTest" type="primary"> 打开测试接口 </Button>
+        <Button class="ml-2" @click="onCloseTest" type="primary"> 关闭测试接口 </Button>
       </div>
       <div v-if="showTestEditCell" class="mt-8">
         <a-row type="flex" justify="center">
@@ -31,8 +32,9 @@
   import moment from 'moment';
   import { useUtils } from '../../../hooks/useUtils';
   import JsonEditor from '../../SimpleRequest/components/jsonEditor.vue';
+  import { useMessage } from '/@/hooks/web/useMessage';
 
-  const emits = defineEmits(['testBodyInterface']);
+  const emits = defineEmits(['testBodyInterface', 'closeTest']);
 
   const props = defineProps({
     data: {
@@ -40,6 +42,8 @@
     },
   });
 
+  const { createMessage } = useMessage();
+
   const showTestEditCell = ref(false);
 
   const excuteData = ref({});
@@ -111,6 +115,7 @@
         return {
           key,
           value,
+          required: it.required,
         };
       });
   };
@@ -120,6 +125,11 @@
     let params: any = {};
     if (props.data?.type === 'x-www-form-urlencoded' || props.data?.type === 'form-data') {
       const getTable = getTestTableKeyValue();
+      const hasRequired = getTable?.some((it) => it.required === true && !it.value);
+      if (hasRequired) {
+        createMessage.error('参数不能为空');
+        throw new Error('参数不能为空');
+      }
       getTable?.map((it) => (params[it.key!] = it.value!));
     } else if (props.data?.type === 'json') {
       params = jsonEditorRef.value?.getJsonValue();
@@ -141,6 +151,11 @@
     testResult.value = '';
   };
 
+  const onCloseTest = () => {
+    showTestEditCell.value = false;
+    emits('closeTest');
+  };
+
   defineExpose({
     setValue,
     handleTest,

@@ -243,7 +243,9 @@
         if (f.key === 'organizationId') organizationId = f.value;
         if (f.key === 'entityId') f.value = null;
       });
-      getAttributeOptions({ deviceProfileId: e.value });
+      if (e.value) {
+        getAttributeOptions({ deviceProfileId: e.value });
+      }
       if (organizationId !== '') {
         getEntityOptions(organizationId, e.value);
       }

@@ -5,10 +5,10 @@
     </div>
     <div class="mt-8">
       <a-row type="flex" justify="center">
-        <a-col :span="2"> 测试结果 </a-col>
-        <a-col :span="22">
+        <a-col :span="24">
           <a-textarea
-            v-if="ifWebSocket === '2'"
+            disabled
+            v-if="isWebSocketType === '2'"
             allow-clear
             show-count
             v-model:value="testResult"
@@ -16,6 +16,7 @@
             :rows="8"
           />
           <a-textarea
+            disabled
             v-else
             allow-clear
             show-count
@@ -29,14 +30,13 @@
   </div>
 </template>
 <script lang="ts" setup name="testRequest">
-  import { nextTick, ref, reactive } from 'vue';
+  import { nextTick, ref, reactive, onUnmounted } from 'vue';
   import { Button } from 'ant-design-vue';
   import { otherHttp } from '/@/utils/http/axios';
   import { useWebSocket } from '@vueuse/core';
   import { JWT_TOKEN_KEY } from '/@/enums/cacheEnum';
   import { getAuthCache } from '/@/utils/auth';
-  import { useMessage } from '/@/hooks/web/useMessage';
-  // import { useGlobSetting } from '/@/hooks/setting';
+  import { useUtils } from '../../../hooks/useUtils';
 
   const emits = defineEmits(['emitExcute']);
 
@@ -48,16 +48,10 @@
 
   const showTestFlag = ref(false);
 
-  const ifWebSocket = ref('');
-
-  const { createMessage } = useMessage();
-
   const token = getAuthCache(JWT_TOKEN_KEY);
 
   const socketUrls = ref('');
 
-  // const { socketUrl } = useGlobSetting();
-
   const socketMessage: any = reactive({
     server: ``,
     sendValue: {
@@ -89,6 +83,8 @@
 
   const httpResult = ref('');
 
+  const isWebSocketType = ref('');
+
   //执行测试接口
   const handleExcute = () => {
     emits('emitExcute');
@@ -99,18 +95,23 @@
     await nextTick();
     //获取Params和Header和Body
     const Objects = props.data;
-    const isWebSocketType = Objects?.method;
+    isWebSocketType.value = Objects?.method;
     const apiType = Objects?.apiType;
     const url = Objects?.apiGetUrl;
     const headers = Objects?.Header?.params;
     const params = Objects?.Params?.params;
     const body = Objects?.Body?.params;
     const apiUrl = url?.restfulFormat(params);
-    ifWebSocket.value = isWebSocketType;
-    if (isWebSocketType === '2') {
+    if (isWebSocketType.value === '2') {
       socketUrls.value = url;
       socketMessage.server = `${socketUrls.value}?token=${token}`;
-      websocketRequest(params);
+      const list = Object.values(params);
+      const isEmpty = list.some((it) => it === '' || null || undefined);
+      if (!isEmpty) {
+        websocketRequest(params);
+      } else {
+        resetValue(false);
+      }
     } else {
       const resp = await otherHttpRequest(apiType, apiUrl?.split('{?')[0], headers, params, body);
       if (!resp) return;
@@ -119,7 +120,7 @@
   };
 
   //websocket请求
-  const websocketRequest = (params) => {
+  const websocketRequest = (params, destroy = false) => {
     //websocket请求
     Reflect.deleteProperty(params, 'deviceProfileId');
     Reflect.deleteProperty(params, 'organizationId');
@@ -140,12 +141,17 @@
         console.log('断开连接了');
         close();
       },
-      onError() {
-        createMessage.error('webSocket连接超时,请联系管理员');
-      },
+      onError() {},
     });
+    if (destroy) close();
   };
 
+  onUnmounted(() => {
+    if (isWebSocketType.value === '2') {
+      websocketRequest(null, true);
+    }
+  });
+
   //TODO: 待优化 项目自带第三方请求
   const otherHttpRequest = async (
     apiType,
@@ -165,8 +171,9 @@
           }
         );
       case 'POST':
+        const { convertObj } = useUtils();
         return await otherHttp.post(
-          { url: apiUrl, data: body, headers, params },
+          { url: `${apiUrl}?${convertObj(params)}`, data: body, headers },
           {
             apiUrl: '',
             joinPrefix,
@@ -189,7 +196,7 @@
     }
     httpResult.value = '测试结果为：';
     testResult.value = '测试结果为：';
-    ifWebSocket.value = '0';
+    isWebSocketType.value = '0';
   };
 
   const showTest = () => (showTestFlag.value = true);

 <template>
   <div>
     <div class="mt-8">
-      <div>
-        <Button @click="handleTest" type="primary"> 测试接口 </Button>
+      <div class="flex">
+        <Button @click="handleTest" type="primary"> 打开测试接口 </Button>
+        <Button class="ml-2" @click="onCloseTest" type="primary"> 关闭测试接口 </Button>
       </div>
       <div v-if="showTestEditCell" class="mt-8">
         <a-row type="flex" justify="center">
@@ -20,8 +21,9 @@
   import { ref, nextTick } from 'vue';
   import { Button } from 'ant-design-vue';
   import TestHeaderEditCellTable from './testEditHeaderCellTable.vue';
+  import { useMessage } from '/@/hooks/web/useMessage';
 
-  const emits = defineEmits(['testHeaderInterface']);
+  const emits = defineEmits(['testHeaderInterface', 'closeTest']);
 
   const props = defineProps({
     data: {
@@ -29,6 +31,8 @@
     },
   });
 
+  const { createMessage } = useMessage();
+
   const showTestEditCell = ref(false);
 
   const excuteData = ref({});
@@ -59,6 +63,11 @@
   //获取数据
   const getTestValue = () => {
     const getTable = getTestTableKeyValue();
+    const hasRequired = getTable?.some((it) => it.required === true && !it.value);
+    if (hasRequired) {
+      createMessage.error('参数不能为空');
+      throw new Error('参数不能为空');
+    }
     const params: any = {};
     getTable?.map((it: any) => (params[it.key!] = it.value!));
     excuteData.value = {
@@ -73,6 +82,11 @@
     testResult.value = '';
   };
 
+  const onCloseTest = () => {
+    showTestEditCell.value = false;
+    emits('closeTest');
+  };
+
   defineExpose({
     setValue,
     handleTest,

 <template>
   <div>
     <div class="mt-8">
-      <div>
-        <Button @click="handleTest" type="primary"> 测试接口 </Button>
+      <div class="flex">
+        <Button @click="handleTest" type="primary"> 打开测试接口 </Button>
+        <Button class="ml-2" @click="onCloseTest" type="primary"> 关闭测试接口 </Button>
       </div>
       <div v-if="showTestEditCell" class="mt-8">
         <a-row type="flex" justify="center">
@@ -22,8 +23,9 @@
   import TestParamsCellTable from './testEditParamsCellTable.vue';
   import moment from 'moment';
   import { useUtils } from '../../../hooks/useUtils';
+  import { useMessage } from '/@/hooks/web/useMessage';
 
-  const emits = defineEmits(['testParamsInterface']);
+  const emits = defineEmits(['testParamsInterface', 'closeTest']);
 
   const props = defineProps({
     data: {
@@ -31,6 +33,8 @@
     },
   });
 
+  const { createMessage } = useMessage();
+
   const showTestEditCell = ref(false);
 
   const excuteData = ref({});
@@ -92,6 +96,7 @@
         return {
           key,
           value,
+          required: it.required,
         };
       });
   };
@@ -99,6 +104,11 @@
   //获取数据
   const getTestValue = () => {
     const getTable = getTestTableKeyValue();
+    const hasRequired = getTable?.some((it) => it.required === true && !it.value);
+    if (hasRequired) {
+      createMessage.error('参数不能为空');
+      throw new Error('参数不能为空');
+    }
     const params: any = {};
     getTable?.map((it) => (params[it.key!] = it.value!));
     if (params['keys']) {
@@ -116,6 +126,11 @@
     testResult.value = '';
   };
 
+  const onCloseTest = () => {
+    showTestEditCell.value = false;
+    emits('closeTest');
+  };
+
   defineExpose({
     setValue,
     handleTest,

@@ -235,7 +235,9 @@
         if (f.key === 'organizationId') organizationId = f.value;
         if (f.key === 'entityId') f.value = null;
       });
-      getAttributeOptions({ deviceProfileId: e.value });
+      if (e.value) {
+        getAttributeOptions({ deviceProfileId: e.value });
+      }
       if (organizationId !== '') {
         getEntityOptions(organizationId, e.value);
       }

@@ -46,7 +46,7 @@
   import { useMessage } from '/@/hooks/web/useMessage';
   import { useUtils } from './hooks/useUtils';
 
-  const { resetReqHttpType, resetUpdateSchema } = useUtils();
+  const { resetReqHttpType } = useUtils();
 
   const emits = defineEmits(['success', 'register']);
 
@@ -69,10 +69,15 @@
   const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
     await resetFields();
     await nextTick();
-    updateSchema(resetUpdateSchema);
     setFieldsValue(resetReqHttpType);
     const title = `${!data.isUpdate ? '新增' : '修改'}公共接口`;
     setDrawerProps({ title });
+    updateSchema({
+      field: 'requestHttpTypeAndUrl',
+      componentProps: {
+        type: '0',
+      },
+    });
     isUpdate.value = data.isUpdate;
     !isUpdate.value ? (putId.value = '') : (putId.value = data.record.id);
     simpleRequestRef.value?.resetValue() && testSqlRef.value?.resetValue();
@@ -104,6 +109,14 @@
     try {
       const values = await validate();
       if (!values) return;
+      const isRequestHttpTypeAndUrlEmpty = values?.requestHttpTypeAndUrl;
+      if (
+        !Reflect.get(isRequestHttpTypeAndUrlEmpty, 'requestHttpType') ||
+        !Reflect.get(isRequestHttpTypeAndUrlEmpty, 'requestUrl')
+      ) {
+        createMessage.error('请填写请求类型&地址');
+        throw Error('请填写请求类型&地址');
+      }
       const Objects = simpleRequestRef.value?.getValue(true);
       const requestOriginUrl =
         values['originUrlType'] === 'server_url' ? 'localhost' : values['requestOriginUrl'];

@@ -36,5 +36,20 @@ export const useUtils = () => {
       type: '0',
     },
   };
-  return { getMultipleKeys, pushObj, resetReqHttpType, resetUpdateSchema };
+  //对象转get params参数
+  const convertObj = (data: object) => {
+    const _result: any = [];
+    for (const key in data) {
+      const value = data[key];
+      if (value.constructor == Array) {
+        value.forEach(function (_value) {
+          _result.push(key + '=' + _value);
+        });
+      } else {
+        _result.push(key + '=' + value);
+      }
+    }
+    return _result.join('&');
+  };
+  return { getMultipleKeys, pushObj, resetReqHttpType, resetUpdateSchema, convertObj };
 };

@@ -39,7 +39,7 @@
               icon: 'ant-design:node-expand-outlined',
               onClick: handlePublish.bind(null, 'publish', record),
               ifShow: () => {
-                return record.state === 0;
+                return record.state === 0 && record.creator === userId;
               },
             },
             {
@@ -47,7 +47,7 @@
               icon: 'ant-design:node-collapse-outlined',
               onClick: handlePublish.bind(null, 'canelPublish', record),
               ifShow: () => {
-                return record.state === 1;
+                return record.state === 1 && record.creator === userId;
               },
             },
             {
@@ -55,7 +55,7 @@
               icon: 'clarity:note-edit-line',
               onClick: handleCreateOrEdit.bind(null, record),
               ifShow: () => {
-                return record.state === 0;
+                return record.state === 0 && record.creator === userId;
               },
             },
             {
@@ -63,7 +63,7 @@
               icon: 'ant-design:delete-outlined',
               color: 'error',
               ifShow: () => {
-                return record.state === 0;
+                return record.state === 0 && record.creator === userId;
               },
               popConfirm: {
                 title: '是否确认删除',
@@ -93,6 +93,12 @@
   import { Popconfirm, Modal } from 'ant-design-vue';
   import { JsonPreview } from '/@/components/CodeEditor';
   import { useMessage } from '/@/hooks/web/useMessage';
+  import { USER_INFO_KEY } from '/@/enums/cacheEnum';
+  import { getAuthCache } from '/@/utils/auth';
+
+  const userInfo = getAuthCache(USER_INFO_KEY) as any;
+
+  const userId = ref(userInfo?.userId);
 
   const [registerTable, { reload, clearSelectedRowKeys }] = useTable({
     api: getDataViewInterfacePage,

@@ -52,6 +52,9 @@
     compact: true,
     baseColProps: { span: 8 },
     schemas: searchFormSchema,
+    resetFunc: async () => {
+      getDataSource({ name: '' });
+    },
     submitFunc: async () => {
       getDataSource({ pageSize: pagination.pageSize, page: 1 });
     },

 <script lang="ts" setup>
   import { Button, Tag } from 'ant-design-vue';
-  import { h, onMounted, ref, unref } from 'vue';
+  import { h, onMounted, ref, unref, Ref } from 'vue';
   import { DeviceRecord } from '/@/api/device/model/deviceModel';
-  import { ScriptRecord } from '/@/api/scriptmanage/model/scriptModel';
+  // import { ScriptRecord } from '/@/api/scriptmanage/model/scriptModel';
   import { getScriptManageMeList } from '/@/api/scriptmanage/scriptManager';
   import { Description, useDescription } from '/@/components/Description';
   import { useModal } from '/@/components/Modal';
   import CoverScriptModal from '/@/views/scriptmanage/converscript/ConverScriptModal.vue';
+  import { SelectTypes } from 'ant-design-vue/es/select';
 
   const props = defineProps<{
     record: DeviceRecord['profileData']['transportConfiguration'];
   }>();
 
-  const scriptInfo = ref<ScriptRecord>({} as unknown as ScriptRecord);
+  // const scriptInfo = ref<ScriptRecord>({} as unknown as ScriptRecord);
+  const authScriptIdStr = ref('');
+
+  const upScriptIdStr = ref('');
+
+  const selectUpOptions: Ref<SelectTypes['options']> = ref([]);
+
+  const selectAuthOptions: Ref<SelectTypes['options']> = ref([]);
+
+  onMounted(async () => {
+    selectUpOptions.value = await getAllScriptType('TRANSPORT_TCP_UP');
+    selectAuthOptions.value = await getAllScriptType('TRANSPORT_TCP_AUTH');
+    setDescProps({
+      data: Object.assign(props.record),
+    });
+  });
+
+  const getAllScriptType = async (type) => {
+    const rest = await getScriptManageMeList({ scriptType: type });
+    return rest.map((m) => ({ label: m.name, value: m.id }));
+  };
+
+  const findScriptUpName = (scriptId) => {
+    upScriptIdStr.value = scriptId;
+    return selectUpOptions.value?.find((it) => it.value === scriptId)?.label;
+  };
+
+  const findScriptAuthName = (scriptId) => {
+    authScriptIdStr.value = scriptId;
+    return selectAuthOptions.value?.find((it) => it.value === scriptId)?.label;
+  };
 
   const [register, { setDescProps }] = useDescription({
     layout: 'vertical',
@@ -25,14 +56,27 @@
         span: 2,
       },
       {
-        field: 'scriptName',
-        label: '转换脚本',
+        field: 'authScriptId',
+        label: '鉴权脚本',
         render: (value: string) => {
           return (
             value &&
             h('div', [
-              h(Tag, { color: 'blue' }, () => value),
-              h(Button, { type: 'link', onClick: handleTestScript }, () => '测试脚本'),
+              h(Tag, { color: 'blue' }, () => findScriptAuthName(value)),
+              h(Button, { type: 'link', onClick: handleTestAuthScript }, () => '测试脚本'),
+            ])
+          );
+        },
+      },
+      {
+        field: 'upScriptId',
+        label: '上行脚本',
+        render: (value: string) => {
+          return (
+            value &&
+            h('div', [
+              h(Tag, { color: 'blue' }, () => findScriptUpName(value)),
+              h(Button, { type: 'link', onClick: handleTestUpScript }, () => '测试脚本'),
             ])
           );
         },
@@ -42,29 +86,24 @@
 
   const [registerModal, { openModal }] = useModal();
 
-  const handleTestScript = () => {
+  const handleTestAuthScript = () => {
     openModal(true, {
       isUpdate: false,
       isTest: true,
-      record: unref(scriptInfo).id,
+      record: unref(authScriptIdStr),
       isText: 'test',
       isTitle: 'test',
     });
   };
 
-  onMounted(() => {
-    getTransforScriptInfo();
-  });
-
-  const getTransforScriptInfo = async () => {
-    try {
-      const list = await getScriptManageMeList();
-      const record = list.find((item) => item.id === props.record.scriptId);
-      scriptInfo.value = record!;
-      setDescProps({
-        data: Object.assign(props.record, record, { scriptName: record?.name || '' }),
-      });
-    } catch (error) {}
+  const handleTestUpScript = () => {
+    openModal(true, {
+      isUpdate: false,
+      isTest: true,
+      record: unref(upScriptIdStr),
+      isText: 'test',
+      isTitle: 'test',
+    });
   };
 </script>
 

@@ -41,7 +41,7 @@
   </BasicDrawer>
 </template>
 <script lang="ts" setup>
-  import { ref, computed, unref, reactive, watch, Ref } from 'vue';
+  import { ref, computed, unref, reactive, watch, Ref, nextTick } from 'vue';
   import { BasicForm, useForm } from '/@/components/Form';
   import { formSchema, organizationId } from './config.data';
   import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
@@ -198,6 +198,7 @@
   const isViewDetail = ref(false);
 
   const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
+    await nextTick();
     await resetFields();
     setDrawerProps({ confirmLoading: false });
     isUpdate.value = !!data?.isUpdate;
@@ -222,6 +223,10 @@
       await setFieldsValue(editResData.data);
       //回显嵌套数据
       await setFieldsValue({
+        dateGroupGap:
+          editResData.data.queryCondition?.queryMode === 1
+            ? editResData.data.queryCondition?.interval
+            : null,
         agg: editResData.data.queryCondition?.agg,
         interval: editResData.data.queryCondition?.interval,
         limit: editResData.data.queryCondition?.limit,
@@ -266,6 +271,7 @@
         { label: '最大值', value: AggregateDataEnum.MAX },
         { label: '平均值', value: AggregateDataEnum.AVG },
         { label: '求和', value: AggregateDataEnum.SUM },
+        { label: '计数', value: AggregateDataEnum.COUNT },
         { label: '空', value: AggregateDataEnum.NONE },
       ];
       const updateSchemaAgg = (options: {}) => {
@@ -276,8 +282,8 @@
           },
         });
       };
-      if (editResData.data.dataType == 1) updateSchemaAgg(dataCompareOpions.slice(0, 4));
-      else updateSchemaAgg(dataCompareOpions.slice(4, 5));
+      if (editResData.data.dataType == 1) updateSchemaAgg(dataCompareOpions.slice(0, 5));
+      else updateSchemaAgg(dataCompareOpions.slice(5, 6));
       //回显执行方式和查询周期
       const dataQueryOpions = [
         { label: '固定周期', value: QueryWay.LATEST },
@@ -442,7 +448,7 @@
       }
       queryCondition = {
         agg: values.agg,
-        interval: values.interval,
+        interval: values?.queryMode === 'latest' ? values.interval : values.dateGroupGap,
         limit: values.limit,
         ...{
           startTs: startTs.value,

 import { ref } from 'vue';
 import { BasicColumn, FormSchema } from '/@/components/Table';
 import type { FormSchema as QFormSchema } from '/@/components/Form/index';
-import moment from 'moment';
 import { getOrganizationList } from '/@/api/system/system';
 import { copyTransFun } from '/@/utils/fnUtils';
 import { findDictItemByCode } from '/@/api/system/dict';
@@ -12,6 +11,7 @@ import {
   getPacketIntervalByValue,
   intervalOption,
 } from '../../device/localtion/cpns/TimePeriodForm/helper';
+import moment, { Moment } from 'moment';
 
 export enum QueryWay {
   LATEST = 'latest',
@@ -433,16 +433,70 @@ export const formSchema: QFormSchema[] = [
     ifShow({ values }) {
       return values[SchemaFiled.WAY] === QueryWay.TIME_PERIOD && !isFixedTime(values.executeWay);
     },
-    componentProps: {
-      showTime: {
-        defaultValue: [moment('00:00:00', 'HH:mm:ss'), moment('23:59:59', 'HH:mm:ss')],
-      },
+    // componentProps: {
+    //   showTime: {
+    //     defaultValue: [moment('00:00:00', 'HH:mm:ss'), moment('23:59:59', 'HH:mm:ss')],
+    //   },
+    // },
+    componentProps({ formActionType }) {
+      const { setFieldsValue } = formActionType;
+      let dates: Moment[] = [];
+      return {
+        showTime: {
+          defaultValue: [moment('00:00:00', 'HH:mm:ss'), moment('23:59:59', 'HH:mm:ss')],
+        },
+        onCalendarChange(value: Moment[]) {
+          dates = value;
+        },
+        disabledDate(current: Moment) {
+          if (!dates || dates.length === 0 || !current) {
+            return false;
+          }
+          const diffDate = current.diff(dates[0], 'years', true);
+          return Math.abs(diffDate) > 1;
+        },
+        onChange() {
+          dates = [];
+          setFieldsValue({ dateGroupGap: null });
+        },
+        getPopupContainer: () => document.body,
+      };
     },
     colProps: {
       span: 10,
     },
   },
   {
+    field: 'dateGroupGap',
+    label: '分组间隔',
+    component: 'Select',
+    dynamicRules: ({ model }) => {
+      return [
+        {
+          required: model[SchemaFiled.AGG] !== AggregateDataEnum.NONE,
+          message: '分组间隔为必填项',
+          type: 'number',
+        },
+      ];
+    },
+    ifShow({ values }) {
+      return values[SchemaFiled.WAY] === QueryWay.TIME_PERIOD && !isFixedTime(values.executeWay);
+    },
+    componentProps({ formModel, formActionType }) {
+      const options =
+        formModel[SchemaFiled.WAY] === QueryWay.LATEST
+          ? getPacketIntervalByValue(formModel[SchemaFiled.START_TS])
+          : getPacketIntervalByRange(formModel[SchemaFiled.DATE_RANGE]);
+      if (formModel[SchemaFiled.AGG] !== AggregateDataEnum.NONE) {
+        formActionType.setFieldsValue({ [SchemaFiled.LIMIT]: null });
+      }
+      return {
+        options,
+        getPopupContainer: () => document.body,
+      };
+    },
+  },
+  {
     field: SchemaFiled.START_TS,
     label: '最近时间',
     component: 'Select',

@@ -128,6 +128,7 @@
   import { findOperation } from './config/formatData';
   import { formatToDateTime } from '/@/utils/dateUtil';
   import ObjectModelValidateForm from '/@/components/Form/src/externalCompns/components/ObjectModelValidateForm/ObjectModelValidateForm.vue';
+  import { isEmpty } from '/@/utils/is';
   import { add } from '/@/components/Form/src/componentMap';
 
   add('ObjectModelValidateForm', ObjectModelValidateForm);
@@ -156,7 +157,7 @@
   const id = ref(undefined);
   const tenantId = ref(undefined);
   const isView = ref(true);
-  const [registerForm, { resetFields, validate, setFieldsValue }] = useForm({
+  const [registerForm, { resetFields, validate, setFieldsValue, getFieldsValue }] = useForm({
     labelWidth: 120,
     schemas: formSchema,
     showActionButtonGroup: false,
@@ -617,12 +618,25 @@
   //     item.updateFieldAlarmConfig(alarmConfigList);
   //   });
   // }
+
+  const isEmptyThrowError = (obj) => {
+    if (isEmpty(obj)) {
+      createMessage.error('请选择组织');
+      throw Error('请选择组织');
+    }
+    if (!Reflect.get(obj, 'organizationId')) {
+      createMessage.error('请选择组织');
+      throw Error('请选择组织');
+    }
+  };
+
   // 添加触发器
   const addTrigger = () => {
     unref(triggerData).push(Date.now());
     nextTick(() => {
       setFields(skipUnwrap.triggerItemRefs);
     });
+    isEmptyThrowError(getFieldsValue());
   };
   // 添加执行条件
   const addCondition = () => {
@@ -630,6 +644,7 @@
     nextTick(() => {
       setFields(skipUnwrap.conditionItemRefs);
     });
+    isEmptyThrowError(getFieldsValue());
   };
   // 添加执行动作
   const addAction = () => {
@@ -637,6 +652,7 @@
     nextTick(() => {
       setFields(skipUnwrap.actionItemRefs);
     });
+    isEmptyThrowError(getFieldsValue());
   };
 
   /**

-<template>
-  <div>
-    <a-form
-      ref="formRef"
-      :model="scriptForm"
-      name="basic"
-      :label-col="{ span: 4 }"
-      :wrapper-col="{ span: 16 }"
-      autocomplete="off"
-    >
-      <a-form-item
-        :label="ifAdd ? '名称' : '输入参数(params)'"
-        :name="ifAdd ? 'name' : 'params'"
-        :rules="[{ required: true, message: ifAdd ? '请输入脚本名称' : '请输入参数' }]"
-      >
-        <a-input
-          v-if="ifAdd"
-          :maxlength="36"
-          @change="handleInputChange"
-          v-model:value="scriptForm.name"
-          placeholder="请输入脚本名称"
-        />
-        <a-input
-          @change="handleInputChange"
-          v-else
-          v-model:value="scriptForm.params"
-          placeholder="请输入参数"
-        />
-      </a-form-item>
-      <a-form-item
-        label="脚本类型"
-        name="scriptType"
-        :rules="[{ required: true, message: '请选择脚本类型' }]"
-      >
-        <a-space direction="vertical">
-          <a-radio-group
-            @change="handleScriptType"
-            v-model:value="scriptForm.scriptType"
-            :options="scriptTypeOptions"
-          />
-        </a-space>
-      </a-form-item>
-      <a-form-item
-        label="保存原始数据"
-        name="saveOriginalData"
-        :rules="[{ required: true, message: '请选择保存原始数据' }]"
-      >
-        <a-space direction="vertical">
-          <a-radio-group v-model:value="scriptForm.saveOriginalData" :options="originalOptions" />
-        </a-space>
-      </a-form-item>
-      <a-form-item label="脚本内容" :name="ifAdd ? 'convertJs' : 'script'">
-        <Card title="脚本内容" :bodyStyle="{ padding: 0, height: '280px' }">
-          <template #extra>
-            <a-button @click="handleFormat" size="small">格式化</a-button>
-            <Tooltip :title="defaultTitle" class="ml-2">
-              <QuestionCircleOutlined style="font-size: 1rem" />
-            </Tooltip>
-          </template>
-          <div ref="aceRef" class="overflow-hidden"></div>
-        </Card>
-        <Button @click="handleCopy" class="mt-4">
-          <template #icon>
-            <CopyOutlined />
-          </template>
-          copy
-        </Button>
-      </a-form-item>
-      <a-form-item
-        :label="ifAdd ? '备注' : '输出参数(output)'"
-        :name="ifAdd ? 'description' : 'output'"
-      >
-        <a-textarea
-          :rows="3"
-          v-if="ifAdd"
-          v-model:value="scriptForm.description"
-          placeholder="请输入备注"
-          :maxlength="255"
-        />
-        <a-textarea
-          disabled
-          :rows="5"
-          v-else
-          v-model:value="scriptForm.output"
-          placeholder="输出参数为服务端返回的内容"
-          :maxlength="255"
-        />
-      </a-form-item>
-    </a-form>
-  </div>
-</template>
-<script setup lang="ts">
-  import { ref, unref, reactive, onMounted, toRefs, nextTick, computed } from 'vue';
-  import ace from 'ace-builds';
-  import { Card, Button, Tooltip } from 'ant-design-vue';
-  import 'ace-builds/src-noconflict/theme-chrome'; // 默认设置的主题
-  import 'ace-builds/src-noconflict/theme-terminal'; // 默认设置的主题
-  import 'ace-builds/src-noconflict/mode-javascript'; // 默认设置的语言模式
-  import { beautify } from 'ace-builds/src-noconflict/ext-beautify.js';
-  import { CopyOutlined } from '@ant-design/icons-vue';
-  import { useCopyToClipboard } from '/@/hooks/web/useCopyToClipboard';
-  import { useMessage } from '/@/hooks/web/useMessage';
-  import { findDictItemByCode } from '/@/api/system/dict';
-  import { QuestionCircleOutlined } from '@ant-design/icons-vue';
-  import { defaultTitle, defaultScriptTypeContent } from './config.data';
-  import { useAppStore } from '/@/store/modules/app';
-
-  defineEmits(['register']);
-  const props = defineProps({
-    ifAdd: { type: Boolean, default: true },
-  });
-
-  const scriptForm = reactive({
-    name: '',
-    description: '',
-    convertJs: '',
-    script: '',
-    params: '',
-    output: '',
-    scriptType: 'TRANSPORT_TCP_UP',
-    saveOriginalData: 'true',
-  });
-
-  const reportTypeOptions = reactive({
-    originalOptions: [],
-    scriptTypeOptions: [],
-  });
-
-  const { originalOptions, scriptTypeOptions } = toRefs(reportTypeOptions);
-
-  const { createMessage } = useMessage();
-
-  const { clipboardRef, copiedRef } = useCopyToClipboard();
-
-  const aceEditor = ref();
-
-  const aceRef = ref();
-
-  const userStore = useAppStore();
-
-  const getAceClass = computed((): string => userStore.getDarkMode);
-
-  const setDefaultRadio = (p2, p3) => {
-    scriptForm.saveOriginalData = p2;
-    scriptForm.scriptType = p3;
-  };
-
-  const getDictValue = async (dict_type) => {
-    const res = await findDictItemByCode({
-      dictCode: dict_type,
-    });
-    return res.map((m) => {
-      return { label: m.itemText, value: m.itemValue };
-    });
-  };
-
-  onMounted(async () => {
-    reportTypeOptions.originalOptions = (await getDictValue('original_data')) as never as any;
-    reportTypeOptions.scriptTypeOptions = (await getDictValue('script_type')) as never as any;
-  });
-
-  // 初始化编辑器
-  const initEditor = () => {
-    aceEditor.value = ace.edit(aceRef.value, {
-      maxLines: 12, // 最大行数，超过会自动出现滚动条
-      minLines: 12, // 最小行数，还未到最大行数时，编辑器会自动伸缩大小
-      fontSize: 14, // 编辑器内字体大小
-      theme: 'ace/theme/chrome', // 默认设置的主题
-      mode: 'ace/mode/javascript', // 默认设置的语言模式
-      tabSize: 2, // 制表符设置为 4 个空格大小
-    });
-
-    aceEditor.value.setOptions({
-      enableBasicAutocompletion: true,
-      enableLiveAutocompletion: true,
-      theme: getAceClass.value === 'dark' ? 'ace/theme/terminal' : 'ace/theme/chrome',
-    });
-    aceEditor.value.setValue('');
-    beautify(aceEditor.value.session);
-    switchScriptTypeGetContent('TRANSPORT_TCP_UP');
-  };
-
-  const handleScriptType = ({ target }) => {
-    const { value } = target;
-    switchScriptTypeGetContent(value);
-  };
-
-  const switchScriptTypeGetContent = (type) => {
-    aceEditor.value.setValue(defaultScriptTypeContent[type]);
-  };
-
-  const handleCopy = () => {
-    const valueRef = aceEditor.value.getValue();
-    const value = unref(valueRef);
-    if (!value) {
-      createMessage.warning('请输入要拷贝的内容！');
-      return;
-    }
-    clipboardRef.value = value;
-    if (unref(copiedRef)) {
-      createMessage.success('复制成功！');
-    }
-  };
-
-  const formRef = ref();
-
-  const getFormData = async () => {
-    const value = await formRef.value.validateFields();
-    if (props.ifAdd) {
-      scriptForm.convertJs = aceEditor.value.getValue();
-      if (scriptForm.convertJs == '') {
-        createMessage.error('请编写脚本内容');
-        throw '请编写脚本内容';
-      }
-    } else {
-      scriptForm.script = aceEditor.value.getValue();
-      if (scriptForm.script == '') {
-        createMessage.error('请编写脚本内容');
-        throw '请编写脚本内容';
-      }
-    }
-    if (!value) return;
-    if (scriptForm.params) {
-      const trimParams = scriptForm.params.replace(/\s*/g, '');
-      Reflect.set(value, 'params', trimParams);
-    }
-    if (scriptForm.convertJs.length > 1000) {
-      createMessage.error('脚本内容长度不能大于1000');
-      throw '脚本内容长度不能大于1000';
-    }
-    return {
-      ...value,
-      ...{ convertJs: props.ifAdd ? scriptForm.convertJs : null },
-      ...{ script: !props.ifAdd ? scriptForm.script : null },
-      ...{ saveOriginalData: scriptForm.saveOriginalData === 'false' ? false : true },
-    };
-  };
-
-  const handleInputChange = (e) => {
-    const trimParams = e.target.value.replace(/\s*/g, '');
-    Reflect.set(scriptForm, 'params', trimParams);
-    if (scriptForm.scriptType === 'TRANSPORT_TCP_DOWN') {
-      aceEditor.value.setValue(`out.datas = "${scriptForm.params}";out.deviceName = "sensor";`);
-    }
-  };
-
-  const setFormData = (v) => {
-    if (v) {
-      for (let i in scriptForm) {
-        Reflect.set(scriptForm, i, v[i]);
-      }
-      nextTick(() => {
-        setTimeout(() => {
-          scriptForm.saveOriginalData = v.saveOriginalData === false ? 'false' : 'true';
-        }, 10);
-      });
-      aceEditor.value.setValue(v.convertJs);
-      handleFormat();
-    }
-  };
-
-  const setScriptContentData = (v) => {
-    aceEditor.value.setValue(v);
-    handleFormat();
-  };
-
-  const resetFormData = () => {
-    for (let i in scriptForm) {
-      Reflect.set(scriptForm, i, '');
-    }
-  };
-
-  const setScriptOutputData = (v) => {
-    scriptForm.output = v;
-  };
-
-  const handleFormat = () => {
-    beautify(aceEditor.value.session);
-    aceEditor.value.getSession().setUseWrapMode(true);
-  };
-
-  defineExpose({
-    initEditor,
-    getFormData,
-    resetFormData,
-    setFormData,
-    setScriptContentData,
-    setScriptOutputData,
-    setDefaultRadio,
-  });
-</script>
-<style lang="less" scoped>
-  @import url('./ConverScriptModal.less');
-</style>
+<template>
+  <div>
+    <a-form
+      ref="formRef"
+      :model="scriptForm"
+      name="basic"
+      :label-col="{ span: 4 }"
+      :wrapper-col="{ span: 16 }"
+      autocomplete="off"
+    >
+      <a-form-item
+        :label="ifAdd ? '名称' : '输入参数(params)'"
+        :name="ifAdd ? 'name' : 'params'"
+        :rules="[{ required: true, message: ifAdd ? '请输入脚本名称' : '请输入参数' }]"
+      >
+        <a-input-group compact>
+          <a-input
+            style="width: calc(100% - 200px)"
+            v-if="ifAdd"
+            :maxlength="36"
+            @change="handleInputChange"
+            v-model:value="scriptForm.name"
+            placeholder="请输入脚本名称"
+          />
+          <a-input
+            @change="handleInputChange"
+            v-else
+            v-model:value="scriptForm.params"
+            placeholder="请输入参数"
+          />
+          <a-button @click="onHandleClick(text)" v-show="ifAdd && !view" type="primary">
+            测试
+          </a-button>
+        </a-input-group>
+      </a-form-item>
+      <a-form-item
+        label="脚本类型"
+        name="scriptType"
+        :rules="[{ required: true, message: '请选择脚本类型' }]"
+      >
+        <a-space direction="vertical">
+          <a-radio-group
+            @change="handleScriptType"
+            v-model:value="scriptForm.scriptType"
+            :options="scriptTypeOptions"
+          />
+        </a-space>
+      </a-form-item>
+      <a-form-item
+        label="保存原始数据"
+        name="saveOriginalData"
+        :rules="[{ required: true, message: '请选择保存原始数据' }]"
+      >
+        <a-space direction="vertical">
+          <a-radio-group v-model:value="scriptForm.saveOriginalData" :options="originalOptions" />
+        </a-space>
+      </a-form-item>
+      <a-form-item label="脚本内容" :name="ifAdd ? 'convertJs' : 'script'">
+        <Card title="脚本内容" :bodyStyle="{ padding: 0, height: '280px' }">
+          <template #extra>
+            <a-button @click="handleFormat" size="small">格式化</a-button>
+            <Tooltip v-if="!ifAdd" :title="defaultAuthTitle" class="ml-2">
+              <QuestionCircleOutlined style="font-size: 1rem" />
+            </Tooltip>
+            <Tooltip v-if="!ifAdd" :title="defaultUpTitle" class="ml-2">
+              <QuestionCircleOutlined style="font-size: 1rem" />
+            </Tooltip>
+          </template>
+          <div ref="aceRef" class="overflow-hidden"></div>
+        </Card>
+        <Button @click="handleCopy" class="mt-4">
+          <template #icon>
+            <CopyOutlined />
+          </template>
+          copy
+        </Button>
+      </a-form-item>
+      <a-form-item
+        :label="ifAdd ? '备注' : '输出参数(output)'"
+        :name="ifAdd ? 'description' : 'output'"
+      >
+        <a-textarea
+          :rows="3"
+          v-if="ifAdd"
+          v-model:value="scriptForm.description"
+          placeholder="请输入备注"
+          :maxlength="255"
+        />
+        <a-textarea
+          :rows="5"
+          v-else
+          v-model:value="scriptForm.output"
+          placeholder="输出参数为服务端返回的内容"
+          :maxlength="255"
+        />
+      </a-form-item>
+    </a-form>
+    <TestScriptModal @register="registerModal" @success="handleSuccess" />
+  </div>
+</template>
+<script setup lang="ts">
+  import { ref, unref, reactive, onMounted, toRefs, nextTick, computed } from 'vue';
+  import ace from 'ace-builds';
+  import { Card, Button, Tooltip } from 'ant-design-vue';
+  import 'ace-builds/src-noconflict/theme-chrome'; // 默认设置的主题
+  import 'ace-builds/src-noconflict/theme-terminal'; // 默认设置的主题
+  import 'ace-builds/src-noconflict/mode-javascript'; // 默认设置的语言模式
+  import { beautify } from 'ace-builds/src-noconflict/ext-beautify.js';
+  import { CopyOutlined } from '@ant-design/icons-vue';
+  import { useCopyToClipboard } from '/@/hooks/web/useCopyToClipboard';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import { findDictItemByCode } from '/@/api/system/dict';
+  import { QuestionCircleOutlined } from '@ant-design/icons-vue';
+  import { defaultAuthTitle, defaultUpTitle, defaultScriptTypeContent } from './config.data';
+  import { useAppStore } from '/@/store/modules/app';
+  import TestScriptModal from './TestScriptModal.vue';
+  import { useModal } from '/@/components/Modal';
+
+  defineEmits(['register']);
+  const props = defineProps({
+    ifAdd: { type: Boolean, default: true },
+    text: { type: String, default: '' },
+    view: { type: Boolean, default: false },
+  });
+
+  const scriptForm = reactive({
+    name: '',
+    description: '',
+    convertJs: '',
+    script: '',
+    params: '',
+    output: '',
+    scriptType: 'TRANSPORT_TCP_UP',
+    saveOriginalData: 'true',
+  });
+
+  const reportTypeOptions = reactive({
+    originalOptions: [],
+    scriptTypeOptions: [],
+  });
+
+  const { originalOptions, scriptTypeOptions } = toRefs(reportTypeOptions);
+
+  const { createMessage } = useMessage();
+
+  const { clipboardRef, copiedRef } = useCopyToClipboard();
+
+  const aceEditor = ref();
+
+  const aceRef = ref();
+
+  const userStore = useAppStore();
+
+  const getAceClass = computed((): string => userStore.getDarkMode);
+
+  const setDefaultRadio = (p2, p3) => {
+    scriptForm.saveOriginalData = p2;
+    scriptForm.scriptType = p3;
+  };
+
+  const getDictValue = async (dict_type) => {
+    const res = await findDictItemByCode({
+      dictCode: dict_type,
+    });
+    return res.map((m) => {
+      return { label: m.itemText, value: m.itemValue };
+    });
+  };
+
+  onMounted(async () => {
+    reportTypeOptions.originalOptions = (await getDictValue('original_data')) as never as any;
+    reportTypeOptions.scriptTypeOptions = (await getDictValue('script_type')) as never as any;
+  });
+
+  // 初始化编辑器
+  const initEditor = () => {
+    aceEditor.value = ace.edit(aceRef.value, {
+      maxLines: 12, // 最大行数，超过会自动出现滚动条
+      minLines: 12, // 最小行数，还未到最大行数时，编辑器会自动伸缩大小
+      fontSize: 14, // 编辑器内字体大小
+      theme: 'ace/theme/chrome', // 默认设置的主题
+      mode: 'ace/mode/javascript', // 默认设置的语言模式
+      tabSize: 2, // 制表符设置为 4 个空格大小
+    });
+
+    aceEditor.value.setOptions({
+      enableBasicAutocompletion: true,
+      enableLiveAutocompletion: true,
+      theme: getAceClass.value === 'dark' ? 'ace/theme/terminal' : 'ace/theme/chrome',
+    });
+    aceEditor.value.setValue('');
+    beautify(aceEditor.value.session);
+    switchScriptTypeGetContent('TRANSPORT_TCP_UP');
+  };
+
+  const handleScriptType = ({ target }) => {
+    const { value } = target;
+    switchScriptTypeGetContent(value);
+  };
+
+  const switchScriptTypeGetContent = (type) => {
+    aceEditor.value.setValue(defaultScriptTypeContent[type]);
+  };
+
+  const handleCopy = () => {
+    const valueRef = aceEditor.value.getValue();
+    const value = unref(valueRef);
+    if (!value) {
+      createMessage.warning('请输入要拷贝的内容！');
+      return;
+    }
+    clipboardRef.value = value;
+    if (unref(copiedRef)) {
+      createMessage.success('复制成功！');
+    }
+  };
+
+  const formRef = ref();
+
+  const getFormData = async () => {
+    const value = await formRef.value.validateFields();
+    if (props.ifAdd) {
+      scriptForm.convertJs = aceEditor.value.getValue();
+      if (scriptForm.convertJs == '') {
+        createMessage.error('请编写脚本内容');
+        throw '请编写脚本内容';
+      }
+    } else {
+      scriptForm.script = aceEditor.value.getValue();
+      if (scriptForm.script == '') {
+        createMessage.error('请编写脚本内容');
+        throw '请编写脚本内容';
+      }
+    }
+    if (!value) return;
+    if (scriptForm.params) {
+      const trimParams = scriptForm.params.replace(/\s*/g, '');
+      Reflect.set(value, 'params', trimParams);
+    }
+    if (scriptForm.convertJs.length > 1000) {
+      createMessage.error('脚本内容长度不能大于1000');
+      throw '脚本内容长度不能大于1000';
+    }
+    return {
+      ...value,
+      ...{ convertJs: props.ifAdd ? scriptForm.convertJs : null },
+      ...{ script: !props.ifAdd ? scriptForm.script : null },
+      ...{ saveOriginalData: scriptForm.saveOriginalData === 'false' ? false : true },
+    };
+  };
+
+  const handleInputChange = (e) => {
+    const trimParams = e.target.value.replace(/\s*/g, '');
+    Reflect.set(scriptForm, 'params', trimParams);
+    if (scriptForm.scriptType === 'TRANSPORT_TCP_DOWN') {
+      aceEditor.value.setValue(`out.datas = "${scriptForm.params}";out.deviceName = "sensor";`);
+    }
+  };
+
+  const getRecordId = ref('');
+
+  const setFormData = (v) => {
+    if (v) {
+      getRecordId.value = v?.id;
+      for (let i in scriptForm) {
+        Reflect.set(scriptForm, i, v[i]);
+      }
+      nextTick(() => {
+        setTimeout(() => {
+          scriptForm.saveOriginalData = v.saveOriginalData === false ? 'false' : 'true';
+        }, 10);
+      });
+      aceEditor.value.setValue(v.convertJs);
+      handleFormat();
+    }
+  };
+
+  const setScriptContentData = (v) => {
+    aceEditor.value.setValue(v);
+    handleFormat();
+  };
+
+  const resetFormData = () => {
+    for (let i in scriptForm) {
+      Reflect.set(scriptForm, i, '');
+    }
+  };
+
+  const setScriptOutputData = (v) => {
+    scriptForm.output = v;
+  };
+
+  const handleFormat = () => {
+    beautify(aceEditor.value.session);
+    aceEditor.value.getSession().setUseWrapMode(true);
+  };
+
+  const [registerModal, { openModal }] = useModal();
+
+  const onHandleClick = (o) => {
+    openModal(true, {
+      isAuth: '',
+      isUpdate: false,
+      record: o === 'add' ? null : getRecordId.value,
+      isTest: true,
+      isText: 'test',
+      isTitle: 'test',
+    });
+  };
+
+  defineExpose({
+    initEditor,
+    getFormData,
+    resetFormData,
+    setFormData,
+    setScriptContentData,
+    setScriptOutputData,
+    setDefaultRadio,
+  });
+</script>
+<style lang="less" scoped>
+  @import url('./ConverScriptModal.less');
+</style>

@@ -10,7 +10,12 @@
       @cancel="handleCancel"
       @ok="handleSubmit"
     >
-      <ConverScript :ifAdd="isTest ? false : true" ref="converScriptRef" />
+      <ConverScript
+        :view="isViewDetail"
+        :text="isTitle"
+        :ifAdd="isTest ? false : true"
+        ref="converScriptRef"
+      />
     </BasicModal>
   </div>
 </template>

+<template>
+  <div>
+    <BasicModal
+      destroyOnClose
+      v-bind="$attrs"
+      width="60rem"
+      @register="register"
+      :title="getTitle"
+      :minHeight="500"
+      @cancel="handleCancel"
+      @ok="handleSubmit"
+    >
+      <ConverScript
+        :view="isViewDetail"
+        :text="isTitle"
+        :ifAdd="isTest ? false : true"
+        ref="converScriptRef"
+      />
+    </BasicModal>
+  </div>
+</template>
+<script setup lang="ts">
+  import { ref, computed, unref, reactive } from 'vue';
+  import { BasicModal, useModalInner } from '/@/components/Modal';
+  import ConverScript from './ConverScript.vue';
+  import {
+    createOrEditScriptManage,
+    getScriptManageDetail,
+    testScriptManage,
+  } from '/@/api/scriptmanage/scriptManager';
+  import { useMessage } from '/@/hooks/web/useMessage';
+
+  const emits = defineEmits(['success', 'register']);
+  const { createMessage } = useMessage();
+  const converScriptRef = ref<InstanceType<typeof ConverScript>>();
+  const getTitle = computed(() => (isUpdate.value ? '编辑转换脚本' : '新增转换脚本'));
+  const isUpdate = ref(false);
+  const isViewDetail = ref('');
+  const isTest = ref(false);
+  const isText = ref('');
+  const isTitle = ref('');
+  const editData = reactive({
+    data: {},
+  });
+  const [register, { setModalProps, closeModal }] = useModalInner(async (data) => {
+    setModalProps({ loading: true });
+    handleCancel(false);
+    isUpdate.value = data.isUpdate;
+    isViewDetail.value = data.isView;
+    isTest.value = data.isTest;
+    isText.value = data.isText;
+    isTitle.value = data.isTitle;
+    editData.data = data.record;
+    setModalProps({ loading: false });
+    converScriptRef.value?.initEditor();
+    if (!unref(isViewDetail)) {
+      const title =
+        unref(isTitle) == 'edit'
+          ? '编辑转换脚本'
+          : unref(isTitle) == 'add'
+          ? '新增转换脚本'
+          : '测试转换脚本';
+      const okText = isText.value == 'test' ? '测试' : '确定';
+      if (unref(isTitle) == 'add') {
+        converScriptRef.value?.setDefaultRadio('true', 'TRANSPORT_TCP_UP');
+      }
+      if (unref(isTitle) == 'edit') {
+        converScriptRef.value?.setFormData(data.record);
+      }
+      if (unref(isTitle) == 'test') {
+        if (data.record) {
+          const res = await getScriptManageDetail(data.record);
+          converScriptRef.value?.setFormData(res);
+        } else {
+          converScriptRef.value?.setDefaultRadio('true', 'TRANSPORT_TCP_UP');
+        }
+      }
+      setModalProps({ title, showOkBtn: true, showCancelBtn: true, okText });
+      if (!unref(isUpdate)) {
+      }
+    } else {
+      setModalProps({ showOkBtn: false, showCancelBtn: false, title: '查看转换脚本' });
+      const res = await getScriptManageDetail(data.record.id);
+      converScriptRef.value?.setFormData(res || {});
+    }
+  });
+
+  const handleSubmit = async () => {
+    setModalProps({ confirmLoading: true });
+    try {
+      const val = await converScriptRef.value?.getFormData();
+      const tempObj = {
+        ...editData.data,
+        ...val,
+      };
+      const res: any =
+        isText.value == 'test'
+          ? await testScriptManage(val)
+          : await createOrEditScriptManage(tempObj);
+      createMessage.success(
+        unref(isTitle) == 'edit'
+          ? '编辑转换脚本成功'
+          : unref(isTitle) == 'add'
+          ? '新增转换脚本成功'
+          : '测试转换脚本成功'
+      );
+      if (unref(isTitle) == 'add' || unref(isTitle) == 'edit') {
+        setTimeout(() => {
+          closeModal();
+        }, 10);
+        emits('success', {
+          res,
+          text: isText.value,
+        });
+      } else {
+        if (res) {
+          converScriptRef.value?.setScriptOutputData(res?.output || res?.error);
+        }
+      }
+    } finally {
+      setModalProps({ confirmLoading: false });
+    }
+  };
+  const handleCancel = (flag) => {
+    if (flag) {
+      closeModal();
+    }
+    converScriptRef.value?.resetFormData();
+  };
+</script>
+<style lang="less" scoped>
+  @import url('./ConverScriptModal.less');
+</style>

@@ -58,25 +58,30 @@ export const searchFormSchema: FormSchema[] = [
   },
 ];
 
-export const defaultTitle = h('div', { style: 'background:#404040' }, [
-  h('h3', { style: 'color:white' }, '示例'),
-  h('h3', { style: 'color:white' }, '输入参数:'),
-  h('h3', { style: 'color:white' }, '0103040150008D3BBB'),
-  h('h3', { style: 'color:white' }, [
-    h('h3', { style: 'color:white' }, '脚本内容:'),
-    h(
-      'h3',
-      { style: 'color:white' },
-      "out.humidity = (parseInt('0x'+params.substr(6, 4))*0.1).toFixed(2);"
-    ),
-    h(
-      'h3',
-      { style: 'color:white' },
-      "out.temperature = (parseInt('0x'+params.substr(10, 4))*0.1).toFixed(2);"
-    ),
-    h('h3', { style: 'color:white' }, '输出参数:'),
-    h('h3', { style: 'color:white' }, "{'humidity':'33.60','temperature':'14.10'}"),
-  ]),
+export const defaultAuthTitle = h('div', { style: 'background:#404040' }, [
+  h('h3', { style: 'color:white' }, '设备鉴权示例'),
+  h('h3', { style: 'color:white' }, '输入参数：为16进制字符串'),
+  h('h3', { style: 'color:white' }, '输出参数：{"password":"","success":""}'),
+  h('h3', { style: 'color:white' }, 'password为设备鉴权信息，success为鉴权成功后响应给设备的内容'),
+]);
+
+export const defaultUpTitle = h('div', { style: 'background:#404040' }, [
+  h('h3', { style: 'color:white' }, '上行数据解析示例'),
+  h('h3', { style: 'color:white' }, '输入参数:为字符串'),
+  h(
+    'h3',
+    { style: 'color:white' },
+    `输出参数:{"datas":{"source":""},"telemetry":true,"ackMsg":"","deviceName":"","ts":1681701034289}`
+  ),
+  h(
+    'h3',
+    { style: 'color:white' },
+    `datas：json对象，属性名为遥测指标或子设备名称
+  telemetry:  datas内容是否为遥测数据
+  ackMsg:  响应给设备的确认消息
+  deviceName:  设备名称
+  ts:  数据采集时间`
+  ),
 ]);
 
 // TRANSPORT_TCP_DOWN: 'out.datas = "";out.deviceName = "sensor";',

@@ -273,6 +273,8 @@
       status: searchInfo.status,
       page: pagination.current,
       pageSize: pagination.pageSize,
+      startTime: moment(searchInfo.sendTime.at(-2)).valueOf(),
+      endTime: moment(searchInfo.sendTime.at(-1)).valueOf(),
     });
     setTableData(res.items);
     pagination.total = res.total;