组织架构图筛选修复

feature/orgChart
Chengliang 3 years ago
parent 5e2d067e64
commit 958661033f

@ -2,7 +2,7 @@
* @Author: Chengliang 1546584672@qq.com * @Author: Chengliang 1546584672@qq.com
* @Date: 2022-08-04 10:22:55 * @Date: 2022-08-04 10:22:55
* @LastEditors: Chengliang 1546584672@qq.com * @LastEditors: Chengliang 1546584672@qq.com
* @LastEditTime: 2022-08-09 11:01:43 * @LastEditTime: 2022-11-01 15:01:23
* @FilePath: /org-chart-frant/src/components/orgChart/index.jsx * @FilePath: /org-chart-frant/src/components/orgChart/index.jsx
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/ */
@ -57,7 +57,6 @@ export const OrgChartComponent = memo((props, ref) => {
.style('stroke-dasharray', '3, 3'); .style('stroke-dasharray', '3, 3');
}) })
.onNodeClick((d, i, arr) => { .onNodeClick((d, i, arr) => {
console.log(d, 'Id of clicked node ');
props.onNodeClick(d); props.onNodeClick(d);
}) })
@ -74,7 +73,6 @@ export const OrgChartComponent = memo((props, ref) => {
props.onButtonClick && props.onButtonClick(event, d); props.onButtonClick && props.onButtonClick(event, d);
}; };
} catch (err) { } catch (err) {
console.log(err);
message.warning(err); message.warning(err);
} }
} }

@ -49,7 +49,6 @@ export default class ToolBar extends React.Component {
handleMouseUp(e) { handleMouseUp(e) {
this.start = false; this.start = false;
console.log('this.start:', this.start);
} }
render() { render() {

@ -45,8 +45,6 @@ export default function userPage() {
let idsStr = idsList.join(','); let idsStr = idsList.join(',');
console.log('idsStr', idsStr);
let api = ''; let api = '';
if (topBarSearchRequest) { if (topBarSearchRequest) {
let request = { ...topBarSearchRequest, ids: idsStr }; let request = { ...topBarSearchRequest, ids: idsStr };
@ -247,13 +245,13 @@ export default function userPage() {
// //
let postUserUrl = `/spa/organization/static/index.html#/main/organization/resourceCard/${d.data.fobjid}`; let postUserUrl = `/spa/organization/static/index.html#/main/organization/resourceCard/${d.data.fobjid}`;
// //
let addressBookGroupUrl = `/spa/organization/static/index.html#/main/organization/resource/?virtualtype=${d.data.fecid}`; let addressBookGroupUrl = `/spa/organization/static/index.html#/main/organization/resource/?virtualtype=0`;
// //
let addressBookUrl = `/spa/organization/static/index.html#/main/organization/resource/?subcompanyid1=${d.data.fecid}`; let addressBookUrl = `/spa/organization/static/index.html#/main/organization/resource/?companyId=${d.data.fobjid}`;
// //
let addressBookDepartmentUrl = `/spa/organization/static/index.html#/main/organization/resource/?departmentid=${d.data.fecid}`; let addressBookDepartmentUrl = `/spa/organization/static/index.html#/main/organization/resource/?departmentId=${d.data.fobjid}`;
// //
let addressBookPostUrl = `/spa/organization/static/index.html#/main/organization/resource/?departmentid=${d.data.fobjparentId}`; let addressBookPostUrl = `/spa/organization/static/index.html#/main/organization/resource/?jobTitle=${d.data.fobjid}`;
if (d.data.ftype == 0 || d.data.ftype == 1 || d.data.ftype == 2) { if (d.data.ftype == 0 || d.data.ftype == 1 || d.data.ftype == 2) {
return `<div> return `<div>

Loading…
Cancel
Save