fix: 修改bug

src/components/ProTableCard/CardItems/Scene/index.tsx

@@ -276,8 +276,12 @@ const actionRender = (action: ActionsType, index: number) => {
 };
 
 const conditionsRender = (when: any[], index: number) => {
-  if (when.length) {
-    return (when[index]?.terms || []).join('');
+  if (when.length && when[index]) {
+    let str: string = '';
+    (when[index]?.terms || []).map((i: any) => {
+      str += `${i?.terms[0] || ''}${i?.termType || ''}`;
+    });
+    return str;
   }
   return '';
 };
@@ -342,10 +346,16 @@ const ContentRender = (data: SceneCardProps) => {
                   <div className={styles['card-item-content-action-item-right']}>
                     <div className={styles['card-item-content-action-item-right-item']}>
                       {type === 'device' && (
-                        <div className={styles['right-item-left']}>
-                          <MyTooltip title={conditionsRender(data.options?.terms || [], index)}>
+                        <div
+                          className={styles['right-item-left']}
+                          style={{ width: item?.then && item?.then.length ? '15%' : '100%' }}
+                        >
+                          <MyTooltip
+                            placement={'topLeft'}
+                            title={conditionsRender(data.options?.when || [], index)}
+                          >
                             <div className={classNames(styles['trigger-conditions'], 'ellipsis')}>
-                              {conditionsRender(data.options?.terms || [], index)}
+                              {conditionsRender(data.options?.when || [], index)}
                             </div>
                           </MyTooltip>
                           {item.shakeLimit?.enabled && (
@@ -361,18 +371,23 @@ const ContentRender = (data: SceneCardProps) => {
                           )}
                         </div>
                       )}
-                      <div className={styles['right-item-right']}>
-                        {(item?.then || []).map((i: BranchesThen, _index: number) => (
-                          <div key={i?.key || _index} className={styles['right-item-right-item']}>
-                            <div className={styles['trigger-ways']}>
-                              {i.parallel ? '并行执行' : '串行执行'}
-                            </div>
-                            <div className={classNames(styles['right-item-right-item-contents'])}>
-                              {branchesActionRender(Array.isArray(i?.actions) ? i?.actions : [])}
+                      {item?.then && item?.then.length && (
+                        <div
+                          className={styles['right-item-right']}
+                          style={{ width: type === 'device' ? '85%' : '15%' }}
+                        >
+                          {(item?.then || []).map((i: BranchesThen, _index: number) => (
+                            <div key={i?.key || _index} className={styles['right-item-right-item']}>
+                              <div className={styles['trigger-ways']}>
+                                {i.parallel ? '并行执行' : '串行执行'}
+                              </div>
+                              <div className={classNames(styles['right-item-right-item-contents'])}>
+                                {branchesActionRender(Array.isArray(i?.actions) ? i?.actions : [])}
+                              </div>
                             </div>
-                          </div>
-                        ))}
-                      </div>
+                          ))}
+                        </div>
+                      )}
                     </div>
                   </div>
                 </div>

src/components/ProTableCard/CardItems/ruleInstance.tsx

@@ -10,7 +10,7 @@ export interface RuleInstanceCardProps extends InstanceItem {
   avatarSize?: number;
 }
 
-const defaultImage = require('/public/images/device-type-3-big.png');
+const defaultImage = require('/public/images/scene/trigger-type/scene.png');
 
 export default (props: RuleInstanceCardProps) => {
   return (

src/pages/link/DataCollect/components/Point/Save/modbus.tsx

@@ -34,6 +34,9 @@ export default (props: Props) => {
       accessModes: props.data?.accessModes
         ? (props.data?.accessModes || []).map((item) => item.value)
         : [],
+      features: props.data?.features
+        ? (props.data?.features || []).map((item: any) => item?.value)
+        : [],
     });
   }, [props.data]);
 
@@ -155,9 +158,9 @@ export default (props: Props) => {
               placeholder: '请选择功能码',
             },
             enum: [
-              { label: '线圈寄存器', value: 'Coils' },
-              { label: '保存寄存器', value: 'HoldingRegisters' },
-              { label: '输入寄存器', value: 'DiscreteInputs' },
+              { label: '01线圈寄存器', value: 'Coils' },
+              { label: '03保存寄存器', value: 'HoldingRegisters' },
+              { label: '04输入寄存器', value: 'DiscreteInputs' },
             ],
             'x-validator': [
               {

src/pages/link/DataCollect/components/Point/index.tsx

@@ -394,21 +394,21 @@ export default observer((props: Props) => {
             },
           },
         },
-        {
-          title: '状态',
-          dataIndex: 'state',
-          valueType: 'select',
-          valueEnum: {
-            enabled: {
-              text: '正常',
-              status: 'enabled',
-            },
-            disabled: {
-              text: '禁用',
-              status: 'disabled',
-            },
-          },
-        },
+        // {
+        //   title: '状态',
+        //   dataIndex: 'state',
+        //   valueType: 'select',
+        //   valueEnum: {
+        //     enabled: {
+        //       text: '正常',
+        //       status: 'enabled',
+        //     },
+        //     disabled: {
+        //       text: '禁用',
+        //       status: 'disabled',
+        //     },
+        //   },
+        // },
         {
           title: '运行状态',
           dataIndex: 'runningState',
@@ -473,21 +473,21 @@ export default observer((props: Props) => {
                   },
                 },
         },
-        {
-          title: '状态',
-          dataIndex: 'state',
-          valueType: 'select',
-          valueEnum: {
-            enabled: {
-              text: '正常',
-              status: 'enabled',
-            },
-            disabled: {
-              text: '禁用',
-              status: 'disabled',
-            },
-          },
-        },
+        // {
+        //   title: '状态',
+        //   dataIndex: 'state',
+        //   valueType: 'select',
+        //   valueEnum: {
+        //     enabled: {
+        //       text: '正常',
+        //       status: 'enabled',
+        //     },
+        //     disabled: {
+        //       text: '禁用',
+        //       status: 'disabled',
+        //     },
+        //   },
+        // },
         {
           title: '运行状态',
           dataIndex: 'runningState',

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

@@ -186,10 +186,11 @@ export default (props: ItemProps) => {
     // console.log('props.data', props.data)
     if (props?.data?.alarm?.mode === 'trigger') {
       return (
-        <div>
+        <div className={'item-options-content'}>
           满足条件后将触发关联
           <a
-            onClick={() => {
+            onClick={(e) => {
+              e.stopPropagation();
               setTriggerVisible(true);
             }}
           >

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

@@ -105,7 +105,7 @@ export default (props: Props) => {
     <Modal
       title="类型"
       open
-      width={800}
+      width={860}
       onCancel={() => {
         props.close();
       }}

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

@@ -143,11 +143,12 @@ export default (props: Props) => {
         props.close();
       }}
     >
-      <div>关联告警数量：{count}</div>
+      <div style={{ marginBottom: 24 }}>关联告警数量：{count}</div>
       <ProTable<ConfigurationItem>
         actionRef={actionRef}
         params={{}}
         columns={columns}
+        toolBarRender={false}
         search={false}
         rowKey={'id'}
         columnEmptyText={''}

src/pages/rule-engine/Scene/Save/action/notify/components/notifyType/index.less

@@ -3,7 +3,7 @@
 .notify-type-warp {
   display: flex;
   flex-wrap: wrap;
-  gap: 8px;
+  gap: 16px 24px;
   width: 100%;
 
   .notify-type-item {

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

@@ -132,7 +132,7 @@ export default observer((props: Props) => {
     <Modal
       title={'执行动作'}
       open
-      width={800}
+      width={810}
       onCancel={() => {
         props.cancel();
         NotifyModel.current = 0;

src/pages/rule-engine/Scene/Save/components/TriggerWay/actionsType.tsx

@@ -1,7 +1,6 @@
 import { useEffect, useState } from 'react';
 import classNames from 'classnames';
 import './index.less';
-// import { ParallelType } from '../../../typings';
 
 interface ActionsTypeProps {
   value?: string;
@@ -9,16 +8,9 @@ interface ActionsTypeProps {
   onChange?: (type: string) => void;
   onSelect?: (type: string) => void;
   disabled?: boolean;
-  // type: ParallelType;
   parallel: boolean; //并行true
 }
 
-export enum ActionsTypeEnum {
-  manual = 'manual',
-  timing = 'timer',
-  device = 'device',
-}
-
 const TypeList = [
   {
     label: '设备输出',

src/pages/rule-engine/Scene/Save/components/TriggerWay/index.less

@@ -3,13 +3,12 @@
 .trigger-way-warp {
   display: flex;
   flex-wrap: wrap;
-  gap: 8px;
+  gap: 16px 24px;
   width: 100%;
 
   .trigger-way-item {
     display: flex;
     justify-content: space-between;
-    // width: 100%;
     padding: 16px;
     border: 1px solid #e0e4e8;
     border-radius: 2px;

src/pages/rule-engine/Scene/Save/device/index.less

@@ -14,7 +14,7 @@
 .trigger-way-warp {
   display: flex;
   flex-wrap: wrap;
-  gap: 8px;
+  gap: 16px 24px;
   width: 100%;
 
   .trigger-way-item {