Parcourir la source

feat: 修改执行动作编辑逻辑

xieyonghong il y a 3 ans
Parent
commit
9b166822ec

+ 1 - 0
src/pages/rule-engine/Scene/Save/action/ListItem/List.tsx

@@ -38,6 +38,7 @@ export default (props: ListProps) => {
           }}
           onUpdate={(data, options) => {
             props.onAdd({
+              ...item,
               ...data,
               options,
             });

+ 2 - 2
src/pages/rule-engine/Scene/Save/action/Modal/add.tsx

@@ -34,7 +34,7 @@ export default (props: Props) => {
             value={props.data?.device}
             save={(data: any, options: any) => {
               setActionType('');
-              // console.log(data, options);
+              console.log('Device', data);
               // props.save(data, options);
               // console.log('device-------------', {
               //   type: 'device',
@@ -46,7 +46,7 @@ export default (props: Props) => {
               props.save(
                 {
                   type: 'device',
-                  key: props.data.key || `action_${props.name}`,
+                  key: props.data.key || `device_${new Date().getTime()}`,
                   device: {
                     ...data,
                   },

+ 1 - 1
src/pages/rule-engine/Scene/Save/action/index.tsx

@@ -63,7 +63,7 @@ export default (props: ActionsProps) => {
                       parallel={false}
                       actions={parallelThens.length ? parallelThens[0].actions : []}
                       onAdd={(actionItem) => {
-                        // console.log(parallelThens);
+                        console.log('parallelThens', parallelThens);
                         if (parallelThens[0]) {
                           if (
                             parallelThens[0].actions.some((aItem) => aItem.key === actionItem.key)