feat(merge): merge sc

fix: 修改bug

src/components/ProTableCard/TableCard.tsx

@@ -20,19 +20,21 @@ export interface TableCardProps {
 }
 
 function getAction(actions: React.ReactNode[]) {
-  return actions.map((item: any) => {
-    return (
-      <div
-        className={classNames('card-button', {
-          delete: item.key === 'delete',
-          disabled: item.disabled,
-        })}
-        key={item.key}
-      >
-        {item}
-      </div>
-    );
-  });
+  return actions
+    .filter((item) => item)
+    .map((item: any) => {
+      return (
+        <div
+          className={classNames('card-button', {
+            delete: item.key === 'delete',
+            disabled: item.disabled,
+          })}
+          key={item.key}
+        >
+          {item}
+        </div>
+      );
+    });
 }
 
 export default (props: TableCardProps) => {

src/pages/rule-engine/Alarm/Configuration/index.tsx

@@ -132,7 +132,6 @@ const Configuration = () => {
                 record.state?.value === 'disabled' ? 'disabled' : 'enabled'
               }`,
               defaultMessage: record.state?.value === 'disabled' ? '禁用' : '启用',
-
             }),
           }}
           type="link"
@@ -185,7 +184,7 @@ const Configuration = () => {
           <AlarmConfig
             {...record}
             actions={[
-              record.sceneTriggerType === 'manual' && (
+              record.sceneTriggerType === 'manual' ? (
                 <PermissionButton
                   key="trigger"
                   type="link"
@@ -207,7 +206,7 @@ const Configuration = () => {
                   <LikeOutlined />
                   手动触发
                 </PermissionButton>
-              ),
+              ) : null,
               <PermissionButton
                 isPermission={true}
                 key="edit"