mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-11-17 02:25:02 +03:00
Compare commits
2 Commits
cd46730bb9
..
v3.3.1
| Author | SHA1 | Date | |
|---|---|---|---|
| b5ef412b8d | |||
| 41cb0b8ae7 |
Generated
+2
-2
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "3x-ui-frontend",
|
||||
"version": "0.3.0",
|
||||
"version": "0.3.1",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "3x-ui-frontend",
|
||||
"version": "0.3.0",
|
||||
"version": "0.3.1",
|
||||
"dependencies": {
|
||||
"@ant-design/icons": "^6.2.5",
|
||||
"@codemirror/lang-json": "^6.0.2",
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "3x-ui-frontend",
|
||||
"private": true,
|
||||
"version": "0.3.0",
|
||||
"version": "0.3.1",
|
||||
"type": "module",
|
||||
"description": "3x-ui panel frontend (React 19 + Ant Design 6 + Vite 8).",
|
||||
"engines": {
|
||||
@@ -73,4 +73,4 @@
|
||||
"core-js-pure": false,
|
||||
"tree-sitter-json": false
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,12 +1,9 @@
|
||||
/**
|
||||
* Display label for an inbound: `tag (remark)` when a distinct remark exists,
|
||||
* otherwise just the tag. Falls back to the remark when no tag is set, and to an
|
||||
* empty string when neither is present.
|
||||
* Display label for an inbound: the remark when one is set, otherwise the
|
||||
* inbound tag. Falls back to an empty string when neither is present.
|
||||
*/
|
||||
export function formatInboundLabel(tag?: string, remark?: string): string {
|
||||
const tagText = (tag || '').trim();
|
||||
const remarkText = (remark || '').trim();
|
||||
if (!tagText) return remarkText;
|
||||
if (!remarkText || remarkText === tagText) return tagText;
|
||||
return `${tagText} (${remarkText})`;
|
||||
if (remarkText) return remarkText;
|
||||
return (tag || '').trim();
|
||||
}
|
||||
|
||||
@@ -1 +1 @@
|
||||
3.3.0
|
||||
3.3.1
|
||||
@@ -418,7 +418,7 @@ func GetApiToken(getApiToken bool) {
|
||||
if len(tokens) > 0 {
|
||||
fmt.Printf("There are %d API token(s) configured. Existing tokens cannot be retrieved in plaintext because only hashes are stored.\n", len(tokens))
|
||||
fmt.Println("If you have lost your token, you can manage and generate new tokens through the Panel UI (Settings -> API Tokens).")
|
||||
|
||||
|
||||
// Create a new fallback token so the CLI is still useful without the UI
|
||||
fallbackName := fmt.Sprintf("cli-fallback-%d", time.Now().Unix())
|
||||
created, err := apiTokenService.Create(fallbackName)
|
||||
|
||||
Reference in New Issue
Block a user