Merge branch 'dev-yxl' into dev-yxl250227

v1.3.0
于肖磊 2025-02-28 17:15:16 +08:00
commit 49ebe2bae5
1 changed files with 3 additions and 3 deletions

View File

@ -336,11 +336,11 @@ const url_value_dialog_call_back = (item: any[]) => {
*/
const sliding_fixed_change = (val: string | number | boolean, index: number) => {
//
const tabs_list_is_sliding_fixed = form.value.tabs_list.findIndex((item: any, index1: number) => item.is_sliding_fixed == '1' && index != index1);
const tabs_list_is_sliding_fixed = form.tabs_list.findIndex((item: any, index1: number) => item.is_sliding_fixed == '1' && index != index1);
// '1'
if (val == '1' && tabs_list_is_sliding_fixed != -1) {
// '0'
form.value.tabs_list.forEach((item: any, index1: number) => {
form.tabs_list.forEach((item: any, index1: number) => {
if (index != index1) {
item.is_sliding_fixed = '0';
}
@ -357,7 +357,7 @@ const tabs_theme_change = (val: string | number | boolean | undefined): void =>
const is_not_general_safe_distance = computed(() => common_store.is_immersion_model && !common_store.is_general_safe_distance);
watchEffect(() => {
if (!is_not_general_safe_distance.value) {
form.value.is_general_safe_distance = '0';
form.is_general_safe_distance = '0';
}
});
//