fix: 设备输出

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

@@ -47,13 +47,13 @@ export default observer((props: Props) => {
       label: '按关系',
       value: 'relation',
       image: require('/public/images/scene/device-custom.png'),
-      tip: '自定义选择当前产品下的任意设备',
+      tip: '选择与触发设备具有相同关系的设备',
     },
     {
       label: '按标签',
       value: 'tag',
       image: require('/public/images/scene/device-custom.png'),
-      tip: '自定义选择当前产品下的任意设备',
+      tip: '按标签选择产品下具有特定标签的设备',
     },
     {
       label: '按变量',

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

@@ -9,7 +9,7 @@ import './index.less';
 import DeviceModel from './model';
 import { onlyMessage } from '@/utils/util';
 import { ActionsDeviceProps } from '../../../typings';
-import { FormModel } from '../..';
+// import { FormModel } from '../..';
 
 export const service = new Service<any>('');
 
@@ -73,7 +73,7 @@ export default observer((props: Props) => {
       source: DeviceModel.source,
       selectorValues: DeviceModel.selectorValues,
       productId: DeviceModel.productId,
-      message: value,
+      message: value.device.message,
     };
     console.log(item, value);
 
@@ -108,10 +108,10 @@ export default observer((props: Props) => {
       }));
       // console.log(_options.taglist, 'taglist')
     }
-    console.log(_options);
+    // console.log(_options);
     // console.log('device', item);
-    props.save(item);
-    FormModel.actions[props.name].options = _options;
+    props.save(item, _options);
+    // FormModel.actions[props.name].options = _options;
     DeviceModel.current = 0;
   };
 

src/pages/rule-engine/Scene/Save/action/ListItem/Item.tsx

@@ -175,6 +175,7 @@ export default (props: ItemProps) => {
   };
 
   const contentRender = () => {
+    // console.log('props.data', props.data)
     if (props?.data?.alarm?.mode === 'trigger') {
       return (
         <div>
@@ -229,7 +230,16 @@ export default (props: ItemProps) => {
         </div>
       );
     } else if (props.data?.executor === 'device') {
-      return deviceRender(props?.data);
+      return (
+        <div
+          className={'item-options-content'}
+          onClick={() => {
+            setVisible(true);
+          }}
+        >
+          {deviceRender(props?.data)}
+        </div>
+      );
     }
     return (
       <AddButton

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

@@ -62,6 +62,7 @@ export default (props: ListProps) => {
           }}
           save={(data: any, options) => {
             const { type, ...extra } = data;
+            console.log('list', data);
             const item: ActionsType = {
               ...extra,
               executor: data.type === 'trigger' || data.type === 'relieve' ? 'alarm' : data.type,

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

@@ -34,8 +34,23 @@ export default (props: Props) => {
             value={props.data?.device}
             save={(data: any, options: any) => {
               setActionType('');
-              // console.log(data,options)
-              props.save(data, options);
+              console.log('device-------------', {
+                type: 'device',
+                key: props.data.key || `action_${props.name}`,
+                device: {
+                  ...data,
+                },
+              });
+              props.save(
+                {
+                  type: 'device',
+                  key: props.data.key || `action_${props.name}`,
+                  device: {
+                    ...data,
+                  },
+                },
+                options,
+              );
             }}
             name={props.name}
             cancel={() => {

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

@@ -56,7 +56,7 @@ export default (props: ActionsProps) => {
               <Observer>
                 {() => {
                   const parallelThens = props.thenOptions.filter((item) => !item.parallel);
-                  console.log(parallelThens);
+                  // console.log(parallelThens);
 
                   return (
                     <List
@@ -64,7 +64,7 @@ export default (props: ActionsProps) => {
                       parallel={false}
                       actions={parallelThens.length ? parallelThens[0].actions : []}
                       onAdd={(actionItem) => {
-                        console.log(parallelThens);
+                        // console.log(parallelThens);
                         if (parallelThens[0]) {
                           parallelThens[0].actions = parallelThens[0].actions.map((aItem) => {
                             if (aItem.key === actionItem.key) {