|
@@ -580,10 +580,6 @@ namespace PDF_Master.Views.PageEdit
|
|
|
return;
|
|
|
}
|
|
|
#region 功能付费锁
|
|
|
- if((bool)!viewModel?.viewContentViewModel.IAPBeforeFunction())
|
|
|
- {
|
|
|
- return;
|
|
|
- }
|
|
|
#endregion
|
|
|
|
|
|
#region 从外部拖拽插入文件
|
|
@@ -694,6 +690,12 @@ namespace PDF_Master.Views.PageEdit
|
|
|
{
|
|
|
try
|
|
|
{
|
|
|
+ //将付费锁逻辑提前,避免因弹窗显示后导致虚影无法消失问题
|
|
|
+ if(!viewModel.viewContentViewModel.IAPBeforeFunction())
|
|
|
+ {
|
|
|
+ return;
|
|
|
+ }
|
|
|
+
|
|
|
//ctrl建按下 不显示插入标记和虚影 因为释放不会响应drop事件
|
|
|
if (e.KeyStates == (DragDropKeyStates.ControlKey | DragDropKeyStates.LeftMouseButton) || e.KeyStates == (DragDropKeyStates.ShiftKey | DragDropKeyStates.LeftMouseButton | DragDropKeyStates.ControlKey))
|
|
|
return;
|
|
@@ -1066,7 +1068,5 @@ namespace PDF_Master.Views.PageEdit
|
|
|
timer.Tick += Timer_Tick;
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
}
|
|
|
}
|