feat(merge): merge xyh

Next xyh

src/pages/rule-engine/Scene/Save/components/TimingTrigger/index.tsx

@@ -67,7 +67,7 @@ export default (props: TimingTrigger) => {
         mod: PeriodModEnum.period,
         when: [],
         period: {
-          unit: 'second',
+          unit: 'seconds',
         },
       });
     } else {
@@ -87,7 +87,7 @@ export default (props: TimingTrigger) => {
           period: {
             from: undefined,
             to: undefined,
-            unit: 'second',
+            unit: 'seconds',
           },
         });
       } else {
@@ -105,11 +105,11 @@ export default (props: TimingTrigger) => {
 
   const TimeTypeAfter = (
     <Select
-      value={data.period?.unit || 'second'}
+      value={data.period?.unit || 'seconds'}
       options={[
-        { label: '秒', value: 'second' },
-        { label: '分', value: 'minute' },
-        { label: '小时', value: 'hour' },
+        { label: '秒', value: 'seconds' },
+        { label: '分', value: 'minutes' },
+        { label: '小时', value: 'hours' },
       ]}
       onSelect={(key: string) => {
         onChange({

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

@@ -95,6 +95,7 @@ export default () => {
       setLoading(false);
       if (resp.status === 200) {
         message.success('操作成功');
+        form.setFieldsValue({ id: resp.result.id });
       } else {
         message.error(resp.message);
       }