Merge branch 'CloudOrc:dev' into dev

dlimeng · Sep 27, 2023 · 472d1e0 · 472d1e0
2 parents c776131 + a60d71c
commit 472d1e0
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 44 deletions.
diff --git a/solidui-web/src/pages/Designer/Header/Header.tsx b/solidui-web/src/pages/Designer/Header/Header.tsx
@@ -116,7 +116,7 @@ function Header() {
 					</div>
 				</div>
 				<div className="header-center">
-					<Tooltip title="Bar Chart">
+					{/* <Tooltip title="Bar Chart">
 						<ChartHistogramTwo
 							theme="two-tone"
 							size="32"
@@ -132,7 +132,7 @@ function Header() {
 								});
 							}}
 						/>
-					</Tooltip>
+					</Tooltip> */}
 				</div>
 				<div className="header-right">
 					<Button

diff --git a/solidui-web/src/pages/Designer/Properties/Properties.tsx b/solidui-web/src/pages/Designer/Properties/Properties.tsx
@@ -35,10 +35,10 @@ function Properties() {
 					key: "Style",
 					tab: "Style",
 				},
-				{
-					key: "Data",
-					tab: "Data",
-				},
+				// {
+				// 	key: "Data",
+				// 	tab: "Data",
+				// },
 			],
 		});
 
@@ -78,42 +78,49 @@ function Properties() {
 	function handleChangeOpen(type: string) {
 		const dom: any = document.getElementById("section-properties");
 		const DbConfig: any = document.getElementById("db-config");
-		const asideEastContainer : any = document.getElementById('aside-east__container');
+		const asideEastContainer: any = document.getElementById(
+			"aside-east__container",
+		);
 		if (type === "close") {
-			setModelWidth(dom.offsetWidth)
-			dom.style.width = 0
-			setModelOpen(false)
+			setModelWidth(dom.offsetWidth);
+			dom.style.width = 0;
+			setModelOpen(false);
 			if (DbConfig) {
-				DbConfig.style.display = 'none'
+				DbConfig.style.display = "none";
 			}
 			if (asideEastContainer) {
-				asideEastContainer.style.display = 'none'
+				asideEastContainer.style.display = "none";
 			}
 		} else {
-			dom.style.width = modelWidth + 'px'
-			setModelOpen(true)
+			dom.style.width = modelWidth + "px";
+			setModelOpen(true);
 			if (DbConfig) {
-				DbConfig.style.display = 'block'
+				DbConfig.style.display = "block";
 			}
 			if (asideEastContainer) {
-				asideEastContainer.style.display = 'block'
+				asideEastContainer.style.display = "block";
 			}
 		}
 	}
 
 	return (
 		<section id="section-properties" className="aside-east" ref={asideRef}>
-			<div className="aside-east__container" id="aside-east__container">{renderByPropertyKey()}</div>
-			{ modelOpen ? (
-				<div className="expand" style={{
-					position: "absolute",
-					left: 0,
-					top: 0,
-					zIndex: 99,
-					display: "flex",
-					alignItems: "center",
-					height: "100%"
-				}}>
+			<div className="aside-east__container" id="aside-east__container">
+				{renderByPropertyKey()}
+			</div>
+			{modelOpen ? (
+				<div
+					className="expand"
+					style={{
+						position: "absolute",
+						left: 0,
+						top: 0,
+						zIndex: 99,
+						display: "flex",
+						alignItems: "center",
+						height: "100%",
+					}}
+				>
 					<LeftExpand
 						theme="outline"
 						size="20"
@@ -122,23 +129,26 @@ function Properties() {
 						strokeLinejoin="miter"
 						strokeLinecap="square"
 						style={{
-							cursor: "pointer"
+							cursor: "pointer",
 						}}
 						onClick={() => {
-							handleChangeOpen('close')
+							handleChangeOpen("close");
 						}}
 					/>
 				</div>
-			): (
-				<div className="expand" style={{
-					position: "absolute",
-					left: -20,
-					top: 0,
-					zIndex: 99,
-					display: "flex",
-					alignItems: "center",
-					height: "100%"
-				}}>
+			) : (
+				<div
+					className="expand"
+					style={{
+						position: "absolute",
+						left: -20,
+						top: 0,
+						zIndex: 99,
+						display: "flex",
+						alignItems: "center",
+						height: "100%",
+					}}
+				>
 					<RightExpand
 						theme="outline"
 						size="20"
@@ -147,15 +157,14 @@ function Properties() {
 						strokeLinejoin="miter"
 						strokeLinecap="square"
 						style={{
-							cursor: "pointer"
+							cursor: "pointer",
 						}}
 						onClick={() => {
-							handleChangeOpen('open')
+							handleChangeOpen("open");
 						}}
 					/>
 				</div>
-			) }
-
+			)}
 		</section>
 	);
 }

diff --git a/solidui-web/src/pages/Designer/Properties/configurations.less b/solidui-web/src/pages/Designer/Properties/configurations.less
@@ -64,7 +64,8 @@
 			height: 100%;
 			cursor: pointer;
 			// width: 33.33%;
-			width: 50%;
+			// width: 50%;
+			flex: 1;
 			font-size: 12px;
 
 			&.active {