feat(merge): merge xyh

src/components/ProTableCard/CardItems/device.tsx

@@ -12,7 +12,7 @@ export interface DeviceCardProps extends DeviceInstance {
 
 export default (props: DeviceCardProps) => {
   return (
-    <Card style={{ width: 340 }} cover={null} actions={props.actions}>
+    <Card style={{ width: '100%' }} cover={null} actions={props.actions}>
       <div className={'pro-table-card-item'}>
         <div className={'card-item-avatar'}>
           <Avatar size={props.avatarSize || 64} src={props.photoUrl} />

src/components/ProTableCard/CardItems/product.tsx

@@ -15,7 +15,7 @@ export default (props: ProductCardProps) => {
   const intl = useIntl();
 
   return (
-    <Card style={{ width: 340 }} cover={null} actions={props.actions}>
+    <Card style={{ width: '100%' }} cover={null} actions={props.actions}>
       <div className={'pro-table-card-item'}>
         <div className={'card-item-avatar'}>
           <Avatar size={props.avatarSize || 64} src={props.photoUrl} />

src/components/ProTableCard/index.less

@@ -20,7 +20,7 @@
   .pro-table-card-items {
     display: grid;
     grid-gap: 26px;
-    grid-template-columns: repeat(auto-fit, 340px);
+    grid-template-columns: repeat(4, 1fr);
     //display: flex;
     //flex-wrap: wrap;
     padding-bottom: 38px;

src/pages/device/Instance/Detail/Running/Event/index.tsx

@@ -1,14 +1,16 @@
 import type { ActionType, ProColumns } from '@jetlinks/pro-table';
 import ProTable from '@jetlinks/pro-table';
-import { service } from '@/pages/device/Instance';
+import { InstanceModel, service } from '@/pages/device/Instance';
 import { useParams } from 'umi';
 import type { EventMetadata } from '@/pages/device/Product/typings';
 import SearchComponent from '@/components/SearchComponent';
 import moment from 'moment';
 import { Form, Modal } from 'antd';
 import { SearchOutlined } from '@ant-design/icons';
-import { useRef, useState } from 'react';
+import { useEffect, useRef, useState } from 'react';
 import MonacoEditor from 'react-monaco-editor';
+import useSendWebsocketMessage from '@/hooks/websocket/useSendWebsocketMessage';
+import { map } from 'rxjs/operators';
 
 interface Props {
   data: Partial<EventMetadata>;
@@ -18,7 +20,9 @@ const EventLog = (props: Props) => {
   const params = useParams<{ id: string }>();
   const { data } = props;
   const actionRef = useRef<ActionType>();
-  const [searchParams, setSearchParams] = useState<any>({});
+  const [searchParams, setSearchParams] = useState<any>({ pageSize: 10 });
+  const device = InstanceModel.detail;
+  const [subscribeTopic] = useSendWebsocketMessage();
 
   const columns: ProColumns<MetadataLogData>[] = [
     {
@@ -63,6 +67,28 @@ const EventLog = (props: Props) => {
     },
   ];
 
+  /**
+   * 订阅事件数据
+   */
+  const subscribeEvent = () => {
+    const id = `instance-info-event-${device.id}-${device.productId}`;
+    const topic = `/dashboard/device/${device.productId}/events/realTime`;
+    subscribeTopic!(id, topic, {
+      deviceId: device.id,
+    })
+      ?.pipe(map((res) => res.payload))
+      .subscribe((payload: any) => {
+        const { value } = payload;
+        if (value) {
+          actionRef.current?.reload?.();
+        }
+      });
+  };
+
+  useEffect(() => {
+    subscribeEvent();
+  }, []);
+
   const createColumn = (): ProColumns[] =>
     data.valueType?.type === 'object'
       ? data.valueType.properties.map(

src/pages/device/Instance/Detail/Running/Property/index.tsx

@@ -28,7 +28,6 @@ const ColResponsiveProps = {
 
 const Property = (props: Props) => {
   const { data } = props;
-  console.log(data);
   const device = InstanceModel.detail;
   const params = useParams<{ id: string }>();
   const [subscribeTopic] = useSendWebsocketMessage();

src/pages/device/Instance/Detail/index.tsx

@@ -16,7 +16,7 @@ import type { DeviceMetadata } from '@/pages/device/Product/typings';
 import MetadataAction from '@/pages/device/components/Metadata/DataBaseAction';
 import { Store } from 'jetlinks-store';
 import SystemConst from '@/utils/const';
-import { getMenuPathByCode, MENUS_CODE } from '@/utils/menu';
+import { getMenuPathByParams, MENUS_CODE } from '@/utils/menu';
 
 export const deviceStatus = new Map();
 deviceStatus.set('online', <Badge status="success" text={'在线'} />);
@@ -159,8 +159,11 @@ const InstanceDetail = observer(() => {
               type={'link'}
               size={'small'}
               onClick={() => {
-                const url = getMenuPathByCode(MENUS_CODE['device/Product']);
-                history.push(`${url}?id=${InstanceModel.detail.productId}`);
+                const url = getMenuPathByParams(
+                  MENUS_CODE['device/Product/Detail'],
+                  InstanceModel.detail.productId,
+                );
+                history.replace(url);
               }}
             >
               {InstanceModel.detail.productName}

src/pages/device/Instance/Save/index.tsx

@@ -205,6 +205,7 @@ const Save = (props: Props) => {
                     productName: node.label,
                   });
                 }}
+                filterOption={(input, option) => option.label.includes(input)}
               />
             </Form.Item>
             <Form.Item hidden={true} name={'productName'}>

src/pages/device/Instance/index.tsx

@@ -88,6 +88,7 @@ const Instance = () => {
       </Button>
     </Tooltip>,
     <Popconfirm
+      key={'state'}
       title={intl.formatMessage({
         id: `pages.data.option.${record.state.value !== 'notActive' ? 'disabled' : 'enabled'}.tips`,
         defaultMessage: '确认禁用？',
@@ -125,6 +126,7 @@ const Instance = () => {
             ? 'pages.data.option.remove.tips'
             : 'pages.device.instance.deleteTip',
       })}
+      key={'delete'}
       onConfirm={async () => {
         if (record.state.value === 'notActive') {
           await service.remove(record.id);

src/pages/device/Product/index.tsx

@@ -1,5 +1,5 @@
 import { PageContainer } from '@ant-design/pro-layout';
-import { Badge, Button, message, Popconfirm, Space, Tooltip } from 'antd';
+import { Badge, Button, message, Popconfirm, Space, Tooltip, Upload } from 'antd';
 import type { ProductItem } from '@/pages/device/Product/typings';
 import {
   DeleteOutlined,
@@ -22,6 +22,7 @@ import SearchComponent from '@/components/SearchComponent';
 import { getMenuPathByParams, MENUS_CODE } from '@/utils/menu';
 import { ProTableCard } from '@/components';
 import ProductCard from '@/components/ProTableCard/CardItems/product';
+import { downloadObject } from '@/utils/util';
 
 export const service = new Service('device-product');
 export const statusMap = {
@@ -151,11 +152,12 @@ const Product = observer(() => {
       <Button type={'link'} style={{ padding: 0 }}>
         <DownloadOutlined
           onClick={async () => {
-            await message.success(
-              `${intl.formatMessage({
-                id: 'pages.data.option.download',
-                defaultMessage: '下载',
-              })}`,
+            downloadObject(
+              record,
+              intl.formatMessage({
+                id: 'pages.device.product',
+                defaultMessage: '产品',
+              }),
             );
           }}
         />
@@ -305,9 +307,41 @@ const Product = observer(() => {
               defaultMessage: '新增',
             })}
           </Button>,
-          <Button onClick={() => {}} key={'import'} type={'primary'}>
-            导入
-          </Button>,
+          <Upload
+            key={'import'}
+            showUploadList={false}
+            beforeUpload={(file) => {
+              const reader = new FileReader();
+              reader.readAsText(file);
+              reader.onload = async (result) => {
+                const text = result.target?.result as string;
+                if (!file.type.includes('json')) {
+                  message.warning('文件内容格式错误');
+                  return;
+                }
+                try {
+                  const data = JSON.parse(text || '{}');
+                  // 设置导入的产品状态为未发布
+                  data.state = 0;
+                  if (Array.isArray(data)) {
+                    message.warning('文件内容格式错误');
+                    return;
+                  }
+
+                  const res = await service.update(data);
+                  if (res.status === 200) {
+                    message.success('操作成功');
+                    actionRef.current?.reload();
+                  }
+                } catch {
+                  message.warning('文件内容格式错误');
+                }
+              };
+              return false;
+            }}
+          >
+            <Button style={{ marginLeft: 12 }}>导入</Button>
+          </Upload>,
         ]}
         cardRender={(record) => <ProductCard {...record} actions={tools(record)} />}
       />

src/pages/link/Protocol/index.tsx

@@ -117,7 +117,7 @@ const Protocol = () => {
               : '请先禁用该组件，再删除。'
           }
         >
-          <Button style={{ padding: 0 }} key="delete" type="link" disabled={record.state !== 1}>
+          <Button style={{ padding: 0 }} key="delete" type="link" disabled={record.state === 1}>
             <Popconfirm
               title={intl.formatMessage({
                 id: 'pages.data.option.remove.tips',

src/pages/system/Department/Assets/deivce/index.tsx

@@ -38,23 +38,27 @@ export default observer(() => {
    * 解除资产绑定
    */
   const handleUnBind = () => {
-    service
-      .unBind('device', [
-        {
-          targetType: 'org',
-          targetId: param.id,
-          assetType: 'device',
-          assetIdList: Models.unBindKeys,
-        },
-      ])
-      .subscribe({
-        next: () => message.success('操作成功'),
-        error: () => message.error('操作失败'),
-        complete: () => {
-          Models.unBindKeys = [];
-          actionRef.current?.reload();
-        },
-      });
+    if (Models.unBindKeys.length) {
+      service
+        .unBind('device', [
+          {
+            targetType: 'org',
+            targetId: param.id,
+            assetType: 'device',
+            assetIdList: Models.unBindKeys,
+          },
+        ])
+        .subscribe({
+          next: () => message.success('操作成功'),
+          error: () => message.error('操作失败'),
+          complete: () => {
+            Models.unBindKeys = [];
+            actionRef.current?.reload();
+          },
+        });
+    } else {
+      message.warning('请勾选需要解绑的数据');
+    }
   };
 
   const singleUnBind = (key: string) => {

src/pages/system/Department/Assets/product/index.tsx

@@ -26,23 +26,27 @@ export default observer(() => {
    * 解除资产绑定
    */
   const handleUnBind = () => {
-    service
-      .unBind('product', [
-        {
-          targetType: 'org',
-          targetId: param.id,
-          assetType: 'product',
-          assetIdList: Models.unBindKeys,
-        },
-      ])
-      .subscribe({
-        next: () => message.success('操作成功'),
-        error: () => message.error('操作失败'),
-        complete: () => {
-          Models.unBindKeys = [];
-          actionRef.current?.reload();
-        },
-      });
+    if (Models.unBindKeys.length) {
+      service
+        .unBind('product', [
+          {
+            targetType: 'org',
+            targetId: param.id,
+            assetType: 'product',
+            assetIdList: Models.unBindKeys,
+          },
+        ])
+        .subscribe({
+          next: () => message.success('操作成功'),
+          error: () => message.error('操作失败'),
+          complete: () => {
+            Models.unBindKeys = [];
+            actionRef.current?.reload();
+          },
+        });
+    } else {
+      message.warning('请勾选需要解绑的数据');
+    }
   };
 
   const singleUnBind = (key: string) => {

src/pages/system/Department/Assets/productCategory/bind.tsx

@@ -2,7 +2,7 @@
 import type { ActionType, ProColumns } from '@jetlinks/pro-table';
 import ProTable from '@jetlinks/pro-table';
 import { getTableKeys, service } from './index';
-import { message, Modal } from 'antd';
+import { Button, message, Modal, Space } from 'antd';
 import { useParams } from 'umi';
 import Models from './model';
 import { useEffect, useRef, useState } from 'react';
@@ -127,12 +127,37 @@ const Bind = observer((props: Props) => {
           onSelect: (record, selected, selectedRows) => {
             const keys = getTableKeys(selected ? selectedRows : [record]);
             if (selected) {
-              Models.bindKeys = keys;
+              const _map = new Map();
+              keys.forEach((k) => {
+                _map.set(k, k);
+              });
+              Models.bindKeys = [..._map.values()];
             } else {
               // 去除重复的key
               Models.bindKeys = difference(Models.bindKeys, keys);
             }
           },
+          onSelectAll: (selected, selectedRows) => {
+            if (selected) {
+              Models.bindKeys = selectedRows.map((item) => item.id);
+            } else {
+              Models.bindKeys = [];
+            }
+          },
+        }}
+        tableAlertOptionRender={() => {
+          return (
+            <Space size={16}>
+              <Button
+                type={'link'}
+                onClick={() => {
+                  Models.bindKeys = [];
+                }}
+              >
+                取消选择
+              </Button>
+            </Space>
+          );
         }}
         params={searchParam}
         request={async (params) => {

src/pages/system/Department/Assets/productCategory/index.tsx

@@ -2,7 +2,7 @@
 import type { ActionType, ProColumns } from '@jetlinks/pro-table';
 import ProTable from '@jetlinks/pro-table';
 import { useIntl } from '@@/plugin-locale/localeExports';
-import { Button, message, Popconfirm, Tooltip } from 'antd';
+import { Button, message, Popconfirm, Space, Tooltip } from 'antd';
 import { useRef, useState } from 'react';
 import { useParams } from 'umi';
 import { observer } from '@formily/react';
@@ -39,23 +39,27 @@ export default observer(() => {
    * 解除资产绑定
    */
   const handleUnBind = () => {
-    service
-      .unBind('deviceCategory', [
-        {
-          targetType: 'org',
-          targetId: param.id,
-          assetType: 'deviceCategory',
-          assetIdList: Models.unBindKeys,
-        },
-      ])
-      .subscribe({
-        next: () => message.success('操作成功'),
-        error: () => message.error('操作失败'),
-        complete: () => {
-          Models.unBindKeys = [];
-          actionRef.current?.reload();
-        },
-      });
+    if (Models.unBindKeys.length) {
+      service
+        .unBind('deviceCategory', [
+          {
+            targetType: 'org',
+            targetId: param.id,
+            assetType: 'deviceCategory',
+            assetIdList: Models.unBindKeys,
+          },
+        ])
+        .subscribe({
+          next: () => message.success('操作成功'),
+          error: () => message.error('操作失败'),
+          complete: () => {
+            Models.unBindKeys = [];
+            actionRef.current?.reload();
+          },
+        });
+    } else {
+      message.warning('请勾选需要解绑的数据');
+    }
   };
 
   const singleUnBind = (key: string) => {
@@ -196,13 +200,39 @@ export default observer(() => {
           selectedRowKeys: Models.unBindKeys,
           onSelect: (record, selected, selectedRows) => {
             const keys = getTableKeys(selected ? selectedRows : [record]);
+            console.log(record, selected, selectedRows);
             if (selected) {
-              Models.unBindKeys = keys;
+              const _map = new Map();
+              keys.forEach((k) => {
+                _map.set(k, k);
+              });
+              Models.unBindKeys = [..._map.values()];
             } else {
               // 去除重复的key
               Models.unBindKeys = difference(Models.unBindKeys, keys);
             }
           },
+          onSelectAll: (selected, selectedRows) => {
+            if (selected) {
+              Models.unBindKeys = selectedRows.map((item) => item.id);
+            } else {
+              Models.unBindKeys = [];
+            }
+          },
+        }}
+        tableAlertOptionRender={() => {
+          return (
+            <Space size={16}>
+              <Button
+                type={'link'}
+                onClick={() => {
+                  Models.unBindKeys = [];
+                }}
+              >
+                取消选择
+              </Button>
+            </Space>
+          );
         }}
         toolBarRender={() => [
           <Button

src/pages/system/Department/Member/index.tsx

@@ -24,14 +24,18 @@ const Member = observer(() => {
   const [searchParam, setSearchParam] = useState({});
 
   const handleUnBind = () => {
-    service.handleUser(param.id, MemberModel.unBindUsers, 'unbind').subscribe({
-      next: () => message.success('操作成功'),
-      error: () => message.error('操作失败'),
-      complete: () => {
-        MemberModel.unBindUsers = [];
-        actionRef.current?.reload();
-      },
-    });
+    if (MemberModel.unBindUsers.length) {
+      service.handleUser(param.id, MemberModel.unBindUsers, 'unbind').subscribe({
+        next: () => message.success('操作成功'),
+        error: () => message.error('操作失败'),
+        complete: () => {
+          MemberModel.unBindUsers = [];
+          actionRef.current?.reload();
+        },
+      });
+    } else {
+      message.warning('请勾选需要解绑的数据');
+    }
   };
 
   const singleUnBind = (key: string) => {

src/pages/system/Menu/Detail/buttons.tsx

@@ -8,7 +8,6 @@ import { DeleteOutlined, EditOutlined, PlusOutlined, SearchOutlined } from '@ant
 import type { MenuButtonInfo, MenuItem } from '@/pages/system/Menu/typing';
 import Permission from '@/pages/system/Menu/components/permission';
 import { useRequest } from '@@/plugin-request/request';
-import { debounce } from 'lodash';
 
 type ButtonsProps = {
   data: MenuItem;
@@ -49,15 +48,15 @@ export default (props: ButtonsProps) => {
     setDisabled(false);
   };
 
-  const filterThree = (e: any) => {
-    const _data: any = {
-      paging: false,
-    };
-    if (e.target.value) {
-      _data.terms = [{ column: 'name', value: e.target.value }];
-    }
-    queryPermissions(_data);
-  };
+  // const filterThree = (e: any) => {
+  //   const _data: any = {
+  //     paging: false,
+  //   };
+  //   if (e.target.value) {
+  //     _data.terms = [{ column: 'name', value: e.target.value }];
+  //   }
+  //   queryPermissions(_data);
+  // };
 
   /**
    * 更新菜单信息
@@ -65,17 +64,19 @@ export default (props: ButtonsProps) => {
    */
   const updateMenuInfo = useCallback(
     async (data: MenuButtonInfo[]) => {
-      const response = await service.update({
-        ...props.data,
-        buttons: data,
-      });
-      if (response.status === 200) {
-        message.success('操作成功!');
-        props.onLoad();
-        resetForm();
-        setVisible(false);
-      } else {
-        message.error('操作失败!');
+      if (props.data.id) {
+        const response = await service.update({
+          ...props.data,
+          buttons: data,
+        });
+        if (response.status === 200) {
+          message.success('操作成功!');
+          props.onLoad();
+          resetForm();
+          setVisible(false);
+        } else {
+          message.error('操作失败!');
+        }
       }
       /* eslint-disable */
     },
@@ -153,6 +154,10 @@ export default (props: ButtonsProps) => {
         defaultMessage: '备注说明',
       }),
       dataIndex: 'describe',
+      // render: (_, row) => () => {
+      //   console.log(row)
+      //   return (<> {row.describe || '-'}</>)
+      // }
     },
     {
       title: intl.formatMessage({
@@ -234,6 +239,10 @@ export default (props: ButtonsProps) => {
         toolBarRender={() => [
           <Button
             onClick={() => {
+              if (!props.data) {
+                message.warning('请先新增菜单基本信息');
+                return;
+              }
               form.resetFields();
               setVisible(true);
             }}
@@ -310,7 +319,6 @@ export default (props: ButtonsProps) => {
             })}
             required={true}
           >
-            <Input disabled={disabled} onChange={debounce(filterThree, 300)} />
             <Form.Item name="permissions" rules={[{ required: true, message: '请选择权限' }]}>
               <Permission
                 title={intl.formatMessage({

src/pages/system/Menu/components/permission.tsx

@@ -1,4 +1,4 @@
-import React, { useEffect, useState, useRef } from 'react';
+import React, { useEffect, useRef, useState } from 'react';
 import { Checkbox } from 'antd';
 import './permission.less';
 import type { CheckboxChangeEvent } from 'antd/es/checkbox';
@@ -225,6 +225,7 @@ export default (props: PermissionType) => {
    */
   const initialState = (data: PermissionDataType[]) => {
     const _list = data.map((item) => {
+      console.log(item.name, item.actions);
       const propsPermission =
         props.value && props.value.length
           ? props.value.find((p) => p.permission === item.id)
@@ -232,7 +233,9 @@ export default (props: PermissionType) => {
       const propsActions = propsPermission ? propsPermission.actions : [];
       return {
         ...item,
-        actions: item.actions.map((a) => ({ ...a, checked: propsActions.includes(a.action) })),
+        actions: item.actions
+          .filter((action) => Object.keys(action).length)
+          .map((a) => ({ ...a, checked: propsActions.includes(a.action) })),
         state: false, // 是否为半选中状态
         checked: false, // 是否为全选
       };

src/pages/system/Menu/typing.d.ts

@@ -78,5 +78,6 @@ export type MenuButtonInfo = {
   name: string;
   permissions: PermissionInfo;
   createTime: number;
+  describe?: string;
   options: Record<string, any>;
 };