fix: merge

fix: bug

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

@@ -231,7 +231,7 @@ const PropertyLog = (props: Props) => {
         return (
           <Table
             size="small"
-            rowKey={'id'}
+            rowKey={(_, index) => `${index}`}
             onChange={(page) => {
               handleSearch(
                 {
@@ -242,7 +242,7 @@ const PropertyLog = (props: Props) => {
                 end,
               );
             }}
-            dataSource={dataSource?.data || []}
+            dataSource={dataSource?.data}
             columns={data?.valueType?.type === 'geoPoint' ? geoColumns : columns}
             pagination={{
               current: (dataSource?.pageIndex || 0) + 1,

src/pages/init-home/service.ts

@@ -49,8 +49,9 @@ class Service extends BaseService<any> {
     request(`${SystemConst.API_BASE}/permission/_query/no-paging?paging=false`);
 
   // 更新全部菜单
-  updateMenus = (data: any) =>
-    request(`${SystemConst.API_BASE}/menu/_all`, { method: 'PATCH', data });
+  // updateMenus = (data: any) =>
+  //   request(`${SystemConst.API_BASE}/menu/_all`, { method: 'PATCH', data });
+  updateMenus = (data: any) => request(`${SystemConst.API_BASE}/menu`, { method: 'PATCH', data });
 
   // 添加角色
   addRole = (data: any) => request(`/${SystemConst.API_BASE}/role`, { method: 'POST', data });

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

@@ -152,19 +152,19 @@ export default observer((props: { parentId: string }) => {
       // onFilter: true,
       valueType: 'select',
       valueEnum: {
-        onLine: {
+        online: {
           text: intl.formatMessage({
             id: 'pages.device.instance.status.onLine',
             defaultMessage: '在线',
           }),
-          status: 'onLine',
+          status: 'online',
         },
-        offLine: {
+        offline: {
           text: intl.formatMessage({
             id: 'pages.device.instance.status.offLine',
             defaultMessage: '离线',
           }),
-          status: 'offLine',
+          status: 'offline',
         },
         notActive: {
           text: intl.formatMessage({

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

@@ -102,6 +102,7 @@ export default (props: EditProps) => {
   };
 
   useEffect(() => {
+    console.log(props.data, 'edit');
     if (form) {
       form.setFieldsValue({
         ...props.data,

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

@@ -69,7 +69,7 @@ export default () => {
         setTabKey(key);
       }}
     >
-      {tabKey === 'detail' && data ? (
+      {tabKey === 'detail' ? (
         <BaseDetail
           data={{
             ...data,

src/pages/system/Menu/Setting/baseMenu.ts

@@ -4,7 +4,7 @@ export default [
     code: 'iot',
     name: '物联网',
     owner: 'iot',
-    id: '1',
+    // //id: '1',
     url: '/iot',
     icon: 'icon-wulianwang',
     sortIndex: 1,
@@ -14,8 +14,8 @@ export default [
         code: 'home',
         name: '首页',
         owner: 'iot',
-        parentId: '1',
-        id: '1-1',
+        //parentId: '1',
+        //id: '1-1',
         url: '/iot/home',
         icon: 'icon-keshihua',
         sortIndex: 1,
@@ -47,8 +47,8 @@ export default [
         code: 'notice',
         name: '通知管理',
         owner: 'iot',
-        parentId: '1',
-        id: '1-2',
+        //parentId: '1',
+        //id: '1-2',
         url: '/iot/notice/Type',
         icon: 'icon-shebei',
         sortIndex: 2,
@@ -199,8 +199,8 @@ export default [
         code: 'device',
         name: '设备管理',
         owner: 'iot',
-        parentId: '1',
-        id: '1-3',
+        //parentId: '1',
+        //id: '1-3',
         url: '/iot/device',
         icon: 'icon-shebei',
         sortIndex: 3,
@@ -211,8 +211,8 @@ export default [
             code: 'device/DashBoard',
             name: '仪表盘',
             owner: 'iot',
-            parentId: '1-3',
-            id: '1-3-1',
+            //parentId: '1-3',
+            //id: '1-3-1',
             url: '/iot/device/DashBoard',
             icon: 'icon-keshihua',
             sortIndex: 1,
@@ -240,8 +240,8 @@ export default [
             code: 'device/Product',
             name: '产品',
             owner: 'iot',
-            parentId: '1-3',
-            id: '1-3-2',
+            //parentId: '1-3',
+            //id: '1-3-2',
             url: '/iot/device/Product',
             icon: 'icon-chanpin',
             sortIndex: 2,
@@ -431,8 +431,8 @@ export default [
             code: 'device/Instance',
             name: '设备',
             owner: 'iot',
-            parentId: '1-3',
-            id: '1-3-3',
+            //parentId: '1-3',
+            //id: '1-3-3',
             url: '/iot/device/Instance',
             icon: 'icon-shebei',
             sortIndex: 3,
@@ -626,8 +626,8 @@ export default [
             code: 'device/Category',
             name: '产品分类',
             owner: 'iot',
-            parentId: '1-3',
-            id: '1-3-4',
+            //parentId: '1-3',
+            //id: '1-3-4',
             sortIndex: 4,
             url: '/iot/device/Category',
             icon: 'icon-chanpinfenlei1',
@@ -684,8 +684,8 @@ export default [
         code: 'link',
         name: '运维管理',
         owner: 'iot',
-        parentId: '1',
-        id: '1-4',
+        //parentId: '1',
+        //id: '1-4',
         url: '/iot/link',
         icon: 'icon-yunweiguanli-1',
         permissions: [],
@@ -695,8 +695,8 @@ export default [
             code: 'link/DashBoard',
             name: '仪表盘',
             owner: 'iot',
-            parentId: '1-4',
-            id: '1-4-1',
+            //parentId: '1-4',
+            //id: '1-4-1',
             sortIndex: 1,
             url: '/iot/link/dashboard',
             icon: 'icon-keshihua',
@@ -716,8 +716,8 @@ export default [
             code: 'link/AccessConfig',
             name: '设备接入网关',
             owner: 'iot',
-            parentId: '1-4',
-            id: '1-4-2',
+            //parentId: '1-4',
+            //id: '1-4-2',
             sortIndex: 2,
             url: '/iot/link/accessConfig',
             icon: 'icon-wangguanzishebei',
@@ -840,8 +840,8 @@ export default [
             code: 'link/Protocol',
             name: '协议管理',
             owner: 'iot',
-            parentId: '1-4',
-            id: '1-4-3',
+            //parentId: '1-4',
+            //id: '1-4-3',
             sortIndex: 3,
             url: '/iot/link/protocol',
             icon: 'icon-tongzhiguanli',
@@ -920,8 +920,8 @@ export default [
             code: 'Log',
             name: '日志管理',
             owner: 'iot',
-            parentId: '1-4',
-            id: '1-4-4',
+            //parentId: '1-4',
+            //id: '1-4-4',
             sortIndex: 4,
             url: '/iot/link/Log',
             icon: 'icon-rizhifuwu',
@@ -942,8 +942,8 @@ export default [
             code: 'link/Type',
             name: '网络组件',
             owner: 'iot',
-            parentId: '1-4',
-            id: '1-4-5',
+            //parentId: '1-4',
+            //id: '1-4-5',
             sortIndex: 5,
             url: '/iot/link/type',
             icon: 'icon-wangluozujian',
@@ -1018,8 +1018,8 @@ export default [
             code: 'link/Certificate',
             name: '证书管理',
             owner: 'iot',
-            parentId: '1-4',
-            id: '1-4-6',
+            //parentId: '1-4',
+            //id: '1-4-6',
             sortIndex: 6,
             url: '/iot/link/Certificate',
             icon: 'icon-rizhifuwu',
@@ -1072,8 +1072,8 @@ export default [
             code: 'media/Stream',
             name: '流媒体服务',
             owner: 'iot',
-            parentId: '1-4',
-            id: '1-4-7',
+            //parentId: '1-4',
+            //id: '1-4-7',
             sortIndex: 7,
             url: '/iot/link/Stream',
             icon: 'icon-xuanzetongdao1',
@@ -1136,8 +1136,8 @@ export default [
             code: 'link/Channel',
             name: '通道配置',
             owner: 'iot',
-            parentId: '1-4',
-            id: '1-4-8',
+            //parentId: '1-4',
+            //id: '1-4-8',
             sortIndex: 8,
             url: '/iot/link/Channel',
             icon: 'icon-zidingyiguize',
@@ -1148,8 +1148,8 @@ export default [
                 code: 'link/Channel/Opcua',
                 name: 'OPC UA',
                 owner: 'iot',
-                parentId: '1-4-8',
-                id: '1-4-8-1',
+                //parentId: '1-4-8',
+                //id: '1-4-8-1',
                 sortIndex: 1,
                 url: '/iot/link/Channel/Opcua',
                 icon: 'icon-zhilianshebei',
@@ -1210,8 +1210,8 @@ export default [
                 code: 'link/Channel/Modbus',
                 name: 'Modbus',
                 owner: 'iot',
-                parentId: '1-4-8',
-                id: '1-4-8-2',
+                //parentId: '1-4-8',
+                //id: '1-4-8-2',
                 sortIndex: 2,
                 url: '/iot/link/Channel/Modbus',
                 icon: 'icon-changjingliandong',
@@ -1254,8 +1254,8 @@ export default [
             code: 'device/Firmware',
             name: '远程升级',
             owner: 'iot',
-            parentId: '1-4',
-            id: '1-4-9',
+            //parentId: '1-4',
+            //id: '1-4-9',
             sortIndex: 9,
             url: '/iot/link/firmware',
             icon: 'icon-wangluozujian',
@@ -1368,9 +1368,9 @@ export default [
         code: 'rule-engine/Alarm',
         name: '告警中心',
         owner: 'iot',
-        parentId: '1',
-        id: '1-5',
-        sortIndex: 1,
+        //parentId: '1',
+        //id: '1-5',
+        sortIndex: 5,
         url: '/iot/Alarm',
         icon: 'icon-zidingyiguize',
         permissions: [],
@@ -1381,8 +1381,8 @@ export default [
             code: 'rule-engine/DashBoard',
             name: '仪表盘',
             owner: 'iot',
-            parentId: '1-5',
-            id: '1-5-1',
+            //parentId: '1-5',
+            //id: '1-5-1',
             sortIndex: 1,
             url: '/iot/Alarm/dashboard',
             icon: 'icon-shujumoni',
@@ -1398,8 +1398,8 @@ export default [
             code: 'rule-engine/Alarm/Config',
             name: '基础配置',
             owner: 'iot',
-            parentId: '1-5',
-            id: '1-5-3',
+            //parentId: '1-5',
+            //id: '1-5-3',
             sortIndex: 2,
             url: '/iot/Alarm/Config',
             icon: 'icon-chajianguanli',
@@ -1420,8 +1420,8 @@ export default [
             code: 'rule-engine/Alarm/Configuration',
             name: '告警配置',
             owner: 'iot',
-            parentId: '1-5',
-            id: '1-5-2',
+            //parentId: '1-5',
+            //id: '1-5-2',
             sortIndex: 3,
             url: '/iot/Alarm/Configuration',
             icon: 'icon-chajianguanli',
@@ -1522,8 +1522,8 @@ export default [
             code: 'rule-engine/Alarm/Log',
             name: '告警记录',
             owner: 'iot',
-            parentId: '1-5',
-            id: '1-5-4',
+            //parentId: '1-5',
+            //id: '1-5-4',
             sortIndex: 4,
             url: '/iot/Alarm/Log',
             icon: 'icon-changjingliandong',
@@ -1574,8 +1574,8 @@ export default [
         code: 'Northbound',
         name: '北向输出',
         owner: 'iot',
-        parentId: '1',
-        id: '1-6',
+        //parentId: '1',
+        //id: '1-6',
         sortIndex: 6,
         url: '/iot/northbound',
         icon: 'icon-yunyunjieru',
@@ -1587,8 +1587,8 @@ export default [
             code: 'Northbound/DuerOS',
             name: 'DuerOS',
             owner: 'iot',
-            parentId: '1-6',
-            id: '1-6-1',
+            //parentId: '1-6',
+            //id: '1-6-1',
             sortIndex: 1,
             url: '/iot/northbound/DuerOS',
             icon: 'icon-yunyunjieru',
@@ -1649,8 +1649,8 @@ export default [
             code: 'Northbound/AliCloud',
             name: '阿里云',
             owner: 'iot',
-            parentId: '1-6',
-            id: '1-6-2',
+            //parentId: '1-6',
+            //id: '1-6-2',
             sortIndex: 2,
             url: '/iot/northbound/AliCloud',
             icon: 'icon-yunyunjieru',
@@ -1727,8 +1727,8 @@ export default [
         code: 'rule-engine',
         name: '规则引擎',
         owner: 'iot',
-        parentId: '1',
-        id: '1-7',
+        //parentId: '1',
+        //id: '1-7',
         sortIndex: 7,
         url: '/iot/rule-engine',
         icon: 'icon-zidingyiguize',
@@ -1739,8 +1739,8 @@ export default [
             code: 'rule-engine/Instance',
             name: '规则编排',
             owner: 'iot',
-            parentId: '1-7',
-            id: '1-7-1',
+            //parentId: '1-7',
+            //id: '1-7-1',
             sortIndex: 1,
             url: '/iot/rule-engine/Instance',
             icon: 'icon-changjingliandong',
@@ -1883,8 +1883,8 @@ export default [
             code: 'rule-engine/Scene',
             name: '场景联动',
             owner: 'iot',
-            parentId: '1-7',
-            id: '1-7-2',
+            //parentId: '1-7',
+            //id: '1-7-2',
             sortIndex: 2,
             url: '/iot/rule-engine/scene',
             icon: 'icon-yunweiguanli-1',
@@ -2015,7 +2015,7 @@ export default [
     code: 'media',
     name: '视频中心',
     owner: 'iot',
-    id: '2',
+    //id: '2',
     url: '/media',
     icon: 'icon-shipinwangguan',
     sortIndex: 2,
@@ -2028,8 +2028,8 @@ export default [
         code: 'media/Home',
         name: '首页',
         owner: 'iot',
-        parentId: '2',
-        id: '2-1',
+        //parentId: '2',
+        //id: '2-1',
         sortIndex: 1,
         url: '/media/home',
         icon: 'icon-zhihuishequ',
@@ -2041,8 +2041,8 @@ export default [
         code: 'media/DashBoard',
         name: '仪表盘',
         owner: 'iot',
-        parentId: '2',
-        id: '2-2',
+        //parentId: '2',
+        //id: '2-2',
         sortIndex: 2,
         url: '/media/dashboard',
         icon: 'icon-keshihua',
@@ -2054,8 +2054,8 @@ export default [
         code: 'media/Device',
         name: '视频设备',
         owner: 'iot',
-        parentId: '2',
-        id: '2-3',
+        //parentId: '2',
+        //id: '2-3',
         sortIndex: 3,
         url: '/media/device',
         icon: 'icon-keshihua',
@@ -2121,8 +2121,8 @@ export default [
         code: 'media/SplitScreen',
         name: '分屏展示',
         owner: 'iot',
-        parentId: '2',
-        id: '2-4',
+        //parentId: '2',
+        //id: '2-4',
         sortIndex: 4,
         url: '/media/SplitScreen',
         icon: 'icon-fenpingzhanshi1',
@@ -2146,8 +2146,8 @@ export default [
         code: 'media/Cascade',
         name: '国标级联',
         owner: 'iot',
-        parentId: '2',
-        id: '2-5',
+        //parentId: '2',
+        //id: '2-5',
         sortIndex: 5,
         url: '/media/Cascade',
         icon: 'icon-guojijilian',
@@ -2219,7 +2219,7 @@ export default [
     code: 'system',
     name: '系统管理',
     owner: 'iot',
-    id: '3',
+    //id: '3',
     url: '/system',
     icon: 'icon-xitongguanli1',
     sortIndex: 3,
@@ -2230,8 +2230,8 @@ export default [
         code: 'system/Basis',
         name: '基础配置',
         owner: 'iot',
-        parentId: '3',
-        id: '3-1',
+        //parentId: '3',
+        //id: '3-1',
         sortIndex: 1,
         url: '/system/Basis',
         icon: 'icon-shezhi',
@@ -2258,8 +2258,8 @@ export default [
         code: 'system/User',
         name: '用户管理',
         owner: 'iot',
-        parentId: '3',
-        id: '3-2',
+        //parentId: '3',
+        //id: '3-2',
         sortIndex: 2,
         url: '/system/user',
         icon: 'icon-yonghuguanli',
@@ -2346,8 +2346,8 @@ export default [
         code: 'system/Department',
         name: '组织管理',
         owner: 'iot',
-        parentId: '3',
-        id: '3-3',
+        //parentId: '3',
+        //id: '3-3',
         sortIndex: 3,
         url: '/system/Department',
         icon: 'icon-bumenguanli',
@@ -2564,8 +2564,8 @@ export default [
         code: 'system/Role',
         name: '角色管理',
         owner: 'iot',
-        parentId: '3',
-        id: '3-4',
+        //parentId: '3',
+        //id: '3-4',
         sortIndex: 4,
         url: '/system/Role',
         icon: 'icon-jiaoseguanli',
@@ -2634,8 +2634,8 @@ export default [
         code: 'system/Menu',
         name: '菜单管理',
         owner: 'iot',
-        parentId: '3',
-        id: '3-5',
+        //parentId: '3',
+        //id: '3-5',
         sortIndex: 5,
         url: '/system/Menu',
         icon: 'icon-caidanguanli',
@@ -2726,8 +2726,8 @@ export default [
         code: 'system/Permission',
         name: '权限管理',
         owner: 'iot',
-        parentId: '3',
-        id: '3-6',
+        //parentId: '3',
+        //id: '3-6',
         sortIndex: 6,
         url: '/system/Permission',
         icon: 'icon-quanxianguanli',
@@ -2814,8 +2814,8 @@ export default [
       //   code: 'system/Platforms',
       //   name: '第三方平台',
       //   owner: 'iot',
-      //   parentId: '3',
-      //   id: '3-7',
+      //   //parentId: '3',
+      //   //id: '3-7',
       //   sortIndex: 7,
       //   url: '/system/platforms',
       //   icon: 'icon-xitongguanli1',
@@ -2851,8 +2851,8 @@ export default [
         code: 'system/Relationship',
         name: '关系配置',
         owner: 'iot',
-        parentId: '3',
-        id: '3-8',
+        //parentId: '3',
+        //id: '3-8',
         sortIndex: 8,
         url: '/system/Relationship',
         icon: 'icon-renyuan',
@@ -2905,8 +2905,8 @@ export default [
         code: 'system/DataSource',
         name: '数据源管理',
         owner: 'iot',
-        parentId: '3',
-        id: '3-9',
+        //parentId: '3',
+        //id: '3-9',
         sortIndex: 9,
         url: '/system/DataSource',
         icon: 'icon-shebei',
@@ -2987,8 +2987,8 @@ export default [
         code: 'system/Platforms/Setting',
         name: 'API配置',
         owner: 'iot',
-        parentId: '3',
-        id: '3-10',
+        //parentId: '3',
+        //id: '3-10',
         sortIndex: 10,
         url: '/system/Api',
         icon: 'icon-rizhifuwu',
@@ -3000,8 +3000,8 @@ export default [
         code: 'system/Apply',
         name: '应用管理',
         owner: 'iot',
-        parentId: '3',
-        id: '3-11',
+        //parentId: '3',
+        //id: '3-11',
         sortIndex: 11,
         url: '/system/Apply',
         icon: 'icon-wangguanzishebei',
@@ -3104,8 +3104,8 @@ export default [
         code: 'system/License',
         name: 'License管理',
         owner: 'iot',
-        parentId: '3',
-        id: '3-12',
+        //parentId: '3',
+        //id: '3-12',
         sortIndex: 12,
         url: '/system/License',
         icon: 'icon-zidingyiguize',

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

@@ -148,7 +148,6 @@ export default (props: PermissionType) => {
   };
 
   useEffect(() => {
-    console.log(props.value, 3333333);
     checkKeysRef.clear();
   }, []);
 
@@ -246,6 +245,7 @@ export default (props: PermissionType) => {
    * @param data
    */
   const initialState = (data: PermissionDataType[]) => {
+    console.log(props.value, 'init');
     props.value?.forEach((item) => {
       checkKeysRef.set(item.permission, item);
     });
@@ -275,6 +275,10 @@ export default (props: PermissionType) => {
     /* eslint-disable */
   }, [props.data, props.disabled]);
 
+  useEffect(() => {
+    console.log(props.value, 'value');
+  }, [props.value]);
+
   return (
     <div className="permission-container">
       <div className="permission-header">

src/pages/system/Menu/service.ts

@@ -29,7 +29,8 @@ class Service extends BaseService<MenuItem> {
   queryAssetsType = () => request(`${SystemConst.API_BASE}/asset/types`, { method: 'GET' });
 
   // 更新全部菜单
-  updateMenus = (data: any) => request(`${this.uri}/_all`, { method: 'PATCH', data });
+  // updateMenus = (data: any) => request(`${this.uri}/_all`, { method: 'PATCH', data });
+  updateMenus = (data: any) => request(`${this.uri}`, { method: 'PATCH', data });
 
   getSystemPermission = () =>
     request(`${SystemConst.API_BASE}/system/resources/permission`, {