aa

lowcoder-org · FalkWolsky · May 11, 2024 · Apr 18, 2024 · Apr 18, 2024 · Apr 18, 2024
commit b07fee5858ec368e91c792260e8c8aa427ea51b2
diff --git a/client/packages/lowcoder/src/comps/comps/shapeComp/shapeComp.tsx b/client/packages/lowcoder/src/comps/comps/shapeComp/shapeComp.tsx
@@ -81,27 +81,16 @@ const IconView = (props: RecordConstructorToView<typeof childrenMap>) => {
     setWidth(container?.clientWidth ?? 0);
     setHeight(container?.clientHeight ?? 0);
   };
-  const getIconDetails = () => {
-    if (props?.icon) {
-      let { props: pp } = props?.icon;
-      console.log(pp);
+  let [shape, setShape] = useState({ value: "star", index: 0 });
+  useEffect(() => {
+    if (props.icon) {
+      let shapeDetails = Object.values(props?.icon)[4]?.value;
+      setShape({
+        index: parseInt(shapeDetails?.split("_")[0]),
+        value: shapeDetails?.split("_")[1],
+      });
     }
-
-    // let shapeDetails: any = props.icon["props"];
-    // console.log(shapeDetails);
-
-    // if (props.icon && props.icon?.props?.value) {
-    //   return {
-    //     index: parseInt(props.icon?.props?.value.split("_")[1]),
-    //     value: props.icon?.props?.value.split("_")[0],
-    //   };
-    // } else {
-    //   return {
-    //     index: 0,
-    //     value: "star",
-    //   };
-    // }
-  };
+  }, [props.icon]);
 
   return (
     <ReactResizeDetector onResize={onResize}>
@@ -114,12 +103,13 @@ const IconView = (props: RecordConstructorToView<typeof childrenMap>) => {
             : props.iconSize,
           background: props.style.background,
         }}
-        onClick={() => props.onEvent("click")}
+        onClick={() => {
+          console.log("click");
+        }}
       >
-        {/* {props.icon} */}
         <Coolshape
-          type={getIconDetails()["value"]}
-          index={getIconDetails()["index"]}
+          type={shape.value as any}
+          index={shape.index}
           size={48}
           noise={true}
         />

diff --git a/client/packages/lowcoder/src/comps/controls/shapeControl.tsx b/client/packages/lowcoder/src/comps/controls/shapeControl.tsx
@@ -4,6 +4,7 @@ import {
   iconWidgetClass,
 } from "base/codeEditor/extensions/iconExtension";
 import { i18nObjs, trans } from "i18n";
+import { Coolshape } from "coolshapes-react";
 import {
   AbstractComp,
   CompAction,
@@ -34,7 +35,6 @@ import styled from "styled-components";
 import { setFieldsNoTypeCheck } from "util/objectUtils";
 import { StringControl } from "./codeControl";
 import { ControlParams } from "./controlParams";
-import { log } from "console";
 
 const ButtonWrapper = styled.div`
   width: 100%;
@@ -81,6 +81,11 @@ const IconPicker = (props: {
   IconType?: "OnlyAntd" | "All" | "default" | undefined;
 }) => {
   const icon = useShape(props.value);
+  console.log(props);
+  let shapeDetails = props.value;
+  console.log("shapeDetails ", shapeDetails);
+
+
   return (
     <ShapeSelect
       onChange={props.onChange}
@@ -89,13 +94,22 @@ const IconPicker = (props: {
       IconType={props.IconType}
     >
       <TacoButton style={{ width: "100%" }}>
-        {icon ? (
+        {props.value ? (
           <ButtonWrapper>
-            <ButtonIconWrapper>{icon.getView()}</ButtonIconWrapper>
-            <ButtonText title={icon.title}>{icon.title}</ButtonText>
+            <ButtonIconWrapper>
+              <Coolshape
+                type={"star"}
+                index={0}
+                size={48}
+                noise={true}
+              />
+            </ButtonIconWrapper>
+            {/* <ButtonIconWrapper>{icon.getView()}</ButtonIconWrapper>
+            <ButtonText title={icon.title}>{icon.title}</ButtonText> */}
+
             <StyledDeleteInputIcon
               onClick={(e) => {
-                props.onChange("");
+                props.onChange(""); 
                 e.stopPropagation();
               }}
             />
@@ -246,7 +260,8 @@ export class ShapeControl extends AbstractComp<
   }
 
   override getPropertyView(): ReactNode {
-    throw new Error("Method not implemented.");
+    const value = this.codeControl.getView();
+    return <ShapeControlView value={value} />;
   }
 
   changeModeAction() {

diff --git a/client/packages/lowcoder/src/constants/apiConstants.ts b/client/packages/lowcoder/src/constants/apiConstants.ts
@@ -9,7 +9,7 @@ export const DEFAULT_TEST_DATA_SOURCE_TIMEOUT_MS = 30000;
 export const SHARE_TITLE = trans("share.title");
 
 export enum API_STATUS_CODES {
-  SUCCESS = 200,
+  SUCCESS = 200, 
   REQUEST_NOT_AUTHORISED = 401,
   SERVER_FORBIDDEN = 403,
   RESOURCE_NOT_FOUND = 404,