Merge pull request #105 from xunxun1982/xxdev

fix: 修复动态权重浮动提示显示不全的问题

Author: xunxun1982

internal/channel/codex_channel_test.go

@@ -194,39 +194,39 @@ func TestForceStreamRequest(t *testing.T) {
 	t.Parallel()
 
 	tests := []struct {
-		name                 string
-		inputBody            string
-		expectedModified     bool
-		expectedStreamValue  bool
-		shouldContainStream  bool
+		name                string
+		inputBody           string
+		expectedModified    bool
+		expectedStreamValue bool
+		shouldContainStream bool
 	}{
 		{
-			name:                 "Non-streaming request becomes streaming",
-			inputBody:            `{"model": "gpt-5.2-codex", "input": "test"}`,
-			expectedModified:     true,
-			expectedStreamValue:  true,
-			shouldContainStream:  true,
+			name:                "Non-streaming request becomes streaming",
+			inputBody:           `{"model": "gpt-5.2-codex", "input": "test"}`,
+			expectedModified:    true,
+			expectedStreamValue: true,
+			shouldContainStream: true,
 		},
 		{
-			name:                 "Already streaming request unchanged",
-			inputBody:            `{"model": "gpt-5.2-codex", "stream": true}`,
-			expectedModified:     false,
-			expectedStreamValue:  true,
-			shouldContainStream:  true,
+			name:                "Already streaming request unchanged",
+			inputBody:           `{"model": "gpt-5.2-codex", "stream": true}`,
+			expectedModified:    false,
+			expectedStreamValue: true,
+			shouldContainStream: true,
 		},
 		{
-			name:                 "Empty body unchanged",
-			inputBody:            ``,
-			expectedModified:     false,
-			expectedStreamValue:  false,
-			shouldContainStream:  false,
+			name:                "Empty body unchanged",
+			inputBody:           ``,
+			expectedModified:    false,
+			expectedStreamValue: false,
+			shouldContainStream: false,
 		},
 		{
-			name:                 "Invalid JSON unchanged",
-			inputBody:            `{invalid}`,
-			expectedModified:     false,
-			expectedStreamValue:  false,
-			shouldContainStream:  false,
+			name:                "Invalid JSON unchanged",
+			inputBody:           `{invalid}`,
+			expectedModified:    false,
+			expectedStreamValue: false,
+			shouldContainStream: false,
 		},
 	}
 

internal/handler/group_import_export_handler.go

@@ -49,11 +49,11 @@ type GroupExportInfo struct {
 	ParamOverrides       map[string]any            `json:"param_overrides"`
 	Config               map[string]any            `json:"config"`
 	HeaderRules          []models.HeaderRule       `json:"header_rules"`
-	ModelMapping         string                    `json:"model_mapping,omitempty"`          // Deprecated: for backward compatibility
-	ModelRedirectRules   map[string]string         `json:"model_redirect_rules,omitempty"`   // V1 rules (one-to-one)
+	ModelMapping         string                    `json:"model_mapping,omitempty"`           // Deprecated: for backward compatibility
+	ModelRedirectRules   map[string]string         `json:"model_redirect_rules,omitempty"`    // V1 rules (one-to-one)
 	ModelRedirectRulesV2 json.RawMessage           `json:"model_redirect_rules_v2,omitempty"` // V2 rules (one-to-many)
-	ModelRedirectStrict  bool                      `json:"model_redirect_strict,omitempty"`  // Strict mode
-	PathRedirects        []models.PathRedirectRule `json:"path_redirects,omitempty"`         // Path redirect rules
+	ModelRedirectStrict  bool                      `json:"model_redirect_strict,omitempty"`   // Strict mode
+	PathRedirects        []models.PathRedirectRule `json:"path_redirects,omitempty"`          // Path redirect rules
 	ProxyKeys            string                    `json:"proxy_keys"`
 	Sort                 int                       `json:"sort"`
 }

internal/handler/task_handler.go

@@ -30,10 +30,10 @@ var (
 // get returns cached status if valid, otherwise returns nil
 // Returns a copy to prevent callers from mutating cached data
 // Note: Shallow copy is safe because:
-// 1. Result field stores value-only structs (KeyImportResult, KeyDeleteResult, ManualValidationResult)
-//    All these types contain only primitive fields (int, string) with no reference types
-// 2. FinishedAt is *time.Time, but time.Time is immutable - copying the pointer is safe
-// 3. All other fields (string, bool, int, time.Time) are value types
+//  1. Result field stores value-only structs (KeyImportResult, KeyDeleteResult, ManualValidationResult)
+//     All these types contain only primitive fields (int, string) with no reference types
+//  2. FinishedAt is *time.Time, but time.Time is immutable - copying the pointer is safe
+//  3. All other fields (string, bool, int, time.Time) are value types
 func (c *taskStatusCache) get() *services.TaskStatus {
 	c.mu.RLock()
 	defer c.mu.RUnlock()

internal/proxy/cc_support.go

@@ -1596,6 +1596,7 @@ var reWindowsDrivePath = regexp.MustCompile(`[A-Za-z]:`)
 // Examples:
 //   - F:\test\file.py - the \t and \f are path separators, not escape sequences
 //   - C:\new\readme.txt - the \n and \r are path separators, not escape sequences
+//
 // Pattern: Match any single backslash (not already doubled)
 // Strategy: Match \ that is NOT followed by another \ (to avoid matching already-doubled \\)
 var reWindowsPathBackslash = regexp.MustCompile(`\\(?:[^\\]|$)`)

internal/proxy/cc_support_test.go

@@ -7028,13 +7028,13 @@ func TestConvertWindowsPathsInToolResult_CorruptedPaths(t *testing.T) {
 	}{
 		{
 			name:     "path with tab character (\\t interpreted)",
-			input:    "F:MyProjects" + string(rune(9)) + "test",  // tab character (byte 9)
-			expected: "F:/MyProjects/test", // Should reconstruct with slashes
+			input:    "F:MyProjects" + string(rune(9)) + "test", // tab character (byte 9)
+			expected: "F:/MyProjects/test",                      // Should reconstruct with slashes
 		},
 		{
 			name:     "path with newline character (\\n interpreted)",
-			input:    "F:MyProjects" + string(rune(10)) + "new",  // newline character (byte 10)
-			expected: "F:/MyProjects/new", // Should reconstruct with slashes
+			input:    "F:MyProjects" + string(rune(10)) + "new", // newline character (byte 10)
+			expected: "F:/MyProjects/new",                       // Should reconstruct with slashes
 		},
 		{
 			name:     "path with multiple control chars",
@@ -7053,8 +7053,8 @@ func TestConvertWindowsPathsInToolResult_CorruptedPaths(t *testing.T) {
 		},
 		{
 			name:     "path with form feed character (\\f interpreted)",
-			input:    "F:" + string(rune(12)) + "older",  // form feed character (byte 12)
-			expected: "F:/older", // Should reconstruct with slash
+			input:    "F:" + string(rune(12)) + "older", // form feed character (byte 12)
+			expected: "F:/older",                        // Should reconstruct with slash
 		},
 		{
 			name:     "Unix path unchanged",
@@ -7068,8 +7068,8 @@ func TestConvertWindowsPathsInToolResult_CorruptedPaths(t *testing.T) {
 		},
 		{
 			name:     "path with backspace character (\\b interpreted)",
-			input:    "D:" + string(rune(8)) + "backup",  // backspace character (byte 8)
-			expected: "D:/backup", // Should reconstruct with slash
+			input:    "D:" + string(rune(8)) + "backup", // backspace character (byte 8)
+			expected: "D:/backup",                       // Should reconstruct with slash
 		},
 	}
 

internal/services/import_export_service.go

@@ -540,16 +540,16 @@ func (s *ImportExportService) ExportGroup(groupID uint) (*GroupExportData, error
 			result.ChildGroups = make([]ChildGroupExport, 0, len(childGroups))
 			for _, cg := range childGroups {
 				childExport := ChildGroupExport{
-					Name:                 cg.Name,
-					DisplayName:          cg.DisplayName,
-					Description:          cg.Description,
-					Enabled:              cg.Enabled,
-					ProxyKeys:            cg.ProxyKeys,
-					Sort:                 cg.Sort,
-					TestModel:            cg.TestModel,
-					ModelMapping:         cg.ModelMapping,
-					ModelRedirectStrict:  cg.ModelRedirectStrict,
-					Keys:                 childKeysMap[cg.ID],
+					Name:                cg.Name,
+					DisplayName:         cg.DisplayName,
+					Description:         cg.Description,
+					Enabled:             cg.Enabled,
+					ProxyKeys:           cg.ProxyKeys,
+					Sort:                cg.Sort,
+					TestModel:           cg.TestModel,
+					ModelMapping:        cg.ModelMapping,
+					ModelRedirectStrict: cg.ModelRedirectStrict,
+					Keys:                childKeysMap[cg.ID],
 				}
 
 				// Export JSON fields as raw JSON to preserve structure
@@ -752,19 +752,19 @@ func (s *ImportExportService) importChildGroups(tx *gorm.DB, parentGroupID uint,
 
 		// Create child group with inherited channel_type from parent
 		childGroup := models.Group{
-			Name:                 childName,
-			DisplayName:          childData.DisplayName,
-			Description:          childData.Description,
-			GroupType:            "standard",
-			ChannelType:          parentChannelType, // Inherit from parent
-			Enabled:              childData.Enabled,
-			ParentGroupID:        &parentGroupID,
-			ProxyKeys:            childData.ProxyKeys,
-			Sort:                 childData.Sort,
-			Upstreams:            []byte(upstreamsJSON),
-			TestModel:            testModel, // Use fallback if empty
-			ModelMapping:         childData.ModelMapping,
-			ModelRedirectStrict:  childData.ModelRedirectStrict,
+			Name:                childName,
+			DisplayName:         childData.DisplayName,
+			Description:         childData.Description,
+			GroupType:           "standard",
+			ChannelType:         parentChannelType, // Inherit from parent
+			Enabled:             childData.Enabled,
+			ParentGroupID:       &parentGroupID,
+			ProxyKeys:           childData.ProxyKeys,
+			Sort:                childData.Sort,
+			Upstreams:           []byte(upstreamsJSON),
+			TestModel:           testModel, // Use fallback if empty
+			ModelMapping:        childData.ModelMapping,
+			ModelRedirectStrict: childData.ModelRedirectStrict,
 		}
 
 		// Import JSON fields from exported data

web/src/components/keys/GroupFormModal.vue

@@ -803,7 +803,10 @@ function mergeModelRedirectItems(items: ModelRedirectItemV2[]): ModelRedirectIte
 
     if (mergedMap.has(from)) {
       // Merge targets into existing rule
-      const existing = mergedMap.get(from)!;
+      const existing = mergedMap.get(from);
+      if (!existing) {
+        continue;
+      }
       // Normalize existing target models before dedupe to avoid whitespace duplicates
       const seenModels = new Set(existing.targets.map(t => t.model.trim()));
 
@@ -2937,20 +2940,42 @@ async function handleSubmit() {
 /* Dynamic weight tooltip styles */
 .dynamic-weight-tooltip {
   min-width: 180px;
+  max-width: 320px;
+  padding: 4px 0;
+  word-break: break-word;
+  overflow-wrap: break-word;
 }
 
 .dynamic-weight-tooltip .tooltip-title {
   font-weight: 600;
   margin-bottom: 8px;
   padding-bottom: 4px;
   border-bottom: 1px solid rgba(255, 255, 255, 0.2);
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
 }
 
 .dynamic-weight-tooltip .tooltip-row {
   display: flex;
   justify-content: space-between;
+  align-items: flex-start;
   margin-bottom: 4px;
   font-size: 12px;
+  gap: 12px;
+  line-height: 1.5;
+}
+
+.dynamic-weight-tooltip .tooltip-row > span:first-child {
+  flex-shrink: 0;
+  white-space: nowrap;
+}
+
+.dynamic-weight-tooltip .tooltip-row > span:last-child {
+  flex: 1;
+  text-align: right;
+  word-break: break-word;
+  overflow-wrap: break-word;
 }
 
 .dynamic-weight-tooltip .health-good {