fix: DEFECT-1169 任务中心自定义cron表达式拼接错误

@@ -263,14 +263,20 @@ export const formSchemas: FormSchema[] = [
     label: '周期',
     label: '周期',
     required: true,
     required: true,
     defaultValue: PeriodTypeEnum.MONTH,
     defaultValue: PeriodTypeEnum.MONTH,
-    componentProps: {
-      placeholder: '请选择周期',
-      options: [
-        { label: PeriodTypeNameEnum.DAY, value: PeriodTypeEnum.DAY },
-        { label: PeriodTypeNameEnum.WEEK, value: PeriodTypeEnum.WEEK },
-        { label: PeriodTypeNameEnum.MONTH, value: PeriodTypeEnum.MONTH },
-      ],
-      getPopupContainer: () => document.body,
+    componentProps: ({ formActionType }) => {
+      const { setFieldsValue } = formActionType;
+      return {
+        placeholder: '请选择周期',
+        options: [
+          { label: PeriodTypeNameEnum.DAY, value: PeriodTypeEnum.DAY },
+          { label: PeriodTypeNameEnum.WEEK, value: PeriodTypeEnum.WEEK },
+          { label: PeriodTypeNameEnum.MONTH, value: PeriodTypeEnum.MONTH },
+        ],
+        getPopupContainer: () => document.body,
+        onChange() {
+          setFieldsValue({ [FormFieldsEnum.EXECUTE_TIME_PERIOD]: null });
+        },
+      };
     },
     },
     ifShow: ({ model }) => model[FormFieldsEnum.EXECUTE_TIME_TYPE] === ExecuteTimeTypeEnum.CUSTOM,
     ifShow: ({ model }) => model[FormFieldsEnum.EXECUTE_TIME_TYPE] === ExecuteTimeTypeEnum.CUSTOM,
   },
   },

-import CronParser, { CronFields, HourRange, SixtyRange } from 'cron-parser';
+import { HourRange, SixtyRange } from 'cron-parser';
 import { dateUtil } from '/@/utils/dateUtil';
 import { dateUtil } from '/@/utils/dateUtil';
-import { ExecuteTimeTypeEnum, FormFieldsEnum, PushWayEnum } from './config';
+import { ExecuteTimeTypeEnum, FormFieldsEnum, PeriodTypeEnum, PushWayEnum } from './config';
 import { CreateTaskRecordType, TaskRecordType } from '/@/api/task/model';
 import { CreateTaskRecordType, TaskRecordType } from '/@/api/task/model';
 import { DeviceCascadePickerValueType } from '../DevicePicker';
 import { DeviceCascadePickerValueType } from '../DevicePicker';
 import { TaskTargetEnum } from '../../config';
 import { TaskTargetEnum } from '../../config';
@@ -12,52 +12,31 @@ export interface FormValueType extends Partial<Record<FormFieldsEnum, any>> {
   [FormFieldsEnum.DEVICE_PROFILE]: ProductCascadePickerValueType;
   [FormFieldsEnum.DEVICE_PROFILE]: ProductCascadePickerValueType;
 }
 }
 
 
-type CanWrite<T> = {
-  -readonly [K in keyof T]: T[K];
-};
-
 interface GenCronExpressionResultType {
 interface GenCronExpressionResultType {
   effective: boolean;
   effective: boolean;
   expression?: string;
   expression?: string;
 }
 }
 
 
-export const usePluginGenCronExpression = (
-  time: string,
-  expression = '* * * * * * *',
-  includesYear = true
-): GenCronExpressionResultType => {
-  try {
-    const separator = ' ';
-    const removeYear = expression.split(separator).slice(0, 6).join(separator);
-
-    const date = dateUtil(time, 'HH:mm:ss');
-
-    const second = date.get('second') as SixtyRange;
-    const minute = date.get('minute') as SixtyRange;
-    const hour = date.get('hour') as HourRange;
-
-    const result = CronParser.parseExpression(removeYear, { utc: true, nthDayOfWeek: 4 });
-    const fields = JSON.parse(JSON.stringify(result.fields)) as CanWrite<CronFields>;
-    fields.second = [second];
-    fields.minute = [minute];
-    fields.hour = [hour];
-
-    // console.log(CronParser.fieldsToExpression(CronParser.parseExpression('').fields).stringify());
-
-    let newExpression = CronParser.fieldsToExpression(fields).stringify(true);
-    newExpression = includesYear ? `${newExpression} *` : newExpression;
-    return { effective: true, expression: newExpression };
-  } catch (error) {
-    // throw error;
-    return { effective: false };
-  }
+export const genPollCronExpression = (value: number, type: TimeUnitEnum) => {
+  const placeholder = 'placeholder';
+  const expression = {
+    [TimeUnitEnum.SECOND]: `${placeholder} * * * * ? *`,
+    [TimeUnitEnum.MINUTE]: `* ${placeholder} * * * ? *`,
+    [TimeUnitEnum.HOUR]: `* * ${placeholder} * * ? *`,
+  };
+  const newExpression = expression[type];
+  return newExpression.replace(placeholder, `0/${value}`);
 };
 };
 
 
 export const genCronExpression = (
 export const genCronExpression = (
   time: string,
   time: string,
-  expression = '* * * * * * *'
+  expression = '* * * * * * *',
+  periodType: PeriodTypeEnum
 ): GenCronExpressionResultType => {
 ): GenCronExpressionResultType => {
   try {
   try {
+    if (periodType === PeriodTypeEnum.DAY) {
+      expression = '* * * * * ? *';
+    }
     const separator = ' ';
     const separator = ' ';
     const list: (string | number)[] = expression.split(separator);
     const list: (string | number)[] = expression.split(separator);
 
 
@@ -103,10 +82,12 @@ export const composeData = (result: Required<FormValueType>): CreateTaskRecordTy
     deviceType: productDeviceType,
     deviceType: productDeviceType,
   } = deviceProfile || {};
   } = deviceProfile || {};
 
 
-  const { expression } = genCronExpression(time, period);
+  const { expression } = genCronExpression(time, period, periodType);
 
 
   const cron =
   const cron =
-    executeTimeType === ExecuteTimeTypeEnum.POLL ? `0/${interval} * * * * ? *` : expression!;
+    executeTimeType === ExecuteTimeTypeEnum.POLL
+      ? genPollCronExpression(interval, pollUnit)
+      : expression!;
 
 
   return {
   return {
     name,
     name,