fix page adjust (#5883)

* fix page adjust

* fix ad store

Author: newfish-cmyk

packages/web/i18n/en/account.json

@@ -12,6 +12,7 @@
   "custom_model": "custom model",
   "default_model": "Default model",
   "default_model_config": "Default model configuration",
+  "language": "Language and time zone",
   "logout": "Sign out",
   "model.active": "Active",
   "model.alias": "Alias",

packages/web/i18n/en/app.json

@@ -81,7 +81,7 @@
   "core.module.template.System Tools": "System Tools",
   "core.workflow.Copilot": "AI Generation",
   "create_by_curl": "By CURL",
-  "create_by_template": "By template",
+  "create_by_template": "Create by template",
   "create_copy_success": "Duplicate Created Successfully",
   "create_empty_app": "Create Default App",
   "create_empty_plugin": "Create Default Plugin",
@@ -94,6 +94,7 @@
   "cron.every_month": "Run Monthly",
   "cron.every_week": "Run Weekly",
   "cron.interval": "Run at Intervals",
+  "current_package": "Current package: ",
   "custom_plugin": "Custom Plugin",
   "custom_plugin_associated_plugin_label": "Associated Plugin",
   "custom_plugin_associated_plugin_placeholder": "Enter plugin name or appId to search",
@@ -136,7 +137,7 @@
   "edit_info": "Edit",
   "empty_tool_tips": "Please add tools on the left side",
   "execute_time": "Execution Time",
-  "expand_tool_create": "Expand tool create",
+  "expand_tool_create": "Expand MCP/Http create",
   "export_config_successful": "Configuration copied, some sensitive information automatically filtered. Please check for any remaining sensitive data.",
   "export_configs": "Export",
   "fastgpt_marketplace": "FastGPT plug-in market",
@@ -468,6 +469,7 @@
   "type_workflow_description": "Memory-enabled complex multi-turn conversational workflows.",
   "type_workflow_intro": "Drag and drop arrangement and multiple rounds of dialogue",
   "un_auth": "No permission",
+  "unnamed_app": "Unnamed",
   "upload_file_exists_filtered": "Duplicate files have been automatically filtered.",
   "upload_file_extension_type_canSelectAudio": "Audio",
   "upload_file_extension_type_canSelectCustomFileExtension": "Custom file extension type",
@@ -480,6 +482,7 @@
   "upload_file_max_amount_tip": "Maximum number of files uploaded in a single round of conversation",
   "upload_method": "Upload method",
   "url_upload": "File link",
+  "used_points": "Used point: ",
   "variable.internal_type_desc": "Use only inside the workflow and will not appear in the dialog box",
   "variable.select type_desc": "The input box will be displayed in the site conversation and run preview, and this variable will not be displayed in the sharing link.",
   "variable.textarea_type_desc": "Allows users to input up to 4000 characters in the dialogue box.",

packages/web/i18n/zh-CN/account.json

@@ -12,6 +12,7 @@
   "custom_model": "自定义模型",
   "default_model": "预设模型",
   "default_model_config": "默认模型配置",
+  "language": "语言与时区",
   "logout": "登出",
   "model.active": "启用",
   "model.alias": "别名",

packages/web/i18n/zh-CN/app.json

@@ -83,7 +83,7 @@
   "core.module.template.System Tools": "系统工具",
   "core.workflow.Copilot": "AI 生成",
   "create_by_curl": "从 CURL 创建",
-  "create_by_template": "从模板选择",
+  "create_by_template": "从模板创建",
   "create_copy_success": "创建副本成功",
   "create_empty_app": "创建空白应用",
   "create_empty_plugin": "创建空白插件",
@@ -96,6 +96,7 @@
   "cron.every_month": "每月执行",
   "cron.every_week": "每周执行",
   "cron.interval": "间隔执行",
+  "current_package": "当前套餐：",
   "custom_plugin": "自定义插件",
   "custom_plugin_associated_plugin_label": "关联插件",
   "custom_plugin_associated_plugin_placeholder": "输入插件名或 appId 查找插件",
@@ -140,7 +141,7 @@
   "edit_param": "编辑参数",
   "empty_tool_tips": "请在左侧添加工具",
   "execute_time": "执行时间",
-  "expand_tool_create": "展开工具创建",
+  "expand_tool_create": "展开MCP、Http创建",
   "export_config_successful": "已复制配置，自动过滤部分敏感信息，请注意检查是否仍有敏感数据",
   "export_configs": "导出配置",
   "fastgpt_marketplace": "FastGPT 插件市场",
@@ -486,6 +487,7 @@
   "type_workflow_description": "支持记忆的复杂多轮对话工作流。",
   "type_workflow_intro": "拖拽编排与多轮对话",
   "un_auth": "无权限",
+  "unnamed_app": "未命名",
   "upgrade": "去升级",
   "upload_file_exists_filtered": "已自动过滤重复文件",
   "upload_file_extension_type_canSelectAudio": "音频",
@@ -499,6 +501,7 @@
   "upload_file_max_amount_tip": "单轮对话中最大上传文件数量",
   "upload_method": "上传方式",
   "url_upload": "文件链接",
+  "used_points": "积分用量：",
   "variable.internal_type_desc": "仅在工作流内部使用，不会出现在对话框中",
   "variable.select type_desc": "会在站内对话和运行预览中显示输入框，在分享链接中不会显示此变量",
   "variable.textarea_type_desc": "允许用户最多输入4000字的对话框。",

packages/web/i18n/zh-Hant/account.json

@@ -12,6 +12,7 @@
   "custom_model": "自訂模型",
   "default_model": "預設模型",
   "default_model_config": "預設模型設定",
+  "language": "語言與時區",
   "logout": "登出",
   "model.active": "啟用",
   "model.alias": "別名",

packages/web/i18n/zh-Hant/app.json

@@ -93,6 +93,7 @@
   "cron.every_month": "每月執行",
   "cron.every_week": "每週執行",
   "cron.interval": "間隔執行",
+  "current_package": "當前套餐：",
   "custom_plugin": "自訂外掛",
   "custom_plugin_associated_plugin_label": "關聯外掛",
   "custom_plugin_associated_plugin_placeholder": "輸入外掛名稱或 appId 尋找外掛",
@@ -135,7 +136,7 @@
   "edit_info": "編輯資訊",
   "empty_tool_tips": "請在左側添加工具",
   "execute_time": "執行時間",
-  "expand_tool_create": "展開工具創建",
+  "expand_tool_create": "展開 MCP、Http 創建",
   "export_config_successful": "已複製設定，自動過濾部分敏感資訊，請注意檢查是否仍有敏感資料",
   "export_configs": "匯出設定",
   "fastgpt_marketplace": "FastGPT 插件市場",
@@ -465,6 +466,7 @@
   "type_workflow_description": "支持記憶的複雜多輪對話工作流。",
   "type_workflow_intro": "拖拽編排與多輪對話",
   "un_auth": "無權限",
+  "unnamed_app": "未命名",
   "upgrade": "去升級",
   "upload_file_exists_filtered": "已自動過濾重複檔案",
   "upload_file_extension_type_canSelectAudio": "音頻",
@@ -478,6 +480,7 @@
   "upload_file_max_amount_tip": "單輪對話中最大上傳檔案數量",
   "upload_method": "上傳方式",
   "url_upload": "文件鏈接",
+  "used_points": "積分用量：",
   "variable.internal_type_desc": "僅在工作流內部使用，不會出現在對話框中",
   "variable.select type_desc": "會在站內對話和運行預覽中顯示輸入框，在分享鏈接中不會顯示此變量",
   "variable.textarea_type_desc": "允許使用者最多輸入 4000 字的對話框。",

projects/app/src/components/Layout/HelperBot.tsx

@@ -61,8 +61,9 @@ const HelperBot = () => {
           position={'fixed'}
           right={3}
           bottom={'calc(10% + 80px)'}
+          top={'50px'}
           w={'400px'}
-          h={'600px'}
+          maxH={'790px'}
           bg={'white'}
           borderRadius={'lg'}
           boxShadow={'0px 4px 20px rgba(0, 0, 0, 0.15)'}

projects/app/src/components/Layout/navbar.tsx

@@ -69,13 +69,6 @@ const Navbar = ({ unread }: { unread: number }) => {
         link: `/dataset/list`,
         activeLink: ['/dataset/list', '/dataset/detail']
       },
-      {
-        label: t('common:navbar.Chat'),
-        icon: 'navbar/chatLight',
-        activeIcon: 'navbar/chatFill',
-        link: `/chat?appId=${lastChatAppId}&pane=${lastPane}`,
-        activeLink: ['/chat']
-      },
       {
         label: t('common:navbar.Account'),
         icon: 'navbar/userLight',
@@ -94,6 +87,13 @@ const Navbar = ({ unread }: { unread: number }) => {
           '/account/model'
         ]
       },
+      {
+        label: t('common:navbar.Chat'),
+        icon: 'navbar/chatLight',
+        activeIcon: 'navbar/chatFill',
+        link: `/chat?appId=${lastChatAppId}&pane=${lastPane}`,
+        activeLink: ['/chat']
+      },
       ...(userInfo?.username === 'root'
         ? [
             {

projects/app/src/components/common/secret/HeaderAuthForm.tsx

@@ -28,13 +28,15 @@ const AuthValueDisplay = ({
   index = 0,
   onEdit,
   value,
-  onChange
+  onChange,
+  bg
 }: {
   showInput: boolean;
   index?: number;
   onEdit: (index?: number) => void;
   value: string;
   onChange: (value: string) => void;
+  bg: string;
 }) => {
   const { t } = useTranslation();
 
@@ -43,7 +45,7 @@ const AuthValueDisplay = ({
       {showInput ? (
         <Input
           placeholder={'Value'}
-          bg={'myGray.50'}
+          bg={bg}
           h={8}
           maxLength={200}
           onFocus={() => onEdit(index)}
@@ -98,11 +100,13 @@ export const getSecretType = (config: HeaderSecretConfigType): HeaderSecretTypeE
 const HeaderAuthForm = ({
   headerSecretValue,
   onChange,
-  fontWeight = 'medium'
+  fontWeight = 'medium',
+  bg = 'myGray.50'
 }: {
   headerSecretValue: HeaderSecretConfigType;
   onChange: (secret: HeaderSecretConfigType) => void;
   fontWeight?: string;
+  bg?: string;
 }) => {
   const { t } = useTranslation();
   const headerSecretList = [
@@ -138,7 +142,7 @@ const HeaderAuthForm = ({
         {t('common:auth_type')}
       </Box>
       <MySelect
-        bg={'myGray.50'}
+        bg={bg}
         value={currentAuthType}
         onChange={(val) => {
           if (val === HeaderSecretTypeEnum.None) {
@@ -192,6 +196,7 @@ const HeaderAuthForm = ({
                   });
                 }
               }}
+              bg={bg}
             />
           ) : (
             <Box>
@@ -201,7 +206,7 @@ const HeaderAuthForm = ({
                     <Input
                       w={1 / 3}
                       h={8}
-                      bg="myGray.50"
+                      bg={bg}
                       placeholder="key"
                       maxLength={64}
                       value={item.key}
@@ -230,6 +235,7 @@ const HeaderAuthForm = ({
                         }}
                         index={index}
                         onEdit={setEditingIndex}
+                        bg={bg}
                       />
                     </Box>
                     {customHeaders.length > 1 && (

projects/app/src/pageComponents/account/AccountContainer.tsx

@@ -111,8 +111,8 @@ const AccountContainer = ({
         ]
       : []),
     {
-      icon: 'common/settingLight',
-      label: t('common:Setting'),
+      icon: 'support/usage/usageRecordLight',
+      label: t('account:language'),
       value: TabEnum.setting
     },
     {