Merge xyh

Next xyh

src/pages/init-home/index.tsx

@@ -6,16 +6,13 @@ import Menu from './components/menu';
 import Role from './components/role';
 import Data from './components/data';
 import Service from './service';
-import { useHistory } from 'umi';
 import { useState, useRef, useEffect } from 'react';
-import BaseMenu from '@/pages/system/Menu/Setting/baseMenu';
 
 export const service = new Service();
 
 const InitHome = () => {
   const [loadings, setLoadings] = useState<boolean>(false);
   const [, setCurrent] = useState<number>(0);
-  const history = useHistory();
 
   const cacheRef = useRef<Set<string>>();
 
@@ -25,7 +22,7 @@ const InitHome = () => {
   const dataRef = useRef<{ save: any }>();
 
   const jump = () => {
-    history.push(BaseMenu[0].url);
+    window.location.href = '/';
   };
 
   useEffect(() => {

src/pages/notice/Config/Debug/index.tsx

@@ -62,14 +62,14 @@ const Debug = observer(() => {
             switch (value) {
               case 'date':
                 // const a = variableRef.current?.find((i: any) => i.id === _id.value);
-                let dateFormat = 'YYYY-MM-DD HH:mm:ss';
+                let dateFormat = 'yyyy-MM-dd HH:mm:ss';
                 if (variableRef.current) {
                   const a = variableRef.current?.find((i: any) => i.id === _id.value);
                   dateFormat = a?.format;
                 }
                 format.setComponent(FDatePicker, {
                   showTime: true,
-                  format: dateFormat === 'timestamp' ? 'X' : dateFormat,
+                  format: dateFormat === 'timestamp' ? 'X' : dateFormat.replace('dd', 'DD'),
                 });
                 format.setComponent(DatePicker);
                 break;

src/pages/notice/Template/Debug/index.tsx

@@ -50,14 +50,14 @@ const Debug = observer(() => {
             if (format && value) {
               switch (value) {
                 case 'date':
-                  let dateFormat = 'YYYY-MM-DD HH:mm:ss';
+                  let dateFormat = 'yyyy-MM-dd HH:mm:ss';
                   if (variableRef.current) {
                     const a = variableRef.current?.find((i: any) => i.id === _id.value);
                     dateFormat = a?.format;
                   }
                   format.setComponent(FDatePicker, {
                     showTime: true,
-                    format: dateFormat === 'timestamp' ? 'X' : dateFormat,
+                    format: dateFormat === 'timestamp' ? 'X' : dateFormat.replace('dd', 'DD'),
                   });
                   break;
                 case 'string':

src/pages/notice/Template/Detail/index.tsx

@@ -349,8 +349,8 @@ const Detail = observer(() => {
                 format.setComponent(FAutoComplete);
                 format.setDataSource([
                   { label: 'timestamp', value: 'timestamp' },
-                  { label: 'yyyy-MM-DD', value: 'yyyy-MM-DD' },
-                  { label: 'yyyy-MM-DD HH:mm:ss', value: 'yyyy-MM-DD HH:mm:ss' },
+                  { label: 'yyyy-MM-dd', value: 'yyyy-MM-dd' },
+                  { label: 'yyyy-MM-dd HH:mm:ss', value: 'yyyy-MM-dd HH:mm:ss' },
                   // { label: 'yyyy-MM-dd HH:mm:ss EE', value: 'yyyy-MM-dd HH:mm:ss EE' },
                   // { label: 'yyyy-MM-dd HH:mm:ss zzz', value: 'yyyy-MM-dd HH:mm:ss zzz' },
                 ]);

src/pages/rule-engine/Scene/Save/action/VariableItems/builtIn.tsx

@@ -57,7 +57,7 @@ export default (props: BuiltInProps) => {
     const data = props.form.getFieldsValue();
     const triggerData = await props.triggerRef.getTriggerData();
     console.log(triggerData);
-    data.terms = triggerData.trigger;
+    data.terms = triggerData?.trigger;
     const params = props.name - 1 >= 0 ? { action: props.name - 1 } : undefined;
     queryBuiltInParams(data, params).then((res: any) => {
       if (res.status === 200) {

src/pages/rule-engine/Scene/Save/action/device/functionCall.tsx

@@ -155,6 +155,7 @@ export default (props: FunctionCallProps) => {
       <EditableProTable
         rowKey="id"
         name={'table'}
+        recordCreatorProps={false}
         columns={columns}
         size={'small'}
         editable={{