wzyyy 3 lat temu
rodzic
commit
bbf8196f7a

+ 3 - 3
src/pages/rule-engine/Scene/Save/components/TimingTrigger/RangePicker.tsx

@@ -25,13 +25,13 @@ export default (props: RangePickerProps) => {
         moment(props.value?.to || new Date(), 'hh:mm:ss'),
         moment(props.value?.to || new Date(), 'hh:mm:ss'),
       ]}
       ]}
       onChange={(_, dateString) => {
       onChange={(_, dateString) => {
-        const { every, unit } = props.form.getFieldsValue().trigger?.timer?.period;
+        const item = props.form.getFieldsValue().trigger?.timer?.period;
         if (props.onChange) {
         if (props.onChange) {
           props.onChange({
           props.onChange({
             from: dateString[0],
             from: dateString[0],
             to: dateString[1],
             to: dateString[1],
-            every: every,
-            unit: unit,
+            every: item?.every,
+            unit: item?.unit,
           });
           });
         }
         }
       }}
       }}

+ 4 - 3
src/pages/rule-engine/Scene/Save/index.tsx

@@ -1,6 +1,6 @@
 import { PageContainer } from '@ant-design/pro-layout';
 import { PageContainer } from '@ant-design/pro-layout';
 import { Button, Card, Form, Input, InputNumber, Radio, Space, Switch, Tooltip } from 'antd';
 import { Button, Card, Form, Input, InputNumber, Radio, Space, Switch, Tooltip } from 'antd';
-import { useIntl } from 'umi';
+import { useIntl, useHistory } from 'umi';
 import { useCallback, useEffect, useRef, useState } from 'react';
 import { useCallback, useEffect, useRef, useState } from 'react';
 import { PermissionButton, TitleComponent } from '@/components';
 import { PermissionButton, TitleComponent } from '@/components';
 import ActionItems from './action/action';
 import ActionItems from './action/action';
@@ -16,7 +16,7 @@ import type { FormModelType } from '@/pages/rule-engine/Scene/typings';
 import { onlyMessage } from '@/utils/util';
 import { onlyMessage } from '@/utils/util';
 import Explanation from './Explanation';
 import Explanation from './Explanation';
 import { getMenuPathByCode } from '@/utils/menu';
 import { getMenuPathByCode } from '@/utils/menu';
-import { useLocation, useHistory } from '@/hooks';
+import { useLocation } from '@/hooks';
 
 
 type ShakeLimitType = {
 type ShakeLimitType = {
   enabled: boolean;
   enabled: boolean;
@@ -132,7 +132,8 @@ export default () => {
       setLoading(false);
       setLoading(false);
       if (resp.status === 200) {
       if (resp.status === 200) {
         onlyMessage('操作成功');
         onlyMessage('操作成功');
-        history.push(getMenuPathByCode('rule-engine/Scene'));
+        const url = getMenuPathByCode('rule-engine/Scene');
+        history.push(url);
       } else {
       } else {
         onlyMessage(resp.message);
         onlyMessage(resp.message);
       }
       }