Skip to content

Fixed: Fix the issue where Select remembers empty content. #1439

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ZhaoJiSen merged 1 commit into from
Aug 20, 2025
Merged

Fixed: Fix the issue where Select remembers empty content. #1439

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 21 additions & 12 deletions src/app/elements/connect/connect-dialog/advanced-option/advanced-option.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,21 +156,10 @@ export class ElementAdvancedOptionComponent implements OnChanges, OnInit {
hidden: () => {
if (!this.connectMethod) return true;
if (!gs.CONNECTION_TOKEN_REUSABLE) return true;

// razor 直接显示
if (this.connectMethod.component === 'razor') return false;

if (this.connectMethod.component === 'tinker') {
const method = (
this.connectOption.appletConnectMethod ??
this.connectOption.virtualappConnectMethod ??
this.setting.graphics.applet_connection_method ??
''
)
.toString()
.toLowerCase();

return method !== 'client';
return this.connectOption.appletConnectMethod !== 'client';
}

return true;
Expand Down Expand Up @@ -212,6 +201,26 @@ export class ElementAdvancedOptionComponent implements OnChanges, OnInit {

this.advancedOptions = this.allOptions.filter(i => !i.hidden());
this.isShowAdvancedOption = this.advancedOptions.length > 0;

// 如果记住的 select 值已不在可选项中，回退到 web 或默认值
this.advancedOptions
.filter(i => i.type === 'select')
.forEach(i => {
const options = i.options || [];
const values = new Set(options.map(opt => opt.value));
const current = this.connectOption[i.field];

if (!values.has(current)) {
let fallback: any = 'web';

if (!values.has(fallback)) {
fallback = i.value !== undefined ? i.value : options[0] ? options[0].value : undefined;
}
if (fallback !== undefined) {
this.connectOption[i.field] = fallback;
}
}
});
}

onChange() {
Expand Down