Commit e88c9a01056289a02d815e5b37811b1928cf8dd8

Authored by xp.Huang
2 parents c7ae8c1b d1c692cf

Merge branch 'fix/DEFECT-2115' into 'main_dev'

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

See merge request yunteng/thingskit-front!1378
... ... @@ -9,7 +9,7 @@ import {
9 9 import { PollCommandInput, ModeEnum } from '../PollCommandInput';
10 10 import { DeviceProfileModel } from '/@/api/device/model/deviceModel';
11 11 import { JSONEditorValidator } from '/@/components/CodeEditor/src/JSONEditor';
12   -import { BooleanStringEnum, TimeUnitEnum, TimeUnitNameEnum } from '/@/enums/toolEnum';
  12 +import { TimeUnitEnum, TimeUnitNameEnum } from '/@/enums/toolEnum';
13 13 import { dateUtil } from '/@/utils/dateUtil';
14 14 import { ProductPicker, validateProductPicker } from '../ProductPicker';
15 15 import { useGlobSetting } from '/@/hooks/setting';
... ... @@ -386,16 +386,15 @@ export const formSchemas: FormSchema[] = [
386 386 component: 'RadioGroup',
387 387 label: '时间单位',
388 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 392 componentProps: () => {
394 393 const options = [
395 394 { label: TimeUnitNameEnum.MINUTE, value: TimeUnitEnum.MINUTE },
396 395 { label: TimeUnitNameEnum.HOUR, value: TimeUnitEnum.HOUR },
397 396 ];
398   - if (disabledTaskCenterExecuteIntervalUnitSecond === BooleanStringEnum.FALSE) {
  397 + if (!disabledTaskCenterExecuteIntervalUnitSecond) {
399 398 options.unshift({ label: TimeUnitNameEnum.SECOND, value: TimeUnitEnum.SECOND });
400 399 }
401 400 return {
... ...