模态更改

internals/webpack/webpack.base.babel.js

@@ -211,7 +211,7 @@ module.exports = options => ({
     alias: {
       '@': path.resolve(process.cwd(), './src'),
       components: path.resolve(process.cwd(), './src/components'),
-      cesium: path.resolve(process.cwd(), cesiumSource ),
+      cesium: path.resolve(process.cwd(), cesiumSource),
     },
   },
   devtool: options.devtool,

package.json

@@ -101,7 +101,7 @@
     "dragm": "^0.0.5",
     "express": "4.16.4",
     "fontfaceobserver": "2.1.0",
-    "gojs": "^2.1.37",
+    "gojs": "2.1.49",
     "history": "4.9.0",
     "hoist-non-react-statics": "3.3.0",
     "immer": "3.0.0",
@@ -114,6 +114,7 @@
     "prop-types": "15.7.2",
     "react": "16.8.6",
     "react-ace": "^9.2.0",
+    "react-copy-to-clipboard": "^5.0.4",
     "react-dom": "16.8.6",
     "react-grid-layout": "^1.2.5",
     "react-helmet": "6.0.0-beta",

patches/gojs+2.1.49.patch

 diff --git a/node_modules/gojs/release/go.js b/node_modules/gojs/release/go.js
-index 2c43470..f518a15 100644
+index 2c43470..06cf0ce 100644
 --- a/node_modules/gojs/release/go.js
 +++ b/node_modules/gojs/release/go.js
 @@ -803,7 +803,7 @@ R.prototype.findObjectsNear=R.prototype.Eg;R.prototype.findPartsNear=R.prototype
@@ -7,7 +7,7 @@ index 2c43470..f518a15 100644
  var He=null,vi=new H,Pi=null,Oi=null,Wg=void 0!==x.document,Ei=null,Fi="",Lh=new D(R,"None",0),cj=new D(R,"Uniform",1),dj=new D(R,"UniformToFill",2),Of=new D(R,"CycleAll",10),Sf=new D(R,"CycleNotDirected",11),Uf=new D(R,"CycleNotDirectedFast",12),Vf=new D(R,"CycleNotUndirected",13),Pf=new D(R,"CycleDestinationTree",14),Rf=new D(R,"CycleSourceTree",15),Zh=new D(R,"DocumentScroll",1),ai=new D(R,"InfiniteScroll",2),ui=new D(R,"TreeParentCollapsed",21),Ik=new D(R,"AllParentsCollapsed",22),Jk=new D(R,
  "AnyParentsCollapsed",23),Kk=new E,Lk="2.1.49",Fk="image",Mk=null,ri=!1;
 -function si(){if(Wg){var a=x.document.createElement("canvas"),b=a.getContext("2d"),c=Sa("7ca11abfd022028846");b[c]=Sa("398c3597c01238");for(var d=["5da73c80a36455d5038e4972187c3cae51fd22",ra.Dx+"4ae6247590da4bb21c324ba3a84e385776",rd.xF+"fb236cdfda5de14c134ba1a95a2d4c7cc6f93c1387",L.za],e=1;5>e;e++)b[Sa("7ca11abfd7330390")](Sa(d[e-1]),10,15*e);b[c]=Sa("39f046ebb36e4b");for(c=1;5>c;c++)b[Sa("7ca11abfd7330390")](Sa(d[c-1]),10,15*c);if(4!==d.length||"5"!==d[0][0]||"7"!==d[3][0])rd.prototype.Kd=rd.prototype.Yx;
-+function si(){if(Wg){var a=x.document.createElement("canvas"),b=a.getContext("2d"),c=Sa("7ca11abfd022028846");b[c]=Sa("398c3597c01238");for(var d=["5da73c80a36455d5038e4972187c3cae51fd22",ra.Dx+"4ae6247590da4bb21c324ba3a84e385776",rd.xF+"fb236cdfda5de14c134ba1a95a2d4c7cc6f93c1387",L.za],e=1;5>e;e++)/*b[Sa("7ca11abfd7330390")](Sa(d[e-1]),10,15*e);*/Sa(d[e-1]);b[c]=Sa("39f046ebb36e4b");for(c=1;5>c;c++)/*b[Sa("7ca11abfd7330390")](Sa(d[c-1]),10,15*c);*/Sa(d[c-1]);if(4!==d.length||"5"!==d[0][0]||"7"!==d[3][0])rd.prototype.Kd=rd.prototype.Yx;
++function si(){if(Wg){var a=x.document.createElement("canvas"),b=a.getContext("2d"),c=Sa("7ca11abfd022028846");b[c]=Sa("398c3597c01238");for(var d=["5da73c80a36455d5038e4972187c3cae51fd22",ra.Dx+"4ae6247590da4bb21c324ba3a84e385776",rd.xF+"fb236cdfda5de14c134ba1a95a2d4c7cc6f93c1387",L.za],e=1;5>e;e++)/*b[Sa("7ca11abfd7330390")](Sa(d[e-1]),10,15*e);*/Sa(d[e-1]); b[c]=Sa("39f046ebb36e4b");for(c=1;5>c;c++)/*b[Sa("7ca11abfd7330390")](Sa(d[c-1]),10,15*c);*/Sa(d[c-1]); if(4!==d.length||"5"!==d[0][0]||"7"!==d[3][0])rd.prototype.Kd=rd.prototype.Yx;
  Mk=a}}R.className="Diagram";R.fromDiv=function(a){var b=a;"string"===typeof a&&(b=x.document.getElementById(a));return b instanceof HTMLDivElement&&b.B instanceof R?b.B:null};R.inherit=function(a,b){function c(){}if(Object.getPrototypeOf(a).prototype)throw Error("Used go.Diagram.inherit defining already defined class \n"+a);c.prototype=b.prototype;a.prototype=new c;a.prototype.constructor=a};R.None=Lh;R.Uniform=cj;R.UniformToFill=dj;R.CycleAll=Of;R.CycleNotDirected=Sf;R.CycleNotDirectedFast=Uf;
  R.CycleNotUndirected=Vf;R.CycleDestinationTree=Pf;R.CycleSourceTree=Rf;R.DocumentScroll=Zh;R.InfiniteScroll=ai;R.TreeParentCollapsed=ui;R.AllParentsCollapsed=Ik;R.AnyParentsCollapsed=Jk;function Ci(){this.jz=null;this.l="zz@orderNum";"63ad05bbe23a1786468a4c741b6d2"===this._tk?this.We=this.l=!0:this.We=null}
  function zj(a,b){b.Gb.setTransform(b.Tb,0,0,b.Tb,0,0);if(null===a.We){b="f";var c=x[Sa("76a715b2f73f148a")][Sa("72ba13b5")];a.We=!0;if(Wg){var d=R[Sa("76a115b6ed251eaf4692")];if(d)for(var e=Kk.iterator;e.next();){d=e.value;d=Sa(d).split(Sa("39e9"));if(6>d.length)break;var f=Sa(d[1]).split(".");if("7da71ca0"!==d[4])break;var g=Sa(ra[Sa("6cae19")]).split(".");if(f[0]>g[0]||f[0]===g[0]&&f[1]>=g[1]){f=c[Sa("76ad18b4f73e")];for(g=c[Sa("73a612b6fb191d")](Sa("35e7"))+2;g<f;g++)b+=c[g];f=b[Sa("73a612b6fb191d")](Sa(d[2]));

src/containers/App/index.js

@@ -7,15 +7,30 @@ import Authozed from '@/utils/authority';
 import UserLogin from '@/pages/user/login';
 import UserLayout from '@/layouts/UserLayout';
 import { AUTHORITY, BASENAME } from '@/utils/constants';
+import { Modal } from 'antd';
 import { PictureWallProvider } from '@/components/Upload/context';
 export default appConnector(function App(props) {
   const { routesConfig } = props;
+  const getConfirmation = (msg, callBack) => {
+    Modal.confirm({
+      title: '确认',
+      content: msg,
+      okText: '确认',
+      cancelText: '取消',
+      onOk() {
+        callBack(true);
+      },
+      onCancel() {
+        callBack(false);
+      },
+    });
+  };
   return (
     <>
       <Helmet titleTemplate="%s - 运维平台" defaultTitle="运维平台">
         <meta name="description" content="运维平台" />
       </Helmet>
-      <Router basename={BASENAME}>
+      <Router basename={BASENAME} getUserConfirmation={getConfirmation}>
         <Authozed
           noMatch={
             <UserLayout>

src/pages/dataCenter/dictionary1/AppDic.js

@@ -13,8 +13,18 @@ import {
   message,
 } from 'antd';
 import { get, CITY_SERVICE, PUBLISH_SERVICE } from '@/services';
-import { GetKeyValue, EditKeyValue, DeleteKeyValue, AddKeyValue } from '@/services/dataCenter/api'
-import { EditTwoTone, DeleteOutlined, PlusSquareOutlined, SyncOutlined } from '@ant-design/icons';
+import {
+  GetKeyValue,
+  EditKeyValue,
+  DeleteKeyValue,
+  AddKeyValue,
+} from '@/services/dataCenter/api';
+import {
+  EditTwoTone,
+  DeleteOutlined,
+  PlusSquareOutlined,
+  SyncOutlined,
+} from '@ant-design/icons';
 import styles from './AppDic.less';
 
 const AppDic = () => {
@@ -127,10 +137,9 @@ const AppDic = () => {
     //     setLoading(false);
     //     message.error(err);
     //   });
-    GetKeyValue({}).then(
-      resnew => {
+    GetKeyValue({}).then(resnew => {
       if (resnew.code == 0) {
-          let res = resnew.data
+        let res = resnew.data;
         if (res.length > 0) {
           res.map(item => {
             item.key = item.id;
@@ -145,8 +154,7 @@ const AppDic = () => {
         });
       }
       setLoading(false);
-      }
-    )
+    });
   };
   // 提交-添加
   const submitAdd = () => {
@@ -185,8 +193,7 @@ const AppDic = () => {
         key,
         value,
         desc: description,
-      }).then(
-        res => {
+      }).then(res => {
         if (res.code == 0) {
           setAddVisible(false);
           getData();
@@ -199,10 +206,7 @@ const AppDic = () => {
             description: res.msg,
           });
         }
-        }
-      )
-
-
+      });
     } else {
       notification.error({
         message: '提交失败',
@@ -212,8 +216,7 @@ const AppDic = () => {
   };
   // 提交-重置
   const submitReset = () => {
-    get(`${PUBLISH_SERVICE}/DataManger/ResetKeyValue`, {
-    })
+    get(`${PUBLISH_SERVICE}/DataManger/ResetKeyValue`, {})
       .then(res => {
         if (res.code === 0) {
           getData();
@@ -230,7 +233,6 @@ const AppDic = () => {
       .catch(err => {
         message.error(err);
       });
-
   };
   // 提交-编辑
   const submitEdit = () => {
@@ -271,8 +273,7 @@ const AppDic = () => {
         key,
         value,
         desc: description,
-      }).then(
-        res => {
+      }).then(res => {
         if (res.code == 0) {
           setEditVisible(false);
           getData();
@@ -285,8 +286,7 @@ const AppDic = () => {
             description: res.msg,
           });
         }
-        }
-      )
+      });
     } else {
       notification.error({
         message: '提交失败',
@@ -320,8 +320,7 @@ const AppDic = () => {
 
     DeleteKeyValue({
       key: select.Key,
-    }).then(
-      res => {
+    }).then(res => {
       if (res.code === 0) {
         getData(select.parentID);
         notification.success({
@@ -333,8 +332,7 @@ const AppDic = () => {
           description: res.msg,
         });
       }
-      }
-    )
+    });
   };
 
   const pagination = {
@@ -343,7 +341,7 @@ const AppDic = () => {
     defaultPageSize: 20,
     showQuickJumper: true,
     showSizeChanger: true,
-  }
+  };
   return (
     <div className={styles.AppDic}>
       <Spin spinning={loading} tip="loading...">
@@ -352,11 +350,11 @@ const AppDic = () => {
             marginBottom: '10px',
             fontSize: '16px',
             height: 'calc(100vh-200px)',
-            display:'flex',
-            alignItems:'center'
+            display: 'flex',
+            alignItems: 'center',
           }}
         >
-          <span >数据字典</span>
+          <span>数据字典</span>
           <Tooltip title="添加">
             <PlusSquareOutlined
               onClick={() => {
@@ -367,7 +365,7 @@ const AppDic = () => {
                 color: '#1890FF',
                 fontSize: '20px',
                 marginRight: '22px',
-                marginLeft: '90%'
+                marginLeft: '90%',
               }}
             />
           </Tooltip>
@@ -385,7 +383,7 @@ const AppDic = () => {
                   fontSize: '20px',
                   verticalAlign: 'text-bottom',
                   marginRight: '30px',
-                  float: 'right'
+                  float: 'right',
                 }}
               />
             </Tooltip>

src/pages/dataCenter/dictionary1/index.js

@@ -28,7 +28,6 @@ const dictionary1 = () => {
         </Tabs>
       </Card>
     </PageContainer>
-    
   );
 };
 

src/pages/database/ManagementDataBase.jsx

@@ -9,6 +9,7 @@ import {
   notification,
   Spin,
 } from 'antd';
+import copy from 'copy-to-clipboard';
 import PageContainer from '@/components/BasePageContainer';
 import styles from './ManagementDataBase.less';
 import {
@@ -177,6 +178,22 @@ const ManagementDataBase = () => {
     // setContent(text);
     setContent(arr);
   };
+  // 复制SQL
+  const copySql = text => {
+    if (copy(text)) {
+      notification.success({
+        message: '提示',
+        duration: 3,
+        description: '复制成功',
+      });
+    } else {
+      notification.error({
+        message: '提示',
+        duration: 3,
+        description: '复制失败',
+      });
+    }
+  };
   const autoCheckColumns = [
     {
       title: '表名称',
@@ -212,6 +229,16 @@ const ManagementDataBase = () => {
       key: 'Message',
       ellipsis: true,
     },
+    {
+      title: 'SQL语句',
+      dataIndex: 'DiffSql',
+      key: 'DiffSql',
+      render: text => (
+        <Button size="small" type="primary" onClick={() => copySql(text)}>
+          复制SQL
+        </Button>
+      ),
+    },
   ];
   const logColumns = [
     {

src/pages/log/loginLog/index.js

@@ -27,7 +27,7 @@ const LoginLog = () => {
   const [endTime, setEndTime] = useState(
     moment(new Date(), 'YYYY-MM-DD HH:mm:ss'), // 默认值当前时间
   );
-  const [filteredValue,setFilteredValue] =useState([])
+  const [filteredValue, setFilteredValue] = useState([]);
 
   const columns = [
     // {
@@ -47,7 +47,7 @@ const LoginLog = () => {
       key: 'LoginName',
       filters: LoginNameFilters,
       onFilter: (value, record) => record.LoginName === value,
-      filteredValue
+      filteredValue,
     },
     {
       title: '用户名',
@@ -55,7 +55,7 @@ const LoginLog = () => {
       key: 'ShowName',
       filters: ShowNameFilters,
       onFilter: (value, record) => record.ShowName === value,
-      filteredValue
+      filteredValue,
     },
     {
       title: '系统类型',
@@ -63,7 +63,7 @@ const LoginLog = () => {
       key: 'SystemType',
       filters: SystemTypeFilters,
       onFilter: (value, record) => record.SystemType === value,
-      filteredValue
+      filteredValue,
     },
     // {
     //   title: '终端',
@@ -133,14 +133,14 @@ const LoginLog = () => {
       ),
     );
   };
-  const handleReset = () =>{
-    setStartTime(moment().startOf('week'))
-    setFilteredValue([])
-  }
-  const onChangeInput =(filters) =>{
-    console.log('filters',filters);
-    setFilteredValue(filters.LoginName,filters.ShowName,filters.SystemType)
-  }
+  const handleReset = () => {
+    setStartTime(moment().startOf('week'));
+    setFilteredValue([]);
+  };
+  const onChangeInput = filters => {
+    console.log('filters', filters);
+    setFilteredValue(filters.LoginName, filters.ShowName, filters.SystemType);
+  };
   return (
     <>
       <div className={styles.loginLog}>
@@ -171,7 +171,15 @@ const LoginLog = () => {
             <Button onClick={() => setTime(24 * 7)}>近1周</Button>
             <Button onClick={() => setTime(14 * 24)}>近2周</Button>
             <Button onClick={() => setTime(30 * 24)}>近1月</Button>
-            <Button icon={<SyncOutlined className={styles.icon}/>} onClick={handleReset} style={{ marginLeft: '25px', verticalAlign:'middle', marginTop:'-3px' }}>
+            <Button
+              icon={<SyncOutlined className={styles.icon} />}
+              onClick={handleReset}
+              style={{
+                marginLeft: '25px',
+                verticalAlign: 'middle',
+                marginTop: '-3px',
+              }}
+            >
               重置
             </Button>
           </Col>

src/pages/log/omsLog/index.js

@@ -13,7 +13,7 @@ import {
 } from 'antd';
 import { SwapRightOutlined, SyncOutlined } from '@ant-design/icons';
 import moment from 'moment';
-import { get,PUBLISH_SERVICE } from '@/services/index';
+import { get, PUBLISH_SERVICE } from '@/services/index';
 import styles from './index.less';
 
 const OmsLog = () => {
@@ -23,7 +23,7 @@ const OmsLog = () => {
   const [functionName, setFunctionName] = useState(''); // 接口名称筛选
   const [label, setLabel] = useState(''); // 标签筛选
   const [startTime, setStartTime] = useState(moment().startOf('week')); // 默认值当天0点
-  const [filteredValue,setFilteredValue] =useState([])
+  const [filteredValue, setFilteredValue] = useState([]);
   const [endTime, setEndTime] = useState(
     moment(new Date(), 'YYYY-MM-DD HH:mm:ss'), // 默认值当前时间
   );
@@ -105,10 +105,10 @@ const OmsLog = () => {
       function: functionName,
       label,
       PageIndex: 1,
-      PageSize: 1000 
+      PageSize: 1000,
     })
       .then(res => {
-        if (res.code===0) {
+        if (res.code === 0) {
           // setData(res.root.filter(item => item.label!=="ServiceInput"&&item.label!=="ServiceReturn"));
           if (!res.data) {
             setData([]);
@@ -120,13 +120,12 @@ const OmsLog = () => {
                 return item;
               }),
             );
-              console.log(result)
+            console.log(result);
             // 过滤优先级
             let arr1 = result.map(item => item.Level);
             arr1 = arr1.filter((value, index) => arr1.indexOf(value) === index);
             setLevelFilters(arr1.map(item => ({ text: item, value: item })));
           }
-            
         } else {
           notification.error({
             message: '数据获取失败',
@@ -157,17 +156,17 @@ const OmsLog = () => {
       ),
     );
   };
-  const handleReset =() =>{
-    setStartTime(moment().startOf('week'))
-    setEndTime(moment(new Date(), 'YYYY-MM-DD HH:mm:ss'))
-    setFunctionName('')
-    setFilteredValue([])
-    setLabel('')
-  }
-  const onChangeInput =(filters)=>{
-    console.log('filters',filters);
-    setFilteredValue(filters.Level)
-  }
+  const handleReset = () => {
+    setStartTime(moment().startOf('week'));
+    setEndTime(moment(new Date(), 'YYYY-MM-DD HH:mm:ss'));
+    setFunctionName('');
+    setFilteredValue([]);
+    setLabel('');
+  };
+  const onChangeInput = filters => {
+    console.log('filters', filters);
+    setFilteredValue(filters.Level);
+  };
   return (
     <>
       <div className={styles.omsLog}>
@@ -218,12 +217,20 @@ const OmsLog = () => {
             />
             <Button
               type="primary"
-              style={{ marginLeft: '10px'}}
+              style={{ marginLeft: '10px' }}
               onClick={getData}
             >
               查询
             </Button>
-            <Button icon={<SyncOutlined className={styles.icon}/>} onClick={handleReset} style={{ marginLeft: '25px', verticalAlign:'middle', marginTop:'-3px' }}>
+            <Button
+              icon={<SyncOutlined className={styles.icon} />}
+              onClick={handleReset}
+              style={{
+                marginLeft: '25px',
+                verticalAlign: 'middle',
+                marginTop: '-3px',
+              }}
+            >
               重置
             </Button>
           </Col>

src/pages/log/serviceLog/index.js

@@ -251,7 +251,7 @@ const ServiceLog = () => {
     setStartTime(moment().startOf('week'));
     setEndTime(moment(new Date(), 'YYYY-MM-DD HH:mm:ss'));
     setSearchWord('');
-  }
+  };
   return (
     <>
       <div className={styles.serviceLog}>
@@ -282,7 +282,12 @@ const ServiceLog = () => {
             <Button onClick={() => setTime(24 * 60, '3')}>近1天</Button>
             <Button onClick={() => setTime(24 * 7 * 60, '4')}>近1周</Button>
             <span style={{ marginLeft: '20px' }}>返回状态：</span>
-            <Select defaultValue='全部' value={logType} onChange={changeStatus} className={styles.sel}>
+            <Select
+              defaultValue="全部"
+              value={logType}
+              onChange={changeStatus}
+              className={styles.sel}
+            >
               <Option value="9999">全部</Option>
               <Option value="0">正常</Option>
               <Option value="-1">异常</Option>
@@ -298,7 +303,15 @@ const ServiceLog = () => {
               enterButton
               value={searchWord}
             />
-            <Button icon={<SyncOutlined className={styles.icon}/>} onClick={handleReset} style={{ marginLeft: '25px', verticalAlign:'middle', marginTop:'-3px' }}>
+            <Button
+              icon={<SyncOutlined className={styles.icon} />}
+              onClick={handleReset}
+              style={{
+                marginLeft: '25px',
+                verticalAlign: 'middle',
+                marginTop: '-3px',
+              }}
+            >
               重置
             </Button>
           </Col>
@@ -306,7 +319,9 @@ const ServiceLog = () => {
         <Spin spinning={loading} tip="loading">
           <Row style={{ background: 'white' }}>
             <Col span={8} style={{ paddingTop: '8px', paddingLeft: '5px' }}>
-              <span style={{ fontSize: '14px', fontWeight: '600' }}>访问量统计</span>
+              <span style={{ fontSize: '14px', fontWeight: '600' }}>
+                访问量统计
+              </span>
               <span style={{ paddingLeft: '60%' }}>间隔：</span>
               <Select
                 defaultValue="每小时"
@@ -322,10 +337,14 @@ const ServiceLog = () => {
               </Select>
             </Col>
             <Col span={7} offset={1} style={{ paddingTop: '8px' }}>
-              <span style={{ fontSize: '14px', fontWeight: '600' }}>接口调用频次统计</span>
+              <span style={{ fontSize: '14px', fontWeight: '600' }}>
+                接口调用频次统计
+              </span>
             </Col>
             <Col span={7} offset={1} style={{ paddingTop: '8px' }}>
-              <span style={{ fontSize: '14px', fontWeight: '600' }}>接口平均耗时统计</span>
+              <span style={{ fontSize: '14px', fontWeight: '600' }}>
+                接口平均耗时统计
+              </span>
             </Col>
           </Row>
           <Row className={styles.chart}>
@@ -339,10 +358,15 @@ const ServiceLog = () => {
                 renderer="svg"
                 scale={{
                   Count: { alias: '计数' },
-                  StartTime: { alias: '访问开始时间'}
+                  StartTime: { alias: '访问开始时间' },
                 }}
               >
-                <Axis name="StartTime" label="" title={{ offset: 20 }} className={styles.fontColor} />
+                <Axis
+                  name="StartTime"
+                  label=""
+                  title={{ offset: 20 }}
+                  className={styles.fontColor}
+                />
                 <Axis name="Count" title />
                 <Line shape="smooth" position="StartTime*Count" />
                 <Tooltip shared lock />
@@ -361,7 +385,12 @@ const ServiceLog = () => {
                   Path: { alias: '接口调用频次' },
                 }}
               >
-                <Axis name="Path" label="" title={{ offset: 20 }} className={styles.fontColor}/>
+                <Axis
+                  name="Path"
+                  label=""
+                  title={{ offset: 20 }}
+                  className={styles.fontColor}
+                />
                 <Axis name="Count" title />
                 <Interval position="Path*Count" />
                 <Tooltip shared lock />

src/pages/mobileConfig/addConfig.jsx

@@ -9,7 +9,7 @@ import PicturesWall from '@/components/Upload/index';
 const { Item } = Form;
 const { Option } = Select;
 const AddConfig = props => {
-  const { miniTitle, submitCallback, subType, addCallback } = props;
+  const { miniTitle, submitCallback, subType, addCallback, singleList } = props;
   console.log(subType, 'ubType');
   const [config, setConfig] = useState(''); // 网站配置信息
   const [loginList, setLoginList] = useState([
@@ -40,6 +40,19 @@ const AddConfig = props => {
   const submit = value => {
     form.validateFields().then(valid => {
       if (valid) {
+        if (
+          singleList.some(
+            item =>
+              item.text === valid.title || item.id.slice(6) === valid.client,
+          )
+        ) {
+          notification.error({
+            message: '提示',
+            duration: 3,
+            description: '应用名称跟类别不能重复',
+          });
+          return;
+        }
         setLoading(true);
         const obj = { ...form.getFieldsValue() };
         let params = { ...obj, mode: 'single' };

src/pages/mobileConfig/index.js

@@ -262,7 +262,11 @@ const MobileConfigPage = props => {
         }}
         visible={addVisible}
       >
-        <AddConfig addCallback={addCallback} submitCallback={submitCallback} />
+        <AddConfig
+          addCallback={addCallback}
+          submitCallback={submitCallback}
+          singleList={singleList}
+        />
       </Drawer>
     </PageContainer>
   );

src/pages/mobileConfig/menuconfig/miniMenu.jsx

@@ -293,7 +293,7 @@ const MiniMenu = props => {
     //   obj.relatedRoleList = String(roleList) || '';
     // }
     console.log(obj);
-    const parentID = item.menuID ? item.menuID : -1;
+    const parentID = item.menuID ? item.menuID : '-1';
     addMenu({
       _dc: Date.now(),
       parentID,
@@ -431,13 +431,13 @@ const MiniMenu = props => {
 
     dragMenu({
       menuID: obj.id,
-      newParentID: obj.parentId || -1,
+      newParentID: obj.parentId.toString() || '-1',
       menuList: String(arrList) || '',
       _version: 9999,
       _dc: Date.now(),
     }).then(res => {
       console.log(res);
-      if (res.success) {
+      if (res.code === 0) {
         setFlag(flag + 1);
       } else {
         notification.error({

src/pages/platformCenter/bsmanager/maintenance/ModalDrag.js

@@ -5,23 +5,24 @@
  * @LastEditTime: 2021-10-11 10:21:35
  * @LastEditors: leizhe
  */
-import React, {PureComponent } from "react";
-import DragM from "dragm";
+import React, { PureComponent } from 'react';
+import DragM from 'dragm';
 
 export default class ModalDrag extends PureComponent {
-    updateTransform = transformStr =>{
+  updateTransform = transformStr => {
     this.modalDom.style.transform = transformStr;
-
   };
-    componentDidMount(){ 
-        this.modalDom = document.getElementsByClassName("ant-modal-wrap")[0]
+
+  componentDidMount() {
+    this.modalDom = document.getElementsByClassName('ant-modal-wrap')[0];
   }
-    render(){
-        const {title} = this.props;
+
+  render() {
+    const { title } = this.props;
     return (
       <DragM updateTransform={this.updateTransform}>
         <div>{title}</div>
       </DragM>
-        )
+    );
   }
 }

src/pages/platformCenter/bsmanager/tablemanager/components/Field/index.less

@@ -6,7 +6,7 @@
     max-height: 20rem;
     overflow-y: scroll;
     .ant-card{
-        width: 80%;
+        width: 83%;
         margin-left: 4rem;
     }
     .ant-card-head-title{

src/pages/platformCenter/bsmanager/tablemanager/index.jsx

@@ -216,7 +216,7 @@ const TableManager = (props) => {
                 align: 'center'
             },
             {
-                title: '字段数量',
+                title: '附加字段',
                 dataIndex: 'fieldCount',
                 key: 'fieldCount',
                 align: 'center',
@@ -334,7 +334,7 @@ const TableManager = (props) => {
             align: 'center',
         },
         {
-            title: '字段数量',
+            title: '附加字段',
             dataIndex: 'fieldCount',
             key: 'fieldCount',
             align: 'center',

src/pages/platformCenter/bsmanager/workFlow/flow.jsx

@@ -136,8 +136,9 @@ const Flow = () => {
       dataIndex: 'extendWebPage',
       align: 'center',
       render: text => (
-        // eslint-disable-next-line react/no-danger
-        <span dangerouslySetInnerHTML={{ __html: text }} />
+        <span style={{ color: text === '(默认)' ? 'grey' : '000000D9' }}>
+          {text}
+        </span>
       ),
     },
     {
@@ -145,8 +146,9 @@ const Flow = () => {
       dataIndex: 'extendMobilePage',
       align: 'center',
       render: text => (
-        // eslint-disable-next-line react/no-danger
-        <span dangerouslySetInnerHTML={{ __html: text }} />
+        <span style={{ color: text === '(默认)' ? 'grey' : '000000D9' }}>
+          {text}
+        </span>
       ),
     },
     {
@@ -155,8 +157,9 @@ const Flow = () => {
       align: 'center',
       width: 80,
       render: text => (
-        // eslint-disable-next-line react/no-danger
-        <span dangerouslySetInnerHTML={{ __html: text }} />
+        <span style={{ color: text === '(无)' ? 'grey' : '000000D9' }}>
+          {text}
+        </span>
       ),
     },
     {
@@ -164,8 +167,9 @@ const Flow = () => {
       dataIndex: 'flowEndBehavior',
       align: 'center',
       render: text => (
-        // eslint-disable-next-line react/no-danger
-        <span dangerouslySetInnerHTML={{ __html: text }} />
+        <span style={{ color: text === '(不做处理)' ? 'grey' : '000000D9' }}>
+          {text}
+        </span>
       ),
     },
     {
@@ -179,8 +183,7 @@ const Flow = () => {
       dataIndex: 'errorNodes',
       align: 'center',
       render: text => (
-        // eslint-disable-next-line react/no-danger
-        <span dangerouslySetInnerHTML={{ __html: text }} />
+        <span style={{ color: text === '(无)' ? 'grey' : 'red' }}>{text}</span>
       ),
     },
     {
@@ -188,8 +191,9 @@ const Flow = () => {
       dataIndex: 'interfaceConfig',
       align: 'center',
       render: text => (
-        // eslint-disable-next-line react/no-danger
-        <span dangerouslySetInnerHTML={{ __html: text }} />
+        <span style={{ color: text === '(无)' ? 'grey' : '000000D9' }}>
+          {text}
+        </span>
       ),
     },
     {

src/pages/platformCenter/bsmanager/workFlow/flowComponents/Timelimit.jsx

@@ -82,45 +82,30 @@ const Timelimit = props => {
       title: '规则名称',
       dataIndex: 'Name',
       align: 'center',
-      render: text => (
-        // eslint-disable-next-line react/no-danger
-        <span dangerouslySetInnerHTML={{ __html: text }} />
-      ),
     },
     {
       title: '开始节点',
       dataIndex: 'StartNode',
       align: 'center',
-      render: text => (
-        // eslint-disable-next-line react/no-danger
-        <span dangerouslySetInnerHTML={{ __html: text }} />
-      ),
     },
     {
       title: '结束节点',
       dataIndex: 'EndNode',
       align: 'center',
-      render: text => (
-        // eslint-disable-next-line react/no-danger
-        <span dangerouslySetInnerHTML={{ __html: text }} />
-      ),
     },
     {
       title: '默认时限',
       dataIndex: 'TimeLimit',
       align: 'center',
-      render: text => (
-        // eslint-disable-next-line react/no-danger
-        <span dangerouslySetInnerHTML={{ __html: text }} />
-      ),
     },
     {
       title: '时限指派字段',
-      dataIndex: 'TimeLimitFieldHtml',
+      dataIndex: 'TimeLimitField',
       align: 'center',
       render: text => (
-        // eslint-disable-next-line react/no-danger
-        <span dangerouslySetInnerHTML={{ __html: text }} />
+        <span style={{ color: text === '(未配置)' ? 'grey' : '#0000009D' }}>
+          {text}
+        </span>
       ),
     },
     {
@@ -128,8 +113,9 @@ const Timelimit = props => {
       dataIndex: 'TimeoutField',
       align: 'center',
       render: text => (
-        // eslint-disable-next-line react/no-danger
-        <span dangerouslySetInnerHTML={{ __html: text }} />
+        <span style={{ color: text === '(未配置)' ? 'grey' : '#0000009D' }}>
+          {text}
+        </span>
       ),
     },
     {

src/pages/platformCenter/bsmanager/workFlow/flowComponents/timelimitComponents/AddModal.jsx

@@ -230,8 +230,7 @@ const AddModal = props => {
           <Select>
             {timeLimitFlowNodes.map(item => (
               <Option value={item.Name} key={item.ID}>
-                {/* eslint-disable-next-line react/no-danger */}
-                <span dangerouslySetInnerHTML={{ __html: item.Name }} />
+                <span>{item.Name}</span>
               </Option>
             ))}
           </Select>
@@ -244,8 +243,7 @@ const AddModal = props => {
           <Select>
             {timeLimitFlowNodes.map(item => (
               <Option value={item.Name} key={item.ID}>
-                {/* eslint-disable-next-line react/no-danger */}
-                <span dangerouslySetInnerHTML={{ __html: item.Name }} />
+                <span>{item.Name}</span>
               </Option>
             ))}
           </Select>

src/pages/platformCenter/bsmanager/workFlow/flowNode/flowNode.jsx

@@ -93,6 +93,17 @@ const FlowNode = () => {
     }
     setExpandedRowKeys(data);
   };
+  // 表格内文案样式
+  const textStyleOne = (text, record) => {
+    if (record.colorType === 2) {
+      return 'red';
+    }
+    if (text === '(未配置)') {
+      return 'grey';
+    }
+    return '000000D9';
+  };
+
   // 定义展开的表格
   const createUnfoldTable = itemTable => {
     const columns = [
@@ -101,12 +112,15 @@ const FlowNode = () => {
         dataIndex: 'name',
         width: 149,
         align: 'left',
-        render: text => (
+        render: (text, record) => (
           <div
-            style={{ paddingLeft: 60 }}
-            // eslint-disable-next-line react/no-danger
-            dangerouslySetInnerHTML={{ __html: text }}
-          />
+            style={{
+              paddingLeft: 60,
+              color: record.colorType === 2 ? 'red' : '#000000D9',
+            }}
+          >
+            {text}
+          </div>
         ),
       },
       {
@@ -114,19 +128,15 @@ const FlowNode = () => {
         dataIndex: 'aliasName',
         align: 'center',
         width: 80,
-        render: text => (
-          // eslint-disable-next-line react/no-danger
-          <span dangerouslySetInnerHTML={{ __html: text }} />
-        ),
+        render: text => <span>{text}</span>,
       },
       {
         title: '移交方式',
         dataIndex: 'extendHandover',
         align: 'center',
         width: 80,
-        render: text => (
-          // eslint-disable-next-line react/no-danger
-          <span dangerouslySetInnerHTML={{ __html: text }} />
+        render: (text, record) => (
+          <span style={{ color: textStyleOne(text, record) }}>{text}</span>
         ),
       },
       {
@@ -134,9 +144,8 @@ const FlowNode = () => {
         dataIndex: 'extendNodeType',
         align: 'center',
         width: 80,
-        render: text => (
-          // eslint-disable-next-line react/no-danger
-          <span dangerouslySetInnerHTML={{ __html: text }} />
+        render: (text, record) => (
+          <span style={{ color: textStyleOne(text, record) }}>{text}</span>
         ),
       },
       {
@@ -147,10 +156,9 @@ const FlowNode = () => {
         ellipsis: {
           showTitle: true,
         },
-        render: text => (
+        render: (text, record) => (
           <Tooltip placement="topLeft" title={text}>
-            {/* eslint-disable-next-line react/no-danger */}
-            <span dangerouslySetInnerHTML={{ __html: text }} />
+            <span style={{ color: textStyleOne(text, record) }}>{text}</span>
           </Tooltip>
         ),
       },
@@ -159,15 +167,21 @@ const FlowNode = () => {
         dataIndex: 'extendSeeFields',
         align: 'center',
         width: 80,
+        render: (text, record) => (
+          <span style={{ color: record.colorType === 2 ? 'red' : '#000000D9' }}>
+            {text}
+          </span>
+        ),
       },
       {
         title: '字段',
         dataIndex: 'extendFields',
         align: 'center',
         width: 80,
-        render: text => (
-          // eslint-disable-next-line react/no-danger
-          <span dangerouslySetInnerHTML={{ __html: text }} />
+        render: (text, record) => (
+          <span style={{ color: record.colorType === 2 ? 'red' : '#000000D9' }}>
+            {text}
+          </span>
         ),
       },
 
@@ -176,9 +190,10 @@ const FlowNode = () => {
         dataIndex: 'extendEditableLater',
         align: 'center',
         width: 80,
-        render: text => (
-          // eslint-disable-next-line react/no-danger
-          <span dangerouslySetInnerHTML={{ __html: text }} />
+        render: (text, record) => (
+          <span style={{ color: record.colorType === 2 ? 'red' : '#000000D9' }}>
+            {text}
+          </span>
         ),
       },
       {
@@ -186,9 +201,10 @@ const FlowNode = () => {
         dataIndex: 'extendRollbackable',
         align: 'center',
         width: 80,
-        render: text => (
-          // eslint-disable-next-line react/no-danger
-          <span dangerouslySetInnerHTML={{ __html: text }} />
+        render: (text, record) => (
+          <span style={{ color: record.colorType === 2 ? 'red' : '#000000D9' }}>
+            {text}
+          </span>
         ),
       },
       {
@@ -196,9 +212,10 @@ const FlowNode = () => {
         dataIndex: 'extendRollbackNode',
         align: 'center',
         width: 80,
-        render: text => (
-          // eslint-disable-next-line react/no-danger
-          <span dangerouslySetInnerHTML={{ __html: text }} />
+        render: (text, record) => (
+          <span style={{ color: record.colorType === 2 ? 'red' : '#000000D9' }}>
+            {text}
+          </span>
         ),
       },
       {
@@ -206,9 +223,10 @@ const FlowNode = () => {
         dataIndex: 'tranferable',
         align: 'center',
         width: 80,
-        render: text => (
-          // eslint-disable-next-line react/no-danger
-          <span dangerouslySetInnerHTML={{ __html: text }} />
+        render: (text, record) => (
+          <span style={{ color: record.colorType === 2 ? 'red' : '#000000D9' }}>
+            {text}
+          </span>
         ),
       },
       {
@@ -216,9 +234,10 @@ const FlowNode = () => {
         dataIndex: 'eventInformation',
         align: 'center',
         width: 80,
-        render: text => (
-          // eslint-disable-next-line react/no-danger
-          <span dangerouslySetInnerHTML={{ __html: text }} />
+        render: (text, record) => (
+          <span style={{ color: record.colorType === 2 ? 'red' : '#000000D9' }}>
+            {text}
+          </span>
         ),
       },
       {

src/pages/platformCenter/bsmanager/workFlow/flowNode/flowNode.less

@@ -28,8 +28,11 @@
 
 // 编辑节点表单
 .formData {
-  height: 32rem;
+  height: calc(100vh - 162px);
   overflow-y: scroll;
+  .ant-radio-wrapper {
+    min-width: 130px;
+  }
   .filedListItem {
     display: flex;
     flex-wrap: nowrap;

src/pages/platformCenter/bsmanager/workFlow/flowNode/flowNodeComponents/AuxiliaryView.jsx

@@ -85,55 +85,67 @@ const AuxiliaryView = props => {
       title: '前端便签',
       dataIndex: 'WebLabel',
       align: 'center',
-      render: text => (
-        // eslint-disable-next-line react/no-danger
-        <span dangerouslySetInnerHTML={{ __html: text }} />
-      ),
+      render: text => {
+        if (text === '(未配置)' || text === '(无)') {
+          return <span style={{ color: 'grey' }}>{text}</span>;
+        }
+        return <span>{text}</span>;
+      },
     },
     {
       title: '前端视图',
       dataIndex: 'WebPage',
       align: 'center',
-      render: text => (
-        // eslint-disable-next-line react/no-danger
-        <span dangerouslySetInnerHTML={{ __html: text }} />
-      ),
+      render: text => {
+        if (text === '(未配置)' || text === '(无)') {
+          return <span style={{ color: 'grey' }}>{text}</span>;
+        }
+        return <span>{text}</span>;
+      },
     },
     {
       title: '前端参数',
       dataIndex: 'WebParam',
       align: 'center',
-      render: text => (
-        // eslint-disable-next-line react/no-danger
-        <span dangerouslySetInnerHTML={{ __html: text }} />
-      ),
+      render: text => {
+        if (text === '(未配置)' || text === '(无)') {
+          return <span style={{ color: 'grey' }}>{text}</span>;
+        }
+        return <span>{text}</span>;
+      },
     },
     {
       title: '手持标签',
       dataIndex: 'MobileLabel',
       align: 'center',
-      render: text => (
-        // eslint-disable-next-line react/no-danger
-        <span dangerouslySetInnerHTML={{ __html: text }} />
-      ),
+      render: text => {
+        if (text === '(未配置)' || text === '(无)') {
+          return <span style={{ color: 'grey' }}>{text}</span>;
+        }
+        return <span>{text}</span>;
+      },
     },
     {
       title: '手持视图',
       dataIndex: 'MobilePage',
       align: 'center',
-      render: text => (
-        // eslint-disable-next-line react/no-danger
-        <span dangerouslySetInnerHTML={{ __html: text }} />
-      ),
+      render: text => {
+        if (text === '(未配置)' || text === '(无)') {
+          return <span style={{ color: 'grey' }}>{text}</span>;
+        }
+        return <span>{text}</span>;
+      },
     },
     {
       title: '手持参数',
       dataIndex: 'MobileParam',
       align: 'center',
-      render: text => (
-        // eslint-disable-next-line react/no-danger
-        <span dangerouslySetInnerHTML={{ __html: text }} />
-      ),
+      render: text => {
+        if (text === '(未配置)' || text === '(无)') {
+          return <span style={{ color: 'grey' }}>{text}</span>;
+        }
+        return <span>{text}</span>;
+      },
     },
     {
       title: '操作',

src/pages/platformCenter/bsmanager/workFlow/flowNode/flowNodeComponents/NodeEdit.jsx

@@ -10,7 +10,6 @@ import {
 
 import {
   Form,
-  Modal,
   Input,
   Radio,
   Select,
@@ -18,6 +17,8 @@ import {
   Checkbox,
   Button,
   message,
+  Drawer,
+  Space,
 } from 'antd';
 import { PlusOutlined } from '@ant-design/icons';
 import Fieldselection from './nodeEditComponents/Fieldselection';
@@ -99,58 +100,47 @@ const NodeEdit = props => {
     loadEventFields({ eventTableName: value.TableName }).then(res => {
       if (res.code === 0) {
         let defaultCheckedList = value[val] ? value[val].split(',') : [];
-        // 处理数据为树形结构
-        let keylist = new Set();
-        let list = new Map();
-        res.data.forEach(item => {
-          keylist.add(item.group);
-          if (keylist.has(item.group)) {
-            let listItem = list.get(item.group);
-            // 存入check得选项，是否全选，选中的选项'
-            if (listItem) {
-              list.set(item.group, {
-                plainOptions: [...listItem.plainOptions, item.fieldName],
-                defaultCheckedList: [],
+        // 处理树形结构
+        let checkList = res.data.map(item => {
+          let plainOptions = [];
+          item.root.forEach(ele => {
+            plainOptions = [...plainOptions, ele.fieldName];
           });
-            } else {
-              list.set(item.group, {
-                plainOptions: [item.fieldName],
+          return {
+            groupName: item.groupName,
+            plainOptions,
             defaultCheckedList: [],
+          };
         });
-            }
-          }
-        });
-        let checkList = [...list];
         defaultCheckedList.forEach(item => {
           checkList.forEach(element => {
             // 当前得模块是否有当前字段
-            let indeterminate = element[1].plainOptions.some(
+            let indeterminate = element.plainOptions.some(
               checkName => checkName === item,
             );
             // 处理已选中的字段
             if (indeterminate) {
-              element[1].defaultCheckedList.push(item);
+              element.defaultCheckedList.push(item);
             }
             if (
-              element[1].defaultCheckedList.length > 0 &&
-              element[1].defaultCheckedList.length <
-                element[1].plainOptions.length
+              element.defaultCheckedList.length > 0 &&
+              element.defaultCheckedList.length < element.plainOptions.length
             ) {
-              element[1].indeterminate = true;
+              element.indeterminate = true;
             } else {
-              element[1].indeterminate = false;
+              element.indeterminate = false;
             }
             // 处理是否全选字段
             if (
-              element[1].defaultCheckedList.length ===
-              element[1].plainOptions.length
+              element.defaultCheckedList.length === element.plainOptions.length
             ) {
-              element[1].checkAll = true;
+              element.checkAll = true;
             } else {
-              element[1].checkAll = false;
+              element.checkAll = false;
             }
           });
         });
+        console.log(checkList, 'checkList');
         setFieldList(checkList);
         setTimeout(() => {
           setShowField(true);
@@ -215,14 +205,19 @@ const NodeEdit = props => {
     }
   };
   return (
-    <Modal
+    <Drawer
       title="流程节点配置"
+      width="500px"
+      onClose={handleCancel}
       visible={visible}
-      onOk={onFinish}
-      width="800px"
-      onCancel={handleCancel}
-      maskClosable={false}
-      centered
+      footer={
+        <Space>
+          <Button onClick={handleCancel}>取消</Button>
+          <Button onClick={onFinish} type="primary">
+            确定
+          </Button>
+        </Space>
+      }
     >
       <Form
         form={form}
@@ -329,13 +324,13 @@ const NodeEdit = props => {
             />
           </div>
         </Form.Item>
-        <Form.Item label="查看字段（工程模型）">
+        <Form.Item label="查看字段">
           <div className={styles.filedListItem}>
             <Form.Item
               name="SeeFields"
               style={{ marginBottom: 0, width: '100%' }}
             >
-              <Input placeholder="请选择查看字段" allowClear />
+              <Input placeholder="请选择查看字段（工程模型）" allowClear />
             </Form.Item>
             <Button
               type="dashed"
@@ -379,7 +374,7 @@ const NodeEdit = props => {
         fieldList={fieldList}
         onSubumit={val => setFiled(val)}
       />
-    </Modal>
+    </Drawer>
   );
 };
 export default NodeEdit;

src/pages/platformCenter/bsmanager/workFlow/flowNode/flowNodeComponents/nodeEditComponents/Fieldselection.jsx

@@ -19,7 +19,7 @@ const Fieldselection = props => {
       return;
     }
     checkList.forEach(element => {
-      arr = [...arr, ...element[1].defaultCheckedList];
+      arr = [...arr, ...element.defaultCheckedList];
     });
     setSelectList(arr);
     // 初始化拖拽
@@ -35,11 +35,11 @@ const Fieldselection = props => {
   const onChange = (list, index) => {
     setCheckList(value => {
       const chooseList = JSON.parse(JSON.stringify(value));
-      chooseList[index][1].defaultCheckedList = list;
-      chooseList[index][1].indeterminate =
-        !!list.length && list.length < chooseList[index][1].plainOptions.length;
-      chooseList[index][1].checkAll =
-        list.length === chooseList[index][1].plainOptions.length;
+      chooseList[index].defaultCheckedList = list;
+      chooseList[index].indeterminate =
+        !!list.length && list.length < chooseList[index].plainOptions.length;
+      chooseList[index].checkAll =
+        list.length === chooseList[index].plainOptions.length;
       return chooseList;
     });
   };
@@ -47,11 +47,11 @@ const Fieldselection = props => {
   const onCheckAllChange = (e, index) => {
     setCheckList(value => {
       const chooseList = JSON.parse(JSON.stringify(value));
-      chooseList[index][1].defaultCheckedList = e.target.checked
-        ? chooseList[index][1].plainOptions
+      chooseList[index].defaultCheckedList = e.target.checked
+        ? chooseList[index].plainOptions
         : [];
-      chooseList[index][1].indeterminate = false;
-      chooseList[index][1].checkAll = e.target.checked;
+      chooseList[index].indeterminate = false;
+      chooseList[index].checkAll = e.target.checked;
       return chooseList;
     });
   };
@@ -98,19 +98,21 @@ const Fieldselection = props => {
               <div className={styles.cardBox} key={index}>
                 <div className={styles.title}>
                   <Divider orientation="left" className={styles.cardDivider}>
-                    <span style={{ marginRight: '10px' }}>{item[0]}</span>
+                    <span style={{ marginRight: '10px' }}>
+                      {item.groupName}
+                    </span>
                     <Checkbox
-                      indeterminate={item[1].indeterminate}
+                      indeterminate={item.indeterminate}
                       onChange={e => onCheckAllChange(e, index)}
-                      checked={item[1].checkAll}
+                      checked={item.checkAll}
                     />
                   </Divider>
                 </div>
                 <div className={styles.filedList}>
                   <CheckboxGroup
                     key={index}
-                    options={item[1].plainOptions}
-                    value={item[1].defaultCheckedList}
+                    options={item.plainOptions}
+                    value={item.defaultCheckedList}
                     onChange={list => onChange(list, index)}
                   />
                 </div>

src/pages/platformCenter/bsmanager/workflowEdit/Workflow.jsx

@@ -37,6 +37,7 @@ const Workflow = () => {
   const [editIndex, setEditIndex] = useState(); // 编辑流程组得索引
   const [treeVisible, setTreeVisible] = useState(true);
   const [chartLoading, setChartLoading] = useState(false); // 流程图的loading
+  const [canSelect, setCanSelect] = useState(true); // 是否可以切换树
   const [visible, setVisible] = useState({
     FlowModal: false,
     FlowGroupModal: false,
@@ -129,8 +130,8 @@ const Workflow = () => {
     showModal('FlowGroupModal', true);
     setModalType('add');
   };
-  // 点击节点树触发
-  const onSelect = (prop, treeNode) => {
+  // 选择节点
+  const chooseNode = (prop, treeNode) => {
     if (!treeNode || treeNode.node.children) {
       setCurrentSelectId(treeId);
       return;
@@ -146,6 +147,7 @@ const Workflow = () => {
         if (res.code === 0) {
           setFlowData(res.data);
         } else {
+          setFlowData({ Nodes: [], Lines: [] });
           notification.error({
             title: '提示',
             duration: 3,
@@ -157,6 +159,27 @@ const Workflow = () => {
       setCurrentSelectId(treeId);
     }
   };
+  // 点击节点树触发
+  const onSelect = (prop, treeNode) => {
+    // 如果没有保存弹是否保存弹窗
+    if (!canSelect) {
+      confirm({
+        title: '流程未保存确定要切换吗？',
+        icon: <ExclamationCircleOutlined />,
+        content: '',
+        okText: '是',
+        okType: 'danger',
+        cancelText: '否',
+        onOk() {
+          setCanSelect(true);
+          chooseNode(prop, treeNode);
+        },
+        onCancel() {},
+      });
+    } else {
+      chooseNode(prop, treeNode);
+    }
+  };
   // 处理树数据
   const mapTree = (val, index) => {
     const obj = { ...val };
@@ -222,6 +245,10 @@ const Workflow = () => {
     // 选中当前选中的节点
     onSelect();
   };
+  // 数据改变后的回调函数
+  const leaveCallBack = val => {
+    setCanSelect(!val);
+  };
   return (
     <PageContainer>
       <div className={styles.flowContainer}>
@@ -273,6 +300,7 @@ const Workflow = () => {
               flowData={flowData}
               flowID={currentSelectId}
               chartLoading={chartLoading}
+              leaveCallBack={leaveCallBack}
             />
           ) : (
             <Empty

src/pages/platformCenter/bsmanager/workflowEdit/workFlowComponents/FlowChart.jsx

@@ -3,6 +3,7 @@ import { Button, Modal, notification, Spin } from 'antd';
 import { SaveNodeChange, GetFlowNode } from '@/services/platform/workflow';
 
 import { ExclamationCircleOutlined } from '@ant-design/icons';
+import { Prompt } from 'react-router-dom';
 import * as go from 'gojs';
 import styles from '../workflow.less';
 import NodeModal from './flowChartComponents/NodeModal';
@@ -10,7 +11,7 @@ import imgUrl from '@/assets/images/icons/closeBlue.png';
 const { confirm } = Modal;
 let diagram = null;
 const FlowChart = props => {
-  const { flowData, flowID, chartLoading } = props;
+  const { flowData, flowID, chartLoading, leaveCallBack } = props;
   const [visible, setVisible] = useState(false);
   const [editMsg, setEditMsg] = useState({}); // 编辑节点的信息
   const [modalType, setModalType] = useState(''); // 存入弹窗是编辑还是新增
@@ -20,10 +21,12 @@ const FlowChart = props => {
   const [deleteLine, setDeleteLine] = useState(); // 删除的线id
   const [deleteNode, setDeleteNode] = useState(); // 删除的节点id
   const [AddNodes, setAddNodes] = useState([]); // 新增数组
+  const [initFlowData, setInitFlowData] = useState({}); // 初始数据，用来比对是否有修改流程图
   const [currentFlowData, setCurrentFlowData] = useState({
     Nodes: [],
     Lines: [],
   }); // 组件内得流程图数据
+  const [showLeaveTip, setShowLeaveTip] = useState(false); // 离开路由是否又提醒
   const objGo = go.GraphObject.make;
   // 监听删除，给删除数组里添加删除id
   useEffect(() => {
@@ -36,6 +39,7 @@ const FlowChart = props => {
       setDeleteNodes([...DeleteNodes, deleteNode]);
     }
   }, [deleteNode]);
+  // 初始化
   useEffect(() => {
     // 初始化流程图
     init();
@@ -73,6 +77,7 @@ const FlowChart = props => {
       setDeleteNode('');
       setDeleteLine('');
       setCurrentFlowData(JSON.parse(JSON.stringify(flowData)));
+      setShowLeaveTip(false);
     }
   }, [flowData]);
   // 存入在树形流程中选择得流程数据
@@ -81,13 +86,30 @@ const FlowChart = props => {
     if (currentFlowData.Nodes.length === 0) {
       nodeDataArray = [];
     } else {
-      nodeDataArray = currentFlowData.Nodes.map(item => {
+      // 处理老数据，让老数据可以正常展示
+      nodeDataArray = currentFlowData.Nodes.map((item, index) => {
         let obj;
         obj = item;
         obj.key = item.NodeId;
+        if (obj.points === '') {
+          if (obj.NodeType === '1') {
+            obj.points = `${(index * 200).toString()}" 100"`;
+          } else {
+            obj.points = `${(index * 200).toString()}" -22"`;
+          }
+        }
         return obj;
       });
     }
+    // 保存初始数据
+    setInitFlowData(
+      JSON.parse(
+        JSON.stringify({
+          Nodes: nodeDataArray,
+          Lines: currentFlowData.Lines,
+        }),
+      ),
+    );
     diagram.model = go.Model.fromJson({
       linkFromPortIdProperty: 'fromPort', // 所需信息：
       linkToPortIdProperty: 'toPort', // 标识数据属性名称
@@ -112,6 +134,8 @@ const FlowChart = props => {
   };
   // 删除节点
   const delNode = () => {
+    setShowLeaveTip(true);
+    leaveCallBack(true);
     diagram.commandHandler.deleteSelection();
   };
   // 流程图初始化
@@ -303,12 +327,30 @@ const FlowChart = props => {
       nodeData.roleList = roleList;
       diagram.model.updateTargetBindings(nodeData);
     }
+    // 关闭时进行数据比对看数据是否改变
+    let diagramObj = JSON.parse(diagram.model.toJson());
+    let stageJson = {
+      Nodes: diagramObj.nodeDataArray,
+      Lines: diagramObj.linkDataArray,
+    };
+    if (
+      JSON.stringify(stageJson.Nodes) === JSON.stringify(initFlowData.Nodes)
+    ) {
+      setShowLeaveTip(false);
+      leaveCallBack(false);
+    } else {
+      leaveCallBack(true);
+      setShowLeaveTip(true);
+    }
     setVisible(false);
   };
   // 获取保存后的流程数据
   const getFlowData = () => {
     GetFlowNode({ flowID }).then(res => {
       if (res.code === 0) {
+        // 保存后离开不用提醒要修改数据了
+        setShowLeaveTip(false);
+        leaveCallBack(false);
         setCurrentFlowData(res.data);
       } else {
         notification.error({
@@ -355,9 +397,15 @@ const FlowChart = props => {
   };
   return (
     <>
+      <Prompt
+        message="编辑的内容还未保存，确定要离开该页面吗?"
+        when={showLeaveTip}
+      />
       <div className={styles.buttonList}>
         <Button onClick={() => addNode()}>添加节点</Button>
-        <Button onClick={() => saveFlow()}>保存</Button>
+        <Button type="primary" onClick={() => saveFlow()}>
+          保存
+        </Button>
       </div>
       <Spin spinning={chartLoading}>
         <div

src/pages/platformCenter/bsmanager/workflowEdit/workFlowComponents/flowChartComponents/NodeModal.jsx

@@ -13,7 +13,7 @@ import {
   Popconfirm,
   message,
 } from 'antd';
-import { DeleteOutlined } from '@ant-design/icons';
+import { DeleteOutlined, EditTwoTone } from '@ant-design/icons';
 import RoalChoose from './nodeModalComponents/RoalChoose';
 const { Option } = Select;
 
@@ -21,6 +21,8 @@ const NodeModal = props => {
   const { onSubumit, handleCancel, visible, modalType, editMsg } = props;
   const [form] = Form.useForm();
   const [showRoal, setShowRoal] = useState(false); // 是否显示选择角色用户弹窗
+  const [isEdit, setIsEdit] = useState(); // 是编辑角色还是添加角色
+  const [chooseUser, setChooseUser] = useState(); // 当前编辑角色或者机构的默认承办人
   const [nodeMsg, setNodeMsg] = useState({
     NodeName: '',
     NodeType: '',
@@ -58,8 +60,8 @@ const NodeModal = props => {
     setNodeMsg({ ...nodeMsg, roleList });
   };
   // 添加用户
-  const addUser = obj => {
-    if (obj.roleId === '') {
+  const addUser = (obj, treeLength) => {
+    if (obj.roleId === '' || obj.roleName === '' || treeLength === 0) {
       notification.error({
         message: '提示',
         duration: 3,
@@ -68,7 +70,10 @@ const NodeModal = props => {
       return;
     }
     // 如果已经有角色就提示
-    if (nodeMsg.roleList.some(item => item.roleId === obj.roleId)) {
+    if (
+      nodeMsg.roleList.some(item => item.roleId === obj.roleId) &&
+      isEdit === 'add'
+    ) {
       notification.error({
         message: '提示',
         duration: 3,
@@ -76,9 +81,27 @@ const NodeModal = props => {
       });
       return;
     }
-    setShowRoal(false);
+    // 编辑角色覆盖原有
+    let chooseIndex = nodeMsg.roleList.findIndex(
+      item => item.roleId === obj.roleId,
+    );
+    let newList;
+    if (chooseIndex === -1) {
       // 添加表格
       setNodeMsg({ ...nodeMsg, roleList: [...nodeMsg.roleList, obj] });
+    } else {
+      newList = [...nodeMsg.roleList];
+      newList[chooseIndex] = obj;
+      // 修改表格
+      setNodeMsg({ ...nodeMsg, roleList: [...newList] });
+    }
+    setShowRoal(false);
+  };
+  // 编辑默认承办人
+  const toEdit = record => {
+    setIsEdit('edit');
+    setChooseUser(record);
+    setShowRoal(true);
   };
   // 定义表格
   const columns = [
@@ -86,6 +109,14 @@ const NodeModal = props => {
       title: '机构(角色)名称',
       dataIndex: 'roleName',
       align: 'center',
+      ellipsis: {
+        showTitle: false,
+      },
+      render: text => (
+        <Tooltip placement="topLeft" title={text}>
+          {text}
+        </Tooltip>
+      ),
     },
     {
       title: '默认承办人',
@@ -120,6 +151,12 @@ const NodeModal = props => {
                 />
               </Popconfirm>
             </Tooltip>
+            <Tooltip title="修改默认承办人">
+              <EditTwoTone
+                onClick={() => toEdit(record)}
+                style={{ fontSize: '16px', color: '#1890FF' }}
+              />
+            </Tooltip>
           </Space>
         </>
       ),
@@ -196,7 +233,9 @@ const NodeModal = props => {
           style={{ marginBottom: '10px' }}
           onClick={() => {
             setShowRoal(true);
+            setIsEdit('add');
           }}
+          type="primary"
         >
           添加
         </Button>
@@ -207,11 +246,18 @@ const NodeModal = props => {
           bordered
           size="small"
           scroll={{ y: 'calc(100vh - 550px)' }}
+          onRow={record => ({
+            onDoubleClick: () => {
+              toEdit(record);
+            },
+          })}
           pagination={false}
         />
       </Drawer>
       <RoalChoose
         visible={showRoal}
+        modalType={isEdit}
+        chooseUser={chooseUser}
         handleCancel={() => setShowRoal(false)}
         onSubumit={addUser}
       />

src/pages/platformCenter/bsmanager/workflowEdit/workFlowComponents/flowChartComponents/nodeModalComponents/RoalChoose.jsx

@@ -9,15 +9,19 @@ import {
   Pagination,
   Spin,
   Divider,
+  notification,
+  Empty,
+  Tabs,
 } from 'antd';
 import Tree from '@/components/ExpendableTree';
 import { UserOutlined } from '@ant-design/icons';
 import styles from '../../../workflow.less';
 
 const CheckboxGroup = Checkbox.Group;
+const { TabPane } = Tabs;
 
 const RoalChoose = props => {
-  const { onSubumit, handleCancel, visible } = props;
+  const { onSubumit, handleCancel, visible, modalType, chooseUser } = props;
   const [form] = Form.useForm();
   const [currentSelectId, setCurrentSelectId] = useState(''); // 当前选择节点Id
   const [currentRoalName, setCurrentRoalName] = useState(''); // 当前选择节点名称
@@ -28,35 +32,82 @@ const RoalChoose = props => {
   const [checkAll, setCheckAll] = useState(false); // 全选框全选样式
   const [total, setTotal] = useState(); // 角色人员条数
   const [loading, setLoading] = useState(false); // 加载时的loading
+  const [userList, setUserList] = useState([]); // 编辑选中的用户信息
   const [currentPage, setCurrentPage] = useState(1);
+  const [pageSize, setPageSize] = useState(10);
+  const [roleType, setRoleType] = useState('2'); // 角色类型
   // 初始化
   useEffect(() => {
     form.resetFields();
     if (visible) {
-      setCurrentSelectId('');
+      setCurrentPage(1);
+      if (modalType === 'edit') {
+        console.log(chooseUser);
+        setRoleType(chooseUser.type.toString());
+        form.setFieldsValue({ roleName: chooseUser.roleName });
+        setUserList(chooseUser.defaultUserId);
+        getData('', 1, pageSize, chooseUser.roleId, chooseUser.type);
+      } else {
+        getData('', 1, pageSize, 0, 2);
+        setRoleType('2');
+      }
+    } else {
+      setUserList([]);
+      setTreeData([]);
       setPlainOptions([]);
       setCheckedList([]);
       setIndeterminate(false);
       setCheckAll(false);
-      setCurrentPage(1);
-      getData('', 0);
-    } else {
-      setTreeData([]);
     }
   }, [visible]);
-  // 获取表单回显
-  const getData = (roleName, pageIndex, pageSize) => {
+  // 默认选中第一个
+  useEffect(() => {
+    if (treeData.length > 0) {
+      setCurrentSelectId(treeData[0].id);
+      setCurrentRoalName(treeData[0].name);
+      let options = treeData[0].userList.map(item => ({
+        label: item.name,
+        value: item.id,
+      }));
+      setPlainOptions(options);
+    }
+  }, [treeData]);
+  // 对默认选中的进行处理
+  useEffect(() => {
+    if (userList.length > 0 && modalType === 'edit') {
+      onChange(userList);
+    } else {
+      setCheckedList([]);
+      setIndeterminate(false);
+      setCheckAll(false);
+    }
+  }, [plainOptions]);
+
+  // 获取左侧树回显
+  const getData = (roleName, pageIndex, pageSizes, roleId, Type) => {
     roleName = roleName || '';
     setLoading(true);
-    GetRoleUser({ roleName, pageIndex, pageSize }).then(res => {
+    GetRoleUser({
+      roleName,
+      pageIndex,
+      pageSize: pageSizes,
+      roleId,
+      Type: Number(Type),
+    }).then(res => {
       setLoading(false);
       if (res.code === 0) {
         setTreeData(res.data.data);
         setTotal(res.data.count);
+      } else {
+        notification.error({
+          message: '提示',
+          duration: 3,
+          description: res.msg,
+        });
       }
     });
   };
-  // 提交表单
+  // 查询角色
   const onFinish = () => {
     form.validateFields().then(validate => {
       if (validate) {
@@ -66,7 +117,7 @@ const RoalChoose = props => {
         setIndeterminate(false);
         setCheckAll(false);
         setCurrentPage(1);
-        getData(validate.roleName, 1);
+        getData(validate.roleName, 1, pageSize, 0, roleType);
       }
     });
   };
@@ -76,6 +127,7 @@ const RoalChoose = props => {
     return {
       title: obj.name,
       key: obj.id,
+      disabled: modalType === 'edit' && obj.name !== chooseUser.roleName,
       userList: obj.userList,
     };
   };
@@ -84,20 +136,17 @@ const RoalChoose = props => {
     setCurrentRoalName(e.node.title);
     if (selectedKeys[0]) {
       // 选择后对复选框的用户进行重新赋值
-      let userList = [...e.node.userList];
-      let options = userList.map(item => ({
+      let userLists = [...e.node.userList];
+      let options = userLists.map(item => ({
         label: item.name,
         value: item.id,
       }));
       setCurrentSelectId(selectedKeys[0]);
       setPlainOptions(options);
-      setCheckedList([]);
-      setIndeterminate(false);
-      setCheckAll(false);
     }
   };
   // 监听分页
-  const paginationChange = (page, pageSize) => {
+  const paginationChange = (page, pageSizes) => {
     // 分页时清空复选框
     setCurrentSelectId('');
     setPlainOptions([]);
@@ -105,8 +154,9 @@ const RoalChoose = props => {
     setIndeterminate(false);
     setCheckAll(false);
     setCurrentPage(page);
+    setPageSize(pageSizes);
     let roleName = form.getFieldValue('roleName');
-    getData(roleName, page, pageSize);
+    getData(roleName, page, pageSizes, 0, roleType);
   };
   // 复选框全选监听
   const onCheckAllChange = e => {
@@ -121,6 +171,19 @@ const RoalChoose = props => {
     setIndeterminate(!!list.length && list.length < plainOptions.length);
     setCheckAll(list.length === plainOptions.length);
   };
+  // tab栏切换回调
+  const tabCallback = val => {
+    if (val === roleType) {
+      return;
+    }
+    setRoleType(val);
+    setPlainOptions([]);
+    setCheckedList([]);
+    setIndeterminate(false);
+    setCheckAll(false);
+    setCurrentPage(1);
+    getData(form.getFieldValue('roleName'), 1, pageSize, 0, val);
+  };
   // 保存选择的角色列表
   const onSave = () => {
     // 默认承办人字符串拼接
@@ -142,9 +205,26 @@ const RoalChoose = props => {
       roleId: currentSelectId,
       defaultUserId: checkedList,
       defauletUserName: DeafaultUserName,
+      type: Number(roleType),
     };
-    onSubumit(obj);
+    onSubumit(obj, treeData.length);
   };
+  // 角色列表样式
+  const roleDom = () =>
+    treeData.length > 0 ? (
+      <Tree
+        blockNode
+        autoExpandParent
+        onSelect={onSelect}
+        selectedKeys={[currentSelectId]}
+        treeData={treeData.map(item => mapTree(item))}
+      />
+    ) : (
+      <Empty
+        image={Empty.PRESENTED_IMAGE_SIMPLE}
+        description="未有查找到角色"
+      />
+    );
   return (
     <Modal
       title="角色用户列表"
@@ -164,12 +244,17 @@ const RoalChoose = props => {
               <Form.Item name="roleName">
                 <Input
                   prefix={<UserOutlined className="site-form-item-icon" />}
-                  placeholder="RoleName"
+                  placeholder="请输入机构或角色名称"
+                  disabled={modalType === 'edit'}
                   allowClear
                 />
               </Form.Item>
               <Form.Item>
-                <Button type="primary" htmlType="submit">
+                <Button
+                  type="primary"
+                  htmlType="submit"
+                  disabled={modalType === 'edit'}
+                >
                   搜索
                 </Button>
               </Form.Item>
@@ -178,17 +263,22 @@ const RoalChoose = props => {
           {/* 角色树 */}
           <Spin spinning={loading}>
             <div className={styles.treeContent}>
-              <span style={{ marginLeft: '28px', fontWeight: 700 }}>
-                角色列表
-              </span>
-              <Divider style={{ margin: '10px 0' }} />
-              <Tree
-                blockNode
-                autoExpandParent
-                onSelect={onSelect}
-                selectedKeys={[currentSelectId]}
-                treeData={treeData.map(item => mapTree(item))}
-              />
+              <Tabs activeKey={roleType} onChange={tabCallback}>
+                <TabPane
+                  tab="角色列表"
+                  key="2"
+                  disabled={modalType === 'edit' && chooseUser.type === 1}
+                >
+                  {roleDom()}
+                </TabPane>
+                <TabPane
+                  tab="机构列表"
+                  key="1"
+                  disabled={modalType === 'edit' && chooseUser.type === 2}
+                >
+                  {roleDom()}
+                </TabPane>
+              </Tabs>
             </div>
           </Spin>
           {/* 分页 */}
@@ -215,11 +305,18 @@ const RoalChoose = props => {
             </Checkbox>
             <Divider style={{ margin: '10px 0' }} />
             <div className={styles.checkContent}>
+              {plainOptions.length > 0 ? (
                 <CheckboxGroup
                   options={plainOptions}
                   value={checkedList}
                   onChange={onChange}
                 />
+              ) : (
+                <Empty
+                  image={Empty.PRESENTED_IMAGE_SIMPLE}
+                  description="未有查找到用户"
+                />
+              )}
             </div>
           </div>
         </div>

src/pages/platformCenter/bsmanager/workflowEdit/workflow.less

@@ -109,13 +109,17 @@
       width: 100%;
       height: 370px;
       margin: 10px 0 10px 0;
-      padding: 20px 20px 20px 20px;
+      padding: 8px 20px 20px 20px;
       box-sizing: border-box;
       border: 1px solid #ccc;
       .ant-tree-list-holder {
         height: 285px;
       }
     }
+    .footer {
+      position: relative;
+      z-index: 999;
+    }
   }
   .userContent {
     width: 50%;

src/pages/platformCenter/filedConfig/fieldEditor.jsx

 import React, { useState, useEffect } from 'react';
-import { Form, Modal, Input, Select, Radio, Checkbox, notification, Tooltip } from 'antd';
+import {
+  Form,
+  Modal,
+  Input,
+  Select,
+  Radio,
+  Checkbox,
+  notification,
+  Tooltip,
+  Drawer,
+  Space,
+  Button,
+} from 'antd';
 
 import {
-    getField, loadTableFields, LoadEventFields, LoadEventType, UpdateFields
-} from '@/services/platform/bs'
-import styles from './index.less'
-import ChangeAdd from './changeAdd'
+  getField,
+  loadTableFields,
+  LoadEventFields,
+  LoadEventType,
+  UpdateFields,
+} from '@/services/platform/bs';
+import styles from './index.less';
+import ChangeAdd from './changeAdd';
 import { PlusSquareOutlined } from '@ant-design/icons';
 import { shape } from 'prop-types';
 const AddModal = props => {
-    const { callBackSubmit = () => { }, isType, itemData, isVisible, formObj1 } = props;
+  const {
+    callBackSubmit = () => {},
+    isType,
+    itemData,
+    isVisible,
+    formObj1,
+    onCancel,
+  } = props;
   const [loading, setLoading] = useState(false);
   const [fieldName, setFieldName] = useState([]); // 弹窗
   const [eventList, setEventList] = useState([]); // 事件
   const [filed, setFiled] = useState({}); // 事件
   const [verification, setVerification] = useState([]);
-    const [Shape, setShape] = useState('文本')
-    const [characteristics, setCharacteristics] = useState(['文本', '数值', '唯一值文本', '多行文本', '编码', '地址', '本人部门', '本人姓名', '本人ID', '选择器', '搜索选择器', '值选择器', '值复选器', '业务选择器', '可编辑值选择器', '平铺值选择器', '站点选择器', '人员选择器', '人员选择器新', '城市选择器', '台账选择器', '附件', '可预览附件', '图片', '可预览图片', '录音', '视频', '日期时间', '日期', '日期月份', '日期年份', '日期周', '时分秒', '设备选择', '坐标控件', '区域控件', '路径控件', '智能抄表', '二维码识别', '设备二维码', '位置坐标'])
+  const [Shape, setShape] = useState('文本');
+  const [characteristics, setCharacteristics] = useState([
+    '文本',
+    '数值',
+    '唯一值文本',
+    '多行文本',
+    '编码',
+    '地址',
+    '本人部门',
+    '本人姓名',
+    '本人ID',
+    '选择器',
+    '搜索选择器',
+    '值选择器',
+    '值复选器',
+    '业务选择器',
+    '可编辑值选择器',
+    '平铺值选择器',
+    '站点选择器',
+    '人员选择器',
+    '人员选择器新',
+    '城市选择器',
+    '台账选择器',
+    '附件',
+    '可预览附件',
+    '图片',
+    '可预览图片',
+    '录音',
+    '视频',
+    '日期时间',
+    '日期',
+    '日期月份',
+    '日期年份',
+    '日期周',
+    '时分秒',
+    '设备选择',
+    '坐标控件',
+    '区域控件',
+    '路径控件',
+    '智能抄表',
+    '二维码识别',
+    '设备二维码',
+    '位置坐标',
+  ]);
   const [visible, setVisible] = useState(false); // 弹窗
   const [isShow, setIsShow] = useState(false); // 弹窗
   const [type, setType] = useState(''); // 弹窗类型
   const [formObj, setFormObj] = useState({ rule: [], numerical: '' });
-    const [characterValue, setCharacterValue] = useState('')
-    const [pramData, setPramData] = useState({ Unit: '', ExceptionEvent: '', Group: '', RowSpan: 0, ColSpan: 0, ReadOnly: false, EditableLater: false, ExceptionValue: '', Preset: '', picture: false, must: false, coordinates: false })
-    const [checkedList, setCheckedList] = useState([]);//选中的复选框内容
+  const [characterValue, setCharacterValue] = useState('');
+  const [pramData, setPramData] = useState({
+    Unit: '',
+    ExceptionEvent: '',
+    Group: '',
+    RowSpan: 0,
+    ColSpan: 0,
+    ReadOnly: false,
+    EditableLater: false,
+    ExceptionValue: '',
+    Preset: '',
+    picture: false,
+    must: false,
+    coordinates: false,
+  });
+  const [checkedList, setCheckedList] = useState([]); //选中的复选框内容
   const { TextArea } = Input;
   const [form] = Form.useForm();
   const { Item } = Form;
@@ -33,25 +111,48 @@ const AddModal = props => {
       if (validate) {
         setLoading(true);
         let obj = form.getFieldsValue();
-                let data = [{ Unit: pramData.Unit || '', StoreType: "nvarchar(255)", Group: pramData.Group || '', Shape, ExceptionEvent: pramData.ExceptionEvent || '', RowSpan: pramData.RowSpan || 0, ColSpan: pramData.ColSpan || 0, ReadOnly: pramData.ReadOnly || false, EditableLater: pramData.EditableLater || false, ExceptionValue: pramData.ExceptionValue || '', Preset: pramData.Preset || '', ID: Number(itemData.ID), Name: obj.Name, Alias: obj.Alias, SyncEvent: obj.SyncEvent, ValidationRule: obj.ValidationRule, ExceptionEventFields: characterValue }]
+        let data = [
+          {
+            Unit: pramData.Unit || '',
+            StoreType: 'nvarchar(255)',
+            Group: pramData.Group || '',
+            Shape,
+            ExceptionEvent: pramData.ExceptionEvent || '',
+            RowSpan: pramData.RowSpan || 0,
+            ColSpan: pramData.ColSpan || 0,
+            ReadOnly: pramData.ReadOnly || false,
+            EditableLater: pramData.EditableLater || false,
+            ExceptionValue: pramData.ExceptionValue || '',
+            Preset: pramData.Preset || '',
+            ID: Number(itemData.ID),
+            Name: obj.Name,
+            Alias: obj.Alias,
+            SyncEvent: obj.SyncEvent,
+            ValidationRule: obj.ValidationRule,
+            ExceptionEventFields: characterValue,
+          },
+        ];
 
         switch (Shape) {
           case '编码':
             data[0].Config = `${obj.code}.${obj.prefix ? obj.prefix : ''}`;
-                        break
+            break;
           case '坐标控件':
-                        pramData.coordinates ? data[0].Config = '当前坐标' : data[0].Config = '';
-                        break
-                    case '图片': case '可预览图片':
+            pramData.coordinates
+              ? (data[0].Config = '当前坐标')
+              : (data[0].Config = '');
+            break;
+          case '图片':
+          case '可预览图片':
             data[0].Preset = pramData.picture ? '拍照相册' : '';
-                        data[0].ValidationRule = pramData.must ? 'required' : ''
-                        break
+            data[0].ValidationRule = pramData.must ? 'required' : '';
+            break;
           default:
             data[0].Config = obj.Config;
         }
         UpdateFields(data).then(res => {
           setLoading(false);
-                    if (res.msg === "Ok" || res.msg === "") {
+          if (res.msg === 'Ok' || res.msg === '') {
             form.resetFields();
             callBackSubmit();
             notification.success({
@@ -59,7 +160,6 @@ const AddModal = props => {
               duration: 3,
               description: '修改成功',
             });
-
           } else {
             notification.error({
               message: '提示',
@@ -67,88 +167,96 @@ const AddModal = props => {
               description: res.msg,
             });
           }
-                })
-
+        });
       }
     });
   };
 
-
   useEffect(() => {
     if (isType != '') {
-            let req1 = getField({ fieldID: itemData.ID })
-            let req2 = loadTableFields({ tableName: formObj1 })
-            let req3 = LoadEventType({})
+      let req1 = getField({ fieldID: itemData.ID });
+      let req2 = loadTableFields({ tableName: formObj1 });
+      let req3 = LoadEventType({});
       Promise.all([req1, req2, req3]).then(res => {
-                res[1].msg === 'Ok' && setFieldName(res[1].data.root)
-                res[2].msg === 'Ok' && setEventList(res[2].data.root)
+        res[1].msg === 'Ok' && setFieldName(res[1].data.root);
+        res[2].msg === 'Ok' && setEventList(res[2].data.root);
         if (res[0].msg === 'Ok') {
-                    form.setFieldsValue({ ...res[0].data.root })
+          form.setFieldsValue({ ...res[0].data.root });
           if (res[0].data.root.ExceptionEventFields === '') {
-                        setCharacterValue('')
-                        setCheckedList([])
-                        setIsShow(false)
+            setCharacterValue('');
+            setCheckedList([]);
+            setIsShow(false);
           } else {
-                        setIsShow(true)
-                        setCharacterValue(res[0].data.root.ExceptionEventFields)
-                        setCheckedList(res[0].data.root.ExceptionEventFields.split(','))
-                    }
-                    setShape(res[0].data.root.Shape)
-                    let coordinates = false, picture = false, must = false
+            setIsShow(true);
+            setCharacterValue(res[0].data.root.ExceptionEventFields);
+            setCheckedList(res[0].data.root.ExceptionEventFields.split(','));
+          }
+          setShape(res[0].data.root.Shape);
+          let coordinates = false,
+            picture = false,
+            must = false;
           switch (res[0].data.root.Shape) {
             case '坐标控件':
-                            res[0].data.root.Config === "当前坐标" ? coordinates = true : coordinates = false
-                            break
-                        case '图片': case '可预览图片':
-                            res[0].data.root.Preset === "拍照相册" ? picture = true : picture = false;
-                            res[0].data.root.ValidationRule === "required" ? must = true : must = false
-                            break
+              res[0].data.root.Config === '当前坐标'
+                ? (coordinates = true)
+                : (coordinates = false);
+              break;
+            case '图片':
+            case '可预览图片':
+              res[0].data.root.Preset === '拍照相册'
+                ? (picture = true)
+                : (picture = false);
+              res[0].data.root.ValidationRule === 'required'
+                ? (must = true)
+                : (must = false);
+              break;
             case '编码':
-                            let code = res[0].data.root.Config.split(".")
-                            form.setFieldsValue({ code: code[0] || '', prefix: code[1] === "undefined" ? '' : code[1] });
-                            break
-
+              let code = res[0].data.root.Config.split('.');
+              form.setFieldsValue({
+                code: code[0] || '',
+                prefix: code[1] === 'undefined' ? '' : code[1],
+              });
+              break;
           }
-                    setPramData({ ...res[0].data.root, coordinates, must, picture })
-                    let index = res[2].data.root.find(item => { return item.Name == res[0].data.root.ExceptionEvent })
-                    console.log('index',index);
-                    getFieldData(index.TableName)
+          setPramData({ ...res[0].data.root, coordinates, must, picture });
+          let index = res[2].data.root.find(item => {
+            return item.Name == res[0].data.root.ExceptionEvent;
+          });
+          console.log('index', index);
+          getFieldData(index.TableName);
         }
-            })
+      });
     }
-
   }, [isVisible]);
 
   const layout = {
     layout: 'horizontal',
     labelCol: {
-            span: 4,
+      span: 3,
     },
     wrapperCol: {
-            span: 17,
+      span: 30,
     },
   };
 
-    const handleChange = (value) => {
+  const handleChange = value => {
     form.setFieldsValue({ schemename: value });
-    }
-
+  };
 
   const onOK = prop => {
     setVisible(false);
     if (type === 'rule') {
       form.setFieldsValue({ ValidationRule: prop });
     } else {
-            setCheckedList(prop.checkedList)
-            setCharacterValue(prop.str)
+      setCheckedList(prop.checkedList);
+      setCharacterValue(prop.str);
     }
-
   };
-    const add = (type) => {
+  const add = type => {
     let obj = form.getFieldsValue();
-        let data = { ...formObj }
+    let data = { ...formObj };
     if (obj.ValidationRule) {
-            let arr = obj.ValidationRule.split(",")
+      let arr = obj.ValidationRule.split(',');
       arr.map(item => {
         switch (item) {
           case 'required':
@@ -161,117 +269,114 @@ const AddModal = props => {
             data.rule.push(item);
             break;
           default:
-                        data.numerical = item
+            data.numerical = item;
         }
-            })
+      });
     } else {
-            data = { rule: [], numerical: '' }
+      data = { rule: [], numerical: '' };
     }
     setType(type);
-        setFormObj(data)
+    setFormObj(data);
     setVisible(true);
-    }
+  };
 
   const handleEvent = (value, e) => {
-        let data = { ...pramData }
-        data.ExceptionEvent = e.name
+    let data = { ...pramData };
+    data.ExceptionEvent = e.name;
     if (e.tablename) {
-            getFieldData(e.tablename)
-            setPramData(data)
+      getFieldData(e.tablename);
+      setPramData(data);
     } else {
-            setIsShow(false)
-            setFiled({})
-            setCharacterValue('')
-            setCheckedList([])
-        }
+      setIsShow(false);
+      setFiled({});
+      setCharacterValue('');
+      setCheckedList([]);
     }
-    const getFieldData = (value) => {
+  };
+  const getFieldData = value => {
     LoadEventFields({ eventTableName: value, distinctFields: '' }).then(res => {
       if (res.msg === 'Ok') {
-                setFiled(formateArrDataA(res.data.root, 'group'))
-                setIsShow(true)
+        setFiled(formateArrDataA(res.data.root, 'group'));
+        setIsShow(true);
       }
-
-        })
-    }
-
+    });
+  };
 
   const formateArrDataA = (initialArr, name) => {
     // 判定传参是否符合规则
     if (!(initialArr instanceof Array)) {
-            return '请传入正确格式的数组'
+      return '请传入正确格式的数组';
     }
     if (!name) {
-            return '请传入对象属性'
+      return '请传入对象属性';
     }
     //先获取一下这个数组中有多少个"name"
-        let nameArr = []
+    let nameArr = [];
     for (let i in initialArr) {
       if (nameArr.indexOf(initialArr[i][`${name}`]) === -1) {
-                nameArr.push(initialArr[i][`${name}`])
+        nameArr.push(initialArr[i][`${name}`]);
       }
     }
     //新建一个包含多个list的结果对象
-        let tempObj = {}
+    let tempObj = {};
     // 根据不同的"name"生成多个数组
     for (let k in nameArr) {
       for (let j in initialArr) {
         if (initialArr[j][`${name}`] == nameArr[k]) {
           // 每次外循环时新建一个对应"name"的数组, 内循环时当前数组不变
-                    tempObj[nameArr[k]] = tempObj[nameArr[k]] || []
-                    tempObj[nameArr[k]].push(initialArr[j])
+          tempObj[nameArr[k]] = tempObj[nameArr[k]] || [];
+          tempObj[nameArr[k]].push(initialArr[j]);
         }
       }
     }
     for (let key in tempObj) {
-            let arr = []
+      let arr = [];
       tempObj[key].map(item => {
         tempObj[key] = arr;
-                arr.push(item.fieldName)
-            })
-        }
-        return tempObj
+        arr.push(item.fieldName);
+      });
     }
-    const handleCharacteristics = (value) => {
-        let data = { ...pramData }
-        setShape(value)
-        data.must = false
-        data.coordinates = false
-        data.picture = false
-        data.Preset = ''
-        setPramData(data)
+    return tempObj;
+  };
+  const handleCharacteristics = value => {
+    let data = { ...pramData };
+    setShape(value);
+    data.must = false;
+    data.coordinates = false;
+    data.picture = false;
+    data.Preset = '';
+    setPramData(data);
     form.setFieldsValue({ ValidationRule: '' });
-        if (value.indexOf("日期") != -1 || value === "时分秒") {
+    if (value.indexOf('日期') != -1 || value === '时分秒') {
       form.setFieldsValue({ Config: undefined });
     }
-
-    }
-    const onCharacterValue = (e) => {
-        setCharacterValue(e.target.value)
-    }
+  };
+  const onCharacterValue = e => {
+    setCharacterValue(e.target.value);
+  };
   const onChangeReady = (e, str) => {
-        let data = { ...pramData }
+    let data = { ...pramData };
     switch (str) {
       case 'ReadOnly':
         data.ReadOnly = e.target.checked;
         break;
       case 'EditableLater':
-                data.EditableLater = e.target.checked
+        data.EditableLater = e.target.checked;
         break;
       case 'must':
-                data.must = e.target.checked
+        data.must = e.target.checked;
         break;
       case 'picture':
-                data.picture = e.target.checked
+        data.picture = e.target.checked;
         break;
       case 'coordinates':
-                data.coordinates = e.target.checked
+        data.coordinates = e.target.checked;
         break;
     }
-        setPramData(data)
-    }
+    setPramData(data);
+  };
   const handleInput = (e, str) => {
-        let data = { ...pramData }
+    let data = { ...pramData };
     switch (str) {
       case 'Unit':
         data.Unit = e.target.value;
@@ -286,49 +391,47 @@ const AddModal = props => {
         data.ExceptionValue = e.target.value;
         break;
       default:
-                break
-
-        }
-        setPramData(data)
+        break;
     }
-    const handleSeparator = (value) => {
-        let data = { ...pramData }
+    setPramData(data);
+  };
+  const handleSeparator = value => {
+    let data = { ...pramData };
     switch (value) {
       case '6':
-                data.Preset = '是'
+        data.Preset = '是';
         form.setFieldsValue({ Config: '是,否' });
         break;
       case '7':
-                data.Preset = '否'
+        data.Preset = '否';
         form.setFieldsValue({ Config: '是,否' });
         break;
       case '8':
-                data.Preset = '否'
+        data.Preset = '否';
         form.setFieldsValue({ Config: '否,是' });
         break;
     }
-        setPramData(data)
-    }
+    setPramData(data);
+  };
   return (
     <>
-            <Modal
-                title='修改'
-                bodyStyle={{ width: '100%', minHeight: '100px' }}
-                width="700px"
-                destroyOnClose
-                maskClosable={false}
-                centered={true}
-                cancelText="取消"
-                okText="确认"
-                {...props}
+      <Drawer
+        title="修改"
+        width="600px"
+        // {...props}
         visible={isVisible}
-                onOk={() => onSubmit()}
-                confirmLoading={loading}
-                forceRender={true}
-                getContainer={false}
+        onClose={onCancel}
+        footer={
+          <Space>
+            <Button onClick={onCancel}>取消</Button>
+            <Button onClick={onSubmit} type="primary">
+              确定
+            </Button>
+          </Space>
+        }
       >
         {isVisible && (
-                    <Form form={form} {...layout} >
+          <Form form={form} {...layout}>
             <Item
               label="字段名"
               name="Name"
@@ -336,138 +439,233 @@ const AddModal = props => {
             >
               <Input placeholder="请输入别名" disabled />
             </Item>
-                        <Item
-                            label="别名"
-                            name="Alias"
-                        >
+            <Item label="别名" name="Alias">
               <Input placeholder="请输入别名" allowClear />
             </Item>
-                        <Item
-                            name="ReadOnly"
-                            label="属性"
-                        >
+            <Item name="ReadOnly" label="属性">
               <div>
-                                <Checkbox checked={pramData.ReadOnly} onChange={(e) => onChangeReady(e, 'ReadOnly')}>只读</Checkbox>
-                                <Checkbox checked={pramData.EditableLater} onChange={(e) => onChangeReady(e, 'EditableLater')}>允许补正(事后修改)</Checkbox>
+                <Checkbox
+                  checked={pramData.ReadOnly}
+                  onChange={e => onChangeReady(e, 'ReadOnly')}
+                >
+                  只读
+                </Checkbox>
+                <Checkbox
+                  checked={pramData.EditableLater}
+                  onChange={e => onChangeReady(e, 'EditableLater')}
+                >
+                  允许补正(事后修改)
+                </Checkbox>
               </div>
             </Item>
-                        <Item
-                            label="同步"
-                            name="SyncEvent"
-                        >
+            <Item label="同步" name="SyncEvent">
               <Radio.Group>
-                                <Radio value={0} style={{ marginRight: '0.5rem' }}>不同步</Radio>
-                                <Radio value={1} style={{ marginRight: '0.5rem' }}>工单 → 事件</Radio>
-                                <Radio value={2} >事件（上报时） → 工单</Radio>
+                <Radio value={0} style={{ marginRight: '0.5rem' }}>
+                  不同步
+                </Radio>
+                <Radio value={1} style={{ marginRight: '0.5rem' }}>
+                  工单 → 事件
+                </Radio>
+                <Radio value={2}>事件（上报时） → 工单</Radio>
               </Radio.Group>
             </Item>
 
-                        <Item
-                            label="形态"
-                        >
+            <Item label="形态">
               <div className={styles.listEvent}>
-                                <Select style={{ width: '42%' }} value={Shape} onChange={handleCharacteristics}>
-                                    {characteristics.length ? characteristics.map((item, index) => { return <Select.Option key={index} value={item}>{item}</Select.Option>; }) : ''}
+                <Select
+                  style={{ width: '42%' }}
+                  value={Shape}
+                  onChange={handleCharacteristics}
+                >
+                  {characteristics.length
+                    ? characteristics.map((item, index) => {
+                        return (
+                          <Select.Option key={index} value={item}>
+                            {item}
+                          </Select.Option>
+                        );
+                      })
+                    : ''}
                 </Select>
-                                <div className={styles.unit}>单位：<Input style={{ width: '5rem' }} placeholder="" allowClear value={pramData.Unit} onChange={(e) => handleInput(e, 'Unit')} /></div>
-                                <div className={styles.unit}>宽：<Input style={{ width: '4rem' }} placeholder="" allowClear value={pramData.RowSpan} onChange={(e) => handleInput(e, 'RowSpan')} /></div>
+                <div className={styles.unit}>
+                  单位：
+                  <Input
+                    style={{ width: '5rem' }}
+                    placeholder=""
+                    allowClear
+                    value={pramData.Unit}
+                    onChange={e => handleInput(e, 'Unit')}
+                  />
+                </div>
+                <div className={styles.unit}>
+                  宽：
+                  <Input
+                    style={{ width: '4rem' }}
+                    placeholder=""
+                    allowClear
+                    value={pramData.RowSpan}
+                    onChange={e => handleInput(e, 'RowSpan')}
+                  />
+                </div>
               </div>
             </Item>
             {(() => {
               switch (Shape) {
                 case '编码':
-                                    return <>
-                                        <Item
-                                            label="前缀"
-                                            name="prefix"
-                                        >
-                                            <Input style={{ width: '95%' }} placeholder="" allowClear />
+                  return (
+                    <>
+                      <Item label="前缀" name="prefix">
+                        <Input
+                          style={{ width: '95%' }}
+                          placeholder=""
+                          allowClear
+                        />
                       </Item>
-                                        <Item
-                                            label="编码方式"
-                                            name="code"
-                                        >
+                      <Item label="编码方式" name="code">
                         <Radio.Group>
-                                                <Radio value='年份编码' style={{ marginRight: '0.5rem' }}>XJ-2019-000001（前缀-年份-六位编码）</Radio>
-                                                <Radio value='年月编码' style={{ marginRight: '0.5rem' }}>XJ-201909-000001（前缀-年份月份-六位编码）</Radio>
-                                                <Radio value='一般编码' defaultChecked >XJ00000001（前缀 八位编码）</Radio>
+                          <Radio
+                            value="年份编码"
+                            style={{ marginRight: '0.5rem' }}
+                          >
+                            XJ-2019-000001（前缀-年份-六位编码）
+                          </Radio>
+                          <Radio
+                            value="年月编码"
+                            style={{ marginRight: '0.5rem' }}
+                          >
+                            XJ-201909-000001（前缀-年份月份-六位编码）
+                          </Radio>
+                          <Radio value="一般编码" defaultChecked>
+                            XJ00000001（前缀 八位编码）
+                          </Radio>
                         </Radio.Group>
                       </Item>
                     </>
-                                case '值选择器': case '值复选器': case '可编辑值选择器': case '平铺值选择器':
-                                    return <> <Item
-                                        label="可选值"
-                                        name="Config"
-                                    >
+                  );
+                case '值选择器':
+                case '值复选器':
+                case '可编辑值选择器':
+                case '平铺值选择器':
+                  return (
+                    <>
+                      {' '}
+                      <Item label="可选值" name="Config">
                         <TextArea allowClear />
                       </Item>
-                                        <Item
-                                            colon={false}
-                                            label=" "
-                                        >  <div style={{ display: 'flex', alignItems: 'center' }}>
-                                                <span style={{ marginRight: '0.4rem' }}>以英文逗号为分隔符填写，或其他分隔符粘贴：</span>
-                                                <Select onChange={handleSeparator} style={{ width: '30%' }}>
-                                                    <Select.Option value='0'>以,分隔(英文逗号)</Select.Option>
-                                                    <Select.Option value='1'>以/分隔(正斜杠)</Select.Option>
-                                                    <Select.Option value='2'>以\\分隔(反斜杠)</Select.Option>
-                                                    <Select.Option value='3'>以、分隔(中文顿号)</Select.Option>
-                                                    <Select.Option value='4'>以;分隔(英文分号)</Select.Option>
-                                                    <Select.Option value='5'>以；分隔(中文分号)</Select.Option>
-                                                    <Select.Option value='6'>(是)/否</Select.Option>
-                                                    <Select.Option value='7'>是/(否)</Select.Option>
-                                                    <Select.Option value='8'>(否)/是</Select.Option>
+                      <Item colon={false} label=" ">
+                        {' '}
+                        <div style={{ display: 'flex', alignItems: 'center' }}>
+                          <span style={{ marginRight: '0.4rem' }}>
+                            以英文逗号为分隔符填写，或其他分隔符粘贴：
+                          </span>
+                          <Select
+                            onChange={handleSeparator}
+                            style={{ width: '30%' }}
+                          >
+                            <Select.Option value="0">
+                              以,分隔(英文逗号)
+                            </Select.Option>
+                            <Select.Option value="1">
+                              以/分隔(正斜杠)
+                            </Select.Option>
+                            <Select.Option value="2">
+                              以\\分隔(反斜杠)
+                            </Select.Option>
+                            <Select.Option value="3">
+                              以、分隔(中文顿号)
+                            </Select.Option>
+                            <Select.Option value="4">
+                              以;分隔(英文分号)
+                            </Select.Option>
+                            <Select.Option value="5">
+                              以；分隔(中文分号)
+                            </Select.Option>
+                            <Select.Option value="6">(是)/否</Select.Option>
+                            <Select.Option value="7">是/(否)</Select.Option>
+                            <Select.Option value="8">(否)/是</Select.Option>
                           </Select>
                         </div>
-
                       </Item>
                     </>
-                                case '图片': case '可预览图片':
-                                    return <Item
-                                        name="ReadOnly"
-                                        label="选项"
-                                    >
+                  );
+                case '图片':
+                case '可预览图片':
+                  return (
+                    <Item name="ReadOnly" label="选项">
                       <div>
-                                            <Checkbox checked={pramData.picture} onChange={(e) => onChangeReady(e, 'picture')}>允许从相册选取</Checkbox>
-                                            <Checkbox checked={pramData.must} onChange={(e) => onChangeReady(e, 'must')}>必填字段</Checkbox>
+                        <Checkbox
+                          checked={pramData.picture}
+                          onChange={e => onChangeReady(e, 'picture')}
+                        >
+                          允许从相册选取
+                        </Checkbox>
+                        <Checkbox
+                          checked={pramData.must}
+                          onChange={e => onChangeReady(e, 'must')}
+                        >
+                          必填字段
+                        </Checkbox>
                       </div>
                     </Item>
-                                case '日期时间': case '日期': case '日期月份': case '日期年份': case '日期周': case '时分秒':
-                                    return <Item
-                                        label="选项"
-                                        name="Config"
-                                    >
+                  );
+                case '日期时间':
+                case '日期':
+                case '日期月份':
+                case '日期年份':
+                case '日期周':
+                case '时分秒':
+                  return (
+                    <Item label="选项" name="Config">
                       <Radio.Group style={{ marginTop: '0.3rem' }}>
-                                            <Radio value='默认为空' defaultChecked style={{ width: '18rem', marginBottom: '0.5rem' }}>默认为空</Radio>
-                                            <Radio value='' >默认为当前时间</Radio>
-                                            <Radio value='不可选择' style={{ width: '18rem' }}>锁定为当前时间(通过用户点击刷新)</Radio>
-                                            <Radio value='不超过当前时间' >不超过当前时间</Radio>
+                        <Radio
+                          value="默认为空"
+                          defaultChecked
+                          style={{ width: '18rem', marginBottom: '0.5rem' }}
+                        >
+                          默认为空
+                        </Radio>
+                        <Radio value="">默认为当前时间</Radio>
+                        <Radio value="不可选择" style={{ width: '18rem' }}>
+                          锁定为当前时间(通过用户点击刷新)
+                        </Radio>
+                        <Radio value="不超过当前时间">不超过当前时间</Radio>
                       </Radio.Group>
                     </Item>
+                  );
                 case '坐标控件':
-                                    return <Item
-                                        label="选项"
-                                        name="Config"
-                                    >
+                  return (
+                    <Item label="选项" name="Config">
                       <div>
-                                            <Checkbox value='当前坐标' style={{ marginRight: '0.2rem' }} checked={pramData.coordinates} onChange={(e) => onChangeReady(e, 'coordinates')}></Checkbox>锁定为当前位置坐标
+                        <Checkbox
+                          value="当前坐标"
+                          style={{ marginRight: '0.2rem' }}
+                          checked={pramData.coordinates}
+                          onChange={e => onChangeReady(e, 'coordinates')}
+                        />
+                        锁定为当前位置坐标
                       </div>
                     </Item>
+                  );
                 default:
-                                    return <Item
-                                        label="配置"
-                                        name="Config"
-                                    >
+                  return (
+                    <Item label="配置" name="Config">
                       <TextArea allowClear />
                     </Item>
+                  );
               }
-                        }
-                        )()}
-                        {Shape === '图片' || Shape === '可预览图片' ? '' :
-                            <Item
-                                label="预设值"
-                            >
+            })()}
+            {Shape === '图片' || Shape === '可预览图片' ? (
+              ''
+            ) : (
+              <Item label="预设值">
                 <div className={styles.listEvent}>
-                                    <Input style={{ width: '40%', height: '1.8rem' }} value={pramData.Preset} onChange={(e) => handleInput(e, 'Preset')} placeholder="" allowClear />
+                  <Input
+                    style={{ width: '40%', height: '1.8rem' }}
+                    value={pramData.Preset}
+                    onChange={e => handleInput(e, 'Preset')}
+                    placeholder=""
+                    allowClear
+                  />
                   <Item
                     style={{ marginLeft: '1rem' }}
                     label="验证"
@@ -479,17 +677,26 @@ const AddModal = props => {
                   <Tooltip title="选择验证规则">
                     <PlusSquareOutlined
                       onClick={() => add('rule')}
-                                            style={{ fontSize: '24px', color: '#1890FF', display: 'flex', alignItems: 'center' }}
+                      style={{
+                        fontSize: '24px',
+                        color: '#1890FF',
+                        display: 'flex',
+                        alignItems: 'center',
+                      }}
                     />
                   </Tooltip>
                 </div>
               </Item>
-                        }
-                        <Item
-                            label="异常值"
-                        >
+            )}
+            <Item label="异常值">
               <div className={styles.listEvent}>
-                                <Input style={{ width: '40%', height: '1.8rem' }} value={pramData.ExceptionValue} onChange={(e) => handleInput(e, 'ExceptionValue')} placeholder="" allowClear />
+                <Input
+                  style={{ width: '40%', height: '1.8rem' }}
+                  value={pramData.ExceptionValue}
+                  onChange={e => handleInput(e, 'ExceptionValue')}
+                  placeholder=""
+                  allowClear
+                />
                 <Item
                   style={{ marginLeft: '1rem' }}
                   label="触发事件"
@@ -497,27 +704,51 @@ const AddModal = props => {
                   style={{ margin: '0 0 0 1rem' }}
                 >
                   <Select style={{ width: '12rem' }} onChange={handleEvent}>
-                                        {eventList.length ? eventList.map((item, index) => { return <Select.Option key={index} tablename={item.TableName} name={item.Name} value={item.ID}>{item.Name}</Select.Option>; }) : ''}
+                    {eventList.length
+                      ? eventList.map((item, index) => {
+                          return (
+                            <Select.Option
+                              key={index}
+                              tablename={item.TableName}
+                              name={item.Name}
+                              value={item.ID}
+                            >
+                              {item.Name}
+                            </Select.Option>
+                          );
+                        })
+                      : ''}
                   </Select>
                 </Item>
               </div>
             </Item>
-                        <Item
-                            label="字段集"
-                        >
+            <Item label="字段集">
               <div className={styles.listEvent}>
-                                <Input style={{ width: '93%' }} placeholder="" disabled={!isShow} onChange={onCharacterValue} allowClear value={characterValue} />
+                <Input
+                  style={{ width: '93%' }}
+                  placeholder=""
+                  disabled={!isShow}
+                  onChange={onCharacterValue}
+                  allowClear
+                  value={characterValue}
+                />
                 <Tooltip title={!isShow ? '' : '字符集选择'}>
                   <PlusSquareOutlined
-                                        onClick={() => !isShow ? '' : add('characteristics')}
-                                        style={{ fontSize: '24px', color: !isShow ? 'gray' : '#1890FF', cursor: !isShow ? 'no-drop' : 'pointer', display: 'flex', alignItems: 'center', marginLeft: '0.5rem' }}
+                    onClick={() => (!isShow ? '' : add('characteristics'))}
+                    style={{
+                      fontSize: '24px',
+                      color: !isShow ? 'gray' : '#1890FF',
+                      cursor: !isShow ? 'no-drop' : 'pointer',
+                      display: 'flex',
+                      alignItems: 'center',
+                      marginLeft: '0.5rem',
+                    }}
                   />
                 </Tooltip>
               </div>
             </Item>
           </Form>
         )}
-            </Modal>
         <ChangeAdd
           visible={visible}
           onCancel={() => setVisible(false)}
@@ -526,7 +757,9 @@ const AddModal = props => {
           isType={type}
           filed={filed}
           characterValue={characterValue}
-                formObj={formObj} />
+          formObj={formObj}
+        />
+      </Drawer>
     </>
   );
 };

src/pages/platformCenter/filedConfig/filedConfig.jsx

@@ -8,19 +8,29 @@ import {
   Popconfirm,
   Spin,
   notification,
-    Tooltip
+  Tooltip,
 } from 'antd';
-import { EditOutlined, DeleteOutlined,SortDescendingOutlined,PlusSquareOutlined,RollbackOutlined  } from '@ant-design/icons';
-import { reloadTableFields, removeFields, loadUnattachedTables } from '@/services/platform/bs';
+import {
+  EditOutlined,
+  DeleteOutlined,
+  SortDescendingOutlined,
+  PlusSquareOutlined,
+  RollbackOutlined,
+} from '@ant-design/icons';
+import {
+  reloadTableFields,
+  removeFields,
+  loadUnattachedTables,
+} from '@/services/platform/bs';
 import FieldEditor from './fieldEditor';
 import { useHistory } from 'react-router-dom';
-import styles from './index.less'
-import AffiliateAdd from '../bsmanager/tablemanager/components/Field/affiliateAdd'
-import LoadGroup from '../bsmanager/tablemanager/components/Field/loadGroup'
+import styles from './index.less';
+import AffiliateAdd from '../bsmanager/tablemanager/components/Field/affiliateAdd';
+import LoadGroup from '../bsmanager/tablemanager/components/Field/loadGroup';
 const AddModal = props => {
   const history = useHistory();
   const [allData, setAllData] = useState([]);
-    const [tableList, setTableList] = useState([])
+  const [tableList, setTableList] = useState([]);
   const [tableData, setTableData] = useState([]);
   const [treeLoading, setTreeLoading] = useState(false);
   const [formObj, setFormObj] = useState('');
@@ -28,8 +38,8 @@ const AddModal = props => {
   const [isVisible, setIsVisible] = useState(false); // 弹窗
   const [isType, setIsType] = useState(''); // 弹窗类型
   const [itemData, setItemData] = useState({});
-    const [select, setSelect] = useState([])
-    const [selectTableName, setSelectTableName] = useState({})
+  const [select, setSelect] = useState([]);
+  const [selectTableName, setSelectTableName] = useState({});
   const [pramFormObj, setPramFormObj] = useState({});
   const [visible, setVisible] = useState(false); // 弹窗
   const [type, setType] = useState(''); // 弹窗类型
@@ -45,12 +55,21 @@ const AddModal = props => {
   const getField = () => {
     loadUnattachedTables().then(res => {
       if (res.data.root && res.data.root.length) {
-                setTableList(res.data.root)
+        setTableList(res.data.root);
       }
-
-        })
+    });
+  };
+  // 处理表格特殊样式
+  const styleConfig = record => {
+    if (record.Type === 1) {
+      return 'red';
+    }
+    if (record.Type === 2) {
+      return 'grey';
     }
-    const expandedRowRender = (item) => {
+    return '000000D9';
+  };
+  const expandedRowRender = item => {
     const columns = [
       {
         title: '字段名',
@@ -58,7 +77,11 @@ const AddModal = props => {
         key: 'name',
         width: 190,
         align: 'left',
-                render: text => <div style={{ paddingLeft: '2rem' }}>{text}</div>,
+        render: (text, record) => (
+          <div style={{ paddingLeft: '2rem', color: styleConfig(record) }}>
+            {text}
+          </div>
+        ),
       },
       {
         title: '别名',
@@ -66,6 +89,9 @@ const AddModal = props => {
         key: 'alias',
         align: 'center',
         width: 200,
+        render: (text, record) => (
+          <span style={{ color: styleConfig(record) }}>{text} </span>
+        ),
       },
       {
         title: '字段类型',
@@ -73,6 +99,9 @@ const AddModal = props => {
         key: 'storeType',
         align: 'center',
         width: 200,
+        render: (text, record) => (
+          <span style={{ color: styleConfig(record) }}>{text} </span>
+        ),
       },
       {
         title: '形态',
@@ -80,6 +109,9 @@ const AddModal = props => {
         key: 'shape',
         align: 'center',
         width: 200,
+        render: (text, record) => (
+          <span style={{ color: styleConfig(record) }}>{text} </span>
+        ),
       },
       {
         title: '配置',
@@ -87,6 +119,9 @@ const AddModal = props => {
         key: 'config',
         align: 'center',
         width: 200,
+        render: (text, record) => (
+          <span style={{ color: styleConfig(record) }}>{text} </span>
+        ),
       },
 
       {
@@ -95,6 +130,9 @@ const AddModal = props => {
         key: 'readOnly',
         align: 'center',
         width: 200,
+        render: (text, record) => (
+          <span style={{ color: styleConfig(record) }}>{text} </span>
+        ),
       },
       {
         title: '同步',
@@ -102,6 +140,9 @@ const AddModal = props => {
         key: 'syncEvent',
         align: 'center',
         width: 200,
+        render: (text, record) => (
+          <span style={{ color: styleConfig(record) }}>{text} </span>
+        ),
       },
       {
         title: '操作',
@@ -111,10 +152,12 @@ const AddModal = props => {
         render: (text, record) => (
           <Space>
             <Tooltip title="修改">
-                            <EditOutlined  style={{ fontSize: '16px', color: '#1890FF' }}
+              <EditOutlined
+                style={{ fontSize: '16px', color: '#1890FF' }}
                 onClick={() => {
                   editor(record);
-                                }}>
+                }}
+              >
                 编辑
               </EditOutlined>
             </Tooltip>
@@ -128,7 +171,11 @@ const AddModal = props => {
                 }}
               >
                 <Tooltip title="删除">
-                                    <DeleteOutlined style={{ fontSize: '16px', color: '#e86060' }}>删除</DeleteOutlined>
+                  <DeleteOutlined
+                    style={{ fontSize: '16px', color: '#e86060' }}
+                  >
+                    删除
+                  </DeleteOutlined>
                 </Tooltip>
               </Popconfirm>
             </div>
@@ -137,23 +184,35 @@ const AddModal = props => {
       },
     ];
 
-        return <Table columns={columns} onRow={record => {
+    return (
+      <Table
+        columns={columns}
+        onRow={record => {
           return {
             onDoubleClick: event => {
-                    event.stopPropagation()
+              event.stopPropagation();
               editor(record);
             },
             onClick: event => {
-                    event.stopPropagation()
-                    setSelectTableName(record)
+              event.stopPropagation();
+              setSelectTableName(record);
             }, // 点击行
-            }
-        }} bordered rowClassName={setRowClassName} showHeader={false} dataSource={allData[item.type]} pagination={false} />;
           };
-    const setRowClassName = (record) =>
-        Object.entries(record).toString() === Object.entries(selectTableName).toString() ? styles.clickRowStyle : '';
+        }}
+        bordered
+        rowClassName={setRowClassName}
+        showHeader={false}
+        dataSource={allData[item.type]}
+        pagination={false}
+      />
+    );
+  };
+  const setRowClassName = record =>
+    Object.entries(record).toString() ===
+    Object.entries(selectTableName).toString()
+      ? styles.clickRowStyle
+      : '';
   const columns = [
-
     {
       title: '字段名',
       dataIndex: 'type',
@@ -161,9 +220,12 @@ const AddModal = props => {
       align: 'left',
       width: 150,
       render: text => {
-                return (<a >{text}(共{allData[text] ? allData[text].length : ''}条)</a>)
-            }
-
+        return (
+          <a>
+            {text}(共{allData[text] ? allData[text].length : ''}条)
+          </a>
+        );
+      },
     },
     {
       title: '别名',
@@ -214,69 +276,67 @@ const AddModal = props => {
       ellipsis: true,
       key: 'title',
       align: 'center',
-
     },
-
   ];
   useEffect(() => {
     if (props.match.params.id) {
-            setFormObj(props.match.params.id)
+      setFormObj(props.match.params.id);
       setTreeLoading(true);
       reloadTableFields({
         tableName: props.match.params.id,
       }).then(res => {
         setTreeLoading(false);
         if (res.msg === 'Ok') {
-                    let arr = formateArrDataA(res.data.root, 'group')
-                    let newArr = []
+          let arr = formateArrDataA(res.data.root, 'group');
+          let newArr = [];
           Object.keys(arr).map((item, index) => {
-                        newArr.push({ type: item, key: index, id: index })
-                    })
+            newArr.push({ type: item, key: index, id: index });
+          });
           setAllData(arr);
           setTableData(newArr);
-                    setSelect(newArr)
+          setSelect(newArr);
         }
       });
-            getField()
+      getField();
     }
   }, [flag]);
   const formateArrDataA = (initialArr, name) => {
     // 判定传参是否符合规则
     if (!(initialArr instanceof Array)) {
-            return '请传入正确格式的数组'
+      return '请传入正确格式的数组';
     }
     if (!name) {
-            return '请传入对象属性'
+      return '请传入对象属性';
     }
     //先获取一下这个数组中有多少个"name"
-        let nameArr = []
+    let nameArr = [];
     for (let i in initialArr) {
       if (nameArr.indexOf(initialArr[i][`${name}`]) === -1) {
-                nameArr.push(initialArr[i][`${name}`])
+        nameArr.push(initialArr[i][`${name}`]);
       }
     }
     //新建一个包含多个list的结果对象
-        let tempObj = {}
+    let tempObj = {};
     // 根据不同的"name"生成多个数组
     for (let k in nameArr) {
       for (let j in initialArr) {
         if (initialArr[j][`${name}`] == nameArr[k]) {
           // 每次外循环时新建一个对应"name"的数组, 内循环时当前数组不变
-                    tempObj[nameArr[k]] = tempObj[nameArr[k]] || []
-                    tempObj[nameArr[k]].push(initialArr[j])
+          tempObj[nameArr[k]] = tempObj[nameArr[k]] || [];
+          tempObj[nameArr[k]].push(initialArr[j]);
         }
       }
     }
     for (let keys in tempObj) {
-            let arr = []
+      let arr = [];
       tempObj[keys].map((item, index) => {
         tempObj[keys] = arr;
-                item.key = index
-                arr.push(item)
-            })
-        }
-        return tempObj
+        item.key = index;
+        arr.push(item);
+      });
     }
+    return tempObj;
+  };
   // 删除表字段
   const deleteChart = record => {
     removeFields({ fieldIDs: record.ID }).then(res => {
@@ -298,44 +358,63 @@ const AddModal = props => {
   };
   // 返回上一级
   const back = () => {
-        let template = props.history.location.state.template
-        history.push({ pathname: '/platformCenter/bsmanger/tablemanger', state: { template } })
-    }
+    let template = props.history.location.state.template;
+    history.push({
+      pathname: '/platformCenter/bsmanger/tablemanger',
+      state: { template },
+    });
+  };
   const onUnfold = (expanded, record) => {
-        const data = [...select]
-        let index = data.indexOf(record)
+    const data = [...select];
+    let index = data.indexOf(record);
     if (expanded) {
-            data.push(record)
+      data.push(record);
     } else {
-            data.splice(index, 1)
-        }
-        setSelect(data)
+      data.splice(index, 1);
     }
+    setSelect(data);
+  };
   //附加
-    const add = (record) => {
+  const add = record => {
     setPramFormObj(props.history.location.state.template);
     setType('affiliateAdd');
     setVisible(true);
-    }
+  };
   //分组与排序
-    const sort = (record) => {
+  const sort = record => {
     setPramFormObj(props.history.location.state.template);
     setType('sort');
     setVisible(true);
-    }
+  };
   const onSubmit = prop => {
     setVisible(false);
-        setFlag(flag + 1)
+    setFlag(flag + 1);
   };
   return (
-
-        <><Spin tip="loading..." spinning={treeLoading}>
+    <>
+      <Spin tip="loading..." spinning={treeLoading}>
         <div className={styles.containerBox}>
-                <div className={styles.config}><div className={styles.title}>{formObj}(字段配置)</div>
+          <div className={styles.config}>
+            <div className={styles.title}>{formObj}(字段配置)</div>
             <div className={styles.btn}>
-                        <Button type="primary" icon={<PlusSquareOutlined />} onClick={add}>附加</Button>
-                        <Button type="primary" icon={<SortDescendingOutlined /> }onClick={sort}>分组排序</Button>
-                        <Button type="primary" icon={<RollbackOutlined />} onClick={back}>返回</Button></div>
+              <Button
+                type="primary"
+                icon={<PlusSquareOutlined />}
+                onClick={add}
+              >
+                附加
+              </Button>
+              <Button
+                type="primary"
+                icon={<SortDescendingOutlined />}
+                onClick={sort}
+              >
+                分组排序
+              </Button>
+              <Button type="primary" icon={<RollbackOutlined />} onClick={back}>
+                返回
+              </Button>
+            </div>
           </div>
 
           <Table
@@ -343,22 +422,25 @@ const AddModal = props => {
             dataSource={tableData}
             expandable={{ expandedRowRender }}
             size="small"
-                    rowKey='id'
+            rowKey="id"
             expandedRowKeys={select.map(item => item.key)} //展开的行
             expandRowByClick={true}
             defaultExpandAllRows={true}
             pagination={false}
             scroll={{ y: 'calc(100vh - 186px)' }}
             size="small"
-                    onExpand={onUnfold} />
+            onExpand={onUnfold}
+          />
         </div>
-        </Spin><FieldEditor
+      </Spin>
+      <FieldEditor
         isVisible={isVisible}
         isType={isType}
         itemData={itemData}
         formObj1={formObj}
         onCancel={() => setIsVisible(false)}
-                callBackSubmit={Submit} />
+        callBackSubmit={Submit}
+      />
       {visible && type === 'affiliateAdd' && (
         <AffiliateAdd
           visible={visible}
@@ -378,8 +460,8 @@ const AddModal = props => {
           onCancel={() => setVisible(false)}
           callBackSubmit={onSubmit}
         />
-            )}</>
-
+      )}
+    </>
   );
 };
 export default AddModal;

src/pages/platformCenter/videoManager/index.js

 import React, { useState, useEffect } from 'react';
+import {
+  Row,
+  Col,
+  Select,
+  Spin,
+  Table,
+  Input,
+  Button,
+  Space,
+  Tooltip,
+  Popconfirm,
+  notification,
+} from 'antd';
+import {
+  SyncOutlined,
+  PlusOutlined,
+  ArrowUpOutlined,
+  EditTwoTone,
+  DeleteOutlined,
+  VideoCameraOutlined,
+  ZoomInOutlined,
+  CaretUpFilled,
+  CaretDownFilled,
+} from '@ant-design/icons';
+import voca from 'voca';
 import styles from './index.less';
-import { Row, Col, Select, Spin, Table, Input, Button, Space, Tooltip, Popconfirm, notification } from 'antd';
-import { SyncOutlined, PlusOutlined, ArrowUpOutlined, EditTwoTone, DeleteOutlined, VideoCameraOutlined, ZoomInOutlined, CaretUpFilled, CaretDownFilled } from '@ant-design/icons';
-import { GetVideoConfigList, deleteInsertVideoConfig } from '@/services/platform/videoManger';
+import {
+  GetVideoConfigList,
+  deleteInsertVideoConfig,
+} from '@/services/platform/videoManger';
 import AddModal from './AddModal';
 import CheckModal from './CheckModal';
 import VideoModal from './VideoModal';
-import voca from 'voca';
 
 const videoManager = () => {
-    const [configurationType, setConfigurationType] = useState('1')
+  const [configurationType, setConfigurationType] = useState('1');
   const [loading, setLoading] = useState(false); // 加载
   const [searchWord, setSearchWord] = useState(''); // 关键字
   const { Search } = Input;
-    const [addVisible, setAddVisible] = useState(false)
-    const [checkVisible, setCheckVisible] = useState(false)
-    const [videoVisible, setVideoVisible] = useState(false)
-    const [type, setType] = useState('萤石云')//视频厂商类型
-    const [type1, setType1] = useState('bb')//表单样式
-    const [kind, setKind] = useState('')
-    const [tableData, setTableData] = useState('')
-    const [flag, setFlag] = useState(0)
-    const [obj, setObj] = useState({})
-    const [show1, setShow1] = useState('block')
-    const [show2, setShow2] = useState('none')
+  const [addVisible, setAddVisible] = useState(false);
+  const [checkVisible, setCheckVisible] = useState(false);
+  const [videoVisible, setVideoVisible] = useState(false);
+  const [type, setType] = useState('萤石云'); // 视频厂商类型
+  const [type1, setType1] = useState('bb'); // 表单样式
+  const [kind, setKind] = useState('');
+  const [tableData, setTableData] = useState('');
+  const [flag, setFlag] = useState(0);
+  const [obj, setObj] = useState({});
+  const [show1, setShow1] = useState('block');
+  const [show2, setShow2] = useState('none');
 
   const columns = [
     {
@@ -31,53 +56,85 @@ const videoManager = () => {
       dataIndex: 'Name',
       key: 'Name',
       width: 200,
-            align: 'center'
-        }, {
+      align: 'center',
+    },
+    {
       title: '视频厂商',
       dataIndex: 'VideoManufacturer',
       key: 'VideoManufacturer',
       width: 150,
-            align: 'center'
-        }, {
+      align: 'center',
+    },
+    {
       title: '登录名',
       dataIndex: 'LoginName',
       key: 'LoginName',
       width: 350,
-            align: 'center'
-        }, {
+      align: 'center',
+    },
+    {
       title: '登录密码',
       dataIndex: 'LoginPwd',
       key: 'LoginPwd',
       width: 350,
-            align: 'center'
-        }, {
+      align: 'center',
+    },
+    {
       title: '设备编码',
       dataIndex: 'EquipmentCode',
       key: 'EquipmentCode',
       width: 150,
-            align: 'center'
-        }, {
+      align: 'center',
+    },
+    {
       title: '通道ID',
       dataIndex: 'PassageId',
       key: 'PassageId',
       width: 100,
-            align: 'center'
-        }, {
+      align: 'center',
+    },
+    {
       title: '刻录机名称',
       dataIndex: 'RecorderName',
       key: 'RecorderName',
       width: 100,
-            align: 'center'
-        }, {
+      align: 'center',
+    },
+    {
       // title: '录入时间',
       dataIndex: 'CreateTime',
       key: 'CreateTime',
       width: 150,
       align: 'center',
       title: (
-                      <div>录入时间<Tooltip title="点击降序"><CaretUpFilled style={{display:show1,color:'#1890ff',marginTop: '-13px', marginLeft: '60%'}} onClick={()=> shengxu()}/></Tooltip><Tooltip title="点击升序"><CaretDownFilled style={{display:show2,color:'#1890ff',marginTop: '-13px', marginLeft: '60%'}} onClick={()=> jiangxu()}/></Tooltip></div>
-                )
-        }, {
+        <div>
+          录入时间
+          <Tooltip title="点击降序">
+            <CaretUpFilled
+              style={{
+                display: show1,
+                color: '#1890ff',
+                marginTop: '-13px',
+                marginLeft: '60%',
+              }}
+              onClick={() => shengxu()}
+            />
+          </Tooltip>
+          <Tooltip title="点击升序">
+            <CaretDownFilled
+              style={{
+                display: show2,
+                color: '#1890ff',
+                marginTop: '-13px',
+                marginLeft: '60%',
+              }}
+              onClick={() => jiangxu()}
+            />
+          </Tooltip>
+        </div>
+      ),
+    },
+    {
       title: '操作',
       dataIndex: '',
       key: '',
@@ -123,25 +180,25 @@ const videoManager = () => {
           </Tooltip>
         </Space>
       ),
-        }
-    ]
+    },
+  ];
 
-    const edit = record =>{
-       setAddVisible(true)
-       setKind('edit')
-       setObj(record)
-    }
-    const preView = record =>{
-        setVideoVisible(true)
-        setObj(record)
-    }
-    const check = record =>{
-        setCheckVisible(true)
-        setObj(record)
-        console.log(record)
-    }
-    const delete1 = record =>{
-        deleteInsertVideoConfig({Id:record.Id}).then(res =>{
+  const edit = record => {
+    setAddVisible(true);
+    setKind('edit');
+    setObj(record);
+  };
+  const preView = record => {
+    setVideoVisible(true);
+    setObj(record);
+  };
+  const check = record => {
+    setCheckVisible(true);
+    setObj(record);
+    console.log(record);
+  };
+  const delete1 = record => {
+    deleteInsertVideoConfig({ Id: record.Id }).then(res => {
       if (res.msg === 'Ok') {
         notification.success({
           message: '提示',
@@ -156,120 +213,120 @@ const videoManager = () => {
           description: res.msg,
         });
       }
-        })
-    }
-    const shengxu =()=>{
-        setShow1('none')
-        setShow2('block')
-        setLoading(true)
+    });
+  };
+  const shengxu = () => {
+    setShow1('none');
+    setShow2('block');
+    setLoading(true);
     GetVideoConfigList({
       VideoType: type,
       pageIndex: 1,
       pageSize: 1000,
-            IsAsc:true
-        }).then(res=>{
-            setLoading(false)
-            if(res.msg ==='Ok'){
-               setTableData(res.data.list)
-            }
-        })
+      IsAsc: true,
+    }).then(res => {
+      setLoading(false);
+      if (res.msg === 'Ok') {
+        setTableData(res.data.list);
       }
-    const jiangxu =()=>{
-        setShow2('none')
-        setShow1('block')
-        setLoading(true)
+    });
+  };
+  const jiangxu = () => {
+    setShow2('none');
+    setShow1('block');
+    setLoading(true);
     GetVideoConfigList({
       VideoType: type,
       pageIndex: 1,
       pageSize: 1000,
-            IsAsc:false
-        }).then(res=>{
-            setLoading(false)
-            if(res.msg ==='Ok'){
-               setTableData(res.data.list)
-            }
-        })
+      IsAsc: false,
+    }).then(res => {
+      setLoading(false);
+      if (res.msg === 'Ok') {
+        setTableData(res.data.list);
       }
-    useEffect(()=>{
-        setLoading(true)
-        getData()
-    },[])
+    });
+  };
+  useEffect(() => {
+    setLoading(true);
+    getData();
+  }, []);
 
-    useEffect(()=>{
-        setLoading(true)
-        getData()
-    },[type,flag])
+  useEffect(() => {
+    setLoading(true);
+    getData();
+  }, [type, flag]);
 
-    const getData =() =>{
+  const getData = () => {
     GetVideoConfigList({
       VideoType: type,
       pageIndex: 1,
-            pageSize: 1000
-        }).then(res=>{
-            setLoading(false)
-            if(res.msg ==='Ok'){
-               setTableData(res.data.list)
-            }
-        })
+      pageSize: 1000,
+    }).then(res => {
+      setLoading(false);
+      if (res.msg === 'Ok') {
+        setTableData(res.data.list);
       }
+    });
+  };
   const selectChange = value => {
-        setConfigurationType(value)
+    setConfigurationType(value);
     switch (value) {
       case '1':
-                setType('萤石云')
-                setType1('bb')
+        setType('萤石云');
+        setType1('bb');
         break;
       case '2':
-                setType('海康')
-                setType1('bb')
+        setType('海康');
+        setType1('bb');
         break;
       case '3':
-                setType('海康1.2')
-                setType1('aa')
+        setType('海康1.2');
+        setType1('aa');
         break;
       case '4':
-                setType('海康NVR')
-                setType1('aa')
+        setType('海康NVR');
+        setType1('aa');
         break;
     }
-    }
+  };
 
   // 获取搜索框的值
   const handleSearch = e => {
     setSearchWord(e.target.value);
   };
-    //搜索
+  // 搜索
   const submitSearchUser = () => {
     GetVideoConfigList({
       VideoType: type,
       pageIndex: 1,
       pageSize: 1000,
-            QueryWhere: searchWord
-        }).then(res=>{
-            if(res.msg ==='Ok'){
-               setTableData(res.data.list)
-            }
-        })
+      QueryWhere: searchWord,
+    }).then(res => {
+      if (res.msg === 'Ok') {
+        setTableData(res.data.list);
       }
-    //重置
+    });
+  };
+  // 重置
   const handleReset = () => {
-        setConfigurationType('1')
-        setSearchWord('')
-        setType('萤石云') 
-        setType1('bb')
-        setFlag(flag+1)
-    }
+    setConfigurationType('1');
+    setSearchWord('');
+    setType('萤石云');
+    setType1('bb');
+    setFlag(flag + 1);
+  };
 
-    //新增
+  // 新增
   const addVideo = () => {
-        setAddVisible(true)
-        setKind('add')
-    }
+    setAddVisible(true);
+    setKind('add');
+  };
 
-    const onSubmit =()=>{
-        setAddVisible(false)
-        setFlag(flag+1)
-    }
+  const onSubmit = () => {
+    setAddVisible(false);
+    setFlag(flag + 1);
+  };
   return (
     <div className={styles.videoManagerContainer}>
       <Row className={styles.head}>
@@ -295,11 +352,27 @@ const videoManager = () => {
             enterButton
             value={searchWord}
           />
-                    <Button icon={<SyncOutlined className={styles.icon} />} onClick={handleReset} style={{ marginLeft: '30px', verticalAlign: 'middle', marginTop: '-3px' }}>
-                        重置
+          <Button
+            icon={<SyncOutlined className={styles.icon} />}
+            onClick={handleReset}
+            style={{
+              marginLeft: '30px',
+              verticalAlign: 'middle',
+              marginTop: '-3px',
+            }}
+          >
+            }} > 重置
           </Button>
-                    <Button icon={<PlusOutlined className={styles.icon} />} onClick={addVideo} style={{ marginLeft: '49%', verticalAlign: 'middle', marginTop: '-3px' }}>
-                        新增
+          <Button
+            icon={<PlusOutlined className={styles.icon} />}
+            onClick={addVideo}
+            style={{
+              marginLeft: '49%',
+              verticalAlign: 'middle',
+              marginTop: '-3px',
+            }}
+          >
+            }} > 新增
           </Button>
         </Col>
       </Row>
@@ -311,12 +384,13 @@ const videoManager = () => {
             rowKey={record => record.Id}
             columns={columns}
             dataSource={tableData}
-                        scroll={{y: 'calc(100vh - 210px)' }}
-                        onRow={record => {
-                            return {
-                              onDoubleClick: event => {event.stopPropagation(); edit(record)}, //双击
-                            };
-                          }}
+            scroll={{ y: 'calc(100vh - 210px)' }}
+            onRow={record => ({
+              onDoubleClick: event => {
+                event.stopPropagation();
+                edit(record);
+              }, // 双击
+            })}
             pagination={{
               showTotal: (total, range) =>
                 `第${range[0]}-${range[1]} 条/共 ${total} 条`,
@@ -331,7 +405,7 @@ const videoManager = () => {
       <AddModal
         visible={addVisible}
         onCancel={() => {
-                    setAddVisible(false)
+          setAddVisible(false);
         }}
         okText="确认"
         cancelText="取消"
@@ -344,7 +418,7 @@ const videoManager = () => {
       <CheckModal
         visible={checkVisible}
         onCancel={() => {
-                    setCheckVisible(false)
+          setCheckVisible(false);
         }}
         okText="确认"
         cancelText="取消"
@@ -355,13 +429,12 @@ const videoManager = () => {
       <VideoModal
         visible={videoVisible}
         onCancel={() => {
-                    setVideoVisible(false)
+          setVideoVisible(false);
         }}
         obj={obj}
       />
-           
     </div>
-    )
+  );
 };
 
 export default videoManager;

src/pages/userCenter/userManage/UserManage.js

@@ -107,6 +107,7 @@ const UserManage = () => {
   const [searchWord, setSearchWord] = useState(''); // 关键字
   const [currentSelectOrg, setCurrentSelectOrg] = useState('-1'); // 左侧机构树-选中组织,字符串类型默认全部机构'-1'，注意用户表中的OUID是数字
   const [currentSelectOldOrg, setCurrentSelectOldOrg] = useState([]); // 更改机构时的树-原先选中组织
+  const [showSearchStyle, setShowSearchStyle] = useState(false); // 是否显示模糊查询样式
 
   /** ***Modal弹框,是否可视**** */
   const [userVisible, setUserVisible] = useState(false); // 添加用户
@@ -143,7 +144,7 @@ const UserManage = () => {
   const [currentOrgArea, setCurrentOrgArea] = useState('');
   const [currentOrgDistinct, setCurrentOrgDistinct] = useState('');
   const [saveExtentFlag, setSaveExtentFlag] = useState(0);
-  const [filteredValue,setFilteredValue] =useState([]);
+  const [filteredValue, setFilteredValue] = useState([]);
   const { Search } = Input;
   const setRowClassName = record =>
     record.userID === selectColor.userID ? styles.clickRowStyle : '';
@@ -155,30 +156,14 @@ const UserManage = () => {
       key: 'loginName',
       width: 150,
       // fixed: 'left',
-      render: item => (
-        <div
-          ref={r => {
-            if (r) {
-              r.innerHTML = item;
-            }
-          }}
-        />
-      ),
+      render: item => searchStyle(item),
     },
     {
       title: '用户姓名',
       dataIndex: 'userName',
       key: 'userName',
       width: 150,
-      render: item => (
-        <div
-          ref={r => {
-            if (r) {
-              r.innerHTML = item;
-            }
-          }}
-        />
-      ),
+      render: item => searchStyle(item),
     },
     {
       title: '所在机构',
@@ -196,17 +181,9 @@ const UserManage = () => {
       key: 'phone',
       width: 150,
       ellipsis: true,
-      render: record => {
-        if (record) {
-          return (
-            <div
-              ref={r => {
-                if (r) {
-                  r.innerHTML = record;
-                }
-              }}
-            />
-          );
+      render: text => {
+        if (text) {
+          return searchStyle(text);
         }
         return <span>未绑定</span>;
       },
@@ -338,10 +315,7 @@ const UserManage = () => {
                 <div style={{ width: '130px' }}>
                   <Form form={form}>
                     <Item>
-                      <Radio.Group
-                        value={selectValue}
-                        onChange={onTypeChange}
-                      >
+                      <Radio.Group value={selectValue} onChange={onTypeChange}>
                         <Space direction="vertical">
                           <Radio value={0}>访客</Radio>
                           <Radio value={1}>普通用户</Radio>
@@ -387,7 +361,19 @@ const UserManage = () => {
       ),
     },
   ];
-
+  // 模糊查询匹配的样式
+  const searchStyle = val => {
+    let n;
+    if (showSearchStyle) {
+      n = val.replace(
+        new RegExp(searchWord, 'g'),
+        `<span style='color:red'>${searchWord}</span>`,
+      );
+    } else {
+      n = val;
+    }
+    return <div dangerouslySetInnerHTML={{ __html: n }} />;
+  };
   // 获取搜索框的值
   const handleSearch = e => {
     setSearchWord(e.target.value);
@@ -419,7 +405,7 @@ const UserManage = () => {
           <span className={styles.titleText}>{org.text}</span>
           <span className={styles.tip}>
             <Tooltip title="" className={styles.fs}>
-              <Dropdown overlay={orgButtonMenu} disabled={currentOrgOperate} >
+              <Dropdown overlay={orgButtonMenu} disabled={currentOrgOperate}>
                 <PlusOutlined
                   style={{ marginLeft: 20 }}
                   onClick={e => e.stopPropagation()}
@@ -472,7 +458,7 @@ const UserManage = () => {
       .then(newres => {
         if (newres.code === 0) {
           let res = newres.data;
-          console.log(res)
+          console.log(res);
           setTreeLoading(false);
           setTreeData(res);
           setTreeDataCopy(res);
@@ -511,8 +497,8 @@ const UserManage = () => {
 
   // 点击树节点，获取当前机构下所有用户
   const onSelect = (props, e) => {
-    console.log(e)
-    console.log(props)
+    console.log(e);
+    console.log(props);
     setTableLoading(true);
     if (e) {
       setOrgTitle(e.node.title.props.children[0].props.children);
@@ -533,6 +519,7 @@ const UserManage = () => {
       groupID: props[0],
     }).then(res => {
       if (res.code === 0) {
+        console.log(res);
         setCurrentOrgArea(res.data.MapRange);
         setCurrentOrgDistinct(res.data.AreeName);
       }
@@ -562,6 +549,7 @@ const UserManage = () => {
               item.key = index;
               return item;
             });
+            setShowSearchStyle(false);
             setTableData(table);
           } else {
             setTableLoading(false);
@@ -773,12 +761,12 @@ const UserManage = () => {
   const onTypeChange = value => {
     setSelctValue(value.target.value);
   };
-  const authUser = (record) => {
+  const authUser = record => {
     setCurrentUser(record);
-    console.log(selectValue)
+    console.log(selectValue);
     AddUserAuthSetting({
       userId: record.userID,
-      userLevel: selectValue 
+      userLevel: selectValue,
     }).then(res => {
       if (res.code === 0) {
         message.info('提交成功');
@@ -817,12 +805,14 @@ const UserManage = () => {
           setOrgTitle('全部机构搜索结果'); // 设置表头
           setCurrentSelectOrg('-1'); // 清空选中机构
           console.log(res.data);
+          setShowSearchStyle(true);
           setTableData(res.data);
           setTableLength(res.data.length);
         } else {
           notification.error({
-            message: '提交失败',
-            description: res.message,
+            message: '提示',
+            duration: 3,
+            description: res.msg,
           });
         }
       })
@@ -1137,7 +1127,7 @@ const UserManage = () => {
           let res = newres.data;
           setTreeLoading(false);
           setSearchWord('');
-          setFilteredValue([])
+          setFilteredValue([]);
           // 第一次加载，默认选择第一个组织
           onSelect([res[0].id], false);
         } else {
@@ -1154,9 +1144,9 @@ const UserManage = () => {
         message.error(err);
       });
   };
-  const onChangeInput = (filters) =>{
+  const onChangeInput = filters => {
     setFilteredValue(filters.OUName);
-  }
+  };
 
   // 更改机构范围
   const submitExtent = (extent, areaName) => {
@@ -1177,14 +1167,14 @@ const UserManage = () => {
     setEditOrgExtentVisible(false);
   };
 
-  const addChange =e=>{
-    console.log(e)
-    e.domEvent.stopPropagation()
-  }
+  const addChange = e => {
+    console.log(e);
+    e.domEvent.stopPropagation();
+  };
   /** ***操作按钮**** */
   // 机构操作
   const orgButtonMenu = (
-    <Menu onClick={e =>addChange(e)}>
+    <Menu onClick={e => addChange(e)}>
       <Menu.Item key="1" onClick={addUser} icon={<UserAddOutlined />}>
         添加用户
       </Menu.Item>
@@ -1194,7 +1184,7 @@ const UserManage = () => {
     </Menu>
   );
   const orgButtonMenu1 = (
-    <Menu onClick={e =>addChange(e)}>
+    <Menu onClick={e => addChange(e)}>
       <Menu.Item key="3" onClick={editOrg} icon={<EditOutlined />}>
         编辑当前机构
       </Menu.Item>
@@ -1231,7 +1221,7 @@ const UserManage = () => {
         {/* 左侧机构树 */}
         <Spin spinning={treeLoading} tip="loading...">
           <Card
-            style={{overflowY:'hidden'}}
+            style={{ overflowY: 'hidden' }}
             className={classnames({
               [styles.orgContainer]: true,
               [styles.orgContainerHide]: !treeVisible,
@@ -1242,7 +1232,7 @@ const UserManage = () => {
                 style={{
                   fontSize: '15px ',
                   fontWeight: 'bold',
-                  marginLeft: '15px'
+                  marginLeft: '15px',
                 }}
               >
                 机构列表
@@ -1254,11 +1244,13 @@ const UserManage = () => {
                     color: '#1890FF',
                     fontSize: '25px',
                     verticalAlign: 'middle',
-                    marginLeft: '67%'
+                    marginLeft: '67%',
                   }}
                 />
               </Tooltip>
-              <hr style={{ width: '95%', color: '#eeecec' ,marginLeft: '15px'}} />
+              <hr
+                style={{ width: '95%', color: '#eeecec', marginLeft: '15px' }}
+              />
               {treeData.length > 0 && (
                 <Tree
                   showIcon="true"
@@ -1271,7 +1263,7 @@ const UserManage = () => {
                   onSelect={onSelect}
                   height={
                     treeData.length && treeData.length > 30
-                      ? treeData.length * 18+50
+                      ? treeData.length * 18 + 50
                       : 1000
                   }
                   treeData={treeData.map(t => mapTree(t))}

src/services/maintenance/api.js

@@ -9,20 +9,20 @@ import { CITY_SERVICE, get, PUBLISH_SERVICE, post, postForm } from '../index';
 
 // 巡维保计划数据获取
 export const CM_XWBPlan_DataList = query =>
-get(`${PUBLISH_SERVICE}/WorkOrderCenter/CM_XWBPlan_DataList`, query);
+  get(`${PUBLISH_SERVICE}/WorkOrderCenter/CM_XWBPlan_DataList`, query);
 
-//巡维保计划关联设备台账
+// 巡维保计划关联设备台账
 export const CM_XWBPlan_AccountTable = query =>
-get(`${PUBLISH_SERVICE}/WorkOrderCenter/CM_XWBPlan_AccountTable`, query);
+  get(`${PUBLISH_SERVICE}/WorkOrderCenter/CM_XWBPlan_AccountTable`, query);
 
-//计划关联反馈台账表
+// 计划关联反馈台账表
 export const CM_XWBPlan_feedbackTable = query =>
-get(`${PUBLISH_SERVICE}/WorkOrderCenter/CM_XWBPlan_feedbackTable`, query);
+  get(`${PUBLISH_SERVICE}/WorkOrderCenter/CM_XWBPlan_feedbackTable`, query);
 
-//巡维保计划数据删除
+// 巡维保计划数据删除
 export const CM_XWBPlan_RemovePlan = query =>
-get(`${PUBLISH_SERVICE}/WorkOrderCenter/CM_XWBPlan_RemovePlan`, query);
+  get(`${PUBLISH_SERVICE}/WorkOrderCenter/CM_XWBPlan_RemovePlan`, query);
 
-//巡维保计划数据编辑OR添加
+// 巡维保计划数据编辑OR添加
 export const CM_XWBPlan_DataEditORAdd = data =>
-post(`${PUBLISH_SERVICE}/WorkOrderCenter/CM_XWBPlan_DataEditORAdd`, data);
+  post(`${PUBLISH_SERVICE}/WorkOrderCenter/CM_XWBPlan_DataEditORAdd`, data);

src/services/mobileConfig/api.js

@@ -92,19 +92,18 @@ export const getRoleListPlain = params =>
 export const deleteWebsite = params =>
   get(`${PUBLISH_SERVICE}/WebSite/MiniApp_DeleteWebsite`, params);
 // 新增小程序
-export const addWebsite = (params, options) => {
+export const addWebsite = (params, options) =>
   // let strParams = JSON.stringify(params);
   // let qsParams = qs.stringify({ config: strParams });
-  return post(
+  post(
     `${PUBLISH_SERVICE}/WebSite/MiniApp_AddWebsite?_version=9999`,
     params,
     options,
   );
-};
 
 // 菜单拖拽
 export const dragMenu = params =>
-  get(`${CITY_SERVICE}/OMS.svc/P_DragMenu`, params);
+  post(`${PUBLISH_SERVICE}/WebSite/DragMenu `, params);
 
 export const deleteMiniMenu = params =>
   get(`${PUBLISH_SERVICE}/PlatformCenter/DeleteMiniMenu`, params);

src/services/platform/workflow.jsx

@@ -13,7 +13,7 @@ export const UpdateFlowGroup = param =>
   post(`${PUBLISH_SERVICE}/WorkFlow/UpdateFlowGroup`, param);
 // 查询全部角色对应的人员
 export const GetRoleUser = param =>
-  get(`${PUBLISH_SERVICE}/WorkFlow/GetRoleUser`, param);
+  post(`${PUBLISH_SERVICE}/WorkFlow/GetRoleUser`, param);
 // 获取节点信息
 export const GetNodeInfo = param =>
   get(`${PUBLISH_SERVICE}/WorkFlow/GetNodeInfo`, param);

src/services/standingBook/api.js

@@ -11,92 +11,109 @@ import { CITY_SERVICE, get, PUBLISH_SERVICE, post, postForm } from '../index';
 export const GetCM_Ledger_LoadLedgers = query =>
   get(`${PUBLISH_SERVICE}/WorkOrderCenter/GetCM_Ledger_LoadLedgers`, query);
 
-  
 // 加载台账表
 export const GetCM_Ledger_LoadLedgerTable = query =>
-get(`${PUBLISH_SERVICE}/WorkOrderCenter/GetCM_Ledger_LoadLedgerTable`, query);
+  get(`${PUBLISH_SERVICE}/WorkOrderCenter/GetCM_Ledger_LoadLedgerTable`, query);
 
 // 查看对应台账
 export const GetCMLedger_QueryLedgers = query =>
-get(`${PUBLISH_SERVICE}/WorkOrderCenter/GetCMLedger_QueryLedgers`, query);
+  get(`${PUBLISH_SERVICE}/WorkOrderCenter/GetCMLedger_QueryLedgers`, query);
 
 // 编辑或新增台账
 export const GetCMLedger_OperateLedger = data =>
-post(`${PUBLISH_SERVICE}/WorkOrderCenter/GetCMLedger_OperateLedger`, data);
+  post(`${PUBLISH_SERVICE}/WorkOrderCenter/GetCMLedger_OperateLedger`, data);
 
 // 删除台账
 export const CM_Ledger_RmoveLedger = query =>
-get(`${PUBLISH_SERVICE}/WorkOrderCenter/CM_Ledger_RmoveLedger`, query);
+  get(`${PUBLISH_SERVICE}/WorkOrderCenter/CM_Ledger_RmoveLedger`, query);
 
 // 加载事件
 export const GetCM_Event_LoadEventTable = query =>
-get(`${PUBLISH_SERVICE}/WorkOrderCenter/GetCM_Event_LoadEventTable`, query);
+  get(`${PUBLISH_SERVICE}/WorkOrderCenter/GetCM_Event_LoadEventTable`, query);
 
 // 加载事件主表
 export const GetCM_Event_LoadEventTypeTable = query =>
-get(`${PUBLISH_SERVICE}/WorkOrderCenter/GetCM_Event_LoadEventTypeTable`, query);
+  get(
+    `${PUBLISH_SERVICE}/WorkOrderCenter/GetCM_Event_LoadEventTypeTable`,
+    query,
+  );
 
-//根据触发事件加载字段
+// 根据触发事件加载字段
 export const LoadEventFields = query =>
-get(`${PUBLISH_SERVICE}/CaseManage/LoadEventFields`, query);
+  get(`${PUBLISH_SERVICE}/CaseManage/LoadEventFields`, query);
 
 // 加载事件权限部门角色
 export const CM_Event_LoadDepartmentAndRoles = query =>
-get(`${PUBLISH_SERVICE}/WorkOrderCenter/CM_Event_LoadDepartmentAndRoles`, query);
+  get(
+    `${PUBLISH_SERVICE}/WorkOrderCenter/CM_Event_LoadDepartmentAndRoles`,
+    query,
+  );
 
 // 修改事件类型
 export const CM_Event_EditEventTable = data =>
-post(`${PUBLISH_SERVICE}/WorkOrderCenter/CM_Event_EditEventTable`, data);
+  post(`${PUBLISH_SERVICE}/WorkOrderCenter/CM_Event_EditEventTable`, data);
 
 // 加载事件权限部门角色
 export const GetCM_Event_QueryEventType = query =>
-get(`${PUBLISH_SERVICE}/WorkOrderCenter/GetCM_Event_QueryEventType`, query);
+  get(`${PUBLISH_SERVICE}/WorkOrderCenter/GetCM_Event_QueryEventType`, query);
 
 // 添加事件类型表
 export const CM_Event_AddEventTable = data =>
-post(`${PUBLISH_SERVICE}/WorkOrderCenter/CM_Event_AddEventTable`, data);
+  post(`${PUBLISH_SERVICE}/WorkOrderCenter/CM_Event_AddEventTable`, data);
 
 // 删除事件类型表
 export const CM_Event_RemoveEventTable = eventTypeIDs =>
-post(`${PUBLISH_SERVICE}/WorkOrderCenter/CM_Event_RemoveEventTable?eventTypeIDs=${eventTypeIDs}`);
+  post(
+    `${PUBLISH_SERVICE}/WorkOrderCenter/CM_Event_RemoveEventTable?eventTypeIDs=${eventTypeIDs}`,
+  );
 
 // 事件类型调序
 export const CM_Event_ReOrder = eventTypeIDs =>
-post(`${PUBLISH_SERVICE}/WorkOrderCenter/CM_Event_ReOrder?eventTypeIDs=${eventTypeIDs}`);
+  post(
+    `${PUBLISH_SERVICE}/WorkOrderCenter/CM_Event_ReOrder?eventTypeIDs=${eventTypeIDs}`,
+  );
 
 // 点击受理流程之后加载受理流程和权限,显示字段为FlowName，FlowRoles
 export const GetCM_Event_LoadEvenFlows = query =>
-get(`${PUBLISH_SERVICE}/WorkOrderCenter/GetCM_Event_LoadEvenFlows`, query);
+  get(`${PUBLISH_SERVICE}/WorkOrderCenter/GetCM_Event_LoadEvenFlows`, query);
 
 // 点击添加之后加载受理流程集
 export const CM_Event_ReloadFlows = query =>
-get(`${PUBLISH_SERVICE}/WorkOrderCenter/CM_Event_ReloadFlows`, query);
+  get(`${PUBLISH_SERVICE}/WorkOrderCenter/CM_Event_ReloadFlows`, query);
 
 // 添加受理流程
 export const CM_Event_AddEvenFlow = query =>
-get(`${PUBLISH_SERVICE}/WorkOrderCenter/CM_Event_AddEvenFlow`, query);
+  get(`${PUBLISH_SERVICE}/WorkOrderCenter/CM_Event_AddEvenFlow`, query);
 
 // 编辑受理流程
 export const CM_Event_EditEvenFlow = query =>
-get(`${PUBLISH_SERVICE}/WorkOrderCenter/CM_Event_EditEvenFlow`, query);
+  get(`${PUBLISH_SERVICE}/WorkOrderCenter/CM_Event_EditEvenFlow`, query);
 
 // 删除受理流程
 export const CM_Event_RemoveEvenFlow = query =>
-get(`${PUBLISH_SERVICE}/WorkOrderCenter/CM_Event_RemoveEvenFlow`, query);
+  get(`${PUBLISH_SERVICE}/WorkOrderCenter/CM_Event_RemoveEvenFlow`, query);
 
 // 加载事件辅助视图配置信息
 export const CM_Event_ReloadEventExtendPages = query =>
-get(`${PUBLISH_SERVICE}/WorkOrderCenter/CM_Event_ReloadEventExtendPages`, query);
+  get(
+    `${PUBLISH_SERVICE}/WorkOrderCenter/CM_Event_ReloadEventExtendPages`,
+    query,
+  );
 
 // 添加或修改事件辅助视图配置
 export const CM_Event_OperateEventExtendPage = data =>
-post(`${PUBLISH_SERVICE}/WorkOrderCenter/CM_Event_OperateEventExtendPage`, data);
+  post(
+    `${PUBLISH_SERVICE}/WorkOrderCenter/CM_Event_OperateEventExtendPage`,
+    data,
+  );
 
 // 查询事件辅助视图配置信息
 export const GetEventExtendPage = query =>
-get(`${PUBLISH_SERVICE}/WorkOrderCenter/GetEventExtendPage`, query);
+  get(`${PUBLISH_SERVICE}/WorkOrderCenter/GetEventExtendPage`, query);
 
 // 删除事件辅助视图配置
 export const CM_Event_RemoveEventExtendPage = query =>
-get(`${PUBLISH_SERVICE}/WorkOrderCenter/CM_Event_RemoveEventExtendPage`, query);
-
+  get(
+    `${PUBLISH_SERVICE}/WorkOrderCenter/CM_Event_RemoveEventExtendPage`,
+    query,
+  );