Commit 7652c412 by jason

【代码评审修改】触发器 异步 Http 改成 Http 回调

parent de35fd0a
...@@ -756,20 +756,19 @@ export enum TriggerTypeEnum { ...@@ -756,20 +756,19 @@ export enum TriggerTypeEnum {
* 发送 HTTP 请求触发器 * 发送 HTTP 请求触发器
*/ */
HTTP_REQUEST = 1, HTTP_REQUEST = 1,
// TODO @jason:要不把 FORM_UPDATE、FORM_DELETE 调整从 10、11 这样?
/** /**
* 表单数据更新触发器 * 发起 HTTP 回调请求触发器
*/ */
FORM_UPDATE = 2, HTTP_CALLBACK = 2,
/** /**
* 表单数据删除触发器 * 表单数据更新触发器
*/ */
FORM_DELETE = 3, FORM_UPDATE = 10,
// TODO @jason:1)HTTP_CALLBACK 这个枚举值?然后,相关注释,朝着“HTTP 回调”走;2)枚举值改成 2?
/** /**
* 发起异步 HTTP 请求 * 表单数据删除触发器
*/ */
ASYNC_HTTP_REQUEST = 4 FORM_DELETE = 11
} }
/** /**
...@@ -804,7 +803,7 @@ export type FormTriggerSetting = { ...@@ -804,7 +803,7 @@ export type FormTriggerSetting = {
export const TRIGGER_TYPES: DictDataVO[] = [ export const TRIGGER_TYPES: DictDataVO[] = [
{ label: 'HTTP 请求', value: TriggerTypeEnum.HTTP_REQUEST }, { label: 'HTTP 请求', value: TriggerTypeEnum.HTTP_REQUEST },
{ label: '异步 HTTP 请求', value: TriggerTypeEnum.ASYNC_HTTP_REQUEST }, { label: 'HTTP 回调', value: TriggerTypeEnum.HTTP_CALLBACK },
{ label: '修改表单数据', value: TriggerTypeEnum.FORM_UPDATE }, { label: '修改表单数据', value: TriggerTypeEnum.FORM_UPDATE },
{ label: '删除表单数据', value: TriggerTypeEnum.FORM_DELETE } { label: '删除表单数据', value: TriggerTypeEnum.FORM_DELETE }
] ]
......
...@@ -36,11 +36,9 @@ ...@@ -36,11 +36,9 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<!-- HTTP 请求触发器 --> <!-- HTTP 请求触发器 -->
<!-- TODO @jason:可以考虑用 [].include 更简洁 -->
<div <div
v-if=" v-if="
(configForm.type === TriggerTypeEnum.HTTP_REQUEST || [TriggerTypeEnum.HTTP_REQUEST, TriggerTypeEnum.HTTP_CALLBACK].includes(configForm.type) &&
configForm.type === TriggerTypeEnum.ASYNC_HTTP_REQUEST) &&
configForm.httpRequestSetting configForm.httpRequestSetting
" "
> >
...@@ -407,9 +405,9 @@ const changeTriggerType = () => { ...@@ -407,9 +405,9 @@ const changeTriggerType = () => {
return return
} }
if (configForm.value.type === TriggerTypeEnum.ASYNC_HTTP_REQUEST) { if (configForm.value.type === TriggerTypeEnum.HTTP_CALLBACK) {
configForm.value.httpRequestSetting = configForm.value.httpRequestSetting =
originalSetting?.type === TriggerTypeEnum.ASYNC_HTTP_REQUEST && originalSetting?.type === TriggerTypeEnum.HTTP_CALLBACK &&
originalSetting.httpRequestSetting originalSetting.httpRequestSetting
? originalSetting.httpRequestSetting ? originalSetting.httpRequestSetting
: { : {
...@@ -566,7 +564,7 @@ const getShowText = (): string => { ...@@ -566,7 +564,7 @@ const getShowText = (): string => {
let showText = '' let showText = ''
if ( if (
configForm.value.type === TriggerTypeEnum.HTTP_REQUEST || configForm.value.type === TriggerTypeEnum.HTTP_REQUEST ||
configForm.value.type === TriggerTypeEnum.ASYNC_HTTP_REQUEST configForm.value.type === TriggerTypeEnum.HTTP_CALLBACK
) { ) {
showText = `${configForm.value.httpRequestSetting?.url}` showText = `${configForm.value.httpRequestSetting?.url}`
} else if (configForm.value.type === TriggerTypeEnum.FORM_UPDATE) { } else if (configForm.value.type === TriggerTypeEnum.FORM_UPDATE) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment