Merge pull request #126 from 15100399015/dev

[FIX] fix issue #61 -7
CloudOrc · Aug 13, 2023 · 4fcbd6a · 4fcbd6a
2 parents 80b39d1 + 17aee9f
commit 4fcbd6a
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 22 deletions.
diff --git a/solidui-web/src/pages/Designer/Preview/PreviewPopup.tsx b/solidui-web/src/pages/Designer/Preview/PreviewPopup.tsx
@@ -128,19 +128,7 @@ export default function PreviewPopup(props: PreviewPopupProps) {
 
  return (
  <div id="preview">
- {renderViews()}
- <div
- style={{
- position: "absolute",
- bottom: 15,
- right: 15,
- }}
- >
- {/* <FeatureBar
- onPageChange={onChange}
- data={scenePageOptions}
- ></FeatureBar> */}
- </div>
+ <div className="view-container">{renderViews()}</div>
  </div>
  );
 }
diff --git a/solidui-web/src/pages/Designer/Preview/index.tsx b/solidui-web/src/pages/Designer/Preview/index.tsx
@@ -144,14 +144,8 @@ export default function Preview() {
 
  return (
  <div id="preview">
- {renderViews()}
- <div
- style={{
- position: "absolute",
- bottom: 15,
- right: 15,
- }}
- >
+ <div className="view-container">{renderViews()}</div>
+ <div className="operating-area">
  <FeatureBar onPageChange={onChange} data={scenePageOptions} />
  </div>
  </div>

diff --git a/solidui-web/src/pages/Designer/Preview/preview.less b/solidui-web/src/pages/Designer/Preview/preview.less
@@ -22,7 +22,20 @@
  right: 0;
  bottom: 0;
  background-color: #fff;
- overflow: auto;
+ overflow: hidden;
+ .view-container {
+ position: relative;
+ width: 100%;
+ height: 100%;
+ overflow: auto
+ }
+ .operating-area{
+ position: absolute;
+ bottom: 15px;
+ right: 15px;
+ z-index: 100;
+ }
+
 }
 .featbar-wrapper {
  display: flex;