Sfoglia il codice sorgente

Merge wzy

Next wzy
XieYongHong 3 anni fa
parent
commit
4d612aa388

+ 1 - 1
src/pages/init-home/index.tsx

@@ -29,7 +29,7 @@ const InitHome = () => {
   };
 
   useEffect(() => {
-    document.title = '';
+    document.title = '系统初始化';
     service.getInit().then((res) => {
       if (res.status === 200 && res.result.length) {
         // jump()

+ 18 - 2
src/pages/link/Channel/Modbus/index.tsx

@@ -264,7 +264,15 @@ const NewModbus = () => {
           style={{ padding: 0 }}
           disabled={record.state.value === 'enabled'}
           popConfirm={{
-            title: '确认删除',
+            title: (
+              <div
+                style={{
+                  width: 185,
+                }}
+              >
+                该点位已被设备绑定,删除后将清空与设备的绑定关系,确定要删除吗?
+              </div>
+            ),
             disabled: record.state.value === 'enabled',
             onConfirm: async () => {
               const resp: any = await service.deletePoint(record.id);
@@ -461,7 +469,15 @@ const NewModbus = () => {
                             title: item.state.value === 'enabled' ? '请先禁用该通道,再删除。' : '',
                           }}
                           popConfirm={{
-                            title: '确认删除',
+                            title: (
+                              <div
+                                style={{
+                                  width: 190,
+                                }}
+                              >
+                                该通道已被设备绑定,删除后将清空与设备的绑定关系,确定要删除吗?
+                              </div>
+                            ),
                             disabled: item.state.value === 'enabled',
                             onConfirm: async () => {
                               deteleMaster(item.id);

+ 9 - 1
src/pages/notice/Config/Detail/index.tsx

@@ -35,6 +35,7 @@ import { PermissionButton } from '@/components';
 import usePermissions from '@/hooks/permission';
 import FAutoComplete from '@/components/FAutoComplete';
 import Webhook from './doc/Webhook';
+import { useModel } from '@@/plugin-model/useModel';
 
 export const docMap = {
   weixin: {
@@ -61,7 +62,7 @@ export const docMap = {
 
 const Detail = observer(() => {
   const { id } = useParams<{ id: string }>();
-
+  const { initialState } = useModel('@@initialState');
   const [provider, setProvider] = useState<string>('embedded');
   const form = useMemo(
     () =>
@@ -91,6 +92,13 @@ const Detail = observer(() => {
   );
 
   useEffect(() => {
+    setTimeout(() => {
+      if (initialState?.settings?.title) {
+        document.title = `通知配置 - ${initialState?.settings?.title}`;
+      } else {
+        document.title = '通知配置';
+      }
+    }, 0);
     if (id === 'webhook') {
       setProvider('http');
     }

+ 9 - 0
src/pages/notice/Template/Detail/index.tsx

@@ -48,6 +48,7 @@ import { PermissionButton } from '@/components';
 import usePermissions from '@/hooks/permission';
 import FMonacoEditor from '@/components/FMonacoEditor';
 import Webhook from './doc/Webhook';
+import { useModel } from '@@/plugin-model/useModel';
 
 export const docMap = {
   weixin: {
@@ -75,6 +76,7 @@ export const docMap = {
 const Detail = observer(() => {
   const { id } = useParams<{ id: string }>();
   const [provider, setProvider] = useState<string>('embedded');
+  const { initialState } = useModel('@@initialState');
   // 正则提取${}里面的值
   const pattern = /(?<=\$\{).*?(?=\})/g;
 
@@ -389,6 +391,13 @@ const Detail = observer(() => {
   );
 
   useEffect(() => {
+    setTimeout(() => {
+      if (initialState?.settings?.title) {
+        document.title = `通知模板 - ${initialState?.settings?.title}`;
+      } else {
+        document.title = '通知模板';
+      }
+    }, 0);
     if (state.current) {
       form.setValues(state.current);
     }

+ 6 - 1
src/pages/system/Platforms/save.tsx

@@ -228,6 +228,7 @@ export default (props: SaveProps) => {
             'x-decorator-props': {
               gridSpan: 1,
             },
+
             'x-reactions': [
               {
                 dependencies: ['.confirm_password'],
@@ -241,6 +242,10 @@ export default (props: SaveProps) => {
             ],
             'x-validator': [
               {
+                max: 64,
+                message: '最多可输入64个字符',
+              },
+              {
                 triggerType: 'onBlur',
                 validator: (value: string) => {
                   return new Promise((resolve) => {
@@ -457,7 +462,7 @@ export default (props: SaveProps) => {
         onlyMessage('操作成功');
       }
     }
-  }, [props.type]);
+  }, [props.type, form]);
 
   return (
     <Modal