Commit f9c67d2677e334d54a187ebae49ed17fc9caf8e4

Authored by xp.Huang
2 parents ce43e301 01570fb6

Merge branch 'perf/linkedage' into 'main_dev'

perf: 优化场景联动启用规则默认选中时区

See merge request yunteng/thingskit-front!1032
@@ -33,7 +33,7 @@ useComponentRegister('TimeRangePicker', TimeRangePicker); @@ -33,7 +33,7 @@ useComponentRegister('TimeRangePicker', TimeRangePicker);
33 33
34 export const WeekName = ['一', '二', '三', '四', '五', '六', '日']; 34 export const WeekName = ['一', '二', '三', '四', '五', '六', '日'];
35 35
36 -enum TimezoneEnum { 36 +export enum TimezoneEnum {
37 SHANG_HAI = 'Asia/Shanghai', 37 SHANG_HAI = 'Asia/Shanghai',
38 } 38 }
39 39
1 <script setup lang="ts"> 1 <script setup lang="ts">
2 import { BasicModal, useModalInner } from '/@/components/Modal'; 2 import { BasicModal, useModalInner } from '/@/components/Modal';
3 import { BasicForm, useForm } from '/@/components/Form'; 3 import { BasicForm, useForm } from '/@/components/Form';
4 - import { EnableRuleFormType, getFormSchemas } from './config'; 4 + import { EnableRuleFormType, getFormSchemas, TimezoneEnum } from './config';
5 import { nextTick, ref, unref } from 'vue'; 5 import { nextTick, ref, unref } from 'vue';
6 import CustomRule from './CustomRule.vue'; 6 import CustomRule from './CustomRule.vue';
7 import { ScheduleTypeEnum } from '/@/enums/linkedgeEnum'; 7 import { ScheduleTypeEnum } from '/@/enums/linkedgeEnum';
@@ -56,12 +56,17 @@ @@ -56,12 +56,17 @@
56 }; 56 };
57 57
58 const handleSetFieldsValue = async (schedule: ScheduleType) => { 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 if (type === ScheduleTypeEnum.ANY_TIME) return setFieldsValue({ type }); 61 if (type === ScheduleTypeEnum.ANY_TIME) return setFieldsValue({ type });
62 62
63 if (type === ScheduleTypeEnum.SPECIFIC_TIME) 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 setFieldsValue(schedule); 71 setFieldsValue(schedule);
67 await nextTick(); 72 await nextTick();
  1 +import { TimezoneEnum } from './config';
1 import { ScheduleTypeEnum } from '/@/enums/linkedgeEnum'; 2 import { ScheduleTypeEnum } from '/@/enums/linkedgeEnum';
2 3
3 export interface CustomRuleItemType { 4 export interface CustomRuleItemType {
@@ -9,7 +10,7 @@ export interface CustomRuleItemType { @@ -9,7 +10,7 @@ export interface CustomRuleItemType {
9 10
10 export interface ScheduleType { 11 export interface ScheduleType {
11 type: ScheduleTypeEnum; 12 type: ScheduleTypeEnum;
12 - timezone?: string; 13 + timezone?: TimezoneEnum;
13 items?: CustomRuleItemType[]; 14 items?: CustomRuleItemType[];
14 daysOfWeek?: number[]; 15 daysOfWeek?: number[];
15 endsOn?: number; 16 endsOn?: number;