feat: 增加站点排序

README.md

@@ -121,11 +121,12 @@ docker run -itd -v ./data/:/app/data -p8080:8080 --name registry.cn-hangzhou.ali
 - [ ] 考虑多租户的功能，目前前端使用的是nginx auth的授权认证，该方式是否能传递用户id作为查询数据的条件
 - [ ] 考虑增加jwt,basic授权
 
+## 更新日志
+
 ### 2023-07-06
 - [ ] [ngx_http_auth_request_module](https://nginx.org/en/docs/http/ngx_http_auth_request_module.html)
     鉴权模块的实现
-
-## 更新日志
+- 
 - 20230710：修复return 语句未渲染的问题
 - 20230719: 修复return语句在代理或者静态站点的情况下依然渲染的问题
 
@@ -133,6 +134,10 @@ docker run -itd -v ./data/:/app/data -p8080:8080 --name registry.cn-hangzhou.ali
 - 对接第三方oauth
 - docker镜像增加ca-certificates curl 软件安装
 
+### 2024-06-16
+- 调整项目文件结构
+- 增加桌面版本打包
+
 ## git代理
 git config --global http.proxy http://127.0.0.1:{port}
 

frontend/package.json

@@ -28,6 +28,8 @@
     "dayjs": "^1.11.9",
     "events": "^3.3.0",
     "history": "^5.3.0",
+    "i18next": "^23.11.5",
+    "i18next-browser-languagedetector": "5.x",
     "install": "^0.13.0",
     "jszip": "^3.10.1",
     "less": "^4.1.3",
@@ -37,6 +39,7 @@
     "query-string": "^8.1.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
+    "react-i18next": "^14.1.2",
     "react-redux": "^8.1.1",
     "react-router": "^6.14.0",
     "react-router-dom": "^6.14.0",

frontend/src/i18n/i18n.ts

@@ -0,0 +1,27 @@
+import i18n from "i18next"
+import enUsTrans from './locales/en.json'
+import zhCnTrans from './locales/zh.json'
+import {
+    initReactI18next
+} from 'react-i18next'
+import LanguageDetector from 'i18next-browser-languagedetector'; // 检测当前浏览器语言
+
+i18n.use(LanguageDetector)
+    .use(initReactI18next)
+    .init({
+        resources:{
+            en:{
+                translation:enUsTrans
+            },
+            zh:{
+                translation:zhCnTrans
+            }
+        },
+        lng:navigator.language,
+        fallbackLng:"zh",
+        debug:false,
+        interpolation:{
+            escapeValue:false
+        }
+    })
+export default i18n

frontend/src/i18n/locales/en.json

@@ -0,0 +1,5 @@
+{
+
+  "location.is_first": "It's already the first one",
+  "location.is_last": "It's already at the end"
+}

frontend/src/i18n/locales/zh.json

@@ -0,0 +1,5 @@
+{
+
+  "location.is_first": "已经是第一个了",
+  "location.is_last": "已经在最后了"
+}

frontend/src/main.tsx

@@ -5,6 +5,7 @@ import App from './App.tsx'
 import './index.css'
 import './styles/index.less'
 import renderWithQiankun from "vite-plugin-qiankun/es/helper";
+import './i18n/i18n.ts'
 
 let root: Root | null
 

frontend/src/pages/nginx/components/location/index.less

@@ -9,12 +9,18 @@
 }
 
 .location-table{
+  display: block;
   .ant-table-cell{
     padding: 10px;
   }
   .location-btns{
+    display: block;
+
+    .move-btn{
+      margin-right: 5px;
+    }
     .ant-btn+.ant-btn{
-      margin-left: 5px;
+      margin-left: 0;
     }
     .ant-btn{
       padding: 2.4px 0;
@@ -23,8 +29,8 @@
       font-size: 13px;
     }
   }
-
 }
+
 .location-table ~ .description{
   display: block;
   width: 100%;

frontend/src/pages/nginx/components/location/index.tsx

@@ -10,14 +10,21 @@ import {
     uniqueKey
 } from "planning-tools";
 import {useEffect, useRef, useState} from "react";
-import {CopyOutlined, DeleteOutlined, EditOutlined, PlusOutlined} from "@ant-design/icons";
+import { useTranslation } from 'react-i18next'
+import {
+    ArrowDownOutlined,
+    ArrowUpOutlined,
+    CopyOutlined,
+    DeleteOutlined,
+    EditOutlined,
+    PlusOutlined
+} from "@ant-design/icons";
 import {INginxLocation} from "../../../../models/nginx.ts";
 import {cloneDeep} from "lodash";
 import FormConfig from './config.json'
-
-import './index.less'
 import {SiteInput} from "../site";
 import {renderLocation} from "./utils.ts";
+import './index.less'
 
 /**
  * 部分的重要信息
@@ -65,6 +72,7 @@ export const LocationInput = ({value, onChange }: AutoTypeInputProps) => {
     const isAddRef = useRef(false)
 
     const [modal,contextHolder] = Modal.useModal()
+    const {t} = useTranslation()
 
     const formRef = useRef<AutoFormInstance>()
 
@@ -93,6 +101,29 @@ export const LocationInput = ({value, onChange }: AutoTypeInputProps) => {
         setEditData({ ...data,id: uniqueKey(20),__index__: index} as never)
     }
 
+    const moveUp = (data: INginxLocation, index: number) => {
+        if (index == 0){
+            Message.warning(t('location.is_first'))
+            return
+        }
+        const current = locations[index-1]
+        locations[index-1] = data
+        locations[index] = current
+        setLocations([...locations])
+        onChange?.(locations)
+    }
+    const moveDown = (data: INginxLocation,index: number)=>{
+        if (index == locations.length-1){
+            Message.warning(t('location.is_last'))
+            return
+        }
+        const current = locations[index+1]
+        locations[index+1] = data
+        locations[index] = current
+        setLocations([...locations])
+        onChange?.(locations)
+    }
+
     const onRemoveData = (data: INginxLocation)=>{
         const onOk = ()=>{
             const list = locations.filter(item=>item.id !== data.id);
@@ -207,6 +238,8 @@ export const LocationInput = ({value, onChange }: AutoTypeInputProps) => {
     const renderOps = (_: never, data: INginxLocation, index: number) => {
         return (
             <div className="location-btns">
+                <ArrowUpOutlined className='move-btn' onClick={()=>moveUp(data, index)}/>
+                <ArrowDownOutlined className='move-btn' onClick={()=>moveDown(data,index)}/>
                 <Button onClick={() => onRemoveData(data)} type="text" danger icon={<DeleteOutlined/>}/>
                 <Button onClick={() => onEditRow(data)} type="link" icon={<EditOutlined/>}/>
                 <Button onClick={()=>onAddData(data, index)} type="link" icon={<CopyOutlined/>}/>
@@ -249,7 +282,7 @@ export const LocationInput = ({value, onChange }: AutoTypeInputProps) => {
         {
             title: '操作',
             render: renderOps as never,
-            width: 180,
+            width: 200,
             fixed: 'right'
         }
     ]

frontend/src/pages/nginx/server/index.tsx

@@ -35,7 +35,7 @@ export const NginxServer = () => {
   const dispatch = useAppDispatch();
 
   useEffect(()=>{
-    formRef.current?.resetData()
+    formRef.current?.setData(undefined)
     if (server && formRef.current){
       formRef.current?.setData(cloneDeep(server))
     }

frontend/vite.config.ts

@@ -53,8 +53,8 @@ export default defineConfig(({command, mode})=>{
           }
         } : {
           "/api":{
-            // target: 'http://10.10.0.1:8080',
-            target: 'http://127.0.0.1:8080',
+            target: 'http://10.10.0.1:8080',
+            // target: 'http://127.0.0.1:8080',
             rewrite: path => path.replace(/^\/api/,"")
           }
         }

frontend/yarn.lock

@@ -134,6 +134,13 @@
   dependencies:
     regenerator-runtime "^0.13.11"
 
+"@babel/runtime@^7.23.2", "@babel/runtime@^7.23.9", "@babel/runtime@^7.5.5":
+  version "7.24.7"
+  resolved "https://registry.npmmirror.com/@babel/runtime/-/runtime-7.24.7.tgz#f4f0d5530e8dbdf59b3451b9b3e594b6ba082e12"
+  integrity sha512-UwgBRMjJP+xv857DCngvqXI3Iq6J4v0wXmwc6sapg+zyhbwmQX67LUEFrkK5tbyJ30jGuG3ZvWpBiB9LCy1kWw==
+  dependencies:
+    regenerator-runtime "^0.14.0"
+
 "@babel/template@^7.22.5":
   version "7.22.5"
   resolved "https://mirrors.tencent.com/npm/@babel/template/-/template-7.22.5.tgz#0c8c4d944509875849bd0344ff0050756eefc6ec"
@@ -2899,6 +2906,13 @@ html-minifier@^3.4.3:
     relateurl "0.2.x"
     uglify-js "3.4.x"
 
+html-parse-stringify@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.npmmirror.com/html-parse-stringify/-/html-parse-stringify-3.0.1.tgz#dfc1017347ce9f77c8141a507f233040c59c55d2"
+  integrity sha512-KknJ50kTInJ7qIScF3jeaFRpMpE8/lfiTdzf/twXyPBLAGrLRTmkz3AdTnKeh40X8k9L2fdYwEp/42WGXIRGcg==
+  dependencies:
+    void-elements "3.1.0"
+
 htmlparser2@^8.0.1:
   version "8.0.2"
   resolved "https://registry.npmmirror.com/htmlparser2/-/htmlparser2-8.0.2.tgz#f002151705b383e62433b5cf466f5b716edaec21"
@@ -2938,6 +2952,20 @@ humanize-ms@^1.2.1:
   dependencies:
     ms "^2.0.0"
 
+i18next-browser-languagedetector@5.x:
+  version "5.0.1"
+  resolved "https://registry.npmmirror.com/i18next-browser-languagedetector/-/i18next-browser-languagedetector-5.0.1.tgz#02a18f57f79b5de06279feb9a84c80ea4dde7da9"
+  integrity sha512-7K4A6DJ2rNz3Yd835Y493UgkzUxgpGsCeIMKLGkt6Ps0cbgSaJ+LdATFNFA+ujp2brmsUM9BeDThXKhabXUbUw==
+  dependencies:
+    "@babel/runtime" "^7.5.5"
+
+i18next@^23.11.5:
+  version "23.11.5"
+  resolved "https://registry.npmmirror.com/i18next/-/i18next-23.11.5.tgz#d71eb717a7e65498d87d0594f2664237f9e361ef"
+  integrity sha512-41pvpVbW9rhZPk5xjCX2TPJi2861LEig/YRhUkY+1FQ2IQPS0bKUDYnEqY8XPPbB48h1uIwLnP9iiEfuSl20CA==
+  dependencies:
+    "@babel/runtime" "^7.23.2"
+
 iconv-lite@0.6.3, iconv-lite@^0.6.2, iconv-lite@^0.6.3:
   version "0.6.3"
   resolved "https://registry.npmmirror.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501"
@@ -5175,6 +5203,14 @@ react-dom@^18.2.0:
     loose-envify "^1.1.0"
     scheduler "^0.23.0"
 
+react-i18next@^14.1.2:
+  version "14.1.2"
+  resolved "https://registry.npmmirror.com/react-i18next/-/react-i18next-14.1.2.tgz#cd57a755f25a32a5fcc3dbe546cf3cc62b4f3ebd"
+  integrity sha512-FSIcJy6oauJbGEXfhUgVeLzvWBhIBIS+/9c6Lj4niwKZyGaGb4V4vUbATXSlsHJDXXB+ociNxqFNiFuV1gmoqg==
+  dependencies:
+    "@babel/runtime" "^7.23.9"
+    html-parse-stringify "^3.0.1"
+
 react-is@^16.12.0, react-is@^16.13.1, react-is@^16.7.0:
   version "16.13.1"
   resolved "https://registry.npmmirror.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
@@ -5304,6 +5340,11 @@ regenerator-runtime@^0.13.11:
   resolved "https://registry.npmmirror.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz#f6dca3e7ceec20590d07ada785636a90cdca17f9"
   integrity sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==
 
+regenerator-runtime@^0.14.0:
+  version "0.14.1"
+  resolved "https://registry.npmmirror.com/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz#356ade10263f685dda125100cd862c1db895327f"
+  integrity sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==
+
 relateurl@0.2.x:
   version "0.2.7"
   resolved "https://registry.npmmirror.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9"
@@ -5634,7 +5675,16 @@ string-convert@^0.2.0:
   resolved "https://registry.npmmirror.com/string-convert/-/string-convert-0.2.1.tgz#6982cc3049fbb4cd85f8b24568b9d9bf39eeff97"
   integrity sha512-u/1tdPl4yQnPBjnVrmdLo9gtuLvELKsAoRapekWggdiQNvvvum+jYF329d84NAa660KQw7pB2n36KrIKVoXa3A==
 
-"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+"string-width-cjs@npm:string-width@^4.2.0":
+  version "4.2.3"
+  resolved "https://registry.npmmirror.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.1"
+
+"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.npmmirror.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -5674,7 +5724,14 @@ stringify-entities@^4.0.0:
     character-entities-html4 "^2.0.0"
     character-entities-legacy "^3.0.0"
 
-"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
+  version "6.0.1"
+  resolved "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+  dependencies:
+    ansi-regex "^5.0.1"
+
+strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -6191,6 +6248,11 @@ vitest@^0.25.6, vitest@^0.25.8:
     tinyspy "^1.0.2"
     vite "^3.0.0 || ^4.0.0"
 
+void-elements@3.1.0:
+  version "3.1.0"
+  resolved "https://registry.npmmirror.com/void-elements/-/void-elements-3.1.0.tgz#614f7fbf8d801f0bb5f0661f5b2f5785750e4f09"
+  integrity sha512-Dhxzh5HZuiHQhbvTW9AMetFfBHDMYpo23Uo9btPXgdYP+3T5S+p+jgNy7spra+veYhBP2dCSgxR/i2Y02h5/6w==
+
 walk-up-path@^3.0.1:
   version "3.0.1"
   resolved "https://registry.npmmirror.com/walk-up-path/-/walk-up-path-3.0.1.tgz#c8d78d5375b4966c717eb17ada73dbd41490e886"