Merge branch 'local_dev_branch_by_ft' into 'main_dev'

fix: DEFECT-1758 首先点击新增公共接口,选择websocket请求,然后点击管理页回到界面,再新增公共接口,此时普通请求没有请求类型了

See merge request yunteng/thingskit-front!1012

@@ -4,77 +4,102 @@
     <!-- 待完善封装InputGroup -->
     <InputGroup compact>
       <Select
-        v-if="type !== '2'"
+        v-if="type !== RequestMethodTypeEnum.WEBSOCKET"
         placeholder="请求类型"
-        :style="{ width: type !== '2' ? 15 + '%' : 0 + '%' }"
-        v-model:value="valueObj.requestHttpType"
+        :style="{ width: type !== RequestMethodTypeEnum.WEBSOCKET ? 15 + '%' : 0 + '%' }"
+        v-model:value="requestTypeUrlValue.requestHttpType"
         :options="selectOptions"
         allowClear
         @change="emitChange"
       />
       <Input
-        @change="emitChange"
         placeholder="请输入接口地址"
-        v-model:value="valueObj.requestUrl"
-        :style="{ width: type !== '2' ? 85 + '%' : 100 + '%' }"
+        v-model:value="requestTypeUrlValue.requestUrl"
+        :style="{ width: type !== RequestMethodTypeEnum.WEBSOCKET ? 85 + '%' : 100 + '%' }"
+        @change="emitChange"
       />
     </InputGroup>
   </div>
 </template>
 <script lang="ts" setup>
-  import { reactive, ref, watchEffect } from 'vue';
+  import { reactive, ref, PropType, watch } from 'vue';
   import { InputGroup, Select, Input } from 'ant-design-vue';
-  import type { SelectValue } from 'ant-design-vue/lib/select';
   import { findDictItemByCode } from '/@/api/system/dict';
-  import { propTypes } from '/@/utils/propTypes';
+  import { RequestMethodTypeEnum } from '/@/views/dataview/publicApi/config/enum';
 
-  type TypeInputGroup = {
-    requestHttpType: SelectValue | undefined;
+  interface requestTypeUrlConfig {
+    requestHttpType: undefined;
     requestUrl?: string;
     disabled?: boolean;
-  };
+  }
 
-  type selectType = { label: string; value: string; disabled?: boolean };
+  type selectType = {
+    label: string;
+    value: string;
+  };
 
   const props = defineProps({
     type: {
       type: String,
+      default: RequestMethodTypeEnum.COMMOM,
     },
-    value: propTypes.object.def({}),
+    value: Object as PropType<requestTypeUrlConfig>,
   });
 
   const emits = defineEmits(['change', 'update:value']);
 
   const selectOptions = ref<selectType[]>([]);
 
-  const getOptions = async (e) => {
-    const res = await findDictItemByCode({
-      dictCode: e === '1' ? 'dataview_select_sql_request' : 'dataview_select_request',
+  const getOptions = async (requestType) => {
+    // 暂且排除SQL和WEBSOCKET
+    const resItem = await findDictItemByCode({
+      dictCode: 'dataview_select_request',
     });
-    if (e === '1' || e === '0') {
-      selectOptions.value = res.map((m) => ({ label: m.itemText, value: m.itemValue }));
+    if (requestType === RequestMethodTypeEnum.COMMOM) {
+      selectOptions.value = resItem.map((m) => ({ label: m.itemText, value: m.itemValue }));
     } else {
       selectOptions.value = [];
     }
   };
 
-  const valueObj = reactive<TypeInputGroup>({
+  const requestTypeUrlValue = reactive<requestTypeUrlConfig>({
     requestHttpType: undefined,
     requestUrl: '',
   });
 
-  watchEffect(() => {
-    initVal();
-  });
+  watch(
+    () => props.type,
+    () => {
+      initOption();
+    },
+    {
+      immediate: true,
+    }
+  );
+
+  watch(
+    () => props.value,
+    () => {
+      initConfig();
+    },
+    {
+      immediate: true,
+    }
+  );
+
+  function initOption() {
+    if (props.type) {
+      getOptions(props.type);
+    }
+  }
 
-  async function initVal() {
-    if (props?.type) await getOptions(props?.type);
-    if (props?.value) for (let i in props.value) Reflect.set(valueObj, i, props.value[i]);
+  function initConfig() {
+    if (props?.value)
+      for (let i in props.value) Reflect.set(requestTypeUrlValue, i, props.value[i]);
   }
 
   function emitChange() {
-    emits('change', valueObj);
-    emits('update:value', valueObj);
+    emits('change', requestTypeUrlValue);
+    emits('update:value', requestTypeUrlValue);
   }
 </script>
-<style scoped></style>

 export const createPickerSearch = (searchValue = false) => {
   return {
     showSearch: true,
+    getPopupContainer: (triggerNode) => triggerNode.parentNode,
     filterOption: (inputValue: string, option: Record<'label' | 'value', string>) => {
       let { label, value } = option;
       label = label.toLowerCase();

@@ -232,12 +232,6 @@ export const schemas = (): FormSchema[] => {
       component: 'InputGroup',
       required: true,
       colProps: { span: 24 },
-      componentProps: ({ formActionType }) => {
-        const { getFieldsValue } = formActionType;
-        return {
-          type: getFieldsValue().requestContentType,
-        };
-      },
     },
     {
       field: 'fillAddress',

@@ -127,6 +127,15 @@
     showActionButtonGroup: false,
   });
 
+  const updatePartFormScheme = (requestType: string) => {
+    updateSchema({
+      field: 'requestHttpTypeAndUrl',
+      componentProps: {
+        type: requestType,
+      },
+    });
+  };
+
   const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
     await resetFields();
     await nextTick();
@@ -152,13 +161,12 @@
           requestUrl: data.record?.requestUrl,
         },
       });
-      await nextTick(() => simpleRequestRef.value?.setValue(data.record, false, []));
-      updateSchema({
-        field: 'requestHttpTypeAndUrl',
-        componentProps: {
-          type: String(data.record?.requestContentType),
-        },
+      await nextTick(() => {
+        simpleRequestRef.value?.setValue(data.record, false, []);
+        updatePartFormScheme(String(data.record?.requestContentType));
       });
+    } else {
+      await updatePartFormScheme(RequestMethodTypeEnum.COMMOM);
     }
   });
 

@@ -184,10 +184,12 @@
       businessText.value === BusinessReportConfigTextEnum.BUSINESS_ADD_TEXT
         ? await createOrEditReportManage(data)
         : putReportConfigManage({ ...restData.data, ...data });
-      emits('success');
       createMessage.success(`${businessText.value}成功`);
       closeDrawer();
       handleClose();
+      setTimeout(() => {
+        emits('success');
+      }, 500);
     } finally {
       setDrawerProps({ confirmLoading: false });
     }

@@ -166,6 +166,8 @@ export const useHooks = () => {
         dataRange: [value?.startTs, value?.endTs],
         dateGroupGap: value?.interval,
       };
+      Reflect.deleteProperty(value, 'startTs');
+      Reflect.deleteProperty(value, 'interval');
     }
     const spanDisance = executeContent?.split(' ');
     const cronTime =