From 3b21b8064bc85579a8084f358d4ec19e37665c6a Mon Sep 17 00:00:00 2001 From: dhb52 Date: Wed, 19 Jun 2024 17:30:02 +0800 Subject: [PATCH] =?UTF-8?q?feat(sj=5F1.1.0-beta1):=20=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E6=B2=A1=E7=94=A8=E7=BB=84=E4=BB=B6=EF=BC=8Cclearable=E5=B1=9E?= =?UTF-8?q?=E6=80=A7=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/common/block-strategy.vue | 1 - src/components/common/executor-type.vue | 1 - src/components/common/operation-reason.vue | 29 --------------------- src/components/common/route-key.vue | 7 +---- src/components/common/select-group.vue | 5 +++- src/components/common/select-scene.vue | 7 +++-- src/components/common/task-batch-status.vue | 27 ++++++++++--------- src/components/common/task-type.vue | 1 - src/components/common/trigger-type.vue | 1 - 9 files changed, 25 insertions(+), 54 deletions(-) delete mode 100644 src/components/common/operation-reason.vue diff --git a/src/components/common/block-strategy.vue b/src/components/common/block-strategy.vue index b7ebb3c..245b43c 100644 --- a/src/components/common/block-strategy.vue +++ b/src/components/common/block-strategy.vue @@ -25,7 +25,6 @@ const handleUpdate = (value: Api.Common.BlockStrategy) => { v-model:value="valueRef" :placeholder="$t('common.blockStrategy.form')" :options="translateOptions(blockStrategyRecordOptions)" - clearable @update:value="handleUpdate" /> diff --git a/src/components/common/executor-type.vue b/src/components/common/executor-type.vue index 104bcb3..a52a0d8 100644 --- a/src/components/common/executor-type.vue +++ b/src/components/common/executor-type.vue @@ -25,7 +25,6 @@ const handleUpdate = (value: Api.Common.TriggerType) => { v-model:value="valueRef" :placeholder="$t('common.executorType.form')" :options="translateOptions(executorTypeRecordOptions)" - clearable @update:value="handleUpdate" /> diff --git a/src/components/common/operation-reason.vue b/src/components/common/operation-reason.vue deleted file mode 100644 index 9f35817..0000000 --- a/src/components/common/operation-reason.vue +++ /dev/null @@ -1,29 +0,0 @@ - - - - - diff --git a/src/components/common/route-key.vue b/src/components/common/route-key.vue index 7444475..1635ed6 100644 --- a/src/components/common/route-key.vue +++ b/src/components/common/route-key.vue @@ -36,12 +36,7 @@ const selectOptions = computed(() => { diff --git a/src/components/common/select-group.vue b/src/components/common/select-group.vue index 07e751c..a6e2e30 100644 --- a/src/components/common/select-group.vue +++ b/src/components/common/select-group.vue @@ -10,10 +10,12 @@ defineOptions({ interface Props { disabled?: boolean; + clearable?: boolean; } const props = withDefaults(defineProps(), { - disabled: false + disabled: false, + clearable: false }); const model = defineModel(); @@ -45,6 +47,7 @@ getGroupNameList(); :placeholder="$t('page.retryTask.form.groupName')" :options="translateOptions2(groupNameList)" :disabled="props.disabled" + :clearable="props.clearable" filterable @update:value="handleUpdate" /> diff --git a/src/components/common/select-scene.vue b/src/components/common/select-scene.vue index a2d4c8c..b98eea0 100644 --- a/src/components/common/select-scene.vue +++ b/src/components/common/select-scene.vue @@ -12,9 +12,12 @@ const emit = defineEmits(); interface Props { groupName: string | null; + clearable?: boolean; } -const props = defineProps(); +const props = withDefaults(defineProps(), { + clearable: false +}); /** 场景列表 */ const sceneNameList = ref([]); @@ -55,7 +58,7 @@ watch( v-model:value="sceneNameRef" :placeholder="$t('page.retryTask.form.sceneName')" :options="translateOptions2(sceneNameList)" - clearable + :clearable="props.clearable" /> diff --git a/src/components/common/task-batch-status.vue b/src/components/common/task-batch-status.vue index c9357b9..d25464c 100644 --- a/src/components/common/task-batch-status.vue +++ b/src/components/common/task-batch-status.vue @@ -1,28 +1,31 @@ diff --git a/src/components/common/task-type.vue b/src/components/common/task-type.vue index 74dbf49..0efffe4 100644 --- a/src/components/common/task-type.vue +++ b/src/components/common/task-type.vue @@ -25,7 +25,6 @@ const handleUpdate = (value: Api.Common.BlockStrategy) => { v-model:value="valueRef" :placeholder="$t('common.routeKey.routeForm')" :options="translateOptions(taskTypeRecordRecordOptions)" - clearable @update:value="handleUpdate" /> diff --git a/src/components/common/trigger-type.vue b/src/components/common/trigger-type.vue index 614e9b5..5fbf414 100644 --- a/src/components/common/trigger-type.vue +++ b/src/components/common/trigger-type.vue @@ -25,7 +25,6 @@ const handleUpdate = (value: Api.Common.TriggerType) => { v-model:value="valueRef" :placeholder="$t('common.triggerType.form')" :options="translateOptions(triggerTypeOptions)" - clearable @update:value="handleUpdate" />