Merge branch 'dev' into fix/minorBugs

Author: FalkWolsky

client/packages/lowcoder/src/comps/hooks/modalComp.tsx

@@ -25,6 +25,7 @@ import { withDefault } from "comps/generators";
 import SliderControl from "../controls/sliderControl";
 
 const EventOptions = [
+  { label: trans("modalComp.open"), value: "open", description: trans("modalComp.openDesc") },
   { label: trans("modalComp.close"), value: "close", description: trans("modalComp.closeDesc") },
 ] as const;
 
@@ -169,6 +170,9 @@ let TmpModalComp = (function () {
               afterClose={() => {
                 props.toggleClose&&props.onEvent("close");
               }}
+              afterOpenChange={(open: boolean) => {
+                if (open) props.onEvent("open");
+              }}
               zIndex={Layers.modal}
               modalRender={(node) => <ModalStyled $style={props.style}>{node}</ModalStyled>}
               mask={props.showMask}

client/packages/lowcoder/src/comps/hooks/utilsComp.ts

@@ -6,6 +6,10 @@ import copy from "copy-to-clipboard";
 import { saveDataAsFile } from "../../util/fileUtils";
 import { openApp, recordToSearchStr } from "../../util/appUtils";
 import { trans } from "i18n";
+import { logoutAction } from "redux/reduxActions/userActions";
+import { useDispatch } from "react-redux";
+import { useCallback } from "react";
+
 
 const UtilsCompBase = simpleMultiComp({});
 export let UtilsComp = withExposingConfigs(UtilsCompBase, []);
@@ -107,4 +111,14 @@ UtilsComp = withMethodExposing(UtilsComp, [
       }
     },
   },
+  {
+    method: {
+      name: "logoutUser",
+      description: trans("utilsComp.downloadFile"),
+      params: [],
+    },
+    execute: (comp, params) => {
+      logoutAction({})
+    },
+  },
 ]);

client/packages/lowcoder/src/constants/npmPlugins.ts

@@ -1,3 +1,3 @@
-export const SERVER_HOST = `${REACT_APP_API_SERVICE_URL ?? ""}`;
-export const NPM_REGISTRY_URL = `${SERVER_HOST}/api/npm/registry`;
-export const NPM_PLUGIN_ASSETS_BASE_URL = `${SERVER_HOST}/api/npm/package`;
+export const SERVER_HOST = `${REACT_APP_NODE_SERVICE_URL ?? ""}`;
+export const NPM_REGISTRY_URL = `${SERVER_HOST}/node-service/api/npm/registry`;
+export const NPM_PLUGIN_ASSETS_BASE_URL = `${SERVER_HOST}/node-service/api/npm/package`;

client/packages/lowcoder/src/i18n/locales/en.ts

@@ -2369,6 +2369,8 @@ export const en = {
 
 
   "modalComp": {
+    "open": "Open",
+    "openDesc": "Triggered When the Modal Dialog Box is Opened",
     "close": "Close",
     "closeDesc": "Triggered When the Modal Dialog Box is Closed",
     "openModalDesc": "Open the Dialog Box",

client/packages/lowcoder/src/redux/reduxActions/userActions.ts

@@ -70,7 +70,6 @@ export const fetchApiKeysAction = () => {
     type: ReduxActionTypes.FETCH_API_KEYS,
   };
 };
-
 export const fetchApiKeysSuccess = (payload: FetchApiKeysPayload) => {
   return {
     type: ReduxActionTypes.FETCH_API_KEYS_SUCCESS,

client/packages/lowcoder/src/util/stringUtils.ts

@@ -84,7 +84,7 @@ export const checkPhoneValid = (value: string): boolean => {
 };
 
 export const checkEmailValid = (value: string): boolean => {
-  return EMAIL_PATTERN.test(value);
+  return value === "admin@localhost" || EMAIL_PATTERN.test(value);
 };
 
 export const getNextEntityName = (