From 622ebcbcd73857df1f533574d55b76f778bc4225 Mon Sep 17 00:00:00 2001
From: Chengliang <1546584672@qq.com>
Date: Mon, 24 Jul 2023 09:36:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E8=BF=AD=E4=BB=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.idea/encodings.xml | 4 +
.idea/inspectionProfiles/Project_Default.xml | 36 ++
.idea/misc.xml | 7 +
.idea/modules.xml | 8 +
.idea/org-chart-frant.iml | 9 +
.idea/vcs.xml | 6 +
.idea/workspace.xml | 535 +++++++++++++++++++
src/components/toolBar/img/compact.png | Bin 0 -> 210 bytes
src/components/toolBar/img/expandAll.png | Bin 0 -> 414 bytes
src/components/toolBar/img/fit.png | Bin 0 -> 1153 bytes
src/components/toolBar/img/fullscreen.png | Bin 0 -> 474 bytes
src/components/toolBar/index.jsx | 32 ++
src/components/toolBar/index.less | 71 +--
src/pages/company.jsx | 36 +-
14 files changed, 707 insertions(+), 37 deletions(-)
create mode 100644 .idea/encodings.xml
create mode 100644 .idea/inspectionProfiles/Project_Default.xml
create mode 100644 .idea/misc.xml
create mode 100644 .idea/modules.xml
create mode 100644 .idea/org-chart-frant.iml
create mode 100644 .idea/vcs.xml
create mode 100644 .idea/workspace.xml
create mode 100644 src/components/toolBar/img/compact.png
create mode 100644 src/components/toolBar/img/expandAll.png
create mode 100644 src/components/toolBar/img/fit.png
create mode 100644 src/components/toolBar/img/fullscreen.png
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
new file mode 100644
index 0000000..ce358e4
--- /dev/null
+++ b/.idea/encodings.xml
@@ -0,0 +1,4 @@
+
+
+
+
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
new file mode 100644
index 0000000..6560a98
--- /dev/null
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -0,0 +1,36 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000..cf64fc2
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..e674d91
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/org-chart-frant.iml b/.idea/org-chart-frant.iml
new file mode 100644
index 0000000..d6ebd48
--- /dev/null
+++ b/.idea/org-chart-frant.iml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..35eb1dd
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 0000000..198aa37
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,535 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+ DEFINITION_ORDER
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ActionScript specificJavaScript
+
+
+ Android
+
+
+ Ant
+
+
+ Batch Applications
+
+
+ CFML
+
+
+ CSS
+
+
+ Class structureJava
+
+
+ Code quality toolsCSS
+
+
+ Code quality toolsJavaScript
+
+
+ Code style issuesJava
+
+
+ CoffeeScript
+
+
+ CorrectnessLintAndroid
+
+
+ Cucumber
+
+
+ Error handlingJava
+
+
+ Faces Model
+
+
+ Flow type checkerJavaScript
+
+
+ FreeMarker
+
+
+ General
+
+
+ GeneralCoffeeScript
+
+
+ GeneralJavaScript
+
+
+ Google Web Toolkit
+
+
+ GrailsGroovy
+
+
+ Groovy
+
+
+ HTML
+
+
+ Hibernate
+
+
+ IconsUsabilityLintAndroid
+
+
+ ImportsJava
+
+
+ Inheritance issuesJava
+
+
+ Internationalization
+
+
+ InternationalizationJava
+
+
+ InternationalizationLintAndroid
+
+
+ Invalid elementsCSS
+
+
+ J2ME issuesJava
+
+
+ JSON and JSON5
+
+
+ JSP
+
+
+ Java
+
+
+ Java 8Java language level migration aidsJava
+
+
+ Java interop issuesKotlin
+
+
+ Java language level migration aidsJava
+
+
+ JavaFX
+
+
+ JavaScript
+
+
+ JavadocJava
+
+
+ Kotlin
+
+
+ LintAndroid
+
+
+ LintLintAndroid
+
+
+ Manifest
+
+
+ Markdown
+
+
+ MessagesCorrectnessLintAndroid
+
+
+ Node.jsJavaScript
+
+
+ OSGi
+
+
+ OtherGroovy
+
+
+ Pages Navigation Model
+
+
+ Plugin DevKit
+
+
+ PortabilityJava
+
+
+ Potentially confusing code constructsGroovy
+
+
+ Probable bugsJava
+
+
+ Properties Files
+
+
+ Properties FilesJava
+
+
+ RELAX NG
+
+
+ RESTful Web Service
+
+
+ Resource managementJava
+
+
+ SQL
+
+
+ Sass/SCSS
+
+
+ SecurityLintAndroid
+
+
+ SetupSpring CoreSpring
+
+
+ Spring
+
+
+ Spring BootSpring
+
+
+ Spring CoreSpring
+
+
+ Struts
+
+
+ Struts 1Struts
+
+
+ Struts 2Struts
+
+
+ Style issuesKotlin
+
+
+ TestNGJava
+
+
+ Threading issuesJava
+
+
+ TypeScript
+
+
+ UI Form
+
+
+ UsabilityLintAndroid
+
+
+ Validity issuesGroovy
+
+
+ Velocity
+
+
+ Verbose or redundant code constructsJava
+
+
+ VisibilityJava
+
+
+ Vue
+
+
+ Web Services
+
+
+ XML
+
+
+ XMLSpring CoreSpring
+
+
+ XPath
+
+
+ YAML
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 
{
+ this.props.onFullscreen(this.progressBtn);
+ }}
+ />
+ 
{
+ this.props.onFit(this.progressBtn);
+ }}
+ />
+ 
{
+ this.props.onCompact(this.progressBtn);
+ }}
+ />
+ 
{
+ this.props.onExpandAll(this.progressBtn);
+ }}
+ />
);
}
diff --git a/src/components/toolBar/index.less b/src/components/toolBar/index.less
index ffe10d8..305d10f 100644
--- a/src/components/toolBar/index.less
+++ b/src/components/toolBar/index.less
@@ -1,38 +1,39 @@
.toolbarWrapper {
- width: 68px;
- position: fixed;
- right: 10px;
- z-index: 100;
- background: #fff;
- border-radius: 20px;
- padding-top: 20px;
- padding-bottom: 20px;
- text-align: center;
- .progressWrapper {
- position: relative;
- padding-top: 5px;
- padding-bottom: 5px;
- margin-left: 20px;
- .progressLine {
- height: 100px;
- width: 0px;
- border-left: 2px solid #C9C9C9;
- margin-left: 12px;
- }
- .progressBtn {
- width: 16px;
- height: 9px;
- background-color: #C9C9C9;
- position: absolute;
- left: 5px;
- top: 0px;
- }
+ width: 68px;
+ position: fixed;
+ right: 10px;
+ z-index: 100;
+ background: #fff;
+ border-radius: 20px;
+ padding-top: 20px;
+ padding-bottom: 20px;
+ text-align: center;
+ .progressWrapper {
+ position: relative;
+ padding-top: 5px;
+ padding-bottom: 5px;
+ margin-left: 20px;
+ .progressLine {
+ height: 100px;
+ width: 0px;
+ border-left: 2px solid #c9c9c9;
+ margin-left: 12px;
}
- .toolBarItem {
- display: block;
- margin-top: 20px;
- margin-bottom: 20px;
- margin-left: 20px;
- cursor: pointer;
+ .progressBtn {
+ width: 16px;
+ height: 9px;
+ background-color: #c9c9c9;
+ position: absolute;
+ left: 5px;
+ top: 0px;
}
-}
\ No newline at end of file
+ }
+ .toolBarItem {
+ display: block;
+ margin-top: 20px;
+ margin-bottom: 20px;
+ margin-left: 26px;
+ cursor: pointer;
+ width: 20px;
+ }
+}
diff --git a/src/pages/company.jsx b/src/pages/company.jsx
index 3e51d47..832c039 100644
--- a/src/pages/company.jsx
+++ b/src/pages/company.jsx
@@ -19,9 +19,11 @@ let topbar = null;
export default function companyPage() {
const [data, setData] = useState(null);
+ let compact = 0;
+ let expandAll = 0;
+
const [sliderProgress, setSliderProgress] = useState(50);
let addNodeChildFunc = null;
-
let topBarSearchRequest = null;
const [hasRight, setHasRight] = useState('');
const [timelineId, setTimelineId] = useState(0);
@@ -205,6 +207,30 @@ export default function companyPage() {
active = 'left';
};
+ const handleFullscreen = (progressBtn) => {
+ progressBtn.current.style.top = 50 + 'px';
+ orgChart && orgChart.fullscreen('body');
+ };
+
+ const handleFit = (progressBtn) => {
+ progressBtn.current.style.top = 50 + 'px';
+ orgChart && orgChart.fit();
+ };
+
+ const handleCompact = (progressBtn) => {
+ progressBtn.current.style.top = 50 + 'px';
+ orgChart &&
+ orgChart
+ .compact(!!(compact++ % 2))
+ .render()
+ .fit();
+ };
+
+ const handleExpandAll = (progressBtn) => {
+ progressBtn.current.style.top = 50 + 'px';
+ orgChart && expandAll++ % 2 ? orgChart.collapseAll() : orgChart.expandAll();
+ };
+
const handleZoomIn = (progressBtn) => {
if (progressBtn) {
let top = parseInt(progressBtn.current.style.top) - 10;
@@ -309,7 +335,9 @@ export default function companyPage() {
setData(data?.data);
}
}
- setSpinning(false);
+ setTimeout(function () {
+ setSpinning(false);
+ }, 200);
});
};
@@ -376,6 +404,10 @@ export default function companyPage() {
onLeftLayoutClick={(progressBtn) =>
handleLeftLayoutClick(progressBtn)
}
+ onFullscreen={(progressBtn) => handleFullscreen(progressBtn)}
+ onFit={(progressBtn) => handleFit(progressBtn)}
+ onCompact={(progressBtn) => handleCompact(progressBtn)}
+ onExpandAll={(progressBtn) => handleExpandAll(progressBtn)}
onZoomOut={(progressBtn) => handleZoomOut(progressBtn)}
onZoomIn={(progressBtn) => handleZoomIn(progressBtn)}
onZoomBehavior={(value) => handleZoomBehavior(value)}