Merge branch 'ww' into 'main_dev'

fix: 修复预览模式下未轮训请求

See merge request yunteng/thingskit-view!33

 import { ref, toRefs, toRaw, watch } from 'vue'
 import { ref, toRefs, toRaw, watch } from 'vue'
 import type VChart from 'vue-echarts'
 import type VChart from 'vue-echarts'
-import { customizeHttp } from '@/api/http'
 import { useChartDataPondFetch } from '@/hooks/'
 import { useChartDataPondFetch } from '@/hooks/'
 import { CreateComponentType, ChartFrameEnum } from '@/packages/index.d'
 import { CreateComponentType, ChartFrameEnum } from '@/packages/index.d'
 import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
 import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
-import { RequestDataTypeEnum } from '@/enums/httpEnum'
-import { isPreview, newFunctionHandle, intervalUnitHandle } from '@/utils'
+import { isPreview, intervalUnitHandle } from '@/utils'
 import { setOption } from '@/packages/public/chart'
 import { setOption } from '@/packages/public/chart'
+import { useChartDataSocket } from './useChartDataSocket'
+import { customRequest } from '@/api/external/customRequest'
+import { useFilterFn } from './useFilterFn'
 
 
 // 获取类型
 // 获取类型
 type ChartEditStoreType = typeof useChartEditStore
 type ChartEditStoreType = typeof useChartEditStore
@@ -52,18 +53,13 @@ export const useChartDataFetch = (
 
 
     // 目标组件
     // 目标组件
     const {
     const {
-      requestDataType,
       requestUrl,
       requestUrl,
       requestIntervalUnit: targetUnit,
       requestIntervalUnit: targetUnit,
       requestInterval: targetInterval
       requestInterval: targetInterval
     } = toRefs(targetComponent.request)
     } = toRefs(targetComponent.request)
 
 
-    // 非请求类型
-    if (requestDataType.value !== RequestDataTypeEnum.AJAX) return
-
     try {
     try {
-      // 处理地址
-      // @ts-ignore
+      // 处理地址 
       if (requestUrl?.value) {
       if (requestUrl?.value) {
         // requestOriginUrl 允许为空
         // requestOriginUrl 允许为空
         const completePath = requestOriginUrl && requestOriginUrl.value + requestUrl.value
         const completePath = requestOriginUrl && requestOriginUrl.value + requestUrl.value
@@ -72,14 +68,15 @@ export const useChartDataFetch = (
         clearInterval(fetchInterval)
         clearInterval(fetchInterval)
 
 
         const fetchFn = async () => {
         const fetchFn = async () => {
-          const res = await customizeHttp(toRaw(targetComponent.request), toRaw(chartEditStore.getRequestGlobalConfig))
+          const res = await customRequest(toRaw(targetComponent.request))
           if (res) {
           if (res) {
             try {
             try {
               const filter = targetComponent.filter
               const filter = targetComponent.filter
-              echartsUpdateHandle(newFunctionHandle(res?.data, res, filter))
+              const { value } = useFilterFn(filter, res)
+              echartsUpdateHandle(value)
               // 更新回调函数
               // 更新回调函数
               if (updateCallback) {
               if (updateCallback) {
-                updateCallback(newFunctionHandle(res?.data, res, filter))
+                updateCallback(value)
               }
               }
             } catch (error) {
             } catch (error) {
               console.error(error)
               console.error(error)
@@ -113,10 +110,9 @@ export const useChartDataFetch = (
   }
   }
 
 
   if (isPreview()) {
   if (isPreview()) {
-    // 判断是否是数据池类型
-    targetComponent.request.requestDataType === RequestDataTypeEnum.Pond
-      ? addGlobalDataInterface(targetComponent, useChartEditStore, updateCallback || echartsUpdateHandle)
-      : requestIntervalFn()
+    requestIntervalFn()
+    const { initial } = useChartDataSocket()
+    initial(targetComponent, useChartEditStore, updateCallback)
   }
   }
   return { vChartRef }
   return { vChartRef }
 }
 }

@@ -7,18 +7,21 @@ import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore
 import { RequestDataTypeEnum } from '@/enums/httpEnum'
 import { RequestDataTypeEnum } from '@/enums/httpEnum'
 import { isPreview, newFunctionHandle, intervalUnitHandle } from '@/utils'
 import { isPreview, newFunctionHandle, intervalUnitHandle } from '@/utils'
 import { setOption } from '@/packages/public/chart'
 import { setOption } from '@/packages/public/chart'
-import { useChartDataSocket } from './external/useChartDataSocket'
+
+// THINGS_KIT 重写默认方法
+export { useChartDataFetch } from './external/useChartDataFetch.hook'
 
 
 // 获取类型
 // 获取类型
 type ChartEditStoreType = typeof useChartEditStore
 type ChartEditStoreType = typeof useChartEditStore
 
 
+// THINGS_KIT 重命名默认方法
 /**
 /**
  * setdata 数据监听与更改
  * setdata 数据监听与更改
  * @param targetComponent
  * @param targetComponent
  * @param useChartEditStore 若直接引会报错，只能动态传递
  * @param useChartEditStore 若直接引会报错，只能动态传递
  * @param updateCallback 自定义更新函数
  * @param updateCallback 自定义更新函数
  */
  */
-export const useChartDataFetch = (
+export const originUseChartDataFetch = (
   targetComponent: CreateComponentType,
   targetComponent: CreateComponentType,
   useChartEditStore: ChartEditStoreType,
   useChartEditStore: ChartEditStoreType,
   updateCallback?: (...args: any) => any
   updateCallback?: (...args: any) => any
@@ -119,9 +122,5 @@ export const useChartDataFetch = (
       ? addGlobalDataInterface(targetComponent, useChartEditStore, updateCallback || echartsUpdateHandle)
       ? addGlobalDataInterface(targetComponent, useChartEditStore, updateCallback || echartsUpdateHandle)
       : requestIntervalFn()
       : requestIntervalFn()
   }
   }
-
-  // THINGS_KIT 添加socket支持
-  const { initial } = useChartDataSocket() 
-  initial(targetComponent, useChartEditStore, updateCallback)
   return { vChartRef }
   return { vChartRef }
 }
 }

@@ -37,7 +37,6 @@ export function createPermissionGuard(router: Router) {
     }
     }
 
 
     const token = userStore.getJwtToken
     const token = userStore.getJwtToken
-    console.log(token)
 
 
     if (to.matched.find(item => whitePathList.includes(item.path))) {
     if (to.matched.find(item => whitePathList.includes(item.path))) {
       if (to.path === PageEnum.BASE_LOGIN && token) {
       if (to.path === PageEnum.BASE_LOGIN && token) {

 <script lang="ts" setup>
 <script lang="ts" setup>
-import { ParamsItemType, PublicInterfaceRecord } from '@/api/external/dynamicRequest/model';
-import { RequestParams } from '@/enums/httpEnum';
-import { FormItemInst, NDatePicker, NForm, NFormItem, NInput, NSelect, NTreeSelect } from 'naive-ui'
+import { ParamsItemType } from '@/api/external/dynamicRequest/model';
+import { FormItemInst, NDatePicker, NForm, NFormItem, NInput, NSelect, NTreeSelect, NIcon, NTooltip } from 'naive-ui'
 import { computed, nextTick, ref, unref, watch } from 'vue';
 import { computed, nextTick, ref, unref, watch } from 'vue';
-import { ComponentType, useDynamicPublicForm } from './useDynamicPublicForm'; 
+import { ComponentType, useDynamicPublicForm } from './useDynamicPublicForm';
+import { Help } from '@vicons/ionicons5'
 
 
 const props = defineProps<{
 const props = defineProps<{
   paramsItemList: ParamsItemType[]
   paramsItemList: ParamsItemType[]
@@ -16,7 +16,7 @@ const componentMap: { [key in ComponentType]?: any } = {
   [ComponentType.DATE_PICKER]: NDatePicker
   [ComponentType.DATE_PICKER]: NDatePicker
 }
 }
 
 
-const getParamsItemList = computed(() => { 
+const getParamsItemList = computed(() => {
   return props.paramsItemList
   return props.paramsItemList
 })
 })
 
 
@@ -35,7 +35,7 @@ const validate = async () => {
   return unref(validFlag)
   return unref(validFlag)
 }
 }
 const setConfigurationData = async (params: Recordable) => {
 const setConfigurationData = async (params: Recordable) => {
-  await nextTick() 
+  await nextTick()
   setDynamicFormValue(params)
   setDynamicFormValue(params)
 }
 }
 
 
@@ -60,9 +60,36 @@ defineExpose({
 <template>
 <template>
   <NForm>
   <NForm>
     <template v-for="item in getDynamicFormSchemas" :key="item.key">
     <template v-for="item in getDynamicFormSchemas" :key="item.key">
-      <NFormItem ref="dynamicFormItemEl" :required="item.required" :label="item.name" :rule="item.rules">
+      <NFormItem ref="dynamicFormItemEl" :required="item.required" :rule="item.rules">
+        <template #label>
+          <div class="label-container">
+            <span>{{ item.name }}</span>
+            <NTooltip v-if="item.name === 'entityType'" trigger="hover">
+              <template #trigger>
+                <NIcon>
+                  <Help />
+                </NIcon>
+              </template>
+              请填入DEVICE
+            </NTooltip>
+          </div>
+        </template>
         <component :is="componentMap[item.component]" v-bind="item.props" clearable />
         <component :is="componentMap[item.component]" v-bind="item.props" clearable />
       </NFormItem>
       </NFormItem>
     </template>
     </template>
   </NForm>
   </NForm>
 </template>
 </template>
+
+<style scoped lang="scss">
+.label-container {
+  display: flex;
+  align-items: center;
+  cursor: pointer;
+  gap: 5px;
+
+  i {
+    border: 1px solid #000;
+    border-radius: 50%;
+  }
+}
+</style> 

@@ -54,7 +54,7 @@ const handleFilter = (query: string, option: SelectOption) => {
 
 
 const requestHttpTypeRef = ref<RequestHttpEnum>()
 const requestHttpTypeRef = ref<RequestHttpEnum>()
 
 
-const requestIntervalValueRef = ref<number>(30)
+const requestIntervalValueRef = ref<undefined | number>(30)
 
 
 const requestIntervalUnitRef = ref<RequestHttpIntervalEnum>(RequestHttpIntervalEnum.SECOND)
 const requestIntervalUnitRef = ref<RequestHttpIntervalEnum>(RequestHttpIntervalEnum.SECOND)
 
 
@@ -112,12 +112,14 @@ const getConfigurationData = () => {
   record.requestParams[RequestParamsTypeEnum.PARAMS] = getDynamicFormValue()
   record.requestParams[RequestParamsTypeEnum.PARAMS] = getDynamicFormValue()
   record.requestParams[RequestParamsTypeEnum.HEADER] = unref(headerRef)
   record.requestParams[RequestParamsTypeEnum.HEADER] = unref(headerRef)
   record.requestParams[RequestParamsTypeEnum.BODY] = bodyValue
   record.requestParams[RequestParamsTypeEnum.BODY] = bodyValue
+  record.requestInterval = unref(requestIntervalValueRef)
+  record.requestIntervalUnit = unref(requestIntervalUnitRef)
   return record
   return record
 }
 }
 
 
 const setConfigurationData = async (request: ExtraRequestConfigType) => {
 const setConfigurationData = async (request: ExtraRequestConfigType) => {
   await getPublicInterfaceList()
   await getPublicInterfaceList()
-  const { requestDataPondId, requestParams, requestParamsBodyType, requestContentType, requestHttpType } = request
+  const { requestDataPondId, requestParams, requestParamsBodyType, requestContentType, requestHttpType, requestIntervalUnit, requestInterval } = request
   const { Header } = requestParams
   const { Header } = requestParams
   selectedPublicInterface.value = requestDataPondId
   selectedPublicInterface.value = requestDataPondId
   requestContentTypeRef.value = requestContentType
   requestContentTypeRef.value = requestContentType
@@ -125,6 +127,8 @@ const setConfigurationData = async (request: ExtraRequestConfigType) => {
   headerRef.value = Header
   headerRef.value = Header
   requestParamsBodyTypeRef.value = requestParamsBodyType
   requestParamsBodyTypeRef.value = requestParamsBodyType
   requestBodyRef.value = requestParams
   requestBodyRef.value = requestParams
+  requestIntervalUnitRef.value = requestIntervalUnit
+  requestIntervalValueRef.value = requestInterval
   await nextTick()
   await nextTick()
   setDynamicFormValue(request)
   setDynamicFormValue(request)
 }
 }

@@ -124,7 +124,7 @@ const props = withDefaults(
     maxRow: 50,
     maxRow: 50,
   }
   }
 )
 )
- 
+
 
 
 const emit = defineEmits(['update:value'])
 const emit = defineEmits(['update:value'])
 
 
@@ -143,7 +143,7 @@ watch(
       dataSource.value = Object.keys(props.value || {}).map(keyName => ({ ...createNewRow(), keyName, value: Reflect.get(props.value || {}, keyName) }))
       dataSource.value = Object.keys(props.value || {}).map(keyName => ({ ...createNewRow(), keyName, value: Reflect.get(props.value || {}, keyName) }))
     } else {
     } else {
       dataSource.value = [createNewRow()]
       dataSource.value = [createNewRow()]
-    }
+    } 
   },
   },
   {
   {
     immediate: true,
     immediate: true,
@@ -167,11 +167,11 @@ const handleAddRow = (record: DataSource) => {
 const handleSubtractRow = (record: DataSource) => {
 const handleSubtractRow = (record: DataSource) => {
   const index = unref(dataSource).findIndex(item => item.id === record.id)
   const index = unref(dataSource).findIndex(item => item.id === record.id)
   if (unref(dataSource).length === 1) {
   if (unref(dataSource).length === 1) {
-    unref(dataSource)[index].keyName = ''
-    unref(dataSource)[index].value = ''
-    return
+    emit('update:value', {})
+  } else {
+    unref(dataSource).splice(index, 1)
+    emit('update:value', getHeaderConfiguration())
   }
   }
-  unref(dataSource).splice(index, 1)
 }
 }
 
 
 
 
@@ -194,5 +194,5 @@ const getHeaderConfiguration = () => {
 </script>
 </script>
 
 
 <template>
 <template>
-  <NDataTable size="small" :columns="columns" :data="dataSource" max-height="300" />
+  <NDataTable size="small" :columns="columns" :row-key="rowData => rowData.id" :data="dataSource" max-height="300" />
 </template>
 </template>

@@ -69,8 +69,7 @@ const getResult = () => {
 
 
 const handleSaveAction = async () => {
 const handleSaveAction = async () => {
   if (!(await validate())) return
   if (!(await validate())) return
-  const value = getResult()
-  console.log(value)
+  const value = getResult() 
   if (unref(selectTarget)) {
   if (unref(selectTarget)) {
     chartEditStore.updateComponentList(chartEditStore.fetchTargetIndex(), {
     chartEditStore.updateComponentList(chartEditStore.fetchTargetIndex(), {
       ...unref(selectTarget)!,
       ...unref(selectTarget)!,