Merge branch 'dev-ww' into 'main_dev'

fix: 修复teambition bug

See merge request yunteng/thingskit-view!45

@@ -26,7 +26,7 @@ export const useFetchTargetData = () => {
     } catch (error) {
       loading.value = false
       console.error(error);
-      window['$message'].warning('数据异常，请检查参数！')
+      // window['$message'].warning('数据异常，请检查参数！')
     }
   }
   return { fetchTargetData, loading }

+import { excludeParseEventKeyList, excludeParseEventValueList } from "@/enums/eventEnum"
+
+const tryRunFunction = (v: string) => {
+  try {
+    return eval(`(function(){return ${v}})()`)
+  } catch (error) {
+    return v
+  }
+}
+
+export const JSONParse = (data: string) => {
+  return JSON.parse(data, (k, v) => {
+    // 过滤函数字符串
+    if (excludeParseEventKeyList.includes(k)) return v
+    // 过滤函数值表达式
+    if (typeof v === 'string') {
+      const someValue = excludeParseEventValueList.some(excludeValue => v.indexOf(excludeValue) > -1)
+      if (someValue) return v
+    }
+    // 还原函数值
+    if (typeof v === 'string' && v.indexOf && (v.indexOf('function') > -1 || v.indexOf('=>') > -1)) {
+      return tryRunFunction(v)
+    } else if (typeof v === 'string' && v.indexOf && v.indexOf('return ') > -1) {
+      const baseLeftIndex = v.indexOf('(')
+      if (baseLeftIndex > -1) {
+        const newFn = `function ${v.substring(baseLeftIndex)}`
+        return tryRunFunction(newFn)
+      }
+    }
+    return v
+  })
+}

@@ -12,6 +12,9 @@ import { RequestHttpIntervalEnum, RequestParamsObjType } from '@/enums/httpEnum'
 import { CreateComponentType, CreateComponentGroupType } from '@/packages/index.d'
 import { excludeParseEventKeyList, excludeParseEventValueList } from '@/enums/eventEnum'
 
+/// THINGS_KIT 替换JSONParse解析
+export { JSONParse } from './external/utils'
+
 /**
  * * 判断是否是开发环境
  * @return { Boolean }
@@ -127,11 +130,11 @@ export const fileToUrl = (file: File): string => {
  * * file转base64
  */
 export const fileTobase64 = (file: File, callback: Function) => {
-  let reader = new FileReader()
+  const reader = new FileReader()
   reader.readAsDataURL(file)
   reader.onload = function (e: ProgressEvent<FileReader>) {
     if (e.target) {
-      let base64 = e.target.result
+      const base64 = e.target.result
       callback(base64)
     }
   }
@@ -318,7 +321,8 @@ export const JSONStringify = <T>(data: T) => {
  * * JSON反序列化，支持函数和 undefined
  * @param data
  */
-export const JSONParse = (data: string) => {
+/// THINGS_KIT 重命名 JSONParse 为 JSONParseOriginal
+export const JSONParseOriginal = (data: string) => {
   return JSON.parse(data, (k, v) => {
     // 过滤函数字符串
     if (excludeParseEventKeyList.includes(k)) return v
@@ -347,4 +351,4 @@ export const JSONParse = (data: string) => {
  */
 export const setTitle = (title?: string) => {
   title && (document.title = title)
-}
\ No newline at end of file
+}

@@ -29,10 +29,7 @@ const designStore = useDesignStore()
    * 修改后的代码 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 },
@@ -50,7 +47,10 @@ const { fetchTargetData, } = useFetchTargetData()
 
 // 发送请求
 const sendHandle = async () => {
-  if (!targetData.value?.request) return
+  if (!targetData.value?.request || !targetData.value.request.requestUrl) {
+    window['$message'].warning('请先配置请求')
+    return
+  }
   loading.value = true
   try {
     const res = await fetchTargetData()

@@ -11,6 +11,9 @@ import { PublicInterfaceForm } from '../PublicInterfaceForm';
 import ComponentConfiguration from './ComponentConfiguration.vue';
 import GlobalPublicConfiguration from './GlobalPublicConfiguration.vue';
 import { createRequestModalContext } from './useRequestModalContext';
+import { useTargetData } from '../../../../hooks/useTargetData.hook';
+import { useFetchTargetData } from '@/hooks/external/useFetchTargetData';
+import { useFilterFn } from '@/hooks/external/useFilterFn';
 
 
 const requestDataType = ref<RequestDataTypeEnum>(RequestDataTypeEnum.AJAX)
@@ -67,9 +70,26 @@ const getResult = () => {
   return {} as unknown as RequestConfigType
 }
 
+const { targetData } = useTargetData()
+const { fetchTargetData } = useFetchTargetData()
+// 发送请求
+const sendHandle = async () => {
+  if (!targetData.value?.request || !targetData.value.request.requestUrl) {
+    window['$message'].warning('请先配置请求')
+    return
+  }
+  const res = await fetchTargetData()
+  if (res) {
+    const { value } = useFilterFn(targetData.value.filter, res)
+    targetData.value.option.dataset = value
+    return
+  }
+
+}
+
 const handleSaveAction = async () => {
   if (!(await validate())) return
-  const value = getResult() 
+  const value = getResult()
   if (unref(selectTarget)) {
     chartEditStore.updateComponentList(chartEditStore.fetchTargetIndex(), {
       ...unref(selectTarget)!,
@@ -77,6 +97,7 @@ const handleSaveAction = async () => {
     })
   }
   showModal.value = false
+  sendHandle()
 }
 
 createRequestModalContext({