Merge branch 'dev' of github.com:lowcoder-org/lowcoder into feat/1109-nav-tree-items

Author: iamfaran

client/package.json

@@ -81,6 +81,7 @@
     "@types/styled-components": "^5.1.34",
     "antd-mobile": "^5.34.0",
     "chalk": "4",
+    "dompurify": "^3.3.1",
     "flag-icons": "^7.2.1",
     "number-precision": "^1.6.0",
     "react-countup": "^6.5.3",

client/packages/lowcoder-design/src/components/Switch.tsx

@@ -52,6 +52,24 @@ const SwitchStyle: any = styled.input`
     border-radius: 20px;
     background-color: #ffffff;
   }
+
+  &:disabled {
+    background-color: #e0e0e0;
+    opacity: 0.6;
+    cursor: not-allowed;
+  }
+
+  &:disabled::before {
+    background-color: #cccccc;
+  }
+
+  &:disabled:checked {
+    background-color: #a0a0a0;
+  }
+
+  &:disabled:hover {
+    cursor: not-allowed;
+  }
 `;
 
 const SwitchDiv = styled.div<{
@@ -104,16 +122,18 @@ const JsIconGray = styled(jsIconGray)<Ishow>`
 interface SwitchProps extends Omit<React.HTMLAttributes<HTMLInputElement>, "value" | "onChange"> {
   value: boolean;
   onChange: (value: boolean) => void;
+  disabled?: boolean;
 }
 
 export const Switch = (props: SwitchProps) => {
-  const { value, onChange, ...inputChanges } = props;
+  const { value, onChange, disabled, ...inputChanges } = props;
   return (
     <SwitchStyle
       type="checkbox"
-      checked={props.value}
-      onClick={() => props.onChange(!props.value)}
+      checked={value}
+      onClick={() => onChange(!value)}
       onChange={() => {}}
+      disabled={disabled}
       {...inputChanges}
     />
   );
@@ -154,15 +174,17 @@ export const SwitchWrapper = (props: {
 export function TacoSwitch(props: {
   label: string;
   checked: boolean;
-  onChange: (checked: boolean) => void;
+  disabled?: boolean;
+  onChange?: (checked: boolean) => void;
 }) {
   return (
     <SwitchWrapper label={props.label}>
       <Switch
         onChange={(value) => {
-          props.onChange(value);
+          props.onChange ? props.onChange(value) : null;
         }}
         value={props.checked}
+        disabled={props.disabled}
       />
     </SwitchWrapper>
   );

client/packages/lowcoder-design/src/components/toolTip.tsx

@@ -210,6 +210,7 @@ export const TutorialsTooltip = ({
   step,
   backProps,
   skipProps,
+  closeProps,
   primaryProps,
   tooltipProps,
   isLastStep,
@@ -219,7 +220,7 @@ export const TutorialsTooltip = ({
     <ToolTipDiv {...tooltipProps} style={{ width: step.styles?.options?.width }}>
       <TooltipHeader>
         {step.title && <Title>{step.title}</Title>}
-        <CloseDiv {...skipProps}>
+        <CloseDiv {...closeProps}>
           <CloseIcon />
         </CloseDiv>
       </TooltipHeader>

client/packages/lowcoder/src/api/applicationApi.ts

@@ -70,6 +70,11 @@ export interface ApplicationResp extends ApiResponse {
   data: ApplicationDetail;
 }
 
+export interface ApplicationPublishRequest {
+  commitMessage?: string;
+  tag: string;
+}
+
 interface GrantAppPermissionReq {
   applicationId: string;
   role: ApplicationRoleType;
@@ -171,8 +176,13 @@ class ApplicationApi extends Api {
     return Api.put(ApplicationApi.updateApplicationURL(applicationId), rest);
   }
 
-  static publishApplication(request: PublishApplicationPayload): AxiosPromise<ApiResponse> {
-    return Api.post(ApplicationApi.publishApplicationURL(request.applicationId));
+  static publishApplication(
+    request: PublishApplicationPayload
+  ): AxiosPromise<ApiResponse> {
+    return Api.post(
+      ApplicationApi.publishApplicationURL(request.applicationId),
+      request?.request
+    );
   }
 
   static getApplicationDetail(request: FetchAppInfoPayload): AxiosPromise<ApplicationResp> {