Merge branch 'ft' into 'main_dev'

pref: 公共接口管理 调整接口类型根据不同管理员显示

See merge request yunteng/thingskit-front!550

@@ -16,6 +16,8 @@ export enum ConfigurationPermission {
   SHARE = 'api:yt:dataview:center:share',
   DESIGN = 'api:yt:dataview:center:get_configuration_info:design',
   PREVIEW = 'api:yt:dataview:center:get_configuration_info:preview',
+  PUBLISH = 'api:yt:dataview:center:publish',
+  CANCEL_PUBLISH = 'api:yt:dataview:center:cancel_publish',
 }
 
 // 查询字段

@@ -301,7 +301,7 @@
                     },
                     {
                       text: '发布',
-                      auth: ConfigurationPermission.UPDATE,
+                      auth: ConfigurationPermission.PUBLISH,
                       icon: 'ant-design:node-expand-outlined',
                       event: '',
                       onClick: handlePublish.bind(null, item),
@@ -309,6 +309,7 @@
                     },
                     {
                       text: '取消发布',
+                      auth: ConfigurationPermission.CANCEL_PUBLISH,
                       icon: 'ant-design:node-collapse-outlined',
                       event: '',
                       onClick: handleCancelPublish.bind(null, item),

 <template>
-  <div class="flex" style="justify-content: space-between; align-content: center">
+  <div class="flex flex-col justify-between">
     <div ref="jsoneditorRef" style="height: 100%; width: 100%"></div>
     <div class="ml-2 -mt-1.5">
-      <Button v-if="showBtn" @click="onHandleCopy" type="text"> 复制测试结果 </Button>
+      <Button v-if="showBtn" @click="onHandleCopy" class="mt-8 -ml-2">
+        <template #icon>
+          <CopyOutlined />
+        </template>
+        copy
+      </Button>
     </div>
   </div>
 </template>
@@ -13,6 +18,7 @@
   import 'jsoneditor/dist/jsoneditor.min.css';
   import { Button } from 'ant-design-vue';
   import { useMessage } from '/@/hooks/web/useMessage';
+  import { CopyOutlined } from '@ant-design/icons-vue';
 
   const props = defineProps({
     showBtn: {
@@ -36,11 +42,7 @@
         mode: 'code',
         mainMenuBar: false,
         statusBar: false,
-        onFocus: () => {
-          if (props.showBtn) {
-            setJsonValue('测试结果为');
-          }
-        },
+        onFocus: () => {},
         onBlur: () => {},
         onChangeText: (e) => {
           if (props.showBtn) {

@@ -9,6 +9,7 @@
           @closeTest="onCloseTest"
           ref="testParamsRequestRef"
           :data="dataMap.mapParamsObj"
+          :interfaceType="interfaceType"
         />
       </TabPane>
       <TabPane
@@ -24,6 +25,7 @@
           @testBodyInterface="handleTestBodyInterface"
           @closeTest="onCloseTest"
           ref="testBodyRequestRef"
+          :interfaceType="interfaceType"
           :data="dataMap.mapBodyObj"
         />
       </TabPane>
@@ -33,6 +35,7 @@
           @testHeaderInterface="handleTestHeaderInterface"
           @closeTest="onCloseTest"
           ref="testHeaderRequestRef"
+          :interfaceType="interfaceType"
           :data="dataMap.mapHeaderObj"
         />
       </TabPane>
@@ -64,6 +67,9 @@
     originUrlType: {
       type: String,
     },
+    interfaceType: {
+      type: String,
+    },
   });
 
   const emits = defineEmits(['activeKey']);

@@ -2,7 +2,7 @@
   <div>
     <div class="mt-8">
       <div class="flex">
-        <div class="flex" v-if="isAdmin(role)">
+        <div class="flex" v-if="interfaceType === 'SYSTEM' && isAdmin(role)">
           <Select
             v-model:value="selectTenant"
             allowClear
@@ -22,7 +22,7 @@
           />
         </div>
         <Button
-          :disabled="isAdmin(role) ? testDisabled : false"
+          :disabled="interfaceType === 'SYSTEM' && isAdmin(role) ? testDisabled : false"
           class="ml-2"
           @click="handleTest(isSingleClickText)"
           type="primary"
@@ -75,6 +75,9 @@
     data: {
       type: Object,
     },
+    interfaceType: {
+      type: String,
+    },
   });
 
   onMounted(async () => {
@@ -235,6 +238,7 @@
     excuteData.value = {
       params,
       token: getToken.value,
+      type: props.data?.type,
     };
     return excuteData.value;
   };

@@ -100,6 +100,8 @@
 
   const isShowTestResult = ref(false);
 
+  const postBodyType = ref('');
+
   //执行测试接口
   const handleExcute = () => {
     emits('emitExcute');
@@ -123,6 +125,7 @@
     isToken.value = Objects?.Params?.token;
     const body = Objects?.Body?.params;
     isPostToken.value = Objects?.Body?.token;
+    postBodyType.value = Objects?.Body?.type;
     apiUrl.value = url?.restfulFormat(params);
     if (isWebSocketType.value === '2') {
       socketUrls.value = url;
@@ -143,7 +146,8 @@
           params,
           body,
           isToken.value,
-          isPostToken.value
+          isPostToken.value,
+          postBodyType.value
         );
         if (!resp) return;
         if (Object.prototype.toString.call(resp) === '[object Object]') {
@@ -151,7 +155,10 @@
         } else if (typeof resp === 'string') {
           jsonEditorRef.value?.setJsonValue(resp);
         } else if (Array.isArray(resp)) {
-          jsonEditorRef.value?.setJsonValue(JSON.stringify(resp));
+          const temp = {
+            data: resp,
+          };
+          jsonEditorRef.value?.setJsonValue(temp);
         } else {
           jsonEditorRef.value?.setJsonValue(JSON.stringify(resp));
         }
@@ -217,14 +224,19 @@
     body,
     token,
     postToken,
+    postBodyType,
     joinPrefix = false
   ) => {
     const { convertObj } = useUtils();
     switch (apiType) {
       case 'GET':
-        const objGet = Object.assign({}, headers, {
-          'X-Authorization': `Bearer ${!token ? postToken : token}`,
-        });
+        const objGet = Object.assign(
+          {},
+          {
+            'X-Authorization': `Bearer ${!token ? postToken : token}`,
+          },
+          headers
+        );
         return await otherHttp.get(
           { url: apiUrl, params, headers: objGet },
           {
@@ -235,9 +247,26 @@
           }
         );
       case 'POST':
-        const objPost = Object.assign({}, headers, {
-          'X-Authorization': `Bearer ${!postToken ? token : postToken}`,
-        });
+        console.log(postBodyType);
+        const objPost = Object.assign(
+          {},
+          {
+            'X-Authorization': `Bearer ${!postToken ? token : postToken}`,
+          },
+          {
+            'Content-Type':
+              postBodyType === 'xml'
+                ? 'text/xml'
+                : postBodyType === 'form-data'
+                ? 'multipart/form-data'
+                : postBodyType === 'x-www-form-urlencoded'
+                ? 'application/x-www-form-urlencoded'
+                : postBodyType === 'json'
+                ? 'application/json'
+                : 'application/json',
+          },
+          headers
+        );
         return await otherHttp.post(
           { url: `${apiUrl}?${convertObj(params)}`, data: body, headers: objPost },
           {

@@ -2,7 +2,7 @@
   <div>
     <div class="mt-8">
       <div class="flex">
-        <div class="flex" v-if="isAdmin(role)">
+        <div class="flex" v-if="interfaceType === 'SYSTEM' && isAdmin(role)">
           <Select
             allowClear
             v-model:value="selectTenant"
@@ -22,7 +22,7 @@
           />
         </div>
         <Button
-          :disabled="isAdmin(role) ? testDisabled : false"
+          :disabled="interfaceType === 'SYSTEM' && isAdmin(role) ? testDisabled : false"
           class="ml-2"
           @click="handleTest(isSingleClickText)"
           type="primary"
@@ -64,6 +64,9 @@
     data: {
       type: Object,
     },
+    interfaceType: {
+      type: String,
+    },
   });
 
   onMounted(async () => {

@@ -2,7 +2,7 @@
   <div>
     <div class="mt-8">
       <div class="flex">
-        <div class="flex" v-if="isAdmin(role)">
+        <div class="flex" v-if="interfaceType === 'SYSTEM' && isAdmin(role)">
           <Select
             allowClear
             v-model:value="selectTenant"
@@ -22,7 +22,7 @@
           />
         </div>
         <Button
-          :disabled="isAdmin(role) ? testDisabled : false"
+          :disabled="interfaceType === 'SYSTEM' && isAdmin(role) ? testDisabled : false"
           class="ml-2"
           @click="handleTest(isSingleClickText)"
           type="primary"
@@ -66,6 +66,9 @@
     data: {
       type: Object,
     },
+    interfaceType: {
+      type: String,
+    },
   });
 
   onMounted(async () => {

@@ -2,6 +2,9 @@ import { BasicColumn, FormSchema } from '/@/components/Table';
 import { h } from 'vue';
 import { Tag } from 'ant-design-vue';
 import { findDictItemByCode } from '/@/api/system/dict';
+import { USER_INFO_KEY } from '/@/enums/cacheEnum';
+import { getAuthCache } from '/@/utils/auth';
+import { isAdmin } from '/@/enums/roleEnum';
 
 // 表格配置
 export const columns: BasicColumn[] = [
@@ -11,6 +14,14 @@ export const columns: BasicColumn[] = [
     width: 150,
   },
   {
+    title: '接口类型',
+    dataIndex: 'interfaceType',
+    width: 80,
+    format(text) {
+      return text === 'SYSTEM' ? '系统默认' : '自定义';
+    },
+  },
+  {
     title: '请求方式',
     dataIndex: 'requestContentType',
     width: 90,
@@ -42,7 +53,7 @@ export const searchFormSchema: FormSchema[] = [
     field: 'name',
     label: '接口名称',
     component: 'Input',
-    colProps: { span: 9 },
+    colProps: { span: 7 },
     componentProps: {
       maxLength: 36,
       placeholder: '请输入接口名称',
@@ -52,7 +63,7 @@ export const searchFormSchema: FormSchema[] = [
     field: 'state',
     label: '发布状态',
     component: 'Select',
-    colProps: { span: 9 },
+    colProps: { span: 7 },
     componentProps: {
       options: [
         {
@@ -67,6 +78,31 @@ export const searchFormSchema: FormSchema[] = [
       placeholder: '请选择发布状态',
     },
   },
+  {
+    field: 'interfaceType',
+    label: '接口类型',
+    component: 'Select',
+    colProps: { span: 7 },
+    componentProps: {
+      options: [
+        {
+          label: '系统默认',
+          value: 'SYSTEM',
+        },
+        {
+          label: '自定义',
+          value: 'CUSTOM',
+        },
+      ],
+      placeholder: '请选择接口类型',
+    },
+    ifShow: ({}) => {
+      const userInfo: any = getAuthCache(USER_INFO_KEY);
+      const role: string = userInfo?.roles[0];
+      if (isAdmin(role)) return true;
+      else return false;
+    },
+  },
 ];
 
 //表单配置
@@ -82,6 +118,52 @@ 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',
+    label: '接口类型',
+    required: true,
+    colProps: {
+      span: 8,
+    },
+    defaultValue: 'CUSTOM',
+    componentProps: {
+      options: [
+        {
+          label: '系统默认',
+          value: 'SYSTEM',
+        },
+        {
+          label: '自定义',
+          value: 'CUSTOM',
+        },
+      ],
+    },
+    ifShow: ({}) => {
+      const userInfo: any = getAuthCache(USER_INFO_KEY);
+      const role: string = userInfo?.roles[0];
+      if (isAdmin(role)) return true;
+      else return false;
+    },
+  },
   {
     field: 'requestContentType',
     label: '请求方式',
@@ -190,9 +272,17 @@ export const schemas: FormSchema[] = [
     slot: 'slotFillAddress',
     colProps: { span: 24 },
     ifShow: ({ values }) => {
-      if (values['requestOriginUrl']) {
-        return true;
-      } else return false;
+      return values['originUrlType'] === 'custom_url' && values['requestOriginUrl'];
+    },
+  },
+  {
+    field: 'slotServerAddress',
+    label: '完整地址',
+    component: 'Input',
+    slot: 'slotServerAddress',
+    colProps: { span: 24 },
+    ifShow: ({ values }) => {
+      return values['originUrlType'] === 'server_url';
     },
   },
   {

@@ -20,6 +20,7 @@
             :method="model['requestContentType']"
             :requestOriginUrl="model['requestOriginUrl']"
             :originUrlType="model['originUrlType']"
+            :interfaceType="model['interfaceType']"
           />
         </template>
         <template #testSql="{ model }">
@@ -33,6 +34,19 @@
         </template>
         <template #slotFillAddress="{ model }">
           <div>
+            <template v-if="model['originUrlType'] === 'custom_url'">
+              <Tag
+                v-if="model['requestOriginUrl']"
+                color="blue"
+                style="width: 35vw; white-space: normal; height: auto"
+              >
+                {{ ` ${model['requestOriginUrl'] + model['requestHttpTypeAndUrl']?.requestUrl}` }}
+              </Tag>
+            </template>
+          </div>
+        </template>
+        <template #slotServerAddress="{ model }">
+          <div>
             <Tag
               v-if="model['originUrlType'] === 'server_url'"
               color="blue"
@@ -45,15 +59,6 @@
                 `
               }}
             </Tag>
-            <template v-else>
-              <Tag
-                v-if="model['requestOriginUrl']"
-                color="blue"
-                style="width: 35vw; white-space: normal; height: auto"
-              >
-                {{ ` ${model['requestOriginUrl'] + model['requestHttpTypeAndUrl']?.requestUrl}` }}
-              </Tag>
-            </template>
           </div>
         </template>
       </BasicForm>

@@ -12,7 +12,12 @@
       </template>
     </BasicTable>
     <div style="margin-left: 0.44rem">
-      <a-button type="primary" class="mr-4" :disabled="disabled" @click="handleFrpRemote"
+      <a-button
+        v-if="isAdmin !== 'CUSTOMER_USER'"
+        type="primary"
+        class="mr-4"
+        :disabled="disabled"
+        @click="handleFrpRemote"
         >远程连接</a-button
       >
     </div>
@@ -20,13 +25,15 @@
 </template>
 
 <script setup lang="ts">
-  import { ref, nextTick } from 'vue';
+  import { ref, nextTick, computed } from 'vue';
   import { BasicTable, useTable, BasicColumn } from '/@/components/Table';
   import { Switch } from 'ant-design-vue';
   import { h } from 'vue';
   import { Tag } from 'ant-design-vue';
   import { frpGetInfoApi, frpPutInfoApi } from '/@/api/device/deviceConfigApi';
   import { useMessage } from '/@/hooks/web/useMessage';
+  import { USER_INFO_KEY } from '/@/enums/cacheEnum';
+  import { getAuthCache } from '/@/utils/auth';
 
   const props = defineProps({
     deviceDetail: {
@@ -35,6 +42,18 @@
     },
   });
 
+  const userInfo = getAuthCache(USER_INFO_KEY) as unknown as any;
+
+  const isAdmin = computed(() => {
+    if (userInfo.roles.includes('TENANT_ADMIN')) {
+      return 'TENANT_ADMIN';
+    } else if (userInfo.roles.includes('CUSTOMER_USER')) {
+      return 'CUSTOMER_USER';
+    } else {
+      return 'SYS_ADMIN';
+    }
+  });
+
   const { createMessage } = useMessage();
   const tableData: any = ref([]);
   const checked = ref<boolean>(false);