Commit d1c692cff1c64fa0a889bdb0d7af10a02a0112c6

Authored by ww
1 parent c7ae8c1b

fix: 修复时间单位没有默认选择

@@ -9,7 +9,7 @@ import { @@ -9,7 +9,7 @@ import {
9 import { PollCommandInput, ModeEnum } from '../PollCommandInput'; 9 import { PollCommandInput, ModeEnum } from '../PollCommandInput';
10 import { DeviceProfileModel } from '/@/api/device/model/deviceModel'; 10 import { DeviceProfileModel } from '/@/api/device/model/deviceModel';
11 import { JSONEditorValidator } from '/@/components/CodeEditor/src/JSONEditor'; 11 import { JSONEditorValidator } from '/@/components/CodeEditor/src/JSONEditor';
12 -import { BooleanStringEnum, TimeUnitEnum, TimeUnitNameEnum } from '/@/enums/toolEnum'; 12 +import { TimeUnitEnum, TimeUnitNameEnum } from '/@/enums/toolEnum';
13 import { dateUtil } from '/@/utils/dateUtil'; 13 import { dateUtil } from '/@/utils/dateUtil';
14 import { ProductPicker, validateProductPicker } from '../ProductPicker'; 14 import { ProductPicker, validateProductPicker } from '../ProductPicker';
15 import { useGlobSetting } from '/@/hooks/setting'; 15 import { useGlobSetting } from '/@/hooks/setting';
@@ -386,16 +386,15 @@ export const formSchemas: FormSchema[] = [ @@ -386,16 +386,15 @@ export const formSchemas: FormSchema[] = [
386 component: 'RadioGroup', 386 component: 'RadioGroup',
387 label: '时间单位', 387 label: '时间单位',
388 ifShow: ({ model }) => model[FormFieldsEnum.EXECUTE_TIME_TYPE] === ExecuteTimeTypeEnum.POLL, 388 ifShow: ({ model }) => model[FormFieldsEnum.EXECUTE_TIME_TYPE] === ExecuteTimeTypeEnum.POLL,
389 - defaultValue:  
390 - disabledTaskCenterExecuteIntervalUnitSecond === BooleanStringEnum.TRUE  
391 - ? TimeUnitEnum.MINUTE  
392 - : TimeUnitEnum.SECOND, 389 + defaultValue: disabledTaskCenterExecuteIntervalUnitSecond
  390 + ? TimeUnitEnum.MINUTE
  391 + : TimeUnitEnum.SECOND,
393 componentProps: () => { 392 componentProps: () => {
394 const options = [ 393 const options = [
395 { label: TimeUnitNameEnum.MINUTE, value: TimeUnitEnum.MINUTE }, 394 { label: TimeUnitNameEnum.MINUTE, value: TimeUnitEnum.MINUTE },
396 { label: TimeUnitNameEnum.HOUR, value: TimeUnitEnum.HOUR }, 395 { label: TimeUnitNameEnum.HOUR, value: TimeUnitEnum.HOUR },
397 ]; 396 ];
398 - if (disabledTaskCenterExecuteIntervalUnitSecond === BooleanStringEnum.FALSE) { 397 + if (!disabledTaskCenterExecuteIntervalUnitSecond) {
399 options.unshift({ label: TimeUnitNameEnum.SECOND, value: TimeUnitEnum.SECOND }); 398 options.unshift({ label: TimeUnitNameEnum.SECOND, value: TimeUnitEnum.SECOND });
400 } 399 }
401 return { 400 return {