fix: 菜单图标

src/components/FMonacoEditor/index.tsx

@@ -1,9 +1,10 @@
 import MonacoEditor from 'react-monaco-editor';
 import { connect, mapProps } from '@formily/react';
-import { useState } from 'react';
+import { useRef, useState } from 'react';
 
 export const JMonacoEditor = (props: any) => {
   const [loading, setLoading] = useState(false);
+  const monacoRef = useRef<any>();
 
   return (
     <div
@@ -14,7 +15,7 @@ export const JMonacoEditor = (props: any) => {
       }}
       style={{ height: '100%', width: '100%' }}
     >
-      {loading && <MonacoEditor {...props} />}
+      {loading && <MonacoEditor ref={monacoRef} {...props} />}
     </div>
   );
 };

src/pages/Northbound/DuerOS/Detail/index.tsx

@@ -15,7 +15,7 @@ import {
   PreviewText,
   Select,
 } from '@formily/antd';
-import { PermissionButton } from '@/components';
+import { PermissionButton, TitleComponent } from '@/components';
 import { useEffect, useMemo, useState } from 'react';
 import {
   createForm,
@@ -693,8 +693,9 @@ const Save = () => {
   return (
     <PageContainer>
       <Card>
-        <Row>
-          <Col span={12}>
+        <Row gutter={24}>
+          <Col span={14}>
+            <TitleComponent data={'基本信息'} />
             <Form layout="vertical" form={form}>
               <SchemaField
                 schema={schema}
@@ -717,7 +718,7 @@ const Save = () => {
               </FormButtonGroup.Sticky>
             </Form>
           </Col>
-          <Col span={10} push={2}>
+          <Col span={10}>
             <Doc />
           </Col>
         </Row>

src/pages/link/DashBoard/index.tsx

@@ -237,9 +237,9 @@ export default () => {
 
   const networkValueRender = (value: number) => {
     if (value >= 1024 && value < 1024 * 1024) {
-      return `${Number((value / 1024).toFixed(2))}M`;
+      return `${Number((value / 1024).toFixed(2))}KB`;
     } else if (value >= 1024 * 1024) {
-      return `${Number((value / 1024 / 1024).toFixed(2))}KB`;
+      return `${Number((value / 1024 / 1024).toFixed(2))}M`;
     } else {
       return `${value}B`;
     }

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

@@ -310,7 +310,7 @@ const Config = () => {
   const level = (
     <Row>
       <Col span={14}>
-        <Card>
+        <Card style={{ height: 650 }}>
           <TitleComponent data={'告警级别配置'} />
           <Form form={levelForm}>
             <SchemaField schema={levelSchema} />
@@ -327,7 +327,7 @@ const Config = () => {
         </Card>
       </Col>
       <Col span={10}>
-        <div style={{ marginLeft: 20 }} className={styles.doc}>
+        <div style={{ marginLeft: 20, height: 650 }} className={styles.doc}>
           <h1>功能说明</h1>
           <div>1、告警级别用于描述告警的严重程度，请根据业务管理方式进行自定义。</div>
           <div>2、告警级别将会在告警配置中被引用。</div>
@@ -340,7 +340,7 @@ const Config = () => {
     <Row>
       <Col span={14}>
         <div>
-          <Card>
+          <Card style={{ height: 650 }}>
             <TitleComponent
               data={
                 <span>
@@ -370,7 +370,13 @@ const Config = () => {
                 </span>
               }
             />
-            <Descriptions key={'output'} bordered column={2} labelStyle={{ width: 112 }}>
+            <Descriptions
+              key={'output'}
+              bordered
+              column={2}
+              labelStyle={{ width: 112 }}
+              contentStyle={{ minWidth: 100 }}
+            >
               <Descriptions.Item label="kafka地址" contentStyle={{ minWidth: 200 }}>
                 {output?.data?.config?.config?.address && (
                   <Badge
@@ -421,7 +427,13 @@ const Config = () => {
                 </span>
               }
             />
-            <Descriptions key={'input'} bordered column={2} labelStyle={{ width: 112 }}>
+            <Descriptions
+              key={'input'}
+              bordered
+              column={2}
+              labelStyle={{ width: 112 }}
+              contentStyle={{ minWidth: 150 }}
+            >
               <Descriptions.Item label="kafka地址">
                 {input?.data?.config?.config?.address && (
                   <Badge
@@ -446,7 +458,7 @@ const Config = () => {
         </div>
       </Col>
       <Col span={10}>
-        <div style={{ height: 650, marginLeft: 20, paddingBottom: 24 }}>
+        <div style={{ height: 650, marginLeft: 20, paddingBottom: 24, backgroundColor: '#fff' }}>
           <div className={styles.doc}>
             <h1>功能图示</h1>
             <div className={styles.image}>

src/pages/rule-engine/Alarm/Configuration/Save/Log/index.less

@@ -0,0 +1,7 @@
+.alarm-configuration-log-box {
+  :global {
+    .ant-card-body {
+      padding-top: 10px;
+    }
+  }
+}

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

@@ -1,10 +1,15 @@
 import TabComponent from '@/pages/rule-engine/Alarm/Log/TabComponent';
 import useLocation from '@/hooks/route/useLocation';
 import { Empty } from '@/components';
+import styles from './index.less';
 
 export default () => {
   const location = useLocation();
   const id = location?.query?.id || '';
 
-  return <div>{id ? <TabComponent type={'detail'} id={id} /> : <Empty />}</div>;
+  return (
+    <div className={styles['alarm-configuration-log-box']}>
+      {id ? <TabComponent type={'detail'} id={id} /> : <Empty />}
+    </div>
+  );
 };

src/pages/rule-engine/Alarm/Log/TabComponent/index.tsx

@@ -334,7 +334,12 @@ const TabComponent = observer((props: Props) => {
         />
       )}
 
-      <Card bordered={false} style={{ minHeight, position: 'relative' }} className={'alarmLog'}>
+      <Card
+        bordered={false}
+        bodyStyle={{ paddingTop: props.type === 'detail' ? 0 : 24 }}
+        style={{ minHeight, position: 'relative' }}
+        className={'alarmLog'}
+      >
         <div className="alarm-log-card">
           <div style={{ height: '100%', paddingBottom: 48 }}>
             {dataSource?.data.length ? (

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

@@ -17,7 +17,7 @@ export default [
         //parentId: '1',
         //id: '1-1',
         url: '/iot/home',
-        icon: 'icon-keshihua',
+        icon: 'icon-zhihuishequ',
         sortIndex: 1,
         showPage: ['dashboard', 'device-instance', 'device-product'],
         permissions: [
@@ -50,7 +50,7 @@ export default [
         //parentId: '1',
         //id: '1-2',
         url: '/iot/notice/Type',
-        icon: 'icon-shebei',
+        icon: 'icon-tongzhiguanli',
         sortIndex: 2,
         showPage: ['template', 'notifier'],
         permissions: [],
@@ -630,7 +630,7 @@ export default [
             //id: '1-3-4',
             sortIndex: 4,
             url: '/iot/device/Category',
-            icon: 'icon-chanpinfenlei1',
+            icon: 'icon-chanpinfenlei',
             accessSupport: 'support',
             assetType: 'deviceCategory',
             showPage: ['device-category'],
@@ -1022,7 +1022,7 @@ export default [
             //id: '1-4-6',
             sortIndex: 6,
             url: '/iot/link/Certificate',
-            icon: 'icon-rizhifuwu',
+            icon: 'icon-zhengshuguanli',
             showPage: ['certificate'],
             permissions: [],
             buttons: [
@@ -1258,7 +1258,7 @@ export default [
             //id: '1-4-9',
             sortIndex: 9,
             url: '/iot/link/firmware',
-            icon: 'icon-wangluozujian',
+            icon: 'icon-yuanchengshengji',
             showPage: ['firmware-manager'],
             permissions: [],
             buttons: [
@@ -1370,7 +1370,7 @@ export default [
         owner: 'iot',
         sortIndex: 10,
         url: '/iot/link/DataCollect',
-        icon: 'icon-shuxingpeizhi',
+        icon: 'icon-analytics',
         showPage: [],
         permissions: [],
         children: [
@@ -1380,7 +1380,7 @@ export default [
             owner: 'iot',
             sortIndex: 1,
             url: '/iot/DataCollect/Dashboard',
-            icon: 'icon-shujumoni',
+            icon: 'icon-keshihua',
             showPage: [
               'dashboard',
               'data-collect-channel',
@@ -1534,7 +1534,7 @@ export default [
             owner: 'iot',
             sortIndex: 3,
             url: '/iot/DataCollect/IntegratedQuery',
-            icon: 'icon-zhilianshebei',
+            icon: 'icon-yingyongguanli',
             showPage: [
               'data-collect-channel',
               'data-collect-opc',
@@ -1669,7 +1669,7 @@ export default [
         //id: '1-5',
         sortIndex: 5,
         url: '/iot/Alarm',
-        icon: 'icon-zidingyiguize',
+        icon: 'icon-shebeigaojing',
         permissions: [],
         buttons: [],
         showPage: [],
@@ -1682,7 +1682,7 @@ export default [
             //id: '1-5-1',
             sortIndex: 1,
             url: '/iot/Alarm/dashboard',
-            icon: 'icon-shujumoni',
+            icon: 'icon-keshihua',
             showPage: ['dashboard', 'alarm-record', 'alarm-config'],
             permissions: [
               { permission: 'dashboard', actions: ['query'] },
@@ -1721,7 +1721,7 @@ export default [
             //id: '1-5-2',
             sortIndex: 3,
             url: '/iot/Alarm/Configuration',
-            icon: 'icon-chajianguanli',
+            icon: 'icon-warning_amber',
             showPage: ['alarm-config'],
             permissions: [],
             buttons: [
@@ -1888,7 +1888,7 @@ export default [
             //id: '1-6-1',
             sortIndex: 1,
             url: '/iot/northbound/DuerOS',
-            icon: 'icon-yunyunjieru',
+            icon: 'icon-zhineng',
             permissions: [],
             showPage: ['dueros-product'],
             buttons: [
@@ -1964,7 +1964,7 @@ export default [
             //id: '1-6-2',
             sortIndex: 2,
             url: '/iot/northbound/AliCloud',
-            icon: 'icon-yunyunjieru',
+            icon: 'icon-aliyun',
             permissions: [],
             showPage: ['aliyun-bridge'],
             buttons: [
@@ -2324,7 +2324,7 @@ export default [
         owner: 'iot',
         sortIndex: 8,
         url: '/iot/edge',
-        icon: 'icon-zidingyiguize',
+        icon: 'icon-bianyuanwangguan',
         permissions: [],
         buttons: [],
         children: [
@@ -2525,7 +2525,7 @@ export default [
         //id: '2-3',
         sortIndex: 3,
         url: '/media/device',
-        icon: 'icon-keshihua',
+        icon: 'icon-shipinwangguan',
         showPage: ['media-device'],
         permissions: [
           { permission: 'file', actions: ['upload-static'] },
@@ -3322,7 +3322,7 @@ export default [
         //id: '3-8',
         sortIndex: 8,
         url: '/system/Relationship',
-        icon: 'icon-renyuan',
+        icon: 'icon-shuxingpeizhi',
         showPage: ['relation'],
         permissions: [],
         buttons: [
@@ -3458,7 +3458,7 @@ export default [
         //id: '3-10',
         sortIndex: 10,
         url: '/system/Api',
-        icon: 'icon-rizhifuwu',
+        icon: 'icon-chakanAPI',
         showPage: ['open-api'],
         permissions: [{ permission: 'open-api', actions: ['query', 'save'] }],
         buttons: [],
@@ -3471,7 +3471,7 @@ export default [
         //id: '3-11',
         sortIndex: 11,
         url: '/system/Apply',
-        icon: 'icon-wangguanzishebei',
+        icon: 'icon-yingyongguanli',
         showPage: ['application'],
         permissions: [],
         buttons: [
@@ -3622,7 +3622,7 @@ export default [
     name: '物联卡',
     code: 'iot-card',
     url: '/iot-card',
-    icon: 'icon-yunyunjieru',
+    icon: 'icon-wulianka',
     permissions: [],
     children: [
       {
@@ -3633,7 +3633,7 @@ export default [
         name: '首页',
         code: 'iot-card/Home',
         url: '/iot-card/Home',
-        icon: 'icon-shujumoni',
+        icon: 'icon-zhihuishequ',
         status: 1,
         showPage: ['network-flow'],
         permissions: [{ permission: 'network-flow', actions: ['query'] }],
@@ -3662,7 +3662,7 @@ export default [
         name: '物联卡管理',
         code: 'iot-card/CardManagement',
         url: '/iot-card/CardManagement',
-        icon: 'icon-chanpinfenlei',
+        icon: 'icon-wuliankaguanli',
         status: 1,
         showPage: ['network-card'],
         permissions: [
@@ -3783,7 +3783,7 @@ export default [
         showPage: ['network-card'],
         code: 'iot-card/Recharge',
         url: '/iot-card/Recharge',
-        icon: 'icon-caidanguanli',
+        icon: 'icon-chongzhiguanli',
         status: 1,
         permissions: [
           {
@@ -3812,7 +3812,7 @@ export default [
         name: '平台接入',
         code: 'iot-card/Platform',
         url: '/iot-card/Platform',
-        icon: 'icon-wangguanzishebei',
+        icon: 'icon-pingtaiduijie',
         status: 1,
         showPage: ['platform'],
         permissions: [
@@ -3882,7 +3882,7 @@ export default [
         name: '操作记录',
         code: 'iot-card/Record',
         url: '/iot-card/Record',
-        icon: 'icon-rizhifuwu',
+        icon: 'icon-tongzhijilu',
         status: 1,
         showPage: ['network-card'],
         permissions: [

src/pages/system/Permission/Save/index.tsx

@@ -76,18 +76,42 @@ const Save = (props: Props) => {
         'x-component-props': {
           placeholder: '请输入标识(ID)',
         },
+        'x-disabled': model === 'edit',
         name: 'id',
         'x-decorator-props': {
           tooltip: <div>标识ID需与代码中的标识ID一致</div>,
         },
         'x-validator': [
           {
+            required: true,
+            message: '请输入标识(ID)',
+          },
+          {
             max: 64,
             message: '最多可输入64个字符',
           },
           {
-            required: true,
-            message: '请输入标识(ID)',
+            triggerType: 'onBlur',
+            validator: (value: string) => {
+              return new Promise((resolve) => {
+                if (!value) resolve('');
+                service
+                  .validateField({ id: value })
+                  .then((resp) => {
+                    if (resp.status === 200) {
+                      if (resp.result.passed) {
+                        resolve('');
+                      } else {
+                        resolve(model === 'edit' ? '' : resp.result.reason);
+                      }
+                    }
+                    resolve('');
+                  })
+                  .catch(() => {
+                    return '验证失败!';
+                  });
+              });
+            },
           },
         ],
       },
@@ -253,7 +277,7 @@ const Save = (props: Props) => {
   };
 
   const save = async () => {
-    const value = await form.submit<UserItem>();
+    const value = await form.submit<PermissionItem>();
     let response = undefined;
     if (props.model === 'add') {
       response = await service.save(value);

src/pages/system/Permission/service.ts

@@ -32,6 +32,12 @@ class Service extends BaseService<PermissionItem> {
         }),
       ),
     ).pipe(map((item) => item));
+
+  public validateField = (data: any) =>
+    request(`/${SystemConst.API_BASE}/permission/id/_validate`, {
+      method: 'GET',
+      params: data,
+    });
 }
 
 export default Service;