更新版本日志

src/components/Colophon/colContent.jsx

+/* eslint-disable prettier/prettier */
 import React, { useState } from 'react';
 import { Timeline, Tabs } from 'antd';
 import { useHistory } from 'react-router-dom';
@@ -27,6 +28,95 @@ const ColConen = () => {
 };
 
 const arr = [
+  {
+    key: '8',
+    label: 'v6.0.20211224 ',
+    content: (
+      <div className={styles.hr}>
+        <div className={styles.topBox}>
+          <div className={styles.topl}>v6.0.20211224</div>
+          <div className={styles.topr}>2021-12-24</div>
+        </div>
+        <hr />
+        <h3>用户管理</h3>
+        <ul>
+          <li>【新增】 支持菜单拖拽</li>
+        </ul>
+        <h3>角色管理</h3>
+        <ul>
+          <li>【新增】 支持菜单拖拽</li>
+        </ul>
+        <h3>站点管理</h3>
+        <ul>
+          <li>【新增】 支持菜单拖拽</li>
+        </ul>
+        <h3>消息平台</h3>
+        <ul>
+          <li>【新增】 推送测试界面右侧添加已选人员列表</li>
+          <li>【优化】 重构推送方案配置中推送组配置界面</li>
+          <li>【新增】 新增编辑推送方案的交互</li>
+        </ul>
+        <h3>表/字段</h3>
+        <ul>
+          <li>【新增】 重构表字段验证弹窗</li>
+          <li>【新增】 添加了maxLength字段</li>
+        </ul>
+        <h3>事件</h3>
+        <ul>
+          <li>【新增】 重写事件模块事件权限模态交互以及界面重构</li>
+        </ul>
+        <h3>web配置</h3>
+        <ul>
+          <li>【新增】 导入导出菜单功能</li>
+        </ul>
+        <h3>网站配置</h3>
+        <ul>
+          <li>
+            【新增】
+            选择主页产品类型（productType）、消息标记（messageMarking）、语音播报（messageVoice）配置、隐藏了通知方式配置
+          </li>
+        </ul>
+        <h3>移动应用配置</h3>
+        <ul>
+          <li>【优化】 菜单管理调整为默认显示</li>
+        </ul>
+      </div>
+    ),
+  },
+  {
+    key: '7',
+    label: 'v6.0.20211210 ',
+    content: (
+      <div className={styles.hr}>
+        <div className={styles.topBox}>
+          <div className={styles.topl}>v6.0.20211210</div>
+          <div className={styles.topr}>2021-12-10</div>
+        </div>
+        <hr />
+        <ul>
+          <li>【优化】 重构运维平台所有功能的选择字段排序逻辑</li>
+          <li>【优化】 抽离运维系统的业务平台菜单，并进行分组</li>
+        </ul>
+        <h3>消息平台</h3>
+        <ul>
+          <li>【新增】 对企业微信的支持</li>
+          <li>【新增】 消息发送测试功能</li>
+        </ul>
+        <h3>宿主管理</h3>
+        <ul>
+          <li>【新增】 网关模块</li>
+        </ul>
+        <h3>web配置</h3>
+        <ul>
+          <li>【优化】 重构菜单拖拽，菜单以及菜单组可跨组拖拽</li>
+        </ul>
+        <h3>数据字典</h3>
+        <ul>
+          <li>【新增】 表格添加拖拽功能</li>
+        </ul>
+      </div>
+    ),
+  },
   {
     key: '6',
     label: 'v6.0.20210603 ',

src/pages/platformCenter/bsmanager/workOrder/AddModal.jsx

@@ -50,11 +50,7 @@ import ChangeAdd from './changeAdd';
 import ChangeEdit from './changeEdit';
 import ChangeImage from './ChangeImage';
 import ModalDrag from '../maintenance/ModalDrag';
-import {
-  PlusOutlined,
-  DownOutlined,
-  InfoCircleOutlined,
-} from '@ant-design/icons';
+import { PlusOutlined, DownOutlined, InfoCircleOutlined } from '@ant-design/icons';
 import { set } from 'immutable';
 import { getRoleGroup } from '@/services/userCenter/roleManage/api';
 
@@ -476,7 +472,7 @@ const AddModal = props => {
   const [editable, setEditable] = useState(false);
   const [ReportFromMobile, setReportFromMobile] = useState(false);
   const [ReportFromWeb, setReportFromWeb] = useState(false);
-  const [chee, setChee] = useState();
+  const [chee, setChee] = useState(0);
 
   const [indeterminate, setIndeterminate] = useState(true);
   const [checkAll, setCheckAll] = useState(true);
@@ -491,7 +487,7 @@ const AddModal = props => {
 
   const [flag, setFlag] = useState(0);
 
-  const [value, setValue] = useState(1); // 单选
+  const [value, setValue] = useState(''); // 单选
   const [types, setTypes] = useState(''); // 弹窗类型
   const [Order, setOrder] = useState(''); // 弹窗类型
   const [Type1, setType1] = useState('');
@@ -604,6 +600,7 @@ const AddModal = props => {
                 setLoading(false);
                 if (res.msg === 'Ok') {
                   form.resetFields();
+                  setValue('');
                   callBackSubmit();
                   notification.success({
                     message: '提示',
@@ -634,6 +631,7 @@ const AddModal = props => {
                 setLoading(false);
                 if (res.msg === 'Ok') {
                   form.resetFields();
+                  setValue('');
                   callBackSubmit();
                   notification.success({
                     message: '提示',
@@ -664,6 +662,9 @@ const AddModal = props => {
   };
 
   useEffect(() => {
+    setValue('');
+    // 关闭时不会调用
+    if (visible) {
       getRole();
       if (type === 'add') {
         setType1(rember1);
@@ -689,16 +690,29 @@ const AddModal = props => {
         form.resetFields();
         setEditable(false);
         setReportFromMobile(false);
-      // setReportFromWeb(false)
       } else if (type === 'edit') {
+        setChee('');
         getEventData1();
         GetCM_Event_QueryEventType({ eventTypeId: formObj.ID }).then(res => {
           if (res.data.root) {
             console.log(res.data.root);
-          form.setFieldsValue({ ...res.data.root });
             setEditable(res.data.root.Editable);
             setReportFromMobile(res.data.root.ReportFromMobile);
             setReportFromWeb(res.data.root.ReportFromWeb);
+            setType1(res.data.root.BusinessType);
+            setInputValue({ ...res.data.root });
+            setOrder(res.data.root.Order);
+            form.setFieldsValue({ ...res.data.root });
+            LoadEventFields({
+              eventTableName: res.data.root.TableName,
+              distinctFields: '',
+            }).then(res => {
+              if (res.data.root) {
+                setNu(res.data.root);
+                setFiled(formateArrDataA(res.data.root, 'group'));
+              }
+            });
+            // 外部字段逻辑处理
             setSummaryValue(res.data.root.outSummaryFields);
             if (res.data.root.outSummaryFields != 0) {
               setSummaryIsShow('inline');
@@ -735,23 +749,27 @@ const AddModal = props => {
             } else {
               setRelatedEventIsShow('none');
             }
-          setInputValue({ ...res.data.root });
-          setOrder(res.data.root.Order);
-          setType1(res.data.root.BusinessType);
-          LoadEventFields({
-            eventTableName: res.data.root.TableName,
-            distinctFields: '',
-          }).then(res => {
-            if (res.data.root) {
-              setNu(res.data.root);
-              setFiled(formateArrDataA(res.data.root, 'group'));
-              console.log(res.data.root);
           }
         });
       }
+      setFlag(0);
+    } else if (type == 'edit') {
+      setEditable(false);
+      setReportFromMobile(false);
+      setReportFromWeb(false);
+      form.resetFields();
+      setValue('');
+      setInputValue({
+        SummaryFields: '',
+        ReportFields: '',
+        DisplayFields: '',
+        EditableFields: '',
+        TransitFields: '',
+        Roles: '',
+        RelatedEventFields: '',
+        pictureFields: '',
       });
     }
-    setFlag(0);
   }, [visible]);
 
   const getRole = () => {
@@ -1321,9 +1339,7 @@ const AddModal = props => {
       return ch;
     } //dealWithOthers(ch);
     //检查是否是多音字,是按多音字处理,不是就直接在strChineseFirstPY字符串中找对应的首字母
-    return oMultiDiff[uni]
-      ? oMultiDiff[uni]
-      : strChineseFirstPY.charAt(uni - 19968);
+    return oMultiDiff[uni] ? oMultiDiff[uni] : strChineseFirstPY.charAt(uni - 19968);
   };
 
   const mkRslt = arr => {
@@ -1373,6 +1389,11 @@ const AddModal = props => {
       title={type === 'add' ? '添加事件类型' : '编辑事件类型'}
       width="600px"
       destroyOnClose
+      // afterClose={() => {
+      //   setEditable(false);
+      //   setReportFromMobile(false);
+      //   setReportFromWeb(false);
+      // }}
       {...props}
       footer={
         <Space>
@@ -1443,11 +1464,7 @@ const AddModal = props => {
               ]}
             >
               <div>
-                <Input
-                  className="ue-editable-select-input"
-                  onChange={inputType}
-                  value={Type1}
-                />
+                <Input className="ue-editable-select-input" onChange={inputType} value={Type1} />
                 <Dropdown
                   placement="bottomRight"
                   style={{ width: '430px' }}
@@ -1480,9 +1497,7 @@ const AddModal = props => {
                       marginTop: '6px',
                     }}
                   >
-                    <DownOutlined
-                      style={{ fontSize: '12px', color: 'rgba(0, 0, 0, 0.25)' }}
-                    />
+                    <DownOutlined style={{ fontSize: '12px', color: 'rgba(0, 0, 0, 0.25)' }} />
                   </div>
                 </Dropdown>
               </div>
@@ -1554,11 +1569,7 @@ const AddModal = props => {
           </Col>
           <Col span={23}>
             <Item label="上报方式" name="CreateMode" labelCol={{ span: 4 }}>
-              <Radio.Group
-                onChange={onChange2}
-                value={value}
-                defaultValue={chee}
-              >
+              <Radio.Group onChange={onChange2} value={value} defaultValue={chee}>
                 <Radio value={0} style={{ marginLeft: '5px' }}>
                   仅上报
                 </Radio>
@@ -1904,20 +1915,12 @@ const AddModal = props => {
             </Item>
           </Col>
           <Col span={24}>
-            <Item
-              label="接口配置"
-              name="InterfaceConfig"
-              labelCol={{ span: 4 }}
-            >
+            <Item label="接口配置" name="InterfaceConfig" labelCol={{ span: 4 }}>
               <Input placeholder="请输入接口配置" />
             </Item>
           </Col>
           <Col span={24}>
-            <Item
-              label="图片表达"
-              name="ImageExpression"
-              labelCol={{ span: 4 }}
-            >
+            <Item label="图片表达" name="ImageExpression" labelCol={{ span: 4 }}>
               <div className={styles.filed_listItem}>
                 <Input
                   style={{ width: '83%' }}
@@ -1962,11 +1965,7 @@ const AddModal = props => {
         characterValue={characterValue}
         formObj={formObj}
       />
-      <ChangeImage
-        visible={isVisible1}
-        callBackSubmit={oKK}
-        onCancel={onCancel1}
-      />
+      <ChangeImage visible={isVisible1} callBackSubmit={oKK} onCancel={onCancel1} />
     </Drawer>
   );
 };