|
|
@@ -101,8 +101,8 @@ func (m *WorkDesktopMenu) WorkMenuFormat() ([]*pb.MenuList, error) {
|
|
|
ConfirmUrl: mv.AdditionalInfo.ConfirmUrl,
|
|
|
ConfirmText: mv.AdditionalInfo.ConfirmText,
|
|
|
IsShowCancel: mv.AdditionalInfo.IsShowCancel,
|
|
|
- AppType: mv.AppType,
|
|
|
- OpenType: mv.OpenType,
|
|
|
+ AppType: mv.AdditionalInfo.AppType,
|
|
|
+ OpenType: mv.AdditionalInfo.OpenType,
|
|
|
},
|
|
|
Match: MC.If(mv.Match != "", strings.Split(mv.Match, ","), []string{}).([]string),
|
|
|
}
|
|
|
@@ -129,8 +129,8 @@ func (m *WorkDesktopMenu) WorkMenuFormat() ([]*pb.MenuList, error) {
|
|
|
ConfirmUrl: sv.AdditionalInfo.ConfirmUrl,
|
|
|
ConfirmText: sv.AdditionalInfo.ConfirmText,
|
|
|
IsShowCancel: sv.AdditionalInfo.IsShowCancel,
|
|
|
- AppType: sv.AppType,
|
|
|
- OpenType: sv.OpenType,
|
|
|
+ AppType: sv.AdditionalInfo.AppType,
|
|
|
+ OpenType: sv.AdditionalInfo.OpenType,
|
|
|
},
|
|
|
Match: MC.If(sv.Match != "", strings.Split(sv.Match, ","), []string{}).([]string),
|
|
|
}
|
|
|
@@ -156,8 +156,8 @@ func (m *WorkDesktopMenu) WorkMenuFormat() ([]*pb.MenuList, error) {
|
|
|
ConfirmUrl: tv.AdditionalInfo.ConfirmUrl,
|
|
|
ConfirmText: tv.AdditionalInfo.ConfirmText,
|
|
|
IsShowCancel: tv.AdditionalInfo.IsShowCancel,
|
|
|
- AppType: tv.AppType,
|
|
|
- OpenType: tv.OpenType,
|
|
|
+ AppType: tv.AdditionalInfo.AppType,
|
|
|
+ OpenType: tv.AdditionalInfo.OpenType,
|
|
|
},
|
|
|
Match: MC.If(tv.Match != "", strings.Split(tv.Match, ","), []string{}).([]string),
|
|
|
}
|
|
|
@@ -178,8 +178,8 @@ func (m *WorkDesktopMenu) WorkMenuFormat() ([]*pb.MenuList, error) {
|
|
|
ConfirmUrl: fv.AdditionalInfo.ConfirmUrl,
|
|
|
ConfirmText: fv.AdditionalInfo.ConfirmText,
|
|
|
IsShowCancel: fv.AdditionalInfo.IsShowCancel,
|
|
|
- AppType: fv.AppType,
|
|
|
- OpenType: fv.OpenType,
|
|
|
+ AppType: fv.AdditionalInfo.AppType,
|
|
|
+ OpenType: fv.AdditionalInfo.OpenType,
|
|
|
}
|
|
|
}
|
|
|
threeLevel.Match = MC.If(fv.Match != "", strings.Split(fv.Match, ","), []string{}).([]string)
|
