|
|
@@ -804,21 +804,21 @@ namespace PDF_Master.ViewModels.FillAndSign.PropertyPanel
|
|
|
{
|
|
|
if (item == list[0])
|
|
|
continue;
|
|
|
- if (isNoEqualsDir["Shape"] == false)
|
|
|
- {
|
|
|
- foreach (var point in fillAndSignContentViewModel.viewContentViewModel.FillAndSign)
|
|
|
- {
|
|
|
- if (item.PageIndex == point.PageIndex && item.AnnotIndex == point.AnnotIndex)
|
|
|
- {
|
|
|
- lineWidthMultiple = 1;
|
|
|
- if (point.Shape != tempShape)
|
|
|
- {
|
|
|
- isNoEqualsDir["Shape"] = true;
|
|
|
- }
|
|
|
-
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
+ //区分图形是否一致，不一致则属性不选中任何图形
|
|
|
+ //if (isNoEqualsDir["Shape"] == false)
|
|
|
+ //{
|
|
|
+ // foreach (var point in fillAndSignContentViewModel.viewContentViewModel.FillAndSign)
|
|
|
+ // {
|
|
|
+ // if (item.PageIndex == point.PageIndex && item.AnnotIndex == point.AnnotIndex)
|
|
|
+ // {
|
|
|
+ // lineWidthMultiple = 1;
|
|
|
+ // if (point.Shape != tempShape)
|
|
|
+ // {
|
|
|
+ // isNoEqualsDir["Shape"] = true;
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ //}
|
|
|
if (isNoEqualsDir["Color"] == false)
|
|
|
{
|
|
|
if (temp.InkColor.A != item.InkColor.A || temp.InkColor.R != item.InkColor.R || temp.InkColor.G != item.InkColor.G || temp.InkColor.B != item.InkColor.B)
|
