Merge pull request #3685 from illacloud/release/4.4.12

Release/4.4.12
illacloud · Feb 6, 2024 · 3cf4ba9 · 3cf4ba9
2 parents 15946eb + 8049282
commit 3cf4ba9
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 16 deletions.
diff --git a/apps/builder/package.json b/apps/builder/package.json
@@ -5,7 +5,7 @@
   "private": true,
   "author": "ILLA Cloud <[email protected]>",
   "license": "Apache-2.0",
-  "version": "4.4.11",
+  "version": "4.4.12",
   "scripts": {
     "dev": "vite --strictPort --force",
     "build-cloud": "NODE_OPTIONS=--max-old-space-size=12288  vite build --mode cloud",

diff --git a/...builder/src/page/App/components/ScaleSquare/components/ResizingAndDragContainer/index.tsx b/...builder/src/page/App/components/ScaleSquare/components/ResizingAndDragContainer/index.tsx
@@ -14,6 +14,7 @@ import {
   getIsILLAEditMode,
   getIsLikeProductMode,
   getSelectedComponentDisplayNames,
+  isShowDot,
 } from "@/redux/config/configSelector"
 import { configActions } from "@/redux/config/configSlice"
 import {
@@ -75,7 +76,7 @@ export const ResizingAndDragContainer: FC<ResizingAndDragContainerProps> = (
   const layoutInfoResult = useSelector(getClientWidgetLayoutInfo)
   const currentWidgetLayoutInfo = layoutInfoResult[displayName]
   const currentWidgetProps = get(executionResult, displayName, {})
-
+  const isShownDot = useSelector(isShowDot)
   const isDraggingStateInGlobal = useSelector(getIsDragging)
 
   const isAutoLimitedMode =
@@ -133,9 +134,9 @@ export const ResizingAndDragContainer: FC<ResizingAndDragContainerProps> = (
       type: "component",
       clickPosition: [],
     })
-    
+
     e.stopPropagation()
-    
+
     trackInEditor(ILLA_MIXPANEL_EVENT_TYPE.SELECT, {
       element: "component",
       parameter1: "click",
@@ -266,6 +267,7 @@ export const ResizingAndDragContainer: FC<ResizingAndDragContainerProps> = (
                 hasEditors: componentsAttachedUsers.length > 0,
                 isHover: isMouseOver,
                 isDragging: false,
+                shownDot: isShownDot,
               },
             )}
           >
@@ -279,7 +281,8 @@ export const ResizingAndDragContainer: FC<ResizingAndDragContainerProps> = (
               {!isLikeProductionMode &&
                 (isSelected ||
                   isMouseOver ||
-                  componentsAttachedUsers.length > 0) && (
+                  componentsAttachedUsers.length > 0 ||
+                  isShownDot) && (
                   <MoveBar
                     isError={hasError}
                     displayName={displayName}

diff --git a/.../builder/src/page/App/components/ScaleSquare/components/ResizingAndDragContainer/style.ts b/.../builder/src/page/App/components/ScaleSquare/components/ResizingAndDragContainer/style.ts
@@ -14,6 +14,7 @@ export const resizingContainerStyle = (
     hasEditors: boolean
     isHover: boolean
     isDragging: boolean
+    shownDot: boolean
   },
 ) => {
   const { width, height, minHeight, minWidth } = shapeInfo
@@ -23,6 +24,7 @@ export const resizingContainerStyle = (
     hasEditors,
     isHover,
     isDragging,
+    shownDot,
   } = borderInfo
   return css`
     width: ${width}px;
@@ -36,6 +38,7 @@ export const resizingContainerStyle = (
       hasEditors,
       isHover,
       isDragging,
+      shownDot,
     )}
   `
 }

diff --git a/apps/builder/src/page/App/components/ScaleSquare/style.ts b/apps/builder/src/page/App/components/ScaleSquare/style.ts
@@ -222,15 +222,12 @@ export function applyBarHandlerStyle(
 }
 
 const getWrapperBorderColor = (
-  isLikProductionMode: boolean,
   isSelected: boolean,
   hasEditors: boolean,
   isHover: boolean,
+  shownDot: boolean,
 ) => {
-  if (isLikProductionMode) {
-    return "transparent"
-  }
-  if (isSelected || hasEditors || isHover) {
+  if (isSelected || hasEditors || isHover || shownDot) {
     return getColor("techPurple", "03")
   }
   return "transparent"
@@ -241,8 +238,9 @@ const getWrapperBorderStyle = (
   isSelected: boolean,
   isDragging: boolean,
   isHover: boolean,
+  shownDot: boolean,
 ) => {
-  if (hasEditors && !isSelected && !isDragging && !isHover) {
+  if (shownDot || (hasEditors && !isSelected && !isDragging && !isHover)) {
     return "dashed"
   }
   return "solid"
@@ -254,6 +252,7 @@ export const getWrapperBorder = (
   hasEditors: boolean,
   isHover: boolean,
   isDragging: boolean,
+  shownDot: boolean,
 ) => {
   if (isLikProductionMode) {
     return css`
@@ -267,12 +266,13 @@ export const getWrapperBorder = (
       isSelected,
       isDragging,
       isHover,
+      shownDot,
     )};
     border-color: ${getWrapperBorderColor(
-      isLikProductionMode,
       isSelected,
       hasEditors,
       isHover,
+      shownDot,
     )};
   `
 }

diff --git a/apps/builder/src/widgetLibrary/MultiselectWidget/multiselect.tsx b/apps/builder/src/widgetLibrary/MultiselectWidget/multiselect.tsx
@@ -24,7 +24,6 @@ export const WrappedMultiselect: FC<WrappedMultiselectProps> = (props) => {
     disabled,
     loading,
     readOnly,
-    showSearch,
     colorScheme,
     handleUpdateMultiExecutionResult,
     handleOnChange,
@@ -68,7 +67,7 @@ export const WrappedMultiselect: FC<WrappedMultiselectProps> = (props) => {
       disabled={disabled}
       loading={loading}
       readOnly={readOnly}
-      showSearch={showSearch}
+      showSearch
       colorScheme={colorScheme}
       onChange={onChangeSelectValue}
     />

diff --git a/apps/builder/src/widgetLibrary/SelectWidget/select.tsx b/apps/builder/src/widgetLibrary/SelectWidget/select.tsx
@@ -21,7 +21,6 @@ export const WrappedSelect: FC<WrappedSelectProps> = (props) => {
     disabled,
     loading,
     readOnly,
-    showSearch,
     colorScheme,
     handleUpdateMultiExecutionResult,
     handleOnChange,
@@ -64,7 +63,7 @@ export const WrappedSelect: FC<WrappedSelectProps> = (props) => {
       disabled={disabled}
       loading={loading}
       readOnly={readOnly}
-      showSearch={showSearch}
+      showSearch
       colorScheme={colorScheme}
       onChange={onChangeSelectValue}
     />