fix(web): fix cron example & fix function page layout & hide email (l…

…abring#1521)
HUAHUAI23 · Sep 7, 2023 · 4ef265c · 4ef265c
1 parent 46e412b
commit 4ef265c
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 42 deletions.
diff --git a/web/public/locales/en/translation.json b/web/public/locales/en/translation.json
@@ -268,7 +268,7 @@
   },
   "TriggerPanel": {
     "AddTrigger": "Add Trigger",
-    "CornTip": "Example: 0/1 * * * * ? \nIndicates that the task is executed every 1 second",
+    "CornTip": "Example:  * * * * * \nIndicates that the task is executed every 1 minute",
     "DeleteConfirm": "Are you sure you want to delete this trigger",
     "Express": "expression",
     "Function": "Correlation function",

diff --git a/web/public/locales/zh-CN/translation.json b/web/public/locales/zh-CN/translation.json
@@ -268,7 +268,7 @@
   },
   "TriggerPanel": {
     "AddTrigger": "新建触发器",
-    "CornTip": "例:0/1 * * * * ？\n表示每 1 秒执行任务",
+    "CornTip": "例: * * * * * \n表示每 1 分钟执行任务",
     "DeleteConfirm": "确定删除该触发器吗",
     "Express": "表达式",
     "Function": "关联函数",

diff --git a/web/public/locales/zh/translation.json b/web/public/locales/zh/translation.json
@@ -268,7 +268,7 @@
   },
   "TriggerPanel": {
     "AddTrigger": "新建触发器",
-    "CornTip": "例:0/1 * * * * ？\n表示每 1 秒执行任务",
+    "CornTip": "例 * * * * * \n表示每 1 分钟执行任务",
     "DeleteConfirm": "确定删除该触发器吗",
     "Express": "表达式",
     "Function": "关联函数",

diff --git a/web/src/layouts/Function.tsx b/web/src/layouts/Function.tsx
@@ -48,43 +48,44 @@ export default function FunctionLayout() {
   }, [currentApp, init, pageId, setCurrentPage]);
 
   return (
-    <div>
-      <div
-        style={{
-          height: "100vh",
-          overflow: "hidden",
-          position: "relative",
-        }}
-      >
-        {loading || !currentApp?.appid ? (
-          <Center height={200}>
-            <Spinner />
-          </Center>
-        ) : (
-          <>
-            {currentApp?.phase !== APP_PHASE_STATUS.Started &&
-            currentApp?.phase !== APP_PHASE_STATUS.Stopped &&
-            currentApp?.phase !== APP_PHASE_STATUS.Deleted ? (
-              <div
-                className={clsx(
-                  "absolute bottom-0 left-0 right-0 top-0 z-[999] flex flex-col items-center justify-center  opacity-70 ",
-                  darkMode ? "bg-lafDark-100" : "bg-lafWhite-600",
-                )}
-              >
-                <Spinner
-                  thickness="4px"
-                  speed="0.65s"
-                  emptyColor="gray.200"
-                  color="blue.500"
-                  size="xl"
-                />
-                <Badge className="mt-4">{currentApp.phase}...</Badge>
-              </div>
-            ) : null}
-            <Outlet />
-          </>
-        )}
-      </div>
+    <div
+      style={{
+        overflow: "hidden",
+        position: "absolute",
+        top: 0,
+        left: 0,
+        right: 0,
+        bottom: 0,
+      }}
+    >
+      {loading || !currentApp?.appid ? (
+        <Center height={200}>
+          <Spinner />
+        </Center>
+      ) : (
+        <>
+          {currentApp?.phase !== APP_PHASE_STATUS.Started &&
+          currentApp?.phase !== APP_PHASE_STATUS.Stopped &&
+          currentApp?.phase !== APP_PHASE_STATUS.Deleted ? (
+            <div
+              className={clsx(
+                "absolute bottom-0 left-0 right-0 top-0 z-[999] flex flex-col items-center justify-center opacity-70 ",
+                darkMode ? "bg-lafDark-100" : "bg-lafWhite-600",
+              )}
+            >
+              <Spinner
+                thickness="4px"
+                speed="0.65s"
+                emptyColor="gray.200"
+                color="blue.500"
+                size="xl"
+              />
+              <Badge className="mt-4">{currentApp.phase}...</Badge>
+            </div>
+          ) : null}
+          <Outlet />
+        </>
+      )}
     </div>
   );
 }
diff --git a/web/src/pages/app/setting/UserInfo/index.tsx b/web/src/pages/app/setting/UserInfo/index.tsx
@@ -188,7 +188,7 @@ export default function UserInfo() {
                 </span>
               </div>
             )}
-            <div className="flex flex-col pb-4">
+            {/* <div className="flex flex-col pb-4">
               <span className={clsx("pb-3 text-xl", !darkMode && "text-grayModern-900")}>
                 {t("SettingPanel.Email")}
               </span>
@@ -205,7 +205,7 @@ export default function UserInfo() {
                   {t("UserInfo.Change")} <ChevronRightIcon boxSize={5} />
                 </span>
               </span>
-            </div>
+            </div> */}
           </Box>
         </>
       )}