fix: refine rbac permission controls (#12821)

This commit is contained in:
ssongliu
2026-05-23 09:44:11 +08:00
committed by GitHub
parent 0cefe8f6ad
commit 56c7d5e3bd
28 changed files with 408 additions and 396 deletions
+13 -13
View File
@@ -239,24 +239,24 @@ RestoreStep4: "(4/5) 1Panel service rollback completed"
RestoreStep5: "(5/5) 1Panel data rollback completed"
RestoreSuccessful: "Rollback completed. Reverted to {{ .version }}. Restarting service..."
UpdateCommands: "Update panel info"
UpdateUser: "Update panel user"
UpdatePassword: "Update panel password"
UpdateUser: "Update user information"
UpdatePassword: "Update user password"
UpdatePort: "Update panel port"
UpdateUserNull: "Error: panel user is empty!"
UpdateUserBlank: "Error: panel user contains spaces!"
UpdateUserFormat: "Error: Invalid panel user format! Only supports English, Chinese, numbers, and _, length 3-30"
UpdateUserErr: "Error: Failed to update panel user, {{ .err }}"
UpdateUserNull: "Error: user is empty!"
UpdateUserBlank: "Error: user contains spaces!"
UpdateUserFormat: "Error: Invalid user format! Only supports English, Chinese, numbers, and _, length 3-30"
UpdateUserErr: "Error: Failed to update user, {{ .err }}"
UpdateSuccessful: "Update successful!"
UpdateUserResult: "Panel user: {{ .name }}"
UpdatePasswordRead: "Error: Failed to read panel password information, {{ .err }}"
UpdatePasswordNull: "Error: Panel password is empty!"
UpdateUPasswordBlank: "Error: Panel password contains spaces!"
UpdatePasswordFormat: "Error: Panel password supports only letters, numbers, and special characters (!@#$%*_,.?) with a length of 8-30."
UpdateUserResult: "User: {{ .name }}"
UpdatePasswordRead: "Error: Failed to read user password information, {{ .err }}"
UpdatePasswordNull: "Error: User password is empty!"
UpdateUPasswordBlank: "Error: User password contains spaces!"
UpdatePasswordFormat: "Error: User password supports only letters, numbers, and special characters (!@#$%*_,.?) with a length of 8-30."
UpdatePasswordLen: "Error: Enter a password longer than 6 characters"
UpdatePasswordRe: "Confirm password:"
UpdatePasswordErr: "Error: Failed to update panel password, {{ .err }}"
UpdatePasswordErr: "Error: Failed to update user password, {{ .err }}"
UpdatePasswordSame: "Error: The two passwords do not match, check and try again!"
UpdatePasswordResult: "Panel password: {{ .name }}"
UpdatePasswordResult: "User password: {{ .name }}"
UpdatePortFormat: "Error: The input port number must be between 1 and 65535!"
UpdatePortUsed: "Error: The port number is already in use, check and try again!"
UpdatePortErr: "Error: Failed to update panel port, {{ .err }}"
+13 -13
View File
@@ -233,24 +233,24 @@ RestoreStep4: "(4/5) Reversión del servicio de 1Panel completada"
RestoreStep5: "(5/5) Reversión de los datos de 1Panel completada"
RestoreSuccessful: "Reversión completada. Se volvió a {{ .version }}. Reiniciando el servicio..."
UpdateCommands: "Actualizar información del panel"
UpdateUser: "Actualizar usuario del panel"
UpdatePassword: "Actualizar contraseña del panel"
UpdateUser: "Actualizar información del usuario"
UpdatePassword: "Actualizar contraseña del usuario"
UpdatePort: "Actualizar puerto del panel"
UpdateUserNull: "Error: el usuario del panel está vacío"
UpdateUserBlank: "Error: el usuario del panel contiene espacios"
UpdateUserFormat: "Error: formato de usuario del panel inválido Solo admite inglés, chino, números y _, longitud 3-30"
UpdateUserErr: "Error: Fallo al actualizar usuario del panel, {{ .err }}"
UpdateUserNull: "Error: el usuario está vacío"
UpdateUserBlank: "Error: el usuario contiene espacios"
UpdateUserFormat: "Error: formato de usuario inválido Solo admite inglés, chino, números y _, longitud 3-30"
UpdateUserErr: "Error: Fallo al actualizar usuario, {{ .err }}"
UpdateSuccessful: "Actualización finalizada con éxito"
UpdateUserResult: "Usuario del panel: {{ .name }}"
UpdatePasswordRead: "Error: Fallo al leer información de la contraseña del panel, {{ .err }}"
UpdatePasswordNull: "Error: la contraseña del panel está vacía"
UpdateUPasswordBlank: "Error: la contraseña del panel contiene espacios"
UpdatePasswordFormat: "Error: La contraseña del panel solo admite letras, números y caracteres especiales (@#$%*_,.?), con una longitud de 8-30."
UpdateUserResult: "Usuario: {{ .name }}"
UpdatePasswordRead: "Error: Fallo al leer información de la contraseña del usuario, {{ .err }}"
UpdatePasswordNull: "Error: la contraseña del usuario está vacía"
UpdateUPasswordBlank: "Error: la contraseña del usuario contiene espacios"
UpdatePasswordFormat: "Error: La contraseña del usuario solo admite letras, números y caracteres especiales (@#$%*_,.?), con una longitud de 8-30."
UpdatePasswordLen: "Error: Ingrese una contraseña mayor a 6 caracteres"
UpdatePasswordRe: "Confirmar contraseña:"
UpdatePasswordErr: "Error: Fallo al actualizar la contraseña del panel, {{ .err }}"
UpdatePasswordErr: "Error: Fallo al actualizar la contraseña del usuario, {{ .err }}"
UpdatePasswordSame: "Error: Las dos contraseñas no coinciden, verifique e intente de nuevo"
UpdatePasswordResult: "Contraseña del panel: {{ .name }}"
UpdatePasswordResult: "Contraseña del usuario: {{ .name }}"
UpdatePortFormat: "Error: El puerto debe estar entre 1 y 65535"
UpdatePortUsed: "Error: El puerto ya está en uso, verifique e intente de nuevo"
UpdatePortErr: "Error: Fallo al actualizar el puerto del panel, {{ .err }}"
+13 -13
View File
@@ -233,24 +233,24 @@ RestoreStep4: "(4/5)1Panel サービスのロールバックが完了しま
RestoreStep5: "(5/5)1Panel データのロールバックが完了しました"
RestoreSuccessful: "ロールバックが完了しました。{{ .version }} に戻し、サービスを再起動しています..."
UpdateCommands: "パネル情報を更新します"
UpdateUser: "パネルユーザーを更新します"
UpdatePassword: "パスワードを更新します"
UpdateUser: "ユーザー情報を更新します"
UpdatePassword: "ユーザーパスワードを更新します"
UpdatePort: "パネルポートを更新します"
UpdateUserNull: "エラー: パネルユーザーは空です!"
UpdateUserBlank: "エラー: パネルユーザーにはスペースが含まれています!"
UpdateUserFormat: "エラー: 無効なパネルユーザー形式!英語、中国語、数字、_、長さ3〜30のみをサポートしています"
UpdateUserErr: "エラー: パネルユーザーの更新に失敗しました{{ .err }}"
UpdateUserNull: "エラー: ユーザーは空です!"
UpdateUserBlank: "エラー: ユーザーにはスペースが含まれています!"
UpdateUserFormat: "エラー: 無効なユーザー形式!英語、中国語、数字、_、長さ3〜30のみをサポートしています"
UpdateUserErr: "エラー: ユーザーの更新に失敗しました{{ .err }}"
UpdateSuccessful: "更新成功!"
UpdateUserResult: "パネルユーザー: {{ .name }}"
UpdatePasswordRead: "エラー: パネルパスワード情報の読み取りに失敗しました、{{ .err }}"
UpdatePasswordNull: "エラー: パネルパスワードは空です!"
UpdateUPasswordBlank: "エラー: パスワードにはスペースが含まれています!"
UpdatePasswordFormat: "エラー: パネルパスワードは英字、数字、特殊文字(@#$%*_,.?)のみ使用でき、長さは8〜30文字です。"
UpdateUserResult: "ユーザー: {{ .name }}"
UpdatePasswordRead: "エラー: ユーザーパスワード情報の読み取りに失敗しました、{{ .err }}"
UpdatePasswordNull: "エラー: ユーザーパスワードは空です!"
UpdateUPasswordBlank: "エラー: ユーザーパスワードにはスペースが含まれています!"
UpdatePasswordFormat: "エラー: ユーザーパスワードは英字、数字、特殊文字(@#$%*_,.?)のみ使用でき、長さは8〜30文字です。"
UpdatePasswordLen: "エラー: 6文字より長くパスワードを入力してください!"
UpdatePasswordRe: "パスワードを認証する: "
UpdatePasswordErr: "エラー: {{ .err }}のパスワードの更新に失敗しました"
UpdatePasswordErr: "エラー: ユーザーパスワードの更新に失敗しました、{{ .err }}"
UpdatePasswordSame: "エラー: 2つのパスワードが一致しません。チェックして再試行してください!"
UpdatePasswordResult: "パネルパスワード: {{ .name }}"
UpdatePasswordResult: "ユーザーパスワード: {{ .name }}"
UpdatePortFormat: "エラー: 入力ポート番号は1〜65535でなければなりません!"
UpdatePortUsed: "エラー: ポート番号はすでに使用されています。チェックして再試行してください!"
UpdatePortErr: "エラー: パネルポートの更新に失敗しました{{ .err }}"
+13 -13
View File
@@ -232,24 +232,24 @@ RestoreStep4: "(4/5) 1Panel 서비스 롤백 완료"
RestoreStep5: "(5/5) 1Panel 데이터 롤백 완료"
RestoreSuccessful: "롤백이 완료되었습니다. {{ .version }}(으)로 되돌리고 서비스를 다시 시작합니다..."
UpdateCommands: "패널 정보 업데이트"
UpdateUser: "패널 사용자 업데이트"
UpdatePassword: "패널 비밀번호 업데이트"
UpdateUser: "사용자 정보 업데이트"
UpdatePassword: "사용자 비밀번호 업데이트"
UpdatePort: "패널 포트 업데이트"
UpdateUserNull: "오류: 패널 사용자가 비어 있습니다"
UpdateUserBlank: "오류: 패널 사용자에 공백이 포함되어 있습니다"
UpdateUserFormat: "오류: 잘못된 패널 사용자 형식 영어, 중국어, 숫자, _만 지원하며 길이는 3~30자입니다."
UpdateUserErr: "오류: 패널 사용자 업데이트 실패 {{ .err }}"
UpdateUserNull: "오류: 사용자가 비어 있습니다"
UpdateUserBlank: "오류: 사용자에 공백이 포함되어 있습니다"
UpdateUserFormat: "오류: 잘못된 사용자 형식 영어, 중국어, 숫자, _만 지원하며 길이는 3~30자입니다."
UpdateUserErr: "오류: 사용자 업데이트 실패 {{ .err }}"
UpdateSuccessful: "업데이트 성공"
UpdateUserResult: "패널 사용자: {{ .name }}"
UpdatePasswordRead: "오류: 패널 비밀번호 정보 읽기 실패 {{ .err }}"
UpdatePasswordNull: "오류: 패널 비밀번호가 비어 있습니다"
UpdateUPasswordBlank: "오류: 패널 비밀번호에 공백이 포함되어 있습니다"
UpdatePasswordFormat: "오류: 패널 비밀번호는 문자, 숫자, 특수문자(@#$%*_,.?)만 지원하며 길이는 8~30자입니다."
UpdateUserResult: "사용자: {{ .name }}"
UpdatePasswordRead: "오류: 사용자 비밀번호 정보 읽기 실패 {{ .err }}"
UpdatePasswordNull: "오류: 사용자 비밀번호가 비어 있습니다"
UpdateUPasswordBlank: "오류: 사용자 비밀번호에 공백이 포함되어 있습니다"
UpdatePasswordFormat: "오류: 사용자 비밀번호는 문자, 숫자, 특수문자(@#$%*_,.?)만 지원하며 길이는 8~30자입니다."
UpdatePasswordLen: "오류: 6자 이상의 비밀번호를 입력하세요"
UpdatePasswordRe: "비밀번호 확인:"
UpdatePasswordErr: "오류: 패널 비밀번호 업데이트 실패 {{ .err }}"
UpdatePasswordErr: "오류: 사용자 비밀번호 업데이트 실패 {{ .err }}"
UpdatePasswordSame: "오류: 두 비밀번호가 일치하지 않습니다. 확인 후 다시 시도하세요"
UpdatePasswordResult: "패널 비밀번호: {{ .name }}"
UpdatePasswordResult: "사용자 비밀번호: {{ .name }}"
UpdatePortFormat: "오류: 입력한 포트 번호는 1~65535 사이여야 합니다"
UpdatePortUsed: "오류: 포트 번호가 이미 사용 중입니다. 확인 후 다시 시도하세요"
UpdatePortErr: "오류: 패널 포트 업데이트 실패 {{ .err }}"
+13 -13
View File
@@ -227,24 +227,24 @@ RestoreStep4: "(4/5) Rollback perkhidmatan 1Panel berjaya"
RestoreStep5: "(5/5) Rollback data 1Panel berjaya"
RestoreSuccessful: "Rollback berjaya. Dikembalikan ke {{ .version }}. Perkhidmatan sedang dimulakan semula..."
UpdateCommands: "Kemas kini maklumat panel"
UpdateUser: "Kemas kini pengguna panel"
UpdatePassword: "Kemas kini kata laluan panel"
UpdateUser: "Kemas kini maklumat pengguna"
UpdatePassword: "Kemas kini kata laluan pengguna"
UpdatePort: "Kemas kini port panel"
UpdateUserNull: "Ralat: Pengguna panel kosong"
UpdateUserBlank: "Ralat: Pengguna panel mengandungi ruang kosong"
UpdateUserFormat: "Ralat: Format pengguna panel tidak sah Hanya menyokong huruf Inggeris, Cina, nombor, dan _, dengan panjang 3-30 aksara"
UpdateUserErr: "Ralat: Gagal mengemas kini pengguna panel, {{ .err }}"
UpdateUserNull: "Ralat: Pengguna kosong"
UpdateUserBlank: "Ralat: Pengguna mengandungi ruang kosong"
UpdateUserFormat: "Ralat: Format pengguna tidak sah Hanya menyokong huruf Inggeris, Cina, nombor, dan _, dengan panjang 3-30 aksara"
UpdateUserErr: "Ralat: Gagal mengemas kini pengguna, {{ .err }}"
UpdateSuccessful: "Kemas kini berjaya"
UpdateUserResult: "Pengguna panel: {{ .name }}"
UpdatePasswordRead: "Ralat: Gagal membaca maklumat kata laluan panel, {{ .err }}"
UpdatePasswordNull: "Ralat: Kata laluan panel kosong"
UpdateUPasswordBlank: "Ralat: Kata laluan panel mengandungi ruang kosong"
UpdatePasswordFormat: "Ralat: Kata laluan panel hanya menyokong huruf, nombor, dan aksara khas (@#$%*_,.?), dengan panjang 8-30 aksara."
UpdateUserResult: "Pengguna: {{ .name }}"
UpdatePasswordRead: "Ralat: Gagal membaca maklumat kata laluan pengguna, {{ .err }}"
UpdatePasswordNull: "Ralat: Kata laluan pengguna kosong"
UpdateUPasswordBlank: "Ralat: Kata laluan pengguna mengandungi ruang kosong"
UpdatePasswordFormat: "Ralat: Kata laluan pengguna hanya menyokong huruf, nombor, dan aksara khas (@#$%*_,.?), dengan panjang 8-30 aksara."
UpdatePasswordLen: "Ralat: Sila masukkan kata laluan lebih panjang daripada 6 aksara"
UpdatePasswordRe: "Sahkan kata laluan:"
UpdatePasswordErr: "Ralat: Gagal mengemas kini kata laluan panel, {{ .err }}"
UpdatePasswordErr: "Ralat: Gagal mengemas kini kata laluan pengguna, {{ .err }}"
UpdatePasswordSame: "Ralat: Kedua-dua kata laluan tidak sepadan, sila semak dan cuba lagi"
UpdatePasswordResult: "Kata laluan panel: {{ .name }}"
UpdatePasswordResult: "Kata laluan pengguna: {{ .name }}"
UpdatePortFormat: "Ralat: Nombor port yang dimasukkan mesti antara 1 hingga 65535"
UpdatePortUsed: "Ralat: Nombor port sudah digunakan, sila semak dan cuba lagi"
UpdatePortErr: "Ralat: Gagal mengemas kini port panel, {{ .err }}"
+13 -13
View File
@@ -232,24 +232,24 @@ RestoreStep4: "(4/5) Rollback do serviço do 1Panel concluído"
RestoreStep5: "(5/5) Rollback dos dados do 1Panel concluído"
RestoreSuccessful: "Rollback concluído. Revertido para {{ .version }}. Reiniciando o serviço..."
UpdateCommands: "Atualizar informações do painel"
UpdateUser: "Atualizar usuário do painel"
UpdatePassword: "Atualizar senha do painel"
UpdateUser: "Atualizar informações do usuário"
UpdatePassword: "Atualizar senha do usuário"
UpdatePort: "Atualizar porta do painel"
UpdateUserNull: "Erro: usuário do painel está vazio"
UpdateUserBlank: "Erro: o usuário do painel contém espaços"
UpdateUserFormat: "Erro: Formato de usuário do painel inválido Apenas suporta inglês, chinês, números e _, comprimento de 3-30."
UpdateUserErr: "Erro: Falha ao atualizar o usuário do painel, {{ .err }}"
UpdateUserNull: "Erro: usuário está vazio"
UpdateUserBlank: "Erro: o usuário contém espaços"
UpdateUserFormat: "Erro: Formato de usuário inválido Apenas suporta inglês, chinês, números e _, comprimento de 3-30."
UpdateUserErr: "Erro: Falha ao atualizar o usuário, {{ .err }}"
UpdateSuccessful: "Atualização bem-sucedida"
UpdateUserResult: "Usuário do painel: {{ .name }}"
UpdatePasswordRead: "Erro: Falha ao ler as informações da senha do painel, {{ .err }}"
UpdatePasswordNull: "Erro: A senha do painel está vazia"
UpdateUPasswordBlank: "Erro: A senha do painel contém espaços"
UpdatePasswordFormat: "Erro: A senha do painel suporta apenas letras, números e caracteres especiais (@#$%*_,.?), com comprimento de 8-30."
UpdateUserResult: "Usuário: {{ .name }}"
UpdatePasswordRead: "Erro: Falha ao ler as informações da senha do usuário, {{ .err }}"
UpdatePasswordNull: "Erro: A senha do usuário está vazia"
UpdateUPasswordBlank: "Erro: A senha do usuário contém espaços"
UpdatePasswordFormat: "Erro: A senha do usuário suporta apenas letras, números e caracteres especiais (@#$%*_,.?), com comprimento de 8-30."
UpdatePasswordLen: "Erro: Por favor, insira uma senha com mais de 6 caracteres"
UpdatePasswordRe: "Confirmar senha:"
UpdatePasswordErr: "Erro: Falha ao atualizar a senha do painel, {{ .err }}"
UpdatePasswordErr: "Erro: Falha ao atualizar a senha do usuário, {{ .err }}"
UpdatePasswordSame: "Erro: As duas senhas não correspondem, por favor, verifique e tente novamente"
UpdatePasswordResult: "Senha do painel: {{ .name }}"
UpdatePasswordResult: "Senha do usuário: {{ .name }}"
UpdatePortFormat: "Erro: O número da porta deve estar entre 1 e 65535"
UpdatePortUsed: "Erro: O número da porta já está em uso, por favor, verifique e tente novamente"
UpdatePortErr: "Erro: Falha ao atualizar a porta do painel, {{ .err }}"
+11 -11
View File
@@ -231,24 +231,24 @@ RestoreStep4: "(4/5) Откат сервиса 1Panel завершён"
RestoreStep5: "(5/5) Откат данных 1Panel завершён"
RestoreSuccessful: "Откат завершён. Возвращено к версии {{ .version }}. Перезапускаем сервис..."
UpdateCommands: "Изменить информацию панели"
UpdateUser: "Изменить пользователя панели"
UpdatePassword: "Изменить пароль панели"
UpdateUser: "Изменить информацию пользователя"
UpdatePassword: "Изменить пароль пользователя"
UpdatePort: "Изменить порт панели"
UpdateUserNull: "Ошибка: введён пользователь панели пуст"
UpdateUserBlank: "Ошибка: введён пользователь панели с пробелами"
UpdateUserFormat: "Ошибка: неверный формат имени пользователя панели Поддерживаются только английские, китайские символы, цифры и _ , длина 3-30 символов"
UpdateUserErr: "Ошибка: не удалось изменить пользователя панели, {{ .err }}"
UpdateUserNull: "Ошибка: введён пустой пользователь"
UpdateUserBlank: "Ошибка: введённый пользователь содержит пробелы"
UpdateUserFormat: "Ошибка: неверный формат имени пользователя Поддерживаются только английские, китайские символы, цифры и _ , длина 3-30 символов"
UpdateUserErr: "Ошибка: не удалось изменить пользователя, {{ .err }}"
UpdateSuccessful: "Успешно изменено"
UpdateUserResult: "Пользователь панели: {{ .name }}"
UpdatePasswordRead: "Ошибка: не удалось прочитать информацию о пароле панели, {{ .err }}"
UpdateUserResult: "Пользователь: {{ .name }}"
UpdatePasswordRead: "Ошибка: не удалось прочитать информацию о пароле пользователя, {{ .err }}"
UpdatePasswordNull: "Ошибка: введён пароль пуст"
UpdateUPasswordBlank: "Ошибка: введён пароль с пробелами"
UpdatePasswordFormat: "Ошибка: пароль панели должен содержать только буквы, цифры и специальные символы (@#$%*_,.?) и иметь длину 8-30 символов."
UpdatePasswordFormat: "Ошибка: пароль пользователя должен содержать только буквы, цифры и специальные символы (@#$%*_,.?) и иметь длину 8-30 символов."
UpdatePasswordLen: "Ошибка: пароль должен быть длиной не менее 6 символов"
UpdatePasswordRe: "Подтверждение пароля:"
UpdatePasswordErr: "Ошибка: не удалось изменить пароль панели, {{ .err }}"
UpdatePasswordErr: "Ошибка: не удалось изменить пароль пользователя, {{ .err }}"
UpdatePasswordSame: "Ошибка: пароли не совпадают, пожалуйста, проверьте и попробуйте снова"
UpdatePasswordResult: "Пароль панели: {{ .name }}"
UpdatePasswordResult: "Пароль пользователя: {{ .name }}"
UpdatePortFormat: "Ошибка: введённый порт должен быть в пределах от 1 до 65535"
UpdatePortUsed: "Ошибка: этот порт уже занят, пожалуйста, проверьте и попробуйте снова"
UpdatePortErr: "Ошибка: не удалось изменить порт панели, {{ .err }}"
+13 -13
View File
@@ -231,24 +231,24 @@ RestoreStep4: "(4/5) 1Panel hizmeti için geri alma tamamlandı"
RestoreStep5: "(5/5) 1Panel verileri için geri alma tamamlandı"
RestoreSuccessful: "Geri alma tamamlandı. {{ .version }} sürümüne dönüldü. Hizmet yeniden başlatılıyor..."
UpdateCommands: "Panel bilgilerini güncelle"
UpdateUser: "Panel kullanıcısını güncelle"
UpdatePassword: "Panel şifresini güncelle"
UpdateUser: "Kullanıcı bilgilerini güncelle"
UpdatePassword: "Kullanıcı şifresini güncelle"
UpdatePort: "Panel portunu güncelle"
UpdateUserNull: "Hata: panel kullanıcısı boş"
UpdateUserBlank: "Hata: panel kullanıcısı boşluk içeriyor"
UpdateUserFormat: "Hata: Geçersiz panel kullanıcı formatı Sadece İngilizce, Çince, sayılar ve _ destekler, uzunluk 3-30"
UpdateUserErr: "Hata: Panel kullanıcısı güncelleme başarısız, {{ .err }}"
UpdateUserNull: "Hata: kullanıcı boş"
UpdateUserBlank: "Hata: kullanıcı boşluk içeriyor"
UpdateUserFormat: "Hata: Geçersiz kullanıcı formatı Sadece İngilizce, Çince, sayılar ve _ destekler, uzunluk 3-30"
UpdateUserErr: "Hata: Kullanıcı güncelleme başarısız, {{ .err }}"
UpdateSuccessful: "Güncelleme başarılı"
UpdateUserResult: "Panel kullanıcısı: {{ .name }}"
UpdatePasswordRead: "Hata: Panel şifre bilgilerini okuma başarısız, {{ .err }}"
UpdatePasswordNull: "Hata: Panel şifresi boş"
UpdateUPasswordBlank: "Hata: Panel şifresi boşluk içeriyor"
UpdatePasswordFormat: "Hata: Panel şifresi yalnızca harf, sayı ve özel karakter (@#$%*_,.?) içerebilir ve uzunluğu 8-30 olmalıdır."
UpdateUserResult: "Kullanıcı: {{ .name }}"
UpdatePasswordRead: "Hata: Kullanıcı şifre bilgilerini okuma başarısız, {{ .err }}"
UpdatePasswordNull: "Hata: Kullanıcı şifresi boş"
UpdateUPasswordBlank: "Hata: Kullanıcı şifresi boşluk içeriyor"
UpdatePasswordFormat: "Hata: Kullanıcı şifresi yalnızca harf, sayı ve özel karakter (@#$%*_,.?) içerebilir ve uzunluğu 8-30 olmalıdır."
UpdatePasswordLen: "Hata: Lütfen 6 karakterden uzun bir şifre girin"
UpdatePasswordRe: "Şifreyi onayla:"
UpdatePasswordErr: "Hata: Panel şifresi güncelleme başarısız, {{ .err }}"
UpdatePasswordErr: "Hata: Kullanıcı şifresi güncelleme başarısız, {{ .err }}"
UpdatePasswordSame: "Hata: İki şifre eşleşmiyor, lütfen kontrol edip tekrar deneyin"
UpdatePasswordResult: "Panel şifresi: {{ .name }}"
UpdatePasswordResult: "Kullanıcı şifresi: {{ .name }}"
UpdatePortFormat: "Hata: Girilen port numarası 1 ile 65535 arasında olmalıdır"
UpdatePortUsed: "Hata: Port numarası zaten kullanımda, lütfen kontrol edip tekrar deneyin"
UpdatePortErr: "Hata: Panel port güncelleme başarısız, {{ .err }}"
+13 -13
View File
@@ -234,24 +234,24 @@ RestoreStep4: "(4/5)1Panel 服務回滾成功"
RestoreStep5: "(5/5)1Panel 資料回滾成功"
RestoreSuccessful: "回滾成功!已回滾到 {{ .version }},正在重新啟動服務,請稍候..."
UpdateCommands: "修改面板資訊"
UpdateUser: "修改面板使用者"
UpdatePassword: "修改面板密碼"
UpdateUser: "修改使用者資訊"
UpdatePassword: "修改使用者密碼"
UpdatePort: "修改面板埠"
UpdateUserNull: "錯誤: 輸入面板使用者為空!"
UpdateUserBlank: "錯誤: 輸入面板使用者中包含空格字元!"
UpdateUserFormat: "錯誤: 輸入面板使用者錯誤!僅支援英文、中文、數字和_,長度3-30"
UpdateUserErr: "錯誤: 面板使用者修改失敗,{{ .err }}"
UpdateUserNull: "錯誤: 輸入使用者為空!"
UpdateUserBlank: "錯誤: 輸入使用者中包含空格字元!"
UpdateUserFormat: "錯誤: 輸入使用者錯誤!僅支援英文、中文、數字和_,長度3-30"
UpdateUserErr: "錯誤: 使用者修改失敗,{{ .err }}"
UpdateSuccessful: "修改成功!"
UpdateUserResult: "面板使用者: {{ .name }}"
UpdatePasswordRead: "錯誤: 面板密碼資訊讀取錯誤,{{ .err }}"
UpdatePasswordNull: "錯誤: 輸入面板密碼為空!"
UpdateUPasswordBlank: "錯誤: 輸入面板密碼中包含空格字元!"
UpdatePasswordFormat: "錯誤: 面板密碼僅支援字母、數字、特殊字元(!@#$%*_,.?),長度 8-30 位!"
UpdateUserResult: "使用者: {{ .name }}"
UpdatePasswordRead: "錯誤: 使用者密碼資訊讀取錯誤,{{ .err }}"
UpdatePasswordNull: "錯誤: 輸入使用者密碼為空!"
UpdateUPasswordBlank: "錯誤: 輸入使用者密碼中包含空格字元!"
UpdatePasswordFormat: "錯誤: 使用者密碼僅支援字母、數字、特殊字元(!@#$%*_,.?),長度 8-30 位!"
UpdatePasswordLen: "錯誤: 請輸入 6 位以上密碼!"
UpdatePasswordRe: "確認密碼: "
UpdatePasswordErr: "錯誤: 面板密碼修改失敗,{{ .err }}"
UpdatePasswordErr: "錯誤: 使用者密碼修改失敗,{{ .err }}"
UpdatePasswordSame: "錯誤: 兩次密碼不符,請檢查後重試。"
UpdatePasswordResult: "面板密碼: {{ .name }}"
UpdatePasswordResult: "使用者密碼: {{ .name }}"
UpdatePortFormat: "錯誤: 輸入的埠號必須在 1 到 65535 之間!"
UpdatePortUsed: "錯誤: 該埠號正被佔用,請檢查後重試。"
UpdatePortErr: "錯誤: 面板埠修改失敗,{{ .err }}"
+14 -13
View File
@@ -87,6 +87,7 @@ ErrNodeBoundDelete: "该许可证已被绑定,不支持删除操作,请检
ErrNodeBoundLimit: "当前免费节点已经达到上限,请检查后重试!"
ErrLicenseFree: "仅当许可证正常绑定到节点后,才能使用其免费节点,请检查后重试!"
ErrLicenseUnbind: "检测到该许可证存在社区版节点,请在 [ 面板设置 - 许可证 ] 中解绑后重试!"
ErrLicenseBindCount: "新许可证免费节点数量小于当前已绑定的社区版节点数量,请检查后重试!"
ErrNoSuchNode: "未能找到该节点信息,请检查后重试!"
ErrNodeUnbind: "检测到该节点未在许可证绑定范围内,请检查后重试!"
ErrNodeBind: "检测到该节点已绑定许可证,请检查后重试!"
@@ -239,24 +240,24 @@ RestoreStep4: "(4/5)1Panel 服务回滚成功"
RestoreStep5: "(5/5)1Panel 数据回滚成功"
RestoreSuccessful: "回滚成功!已回滚到 {{ .version }},正在重启服务,请稍候..."
UpdateCommands: "修改面板信息"
UpdateUser: "修改面板用户"
UpdatePassword: "修改面板密码"
UpdateUser: "修改用户信息"
UpdatePassword: "修改用户密码"
UpdatePort: "修改面板端口"
UpdateUserNull: "错误: 输入面板用户为空!"
UpdateUserBlank: "错误: 输入面板用户中包含空格字符!"
UpdateUserFormat: "错误: 输入面板用户错误!仅支持英文、中文、数字和_,长度3-30"
UpdateUserErr: "错误: 面板用户修改失败,{{ .err }}"
UpdateUserNull: "错误: 输入用户为空!"
UpdateUserBlank: "错误: 输入用户中包含空格字符!"
UpdateUserFormat: "错误: 输入用户错误!仅支持英文、中文、数字和_,长度3-30"
UpdateUserErr: "错误: 用户修改失败,{{ .err }}"
UpdateSuccessful: "修改成功!"
UpdateUserResult: "面板用户: {{ .name }}"
UpdatePasswordRead: "错误: 面板密码信息读取错误,{{ .err }}"
UpdatePasswordNull: "错误: 输入面板密码为空!"
UpdateUPasswordBlank: "错误: 输入面板密码中包含空格字符!"
UpdatePasswordFormat: "错误: 面板密码仅支持字母、数字、特殊字符(!@#$%*_,.?),长度 8-30 位!"
UpdateUserResult: "用户: {{ .name }}"
UpdatePasswordRead: "错误: 用户密码信息读取错误,{{ .err }}"
UpdatePasswordNull: "错误: 输入用户密码为空!"
UpdateUPasswordBlank: "错误: 输入用户密码中包含空格字符!"
UpdatePasswordFormat: "错误: 用户密码仅支持字母、数字、特殊字符(!@#$%*_,.?),长度 8-30 位!"
UpdatePasswordLen: "错误: 请输入 6 位以上密码!"
UpdatePasswordRe: "确认密码: "
UpdatePasswordErr: "错误: 面板密码修改失败,{{ .err }}"
UpdatePasswordErr: "错误: 用户密码修改失败,{{ .err }}"
UpdatePasswordSame: "错误: 两次密码不匹配,请检查后重试!"
UpdatePasswordResult: "面板密码: {{ .name }}"
UpdatePasswordResult: "用户密码: {{ .name }}"
UpdatePortFormat: "错误: 输入的端口号必须在 1 到 65535 之间!"
UpdatePortUsed: "错误: 该端口号正被占用,请检查后重试!"
UpdatePortErr: "错误: 面板端口修改失败,{{ .err }}"
+32 -171
View File
@@ -1,37 +1,17 @@
<template>
<li
ref="itemRef"
v-bind="itemAttrs"
data-el-collection-item
:aria-disabled="computedDisabled"
:class="itemClass"
:style="attrs.style"
:tabindex="tabIndex"
:role="role"
@click="handleClick"
@focus="handleFocus"
@keydown.self="handleKeydown"
@mousedown="handleMousedown"
@pointermove="handlePointerMove"
@pointerleave="handlePointerLeave"
>
<el-icon v-if="icon || $slots.icon">
<slot name="icon">
<component :is="icon" />
</slot>
</el-icon>
<slot />
</li>
<span class="fu-dropdown-item">
<el-dropdown-item
v-bind="$attrs"
:disabled="computedDisabled"
:class="{ 'fu-dropdown-item--permission-disabled': computedDisabled }"
>
<slot />
</el-dropdown-item>
</span>
</template>
<script setup lang="ts">
import { DROPDOWN_INJECTION_KEY, EVENT_CODE } from 'element-plus';
import { COLLECTION_ITEM_SIGN } from 'element-plus/es/components/collection/index.mjs';
import {
ROVING_FOCUS_COLLECTION_INJECTION_KEY,
ROVING_FOCUS_GROUP_INJECTION_KEY,
} from 'element-plus/es/components/roving-focus-group/index.mjs';
import { computed, getCurrentInstance, inject, onBeforeUnmount, onMounted, ref, useAttrs } from 'vue';
import { computed, ref } from 'vue';
defineOptions({
name: 'FuDropdownItem',
@@ -39,154 +19,16 @@ defineOptions({
});
const props = defineProps({
command: {
type: [Object, String, Number],
default: () => ({}),
},
disabled: {
type: Boolean,
default: false,
},
divided: {
type: Boolean,
default: false,
},
textValue: String,
icon: {
type: [String, Object, Function],
},
});
const emit = defineEmits(['click', 'pointermove', 'pointerleave']);
const attrs = useAttrs();
const itemRef = ref<HTMLElement>();
const permissionDisabled = ref(false);
const instance = getCurrentInstance();
const itemId = `fu-dropdown-item-${instance?.uid ?? Math.random().toString(36).slice(2)}`;
const dropdownContext = inject<any>(DROPDOWN_INJECTION_KEY, undefined);
const collectionContext = inject<any>(ROVING_FOCUS_COLLECTION_INJECTION_KEY, undefined);
const rovingFocusContext = inject<any>(ROVING_FOCUS_GROUP_INJECTION_KEY, undefined);
const computedDisabled = computed(() => props.disabled || permissionDisabled.value);
const itemAttrs = computed(() => {
return Object.fromEntries(Object.entries(attrs).filter(([key]) => key !== 'class' && key !== 'style'));
});
const itemClass = computed(() => [
attrs.class,
'el-dropdown-menu__item',
{
'el-dropdown-menu__item--divided': props.divided,
'is-disabled': computedDisabled.value,
'fu-dropdown-item--permission-disabled': computedDisabled.value,
},
]);
const tabIndex = computed(() => (rovingFocusContext?.currentTabbedId?.value === itemId ? 0 : -1));
const role = computed(() => {
const menuRole = dropdownContext?.role?.value;
if (menuRole === 'menu') {
return 'menuitem';
}
if (menuRole === 'navigation') {
return 'link';
}
return 'button';
});
const handleMousedown = (event: MouseEvent) => {
if (computedDisabled.value) {
event.preventDefault();
return;
}
rovingFocusContext?.onItemFocus?.(itemId);
};
const handleFocus = () => {
rovingFocusContext?.onItemFocus?.(itemId);
};
const handleKeydown = (event: KeyboardEvent) => {
if ([EVENT_CODE.enter, EVENT_CODE.numpadEnter, EVENT_CODE.space].includes(event.code)) {
event.preventDefault();
event.stopImmediatePropagation();
handleClick(event);
return;
}
if (event.code === EVENT_CODE.tab && event.shiftKey) {
rovingFocusContext?.onItemShiftTab?.();
return;
}
rovingFocusContext?.onKeydown?.(event);
};
const handleClick = (event: Event) => {
if (computedDisabled.value) {
event.stopImmediatePropagation();
return;
}
emit('click', event);
if (event.type !== 'keydown' && event.defaultPrevented) {
return;
}
if (dropdownContext?.hideOnClick?.value) {
dropdownContext.handleClick?.();
}
dropdownContext?.commandHandler?.(props.command, instance, event);
};
const handlePointerMove = (event: PointerEvent) => {
emit('pointermove', event);
if (event.pointerType !== 'mouse') {
return;
}
if (computedDisabled.value) {
dropdownContext?.onItemLeave?.(event);
return;
}
const target = event.currentTarget as HTMLElement;
if (target === document.activeElement || target.contains(document.activeElement)) {
return;
}
dropdownContext?.onItemEnter?.(event);
if (!event.defaultPrevented) {
target.focus({ preventScroll: true });
}
};
const handlePointerLeave = (event: PointerEvent) => {
emit('pointerleave', event);
if (event.pointerType === 'mouse') {
dropdownContext?.onItemLeave?.(event);
}
};
onMounted(() => {
if (!itemRef.value) {
return;
}
collectionContext?.itemMap?.set(itemRef.value, {
ref: itemRef.value,
...attrs,
[COLLECTION_ITEM_SIGN]: '',
});
});
onBeforeUnmount(() => {
if (itemRef.value) {
collectionContext?.itemMap?.delete(itemRef.value);
}
});
defineExpose({
setPermissionDisabled: (disabled: boolean) => {
permissionDisabled.value = disabled;
@@ -195,8 +37,27 @@ defineExpose({
</script>
<style scoped>
.fu-dropdown-item--permission-disabled {
opacity: 0.45;
cursor: not-allowed;
.fu-dropdown-item {
display: contents;
}
:deep(.fu-dropdown-item--permission-disabled),
.fu-dropdown-item.is-disabled :deep(.el-dropdown-menu__item),
.fu-dropdown-item[data-permission-disabled='true'] :deep(.el-dropdown-menu__item) {
color: var(--el-text-color-disabled) !important;
opacity: 0.55;
filter: grayscale(1);
cursor: not-allowed !important;
background-color: transparent !important;
}
:deep(.fu-dropdown-item--permission-disabled:hover),
:deep(.fu-dropdown-item--permission-disabled:focus),
.fu-dropdown-item.is-disabled :deep(.el-dropdown-menu__item:hover),
.fu-dropdown-item.is-disabled :deep(.el-dropdown-menu__item:focus),
.fu-dropdown-item[data-permission-disabled='true'] :deep(.el-dropdown-menu__item:hover),
.fu-dropdown-item[data-permission-disabled='true'] :deep(.el-dropdown-menu__item:focus) {
color: var(--el-text-color-disabled) !important;
background-color: transparent !important;
}
</style>
+57 -29
View File
@@ -1,34 +1,41 @@
<template>
<el-tooltip v-if="msg && msg != ''" effect="dark" placement="bottom">
<template #content>
<div class="content">{{ msg }}</div>
<span
class="status-wrapper"
:class="{ 'is-disabled': isDisabled }"
:aria-disabled="isDisabled"
@click.capture="handlePermissionClick"
>
<el-tooltip v-if="msg && msg != ''" effect="dark" placement="bottom">
<template #content>
<div class="content">{{ msg }}</div>
</template>
<el-tag size="small" :type="getType(statusItem)" round effect="light">
<span class="flx-align-center">
<span v-if="statusItem != ''">{{ $t('commons.status.' + statusItem) }}</span>
<el-icon v-if="loadingIcon(statusItem)" class="is-loading">
<Loading />
</el-icon>
</span>
</el-tag>
</el-tooltip>
<template v-else>
<el-tag size="small" :type="getType(statusItem)" round effect="light" v-if="!operate">
<span class="flx-align-center">
<span v-if="statusItem != ''">{{ $t('commons.status.' + statusItem) }}</span>
<el-icon v-if="loadingIcon(statusItem)" class="is-loading">
<Loading />
</el-icon>
</span>
</el-tag>
<el-button size="small" v-else :type="getType(statusItem)" plain round :disabled="isDisabled">
<span v-if="statusItem != ''">{{ $t('commons.status.' + statusItem) }}</span>
<el-icon v-if="loadingIcon(statusItem)" class="is-loading">
<Loading />
</el-icon>
<svg-icon iconName="p-stop" className="status-icon" v-if="stopIcon(statusItem)"></svg-icon>
<svg-icon iconName="p-start" className="status-icon" v-if="runningIcon(statusItem)"></svg-icon>
</el-button>
</template>
<el-tag size="small" :type="getType(statusItem)" round effect="light">
<span class="flx-align-center">
<span v-if="statusItem != ''">{{ $t('commons.status.' + statusItem) }}</span>
<el-icon v-if="loadingIcon(statusItem)" class="is-loading">
<Loading />
</el-icon>
</span>
</el-tag>
</el-tooltip>
<span v-else>
<el-tag size="small" :type="getType(statusItem)" round effect="light" v-if="!operate">
<span class="flx-align-center">
<span v-if="statusItem != ''">{{ $t('commons.status.' + statusItem) }}</span>
<el-icon v-if="loadingIcon(statusItem)" class="is-loading">
<Loading />
</el-icon>
</span>
</el-tag>
<el-button size="small" v-else :type="getType(statusItem)" plain round :disabled="isDisabled">
<span v-if="statusItem != ''">{{ $t('commons.status.' + statusItem) }}</span>
<el-icon v-if="loadingIcon(statusItem)" class="is-loading">
<Loading />
</el-icon>
<svg-icon iconName="p-stop" className="status-icon" v-if="stopIcon(statusItem)"></svg-icon>
<svg-icon iconName="p-start" className="status-icon" v-if="runningIcon(statusItem)"></svg-icon>
</el-button>
</span>
</template>
@@ -63,6 +70,14 @@ const isDisabled = computed(() => {
return !!props.disabled || permissionDisabled.value;
});
const handlePermissionClick = (event: MouseEvent) => {
if (!isDisabled.value) {
return;
}
event.preventDefault();
event.stopImmediatePropagation();
};
const getType = (status: string) => {
if (status.includes('error') || status.includes('err')) {
return 'danger';
@@ -137,6 +152,19 @@ const runningIcon = (status: string): boolean => {
</script>
<style lang="scss" scoped>
.status-wrapper {
display: inline-flex;
}
.status-wrapper.is-disabled {
cursor: not-allowed;
}
.status-wrapper.is-disabled :deep(.el-tag) {
opacity: 0.55;
filter: grayscale(1);
}
.content {
width: 300px;
word-break: break-all;
+2
View File
@@ -4467,6 +4467,8 @@ const message = {
'Related permissions are selected automatically when dependencies exist; after manual removal, some features may show "Current user has no permission".',
allViewPermissionHelper: 'Grants all view permissions for AI Gateway.',
apiKeyViewPermissionHelper: 'Only allows viewing AI Gateway API Keys.',
masterOnlyPermission: 'Master Node Permission',
masterOnlyPermissionHelper: 'This permission only takes effect on the master node.',
view: 'View',
manage: 'Manage',
},
+2
View File
@@ -4527,6 +4527,8 @@ const message = {
'Si hay dependencias, los permisos relacionados se seleccionarán automáticamente; tras quitarlos manualmente, algunas funciones pueden mostrar "El usuario actual no tiene permiso".',
allViewPermissionHelper: 'Concede todos los permisos de visualización para AI Gateway.',
apiKeyViewPermissionHelper: 'Solo permite ver las API Keys de AI Gateway.',
masterOnlyPermission: 'Permiso del nodo principal',
masterOnlyPermissionHelper: 'Este permiso solo tiene efecto en el nodo principal.',
view: 'Ver',
manage: 'Gestionar',
},
+4 -1
View File
@@ -2941,7 +2941,8 @@ const message = {
cluster: '商用版にアップグレードすると、MySQL/Postgres/Redis のプライマリ/レプリカ構成を管理できます。',
'model-downloader':
'商用版にアップグレードすると、HuggingFace、ModelScope、または互換ミラーからローカルモデルファイルを検索、ダウンロード、管理できます。モデルディレクトリとダウンロードタスクを一元管理できます。',
exceptionalHelper: 'ライセンス同期検証が異常です。手動で同期して商用版機能が正常に動作していることを確認してください。詳細: ',
exceptionalHelper:
'ライセンス同期検証が異常です。手動で同期して商用版機能が正常に動作していることを確認してください。詳細: ',
tamperHelper: '操作失敗。ファイル/フォルダの改ざん保護を確認してください。',
},
clean: {
@@ -4506,6 +4507,8 @@ const message = {
'依存関係がある場合、関連権限は自動選択されます。手動で解除すると、一部機能で「現在のユーザーには権限がありません」と表示される場合があります。',
allViewPermissionHelper: 'AI ゲートウェイのすべての表示権限を付与します。',
apiKeyViewPermissionHelper: 'AI ゲートウェイの API Key のみ表示できます。',
masterOnlyPermission: 'マスターノード権限',
masterOnlyPermissionHelper: 'この権限はマスターノードでのみ有効です。',
view: '表示',
manage: '管理',
},
+2
View File
@@ -4418,6 +4418,8 @@ const message = {
'의존 관계가 있으면 관련 권한이 자동 선택되며, 수동으로 해제하면 일부 기능에서 "현재 사용자에게 권한이 없습니다"가 표시될 수 있습니다.',
allViewPermissionHelper: 'AI 게이트웨이의 모든 보기 권한을 부여합니다.',
apiKeyViewPermissionHelper: 'AI 게이트웨이 API Key만 볼 수 있습니다.',
masterOnlyPermission: '마스터 노드 권한',
masterOnlyPermissionHelper: '이 권한은 마스터 노드에서만 적용됩니다.',
view: '보기',
manage: '관리',
},
+2
View File
@@ -4562,6 +4562,8 @@ const message = {
'Kebenaran berkaitan akan dipilih automatik jika ada kebergantungan; selepas dialih keluar manual, sesetengah ciri mungkin memaparkan "Pengguna semasa tiada kebenaran".',
allViewPermissionHelper: 'Memberikan semua kebenaran paparan untuk AI Gateway.',
apiKeyViewPermissionHelper: 'Hanya membenarkan paparan API Key AI Gateway.',
masterOnlyPermission: 'Kebenaran nod utama',
masterOnlyPermissionHelper: 'Kebenaran ini hanya berkuat kuasa pada nod utama.',
view: 'Lihat',
manage: 'Urus',
},
+2
View File
@@ -4702,6 +4702,8 @@ const message = {
'Permissões relacionadas serão selecionadas automaticamente quando houver dependências; após removê-las manualmente, alguns recursos podem mostrar "O usuário atual não tem permissão".',
allViewPermissionHelper: 'Concede todas as permissões de visualização do AI Gateway.',
apiKeyViewPermissionHelper: 'Permite visualizar apenas as API Keys do AI Gateway.',
masterOnlyPermission: 'Permissão do nó principal',
masterOnlyPermissionHelper: 'Esta permissão só tem efeito no nó principal.',
view: 'Visualizar',
manage: 'Gerenciar',
},
+2
View File
@@ -4554,6 +4554,8 @@ const message = {
'При наличии зависимостей связанные права выбираются автоматически; после ручного снятия некоторые функции могут показать "У текущего пользователя нет разрешения".',
allViewPermissionHelper: 'Предоставляет все права просмотра для AI Gateway.',
apiKeyViewPermissionHelper: 'Разрешает просматривать только API Key AI Gateway.',
masterOnlyPermission: 'Права главного узла',
masterOnlyPermissionHelper: 'Это право действует только на главном узле.',
view: 'Просмотр',
manage: 'Управление',
},
+2
View File
@@ -4554,6 +4554,8 @@ const message = {
'Bağımlılık varsa ilişkili izinler otomatik seçilir; manuel kaldırıldıktan sonra bazı özelliklerde "Geçerli kullanıcının izni yok" gösterilebilir.',
allViewPermissionHelper: 'AI Gateway için tüm görüntüleme izinlerini verir.',
apiKeyViewPermissionHelper: 'Yalnızca AI Gateway API Key görüntülemeye izin verir.',
masterOnlyPermission: 'Ana düğüm izni',
masterOnlyPermissionHelper: 'Bu izin yalnızca ana düğümde geçerlidir.',
view: 'Görüntüle',
manage: 'Yönet',
},
+2
View File
@@ -4182,6 +4182,8 @@ const message = {
permissionLinkageTip: '存在依賴時將自動勾選關聯權限,手動取消後部分功能可能提示「目前使用者無權限」。',
allViewPermissionHelper: '擁有 AI 閘道的所有檢視權限。',
apiKeyViewPermissionHelper: '僅能檢視 AI 閘道 API Key。',
masterOnlyPermission: '主節點權限',
masterOnlyPermissionHelper: '該權限僅在主節點生效。',
view: '檢視',
manage: '管理',
},
+2
View File
@@ -4770,6 +4770,8 @@ const message = {
permissionLinkageTip: '存在依赖时将自动勾选关联权限,手动取消后部分功能可能提示“当前用户无权限”。',
allViewPermissionHelper: '拥有 AI 网关的所有查看权限。',
apiKeyViewPermissionHelper: '仅能查看 AI 网关 API Key。',
masterOnlyPermission: '主节点权限',
masterOnlyPermissionHelper: '该权限仅在主节点生效。',
view: '查看',
manage: '管理',
},
+14 -5
View File
@@ -4,7 +4,7 @@ import piniaPersistConfig from '@/config/pinia-persist';
import { GlobalState } from '../interface';
import { DeviceType } from '@/enums/app';
import i18n, { setActiveLocale } from '@/lang';
import { toManageCode } from '@/utils/permission-codes';
import { isMasterOnlyPermissionCode, toManageCode } from '@/utils/permission-codes';
const CN_DOCS_URL = 'https://1panel.cn/docs/v2';
const INTL_DOCS_URL = 'https://docs.1panel.pro/v2';
@@ -121,18 +121,27 @@ const GlobalStore = defineStore('GlobalState', {
this.isAdmin = false;
},
hasPermission(permission: string) {
if (this.isAdmin) {
return true;
}
const normalizedPermission = permission.trim();
if (!normalizedPermission) {
return false;
}
if (!this.isMaster && isMasterOnlyPermissionCode(normalizedPermission)) {
return false;
}
if (this.isAdmin) {
return true;
}
if (this.permissions.includes(normalizedPermission)) {
return true;
}
const managePermission = toManageCode(normalizedPermission);
return managePermission ? this.permissions.includes(managePermission) : false;
if (!managePermission) {
return false;
}
if (!this.isMaster && isMasterOnlyPermissionCode(managePermission)) {
return false;
}
return this.permissions.includes(managePermission);
},
async updateLanguage(language: string) {
const activeLocale = await setActiveLocale(language);
+16
View File
@@ -1,3 +1,15 @@
const masterOnlyPermissionCodes = new Set([
'ai_proxy_view',
'ai_proxy_manage',
'ai_proxy_key_view',
'ai_benchmark_view',
'ai_benchmark_manage',
'ai_skills_hub_view',
'ai_skills_hub_manage',
'xpack_ops_report_view',
'xpack_ops_report_manage',
]);
export const toManageCode = (permission: string): string => {
if (!permission) {
return '';
@@ -11,3 +23,7 @@ export const normalizeToManageCode = (permission: string): string => {
}
return toManageCode(permission) || permission;
};
export const isMasterOnlyPermissionCode = (permission: string): boolean => {
return masterOnlyPermissionCodes.has(permission);
};
+1 -4
View File
@@ -48,13 +48,10 @@ export const toPermissionList = (value: PermissionBindingValue) => {
const hasPermissionAccessByMode = (mode: PermissionMode, value?: PermissionBindingValue) => {
const globalStore = GlobalStore();
if (globalStore.isAdmin || globalStore.isNodeAdmin) {
return true;
}
const permissions = toPermissionList(value);
const normalizedPermissions = mode === 'manage' ? permissions.map(toManagePermission).filter(Boolean) : permissions;
if (normalizedPermissions.length === 0) {
return false;
return globalStore.isAdmin || globalStore.isNodeAdmin;
}
return normalizedPermissions.some((permission) => globalStore.hasPermission(permission));
};
@@ -20,27 +20,55 @@
<div :class="licenseFormClass">
<div v-loading="loading" class="w-full h-full flex items-center justify-center px-8">
<div class="w-full flex-grow flex flex-col login-form">
<div class="text-2xl font-medium text-gray-900">{{ $t('license.importLicense') }}</div>
<div class="license-upload-section">
<div class="license-section-title">{{ $t('license.importLicense') }}</div>
<el-upload
action="#"
:auto-upload="false"
ref="uploadRef"
drag
:limit="1"
:on-change="fileOnChange"
:on-exceed="handleExceed"
v-model:file-list="uploaderFiles"
>
<el-icon class="el-icon--upload"><upload-filled /></el-icon>
<div class="el-upload__text">
{{ $t('license.importHelper') }}
<el-upload
action="#"
:auto-upload="false"
ref="uploadRef"
drag
:limit="1"
:on-change="fileOnChange"
:on-exceed="handleExceed"
v-model:file-list="uploaderFiles"
>
<el-icon class="el-icon--upload"><upload-filled /></el-icon>
<div class="el-upload__text">
{{ $t('license.importHelper') }}
</div>
</el-upload>
</div>
<div class="license-device-section">
<div class="license-device-header">
<div class="license-helper-title">
{{ $t('license.deviceID') }}
</div>
<span class="input-help license-helper-desc">
{{ $t('license.licenseRequiredShortTip') }}
</span>
</div>
</el-upload>
<div class="license-helper" @click="copyDeviceID">
<div class="license-tip-text">{{ $t('license.licenseRequiredShortTip') }}</div>
<el-button class="copy-tip" icon="DocumentCopy" link type="primary" />
<el-input
v-model="licenseInfo.deviceID"
readonly
@focus="blurDeviceIDInput"
@mousedown.prevent
>
{{ licenseInfo.deviceID }}
<template #append>
<el-button
class="copy-tip"
@click="copyDeviceID"
icon="DocumentCopy"
link
type="primary"
>
{{ $t('commons.button.copy') }}
</el-button>
</template>
</el-input>
</div>
<el-button
@@ -247,6 +275,10 @@ const copyDeviceID = () => {
copyText(licenseInfo.deviceID);
};
const blurDeviceIDInput = (event: FocusEvent) => {
(event.target as HTMLInputElement).blur();
};
const submit = async () => {
if (uploaderFiles.value.length !== 1) {
return;
@@ -300,9 +332,28 @@ onUnmounted(() => {
.login-form {
max-width: 560px;
gap: 14px;
gap: 16px;
transform: translateY(-8px);
font-size: 13px;
.license-upload-section,
.license-device-section {
display: flex;
min-width: 0;
flex-direction: column;
}
.license-upload-section {
gap: 10px;
}
.license-section-title {
color: var(--el-text-color-primary);
font-size: 24px;
font-weight: 500;
line-height: 32px;
}
.login-button {
background-color: var(--login-btn-link-color, #005eeb);
border-color: var(--login-btn-link-color, #005eeb);
@@ -315,32 +366,50 @@ onUnmounted(() => {
}
}
.license-helper {
display: flex;
align-items: center;
justify-content: space-between;
gap: 12px;
padding: 9px 12px;
border: 1px dashed var(--el-border-color);
border-radius: 4px;
background-color: #ffffff;
color: var(--el-text-color-secondary);
cursor: pointer;
.license-device-section {
gap: 8px;
min-width: 0;
font-size: 13px;
line-height: 20px;
&:hover {
border-color: var(--login-btn-link-color, #005eeb);
.license-device-header {
display: flex;
flex-direction: column;
gap: 2px;
}
}
.license-tip-text {
flex: 1;
min-width: 0;
.license-helper-title {
color: var(--el-text-color-primary);
font-size: 14px;
font-weight: 500;
line-height: 22px;
}
.license-helper-desc {
display: block;
margin: 0;
}
:deep(.el-input) {
min-width: 0;
}
:deep(.el-input__wrapper) {
min-width: 0;
border: 1px dashed var(--el-border-color);
box-shadow: none;
}
:deep(.el-input__inner) {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
}
.copy-tip {
flex-shrink: 0;
width: 80px;
height: 20px;
padding: 0;
color: var(--login-btn-link-color, #005eeb);
@@ -357,12 +426,16 @@ onUnmounted(() => {
}
:deep(.el-upload-dragger) {
padding: 34px 12px;
padding: 18px 12px;
}
:deep(.el-upload) {
width: 100%;
}
:deep(.el-icon--upload) {
margin-bottom: 8px;
font-size: 42px;
margin-bottom: 4px;
font-size: 30px;
}
:deep(.el-upload__text) {
+12 -10
View File
@@ -5,13 +5,13 @@
<el-radio-button class="router_card_button" size="large" value="terminal">
{{ $t('menu.terminal', 2) }}
</el-radio-button>
<el-radio-button class="router_card_button" size="large" value="host">
<el-radio-button v-if="isAdmin" class="router_card_button" size="large" value="host">
{{ $t('terminal.host', 2) }}
</el-radio-button>
<el-radio-button class="router_card_button" size="large" value="command">
{{ $t('terminal.quickCommand', 2) }}
</el-radio-button>
<el-radio-button class="router_card_button" size="large" value="setting">
<el-radio-button v-if="isAdmin" class="router_card_button" size="large" value="setting">
{{ $t('container.setting') }}
</el-radio-button>
</el-radio-group>
@@ -20,13 +20,13 @@
<div v-show="activeNames === 'terminal'">
<TerminalTab ref="terminalTabRef" />
</div>
<div v-if="activeNames === 'host'">
<div v-if="isAdmin && activeNames === 'host'">
<HostTab ref="hostTabRef" />
</div>
<div v-if="activeNames === 'command'">
<CommandTab ref="commandTabRef" />
</div>
<div v-if="activeNames === 'setting'">
<div v-if="isAdmin && activeNames === 'setting'">
<SettingTab ref="settingTabRef" />
</div>
</div>
@@ -40,8 +40,10 @@ import SettingTab from '@/views/terminal/setting/index.vue';
import { onMounted, onUnmounted, ref } from 'vue';
import { getTerminalInfo } from '@/api/modules/setting';
import { TerminalStore } from '@/store';
import { useGlobalStore } from '@/composables/useGlobalStore';
const terminalStore = TerminalStore();
const { isAdmin } = useGlobalStore();
const activeNames = ref<string>('terminal');
const hostTabRef = ref();
const commandTabRef = ref();
@@ -49,17 +51,17 @@ const terminalTabRef = ref();
const settingTabRef = ref();
const handleChange = (tab: any) => {
if (tab === 'host') {
hostTabRef.value!.acceptParams();
if (tab === 'host' && isAdmin.value) {
hostTabRef.value?.acceptParams();
}
if (tab === 'command') {
commandTabRef.value!.acceptParams();
commandTabRef.value?.acceptParams();
}
if (tab === 'terminal') {
terminalTabRef.value!.acceptParams();
terminalTabRef.value?.acceptParams();
}
if (tab === 'setting') {
settingTabRef.value!.acceptParams();
if (tab === 'setting' && isAdmin.value) {
settingTabRef.value?.acceptParams();
}
};
+13 -9
View File
@@ -302,15 +302,7 @@ const acceptParams = async () => {
hostTree.value = [];
}
if (terminalTabs.value.length === 0) {
if (isNodeAdmin.value) {
onNewLocal();
} else {
await getAgentSettingInfo().then((res) => {
if (res.data?.localSSHConnShow === 'Enable') {
onNewLocal();
}
});
}
await openDefaultLocalConn();
}
timer = setInterval(() => {
syncTerminal();
@@ -322,6 +314,18 @@ const acceptParams = async () => {
}
};
const openDefaultLocalConn = async () => {
if (isNodeAdmin.value) {
onNewLocal();
return;
}
await getAgentSettingInfo().then((res) => {
if (res.data?.localSSHConnShow === 'Enable') {
onNewLocal();
}
});
};
const cleanTimer = () => {
clearInterval(Number(timer));
timer = null;