Merge branch 'main_dev' into 'main'

thingskit1.1.0

See merge request yunteng/thingskit-front!588

@@ -217,5 +217,6 @@ export const defHttp = createAxios();
 export const otherHttp = createAxios({
   requestOptions: {
     apiUrl: 'xxx',
+    withToken: false,
   },
 });

@@ -27,9 +27,9 @@
   import { ShareModal } from '/@/views/common/ShareModal';
   import { ViewTypeNameEnum } from '../../common/ShareModal/config';
   import { useModal } from '/@/components/Modal';
-  import { useCopyToClipboard } from '/@/hooks/web/useCopyToClipboard';
   import { ViewType } from '../../visual/board/config/panelDetail';
   import { useRole } from '/@/hooks/business/useRole';
+  import { useClipboard } from '@vueuse/core';
 
   const listColumn = ref(5);
 
@@ -167,12 +167,12 @@
     return `${origin}${configurationPrefix}/?${searchParams.toString()}`;
   };
 
-  const { clipboardRef, isSuccessRef } = useCopyToClipboard();
-  const handleCreateShareUrl = (record: ConfigurationCenterItemsModal) => {
+  const { copied, copy } = useClipboard();
+  const handleCreateShareUrl = async (record: ConfigurationCenterItemsModal) => {
     if (!unref(getShareFlag)) return;
     const url = createShareUrl(record);
-    clipboardRef.value = url;
-    if (unref(isSuccessRef)) {
+    await copy(url);
+    if (unref(copied)) {
       createMessage.success('复制成功～');
     }
   };

@@ -28,11 +28,11 @@
   import { useModal } from '/@/components/Modal';
   import { ShareModal } from '/@/views/common/ShareModal';
   import { ViewTypeNameEnum } from '../common/ShareModal/config';
-  import { useCopyToClipboard } from '/@/hooks/web/useCopyToClipboard';
   import { ViewType } from '../visual/board/config/panelDetail';
   import { useUserStore } from '/@/store/modules/user';
   import { RoleEnum } from '/@/enums/roleEnum';
   import { useRole } from '/@/hooks/business/useRole';
+  import { useClipboard } from '@vueuse/core';
 
   const listColumn = ref(5);
 
@@ -182,10 +182,10 @@
     return userStore.getUserInfo.roles![0] !== RoleEnum.CUSTOMER_USER;
   });
 
-  const { clipboardRef, isSuccessRef } = useCopyToClipboard();
-  const handleCreateShareUrl = (record: BigScreenCenterItemsModel) => {
-    clipboardRef.value = createShareUrl(record);
-    if (unref(isSuccessRef)) {
+  const { copied, copy } = useClipboard();
+  const handleCreateShareUrl = async (record: BigScreenCenterItemsModel) => {
+    await copy(createShareUrl(record));
+    if (unref(copied)) {
       createMessage.success('复制成功～');
     }
   };

@@ -38,7 +38,7 @@
 </template>
 <script lang="ts" setup name="body">
   import { reactive, ref, nextTick } from 'vue';
-  import { RequestBodyTypeEnum } from '../../../enum/index';
+  import { RequestBodyTypeEnum } from '../../../config/enum';
   import BodyTable from './bodyTable.vue';
   import { isEmpty } from '/@/utils/is';
   import { useUtils } from '../../../hooks/useUtils';

@@ -59,8 +59,8 @@
   import { Select, Button } from 'ant-design-vue';
   import { findDictItemByCode } from '/@/api/system/dict';
   import { PlusOutlined, MinusOutlined } from '@ant-design/icons-vue';
-  import { editCellTableTHeadConfig } from '../../../config';
-  import { selectType, tableItems } from '../../../types';
+  import { editCellTableTHeadConfig } from '../../../config/config';
+  import { selectType, tableItems } from '../../../config/types';
 
   defineProps({
     method: {

@@ -40,9 +40,8 @@
   import { reactive, nextTick } from 'vue';
   import { Button } from 'ant-design-vue';
   import { PlusOutlined, MinusOutlined } from '@ant-design/icons-vue';
-  import { editTestCellTableTHeaderConfig } from '../../../config';
-  import { tableItems } from '../../../types';
-
+  import { editTestCellTableTHeaderConfig } from '../../../config/config';
+  import { tableItems } from '../../../config/types';
   defineProps({
     method: {
       type: String,

@@ -78,8 +78,8 @@
   import { Select, Button } from 'ant-design-vue';
   import { findDictItemByCode } from '/@/api/system/dict';
   import { PlusOutlined, MinusOutlined } from '@ant-design/icons-vue';
-  import { editCellTableTHeadConfig } from '../../../config';
-  import { selectType, tableItems } from '../../../types';
+  import { editCellTableTHeadConfig } from '../../../config/config';
+  import { selectType, tableItems } from '../../../config/types';
   import { useModal, BasicModal } from '/@/components/Modal';
   import DateRangeSelect from './DateRangeSelect/index.vue';
 

@@ -58,7 +58,7 @@
   import JsonEditor from '../../SimpleRequest/components/jsonEditor.vue';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { getTenantAllPageLists, getTenantPageList } from '/@/api/tenant/tenantApi';
-  import { selectType } from '../../../types';
+  import { selectType } from '../../../config/types';
   import { Select } from 'ant-design-vue';
   import { getUserToken } from '/@/api/sys/user';
   import { USER_INFO_KEY } from '/@/enums/cacheEnum';

@@ -133,8 +133,8 @@
   import { useApi } from '../../../hooks/useApi';
   import { useUtils } from '../../../hooks/useUtils';
   import { cloneDeep } from 'lodash-es';
-  import { tableItems, selectType } from '../../../types';
-  import { editTestCellTableTHeadConfig } from '../../../config';
+  import { tableItems, selectType } from '../../../config/types';
+  import { editTestCellTableTHeadConfig } from '../../../config/config';
   import { QuestionCircleOutlined } from '@ant-design/icons-vue';
 
   const props = defineProps({

@@ -46,7 +46,7 @@
   import { Button } from 'ant-design-vue';
   import TestHeaderEditCellTable from './testEditHeaderCellTable.vue';
   import { useMessage } from '/@/hooks/web/useMessage';
-  import { selectType } from '../../../types';
+  import { selectType } from '../../../config/types';
   import { Select } from 'ant-design-vue';
   import { getUserToken } from '/@/api/sys/user';
   import { USER_INFO_KEY } from '/@/enums/cacheEnum';

@@ -24,8 +24,8 @@
 <script lang="ts" setup name="editCellTable">
   import { reactive } from 'vue';
   import { cloneDeep } from 'lodash-es';
-  import { tableItems } from '../../../types';
-  import { editTestCellTableTHeadConfig } from '../../../config';
+  import { tableItems } from '../../../config/types';
+  import { editTestCellTableTHeadConfig } from '../../../config/config';
 
   defineProps({
     method: {

@@ -49,7 +49,7 @@
   import { useUtils } from '../../../hooks/useUtils';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { getTenantAllPageLists, getTenantPageList } from '/@/api/tenant/tenantApi';
-  import { selectType } from '../../../types';
+  import { selectType } from '../../../config/types';
   import { Select } from 'ant-design-vue';
   import { getUserToken } from '/@/api/sys/user';
   import { USER_INFO_KEY } from '/@/enums/cacheEnum';

@@ -174,8 +174,8 @@
   import { useApi } from '../../../hooks/useApi';
   import { useUtils } from '../../../hooks/useUtils';
   import { cloneDeep } from 'lodash-es';
-  import { tableItems, selectType } from '../../../types';
-  import { editTestCellTableTHeadConfig } from '../../../config';
+  import { tableItems, selectType } from '../../../config/types';
+  import { editTestCellTableTHeadConfig } from '../../../config/config';
   import { QuestionCircleOutlined } from '@ant-design/icons-vue';
   import moment from 'moment';
   import { AggregateDataEnum } from '/@/views/report/config/timeConfig';

@@ -5,6 +5,8 @@ import { findDictItemByCode } from '/@/api/system/dict';
 import { USER_INFO_KEY } from '/@/enums/cacheEnum';
 import { getAuthCache } from '/@/utils/auth';
 import { isAdmin } from '/@/enums/roleEnum';
+import { defaultField } from './constants';
+import { useUtils } from '../hooks/useUtils';
 
 // 表格配置
 export const columns: BasicColumn[] = [
@@ -116,24 +118,6 @@ export const schemas: FormSchema[] = [
       placeholder: '请输入接口名称',
     },
   },
-  // {
-  //   field: 'interfaceType',
-  //   component: 'ApiRadioGroup',
-  //   label: '接口类型',
-  //   required: true,
-  //   colProps: {
-  //     span: 8,
-  //   },
-  //   defaultValue: 'SYSTEM',
-  //   componentProps: {
-  //     api: findDictItemByCode,
-  //     params: {
-  //       dictCode: 'interface_Type',
-  //     },
-  //     labelField: 'itemText',
-  //     valueField: 'itemValue',
-  //   },
-  // },
   {
     field: 'interfaceType',
     component: 'ApiRadioGroup',
@@ -144,19 +128,15 @@ export const schemas: FormSchema[] = [
     },
     defaultValue: 'CUSTOM',
     componentProps: {
-      options: [
-        {
-          label: '系统默认',
-          value: 'SYSTEM',
-        },
-        {
-          label: '自定义',
-          value: 'CUSTOM',
-        },
-      ],
+      api: findDictItemByCode,
+      params: {
+        dictCode: 'interface_Type',
+      },
+      labelField: 'itemText',
+      valueField: 'itemValue',
     },
     ifShow: ({}) => {
-      const userInfo: any = getAuthCache(USER_INFO_KEY);
+      const userInfo = getAuthCache(USER_INFO_KEY) as any;
       const role: string = userInfo?.roles[0];
       if (isAdmin(role)) return true;
       else return false;
@@ -180,14 +160,11 @@ export const schemas: FormSchema[] = [
         labelField: 'itemText',
         valueField: 'itemValue',
         getPopupContainer: () => document.body,
-        async onChange(e) {
-          setFieldsValue({
-            requestOriginUrl: '',
-            requestHttpTypeAndUrl: {
-              requestHttpType: undefined,
-              requestUrl: '',
-            },
-          });
+        onChange(e) {
+          if (!e) return;
+          const { usePlaceholder } = useUtils();
+          const setDefaultPlaceholder = usePlaceholder(e);
+          setFieldsValue(defaultField);
           updateSchema({
             field: 'requestHttpTypeAndUrl',
             componentProps: {
@@ -197,9 +174,7 @@ export const schemas: FormSchema[] = [
           updateSchema({
             field: 'requestOriginUrl',
             componentProps: {
-              placeholder: `${
-                e === '0' ? '示例：http://127.0.0.1' : e === '2' ? '示例：ws://127.0.0.1' : ''
-              }`,
+              placeholder: setDefaultPlaceholder,
             },
           });
         },
@@ -224,11 +199,10 @@ export const schemas: FormSchema[] = [
         labelField: 'itemText',
         valueField: 'itemValue',
         onChange: (e) => {
-          if (e) {
-            setFieldsValue({
-              requestOriginUrl: '',
-            });
-          }
+          if (!e) return;
+          setFieldsValue({
+            requestOriginUrl: '',
+          });
         },
       };
     },
@@ -242,10 +216,9 @@ export const schemas: FormSchema[] = [
     componentProps: ({ formActionType }) => {
       const { getFieldsValue } = formActionType;
       const type = getFieldsValue()?.requestContentType;
+      const { usePlaceholder } = useUtils();
       return {
-        placeholder: `${
-          type === '0' ? '示例：http://127.0.0.1' : type === '2' ? '示例：ws://127.0.0.1' : ''
-        }`,
+        placeholder: usePlaceholder(type),
       };
     },
     ifShow: ({ values }) => values['originUrlType'] === 'custom_url',

+///公共接口管理所需常量值
+
+import { RequestOriginTypeEnum } from './enum';
+
+export const commonHttpPlaceHolder = '示例：http://127.0.0.1';
+
+export const websocketPlaceHolder = '示例：ws://127.0.0.1';
+
+export const defaultField = {
+  originUrlType: RequestOriginTypeEnum.SERVER_URL,
+  requestOriginUrl: '',
+  requestHttpTypeAndUrl: {
+    requestHttpType: undefined,
+    requestUrl: '',
+  },
+};

+///公共接口管理所需枚举值
+
 /**
  * @description: 请求体类型
  */
@@ -8,3 +10,20 @@ export enum RequestBodyTypeEnum {
   JSON = 'json',
   XML = 'xml',
 }
+
+/**
+ * @description: 请求方式
+ */
+export enum RequestMethodTypeEnum {
+  COMMOM = '0',
+  WEBSOCKET = '2',
+  SQL = '1',
+}
+
+/**
+ * @description: 源地址类型
+ */
+export enum RequestOriginTypeEnum {
+  CUSTOM_URL = 'custom_url',
+  SERVER_URL = 'server_url',
+}

@@ -69,7 +69,7 @@
   import { ref, nextTick, watch } from 'vue';
   import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
   import { BasicForm, useForm } from '/@/components/Form';
-  import { schemas } from './config';
+  import { schemas } from './config/config';
   import SimpleRequest from './components/SimpleRequest/index.vue';
   import { TestSql } from './components/TestSql/index';
   import {

+import { commonHttpPlaceHolder, websocketPlaceHolder } from '../config/constants';
+import { RequestMethodTypeEnum } from '../config/enum';
 import { otherHttp } from '/@/utils/http/axios';
 
 export const useUtils = () => {
@@ -16,6 +18,7 @@ export const useUtils = () => {
     });
     return temps;
   };
+
   //默认push一个
   const pushObj = {
     key: undefined,
@@ -25,6 +28,7 @@ export const useUtils = () => {
     date1: '',
     date2: '',
   };
+
   //新增时置空特定数据
   const resetReqHttpType = {
     requestHttpTypeAndUrl: {
@@ -38,6 +42,7 @@ export const useUtils = () => {
       type: '0',
     },
   };
+
   //对象转get params参数
   const convertObj = (data: object) => {
     const _result: any = [];
@@ -53,22 +58,26 @@ export const useUtils = () => {
     }
     return _result.join('&');
   };
+
   //判断服务器地址是否为http/https ws/wss
   const isServerUrl = (method, type) => {
     const pathUrl = window.location.host;
     const protocol = window.location.protocol;
     let url = '';
-    if (method === '2') {
+    if (method === RequestMethodTypeEnum.WEBSOCKET) {
       if (type === 'server_url') {
-        url = `${protocol === 'http' ? 'ws:' : protocol === 'https' ? 'wss:' : 'ws:'}//${pathUrl}`;
+        url = `${
+          protocol === 'http:' ? 'ws:' : protocol === 'https:' ? 'wss:' : 'ws:'
+        }//${pathUrl}`;
       }
-    } else if (method === '0') {
+    } else if (method === RequestMethodTypeEnum.COMMOM) {
       if (type === 'server_url') {
         url = `${protocol}//${pathUrl}`;
       }
     }
     return url;
   };
+
   //TODO:待优化自定义请求
   const isOtherHttp = async (url, token, params) => {
     return await otherHttp.get(
@@ -84,6 +93,17 @@ export const useUtils = () => {
       }
     );
   };
+
+  //请求方式切换动态更新源地址placeholder
+  const usePlaceholder = (type) =>
+    `${
+      type === RequestMethodTypeEnum.COMMOM
+        ? commonHttpPlaceHolder
+        : type === RequestMethodTypeEnum.WEBSOCKET
+        ? websocketPlaceHolder
+        : ''
+    }`;
+
   return {
     getMultipleKeys,
     pushObj,
@@ -92,5 +112,6 @@ export const useUtils = () => {
     isServerUrl,
     convertObj,
     isOtherHttp,
+    usePlaceholder,
   };
 };

@@ -85,7 +85,7 @@
   import { h, ref } from 'vue';
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
   import { useDrawer } from '/@/components/Drawer';
-  import { columns, searchFormSchema } from './config';
+  import { columns, searchFormSchema } from './config/config';
   import { PublicApiForm } from './index';
   import {
     getDataViewInterfacePage,

@@ -112,7 +112,7 @@ export const step1Schemas: FormSchema[] = [
     component: 'Input',
     componentProps: {
       maxLength: 255,
-      placeholder: '请输入设备标识',
+      placeholder: '请输入设备标识或设备地址码',
     },
     ifShow: ({ values }) =>
       values?.transportType === TransportTypeEnum.TCP &&
@@ -154,7 +154,15 @@ export const step1Schemas: FormSchema[] = [
       const { organizationId, transportType } = formModel;
       if (![organizationId, transportType].every(Boolean)) return {};
       return {
-        api: getGatewayDevice,
+        api: async (params: Recordable) => {
+          try {
+            const result = await getGatewayDevice(params as any);
+            return result.map((item) => ({ ...item, alias: item.alias || item.name }));
+          } catch (e) {
+            console.error(e);
+            return [];
+          }
+        },
         showSearch: true,
         params: {
           organizationId,

@@ -51,11 +51,20 @@
           <template #extra>
             <Button
               v-show="ifAdd && !view"
+              @click="onHandleTestExampleGateway(scriptForm.scriptType)"
+              style="position: relative; top: -4rem; right: -6.6rem"
+              type="primary"
+            >
+              直连/子设备用例</Button
+            >
+            <Button
+              class="ml-2"
+              v-show="ifAdd && !view"
               @click="onHandleTestExample(scriptForm.scriptType)"
               style="position: relative; top: -4rem; right: -6.6rem"
               type="primary"
             >
-              测试用例</Button
+              网关用例</Button
             >
             <a-button @click="handleFormat" size="small">格式化</a-button>
             <Tooltip
@@ -120,6 +129,7 @@
     defaultScriptTypeContent,
     defaultTestUpExample,
     defaultTestAuthExample,
+    defaultTestSubGatewayUpExample,
   } from './config.data';
   import { useAppStore } from '/@/store/modules/app';
   import TestScriptModal from './TestScriptModal.vue';
@@ -220,6 +230,14 @@
     handleFormat();
   };
 
+  const onHandleTestExampleGateway = (example) => {
+    if (example === 'TRANSPORT_TCP_UP') {
+      aceEditor.value?.setValue(defaultTestSubGatewayUpExample);
+    } else {
+      aceEditor.value?.setValue(defaultTestAuthExample);
+    }
+    handleFormat();
+  };
   const handleCopy = () => {
     const valueRef = aceEditor.value.getValue();
     const value = unref(valueRef);

@@ -86,88 +86,51 @@ export const defaultUpTitle = h('div', { style: 'background:#404040' }, [
 
 // TRANSPORT_TCP_DOWN: 'out.datas = "";out.deviceName = "sensor";',
 export const defaultScriptTypeContent = {
-  TRANSPORT_TCP_UP: `var teleData = {};
-/*
-物模型数据(可选)：原始数据
-*/
-teleData.source= params;
-/*
-直连/网关子设备设备：temperature是产品物模型中所定义属性的标识符
-*/
-tempVal = params;
-teleData.temperature= tempVal;
-/*
-网关设备：变量slaveDevice是网关子设备的“设备标识”
-*/
-slaveDevice = params.substr(0,2);
-teleData[slaveDevice]= params;
+  TRANSPORT_TCP_UP: `/*网关上行脚本*/
+var teleData = {};
+/*物模型数据(可选)：原始数据*/
+teleData.source = params;
+/*网关设备：slaveDevice是网关子设备的“设备标识”*/
+slaveDevice = params.substr(0, 2);
+teleData[slaveDevice] = params;
 out.datas = teleData;
-/*
-必填：true表示设备上报的遥测数据，false表示命令下发的响应数据
-*/
 out.telemetry = true;
-/*
-必填：设备或命令下发的唯一标识，设备的唯一标识必须与设备信息的“设备名称”一致
-*/
-out.identifier = "01";
-/*
-可选：服务端收到设备数据后，响应的消息内容
-*/
-out.ackMsg = params;
-/*
-可选：默认使用服务器时间，可以使用数据内的时间
-*/
-out.ts = Date.now();`,
-  TRANSPORT_TCP_AUTH: `/*
-    必填：设备的访问令牌
-  */
-  out.password = params;
-  /*
-    选填：设备鉴权成功后响应给设备的信息
-   */
-  out.success = params;
+/*必填：true表示设备上报的遥测数据，false表示命令下发的响应数据*/
+  `,
+  TRANSPORT_TCP_AUTH: `/*必填：设备的访问令牌*/
+out.password = params;
+/*选填：设备鉴权成功后响应给设备的信息*/
+out.success = params;
   `,
 };
 
-export const defaultTestUpExample = `var teleData = {};
-/*
-物模型数据(可选)：原始数据
-*/
+export const defaultTestUpExample = `/*网关上行脚本*/
+var teleData = {};
+/*物模型数据(可选)：原始数据*/
 teleData.source= params;
-/*
-直连/网关子设备设备：temperature是产品物模型中所定义属性的标识符
-*/
-tempVal = params;
-teleData.temperature= tempVal;
-/*
-网关设备：变量slaveDevice是网关子设备的“设备标识”
-*/
+/*网关设备：slaveDevice是网关子设备的“设备标识”*/
 slaveDevice = params.substr(0,2);
 teleData[slaveDevice]= params;
 out.datas = teleData;
-/*
-必填：true表示设备上报的遥测数据，false表示命令下发的响应数据
-*/
-out.telemetry = true;
-/*
-必填：设备或命令下发的唯一标识，设备的唯一标识必须与设备信息的“设备名称”一致
-*/
-out.identifier = "01";
-/*
-可选：服务端收到设备数据后，响应的消息内容
-*/
-out.ackMsg = params;
-/*
-可选：默认使用服务器时间，可以使用数据内的时间
-*/
-out.ts = Date.now();`;
+out.telemetry = true;/*必填：true表示设备上报的遥测数据，false表示命令下发的响应数据*/`;
 
-export const defaultTestAuthExample = `/*
-  必填：设备的访问令牌
- */
+export const defaultTestAuthExample = `/*必填：设备的访问令牌*/
 out.password = params;
-/*
-  选填：设备鉴权成功后响应给设备的信息
- */
+/*选填：设备鉴权成功后响应给设备的信息*/
 out.success = params;
 `;
+
+export const defaultTestSubGatewayUpExample = `/*params为TCP上报的标准ModBus数据,实际使用或测试时请删除*/
+var params = "010304026C00883BF0"
+var teleData = {};
+/*物模型数据(可选)：原始数据*/
+teleData.source = params;
+/*直连设备：tempVal是产品物模型中所定义属性的标识符*/
+tempVal = params;
+/*物模型温度标识符*/
+teleData.temperature = (parseInt('0x'+tempVal.substr(10, 4))*0.1).toFixed(2);
+/*物模型湿度标识符*/
+teleData.humidity = (parseInt('0x'+tempVal.substr(6, 4))*0.1).toFixed(2);
+out.datas = teleData;
+/*必填：true表示设备上报的遥测数据，false表示命令下发的响应数据*/
+out.telemetry = true;`;

@@ -3,7 +3,6 @@
   import { onMounted, ref, unref } from 'vue';
   import { PageWrapper } from '/@/components/Page';
   import { MoreOutlined, ShareAltOutlined } from '@ant-design/icons-vue';
-  import { useCopyToClipboard } from '/@/hooks/web/useCopyToClipboard';
   import { useMessage } from '/@/hooks/web/useMessage';
   import Dropdown from '/@/components/Dropdown/src/Dropdown.vue';
   import { DropMenu } from '/@/components/Dropdown';
@@ -25,6 +24,7 @@
   import { ModalParamsType } from '/#/utils';
   import { DataActionModeEnum } from '/@/enums/toolEnum';
   import { useRole } from '/@/hooks/business/useRole';
+  import { useClipboard } from '@vueuse/core';
 
   const ListItem = List.Item;
   const router = useRouter();
@@ -87,10 +87,10 @@
     return `${origin}${DATA_BOARD_SHARE_URL(id, publicId)}`;
   };
 
-  const { clipboardRef } = useCopyToClipboard();
-  const handleCopyShareUrl = (record: DataBoardRecord) => {
-    clipboardRef.value = createShareUrl(record);
-    unref(clipboardRef) ? createMessage.success('复制成功') : createMessage.error('未找到分享链接');
+  const { copied, copy } = useClipboard();
+  const handleCopyShareUrl = async (record: DataBoardRecord) => {
+    await copy(createShareUrl(record));
+    unref(copied) ? createMessage.success('复制成功') : createMessage.error('未找到分享链接');
   };
 
   const { isCustomerUser } = useRole();