개정판 646a4bb9
Fix: 페이지 전환 시 저장하지 않도록 수정, 저장 시 완료할 때까지 대기하도록 수정
Change-Id: I4fba1bc8b4268d64a5eaefe230c75d9b3d84ee7a
| KCOM/Controls/Sample.xaml.cs | ||
|---|---|---|
| 315 | 315 |
|
| 316 | 316 |
private void PageChange(KCOM.Common.ThumbnailItem selectItem) |
| 317 | 317 |
{
|
| 318 |
var number = selectItem.PageNumber;
|
|
| 318 |
var number = selectItem.PageNumber; |
|
| 319 | 319 |
|
| 320 |
if (ViewerDataModel.Instance.SyncPageNumber != number) |
|
| 321 |
{
|
|
| 322 |
ViewerDataModel.Instance.SystemMain.dzTopMenu._SaveEvent(null, null); /// save controls |
|
| 320 |
if (ViewerDataModel.Instance.SyncPageNumber != number) |
|
| 321 |
{
|
|
| 322 |
#region 페이지 전환시 저장(성능 저하 초래) |
|
| 323 |
//TODO: 확인 후 삭제 |
|
| 324 |
///ViewerDataModel.Instance.SystemMain.dzTopMenu._SaveEvent(null, null); /// save controls |
|
| 325 |
#endregion |
|
| 323 | 326 |
|
| 324 |
this.CurrentPage = ImgListbox.SelectedItem as KCOM.Common.ThumbnailItem;
|
|
| 327 |
this.CurrentPage = ImgListbox.SelectedItem as KCOM.Common.ThumbnailItem; |
|
| 325 | 328 |
|
| 326 | 329 |
PageChanging(this, new PageChangeEventArgs |
| 327 | 330 |
{
|
| ... | ... | |
| 329 | 332 |
PageNumber = number, |
| 330 | 333 |
PageUri = null |
| 331 | 334 |
}); |
| 332 |
}
|
|
| 335 |
} |
|
| 333 | 336 |
} |
| 334 | 337 |
|
| 335 | 338 |
public bool GotoPageFlag = false; |
| KCOM/Events/Implementation/TopMenuEvent.cs | ||
|---|---|---|
| 346 | 346 |
/// - unselect and update my markup list |
| 347 | 347 |
/// <param name="sender"></param> |
| 348 | 348 |
/// <param name="e"></param> |
| 349 |
public bool _SaveEvent(object sender, RoutedEventArgs e)
|
|
| 349 |
public async Task<bool> _SaveEvent(object sender, RoutedEventArgs e)
|
|
| 350 | 350 |
{
|
| 351 | 351 |
bool result = false; |
| 352 | 352 |
|
| ... | ... | |
| 371 | 371 |
{
|
| 372 | 372 |
if ((item as IKCOM.MarkupInfoItem).UserID == App.ViewInfo.UserID) |
| 373 | 373 |
{
|
| 374 |
/// 저장 서비스 호출 |
|
| 375 |
this.ExecuteSaveCommandAsync(mainMenu); |
|
| 374 |
#region 저장 서비스 호출(저장 완료시까지 대기) |
|
| 375 |
await this.ExecuteSaveCommandAsync(mainMenu); |
|
| 376 |
#endregion |
|
| 376 | 377 |
|
| 377 |
ViewerDataModel.Instance._markupInfoList.Where(data => data.MarkupInfoID == (item as IKCOM.MarkupInfoItem).MarkupInfoID).FirstOrDefault().UpdateTime = DateTime.Now;
|
|
| 378 |
ViewerDataModel.Instance._markupInfoList.FirstOrDefault(data => data.MarkupInfoID == (item as IKCOM.MarkupInfoItem).MarkupInfoID).UpdateTime = DateTime.Now;
|
|
| 378 | 379 |
if (!ViewerDataModel.Instance.IsConsolidate && (sender != null)) |
| 379 | 380 |
{
|
| 380 | 381 |
this.ParentOfType<MainWindow>().DialogMessage_Alert("Save is complete.", "Info");
|
| KCOM/KCOM.csproj | ||
|---|---|---|
| 1088 | 1088 |
<SubType>Designer</SubType> |
| 1089 | 1089 |
<CopyToOutputDirectory>Always</CopyToOutputDirectory> |
| 1090 | 1090 |
</None> |
| 1091 |
<None Include="MARKUS - 복사본.ini" /> |
|
| 1092 | 1091 |
<None Include="MARKUS.ini"> |
| 1093 | 1092 |
<CopyToOutputDirectory>Always</CopyToOutputDirectory> |
| 1094 | 1093 |
</None> |
| KCOM/MARKUS - 복사본.ini | ||
|---|---|---|
| 1 |
[Internal] |
|
| 2 |
IP=http://sdms.co.kr:8080/MarkusAPI_DEBUG |
|
| 3 |
[External] |
|
| 4 |
IP=http://sdms.co.kr:8080/MarkusAPI_DEBUG |
|
| 5 |
[BaseClientAddress] |
|
| 6 |
URL=http://sdms.co.kr:8080/MarkusAPI_DEBUG |
|
| 7 |
[HubAddress] |
|
| 8 |
URL=http://192.168.0.67:5100/ |
|
| 9 |
[UpdateVer64] |
|
| 10 |
URL=http://localhost:8080/TileSource/Version/version_x64.xml |
|
| 11 |
[UpdateVer86] |
|
| 12 |
URL=http://localhost:8080/TileSource/Version/version_x86.xml |
|
| 13 |
[excelFilePath] |
|
| 14 |
URL=http://localhost:8080/TileSource/Check_Test/CheckList_T.xlsx |
|
| 15 |
[KCOM_Get_FinalImage_Get_PdfImage] |
|
| 16 |
URL=http://localhost:8080/Get_FInalImage/Get_PdfImage.asmx |
|
| 17 |
[KCOM_kr_co_devdoftech_cloud_FileUpload] |
|
| 18 |
URL=http://sdms.co.kr:8080/ImageUpload/FileUpload.asmx |
|
| 19 |
[mainServerImageWebPath] |
|
| 20 |
URL=http://sdms.co.kr:8080/TileSource/{0}_Tile/{1}/{2}/{3}.png
|
|
| 21 |
[subServerImageWebPath] |
|
| 22 |
URL=http://sdms.co.kr:8080/TileSource/{0}_Tile/{1}/{2}/{3}.png
|
|
| 23 |
[Debug_BaseClientAddress] |
|
| 24 |
URL=http://192.168.0.67:5979 |
|
| 25 |
[HOST_DOMAIN] |
|
| 26 |
DOMAIN= |
|
| 27 |
[GetConversionStateFailed] |
|
| 28 |
MSG=VG9vIE1hbnkgVi9QIEZpbGVzIGFyZSB1cGxvYWRpbmcgaW5zdGFudGFuZW91c2x5LCBUaGlzIFYvUCBmaWxlIGNhbiBub3QgYmUgb3BlbiBub3cuIFBsZWFzZSBmZWVsIGZyZWUgdG8gcmUtb3BlbiB3YWl0IGEgbW9tZW50IGFnYWluIVxuXG7tmITsnqwg7J287Iuc7KCB7Jy866GcIOunjuydgCDslpHsnZggVi9Q6rCAIOuTseuhneuQmOqzoCDsnojslrQg7J20IOusuOyEnOulvCDsl7TrnoztlaAg7IiYIOyXhuyKteuLiOuLpC5cbuyeoOyLnOunjCDquLDri6TroKQg7KO87IugIO2bhCDri6Tsi5wg7Je0656M7ZWY7JesIOyjvOyLnOq4sCDrsJTrno3ri4jri6Q= |
|
| 29 |
[SetFinalPDFError] |
|
| 30 |
MSG=7LWc7KKFIO2MjOydvOydhCDrp4zrk5zripTrjbAg66y47KCc6rCAIOuwnOyDne2VmOyYgOyKteuLiOuLpA== |
|
| 31 |
[SetFinalPDFSuccess] |
|
| 32 |
MSG=7LWc7KKFIO2MjOydvCDsg53shLEg7KSR7J6F64uI64ukLiDrrLjshJzqtIDrpqzsi5zsiqTthZzsnYQg7ZmV7J247ZW07KO87IS47JqU |
|
| 33 |
[SetThumbnail] |
|
| 34 |
WIDTH=265 |
|
| 35 |
[Site] |
|
| 36 |
NAME=sdms |
|
| 37 |
[PortForwarding] |
|
| 38 |
HUB=5100:5100 |
|
| 39 |
RESOURCE=5977:5977 |
|
| 40 |
BASE=8080:8080 |
|
| 41 |
[GetImageResourceFailed] |
|
| 42 |
MSG=7ZW064u5IOusuOyEnOydmCB7MH0gUGFnZSBDb252ZXJ06rCAIOygleyDgeyggeydtOyngCDslYrsirXri4jri6QuIOq0gOumrOyekOyXkOqyjCDrrLjsnZjtlbQg7KO87IS47JqULg== |
|
| 43 |
|
|
| 44 |
[COMMON] |
|
| 45 |
IsDocumentHistory = false |
|
내보내기 Unified diff
