Merge branch 'main_dev' into 'main'

Main dev merge

See merge request yunteng/thingskit-front!723

@@ -68,7 +68,7 @@
   </div>
   </div>
 </template>
 </template>
 <script lang="ts" setup name="testRequest">
 <script lang="ts" setup name="testRequest">
-  import { nextTick, ref, reactive, onUnmounted } from 'vue';
+  import { nextTick, ref, reactive, onUnmounted, unref } from 'vue';
   import { Button } from 'ant-design-vue';
   import { Button } from 'ant-design-vue';
   import { otherHttp } from '/@/utils/http/axios';
   import { otherHttp } from '/@/utils/http/axios';
   import { useWebSocket } from '@vueuse/core';
   import { useWebSocket } from '@vueuse/core';
@@ -153,6 +153,9 @@
 
 
   const postBodyType = ref('');
   const postBodyType = ref('');
 
 
+  //定义一个全局的关闭websocket变量 fix: 修复切换产品切换属性websocket又新建连接，造成上一个ws和这一个ws交替接受信息问题
+  const closeSocket = ref<Nullable<Fn>>(null);
+
   //执行测试接口
   //执行测试接口
   const handleExcute = () => {
   const handleExcute = () => {
     emits('emitExcute');
     emits('emitExcute');
@@ -188,6 +191,8 @@
       const list = Object.values(params);
       const list = Object.values(params);
       const isEmpty = list.some((it) => it === '' || null || undefined);
       const isEmpty = list.some((it) => it === '' || null || undefined);
       if (!isEmpty) {
       if (!isEmpty) {
+        //执行ws close方法 关闭上一个
+        unref(closeSocket)?.();
         websocketRequest(params);
         websocketRequest(params);
       } else {
       } else {
         resetValue(false);
         resetValue(false);
@@ -245,6 +250,7 @@
         },
         },
         onError() {},
         onError() {},
       });
       });
+      closeSocket.value = close;
       if (destroy) close();
       if (destroy) close();
     } finally {
     } finally {
     }
     }

 import { BasicColumn, FormSchema } from '/@/components/Table';
 import { BasicColumn, FormSchema } from '/@/components/Table';
-import { h } from 'vue';
+import { h, unref } from 'vue';
 import { Tag } from 'ant-design-vue';
 import { Tag } from 'ant-design-vue';
 import { findDictItemByCode } from '/@/api/system/dict';
 import { findDictItemByCode } from '/@/api/system/dict';
 import { USER_INFO_KEY } from '/@/enums/cacheEnum';
 import { USER_INFO_KEY } from '/@/enums/cacheEnum';
@@ -7,6 +7,7 @@ import { getAuthCache } from '/@/utils/auth';
 import { isAdmin } from '/@/enums/roleEnum';
 import { isAdmin } from '/@/enums/roleEnum';
 import { defaultField } from './constants';
 import { defaultField } from './constants';
 import { useUtils } from '../hooks/useUtils';
 import { useUtils } from '../hooks/useUtils';
+import { useRole } from '/@/hooks/business/useRole';
 
 
 // 表格配置
 // 表格配置
 export const columns: BasicColumn[] = [
 export const columns: BasicColumn[] = [
@@ -106,189 +107,192 @@ export const searchFormSchema: FormSchema[] = [
 ];
 ];
 
 
 //表单配置
 //表单配置
-export const schemas: FormSchema[] = [
-  {
-    field: 'interfaceName',
-    label: '接口名称',
-    colProps: { span: 24 },
-    required: true,
-    component: 'Input',
-    componentProps: {
-      maxLength: 255,
-      placeholder: '请输入接口名称',
-    },
-  },
-  {
-    field: 'interfaceType',
-    component: 'ApiRadioGroup',
-    label: '接口类型',
-    required: true,
-    colProps: {
-      span: 8,
-    },
-    defaultValue: 'CUSTOM',
-    componentProps: {
-      api: findDictItemByCode,
-      params: {
-        dictCode: 'interface_Type',
+export const schemas = (): FormSchema[] => {
+  const { isPlatformAdmin, isSysadmin } = useRole();
+  return [
+    {
+      field: 'interfaceName',
+      label: '接口名称',
+      colProps: { span: 24 },
+      required: true,
+      component: 'Input',
+      componentProps: {
+        maxLength: 255,
+        placeholder: '请输入接口名称',
       },
       },
-      labelField: 'itemText',
-      valueField: 'itemValue',
-    },
-    ifShow: ({}) => {
-      const userInfo = getAuthCache(USER_INFO_KEY) as any;
-      const role: string = userInfo?.roles[0];
-      if (isAdmin(role)) return true;
-      else return false;
     },
     },
-  },
-  {
-    field: 'requestContentType',
-    label: '请求方式',
-    component: 'ApiSelect',
-    required: true,
-    colProps: { span: 24 },
-    defaultValue: '0',
-    componentProps: ({ formActionType }) => {
-      const { updateSchema, setFieldsValue } = formActionType;
-      return {
+    {
+      field: 'interfaceType',
+      component: 'ApiRadioGroup',
+      label: '接口类型',
+      required: true,
+      colProps: {
+        span: 8,
+      },
+      defaultValue: unref(isPlatformAdmin) || unref(isSysadmin) ? 'SYSTEM' : null,
+      componentProps: {
         api: findDictItemByCode,
         api: findDictItemByCode,
         params: {
         params: {
-          dictCode: 'dataview_select_methods',
+          dictCode: 'interface_Type',
         },
         },
-        placeholder: '请选择请求方式',
         labelField: 'itemText',
         labelField: 'itemText',
         valueField: 'itemValue',
         valueField: 'itemValue',
-        getPopupContainer: () => document.body,
-        onChange(e) {
-          if (!e) return;
-          const { usePlaceholder } = useUtils();
-          const setDefaultPlaceholder = usePlaceholder(e);
-          setFieldsValue(defaultField);
-          updateSchema({
-            field: 'requestHttpTypeAndUrl',
-            componentProps: {
-              type: e,
-            },
-          });
-          updateSchema({
-            field: 'requestOriginUrl',
-            componentProps: {
-              placeholder: setDefaultPlaceholder,
-            },
-          });
-        },
-      };
+      },
+      ifShow: ({}) => {
+        const userInfo = getAuthCache(USER_INFO_KEY) as any;
+        const role: string = userInfo?.roles[0];
+        if (isAdmin(role)) return true;
+        else return false;
+      },
     },
     },
-  },
-  {
-    field: 'originUrlType',
-    label: '地址类型',
-    component: 'ApiSelect',
-    required: true,
-    colProps: { span: 24 },
-    defaultValue: 'server_url',
-    componentProps: ({ formActionType }) => {
-      const { setFieldsValue } = formActionType;
-      return {
-        placeholder: '请选择地址类型',
-        api: findDictItemByCode,
-        params: {
-          dictCode: 'dataview_select_origin_type',
-        },
-        labelField: 'itemText',
-        valueField: 'itemValue',
-        onChange: (e) => {
-          if (!e) return;
-          setFieldsValue({
-            requestOriginUrl: '',
-          });
-        },
-      };
+    {
+      field: 'requestContentType',
+      label: '请求方式',
+      component: 'ApiSelect',
+      required: true,
+      colProps: { span: 24 },
+      defaultValue: '0',
+      componentProps: ({ formActionType }) => {
+        const { updateSchema, setFieldsValue } = formActionType;
+        return {
+          api: findDictItemByCode,
+          params: {
+            dictCode: 'dataview_select_methods',
+          },
+          placeholder: '请选择请求方式',
+          labelField: 'itemText',
+          valueField: 'itemValue',
+          getPopupContainer: () => document.body,
+          onChange(e) {
+            if (!e) return;
+            const { usePlaceholder } = useUtils();
+            const setDefaultPlaceholder = usePlaceholder(e);
+            setFieldsValue(defaultField);
+            updateSchema({
+              field: 'requestHttpTypeAndUrl',
+              componentProps: {
+                type: e,
+              },
+            });
+            updateSchema({
+              field: 'requestOriginUrl',
+              componentProps: {
+                placeholder: setDefaultPlaceholder,
+              },
+            });
+          },
+        };
+      },
     },
     },
-  },
-  {
-    field: 'requestOriginUrl',
-    label: '源地址',
-    colProps: { span: 24 },
-    required: true,
-    component: 'Input',
-    componentProps: ({ formActionType }) => {
-      const { getFieldsValue } = formActionType;
-      const type = getFieldsValue()?.requestContentType;
-      const { usePlaceholder } = useUtils();
-      return {
-        placeholder: usePlaceholder(type),
-      };
+    {
+      field: 'originUrlType',
+      label: '地址类型',
+      component: 'ApiSelect',
+      required: true,
+      colProps: { span: 24 },
+      defaultValue: 'server_url',
+      componentProps: ({ formActionType }) => {
+        const { setFieldsValue } = formActionType;
+        return {
+          placeholder: '请选择地址类型',
+          api: findDictItemByCode,
+          params: {
+            dictCode: 'dataview_select_origin_type',
+          },
+          labelField: 'itemText',
+          valueField: 'itemValue',
+          onChange: (e) => {
+            if (!e) return;
+            setFieldsValue({
+              requestOriginUrl: '',
+            });
+          },
+        };
+      },
     },
     },
-    ifShow: ({ values }) => values['originUrlType'] === 'custom_url',
-  },
-  {
-    field: 'requestHttpTypeAndUrl',
-    label: '请求类型&地址',
-    component: 'InputGroup',
-    required: true,
-    colProps: { span: 24 },
-    componentProps: ({ formActionType }) => {
-      const { getFieldsValue } = formActionType;
-      return {
-        type: getFieldsValue().requestContentType,
-      };
+    {
+      field: 'requestOriginUrl',
+      label: '源地址',
+      colProps: { span: 24 },
+      required: true,
+      component: 'Input',
+      componentProps: ({ formActionType }) => {
+        const { getFieldsValue } = formActionType;
+        const type = getFieldsValue()?.requestContentType;
+        const { usePlaceholder } = useUtils();
+        return {
+          placeholder: usePlaceholder(type),
+        };
+      },
+      ifShow: ({ values }) => values['originUrlType'] === 'custom_url',
     },
     },
-  },
-  {
-    field: 'fillAddress',
-    label: '完整地址',
-    component: 'Input',
-    slot: 'slotFillAddress',
-    colProps: { span: 24 },
-    ifShow: ({ values }) => {
-      return values['originUrlType'] === 'custom_url' && values['requestOriginUrl'];
+    {
+      field: 'requestHttpTypeAndUrl',
+      label: '请求类型&地址',
+      component: 'InputGroup',
+      required: true,
+      colProps: { span: 24 },
+      componentProps: ({ formActionType }) => {
+        const { getFieldsValue } = formActionType;
+        return {
+          type: getFieldsValue().requestContentType,
+        };
+      },
     },
     },
-  },
-  {
-    field: 'slotServerAddress',
-    label: '完整地址',
-    component: 'Input',
-    slot: 'slotServerAddress',
-    colProps: { span: 24 },
-    ifShow: ({ values }) => {
-      return values['originUrlType'] === 'server_url';
+    {
+      field: 'fillAddress',
+      label: '完整地址',
+      component: 'Input',
+      slot: 'slotFillAddress',
+      colProps: { span: 24 },
+      ifShow: ({ values }) => {
+        return values['originUrlType'] === 'custom_url' && values['requestOriginUrl'];
+      },
     },
     },
-  },
-  {
-    field: 'requestSQLKey',
-    label: '键名',
-    colProps: { span: 6 },
-    component: 'Input',
-    defaultValue: 'sql',
-    componentProps: {
-      disabled: true,
+    {
+      field: 'slotServerAddress',
+      label: '完整地址',
+      component: 'Input',
+      slot: 'slotServerAddress',
+      colProps: { span: 24 },
+      ifShow: ({ values }) => {
+        return values['originUrlType'] === 'server_url';
+      },
     },
     },
-    ifShow: ({ values }) => values['requestContentType'] === '1',
-  },
-  {
-    field: 'requestSQLContent',
-    label: '键值',
-    colProps: { span: 24 },
-    component: 'InputTextArea',
-    defaultValue: 'select * from  where',
-    componentProps: {
-      maxLength: 255,
-      placeholder: '请输入键值',
-      rows: 6,
+    {
+      field: 'requestSQLKey',
+      label: '键名',
+      colProps: { span: 6 },
+      component: 'Input',
+      defaultValue: 'sql',
+      componentProps: {
+        disabled: true,
+      },
+      ifShow: ({ values }) => values['requestContentType'] === '1',
     },
     },
-    ifShow: ({ values }) => values['requestContentType'] === '1',
-  },
-  {
-    field: 'slot',
-    label: '参数设置',
-    component: 'Input',
-    slot: 'selectMethods',
-    colProps: { span: 24 },
-    ifShow: ({ values }) => values['requestContentType'] !== '1',
-  },
-];
+    {
+      field: 'requestSQLContent',
+      label: '键值',
+      colProps: { span: 24 },
+      component: 'InputTextArea',
+      defaultValue: 'select * from  where',
+      componentProps: {
+        maxLength: 255,
+        placeholder: '请输入键值',
+        rows: 6,
+      },
+      ifShow: ({ values }) => values['requestContentType'] === '1',
+    },
+    {
+      field: 'slot',
+      label: '参数设置',
+      component: 'Input',
+      slot: 'selectMethods',
+      colProps: { span: 24 },
+      ifShow: ({ values }) => values['requestContentType'] !== '1',
+    },
+  ];
+};
 
 
 //表格表头配置
 //表格表头配置
 export const editCellTableTHeadConfig = ['序号', '内置参数', '参数名', '是否必须', '操作'];
 export const editCellTableTHeadConfig = ['序号', '内置参数', '参数名', '是否必须', '操作'];

@@ -123,7 +123,7 @@
 
 
   const [registerForm, { resetFields, validate, setFieldsValue, updateSchema }] = useForm({
   const [registerForm, { resetFields, validate, setFieldsValue, updateSchema }] = useForm({
     labelWidth: 120,
     labelWidth: 120,
-    schemas,
+    schemas: schemas(),
     showActionButtonGroup: false,
     showActionButtonGroup: false,
   });
   });
 
 
@@ -172,7 +172,6 @@
       const filter = simpleRequestRef.value?.getFilterValue();
       const filter = simpleRequestRef.value?.getFilterValue();
       const requestOriginUrl = getOriginUrlType(values);
       const requestOriginUrl = getOriginUrlType(values);
       const params = (Objects as Recordable)?.Params?.filter((item) => item.key);
       const params = (Objects as Recordable)?.Params?.filter((item) => item.key);
-
       (Objects as Recordable).Params = params;
       (Objects as Recordable).Params = params;
       const data = {
       const data = {
         ...values,
         ...values,