Merge branch 'ft' into 'main_dev'

perf(src/packages/public/publicConfig.ts): 修改默认为动态接口

See merge request yunteng/thingskit-view!44

@@ -2,13 +2,20 @@ import { defHttp } from '@/utils/external/http/axios';
 import { DeviceAttributesRecord, GetDeviceListParams, PublicInterfaceRecord, PublicInterfaceStateEnum } from './model';
 import { PaginationResult } from '/#/external/axios';
 
-enum Api {
-  PUBLIC_API = '/data_view_interface',
-  ORG_LISt = '/organization/me/list',
-  DEVICE_PROFILE_LIST = '/device_profile/me/list',
-  DEVICE_LIST = '/device/list',
-  DEVICE_ATTR_LIST = '/device/attributes',
-  GET_PUBLIC_INTERFACE_ALL = '/data_view_interface/find_all_interface',
+ /**
+   * ft 更换接口
+   * 修改后的代码在注释之间，并标注好源代码和修改后代码，方便回溯
+   * 源代码  GET_PUBLIC_INTERFACE_ALL = '/data_view_interface/find_all_interface',
+   * 修改后代码 GET_PUBLIC_INTERFACE_ALL = '/data_view_interface/find/can_use_interfaces',
+   */
+  enum Api {
+    PUBLIC_API = '/data_view_interface',
+    ORG_LISt = '/organization/me/list',
+    DEVICE_PROFILE_LIST = '/device_profile/me/list',
+    DEVICE_LIST = '/device/list',
+    DEVICE_ATTR_LIST = '/device/attributes',
+    GET_PUBLIC_INTERFACE_ALL = '/data_view_interface/find/can_use_interfaces',
+    //ft
   GET_PUBLIC_INTERFACE_DETAIL = '/data_view_interface/get_interface_details'
 }
 
@@ -52,9 +59,15 @@ export const getDeviceInterfaceDetail = async (interfaces: string[]) => {
     params: interfaces
   })
 }
-
-export const getAllPublicInterface = async (params?: { state: PublicInterfaceStateEnum }) => {
+ /**
+   * ft 更换接口
+   * 修改后的代码在注释之间，并标注好源代码和修改后代码，方便回溯
+   * 源代码  url: `${Api.GET_PUBLIC_INTERFACE_ALL}${params?.state ? `/${params.state}` : ''}`
+   * 修改后代码     url: `${Api.GET_PUBLIC_INTERFACE_ALL}`
+   */
+export const getAllPublicInterface = async () => {
   return defHttp.get<PublicInterfaceRecord[]>({
-    url: `${Api.GET_PUBLIC_INTERFACE_ALL}${params?.state ? `/${params.state}` : ''}`
+    url: `${Api.GET_PUBLIC_INTERFACE_ALL}`
   })
 }
+//ft
\ No newline at end of file

@@ -18,9 +18,17 @@ import {
 import { chartInitConfig } from '@/settings/designSetting'
 import cloneDeep from 'lodash/cloneDeep'
 
+/**
+   * 这里更新版本有冲突 
+   * ft 修改在公共接口下拉框里默认选择公共接口
+   * 修改后的代码在注释之间，并标注好源代码和修改后代码，方便回溯
+   * 源代码 requestDataType: RequestDataTypeEnum.AJAX,
+   * 修改后的代码 requestDataType: RequestDataTypeEnum.Pond,
+   * 修改后代码在//ft之间
+   */
 // 请求基础属性
 export const requestConfig: RequestConfigType = {
-  requestDataType: RequestDataTypeEnum.STATIC,
+  requestDataType: RequestDataTypeEnum.Pond,
   requestHttpType: RequestHttpEnum.GET,
   requestUrl: '',
   requestInterval: undefined,
@@ -41,6 +49,7 @@ export const requestConfig: RequestConfigType = {
     Params: {}
   }
 }
+//ft之间
 
 // 单实例类
 export class PublicConfigClass implements PublicConfigType {

@@ -22,7 +22,17 @@ const requestModal = ref<InstanceType<typeof RequestModal>>()
 const designStore = useDesignStore()
 
 
-const selectedRequestType = ref(targetData.value.request.requestDataType || RequestDataTypeEnum.AJAX)
+/**
+   * ft 修改在公共接口下拉框里默认选择公共接口
+   * 修改后的代码在注释之间，并标注好源代码和修改后代码，方便回溯
+   * 源代码 const selectedRequestType = ref(targetData.value.request.requestDataType || RequestDataTypeEnum.AJAX)
+   * 修改后的代码 const selectedRequestType = ref(targetData.value.request.requestDataType || RequestDataTypeEnum.Pond)
+   * 修改后代码在//ft之间
+   */
+
+const selectedRequestType = ref(targetData.value.request.requestDataType || RequestDataTypeEnum.Pond)
+console.log(targetData.value.request.requestDataType)
+//ft
 
 const getApiRequestType: SelectOption[] = [
   { label: '自定义请求', value: RequestDataTypeEnum.AJAX },

@@ -2,10 +2,10 @@
 import { getAllPublicInterface } from '@/api/external/dynamicRequest'
 import { ParamsItemType, PublicInterfaceRecord, PublicInterfaceRequestParams, PublicInterfaceStateEnum } from '@/api/external/dynamicRequest/model';
 import { SettingItem, SettingItemBox } from '@/components/Pages/ChartItemSetting';
-import { RequestContentTypeEnum, RequestContentTypeNameEnum } from '@/enums/external/httpEnum';
+import { RequestContentTypeEnum, RequestContentTypeNameEnum, RequestEnum } from '@/enums/external/httpEnum';
 import { RequestBodyEnum, RequestHttpEnum, RequestHttpIntervalEnum, RequestParams, RequestParamsTypeEnum } from '@/enums/httpEnum';
-import { NCard, NEmpty, NInputGroup, NInputNumber, NScrollbar, NSelect, NTabPane, NTabs, SelectOption } from 'naive-ui';
-import { ref, computed, unref, nextTick } from 'vue'
+import { NCard, NEllipsis, NEmpty, NInputGroup, NInputNumber, NScrollbar, NSelect, NSpace, NTabPane, NTabs, SelectOption } from 'naive-ui';
+import { ref, computed, unref, nextTick, h } from 'vue'
 import { selectTimeOptions, selectTypeOptions } from '../../../index.d';
 import ParamsTable from '../RequestModal/ParamsTable.vue';
 import BodyContent from './BodyContent.vue'
@@ -43,7 +43,14 @@ const getSelectedInterfaceParams = computed(() => {
 
 const getPublicInterfaceList = async () => {
   if (unref(publicInterfaceList).length) return
-  const result = await getAllPublicInterface({ state: PublicInterfaceStateEnum.PUBLISH })
+   /**
+   * ft 更换接口
+   * 修改后的代码在注释之间，并标注好源代码和修改后代码，方便回溯
+   * 源代码  const result = await getAllPublicInterface({ state: PublicInterfaceStateEnum.PUBLISH })
+   * 修改后代码 const result = await getAllPublicInterface()
+   */
+  const result = await getAllPublicInterface()
+  //ft
   publicInterfaceList.value = result
 }
 
@@ -141,6 +148,30 @@ const setConfigurationData = async (request: ExtraRequestConfigType) => {
   setDynamicFormValue(request)
 }
 
+  /**
+   * ft 修改在公共接口下拉框里加上接口类型
+   * 修改后的代码在注释之间，并标注好源代码和修改后代码，方便回溯
+   * 源代码 属于新增代码，源代码无
+   * 修改后代码在//ft之间
+   */
+
+const getHttpType = (httpType:RequestEnum, contentType:number) => {
+  if(contentType===0){
+    if (httpType === RequestEnum[httpType]) return RequestEnum[httpType] 
+  }
+  else if (contentType===2) return 'WebSocket'
+}
+
+const renderOption = (option: SelectOption) => {
+  const httpType = getHttpType(option?.requestHttpType as RequestEnum, option?.requestContentType as number)
+  const interfaceTypeName = option?.interfaceType === 'SYSTEM' ? '系统默认' :option?.interfaceType === 'CUSTOM'? '自定义':''
+  return h(NSpace, { justify: 'space-between', style: 'padding: 0 15px; height: 28px; line-height: 28px;' }, () => [
+    h(NEllipsis, null, () => `${!httpType?'':httpType+'/'}${interfaceTypeName}`),
+    h(NEllipsis, null, () => option.interfaceName),
+  ])
+}
+//ft
+
 defineExpose({
   getConfigurationData,
   setConfigurationData,
@@ -154,10 +185,19 @@ defineExpose({
   <SettingItemBox name="公共接口" :alone="true" :item-right-style="{ gridTemplateColumns: '5fr 2fr 1fr' }">
     <SettingItem name="请求方式 & URL地址">
       <NInputGroup>
+    <!-- 
+      /**
+        * ft 修改在公共接口下拉框里加上接口类型
+        * 修改后的代码在注释之间，并标注好源代码和修改后代码，方便回溯
+        * 源代码 无
+        * 修改后代码 新增一句 :render-label="renderOption"
+        */
+      -->
         <NSelect v-model:value="selectedPublicInterface" label-field="interfaceName" value-field="id"
           :options="publicInterfaceList" :filter="handleFilter" filterable :reset-menu-on-options-change="false"
-          @update-value="handleSelectedInterfaceChange" size="small">
+          @update-value="handleSelectedInterfaceChange" size="small" :render-label="renderOption">
         </NSelect>
+        <!-- ft -->
         <NSelect v-if="requestContentTypeRef !== RequestContentTypeEnum.WEB_SOCKET" v-model:value="requestHttpTypeRef"
           style="width: 150px;" size="small" :options="(selectTypeOptions as SelectOption[])" :disabled="true" />
         <NSelect v-if="requestContentTypeRef === RequestContentTypeEnum.WEB_SOCKET" :disabled="true" style="width: 150px;"
@@ -225,6 +265,7 @@ defineExpose({
       </NScrollbar>
     </NCard>
   </SettingItemBox>
+  <!-- ft -->
 </template>
 
 <style scoped lang="scss">