Merge remote-tracking branch 'origin/master'

Author: lhy

src/i18n/en.json

@@ -49,11 +49,11 @@
   "webview.settings.save.config.success": "PawSQL Setup Completed",
   "webview.settings.save.config.failed": "PawSQL Setup Failded",
   "form.config.title": "PawSQL Setup",
-  "form.config.email.label": "PawSQL Email",
+  "form.config.email.label": "PawSQL Account",
   "form.config.password.label": "Password",
-  "form.config.backendUrl.label": "PawSQL Engine",
+  "form.config.backendUrl.label": "PawSQL Server Address",
   "form.config.frontendUrl.label": "PawSQL Website",
-  "form.config.description": "PawSQL Client enables developers to access core capabilities of the PawSQL directly within their VS Code development environment. PawSQL provides sophisticated SQL optimization features including smart index recommendations and query rewriting suggestions. More about PawSQL's capabilities, please visit ",
+  "form.config.description": "PawSQL Client enables developers to access core capabilities of the PawSQL directly within VSCode enviroment. PawSQL provides sophisticated SQL optimization features including smart index recommendations and query rewrites. More about PawSQL's capabilities, please visit ",
   "form.config.documentation.link": "docs.pawsql.com",
   "form.config.save": "Save",
   "workspaces.isLoading": "Loading Workspaces",

src/i18n/zh-cn.json

@@ -49,11 +49,11 @@
   "webview.settings.save.config.success": "保存成功",
   "webview.settings.save.config.failed": "保存配置失败",
   "form.config.title": "PawSQL 配置",
-  "form.config.email.label": "PawSQL注册邮箱",
+  "form.config.email.label": "PawSQL 账号",
   "form.config.password.label": "密码",
-  "form.config.backendUrl.label": "PawSQL 引擎地址",
+  "form.config.backendUrl.label": "PawSQL 服务器",
   "form.config.frontendUrl.label": "PawSQL 前端地址",
-  "form.config.description": "PawSQL Client让开发者能够在VS Code开发环境中直接使用PawSQL优化引擎的强大功能，包括智能索引推荐、查询重写建议、自动化性能验证等。想要了解更详细的PawSQL的SQL优化能力，请参考",
+  "form.config.description": "PawSQL Client让开发者能够在VS Code开发环境中直接使用PawSQL优化引擎的强大功能，包括智能索引推荐、查询重写建议、自动化性能验证等。想要了解更多关于PawSQL的优化能力，请参考",
   "form.config.documentation.link": "PawSQL官方文档",
   "form.config.save": "保存",
   "workspaces.isLoading": "工作空间列表加载中...",

src/webview/components/ConfigForm.tsx

@@ -105,7 +105,7 @@ const ConfigForm: React.FC<ConfigFormProps> = ({
           variant="body1"
           align="center"
           color="textSecondary"
-          sx={{ maxWidth: "460px" }}
+          sx={{ maxWidth: "560px" }}
         >
           <FormattedMessage id="form.config.description" />{" "}
           <a
@@ -120,60 +120,60 @@ const ConfigForm: React.FC<ConfigFormProps> = ({
           </a>
         </Typography>
       </div>
-
-      <form onSubmit={handleSubmit}>
-        <TextField
+      <TextField
           fullWidth
-          name="email"
-          label={formatMessage({ id: "form.config.email.label" })}
+          name="backendUrl"
+          label={formatMessage({ id: "form.config.backendUrl.label" })}
           variant="outlined"
           margin="normal"
-          value={formState.email}
+          value={formState.backendUrl}
           onChange={handleInputChange}
           InputProps={{
             startAdornment: (
               <InputAdornment position="start">
-                <PersonIcon sx={{ color: "#666" }} />
+                <PublicIcon sx={{ color: "#666" }} />
               </InputAdornment>
             ),
           }}
           sx={{ mb: 2 }}
         />
+      <form onSubmit={handleSubmit}>
         <TextField
           fullWidth
-          name="password"
-          type="password"
-          label={formatMessage({ id: "form.config.password.label" })}
+          name="email"
+          label={formatMessage({ id: "form.config.email.label" })}
           variant="outlined"
           margin="normal"
-          value={formState.password}
+          value={formState.email}
           onChange={handleInputChange}
           InputProps={{
             startAdornment: (
               <InputAdornment position="start">
-                <LockIcon sx={{ color: "#666" }} />
+                <PersonIcon sx={{ color: "#666" }} />
               </InputAdornment>
             ),
           }}
           sx={{ mb: 2 }}
         />
         <TextField
           fullWidth
-          name="backendUrl"
-          label={formatMessage({ id: "form.config.backendUrl.label" })}
+          name="password"
+          type="password"
+          label={formatMessage({ id: "form.config.password.label" })}
           variant="outlined"
           margin="normal"
-          value={formState.backendUrl}
+          value={formState.password}
           onChange={handleInputChange}
           InputProps={{
             startAdornment: (
               <InputAdornment position="start">
-                <PublicIcon sx={{ color: "#666" }} />
+                <LockIcon sx={{ color: "#666" }} />
               </InputAdornment>
             ),
           }}
           sx={{ mb: 2 }}
         />
+
         <Button
           type="submit"
           variant="contained"