Merge branch 'next' into next-xyh

src/pages/notice/Template/Detail/index.tsx

@@ -218,11 +218,9 @@ const Detail = observer(() => {
                 ?.match(pattern)
                 ?.filter((i: string) => i)
                 .map((item: string) => ({ id: item, type: 'string', format: '--' }));
-            if (idList && idList.length > 0) {
-              form1.setFieldState('variableDefinitions', (state1) => {
-                state1.visible = true;
-              });
-            }
+            form1.setFieldState('variableDefinitions', (state1) => {
+              state1.visible = !!idList && idList.length > 0;
+            });
             if (form1.modified) {
               form1.setValuesIn('variableDefinitions', idList);
             }
@@ -235,8 +233,6 @@ const Detail = observer(() => {
               (index) => `variableDefinitions.${parseInt(index)}.format`,
             );
             const format = field.query(formatPath).take() as any;
-
-            console.log(format, 'format', value);
             if (!format) return;
             switch (value) {
               case 'date':

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

@@ -1,4 +1,4 @@
-import { message, Modal } from 'antd';
+import { message, Modal, Typography } from 'antd';
 import { useMemo } from 'react';
 import { createForm } from '@formily/core';
 import { createSchemaField } from '@formily/react';
@@ -26,9 +26,11 @@ const service = new Service('alarm/config');
 
 const createImageLabel = (image: string, text: string) => {
   return (
-    <div style={{ textAlign: 'center', marginTop: 10, fontSize: '25px' }}>
+    <div style={{ textAlign: 'center', marginTop: 10, fontSize: '15px', width: '90px' }}>
       <img alt="" height="40px" src={image} />
-      {text}
+      <Typography.Text style={{ maxWidth: '50px', marginBottom: 10 }} ellipsis={{ tooltip: text }}>
+        {text}
+      </Typography.Text>
     </div>
   );
 };

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

@@ -1,7 +1,7 @@
-import { Button, InputNumber, Select, Form } from 'antd';
+import { Button, Form, InputNumber, Select } from 'antd';
 import { useEffect, useState } from 'react';
 import { useRequest } from 'umi';
-import { queryMessageType, queryMessageConfig, queryMessageTemplate } from './service';
+import { queryMessageConfig, queryMessageTemplate, queryMessageType } from './service';
 import MessageContent from './messageContent';
 
 interface ActionProps {

src/pages/rule-engine/Scene/Save/action/messageContent.tsx

@@ -1,4 +1,4 @@
-import { Col, Form, Row, Select, TimePicker, Input } from 'antd';
+import { Col, Form, Input, Row, Select, TimePicker } from 'antd';
 import { ItemGroup } from '@/pages/rule-engine/Scene/Save/components';
 
 interface MessageContentProps {

src/pages/rule-engine/Scene/Save/components/TimingTrigger/index.tsx

@@ -1,4 +1,4 @@
-import { Select, Input, TimePicker, InputNumber } from 'antd';
+import { Input, InputNumber, Select, TimePicker } from 'antd';
 import { TimeSelect } from '@/pages/rule-engine/Scene/Save/components';
 import { useState } from 'react';
 

src/pages/rule-engine/Scene/Save2/index.tsx

@@ -1,21 +1,21 @@
 import {
-  FormItem,
-  Editable,
-  Input,
-  Select,
-  Radio,
-  DatePicker,
   ArrayItems,
+  DatePicker,
+  Editable,
   FormButtonGroup,
-  Submit,
-  Space,
-  FormLayout,
   FormGrid,
+  FormItem,
+  FormLayout,
+  Input,
   NumberPicker,
+  Radio,
+  Select,
+  Space,
+  Submit,
 } from '@formily/antd';
-import { createForm, onFieldReact, FieldDataSource, onFieldValueChange } from '@formily/core';
 import type { Field } from '@formily/core';
-import { FormProvider, createSchemaField } from '@formily/react';
+import { createForm, FieldDataSource, onFieldReact, onFieldValueChange } from '@formily/core';
+import { createSchemaField, FormProvider } from '@formily/react';
 import { action } from '@formily/reactive';
 import {
   queryMessageConfig,

src/pages/system/User/ResetPassword/index.tsx

@@ -56,6 +56,7 @@ const ResetPassword = (props: Props) => {
             message: '密码最多可输入128位',
           },
           {
+            min: 8,
             message: '密码不能少于6位',
           },
           {
@@ -82,8 +83,8 @@ const ResetPassword = (props: Props) => {
             message: '密码最多可输入128位',
           },
           {
-            min: 6,
-            message: '密码不能少于6位',
+            min: 8,
+            message: '密码不能少于8位',
           },
           {
             required: true,
@@ -119,6 +120,7 @@ const ResetPassword = (props: Props) => {
           const resp = await service.resetPassword(props.data.id, value.confirmPassword);
           if (resp.status === 200) {
             message.success('操作成功');
+            props.close();
           }
         }
         props.close();

src/utils/menu/index.ts

@@ -1,8 +1,8 @@
 // 路由components映射
 import type { IRouteProps } from 'umi';
 import type { MenuItem } from '@/pages/system/Menu/typing';
-import { getDetailNameByCode, MENUS_CODE } from './router';
 import type { BUTTON_PERMISSION, MENUS_CODE_TYPE } from './router';
+import { getDetailNameByCode, MENUS_CODE } from './router';
 
 /** localStorage key */
 export const MENUS_DATA_CACHE = 'MENUS_DATA_CACHE';