fix: bug#9309

src/pages/rule-engine/Scene/Save/device/addModel.tsx

@@ -7,11 +7,11 @@ import type { TriggerDevice, TriggerDeviceOptions } from '@/pages/rule-engine/Sc
 import Product from './product';
 import Device from './device';
 import Type from './type';
-import { numberToString } from '../components/TimingTrigger/whenOption';
 import { timeUnitEnum } from '../components/TimingTrigger';
 import { Store } from 'jetlinks-store';
 import { FormModel } from '@/pages/rule-engine/Scene/Save';
-import { isArray, isEqual } from 'lodash';
+import { isEqual } from 'lodash';
+import { continuousValue } from '@/pages/rule-engine/Scene/Save/timer/TimerTrigger';
 
 interface AddProps {
   options?: any;
@@ -20,42 +20,6 @@ interface AddProps {
   onSave?: (data: TriggerDevice, options: any) => void;
 }
 
-type continuousValueFn = (data: (string | number)[], type: string) => (number | string)[];
-
-const continuousValue: continuousValueFn = (data, type) => {
-  let start = 0;
-  const newArray: (number | string)[] = [];
-  const isWeek = type === 'week';
-  if (isArray(data)) {
-    data.forEach((item, index) => {
-      const _item = Number(item);
-      const nextValue = data[index + 1];
-      const previousValue = data[index - 1];
-      const nextItemValue = _item + 1;
-      const previousItemValue = _item - 1;
-      if (nextItemValue === nextValue && previousItemValue !== previousValue) {
-        start = _item;
-      } else if (previousItemValue === previousValue && nextItemValue !== nextValue) {
-        // 表示前start和item连续，并且item与nextValue不连续
-        if (_item - start >= 2) {
-          // 至少三位连续
-          newArray.push(
-            isWeek
-              ? `${numberToString[start]} - ${numberToString[_item]}`
-              : `${start} - ${_item}号`,
-          );
-        } else {
-          newArray.push(isWeek ? numberToString[start] : `${start}号`);
-          newArray.push(isWeek ? numberToString[_item] : `${_item}号`);
-        }
-      } else if (previousItemValue !== previousValue && nextItemValue !== nextValue) {
-        newArray.push(isWeek ? numberToString[_item] : `${_item}号`);
-      }
-    });
-  }
-  return newArray;
-};
-
 export interface DeviceModelProps extends Partial<TriggerDevice> {
   steps: { key: string; title: string }[];
   stepNumber: number;
@@ -220,8 +184,8 @@ export default observer((props: AddProps) => {
         if (_timer.when!.length) {
           whenStr = _timer!.trigger === 'week' ? '每周' : '每月';
           const whenStrArr = continuousValue(_timer.when! || [], _timer!.trigger);
-          whenStrArr.length = 3;
-          whenStr += whenStrArr.join('、');
+          const whenStrArr3 = whenStrArr.splice(0, 3);
+          whenStr += whenStrArr3.join('、');
           whenStr += `等${_timer.when!.length}天`;
         }
         _options.when = whenStr;

src/pages/rule-engine/Scene/Save/timer/TimerTrigger/index.tsx

@@ -5,6 +5,7 @@ import TimingTrigger, {
 } from '@/pages/rule-engine/Scene/Save/components/TimingTrigger';
 import { numberToString } from '@/pages/rule-engine/Scene/Save/components/TimingTrigger/whenOption';
 import { useEffect } from 'react';
+import { isArray } from 'lodash';
 
 interface Props {
   close: () => void;
@@ -12,6 +13,42 @@ interface Props {
   save: (data: OperationTimer, options: any) => void;
 }
 
+type continuousValueFn = (data: (string | number)[], type: string) => (number | string)[];
+
+export const continuousValue: continuousValueFn = (data, type) => {
+  let start = 0;
+  const newArray: (number | string)[] = [];
+  const isWeek = type === 'week';
+  if (isArray(data)) {
+    data.forEach((item, index) => {
+      const _item = Number(item);
+      const nextValue = data[index + 1];
+      const previousValue = data[index - 1];
+      const nextItemValue = _item + 1;
+      const previousItemValue = _item - 1;
+      if (nextItemValue === nextValue && previousItemValue !== previousValue) {
+        start = _item;
+      } else if (previousItemValue === previousValue && nextItemValue !== nextValue) {
+        // 表示前start和item连续，并且item与nextValue不连续
+        if (_item - start >= 2) {
+          // 至少三位连续
+          newArray.push(
+            isWeek
+              ? `${numberToString[start]} - ${numberToString[_item]}`
+              : `${start} - ${_item}号`,
+          );
+        } else {
+          newArray.push(isWeek ? numberToString[start] : `${start}号`);
+          newArray.push(isWeek ? numberToString[_item] : `${_item}号`);
+        }
+      } else if (previousItemValue !== previousValue && nextItemValue !== nextValue) {
+        newArray.push(isWeek ? numberToString[_item] : `${_item}号`);
+      }
+    });
+  }
+  return newArray;
+};
+
 export default (props: Props) => {
   const [form] = Form.useForm();
 
@@ -32,19 +69,15 @@ export default (props: Props) => {
     if (_timer.trigger === 'cron') {
       _options.time = _timer.cron;
     } else {
-      _options.when =
-        _timer.when!.length === 0
-          ? '每天'
-          : `每${_timer
-              .when!.map((item) => {
-                if (_timer!.trigger === 'week') {
-                  return numberToString[item];
-                } else {
-                  return item + '号';
-                }
-              })
-              .join(',')}`;
-
+      let whenStr = '每天';
+      if (_timer.when!.length) {
+        whenStr = _timer!.trigger === 'week' ? '每周' : '每月';
+        const whenStrArr = continuousValue(_timer.when! || [], _timer!.trigger);
+        const whenStrArr3 = whenStrArr.splice(0, 3);
+        whenStr += whenStrArr3.join('、');
+        whenStr += `等${_timer.when!.length}天`;
+      }
+      _options.when = whenStr;
       if (_timer.once) {
         _options.time = _timer.once.time + ' 执行1次';
       } else if (_timer.period) {