Commit f9c67d2677e334d54a187ebae49ed17fc9caf8e4
Merge branch 'perf/linkedage' into 'main_dev'
perf: 优化场景联动启用规则默认选中时区 See merge request yunteng/thingskit-front!1032
Showing
3 changed files
with
11 additions
and
5 deletions
| 1 | 1 | <script setup lang="ts"> |
| 2 | 2 | import { BasicModal, useModalInner } from '/@/components/Modal'; |
| 3 | 3 | import { BasicForm, useForm } from '/@/components/Form'; |
| 4 | - import { EnableRuleFormType, getFormSchemas } from './config'; | |
| 4 | + import { EnableRuleFormType, getFormSchemas, TimezoneEnum } from './config'; | |
| 5 | 5 | import { nextTick, ref, unref } from 'vue'; |
| 6 | 6 | import CustomRule from './CustomRule.vue'; |
| 7 | 7 | import { ScheduleTypeEnum } from '/@/enums/linkedgeEnum'; |
| ... | ... | @@ -56,12 +56,17 @@ |
| 56 | 56 | }; |
| 57 | 57 | |
| 58 | 58 | const handleSetFieldsValue = async (schedule: ScheduleType) => { |
| 59 | - const { type, startsOn, endsOn, timezone, daysOfWeek } = schedule; | |
| 59 | + const { type, startsOn, endsOn, timezone = TimezoneEnum.SHANG_HAI, daysOfWeek } = schedule; | |
| 60 | 60 | |
| 61 | 61 | if (type === ScheduleTypeEnum.ANY_TIME) return setFieldsValue({ type }); |
| 62 | 62 | |
| 63 | 63 | if (type === ScheduleTypeEnum.SPECIFIC_TIME) |
| 64 | - return setFieldsValue({ type, timezone, daysOfWeek, timeRange: { startsOn, endsOn } }); | |
| 64 | + return setFieldsValue({ | |
| 65 | + type, | |
| 66 | + timezone, | |
| 67 | + daysOfWeek, | |
| 68 | + timeRange: { startsOn, endsOn }, | |
| 69 | + }); | |
| 65 | 70 | |
| 66 | 71 | setFieldsValue(schedule); |
| 67 | 72 | await nextTick(); | ... | ... |
| 1 | +import { TimezoneEnum } from './config'; | |
| 1 | 2 | import { ScheduleTypeEnum } from '/@/enums/linkedgeEnum'; |
| 2 | 3 | |
| 3 | 4 | export interface CustomRuleItemType { |
| ... | ... | @@ -9,7 +10,7 @@ export interface CustomRuleItemType { |
| 9 | 10 | |
| 10 | 11 | export interface ScheduleType { |
| 11 | 12 | type: ScheduleTypeEnum; |
| 12 | - timezone?: string; | |
| 13 | + timezone?: TimezoneEnum; | |
| 13 | 14 | items?: CustomRuleItemType[]; |
| 14 | 15 | daysOfWeek?: number[]; |
| 15 | 16 | endsOn?: number; | ... | ... |