Commit 69e76a6f authored by 皮倩雯's avatar 皮倩雯

模态更改

parent e296f99d
Pipeline #35937 skipped with stages
...@@ -211,7 +211,7 @@ module.exports = options => ({ ...@@ -211,7 +211,7 @@ module.exports = options => ({
alias: { alias: {
'@': path.resolve(process.cwd(), './src'), '@': path.resolve(process.cwd(), './src'),
components: path.resolve(process.cwd(), './src/components'), components: path.resolve(process.cwd(), './src/components'),
cesium: path.resolve(process.cwd(), cesiumSource ), cesium: path.resolve(process.cwd(), cesiumSource),
}, },
}, },
devtool: options.devtool, devtool: options.devtool,
......
...@@ -101,7 +101,7 @@ ...@@ -101,7 +101,7 @@
"dragm": "^0.0.5", "dragm": "^0.0.5",
"express": "4.16.4", "express": "4.16.4",
"fontfaceobserver": "2.1.0", "fontfaceobserver": "2.1.0",
"gojs": "^2.1.37", "gojs": "2.1.49",
"history": "4.9.0", "history": "4.9.0",
"hoist-non-react-statics": "3.3.0", "hoist-non-react-statics": "3.3.0",
"immer": "3.0.0", "immer": "3.0.0",
...@@ -114,6 +114,7 @@ ...@@ -114,6 +114,7 @@
"prop-types": "15.7.2", "prop-types": "15.7.2",
"react": "16.8.6", "react": "16.8.6",
"react-ace": "^9.2.0", "react-ace": "^9.2.0",
"react-copy-to-clipboard": "^5.0.4",
"react-dom": "16.8.6", "react-dom": "16.8.6",
"react-grid-layout": "^1.2.5", "react-grid-layout": "^1.2.5",
"react-helmet": "6.0.0-beta", "react-helmet": "6.0.0-beta",
......
diff --git a/node_modules/gojs/release/go.js b/node_modules/gojs/release/go.js 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 --- a/node_modules/gojs/release/go.js
+++ b/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 @@ -803,7 +803,7 @@ R.prototype.findObjectsNear=R.prototype.Eg;R.prototype.findPartsNear=R.prototype
...@@ -7,7 +7,7 @@ index 2c43470..f518a15 100644 ...@@ -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, 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; "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);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; 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} 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])); 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]));
...@@ -7,15 +7,30 @@ import Authozed from '@/utils/authority'; ...@@ -7,15 +7,30 @@ import Authozed from '@/utils/authority';
import UserLogin from '@/pages/user/login'; import UserLogin from '@/pages/user/login';
import UserLayout from '@/layouts/UserLayout'; import UserLayout from '@/layouts/UserLayout';
import { AUTHORITY, BASENAME } from '@/utils/constants'; import { AUTHORITY, BASENAME } from '@/utils/constants';
import { Modal } from 'antd';
import { PictureWallProvider } from '@/components/Upload/context'; import { PictureWallProvider } from '@/components/Upload/context';
export default appConnector(function App(props) { export default appConnector(function App(props) {
const { routesConfig } = props; const { routesConfig } = props;
const getConfirmation = (msg, callBack) => {
Modal.confirm({
title: '确认',
content: msg,
okText: '确认',
cancelText: '取消',
onOk() {
callBack(true);
},
onCancel() {
callBack(false);
},
});
};
return ( return (
<> <>
<Helmet titleTemplate="%s - 运维平台" defaultTitle="运维平台"> <Helmet titleTemplate="%s - 运维平台" defaultTitle="运维平台">
<meta name="description" content="运维平台" /> <meta name="description" content="运维平台" />
</Helmet> </Helmet>
<Router basename={BASENAME}> <Router basename={BASENAME} getUserConfirmation={getConfirmation}>
<Authozed <Authozed
noMatch={ noMatch={
<UserLayout> <UserLayout>
......
...@@ -13,8 +13,18 @@ import { ...@@ -13,8 +13,18 @@ import {
message, message,
} from 'antd'; } from 'antd';
import { get, CITY_SERVICE, PUBLISH_SERVICE } from '@/services'; import { get, CITY_SERVICE, PUBLISH_SERVICE } from '@/services';
import { GetKeyValue, EditKeyValue, DeleteKeyValue, AddKeyValue } from '@/services/dataCenter/api' import {
import { EditTwoTone, DeleteOutlined, PlusSquareOutlined, SyncOutlined } from '@ant-design/icons'; GetKeyValue,
EditKeyValue,
DeleteKeyValue,
AddKeyValue,
} from '@/services/dataCenter/api';
import {
EditTwoTone,
DeleteOutlined,
PlusSquareOutlined,
SyncOutlined,
} from '@ant-design/icons';
import styles from './AppDic.less'; import styles from './AppDic.less';
const AppDic = () => { const AppDic = () => {
...@@ -127,26 +137,24 @@ const AppDic = () => { ...@@ -127,26 +137,24 @@ const AppDic = () => {
// setLoading(false); // setLoading(false);
// message.error(err); // message.error(err);
// }); // });
GetKeyValue({}).then( GetKeyValue({}).then(resnew => {
resnew => { if (resnew.code == 0) {
if (resnew.code == 0) { let res = resnew.data;
let res = resnew.data if (res.length > 0) {
if (res.length > 0) { res.map(item => {
res.map(item => { item.key = item.id;
item.key = item.id; return item;
return item;
});
}
setData(res);
} else {
notification.error({
message: '获取失败',
description: res.msg,
}); });
} }
setLoading(false); setData(res);
} else {
notification.error({
message: '获取失败',
description: res.msg,
});
} }
) setLoading(false);
});
}; };
// 提交-添加 // 提交-添加
const submitAdd = () => { const submitAdd = () => {
...@@ -185,24 +193,20 @@ const AppDic = () => { ...@@ -185,24 +193,20 @@ const AppDic = () => {
key, key,
value, value,
desc: description, desc: description,
}).then( }).then(res => {
res => { if (res.code == 0) {
if (res.code == 0) { setAddVisible(false);
setAddVisible(false); getData();
getData(); notification.success({
notification.success({ message: '提交成功',
message: '提交成功', });
}); } else {
} else { notification.error({
notification.error({ message: '提交失败',
message: '提交失败', description: res.msg,
description: res.msg, });
});
}
} }
) });
} else { } else {
notification.error({ notification.error({
message: '提交失败', message: '提交失败',
...@@ -212,8 +216,7 @@ const AppDic = () => { ...@@ -212,8 +216,7 @@ const AppDic = () => {
}; };
// 提交-重置 // 提交-重置
const submitReset = () => { const submitReset = () => {
get(`${PUBLISH_SERVICE}/DataManger/ResetKeyValue`, { get(`${PUBLISH_SERVICE}/DataManger/ResetKeyValue`, {})
})
.then(res => { .then(res => {
if (res.code === 0) { if (res.code === 0) {
getData(); getData();
...@@ -230,7 +233,6 @@ const AppDic = () => { ...@@ -230,7 +233,6 @@ const AppDic = () => {
.catch(err => { .catch(err => {
message.error(err); message.error(err);
}); });
}; };
// 提交-编辑 // 提交-编辑
const submitEdit = () => { const submitEdit = () => {
...@@ -271,22 +273,20 @@ const AppDic = () => { ...@@ -271,22 +273,20 @@ const AppDic = () => {
key, key,
value, value,
desc: description, desc: description,
}).then( }).then(res => {
res => { if (res.code == 0) {
if (res.code == 0) { setEditVisible(false);
setEditVisible(false); getData();
getData(); notification.success({
notification.success({ message: '提交成功',
message: '提交成功', });
}); } else {
} else { notification.error({
notification.error({ message: '提交失败',
message: '提交失败', description: res.msg,
description: res.msg, });
});
}
} }
) });
} else { } else {
notification.error({ notification.error({
message: '提交失败', message: '提交失败',
...@@ -317,24 +317,22 @@ const AppDic = () => { ...@@ -317,24 +317,22 @@ const AppDic = () => {
// .catch(err => { // .catch(err => {
// message.error(err); // message.error(err);
// }); // });
DeleteKeyValue({ DeleteKeyValue({
key: select.Key, key: select.Key,
}).then( }).then(res => {
res => { if (res.code === 0) {
if (res.code === 0) { getData(select.parentID);
getData(select.parentID); notification.success({
notification.success({ message: '删除成功',
message: '删除成功', });
}); } else {
} else { notification.error({
notification.error({ message: '删除失败',
message: '删除失败', description: res.msg,
description: res.msg, });
});
}
} }
) });
}; };
const pagination = { const pagination = {
...@@ -343,7 +341,7 @@ const AppDic = () => { ...@@ -343,7 +341,7 @@ const AppDic = () => {
defaultPageSize: 20, defaultPageSize: 20,
showQuickJumper: true, showQuickJumper: true,
showSizeChanger: true, showSizeChanger: true,
} };
return ( return (
<div className={styles.AppDic}> <div className={styles.AppDic}>
<Spin spinning={loading} tip="loading..."> <Spin spinning={loading} tip="loading...">
...@@ -352,11 +350,11 @@ const AppDic = () => { ...@@ -352,11 +350,11 @@ const AppDic = () => {
marginBottom: '10px', marginBottom: '10px',
fontSize: '16px', fontSize: '16px',
height: 'calc(100vh-200px)', height: 'calc(100vh-200px)',
display:'flex', display: 'flex',
alignItems:'center' alignItems: 'center',
}} }}
> >
<span >数据字典</span> <span>数据字典</span>
<Tooltip title="添加"> <Tooltip title="添加">
<PlusSquareOutlined <PlusSquareOutlined
onClick={() => { onClick={() => {
...@@ -366,8 +364,8 @@ const AppDic = () => { ...@@ -366,8 +364,8 @@ const AppDic = () => {
style={{ style={{
color: '#1890FF', color: '#1890FF',
fontSize: '20px', fontSize: '20px',
marginRight: '22px', marginRight: '22px',
marginLeft: '90%' marginLeft: '90%',
}} }}
/> />
</Tooltip> </Tooltip>
...@@ -385,7 +383,7 @@ const AppDic = () => { ...@@ -385,7 +383,7 @@ const AppDic = () => {
fontSize: '20px', fontSize: '20px',
verticalAlign: 'text-bottom', verticalAlign: 'text-bottom',
marginRight: '30px', marginRight: '30px',
float: 'right' float: 'right',
}} }}
/> />
</Tooltip> </Tooltip>
......
/* /*
* @Description: * @Description:
* @Author: leizhe * @Author: leizhe
* @Date: 2021-07-13 16:32:28 * @Date: 2021-07-13 16:32:28
* @LastEditTime: 2021-07-13 18:02:49 * @LastEditTime: 2021-07-13 18:02:49
...@@ -28,8 +28,7 @@ const dictionary1 = () => { ...@@ -28,8 +28,7 @@ const dictionary1 = () => {
</Tabs> </Tabs>
</Card> </Card>
</PageContainer> </PageContainer>
); );
}; };
export default dictionary1; export default dictionary1;
\ No newline at end of file
...@@ -9,6 +9,7 @@ import { ...@@ -9,6 +9,7 @@ import {
notification, notification,
Spin, Spin,
} from 'antd'; } from 'antd';
import copy from 'copy-to-clipboard';
import PageContainer from '@/components/BasePageContainer'; import PageContainer from '@/components/BasePageContainer';
import styles from './ManagementDataBase.less'; import styles from './ManagementDataBase.less';
import { import {
...@@ -177,6 +178,22 @@ const ManagementDataBase = () => { ...@@ -177,6 +178,22 @@ const ManagementDataBase = () => {
// setContent(text); // setContent(text);
setContent(arr); setContent(arr);
}; };
// 复制SQL
const copySql = text => {
if (copy(text)) {
notification.success({
message: '提示',
duration: 3,
description: '复制成功',
});
} else {
notification.error({
message: '提示',
duration: 3,
description: '复制失败',
});
}
};
const autoCheckColumns = [ const autoCheckColumns = [
{ {
title: '表名称', title: '表名称',
...@@ -212,6 +229,16 @@ const ManagementDataBase = () => { ...@@ -212,6 +229,16 @@ const ManagementDataBase = () => {
key: 'Message', key: 'Message',
ellipsis: true, ellipsis: true,
}, },
{
title: 'SQL语句',
dataIndex: 'DiffSql',
key: 'DiffSql',
render: text => (
<Button size="small" type="primary" onClick={() => copySql(text)}>
复制SQL
</Button>
),
},
]; ];
const logColumns = [ const logColumns = [
{ {
......
...@@ -27,7 +27,7 @@ const LoginLog = () => { ...@@ -27,7 +27,7 @@ const LoginLog = () => {
const [endTime, setEndTime] = useState( const [endTime, setEndTime] = useState(
moment(new Date(), 'YYYY-MM-DD HH:mm:ss'), // 默认值当前时间 moment(new Date(), 'YYYY-MM-DD HH:mm:ss'), // 默认值当前时间
); );
const [filteredValue,setFilteredValue] =useState([]) const [filteredValue, setFilteredValue] = useState([]);
const columns = [ const columns = [
// { // {
...@@ -47,7 +47,7 @@ const LoginLog = () => { ...@@ -47,7 +47,7 @@ const LoginLog = () => {
key: 'LoginName', key: 'LoginName',
filters: LoginNameFilters, filters: LoginNameFilters,
onFilter: (value, record) => record.LoginName === value, onFilter: (value, record) => record.LoginName === value,
filteredValue filteredValue,
}, },
{ {
title: '用户名', title: '用户名',
...@@ -55,7 +55,7 @@ const LoginLog = () => { ...@@ -55,7 +55,7 @@ const LoginLog = () => {
key: 'ShowName', key: 'ShowName',
filters: ShowNameFilters, filters: ShowNameFilters,
onFilter: (value, record) => record.ShowName === value, onFilter: (value, record) => record.ShowName === value,
filteredValue filteredValue,
}, },
{ {
title: '系统类型', title: '系统类型',
...@@ -63,7 +63,7 @@ const LoginLog = () => { ...@@ -63,7 +63,7 @@ const LoginLog = () => {
key: 'SystemType', key: 'SystemType',
filters: SystemTypeFilters, filters: SystemTypeFilters,
onFilter: (value, record) => record.SystemType === value, onFilter: (value, record) => record.SystemType === value,
filteredValue filteredValue,
}, },
// { // {
// title: '终端', // title: '终端',
...@@ -133,14 +133,14 @@ const LoginLog = () => { ...@@ -133,14 +133,14 @@ const LoginLog = () => {
), ),
); );
}; };
const handleReset = () =>{ const handleReset = () => {
setStartTime(moment().startOf('week')) setStartTime(moment().startOf('week'));
setFilteredValue([]) setFilteredValue([]);
} };
const onChangeInput =(filters) =>{ const onChangeInput = filters => {
console.log('filters',filters); console.log('filters', filters);
setFilteredValue(filters.LoginName,filters.ShowName,filters.SystemType) setFilteredValue(filters.LoginName, filters.ShowName, filters.SystemType);
} };
return ( return (
<> <>
<div className={styles.loginLog}> <div className={styles.loginLog}>
...@@ -171,7 +171,15 @@ const LoginLog = () => { ...@@ -171,7 +171,15 @@ const LoginLog = () => {
<Button onClick={() => setTime(24 * 7)}>1</Button> <Button onClick={() => setTime(24 * 7)}>1</Button>
<Button onClick={() => setTime(14 * 24)}>2</Button> <Button onClick={() => setTime(14 * 24)}>2</Button>
<Button onClick={() => setTime(30 * 24)}>1</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> </Button>
</Col> </Col>
......
...@@ -13,7 +13,7 @@ import { ...@@ -13,7 +13,7 @@ import {
} from 'antd'; } from 'antd';
import { SwapRightOutlined, SyncOutlined } from '@ant-design/icons'; import { SwapRightOutlined, SyncOutlined } from '@ant-design/icons';
import moment from 'moment'; import moment from 'moment';
import { get,PUBLISH_SERVICE } from '@/services/index'; import { get, PUBLISH_SERVICE } from '@/services/index';
import styles from './index.less'; import styles from './index.less';
const OmsLog = () => { const OmsLog = () => {
...@@ -23,7 +23,7 @@ const OmsLog = () => { ...@@ -23,7 +23,7 @@ const OmsLog = () => {
const [functionName, setFunctionName] = useState(''); // 接口名称筛选 const [functionName, setFunctionName] = useState(''); // 接口名称筛选
const [label, setLabel] = useState(''); // 标签筛选 const [label, setLabel] = useState(''); // 标签筛选
const [startTime, setStartTime] = useState(moment().startOf('week')); // 默认值当天0点 const [startTime, setStartTime] = useState(moment().startOf('week')); // 默认值当天0点
const [filteredValue,setFilteredValue] =useState([]) const [filteredValue, setFilteredValue] = useState([]);
const [endTime, setEndTime] = useState( const [endTime, setEndTime] = useState(
moment(new Date(), 'YYYY-MM-DD HH:mm:ss'), // 默认值当前时间 moment(new Date(), 'YYYY-MM-DD HH:mm:ss'), // 默认值当前时间
); );
...@@ -89,7 +89,7 @@ const OmsLog = () => { ...@@ -89,7 +89,7 @@ const OmsLog = () => {
}, },
}, },
]; ];
// 在起止时间任意一个变化后获取数据 // 在起止时间任意一个变化后获取数据
useEffect(() => { useEffect(() => {
if (startTime && endTime) { if (startTime && endTime) {
...@@ -105,28 +105,27 @@ const OmsLog = () => { ...@@ -105,28 +105,27 @@ const OmsLog = () => {
function: functionName, function: functionName,
label, label,
PageIndex: 1, PageIndex: 1,
PageSize: 1000 PageSize: 1000,
}) })
.then(res => { .then(res => {
if (res.code===0) { if (res.code === 0) {
// setData(res.root.filter(item => item.label!=="ServiceInput"&&item.label!=="ServiceReturn")); // setData(res.root.filter(item => item.label!=="ServiceInput"&&item.label!=="ServiceReturn"));
if (!res.data) { if (!res.data) {
setData([]); setData([]);
} else { } else {
const result = res.data.list; const result = res.data.list;
setData( setData(
result.map((item, index) => { result.map((item, index) => {
item.key = index; item.key = index;
return item; return item;
}), }),
); );
console.log(result) console.log(result);
// 过滤优先级 // 过滤优先级
let arr1 = result.map(item => item.Level); let arr1 = result.map(item => item.Level);
arr1 = arr1.filter((value, index) => arr1.indexOf(value) === index); arr1 = arr1.filter((value, index) => arr1.indexOf(value) === index);
setLevelFilters(arr1.map(item => ({ text: item, value: item }))); setLevelFilters(arr1.map(item => ({ text: item, value: item })));
} }
} else { } else {
notification.error({ notification.error({
message: '数据获取失败', message: '数据获取失败',
...@@ -157,17 +156,17 @@ const OmsLog = () => { ...@@ -157,17 +156,17 @@ const OmsLog = () => {
), ),
); );
}; };
const handleReset =() =>{ const handleReset = () => {
setStartTime(moment().startOf('week')) setStartTime(moment().startOf('week'));
setEndTime(moment(new Date(), 'YYYY-MM-DD HH:mm:ss')) setEndTime(moment(new Date(), 'YYYY-MM-DD HH:mm:ss'));
setFunctionName('') setFunctionName('');
setFilteredValue([]) setFilteredValue([]);
setLabel('') setLabel('');
} };
const onChangeInput =(filters)=>{ const onChangeInput = filters => {
console.log('filters',filters); console.log('filters', filters);
setFilteredValue(filters.Level) setFilteredValue(filters.Level);
} };
return ( return (
<> <>
<div className={styles.omsLog}> <div className={styles.omsLog}>
...@@ -218,12 +217,20 @@ const OmsLog = () => { ...@@ -218,12 +217,20 @@ const OmsLog = () => {
/> />
<Button <Button
type="primary" type="primary"
style={{ marginLeft: '10px'}} style={{ marginLeft: '10px' }}
onClick={getData} onClick={getData}
> >
查询 查询
</Button> </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> </Button>
</Col> </Col>
......
...@@ -251,7 +251,7 @@ const ServiceLog = () => { ...@@ -251,7 +251,7 @@ const ServiceLog = () => {
setStartTime(moment().startOf('week')); setStartTime(moment().startOf('week'));
setEndTime(moment(new Date(), 'YYYY-MM-DD HH:mm:ss')); setEndTime(moment(new Date(), 'YYYY-MM-DD HH:mm:ss'));
setSearchWord(''); setSearchWord('');
} };
return ( return (
<> <>
<div className={styles.serviceLog}> <div className={styles.serviceLog}>
...@@ -282,7 +282,12 @@ const ServiceLog = () => { ...@@ -282,7 +282,12 @@ const ServiceLog = () => {
<Button onClick={() => setTime(24 * 60, '3')}>1</Button> <Button onClick={() => setTime(24 * 60, '3')}>1</Button>
<Button onClick={() => setTime(24 * 7 * 60, '4')}>1</Button> <Button onClick={() => setTime(24 * 7 * 60, '4')}>1</Button>
<span style={{ marginLeft: '20px' }}>返回状态:</span> <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="9999">全部</Option>
<Option value="0">正常</Option> <Option value="0">正常</Option>
<Option value="-1">异常</Option> <Option value="-1">异常</Option>
...@@ -298,7 +303,15 @@ const ServiceLog = () => { ...@@ -298,7 +303,15 @@ const ServiceLog = () => {
enterButton enterButton
value={searchWord} 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> </Button>
</Col> </Col>
...@@ -306,26 +319,32 @@ const ServiceLog = () => { ...@@ -306,26 +319,32 @@ const ServiceLog = () => {
<Spin spinning={loading} tip="loading"> <Spin spinning={loading} tip="loading">
<Row style={{ background: 'white' }}> <Row style={{ background: 'white' }}>
<Col span={8} style={{ paddingTop: '8px', paddingLeft: '5px' }}> <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> <span style={{ paddingLeft: '60%' }}>间隔:</span>
<Select <Select
defaultValue="每小时" defaultValue="每小时"
size="small" size="small"
value={timeInterval} value={timeInterval}
onChange={selectChange} onChange={selectChange}
className={styles.sel} className={styles.sel}
> >
<Option value="1">每分钟</Option> <Option value="1">每分钟</Option>
<Option value="2">5分钟</Option> <Option value="2">5分钟</Option>
<Option value="3">每小时</Option> <Option value="3">每小时</Option>
<Option value="4">每天</Option> <Option value="4">每天</Option>
</Select> </Select>
</Col> </Col>
<Col span={7} offset={1} style={{ paddingTop: '8px' }}> <Col span={7} offset={1} style={{ paddingTop: '8px' }}>
<span style={{ fontSize: '14px', fontWeight: '600' }}>接口调用频次统计</span> <span style={{ fontSize: '14px', fontWeight: '600' }}>
接口调用频次统计
</span>
</Col> </Col>
<Col span={7} offset={1} style={{ paddingTop: '8px' }}> <Col span={7} offset={1} style={{ paddingTop: '8px' }}>
<span style={{ fontSize: '14px', fontWeight: '600' }}>接口平均耗时统计</span> <span style={{ fontSize: '14px', fontWeight: '600' }}>
接口平均耗时统计
</span>
</Col> </Col>
</Row> </Row>
<Row className={styles.chart}> <Row className={styles.chart}>
...@@ -339,10 +358,15 @@ const ServiceLog = () => { ...@@ -339,10 +358,15 @@ const ServiceLog = () => {
renderer="svg" renderer="svg"
scale={{ scale={{
Count: { alias: '计数' }, 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 /> <Axis name="Count" title />
<Line shape="smooth" position="StartTime*Count" /> <Line shape="smooth" position="StartTime*Count" />
<Tooltip shared lock /> <Tooltip shared lock />
...@@ -361,7 +385,12 @@ const ServiceLog = () => { ...@@ -361,7 +385,12 @@ const ServiceLog = () => {
Path: { alias: '接口调用频次' }, 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 /> <Axis name="Count" title />
<Interval position="Path*Count" /> <Interval position="Path*Count" />
<Tooltip shared lock /> <Tooltip shared lock />
......
...@@ -9,7 +9,7 @@ import PicturesWall from '@/components/Upload/index'; ...@@ -9,7 +9,7 @@ import PicturesWall from '@/components/Upload/index';
const { Item } = Form; const { Item } = Form;
const { Option } = Select; const { Option } = Select;
const AddConfig = props => { const AddConfig = props => {
const { miniTitle, submitCallback, subType, addCallback } = props; const { miniTitle, submitCallback, subType, addCallback, singleList } = props;
console.log(subType, 'ubType'); console.log(subType, 'ubType');
const [config, setConfig] = useState(''); // 网站配置信息 const [config, setConfig] = useState(''); // 网站配置信息
const [loginList, setLoginList] = useState([ const [loginList, setLoginList] = useState([
...@@ -40,6 +40,19 @@ const AddConfig = props => { ...@@ -40,6 +40,19 @@ const AddConfig = props => {
const submit = value => { const submit = value => {
form.validateFields().then(valid => { form.validateFields().then(valid => {
if (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); setLoading(true);
const obj = { ...form.getFieldsValue() }; const obj = { ...form.getFieldsValue() };
let params = { ...obj, mode: 'single' }; let params = { ...obj, mode: 'single' };
......
...@@ -262,7 +262,11 @@ const MobileConfigPage = props => { ...@@ -262,7 +262,11 @@ const MobileConfigPage = props => {
}} }}
visible={addVisible} visible={addVisible}
> >
<AddConfig addCallback={addCallback} submitCallback={submitCallback} /> <AddConfig
addCallback={addCallback}
submitCallback={submitCallback}
singleList={singleList}
/>
</Drawer> </Drawer>
</PageContainer> </PageContainer>
); );
......
...@@ -293,7 +293,7 @@ const MiniMenu = props => { ...@@ -293,7 +293,7 @@ const MiniMenu = props => {
// obj.relatedRoleList = String(roleList) || ''; // obj.relatedRoleList = String(roleList) || '';
// } // }
console.log(obj); console.log(obj);
const parentID = item.menuID ? item.menuID : -1; const parentID = item.menuID ? item.menuID : '-1';
addMenu({ addMenu({
_dc: Date.now(), _dc: Date.now(),
parentID, parentID,
...@@ -431,13 +431,13 @@ const MiniMenu = props => { ...@@ -431,13 +431,13 @@ const MiniMenu = props => {
dragMenu({ dragMenu({
menuID: obj.id, menuID: obj.id,
newParentID: obj.parentId || -1, newParentID: obj.parentId.toString() || '-1',
menuList: String(arrList) || '', menuList: String(arrList) || '',
_version: 9999, _version: 9999,
_dc: Date.now(), _dc: Date.now(),
}).then(res => { }).then(res => {
console.log(res); console.log(res);
if (res.success) { if (res.code === 0) {
setFlag(flag + 1); setFlag(flag + 1);
} else { } else {
notification.error({ notification.error({
......
/* /*
* @Description: * @Description:
* @Author: leizhe * @Author: leizhe
* @Date: 2021-10-09 15:08:18 * @Date: 2021-10-09 15:08:18
* @LastEditTime: 2021-10-11 10:21:35 * @LastEditTime: 2021-10-11 10:21:35
* @LastEditors: leizhe * @LastEditors: leizhe
*/ */
import React, {PureComponent } from "react"; import React, { PureComponent } from 'react';
import DragM from "dragm"; import DragM from 'dragm';
export default class ModalDrag extends PureComponent { export default class ModalDrag extends PureComponent {
updateTransform = transformStr =>{ updateTransform = transformStr => {
this.modalDom.style.transform = transformStr; this.modalDom.style.transform = transformStr;
};
}; componentDidMount() {
componentDidMount(){ this.modalDom = document.getElementsByClassName('ant-modal-wrap')[0];
this.modalDom = document.getElementsByClassName("ant-modal-wrap")[0] }
}
render(){ render() {
const {title} = this.props; const { title } = this.props;
return ( return (
<DragM updateTransform={this.updateTransform}> <DragM updateTransform={this.updateTransform}>
<div>{title}</div> <div>{title}</div>
</DragM> </DragM>
) );
} }
} }
\ No newline at end of file
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
max-height: 20rem; max-height: 20rem;
overflow-y: scroll; overflow-y: scroll;
.ant-card{ .ant-card{
width: 80%; width: 83%;
margin-left: 4rem; margin-left: 4rem;
} }
.ant-card-head-title{ .ant-card-head-title{
......
...@@ -216,7 +216,7 @@ const TableManager = (props) => { ...@@ -216,7 +216,7 @@ const TableManager = (props) => {
align: 'center' align: 'center'
}, },
{ {
title: '字段数量', title: '附加字段',
dataIndex: 'fieldCount', dataIndex: 'fieldCount',
key: 'fieldCount', key: 'fieldCount',
align: 'center', align: 'center',
...@@ -334,7 +334,7 @@ const TableManager = (props) => { ...@@ -334,7 +334,7 @@ const TableManager = (props) => {
align: 'center', align: 'center',
}, },
{ {
title: '字段数量', title: '附加字段',
dataIndex: 'fieldCount', dataIndex: 'fieldCount',
key: 'fieldCount', key: 'fieldCount',
align: 'center', align: 'center',
......
...@@ -136,8 +136,9 @@ const Flow = () => { ...@@ -136,8 +136,9 @@ const Flow = () => {
dataIndex: 'extendWebPage', dataIndex: 'extendWebPage',
align: 'center', align: 'center',
render: text => ( render: text => (
// eslint-disable-next-line react/no-danger <span style={{ color: text === '(默认)' ? 'grey' : '000000D9' }}>
<span dangerouslySetInnerHTML={{ __html: text }} /> {text}
</span>
), ),
}, },
{ {
...@@ -145,8 +146,9 @@ const Flow = () => { ...@@ -145,8 +146,9 @@ const Flow = () => {
dataIndex: 'extendMobilePage', dataIndex: 'extendMobilePage',
align: 'center', align: 'center',
render: text => ( render: text => (
// eslint-disable-next-line react/no-danger <span style={{ color: text === '(默认)' ? 'grey' : '000000D9' }}>
<span dangerouslySetInnerHTML={{ __html: text }} /> {text}
</span>
), ),
}, },
{ {
...@@ -155,8 +157,9 @@ const Flow = () => { ...@@ -155,8 +157,9 @@ const Flow = () => {
align: 'center', align: 'center',
width: 80, width: 80,
render: text => ( render: text => (
// eslint-disable-next-line react/no-danger <span style={{ color: text === '(无)' ? 'grey' : '000000D9' }}>
<span dangerouslySetInnerHTML={{ __html: text }} /> {text}
</span>
), ),
}, },
{ {
...@@ -164,8 +167,9 @@ const Flow = () => { ...@@ -164,8 +167,9 @@ const Flow = () => {
dataIndex: 'flowEndBehavior', dataIndex: 'flowEndBehavior',
align: 'center', align: 'center',
render: text => ( render: text => (
// eslint-disable-next-line react/no-danger <span style={{ color: text === '(不做处理)' ? 'grey' : '000000D9' }}>
<span dangerouslySetInnerHTML={{ __html: text }} /> {text}
</span>
), ),
}, },
{ {
...@@ -179,8 +183,7 @@ const Flow = () => { ...@@ -179,8 +183,7 @@ const Flow = () => {
dataIndex: 'errorNodes', dataIndex: 'errorNodes',
align: 'center', align: 'center',
render: text => ( render: text => (
// eslint-disable-next-line react/no-danger <span style={{ color: text === '(无)' ? 'grey' : 'red' }}>{text}</span>
<span dangerouslySetInnerHTML={{ __html: text }} />
), ),
}, },
{ {
...@@ -188,8 +191,9 @@ const Flow = () => { ...@@ -188,8 +191,9 @@ const Flow = () => {
dataIndex: 'interfaceConfig', dataIndex: 'interfaceConfig',
align: 'center', align: 'center',
render: text => ( render: text => (
// eslint-disable-next-line react/no-danger <span style={{ color: text === '(无)' ? 'grey' : '000000D9' }}>
<span dangerouslySetInnerHTML={{ __html: text }} /> {text}
</span>
), ),
}, },
{ {
......
...@@ -82,45 +82,30 @@ const Timelimit = props => { ...@@ -82,45 +82,30 @@ const Timelimit = props => {
title: '规则名称', title: '规则名称',
dataIndex: 'Name', dataIndex: 'Name',
align: 'center', align: 'center',
render: text => (
// eslint-disable-next-line react/no-danger
<span dangerouslySetInnerHTML={{ __html: text }} />
),
}, },
{ {
title: '开始节点', title: '开始节点',
dataIndex: 'StartNode', dataIndex: 'StartNode',
align: 'center', align: 'center',
render: text => (
// eslint-disable-next-line react/no-danger
<span dangerouslySetInnerHTML={{ __html: text }} />
),
}, },
{ {
title: '结束节点', title: '结束节点',
dataIndex: 'EndNode', dataIndex: 'EndNode',
align: 'center', align: 'center',
render: text => (
// eslint-disable-next-line react/no-danger
<span dangerouslySetInnerHTML={{ __html: text }} />
),
}, },
{ {
title: '默认时限', title: '默认时限',
dataIndex: 'TimeLimit', dataIndex: 'TimeLimit',
align: 'center', align: 'center',
render: text => (
// eslint-disable-next-line react/no-danger
<span dangerouslySetInnerHTML={{ __html: text }} />
),
}, },
{ {
title: '时限指派字段', title: '时限指派字段',
dataIndex: 'TimeLimitFieldHtml', dataIndex: 'TimeLimitField',
align: 'center', align: 'center',
render: text => ( render: text => (
// eslint-disable-next-line react/no-danger <span style={{ color: text === '(未配置)' ? 'grey' : '#0000009D' }}>
<span dangerouslySetInnerHTML={{ __html: text }} /> {text}
</span>
), ),
}, },
{ {
...@@ -128,8 +113,9 @@ const Timelimit = props => { ...@@ -128,8 +113,9 @@ const Timelimit = props => {
dataIndex: 'TimeoutField', dataIndex: 'TimeoutField',
align: 'center', align: 'center',
render: text => ( render: text => (
// eslint-disable-next-line react/no-danger <span style={{ color: text === '(未配置)' ? 'grey' : '#0000009D' }}>
<span dangerouslySetInnerHTML={{ __html: text }} /> {text}
</span>
), ),
}, },
{ {
......
...@@ -230,8 +230,7 @@ const AddModal = props => { ...@@ -230,8 +230,7 @@ const AddModal = props => {
<Select> <Select>
{timeLimitFlowNodes.map(item => ( {timeLimitFlowNodes.map(item => (
<Option value={item.Name} key={item.ID}> <Option value={item.Name} key={item.ID}>
{/* eslint-disable-next-line react/no-danger */} <span>{item.Name}</span>
<span dangerouslySetInnerHTML={{ __html: item.Name }} />
</Option> </Option>
))} ))}
</Select> </Select>
...@@ -244,8 +243,7 @@ const AddModal = props => { ...@@ -244,8 +243,7 @@ const AddModal = props => {
<Select> <Select>
{timeLimitFlowNodes.map(item => ( {timeLimitFlowNodes.map(item => (
<Option value={item.Name} key={item.ID}> <Option value={item.Name} key={item.ID}>
{/* eslint-disable-next-line react/no-danger */} <span>{item.Name}</span>
<span dangerouslySetInnerHTML={{ __html: item.Name }} />
</Option> </Option>
))} ))}
</Select> </Select>
......
...@@ -93,6 +93,17 @@ const FlowNode = () => { ...@@ -93,6 +93,17 @@ const FlowNode = () => {
} }
setExpandedRowKeys(data); setExpandedRowKeys(data);
}; };
// 表格内文案样式
const textStyleOne = (text, record) => {
if (record.colorType === 2) {
return 'red';
}
if (text === '(未配置)') {
return 'grey';
}
return '000000D9';
};
// 定义展开的表格 // 定义展开的表格
const createUnfoldTable = itemTable => { const createUnfoldTable = itemTable => {
const columns = [ const columns = [
...@@ -101,12 +112,15 @@ const FlowNode = () => { ...@@ -101,12 +112,15 @@ const FlowNode = () => {
dataIndex: 'name', dataIndex: 'name',
width: 149, width: 149,
align: 'left', align: 'left',
render: text => ( render: (text, record) => (
<div <div
style={{ paddingLeft: 60 }} style={{
// eslint-disable-next-line react/no-danger paddingLeft: 60,
dangerouslySetInnerHTML={{ __html: text }} color: record.colorType === 2 ? 'red' : '#000000D9',
/> }}
>
{text}
</div>
), ),
}, },
{ {
...@@ -114,19 +128,15 @@ const FlowNode = () => { ...@@ -114,19 +128,15 @@ const FlowNode = () => {
dataIndex: 'aliasName', dataIndex: 'aliasName',
align: 'center', align: 'center',
width: 80, width: 80,
render: text => ( render: text => <span>{text}</span>,
// eslint-disable-next-line react/no-danger
<span dangerouslySetInnerHTML={{ __html: text }} />
),
}, },
{ {
title: '移交方式', title: '移交方式',
dataIndex: 'extendHandover', dataIndex: 'extendHandover',
align: 'center', align: 'center',
width: 80, width: 80,
render: text => ( render: (text, record) => (
// eslint-disable-next-line react/no-danger <span style={{ color: textStyleOne(text, record) }}>{text}</span>
<span dangerouslySetInnerHTML={{ __html: text }} />
), ),
}, },
{ {
...@@ -134,9 +144,8 @@ const FlowNode = () => { ...@@ -134,9 +144,8 @@ const FlowNode = () => {
dataIndex: 'extendNodeType', dataIndex: 'extendNodeType',
align: 'center', align: 'center',
width: 80, width: 80,
render: text => ( render: (text, record) => (
// eslint-disable-next-line react/no-danger <span style={{ color: textStyleOne(text, record) }}>{text}</span>
<span dangerouslySetInnerHTML={{ __html: text }} />
), ),
}, },
{ {
...@@ -147,10 +156,9 @@ const FlowNode = () => { ...@@ -147,10 +156,9 @@ const FlowNode = () => {
ellipsis: { ellipsis: {
showTitle: true, showTitle: true,
}, },
render: text => ( render: (text, record) => (
<Tooltip placement="topLeft" title={text}> <Tooltip placement="topLeft" title={text}>
{/* eslint-disable-next-line react/no-danger */} <span style={{ color: textStyleOne(text, record) }}>{text}</span>
<span dangerouslySetInnerHTML={{ __html: text }} />
</Tooltip> </Tooltip>
), ),
}, },
...@@ -159,15 +167,21 @@ const FlowNode = () => { ...@@ -159,15 +167,21 @@ const FlowNode = () => {
dataIndex: 'extendSeeFields', dataIndex: 'extendSeeFields',
align: 'center', align: 'center',
width: 80, width: 80,
render: (text, record) => (
<span style={{ color: record.colorType === 2 ? 'red' : '#000000D9' }}>
{text}
</span>
),
}, },
{ {
title: '字段', title: '字段',
dataIndex: 'extendFields', dataIndex: 'extendFields',
align: 'center', align: 'center',
width: 80, width: 80,
render: text => ( render: (text, record) => (
// eslint-disable-next-line react/no-danger <span style={{ color: record.colorType === 2 ? 'red' : '#000000D9' }}>
<span dangerouslySetInnerHTML={{ __html: text }} /> {text}
</span>
), ),
}, },
...@@ -176,9 +190,10 @@ const FlowNode = () => { ...@@ -176,9 +190,10 @@ const FlowNode = () => {
dataIndex: 'extendEditableLater', dataIndex: 'extendEditableLater',
align: 'center', align: 'center',
width: 80, width: 80,
render: text => ( render: (text, record) => (
// eslint-disable-next-line react/no-danger <span style={{ color: record.colorType === 2 ? 'red' : '#000000D9' }}>
<span dangerouslySetInnerHTML={{ __html: text }} /> {text}
</span>
), ),
}, },
{ {
...@@ -186,9 +201,10 @@ const FlowNode = () => { ...@@ -186,9 +201,10 @@ const FlowNode = () => {
dataIndex: 'extendRollbackable', dataIndex: 'extendRollbackable',
align: 'center', align: 'center',
width: 80, width: 80,
render: text => ( render: (text, record) => (
// eslint-disable-next-line react/no-danger <span style={{ color: record.colorType === 2 ? 'red' : '#000000D9' }}>
<span dangerouslySetInnerHTML={{ __html: text }} /> {text}
</span>
), ),
}, },
{ {
...@@ -196,9 +212,10 @@ const FlowNode = () => { ...@@ -196,9 +212,10 @@ const FlowNode = () => {
dataIndex: 'extendRollbackNode', dataIndex: 'extendRollbackNode',
align: 'center', align: 'center',
width: 80, width: 80,
render: text => ( render: (text, record) => (
// eslint-disable-next-line react/no-danger <span style={{ color: record.colorType === 2 ? 'red' : '#000000D9' }}>
<span dangerouslySetInnerHTML={{ __html: text }} /> {text}
</span>
), ),
}, },
{ {
...@@ -206,9 +223,10 @@ const FlowNode = () => { ...@@ -206,9 +223,10 @@ const FlowNode = () => {
dataIndex: 'tranferable', dataIndex: 'tranferable',
align: 'center', align: 'center',
width: 80, width: 80,
render: text => ( render: (text, record) => (
// eslint-disable-next-line react/no-danger <span style={{ color: record.colorType === 2 ? 'red' : '#000000D9' }}>
<span dangerouslySetInnerHTML={{ __html: text }} /> {text}
</span>
), ),
}, },
{ {
...@@ -216,9 +234,10 @@ const FlowNode = () => { ...@@ -216,9 +234,10 @@ const FlowNode = () => {
dataIndex: 'eventInformation', dataIndex: 'eventInformation',
align: 'center', align: 'center',
width: 80, width: 80,
render: text => ( render: (text, record) => (
// eslint-disable-next-line react/no-danger <span style={{ color: record.colorType === 2 ? 'red' : '#000000D9' }}>
<span dangerouslySetInnerHTML={{ __html: text }} /> {text}
</span>
), ),
}, },
{ {
......
...@@ -28,8 +28,11 @@ ...@@ -28,8 +28,11 @@
// 编辑节点表单 // 编辑节点表单
.formData { .formData {
height: 32rem; height: calc(100vh - 162px);
overflow-y: scroll; overflow-y: scroll;
.ant-radio-wrapper {
min-width: 130px;
}
.filedListItem { .filedListItem {
display: flex; display: flex;
flex-wrap: nowrap; flex-wrap: nowrap;
......
...@@ -85,55 +85,67 @@ const AuxiliaryView = props => { ...@@ -85,55 +85,67 @@ const AuxiliaryView = props => {
title: '前端便签', title: '前端便签',
dataIndex: 'WebLabel', dataIndex: 'WebLabel',
align: 'center', align: 'center',
render: text => ( render: text => {
// eslint-disable-next-line react/no-danger if (text === '(未配置)' || text === '(无)') {
<span dangerouslySetInnerHTML={{ __html: text }} /> return <span style={{ color: 'grey' }}>{text}</span>;
), }
return <span>{text}</span>;
},
}, },
{ {
title: '前端视图', title: '前端视图',
dataIndex: 'WebPage', dataIndex: 'WebPage',
align: 'center', align: 'center',
render: text => ( render: text => {
// eslint-disable-next-line react/no-danger if (text === '(未配置)' || text === '(无)') {
<span dangerouslySetInnerHTML={{ __html: text }} /> return <span style={{ color: 'grey' }}>{text}</span>;
), }
return <span>{text}</span>;
},
}, },
{ {
title: '前端参数', title: '前端参数',
dataIndex: 'WebParam', dataIndex: 'WebParam',
align: 'center', align: 'center',
render: text => ( render: text => {
// eslint-disable-next-line react/no-danger if (text === '(未配置)' || text === '(无)') {
<span dangerouslySetInnerHTML={{ __html: text }} /> return <span style={{ color: 'grey' }}>{text}</span>;
), }
return <span>{text}</span>;
},
}, },
{ {
title: '手持标签', title: '手持标签',
dataIndex: 'MobileLabel', dataIndex: 'MobileLabel',
align: 'center', align: 'center',
render: text => ( render: text => {
// eslint-disable-next-line react/no-danger if (text === '(未配置)' || text === '(无)') {
<span dangerouslySetInnerHTML={{ __html: text }} /> return <span style={{ color: 'grey' }}>{text}</span>;
), }
return <span>{text}</span>;
},
}, },
{ {
title: '手持视图', title: '手持视图',
dataIndex: 'MobilePage', dataIndex: 'MobilePage',
align: 'center', align: 'center',
render: text => ( render: text => {
// eslint-disable-next-line react/no-danger if (text === '(未配置)' || text === '(无)') {
<span dangerouslySetInnerHTML={{ __html: text }} /> return <span style={{ color: 'grey' }}>{text}</span>;
), }
return <span>{text}</span>;
},
}, },
{ {
title: '手持参数', title: '手持参数',
dataIndex: 'MobileParam', dataIndex: 'MobileParam',
align: 'center', align: 'center',
render: text => ( render: text => {
// eslint-disable-next-line react/no-danger if (text === '(未配置)' || text === '(无)') {
<span dangerouslySetInnerHTML={{ __html: text }} /> return <span style={{ color: 'grey' }}>{text}</span>;
), }
return <span>{text}</span>;
},
}, },
{ {
title: '操作', title: '操作',
......
...@@ -10,7 +10,6 @@ import { ...@@ -10,7 +10,6 @@ import {
import { import {
Form, Form,
Modal,
Input, Input,
Radio, Radio,
Select, Select,
...@@ -18,6 +17,8 @@ import { ...@@ -18,6 +17,8 @@ import {
Checkbox, Checkbox,
Button, Button,
message, message,
Drawer,
Space,
} from 'antd'; } from 'antd';
import { PlusOutlined } from '@ant-design/icons'; import { PlusOutlined } from '@ant-design/icons';
import Fieldselection from './nodeEditComponents/Fieldselection'; import Fieldselection from './nodeEditComponents/Fieldselection';
...@@ -99,58 +100,47 @@ const NodeEdit = props => { ...@@ -99,58 +100,47 @@ const NodeEdit = props => {
loadEventFields({ eventTableName: value.TableName }).then(res => { loadEventFields({ eventTableName: value.TableName }).then(res => {
if (res.code === 0) { if (res.code === 0) {
let defaultCheckedList = value[val] ? value[val].split(',') : []; let defaultCheckedList = value[val] ? value[val].split(',') : [];
// 处理数据为树形结构 // 处理树形结构
let keylist = new Set(); let checkList = res.data.map(item => {
let list = new Map(); let plainOptions = [];
res.data.forEach(item => { item.root.forEach(ele => {
keylist.add(item.group); plainOptions = [...plainOptions, ele.fieldName];
if (keylist.has(item.group)) { });
let listItem = list.get(item.group); return {
// 存入check得选项,是否全选,选中的选项' groupName: item.groupName,
if (listItem) { plainOptions,
list.set(item.group, { defaultCheckedList: [],
plainOptions: [...listItem.plainOptions, item.fieldName], };
defaultCheckedList: [],
});
} else {
list.set(item.group, {
plainOptions: [item.fieldName],
defaultCheckedList: [],
});
}
}
}); });
let checkList = [...list];
defaultCheckedList.forEach(item => { defaultCheckedList.forEach(item => {
checkList.forEach(element => { checkList.forEach(element => {
// 当前得模块是否有当前字段 // 当前得模块是否有当前字段
let indeterminate = element[1].plainOptions.some( let indeterminate = element.plainOptions.some(
checkName => checkName === item, checkName => checkName === item,
); );
// 处理已选中的字段 // 处理已选中的字段
if (indeterminate) { if (indeterminate) {
element[1].defaultCheckedList.push(item); element.defaultCheckedList.push(item);
} }
if ( if (
element[1].defaultCheckedList.length > 0 && element.defaultCheckedList.length > 0 &&
element[1].defaultCheckedList.length < element.defaultCheckedList.length < element.plainOptions.length
element[1].plainOptions.length
) { ) {
element[1].indeterminate = true; element.indeterminate = true;
} else { } else {
element[1].indeterminate = false; element.indeterminate = false;
} }
// 处理是否全选字段 // 处理是否全选字段
if ( if (
element[1].defaultCheckedList.length === element.defaultCheckedList.length === element.plainOptions.length
element[1].plainOptions.length
) { ) {
element[1].checkAll = true; element.checkAll = true;
} else { } else {
element[1].checkAll = false; element.checkAll = false;
} }
}); });
}); });
console.log(checkList, 'checkList');
setFieldList(checkList); setFieldList(checkList);
setTimeout(() => { setTimeout(() => {
setShowField(true); setShowField(true);
...@@ -215,14 +205,19 @@ const NodeEdit = props => { ...@@ -215,14 +205,19 @@ const NodeEdit = props => {
} }
}; };
return ( return (
<Modal <Drawer
title="流程节点配置" title="流程节点配置"
width="500px"
onClose={handleCancel}
visible={visible} visible={visible}
onOk={onFinish} footer={
width="800px" <Space>
onCancel={handleCancel} <Button onClick={handleCancel}>取消</Button>
maskClosable={false} <Button onClick={onFinish} type="primary">
centered 确定
</Button>
</Space>
}
> >
<Form <Form
form={form} form={form}
...@@ -329,13 +324,13 @@ const NodeEdit = props => { ...@@ -329,13 +324,13 @@ const NodeEdit = props => {
/> />
</div> </div>
</Form.Item> </Form.Item>
<Form.Item label="查看字段(工程模型)"> <Form.Item label="查看字段">
<div className={styles.filedListItem}> <div className={styles.filedListItem}>
<Form.Item <Form.Item
name="SeeFields" name="SeeFields"
style={{ marginBottom: 0, width: '100%' }} style={{ marginBottom: 0, width: '100%' }}
> >
<Input placeholder="请选择查看字段" allowClear /> <Input placeholder="请选择查看字段(工程模型)" allowClear />
</Form.Item> </Form.Item>
<Button <Button
type="dashed" type="dashed"
...@@ -379,7 +374,7 @@ const NodeEdit = props => { ...@@ -379,7 +374,7 @@ const NodeEdit = props => {
fieldList={fieldList} fieldList={fieldList}
onSubumit={val => setFiled(val)} onSubumit={val => setFiled(val)}
/> />
</Modal> </Drawer>
); );
}; };
export default NodeEdit; export default NodeEdit;
...@@ -19,7 +19,7 @@ const Fieldselection = props => { ...@@ -19,7 +19,7 @@ const Fieldselection = props => {
return; return;
} }
checkList.forEach(element => { checkList.forEach(element => {
arr = [...arr, ...element[1].defaultCheckedList]; arr = [...arr, ...element.defaultCheckedList];
}); });
setSelectList(arr); setSelectList(arr);
// 初始化拖拽 // 初始化拖拽
...@@ -35,11 +35,11 @@ const Fieldselection = props => { ...@@ -35,11 +35,11 @@ const Fieldselection = props => {
const onChange = (list, index) => { const onChange = (list, index) => {
setCheckList(value => { setCheckList(value => {
const chooseList = JSON.parse(JSON.stringify(value)); const chooseList = JSON.parse(JSON.stringify(value));
chooseList[index][1].defaultCheckedList = list; chooseList[index].defaultCheckedList = list;
chooseList[index][1].indeterminate = chooseList[index].indeterminate =
!!list.length && list.length < chooseList[index][1].plainOptions.length; !!list.length && list.length < chooseList[index].plainOptions.length;
chooseList[index][1].checkAll = chooseList[index].checkAll =
list.length === chooseList[index][1].plainOptions.length; list.length === chooseList[index].plainOptions.length;
return chooseList; return chooseList;
}); });
}; };
...@@ -47,11 +47,11 @@ const Fieldselection = props => { ...@@ -47,11 +47,11 @@ const Fieldselection = props => {
const onCheckAllChange = (e, index) => { const onCheckAllChange = (e, index) => {
setCheckList(value => { setCheckList(value => {
const chooseList = JSON.parse(JSON.stringify(value)); const chooseList = JSON.parse(JSON.stringify(value));
chooseList[index][1].defaultCheckedList = e.target.checked chooseList[index].defaultCheckedList = e.target.checked
? chooseList[index][1].plainOptions ? chooseList[index].plainOptions
: []; : [];
chooseList[index][1].indeterminate = false; chooseList[index].indeterminate = false;
chooseList[index][1].checkAll = e.target.checked; chooseList[index].checkAll = e.target.checked;
return chooseList; return chooseList;
}); });
}; };
...@@ -98,19 +98,21 @@ const Fieldselection = props => { ...@@ -98,19 +98,21 @@ const Fieldselection = props => {
<div className={styles.cardBox} key={index}> <div className={styles.cardBox} key={index}>
<div className={styles.title}> <div className={styles.title}>
<Divider orientation="left" className={styles.cardDivider}> <Divider orientation="left" className={styles.cardDivider}>
<span style={{ marginRight: '10px' }}>{item[0]}</span> <span style={{ marginRight: '10px' }}>
{item.groupName}
</span>
<Checkbox <Checkbox
indeterminate={item[1].indeterminate} indeterminate={item.indeterminate}
onChange={e => onCheckAllChange(e, index)} onChange={e => onCheckAllChange(e, index)}
checked={item[1].checkAll} checked={item.checkAll}
/> />
</Divider> </Divider>
</div> </div>
<div className={styles.filedList}> <div className={styles.filedList}>
<CheckboxGroup <CheckboxGroup
key={index} key={index}
options={item[1].plainOptions} options={item.plainOptions}
value={item[1].defaultCheckedList} value={item.defaultCheckedList}
onChange={list => onChange(list, index)} onChange={list => onChange(list, index)}
/> />
</div> </div>
......
...@@ -37,6 +37,7 @@ const Workflow = () => { ...@@ -37,6 +37,7 @@ const Workflow = () => {
const [editIndex, setEditIndex] = useState(); // 编辑流程组得索引 const [editIndex, setEditIndex] = useState(); // 编辑流程组得索引
const [treeVisible, setTreeVisible] = useState(true); const [treeVisible, setTreeVisible] = useState(true);
const [chartLoading, setChartLoading] = useState(false); // 流程图的loading const [chartLoading, setChartLoading] = useState(false); // 流程图的loading
const [canSelect, setCanSelect] = useState(true); // 是否可以切换树
const [visible, setVisible] = useState({ const [visible, setVisible] = useState({
FlowModal: false, FlowModal: false,
FlowGroupModal: false, FlowGroupModal: false,
...@@ -129,8 +130,8 @@ const Workflow = () => { ...@@ -129,8 +130,8 @@ const Workflow = () => {
showModal('FlowGroupModal', true); showModal('FlowGroupModal', true);
setModalType('add'); setModalType('add');
}; };
// 点击节点树触发 // 选择节点
const onSelect = (prop, treeNode) => { const chooseNode = (prop, treeNode) => {
if (!treeNode || treeNode.node.children) { if (!treeNode || treeNode.node.children) {
setCurrentSelectId(treeId); setCurrentSelectId(treeId);
return; return;
...@@ -146,6 +147,7 @@ const Workflow = () => { ...@@ -146,6 +147,7 @@ const Workflow = () => {
if (res.code === 0) { if (res.code === 0) {
setFlowData(res.data); setFlowData(res.data);
} else { } else {
setFlowData({ Nodes: [], Lines: [] });
notification.error({ notification.error({
title: '提示', title: '提示',
duration: 3, duration: 3,
...@@ -157,6 +159,27 @@ const Workflow = () => { ...@@ -157,6 +159,27 @@ const Workflow = () => {
setCurrentSelectId(treeId); 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 mapTree = (val, index) => {
const obj = { ...val }; const obj = { ...val };
...@@ -222,6 +245,10 @@ const Workflow = () => { ...@@ -222,6 +245,10 @@ const Workflow = () => {
// 选中当前选中的节点 // 选中当前选中的节点
onSelect(); onSelect();
}; };
// 数据改变后的回调函数
const leaveCallBack = val => {
setCanSelect(!val);
};
return ( return (
<PageContainer> <PageContainer>
<div className={styles.flowContainer}> <div className={styles.flowContainer}>
...@@ -273,6 +300,7 @@ const Workflow = () => { ...@@ -273,6 +300,7 @@ const Workflow = () => {
flowData={flowData} flowData={flowData}
flowID={currentSelectId} flowID={currentSelectId}
chartLoading={chartLoading} chartLoading={chartLoading}
leaveCallBack={leaveCallBack}
/> />
) : ( ) : (
<Empty <Empty
......
...@@ -3,6 +3,7 @@ import { Button, Modal, notification, Spin } from 'antd'; ...@@ -3,6 +3,7 @@ import { Button, Modal, notification, Spin } from 'antd';
import { SaveNodeChange, GetFlowNode } from '@/services/platform/workflow'; import { SaveNodeChange, GetFlowNode } from '@/services/platform/workflow';
import { ExclamationCircleOutlined } from '@ant-design/icons'; import { ExclamationCircleOutlined } from '@ant-design/icons';
import { Prompt } from 'react-router-dom';
import * as go from 'gojs'; import * as go from 'gojs';
import styles from '../workflow.less'; import styles from '../workflow.less';
import NodeModal from './flowChartComponents/NodeModal'; import NodeModal from './flowChartComponents/NodeModal';
...@@ -10,7 +11,7 @@ import imgUrl from '@/assets/images/icons/closeBlue.png'; ...@@ -10,7 +11,7 @@ import imgUrl from '@/assets/images/icons/closeBlue.png';
const { confirm } = Modal; const { confirm } = Modal;
let diagram = null; let diagram = null;
const FlowChart = props => { const FlowChart = props => {
const { flowData, flowID, chartLoading } = props; const { flowData, flowID, chartLoading, leaveCallBack } = props;
const [visible, setVisible] = useState(false); const [visible, setVisible] = useState(false);
const [editMsg, setEditMsg] = useState({}); // 编辑节点的信息 const [editMsg, setEditMsg] = useState({}); // 编辑节点的信息
const [modalType, setModalType] = useState(''); // 存入弹窗是编辑还是新增 const [modalType, setModalType] = useState(''); // 存入弹窗是编辑还是新增
...@@ -20,10 +21,12 @@ const FlowChart = props => { ...@@ -20,10 +21,12 @@ const FlowChart = props => {
const [deleteLine, setDeleteLine] = useState(); // 删除的线id const [deleteLine, setDeleteLine] = useState(); // 删除的线id
const [deleteNode, setDeleteNode] = useState(); // 删除的节点id const [deleteNode, setDeleteNode] = useState(); // 删除的节点id
const [AddNodes, setAddNodes] = useState([]); // 新增数组 const [AddNodes, setAddNodes] = useState([]); // 新增数组
const [initFlowData, setInitFlowData] = useState({}); // 初始数据,用来比对是否有修改流程图
const [currentFlowData, setCurrentFlowData] = useState({ const [currentFlowData, setCurrentFlowData] = useState({
Nodes: [], Nodes: [],
Lines: [], Lines: [],
}); // 组件内得流程图数据 }); // 组件内得流程图数据
const [showLeaveTip, setShowLeaveTip] = useState(false); // 离开路由是否又提醒
const objGo = go.GraphObject.make; const objGo = go.GraphObject.make;
// 监听删除,给删除数组里添加删除id // 监听删除,给删除数组里添加删除id
useEffect(() => { useEffect(() => {
...@@ -36,6 +39,7 @@ const FlowChart = props => { ...@@ -36,6 +39,7 @@ const FlowChart = props => {
setDeleteNodes([...DeleteNodes, deleteNode]); setDeleteNodes([...DeleteNodes, deleteNode]);
} }
}, [deleteNode]); }, [deleteNode]);
// 初始化
useEffect(() => { useEffect(() => {
// 初始化流程图 // 初始化流程图
init(); init();
...@@ -73,6 +77,7 @@ const FlowChart = props => { ...@@ -73,6 +77,7 @@ const FlowChart = props => {
setDeleteNode(''); setDeleteNode('');
setDeleteLine(''); setDeleteLine('');
setCurrentFlowData(JSON.parse(JSON.stringify(flowData))); setCurrentFlowData(JSON.parse(JSON.stringify(flowData)));
setShowLeaveTip(false);
} }
}, [flowData]); }, [flowData]);
// 存入在树形流程中选择得流程数据 // 存入在树形流程中选择得流程数据
...@@ -81,13 +86,30 @@ const FlowChart = props => { ...@@ -81,13 +86,30 @@ const FlowChart = props => {
if (currentFlowData.Nodes.length === 0) { if (currentFlowData.Nodes.length === 0) {
nodeDataArray = []; nodeDataArray = [];
} else { } else {
nodeDataArray = currentFlowData.Nodes.map(item => { // 处理老数据,让老数据可以正常展示
nodeDataArray = currentFlowData.Nodes.map((item, index) => {
let obj; let obj;
obj = item; obj = item;
obj.key = item.NodeId; 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; return obj;
}); });
} }
// 保存初始数据
setInitFlowData(
JSON.parse(
JSON.stringify({
Nodes: nodeDataArray,
Lines: currentFlowData.Lines,
}),
),
);
diagram.model = go.Model.fromJson({ diagram.model = go.Model.fromJson({
linkFromPortIdProperty: 'fromPort', // 所需信息: linkFromPortIdProperty: 'fromPort', // 所需信息:
linkToPortIdProperty: 'toPort', // 标识数据属性名称 linkToPortIdProperty: 'toPort', // 标识数据属性名称
...@@ -112,6 +134,8 @@ const FlowChart = props => { ...@@ -112,6 +134,8 @@ const FlowChart = props => {
}; };
// 删除节点 // 删除节点
const delNode = () => { const delNode = () => {
setShowLeaveTip(true);
leaveCallBack(true);
diagram.commandHandler.deleteSelection(); diagram.commandHandler.deleteSelection();
}; };
// 流程图初始化 // 流程图初始化
...@@ -303,12 +327,30 @@ const FlowChart = props => { ...@@ -303,12 +327,30 @@ const FlowChart = props => {
nodeData.roleList = roleList; nodeData.roleList = roleList;
diagram.model.updateTargetBindings(nodeData); 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); setVisible(false);
}; };
// 获取保存后的流程数据 // 获取保存后的流程数据
const getFlowData = () => { const getFlowData = () => {
GetFlowNode({ flowID }).then(res => { GetFlowNode({ flowID }).then(res => {
if (res.code === 0) { if (res.code === 0) {
// 保存后离开不用提醒要修改数据了
setShowLeaveTip(false);
leaveCallBack(false);
setCurrentFlowData(res.data); setCurrentFlowData(res.data);
} else { } else {
notification.error({ notification.error({
...@@ -355,9 +397,15 @@ const FlowChart = props => { ...@@ -355,9 +397,15 @@ const FlowChart = props => {
}; };
return ( return (
<> <>
<Prompt
message="编辑的内容还未保存,确定要离开该页面吗?"
when={showLeaveTip}
/>
<div className={styles.buttonList}> <div className={styles.buttonList}>
<Button onClick={() => addNode()}>添加节点</Button> <Button onClick={() => addNode()}>添加节点</Button>
<Button onClick={() => saveFlow()}>保存</Button> <Button type="primary" onClick={() => saveFlow()}>
保存
</Button>
</div> </div>
<Spin spinning={chartLoading}> <Spin spinning={chartLoading}>
<div <div
......
...@@ -13,7 +13,7 @@ import { ...@@ -13,7 +13,7 @@ import {
Popconfirm, Popconfirm,
message, message,
} from 'antd'; } from 'antd';
import { DeleteOutlined } from '@ant-design/icons'; import { DeleteOutlined, EditTwoTone } from '@ant-design/icons';
import RoalChoose from './nodeModalComponents/RoalChoose'; import RoalChoose from './nodeModalComponents/RoalChoose';
const { Option } = Select; const { Option } = Select;
...@@ -21,6 +21,8 @@ const NodeModal = props => { ...@@ -21,6 +21,8 @@ const NodeModal = props => {
const { onSubumit, handleCancel, visible, modalType, editMsg } = props; const { onSubumit, handleCancel, visible, modalType, editMsg } = props;
const [form] = Form.useForm(); const [form] = Form.useForm();
const [showRoal, setShowRoal] = useState(false); // 是否显示选择角色用户弹窗 const [showRoal, setShowRoal] = useState(false); // 是否显示选择角色用户弹窗
const [isEdit, setIsEdit] = useState(); // 是编辑角色还是添加角色
const [chooseUser, setChooseUser] = useState(); // 当前编辑角色或者机构的默认承办人
const [nodeMsg, setNodeMsg] = useState({ const [nodeMsg, setNodeMsg] = useState({
NodeName: '', NodeName: '',
NodeType: '', NodeType: '',
...@@ -58,8 +60,8 @@ const NodeModal = props => { ...@@ -58,8 +60,8 @@ const NodeModal = props => {
setNodeMsg({ ...nodeMsg, roleList }); setNodeMsg({ ...nodeMsg, roleList });
}; };
// 添加用户 // 添加用户
const addUser = obj => { const addUser = (obj, treeLength) => {
if (obj.roleId === '') { if (obj.roleId === '' || obj.roleName === '' || treeLength === 0) {
notification.error({ notification.error({
message: '提示', message: '提示',
duration: 3, duration: 3,
...@@ -68,7 +70,10 @@ const NodeModal = props => { ...@@ -68,7 +70,10 @@ const NodeModal = props => {
return; return;
} }
// 如果已经有角色就提示 // 如果已经有角色就提示
if (nodeMsg.roleList.some(item => item.roleId === obj.roleId)) { if (
nodeMsg.roleList.some(item => item.roleId === obj.roleId) &&
isEdit === 'add'
) {
notification.error({ notification.error({
message: '提示', message: '提示',
duration: 3, duration: 3,
...@@ -76,9 +81,27 @@ const NodeModal = props => { ...@@ -76,9 +81,27 @@ const NodeModal = props => {
}); });
return; return;
} }
// 编辑角色覆盖原有
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); setShowRoal(false);
// 添加表格 };
setNodeMsg({ ...nodeMsg, roleList: [...nodeMsg.roleList, obj] }); // 编辑默认承办人
const toEdit = record => {
setIsEdit('edit');
setChooseUser(record);
setShowRoal(true);
}; };
// 定义表格 // 定义表格
const columns = [ const columns = [
...@@ -86,6 +109,14 @@ const NodeModal = props => { ...@@ -86,6 +109,14 @@ const NodeModal = props => {
title: '机构(角色)名称', title: '机构(角色)名称',
dataIndex: 'roleName', dataIndex: 'roleName',
align: 'center', align: 'center',
ellipsis: {
showTitle: false,
},
render: text => (
<Tooltip placement="topLeft" title={text}>
{text}
</Tooltip>
),
}, },
{ {
title: '默认承办人', title: '默认承办人',
...@@ -120,6 +151,12 @@ const NodeModal = props => { ...@@ -120,6 +151,12 @@ const NodeModal = props => {
/> />
</Popconfirm> </Popconfirm>
</Tooltip> </Tooltip>
<Tooltip title="修改默认承办人">
<EditTwoTone
onClick={() => toEdit(record)}
style={{ fontSize: '16px', color: '#1890FF' }}
/>
</Tooltip>
</Space> </Space>
</> </>
), ),
...@@ -196,7 +233,9 @@ const NodeModal = props => { ...@@ -196,7 +233,9 @@ const NodeModal = props => {
style={{ marginBottom: '10px' }} style={{ marginBottom: '10px' }}
onClick={() => { onClick={() => {
setShowRoal(true); setShowRoal(true);
setIsEdit('add');
}} }}
type="primary"
> >
添加 添加
</Button> </Button>
...@@ -207,11 +246,18 @@ const NodeModal = props => { ...@@ -207,11 +246,18 @@ const NodeModal = props => {
bordered bordered
size="small" size="small"
scroll={{ y: 'calc(100vh - 550px)' }} scroll={{ y: 'calc(100vh - 550px)' }}
onRow={record => ({
onDoubleClick: () => {
toEdit(record);
},
})}
pagination={false} pagination={false}
/> />
</Drawer> </Drawer>
<RoalChoose <RoalChoose
visible={showRoal} visible={showRoal}
modalType={isEdit}
chooseUser={chooseUser}
handleCancel={() => setShowRoal(false)} handleCancel={() => setShowRoal(false)}
onSubumit={addUser} onSubumit={addUser}
/> />
......
...@@ -9,15 +9,19 @@ import { ...@@ -9,15 +9,19 @@ import {
Pagination, Pagination,
Spin, Spin,
Divider, Divider,
notification,
Empty,
Tabs,
} from 'antd'; } from 'antd';
import Tree from '@/components/ExpendableTree'; import Tree from '@/components/ExpendableTree';
import { UserOutlined } from '@ant-design/icons'; import { UserOutlined } from '@ant-design/icons';
import styles from '../../../workflow.less'; import styles from '../../../workflow.less';
const CheckboxGroup = Checkbox.Group; const CheckboxGroup = Checkbox.Group;
const { TabPane } = Tabs;
const RoalChoose = props => { const RoalChoose = props => {
const { onSubumit, handleCancel, visible } = props; const { onSubumit, handleCancel, visible, modalType, chooseUser } = props;
const [form] = Form.useForm(); const [form] = Form.useForm();
const [currentSelectId, setCurrentSelectId] = useState(''); // 当前选择节点Id const [currentSelectId, setCurrentSelectId] = useState(''); // 当前选择节点Id
const [currentRoalName, setCurrentRoalName] = useState(''); // 当前选择节点名称 const [currentRoalName, setCurrentRoalName] = useState(''); // 当前选择节点名称
...@@ -28,35 +32,82 @@ const RoalChoose = props => { ...@@ -28,35 +32,82 @@ const RoalChoose = props => {
const [checkAll, setCheckAll] = useState(false); // 全选框全选样式 const [checkAll, setCheckAll] = useState(false); // 全选框全选样式
const [total, setTotal] = useState(); // 角色人员条数 const [total, setTotal] = useState(); // 角色人员条数
const [loading, setLoading] = useState(false); // 加载时的loading const [loading, setLoading] = useState(false); // 加载时的loading
const [userList, setUserList] = useState([]); // 编辑选中的用户信息
const [currentPage, setCurrentPage] = useState(1); const [currentPage, setCurrentPage] = useState(1);
const [pageSize, setPageSize] = useState(10);
const [roleType, setRoleType] = useState('2'); // 角色类型
// 初始化 // 初始化
useEffect(() => { useEffect(() => {
form.resetFields(); form.resetFields();
if (visible) { 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([]); setPlainOptions([]);
setCheckedList([]); setCheckedList([]);
setIndeterminate(false); setIndeterminate(false);
setCheckAll(false); setCheckAll(false);
setCurrentPage(1);
getData('', 0);
} else {
setTreeData([]);
} }
}, [visible]); }, [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 || ''; roleName = roleName || '';
setLoading(true); setLoading(true);
GetRoleUser({ roleName, pageIndex, pageSize }).then(res => { GetRoleUser({
roleName,
pageIndex,
pageSize: pageSizes,
roleId,
Type: Number(Type),
}).then(res => {
setLoading(false); setLoading(false);
if (res.code === 0) { if (res.code === 0) {
setTreeData(res.data.data); setTreeData(res.data.data);
setTotal(res.data.count); setTotal(res.data.count);
} else {
notification.error({
message: '提示',
duration: 3,
description: res.msg,
});
} }
}); });
}; };
// 提交表单 // 查询角色
const onFinish = () => { const onFinish = () => {
form.validateFields().then(validate => { form.validateFields().then(validate => {
if (validate) { if (validate) {
...@@ -66,7 +117,7 @@ const RoalChoose = props => { ...@@ -66,7 +117,7 @@ const RoalChoose = props => {
setIndeterminate(false); setIndeterminate(false);
setCheckAll(false); setCheckAll(false);
setCurrentPage(1); setCurrentPage(1);
getData(validate.roleName, 1); getData(validate.roleName, 1, pageSize, 0, roleType);
} }
}); });
}; };
...@@ -76,6 +127,7 @@ const RoalChoose = props => { ...@@ -76,6 +127,7 @@ const RoalChoose = props => {
return { return {
title: obj.name, title: obj.name,
key: obj.id, key: obj.id,
disabled: modalType === 'edit' && obj.name !== chooseUser.roleName,
userList: obj.userList, userList: obj.userList,
}; };
}; };
...@@ -84,20 +136,17 @@ const RoalChoose = props => { ...@@ -84,20 +136,17 @@ const RoalChoose = props => {
setCurrentRoalName(e.node.title); setCurrentRoalName(e.node.title);
if (selectedKeys[0]) { if (selectedKeys[0]) {
// 选择后对复选框的用户进行重新赋值 // 选择后对复选框的用户进行重新赋值
let userList = [...e.node.userList]; let userLists = [...e.node.userList];
let options = userList.map(item => ({ let options = userLists.map(item => ({
label: item.name, label: item.name,
value: item.id, value: item.id,
})); }));
setCurrentSelectId(selectedKeys[0]); setCurrentSelectId(selectedKeys[0]);
setPlainOptions(options); setPlainOptions(options);
setCheckedList([]);
setIndeterminate(false);
setCheckAll(false);
} }
}; };
// 监听分页 // 监听分页
const paginationChange = (page, pageSize) => { const paginationChange = (page, pageSizes) => {
// 分页时清空复选框 // 分页时清空复选框
setCurrentSelectId(''); setCurrentSelectId('');
setPlainOptions([]); setPlainOptions([]);
...@@ -105,8 +154,9 @@ const RoalChoose = props => { ...@@ -105,8 +154,9 @@ const RoalChoose = props => {
setIndeterminate(false); setIndeterminate(false);
setCheckAll(false); setCheckAll(false);
setCurrentPage(page); setCurrentPage(page);
setPageSize(pageSizes);
let roleName = form.getFieldValue('roleName'); let roleName = form.getFieldValue('roleName');
getData(roleName, page, pageSize); getData(roleName, page, pageSizes, 0, roleType);
}; };
// 复选框全选监听 // 复选框全选监听
const onCheckAllChange = e => { const onCheckAllChange = e => {
...@@ -121,6 +171,19 @@ const RoalChoose = props => { ...@@ -121,6 +171,19 @@ const RoalChoose = props => {
setIndeterminate(!!list.length && list.length < plainOptions.length); setIndeterminate(!!list.length && list.length < plainOptions.length);
setCheckAll(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 = () => { const onSave = () => {
// 默认承办人字符串拼接 // 默认承办人字符串拼接
...@@ -142,9 +205,26 @@ const RoalChoose = props => { ...@@ -142,9 +205,26 @@ const RoalChoose = props => {
roleId: currentSelectId, roleId: currentSelectId,
defaultUserId: checkedList, defaultUserId: checkedList,
defauletUserName: DeafaultUserName, 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 ( return (
<Modal <Modal
title="角色用户列表" title="角色用户列表"
...@@ -164,12 +244,17 @@ const RoalChoose = props => { ...@@ -164,12 +244,17 @@ const RoalChoose = props => {
<Form.Item name="roleName"> <Form.Item name="roleName">
<Input <Input
prefix={<UserOutlined className="site-form-item-icon" />} prefix={<UserOutlined className="site-form-item-icon" />}
placeholder="RoleName" placeholder="请输入机构或角色名称"
disabled={modalType === 'edit'}
allowClear allowClear
/> />
</Form.Item> </Form.Item>
<Form.Item> <Form.Item>
<Button type="primary" htmlType="submit"> <Button
type="primary"
htmlType="submit"
disabled={modalType === 'edit'}
>
搜索 搜索
</Button> </Button>
</Form.Item> </Form.Item>
...@@ -178,17 +263,22 @@ const RoalChoose = props => { ...@@ -178,17 +263,22 @@ const RoalChoose = props => {
{/* 角色树 */} {/* 角色树 */}
<Spin spinning={loading}> <Spin spinning={loading}>
<div className={styles.treeContent}> <div className={styles.treeContent}>
<span style={{ marginLeft: '28px', fontWeight: 700 }}> <Tabs activeKey={roleType} onChange={tabCallback}>
角色列表 <TabPane
</span> tab="角色列表"
<Divider style={{ margin: '10px 0' }} /> key="2"
<Tree disabled={modalType === 'edit' && chooseUser.type === 1}
blockNode >
autoExpandParent {roleDom()}
onSelect={onSelect} </TabPane>
selectedKeys={[currentSelectId]} <TabPane
treeData={treeData.map(item => mapTree(item))} tab="机构列表"
/> key="1"
disabled={modalType === 'edit' && chooseUser.type === 2}
>
{roleDom()}
</TabPane>
</Tabs>
</div> </div>
</Spin> </Spin>
{/* 分页 */} {/* 分页 */}
...@@ -215,11 +305,18 @@ const RoalChoose = props => { ...@@ -215,11 +305,18 @@ const RoalChoose = props => {
</Checkbox> </Checkbox>
<Divider style={{ margin: '10px 0' }} /> <Divider style={{ margin: '10px 0' }} />
<div className={styles.checkContent}> <div className={styles.checkContent}>
<CheckboxGroup {plainOptions.length > 0 ? (
options={plainOptions} <CheckboxGroup
value={checkedList} options={plainOptions}
onChange={onChange} value={checkedList}
/> onChange={onChange}
/>
) : (
<Empty
image={Empty.PRESENTED_IMAGE_SIMPLE}
description="未有查找到用户"
/>
)}
</div> </div>
</div> </div>
</div> </div>
......
...@@ -109,13 +109,17 @@ ...@@ -109,13 +109,17 @@
width: 100%; width: 100%;
height: 370px; height: 370px;
margin: 10px 0 10px 0; margin: 10px 0 10px 0;
padding: 20px 20px 20px 20px; padding: 8px 20px 20px 20px;
box-sizing: border-box; box-sizing: border-box;
border: 1px solid #ccc; border: 1px solid #ccc;
.ant-tree-list-holder { .ant-tree-list-holder {
height: 285px; height: 285px;
} }
} }
.footer {
position: relative;
z-index: 999;
}
} }
.userContent { .userContent {
width: 50%; width: 50%;
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment