Merge branch 'ww' into 'main_dev'

chore(types): 修复类型错误

See merge request yunteng/thingskit-view!18

@@ -15,7 +15,12 @@ import { customRequest } from '@/api/external/customRequest'
 const { HelpOutlineIcon, FlashIcon } = icon.ionicons5
 const { targetData } = useTargetData()
 
-const requestModal = ref<InstanceType<typeof RequestModal>>()
+interface ComponentExpose {
+  openModal: ((flag: boolean | undefined, type: RequestDataTypeEnum) => Promise<void>) | undefined
+}
+
+
+const requestModal = ref<ComponentExpose>()
 
 const designStore = useDesignStore()
 
@@ -61,7 +66,7 @@ const themeColor = computed(() => {
 })
 
 const handleClickPanel = () => {
-  unref(requestModal)?.openModal(true, unref(selectedRequestType))
+  unref(requestModal)?.openModal?.(true, unref(selectedRequestType))
 }
 
 watchEffect(() => {

@@ -5,24 +5,28 @@ import { CreateComponentType } from '@/packages/index.d';
 import { CreateComponentGroupType } from '@/packages/index.d';
 import { RequestConfigType } from '@/store/modules/chartEditStore/chartEditStore.d';
 import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore';
-import { GlobalComponentConfig, NButton, NDivider, NModal, NSpace, NTag } from 'naive-ui';
+import { NButton, NDivider, NModal, NSpace, NTag } from 'naive-ui';
 import { ref, unref, computed, nextTick } from 'vue';
 import { PublicInterfaceForm } from '../PublicInterfaceForm';
 import ComponentConfiguration from './ComponentConfiguration.vue';
 import GlobalPublicConfiguration from './GlobalPublicConfiguration.vue';
 import { createRequestModalContext } from './useRequestModalContext';
 
+interface ComponentExpose {
+  getConfigurationData: () => RequestConfigType
+  setConfigurationData: (request: RequestConfigType) => void
+  validate: () => Promise<boolean>
+}
+
 const requestDataType = ref<RequestDataTypeEnum>(RequestDataTypeEnum.AJAX)
 
 const showModal = ref(false)
 
 const chartEditStore = useChartEditStore()
 
-const globalConfigurationEl = ref<Nullable<InstanceType<typeof GlobalPublicConfiguration>>>()
+const componentConfigurationEl = ref<ComponentExpose>()
 
-const componentConfigurationEl = ref<Nullable<InstanceType<typeof ComponentConfiguration>>>()
-
-const publicInterfaceFormEl = ref<Nullable<InstanceType<typeof PublicInterfaceForm>>>()
+const publicInterfaceFormEl = ref<ComponentExpose>()
 
 const getRequestTypeName = computed(() => {
   return RequestDataTypeNameEnum[RequestDataTypeEnum[unref(requestDataType)] as keyof typeof RequestDataTypeEnum]
@@ -34,6 +38,7 @@ const openModal = async (flag = true, type: RequestDataTypeEnum) => {
   requestDataType.value = type
   showModal.value = flag
   await nextTick()
+
   unref(componentConfigurationEl)?.setConfigurationData(unref(selectTarget)!.request || {})
   unref(publicInterfaceFormEl)?.setConfigurationData(unref(selectTarget)!.request || {})
 }
@@ -92,7 +97,7 @@ defineExpose({
 
 <template>
   <NModal :class="prefixCls" v-model:show="showModal" preset="card" style="width: 1000px;" title="请求配置">
-    <GlobalPublicConfiguration v-if="requestDataType === RequestDataTypeEnum.AJAX" ref="globalConfigurationEl" />
+    <GlobalPublicConfiguration v-if="requestDataType === RequestDataTypeEnum.AJAX" />
     <NDivider v-if="requestDataType === RequestDataTypeEnum.AJAX" />
     <ComponentConfiguration v-if="requestDataType === RequestDataTypeEnum.AJAX" ref="componentConfigurationEl" />
     <PublicInterfaceForm v-if="requestDataType === RequestDataTypeEnum.Pond" ref="publicInterfaceFormEl" />