diff --git a/unimarc/unimarc/Helper_DB.cs b/unimarc/unimarc/Helper_DB.cs index 3f357ba..fe1d3b0 100644 --- a/unimarc/unimarc/Helper_DB.cs +++ b/unimarc/unimarc/Helper_DB.cs @@ -313,6 +313,26 @@ namespace UniMarc return cnt; } + + public long DB_Send_CMD_Insert_GetIdx(string cmd) + { + long lastId = -1; + try + { + using (var cn = this.CreateConnection()) + { + var sqlcmd = new MySqlCommand(cmd, cn); + cn.Open(); + sqlcmd.ExecuteNonQuery(); + lastId = sqlcmd.LastInsertedId; + } + } + catch (Exception ex) + { + UTIL.MsgE($"데이터베이스 실행오류\n{ex.Message}"); + } + return lastId; + } /// /// DBcon이 선진행되어야함. /// SELECT * FROM [DB_Table_Name] WHERE [DB_Where_Table] LIKE \"%DB_Search_Data%\" diff --git a/unimarc/unimarc/마크/AddMarc.cs b/unimarc/unimarc/마크/AddMarc.cs index 16fa2fa..e3082d0 100644 --- a/unimarc/unimarc/마크/AddMarc.cs +++ b/unimarc/unimarc/마크/AddMarc.cs @@ -24,6 +24,15 @@ namespace UniMarc InitializeComponent(); m = _m; } + + protected override bool ProcessCmdKey(ref Message msg, Keys keyData) + { + if (keyData == Keys.Alt || keyData == (Keys.Alt | Keys.Menu)) + { + return true; + } + return base.ProcessCmdKey(ref msg, keyData); + } private void AddMarc_Load(object sender, EventArgs e) { @@ -2756,21 +2765,22 @@ namespace UniMarc { TextBox tb = sender as TextBox; + if (e.Alt && e.KeyCode >= Keys.A && e.KeyCode <= Keys.Z) + { + var letter = e.KeyCode.ToString().ToLower(); + tb.InvokeInsertText("▽" + letter); + e.SuppressKeyPress = true; + return; + } + if (e.KeyCode == Keys.F3) { tb.InvokeInsertText("▽"); - - //tb.Select(tb.Text.Length, 0); } else if (e.KeyCode == Keys.F4) { tb.InvokeInsertText("△"); - //tb.Select(tb.Text.Length, 0); } - - - //tb.SelectionStart = tb.Text.Length; - //tb.Select(tb.Text.Length, 0); } private void etc_KeyDown(object sender, KeyEventArgs e) { diff --git a/unimarc/unimarc/마크/AddMarc2.cs b/unimarc/unimarc/마크/AddMarc2.cs index eb3474c..5d3fcbb 100644 --- a/unimarc/unimarc/마크/AddMarc2.cs +++ b/unimarc/unimarc/마크/AddMarc2.cs @@ -44,7 +44,7 @@ namespace UniMarc } private void MarcEditorControl1_BookSaved(object sender, MarcEditorControl.BookSavedEventArgs e) { - string tag056 = Tag056(e.DBMarc, e.griddata); + string tag056 = Tag056(e.DBMarc, e.Param); string date = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); string orimarc = st.made_Ori_marc(e.DBMarc).Replace(@"\", "￦"); @@ -58,11 +58,11 @@ namespace UniMarc string[] BookData = GetBookData(MarcText); bool IsCoverDate = false; - if (e.griddata.SaveDate != "") + if (e.Param.SaveDate != "") { // 마지막 수정일로부터 2일이 지났는지, 마지막 저장자가 사용자인지 확인 - TimeSpan sp = CheckDate(e.griddata.SaveDate, date); - IsCoverDate = IsCoverData(sp.Days, e.griddata.User); + TimeSpan sp = CheckDate(e.Param.SaveDate, date); + IsCoverDate = IsCoverData(sp.Days, e.Param.User); //if (IsCoverDate) // etc2.Text = etc2.Text.Replace(SaveData[0], date); } @@ -75,12 +75,12 @@ namespace UniMarc else isUpdate = false; - var grade = int.Parse(e.griddata.Grade); + var grade = int.Parse(e.Param.Grade); if (isUpdate) - UpdateMarc(Table, midx, orimarc, grade, tag056, date, IsCoverDate,e.griddata); + UpdateMarc(Table, midx, orimarc, grade, tag056, date, IsCoverDate,e.Param); else - InsertMarc(Table, BookData, orimarc, grade, tag056, date, e.griddata); + InsertMarc(Table, BookData, orimarc, grade, tag056, date, e.Param); MessageBox.Show("저장되었습니다.", "저장"); } diff --git a/unimarc/unimarc/마크/Mac_List.Designer.cs b/unimarc/unimarc/마크/Mac_List.Designer.cs index 0a3198b..0e7eccc 100644 --- a/unimarc/unimarc/마크/Mac_List.Designer.cs +++ b/unimarc/unimarc/마크/Mac_List.Designer.cs @@ -163,7 +163,7 @@ this.dataGridView1.RowHeadersWidth = 40; this.dataGridView1.RowTemplate.Height = 23; this.dataGridView1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dataGridView1.Size = new System.Drawing.Size(1638, 624); + this.dataGridView1.Size = new System.Drawing.Size(1310, 478); this.dataGridView1.TabIndex = 48; this.dataGridView1.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellDoubleClick); this.dataGridView1.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dataGridView1_RowPostPaint); @@ -576,8 +576,8 @@ // // panel2 // - this.panel2.Controls.Add(this.bn1); this.panel2.Controls.Add(this.dataGridView1); + this.panel2.Controls.Add(this.bn1); this.panel2.Dock = System.Windows.Forms.DockStyle.Fill; this.panel2.Location = new System.Drawing.Point(0, 34); this.panel2.Name = "panel2"; @@ -590,6 +590,8 @@ this.bn1.BindingSource = this.bs1; this.bn1.CountItem = this.bindingNavigatorCountItem; this.bn1.DeleteItem = this.bindingNavigatorDeleteItem; + this.bn1.Dock = System.Windows.Forms.DockStyle.Bottom; + this.bn1.ImageScalingSize = new System.Drawing.Size(20, 20); this.bn1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.bindingNavigatorMoveFirstItem, this.bindingNavigatorMovePreviousItem, @@ -602,14 +604,14 @@ this.bindingNavigatorSeparator2, this.bindingNavigatorAddNewItem, this.bindingNavigatorDeleteItem}); - this.bn1.Location = new System.Drawing.Point(0, 0); + this.bn1.Location = new System.Drawing.Point(0, 597); this.bn1.MoveFirstItem = this.bindingNavigatorMoveFirstItem; this.bn1.MoveLastItem = this.bindingNavigatorMoveLastItem; this.bn1.MoveNextItem = this.bindingNavigatorMoveNextItem; this.bn1.MovePreviousItem = this.bindingNavigatorMovePreviousItem; this.bn1.Name = "bn1"; this.bn1.PositionItem = this.bindingNavigatorPositionItem; - this.bn1.Size = new System.Drawing.Size(1638, 25); + this.bn1.Size = new System.Drawing.Size(1638, 27); this.bn1.TabIndex = 49; this.bn1.Text = "bindingNavigator1"; // @@ -619,13 +621,13 @@ this.bindingNavigatorAddNewItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorAddNewItem.Image"))); this.bindingNavigatorAddNewItem.Name = "bindingNavigatorAddNewItem"; this.bindingNavigatorAddNewItem.RightToLeftAutoMirrorImage = true; - this.bindingNavigatorAddNewItem.Size = new System.Drawing.Size(23, 22); + this.bindingNavigatorAddNewItem.Size = new System.Drawing.Size(24, 24); this.bindingNavigatorAddNewItem.Text = "새로 추가"; // // bindingNavigatorCountItem // this.bindingNavigatorCountItem.Name = "bindingNavigatorCountItem"; - this.bindingNavigatorCountItem.Size = new System.Drawing.Size(27, 22); + this.bindingNavigatorCountItem.Size = new System.Drawing.Size(27, 24); this.bindingNavigatorCountItem.Text = "/{0}"; this.bindingNavigatorCountItem.ToolTipText = "전체 항목 수"; // @@ -635,7 +637,7 @@ this.bindingNavigatorDeleteItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorDeleteItem.Image"))); this.bindingNavigatorDeleteItem.Name = "bindingNavigatorDeleteItem"; this.bindingNavigatorDeleteItem.RightToLeftAutoMirrorImage = true; - this.bindingNavigatorDeleteItem.Size = new System.Drawing.Size(23, 22); + this.bindingNavigatorDeleteItem.Size = new System.Drawing.Size(24, 24); this.bindingNavigatorDeleteItem.Text = "삭제"; // // bindingNavigatorMoveFirstItem @@ -644,7 +646,7 @@ this.bindingNavigatorMoveFirstItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveFirstItem.Image"))); this.bindingNavigatorMoveFirstItem.Name = "bindingNavigatorMoveFirstItem"; this.bindingNavigatorMoveFirstItem.RightToLeftAutoMirrorImage = true; - this.bindingNavigatorMoveFirstItem.Size = new System.Drawing.Size(23, 22); + this.bindingNavigatorMoveFirstItem.Size = new System.Drawing.Size(24, 24); this.bindingNavigatorMoveFirstItem.Text = "처음으로 이동"; // // bindingNavigatorMovePreviousItem @@ -653,13 +655,13 @@ this.bindingNavigatorMovePreviousItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMovePreviousItem.Image"))); this.bindingNavigatorMovePreviousItem.Name = "bindingNavigatorMovePreviousItem"; this.bindingNavigatorMovePreviousItem.RightToLeftAutoMirrorImage = true; - this.bindingNavigatorMovePreviousItem.Size = new System.Drawing.Size(23, 22); + this.bindingNavigatorMovePreviousItem.Size = new System.Drawing.Size(24, 24); this.bindingNavigatorMovePreviousItem.Text = "이전으로 이동"; // // bindingNavigatorSeparator // this.bindingNavigatorSeparator.Name = "bindingNavigatorSeparator"; - this.bindingNavigatorSeparator.Size = new System.Drawing.Size(6, 25); + this.bindingNavigatorSeparator.Size = new System.Drawing.Size(6, 27); // // bindingNavigatorPositionItem // @@ -674,7 +676,7 @@ // bindingNavigatorSeparator1 // this.bindingNavigatorSeparator1.Name = "bindingNavigatorSeparator1"; - this.bindingNavigatorSeparator1.Size = new System.Drawing.Size(6, 25); + this.bindingNavigatorSeparator1.Size = new System.Drawing.Size(6, 27); // // bindingNavigatorMoveNextItem // @@ -682,7 +684,7 @@ this.bindingNavigatorMoveNextItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveNextItem.Image"))); this.bindingNavigatorMoveNextItem.Name = "bindingNavigatorMoveNextItem"; this.bindingNavigatorMoveNextItem.RightToLeftAutoMirrorImage = true; - this.bindingNavigatorMoveNextItem.Size = new System.Drawing.Size(23, 22); + this.bindingNavigatorMoveNextItem.Size = new System.Drawing.Size(24, 24); this.bindingNavigatorMoveNextItem.Text = "다음으로 이동"; // // bindingNavigatorMoveLastItem @@ -691,13 +693,13 @@ this.bindingNavigatorMoveLastItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveLastItem.Image"))); this.bindingNavigatorMoveLastItem.Name = "bindingNavigatorMoveLastItem"; this.bindingNavigatorMoveLastItem.RightToLeftAutoMirrorImage = true; - this.bindingNavigatorMoveLastItem.Size = new System.Drawing.Size(23, 22); + this.bindingNavigatorMoveLastItem.Size = new System.Drawing.Size(24, 24); this.bindingNavigatorMoveLastItem.Text = "마지막으로 이동"; // // bindingNavigatorSeparator2 // this.bindingNavigatorSeparator2.Name = "bindingNavigatorSeparator2"; - this.bindingNavigatorSeparator2.Size = new System.Drawing.Size(6, 25); + this.bindingNavigatorSeparator2.Size = new System.Drawing.Size(6, 27); // // Mac_List // diff --git a/unimarc/unimarc/마크/Mac_List.resx b/unimarc/unimarc/마크/Mac_List.resx index a73c7d5..cb4993d 100644 --- a/unimarc/unimarc/마크/Mac_List.resx +++ b/unimarc/unimarc/마크/Mac_List.resx @@ -169,7 +169,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wgAADsIBFShKgAAAAVdJREFUOE/Nz0tLAmEUBmB3kWRoCUVEISFUJGb1OywiKrDsIpZdkJAkDUvDQkij + wQAADsEBuJFr7QAAAVdJREFUOE/Nz0tLAmEUBmB3kWRoCUVEISFUJGb1OywiKrDsIpZdkJAkDUvDQkij UKSbVIvatKhNi9oERRAGEQXhjJdp7Hd83/eGs2jhLGQ20QtndTgP71Gp/m0KZ1XInlTjM6XG+4EG5fuK yaTUIN8bIMUQ0gmtcuBtX/MLPMT0yoHnuA6kuA4iruI20lAZ+DiswWuyFum4Dk+7dbiP6kHEFVDBg+tQ My4DLbjwG3DqbcORxygHXxJakGIQRFwDEf0gwjKI4AYtzIHmHaA5Oxg/CsYPIb7YIQced+qluvTLCyIs @@ -184,7 +184,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wgAADsIBFShKgAAAAWtJREFUOE+1kE0ow2Ecx/9X5a2UiwtKOSCTmJBMhuQlMo3IvCUHDouEXHZwIOVC + wQAADsEBuJFr7QAAAWtJREFUOE+1kE0ow2Ecx/9X5a2UiwtKOSCTmJBMhuQlMo3IvCUHDouEXHZwIOVC DrhIDiQl5USy07zNa2tKf2laaRf84/J8xBCetab4XL/f76fn+SnKX4DrGLqrwbHDzywkWJlHdJYjLEbY Wg8q4eYKlma+d1hbgF4TotWIaC+FuYmAktcXCksx2HrknBOHX1KbiTDngrXhW0kMdSBM2TA5Io+/wuI0 oiz5TcRwB7hPYazfLx3rDz7+gCsXNBb4v1SdgajTQ19TaOMP2NtFmPSIilSo0v1y7FHBnAdZMWi6aO51 @@ -196,7 +196,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wgAADsIBFShKgAAAATFJREFUOE9jYBg0oHDW8/9NC57/z5z4+D+6HAyEtz/AKceQO/PZ/1VH3v/HpSi+ + wQAADsEBuJFr7QAAATFJREFUOE9jYBg0oHDW8/9NC57/z5z4+D+6HAyEtz/AKceQO/PZ/1VH3v/HpSi+ +8H/4IZrWOXAIGPK0/8L933Aqii+5+H/pfv///evvoAhBwcJPU/+T9vyHkNRRPt9sObMWf//e5WewG1A ZNej/72rP6AoCm29B9bcuu7/f//Ov/9d8g/gNiCw+eH/uvnv4IqCW+7+X7T3//+Odf//Z8z5+d+u7ud/ +4ztuA3wqLr/P3/aGxRFdsW3/6fP+f3fv+vbf53Cd/8tEtbjNsC+9O7/7MmvMRTpp5z/b1L04r9K1qf/ @@ -207,7 +207,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wgAADsIBFShKgAAAALtJREFUOE9jYBgyILz9wX90MaJBfPeD/8EN18gzIL7n4f+l+///96++QLoBEe33 + wQAADsEBuJFr7QAAALtJREFUOE9jYBgyILz9wX90MaJBfPeD/8EN18gzIL7n4f+l+///96++QLoBEe33 wZozZ/3/71V6gjQDQlvvgTW3rvv/37/z73+X/APEGxDccvf/or3//3es+/8/Y87P/3Z1P//bZ2wn3gAQ sCu+/T99zu///l3f/usUvvtvkbCeNANAQD/l/H+Tohf/VbI+/TeOXEa6ASBgkHTiv2za1/+6wfPIMwAE 9FMv/9fwnUa+ASCg4jGBMgMGLwAA0BRgmCws/7cAAAAASUVORK5CYII= @@ -216,7 +216,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wgAADsIBFShKgAAAAKRJREFUOE9jYBh0oHDW8//oYiSB3JnP/id03yPfkIwpT//P2//7f0LXHfIMSeh5 + wQAADsEBuJFr7QAAAKRJREFUOE9jYBh0oHDW8//oYiSB3JnP/id03yPfkIwpT//P2//7f0LXHfIMSeh5 8n/2vl//O7f+/e9Wepl0QyK7Hv2fsu3X/5Klf/8nTP/73yb3LGmGBDY//N+69j1Ys3HJl//S0df+G0cu I94Qj6r7/0vmvoNrVnTpIV4zCNiX3v0f2PKMPM0gYJF3579NwRXyNIOAYdZt8jWDgE7aDfI1D00AAKB+ X6Bjq5qXAAAAAElFTkSuQmCC @@ -225,7 +225,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wgAADsIBFShKgAAAAStJREFUOE9jYBhUoHDW8//oYjAAkmta8Px/5sTHONUw5M589j+h+x5WBSC5VUfe + wQAADsEBuJFr7QAAAStJREFUOE9jYBhUoHDW8//oYjAAkmta8Px/5sTHONUw5M589j+h+x5WBSC5VUfe /w9vf4BVHgwypjz9P2//7/8JXXcwFIHkFu778D+44RqGHBwk9Dz5P3vfr/+dW//+dyu9jKIQJDdty/v/ /tUXcBsQ2fXo/5Rtv/6XLP37P2H63/82uWfhikFyvas//PcqPYHbgMDmh/9b174HazYu+fJfOvraf+PI ZWANILm6+e/+u+QfwG2AR9X9/yVz38E1K7r0wBWD5PKnvflvn7EdtwH2pXf/B7Y8w9AMk8ue/Pq/RcJ6 diff --git a/unimarc/unimarc/마크/Marc.cs b/unimarc/unimarc/마크/Marc.cs index d01b0dd..cb3d1ff 100644 --- a/unimarc/unimarc/마크/Marc.cs +++ b/unimarc/unimarc/마크/Marc.cs @@ -44,6 +44,15 @@ namespace UniMarc ml = _ml; } + protected override bool ProcessCmdKey(ref Message msg, Keys keyData) + { + if (keyData == Keys.Alt || keyData == (Keys.Alt | Keys.Menu)) + { + return true; + } + return base.ProcessCmdKey(ref msg, keyData); + } + string l_idx = string.Empty; string c_idx = string.Empty; private void Marc_Load(object sender, EventArgs e) @@ -496,8 +505,13 @@ namespace UniMarc string Incmd = db.DB_INSERT(table_name, Insert_tbl, Insert_col); PUB.log.Add("INSERT", string.Format("{0}({1},{2}) : {3}", PUB.user.UserName, PUB.user.CompanyIdx, List_Book.Rows[SaveRowIdx].DefaultCellStyle.ForeColor, Incmd)); - db.DB_Send_CMD_reVoid(Incmd); - isNewData = true; + long newIdx = db.DB_Send_CMD_Insert_GetIdx(Incmd); + if (newIdx > 0) + { + Midx = newIdx.ToString(); + List_Book.Rows[SaveRowIdx].Cells["marc_idx"].Value = Midx; + isNewData = true; + } } else { @@ -530,13 +544,8 @@ namespace UniMarc List_Book.Rows[SaveRowIdx].DefaultCellStyle.ForeColor = SetGradeColor(grade.ToString()); - if (isNewData) - { - string MidxQuery = string.Format("SELECT `idx` FROM Marc WHERE isbn = {0} AND `compidx` = {1};", grid_data[0], PUB.user.CompanyIdx); - PUB.log.Add("MarcInsert", string.Format("{0}({1}) : {2}", PUB.user.UserName, PUB.user.CompanyIdx, MidxQuery)); - Midx = db.DB_Send_CMD_Search(MidxQuery).Replace("|", ""); - List_Book.Rows[SaveRowIdx].Cells["marc_idx"].Value = Midx; - } + // (신규 추가 시 위에서 이미 Midx를 할당함) + string UpdateListIndex = string.Format("UPDATE `Obj_List_Book` SET `m_idx` = {0} WHERE `idx` = {1} AND 'compidx' ={2};", Midx, List_Book.Rows[SaveRowIdx].Cells["list_idx"].Value.ToString(), PUB.user.CompanyIdx); @@ -1495,25 +1504,22 @@ namespace UniMarc { TextBox tb = sender as TextBox; - //if (e.KeyCode == Keys.F3) - //{ - // int line = tb.SelectionStart; - // tb.Text = tb.Text.Insert(line, "▽"); - // tb.SelectionStart = line + 1; - //} + if (e.Alt && e.KeyCode >= Keys.A && e.KeyCode <= Keys.Z) + { + var letter = e.KeyCode.ToString().ToLower(); + tb.InvokeInsertText("▽" + letter); + e.SuppressKeyPress = true; + return; + } + if (e.KeyCode == Keys.F3) { tb.InvokeInsertText("▽"); - //tb.Select(tb.Text.Length, 0); } else if (e.KeyCode == Keys.F4) { tb.InvokeInsertText("△"); - //tb.Select(tb.Text.Length, 0); } - - //tb.SelectionStart = tb.Text.Length; - //tb.Select(tb.Text.Length, 0); } diff --git a/unimarc/unimarc/마크/Marc2.cs b/unimarc/unimarc/마크/Marc2.cs index 94d8639..0911f5e 100644 --- a/unimarc/unimarc/마크/Marc2.cs +++ b/unimarc/unimarc/마크/Marc2.cs @@ -1,6 +1,7 @@ using AR; using System; using System.Collections.Generic; +using System.ComponentModel; using System.Drawing; using System.Drawing.Drawing2D; using System.IO; @@ -37,9 +38,19 @@ namespace UniMarc Skill_Search_Text search_Text = new Skill_Search_Text(); String_Text st = new String_Text(); Mac_List ml; - + BindingList dataList = new BindingList(); MacListItem pItem = null; + protected override bool ProcessCmdKey(ref Message msg, Keys keyData) + { + // Alt 키 하나만 눌렸을 때 메뉴가 활성화되는 것을 방지 + if (keyData == Keys.Alt || keyData == (Keys.Alt | Keys.Menu)) + { + return true; + } + return base.ProcessCmdKey(ref msg, keyData); + } + private void MarcEditorControl1_NextButton(object sender, EventArgs e) @@ -65,7 +76,7 @@ namespace UniMarc marcEditorControl1.CloseButton += (s1, e1) => { this.Close(); }; } - + private void Marc_Load(object sender, EventArgs e) { // 콤보박스 정렬및 필터 @@ -95,7 +106,7 @@ namespace UniMarc return (ary[0], ary[1]); } - + /// /// 가져온 목록을 책목록과 연동하여 Grid에 집어넣음. /// @@ -132,11 +143,12 @@ namespace UniMarc this.Text = $"마크 작성(1){item.list_name}"; } - + string Area = "`idx`, `isbn_marc`, `header`, `num`, `book_name`, `author`, `book_comp`, `count`, `pay`, `image_url`, `m_idx`"; string[] sear_tbl = { "l_idx", "compidx" }; string[] sear_col = { item.idx, PUB.user.CompanyIdx }; + lbl_BookDate.Text = $"{item.start_date}"; lbl_BookList.Text = item.list_name; tbCustName.Text = item.customer_name; lbCustIDX.Text = item.customer; @@ -154,8 +166,8 @@ namespace UniMarc "", "", "V", "", "" }; mLoadCompleted = false; - List dataList = new List(); + dataList = new BindingList(); for (int a = 0; a < db_data.Length - 1; a += 11) { MarcBookItem bitem = new MarcBookItem(); @@ -290,7 +302,7 @@ namespace UniMarc return Color.Gray; case "3": // D - return Color.Red; + return Color.DarkViolet; default: return Color.Black; @@ -385,6 +397,7 @@ namespace UniMarc string user = List_Book.Rows[row_idx].Cells["user"].Value?.ToString() ?? ""; string saveDate = List_Book.Rows[row_idx].Cells["SaveDate"].Value?.ToString() ?? ""; string listIdx = List_Book.Rows[row_idx].Cells["list_idx"].Value?.ToString() ?? ""; // verify this column name in input_list + this.lbListIdx.Text = $"Row:{SaveRowIdx},List:{listIdx}"; var remark = ReadRemark(row_idx); var p = new MacEditorParameter { @@ -435,18 +448,24 @@ namespace UniMarc if (isSort) { - var list = bs1.DataSource as List; + var list = bs1.DataSource as BindingList; if (list != null) { + List sorted; if (combo == 0) { - list.Sort((x, y) => string.Compare(x.Grade, y.Grade)); + sorted = list.OrderBy(x => x.Grade).ToList(); } else { - list.Sort((x, y) => string.Compare(x.ISBN13, y.ISBN13)); + sorted = list.OrderBy(x => x.ISBN13).ToList(); } - bs1.ResetBindings(false); + + list.RaiseListChangedEvents = false; + list.Clear(); + foreach (var item in sorted) list.Add(item); + list.RaiseListChangedEvents = true; + list.ResetBindings(); } } else @@ -543,25 +562,19 @@ namespace UniMarc private void MarcEditorControl_BookSaved(object sender, MarcEditorControl.BookSavedEventArgs e) { + /* [기존 방식: UI 직접 수정 로직 주석 처리] string table_name = "Marc"; - //string[] grid_data = { - // e.griddata[0],// List_Book.Rows[SaveRowIdx].Cells["ISBN13"].Value.ToString(), - // e.griddata[1],//List_Book.Rows[SaveRowIdx].Cells["book_name"].Value.ToString(), - // e.griddata[2],//List_Book.Rows[SaveRowIdx].Cells["author"].Value.ToString(), - // e.griddata[3],//List_Book.Rows[SaveRowIdx].Cells["book_comp"].Value.ToString(), - // e.griddata[4],//List_Book.Rows[SaveRowIdx].Cells["pay"].Value.ToString(), - // e.griddata[5]//List_Book.Rows[SaveRowIdx].Cells["url"].Value.ToString() - //}; + //데이터인덱스를 찾아서 값을 업데이트한다. + var item = this.dataList.Where(t => t.ListIdx == e.Param.ListIdx).FirstOrDefault(); + string date = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); string orimarc = e.DBMarc;// st.made_Ori_marc(richTextBox1).Replace(@"\", "￦"); string Midx = List_Book.Rows[SaveRowIdx].Cells["marc_idx"].Value.ToString(); - string SaveDate = List_Book.Rows[SaveRowIdx].Cells["SaveDate"].Value.ToString(); string SaveUser = List_Book.Rows[SaveRowIdx].Cells["user"].Value.ToString(); bool IsCoverDate = false; - if (SaveDate != "") { // 마지막 수정일로부터 2일이 지났는지, 마지막 저장자가 사용자인지 확인 @@ -582,15 +595,20 @@ namespace UniMarc "grade", "marc_chk", "user", "division", "008tag", "date", "compidx" }; string[] Insert_col = { - e.griddata.ISBN13, e.griddata.BookName, e.griddata.Author, e.griddata.Publisher, - e.griddata.Price, orimarc, e.griddata.Remark1, e.griddata.Remark2, e.griddata.URL, - e.griddata.Grade, "1", mUserName, e.griddata.tag056, e.griddata.text008, + e.Param.ISBN13, e.Param.BookName, e.Param.Author, e.Param.Publisher, + e.Param.Price, orimarc, e.Param.Remark1, e.Param.Remark2, e.Param.URL, + e.Param.Grade, "1", mUserName, e.Param.tag056, e.Param.text008, date, mCompidx }; string Incmd = db.DB_INSERT(table_name, Insert_tbl, Insert_col); PUB.log.Add("INSERT", string.Format("{0}({1},{2}) : {3}", mUserName, mCompidx, List_Book.Rows[SaveRowIdx].DefaultCellStyle.ForeColor, Incmd)); - db.DB_Send_CMD_reVoid(Incmd); - isNewData = true; + long newIdx = db.DB_Send_CMD_Insert_GetIdx(Incmd); + if (newIdx > 0) + { + Midx = newIdx.ToString(); + List_Book.Rows[SaveRowIdx].Cells["marc_idx"].Value = Midx; + isNewData = true; + } } else { @@ -599,12 +617,12 @@ namespace UniMarc "비고2", "url", "division", "008tag", "date", "user", "grade" }; string[] Edit_col = { - mCompidx, orimarc, "1", mOldMarc , "0", e.griddata.Remark1, - e.griddata.Remark2, e.griddata.URL, e.griddata.tag056,e.griddata.text008, date, - mUserName, e.griddata.Grade }; + mCompidx, orimarc, "1", mOldMarc , "0", e.Param.Remark1, + e.Param.Remark2, e.Param.URL, e.Param.tag056,e.Param.text008, date, + mUserName, e.Param.Grade }; string[] Sear_tbl = { "idx", "compidx" }; string[] Sear_col = { Midx, mCompidx }; - if (e.griddata.ISBN13 == null || e.griddata.ISBN13 == "") + if (e.Param.ISBN13 == null || e.Param.ISBN13 == "") { MessageBox.Show("ISBN 데이터가 없습니다."); return; @@ -616,30 +634,80 @@ namespace UniMarc isNewData = false; } - List_Book.Rows[SaveRowIdx].Cells["grade"].Value = e.griddata.Grade; + List_Book.Rows[SaveRowIdx].Cells["grade"].Value = e.Param.Grade; List_Book.Rows[SaveRowIdx].Cells["SaveDate"].Value = e.SaveDate; List_Book.Rows[SaveRowIdx].Cells["user"].Value = mUserName; List_Book.Rows[SaveRowIdx].Cells["db_marc"].Value = e.DBMarc; List_Book.Rows[SaveRowIdx].DefaultCellStyle.ForeColor = SetGradeColor(grade.ToString()); + var item = List_Book.Rows[SaveRowIdx].DataBoundItem as MarcBookItem; if (item != null) item.ForeColor = List_Book.Rows[SaveRowIdx].DefaultCellStyle.ForeColor; - if (isNewData) - { - string MidxQuery = string.Format("SELECT `idx` FROM Marc WHERE isbn = {0} AND `compidx` = {1};", e.griddata.ISBN13, mCompidx); - PUB.log.Add("MarcInsert", string.Format("{0}({1}) : {2}", mUserName, mCompidx, MidxQuery)); - Midx = db.DB_Send_CMD_Search(MidxQuery).Replace("|", ""); - List_Book.Rows[SaveRowIdx].Cells["marc_idx"].Value = Midx; - } + // (신규 추가 시 위에서 이미 Midx를 할당함) + string UpdateListIndex = string.Format("UPDATE `Obj_List_Book` SET `m_idx` = {0} WHERE `idx` = {1} AND 'compidx' ={2};", Midx, List_Book.Rows[SaveRowIdx].Cells["list_idx"].Value.ToString(), mCompidx); PUB.log.Add("MarcUpdate", string.Format("{0}({1}) : {2}", mUserName, mCompidx, UpdateListIndex)); db.DB_Send_CMD_reVoid(UpdateListIndex); MessageBox.Show("저장되었습니다!"); + */ + // [신규 방식: 데이터 객체(Item) 중심 로직] + var item = this.dataList.Where(t => t.ListIdx == e.Param.ListIdx).FirstOrDefault(); + if (item == null) return; + string table_name = "Marc"; + string date = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); + string orimarc = e.DBMarc; + string Midx = item.MarcIdx; + + // 1. DB 작업 (저장 전략 결정: Foreground 색상 기준) + if (item.ForeColor == Color.Orange || item.ForeColor == Color.Red) + { + string[] Insert_tbl = { "ISBN", "서명", "저자", "출판사", "가격", "marc", "비고1", "비고2", "url", "grade", "marc_chk", "user", "division", "008tag", "date", "compidx" }; + string[] Insert_col = { e.Param.ISBN13, e.Param.BookName, e.Param.Author, e.Param.Publisher, e.Param.Price, orimarc, e.Param.Remark1, e.Param.Remark2, e.Param.URL, e.Param.Grade, "1", mUserName, e.Param.tag056, e.Param.text008, date, mCompidx }; + + string Incmd = db.DB_INSERT(table_name, Insert_tbl, Insert_col); + PUB.log.Add("INSERT", string.Format("{0}({1},{2}) : {3}", mUserName, mCompidx, item.ForeColor, Incmd)); + + long newIdx = db.DB_Send_CMD_Insert_GetIdx(Incmd); + if (newIdx > 0) + { + Midx = newIdx.ToString(); + item.MarcIdx = Midx; + } + } + else + { + string[] Edit_tbl = { "compidx", "marc", "marc_chk", "marc1", "marc_chk1", "비고1", "비고2", "url", "division", "008tag", "date", "user", "grade" }; + string[] Edit_col = { mCompidx, orimarc, "1", mOldMarc , "0", e.Param.Remark1, e.Param.Remark2, e.Param.URL, e.Param.tag056,e.Param.text008, date, mUserName, e.Param.Grade }; + string[] Sear_tbl = { "idx", "compidx" }; + string[] Sear_col = { Midx, mCompidx }; + + if (string.IsNullOrEmpty(e.Param.ISBN13)) { MessageBox.Show("ISBN 데이터가 없습니다."); return; } + + string U_cmd = db.More_Update(table_name, Edit_tbl, Edit_col, Sear_tbl, Sear_col); + PUB.log.Add("Update", string.Format("{0}({1},{2}) : {3}", mUserName, mCompidx, item.ForeColor, U_cmd.Replace("\r", " ").Replace("\n", " "))); + db.DB_Send_CMD_reVoid(U_cmd); + } + + // 2. 객체 데이터 업데이트 및 시각적 상태 계산 + item.Grade = e.Param.Grade; + item.SaveDate = date; + item.User = mUserName; + item.DbMarc = e.DBMarc; + item.ForeColor = SetGradeColor(item.Grade); + item.BackColor = GetSaveDateColor(date); + + // 3. 목록 인덱스 연동 업데이트 (Obj_List_Book) + string UpdateListIndex = string.Format("UPDATE `Obj_List_Book` SET `m_idx` = {0} WHERE `idx` = {1} AND `compidx` ={2};", Midx, item.ListIdx, mCompidx); + db.DB_Send_CMD_reVoid(UpdateListIndex); + + // 4. BindingSource 갱신으로 UI 자동 업데이트 + bs1.ResetCurrentItem(); + MessageBox.Show("저장되었습니다!"); } #region Save_Click_Sub @@ -801,25 +869,22 @@ namespace UniMarc { TextBox tb = sender as TextBox; - //if (e.KeyCode == Keys.F3) - //{ - // int line = tb.SelectionStart; - // tb.Text = tb.Text.Insert(line, "▽"); - // tb.SelectionStart = line + 1; - //} + if (e.Alt && e.KeyCode >= Keys.A && e.KeyCode <= Keys.Z) + { + var letter = e.KeyCode.ToString().ToLower(); + tb.InvokeInsertText("▽" + letter); + e.SuppressKeyPress = true; + return; + } + if (e.KeyCode == Keys.F3) { tb.InvokeInsertText("▽"); - //tb.Select(tb.Text.Length, 0); } else if (e.KeyCode == Keys.F4) { tb.InvokeInsertText("△"); - //tb.Select(tb.Text.Length, 0); } - - //tb.SelectionStart = tb.Text.Length; - //tb.Select(tb.Text.Length, 0); } @@ -925,7 +990,7 @@ namespace UniMarc if (int.TryParse(lbCustIDX.Text, out int custidx) && custidx >= 0) { var sql = $"update Obj_List set customer={custidx} where idx = {pItem.idx} and comp_num={PUB.user.CompanyIdx}"; - var cnt = Helper_DB.ExcuteNonQuery(sql,out string msg); + var cnt = Helper_DB.ExcuteNonQuery(sql, out string msg); if (cnt != 1) UTIL.MsgE($"데이터 저장시 오류가 발생했습니다. 영향을 받은 행 수 = {cnt},메세지={msg}"); } diff --git a/unimarc/unimarc/마크/Marc2.designer.cs b/unimarc/unimarc/마크/Marc2.designer.cs index 47ddff8..23e68ce 100644 --- a/unimarc/unimarc/마크/Marc2.designer.cs +++ b/unimarc/unimarc/마크/Marc2.designer.cs @@ -39,10 +39,10 @@ System.Windows.Forms.Label label25; System.Windows.Forms.Label label26; System.Windows.Forms.Label label27; - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Marc2)); this.List_Book = new System.Windows.Forms.DataGridView(); this.list_idx = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -73,19 +73,15 @@ this.tbCustName = new System.Windows.Forms.Button(); this.lbCustIDX = new System.Windows.Forms.Label(); this.btCopy = new System.Windows.Forms.Button(); - this.statusStrip1 = new System.Windows.Forms.StatusStrip(); - this.lbl_BookList = new System.Windows.Forms.ToolStripStatusLabel(); - this.btClose = new System.Windows.Forms.Button(); this.panel2 = new System.Windows.Forms.Panel(); - this.marcEditorControl1 = new UniMarc.MarcEditorControl(); this.panel3 = new System.Windows.Forms.Panel(); this.panel4 = new System.Windows.Forms.Panel(); + this.lbl_BookList = new System.Windows.Forms.Label(); + this.lbl_BookDate = new System.Windows.Forms.Label(); this.button1 = new System.Windows.Forms.Button(); this.bn1 = new System.Windows.Forms.BindingNavigator(this.components); - this.bindingNavigatorAddNewItem = new System.Windows.Forms.ToolStripButton(); this.bs1 = new System.Windows.Forms.BindingSource(this.components); this.bindingNavigatorCountItem = new System.Windows.Forms.ToolStripLabel(); - this.bindingNavigatorDeleteItem = new System.Windows.Forms.ToolStripButton(); this.bindingNavigatorMoveFirstItem = new System.Windows.Forms.ToolStripButton(); this.bindingNavigatorMovePreviousItem = new System.Windows.Forms.ToolStripButton(); this.bindingNavigatorSeparator = new System.Windows.Forms.ToolStripSeparator(); @@ -93,8 +89,10 @@ this.bindingNavigatorSeparator1 = new System.Windows.Forms.ToolStripSeparator(); this.bindingNavigatorMoveNextItem = new System.Windows.Forms.ToolStripButton(); this.bindingNavigatorMoveLastItem = new System.Windows.Forms.ToolStripButton(); - this.bindingNavigatorSeparator2 = new System.Windows.Forms.ToolStripSeparator(); - this.lblBookDate = new System.Windows.Forms.ToolStripStatusLabel(); + this.marcEditorControl1 = new UniMarc.MarcEditorControl(); + this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); + this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel(); + this.lbListIdx = new System.Windows.Forms.ToolStripLabel(); label31 = new System.Windows.Forms.Label(); label30 = new System.Windows.Forms.Label(); label33 = new System.Windows.Forms.Label(); @@ -107,7 +105,6 @@ label27 = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.List_Book)).BeginInit(); this.panel1.SuspendLayout(); - this.statusStrip1.SuspendLayout(); this.panel2.SuspendLayout(); this.panel3.SuspendLayout(); this.panel4.SuspendLayout(); @@ -193,14 +190,14 @@ this.List_Book.AllowUserToDeleteRows = false; this.List_Book.BackgroundColor = System.Drawing.Color.SkyBlue; this.List_Book.BorderStyle = System.Windows.Forms.BorderStyle.None; - dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle5.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.List_Book.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle5; + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle1.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.List_Book.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1; this.List_Book.ColumnHeadersHeight = 29; this.List_Book.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.list_idx, @@ -220,22 +217,22 @@ this.SaveDate}); this.List_Book.Dock = System.Windows.Forms.DockStyle.Fill; this.List_Book.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically; - this.List_Book.Location = new System.Drawing.Point(0, 68); + this.List_Book.Location = new System.Drawing.Point(0, 103); this.List_Book.MultiSelect = false; this.List_Book.Name = "List_Book"; this.List_Book.ReadOnly = true; - dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.ControlDark; - dataGridViewCellStyle8.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - dataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.List_Book.RowHeadersDefaultCellStyle = dataGridViewCellStyle8; + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.ControlDark; + dataGridViewCellStyle4.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.List_Book.RowHeadersDefaultCellStyle = dataGridViewCellStyle4; this.List_Book.RowHeadersWidth = 51; this.List_Book.RowTemplate.Height = 23; this.List_Book.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.List_Book.Size = new System.Drawing.Size(555, 541); + this.List_Book.Size = new System.Drawing.Size(555, 528); this.List_Book.TabIndex = 217; this.List_Book.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.List_Book_RowPostPaint); this.List_Book.SelectionChanged += new System.EventHandler(this.List_Book_SelectionChanged); @@ -357,9 +354,9 @@ // grade // this.grade.DataPropertyName = "Grade"; - dataGridViewCellStyle6.Format = "N0"; - dataGridViewCellStyle6.NullValue = null; - this.grade.DefaultCellStyle = dataGridViewCellStyle6; + dataGridViewCellStyle2.Format = "N0"; + dataGridViewCellStyle2.NullValue = null; + this.grade.DefaultCellStyle = dataGridViewCellStyle2; this.grade.HeaderText = "등급"; this.grade.MinimumWidth = 6; this.grade.Name = "grade"; @@ -370,8 +367,8 @@ // colCheck // this.colCheck.DataPropertyName = "ColCheck"; - dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.colCheck.DefaultCellStyle = dataGridViewCellStyle7; + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.colCheck.DefaultCellStyle = dataGridViewCellStyle3; this.colCheck.HeaderText = "V"; this.colCheck.MinimumWidth = 6; this.colCheck.Name = "colCheck"; @@ -447,7 +444,7 @@ this.panel1.Controls.Add(this.rb_Filter); this.panel1.Controls.Add(this.comboBox8); this.panel1.Dock = System.Windows.Forms.DockStyle.Top; - this.panel1.Location = new System.Drawing.Point(0, 33); + this.panel1.Location = new System.Drawing.Point(0, 68); this.panel1.Name = "panel1"; this.panel1.Size = new System.Drawing.Size(555, 35); this.panel1.TabIndex = 226; @@ -500,7 +497,7 @@ this.checkBox3.BackColor = System.Drawing.Color.White; this.checkBox3.Checked = true; this.checkBox3.CheckState = System.Windows.Forms.CheckState.Checked; - this.checkBox3.Location = new System.Drawing.Point(509, 74); + this.checkBox3.Location = new System.Drawing.Point(511, 109); this.checkBox3.Name = "checkBox3"; this.checkBox3.Size = new System.Drawing.Size(15, 14); this.checkBox3.TabIndex = 227; @@ -510,11 +507,10 @@ // tbCustName // this.tbCustName.BackColor = System.Drawing.Color.LightGray; - this.tbCustName.Dock = System.Windows.Forms.DockStyle.Fill; this.tbCustName.Font = new System.Drawing.Font("굴림체", 14.25F, System.Drawing.FontStyle.Bold); - this.tbCustName.Location = new System.Drawing.Point(103, 3); + this.tbCustName.Location = new System.Drawing.Point(163, 35); this.tbCustName.Name = "tbCustName"; - this.tbCustName.Size = new System.Drawing.Size(301, 27); + this.tbCustName.Size = new System.Drawing.Size(314, 27); this.tbCustName.TabIndex = 33; this.tbCustName.Text = " "; this.tbCustName.UseVisualStyleBackColor = false; @@ -523,12 +519,10 @@ // lbCustIDX // this.lbCustIDX.BackColor = System.Drawing.Color.LightGray; - this.lbCustIDX.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.lbCustIDX.Dock = System.Windows.Forms.DockStyle.Right; this.lbCustIDX.Font = new System.Drawing.Font("굴림체", 14.25F, System.Drawing.FontStyle.Bold); - this.lbCustIDX.Location = new System.Drawing.Point(404, 3); + this.lbCustIDX.Location = new System.Drawing.Point(483, 35); this.lbCustIDX.Name = "lbCustIDX"; - this.lbCustIDX.Size = new System.Drawing.Size(60, 27); + this.lbCustIDX.Size = new System.Drawing.Size(63, 27); this.lbCustIDX.TabIndex = 319; this.lbCustIDX.Text = " "; this.lbCustIDX.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -544,38 +538,6 @@ this.btCopy.UseVisualStyleBackColor = true; this.btCopy.Click += new System.EventHandler(this.button1_Click); // - // statusStrip1 - // - this.statusStrip1.BackColor = System.Drawing.SystemColors.Control; - this.statusStrip1.Font = new System.Drawing.Font("굴림체", 14.25F, System.Drawing.FontStyle.Bold); - this.statusStrip1.ImageScalingSize = new System.Drawing.Size(20, 20); - this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.lblBookDate, - this.lbl_BookList}); - this.statusStrip1.Location = new System.Drawing.Point(0, 634); - this.statusStrip1.Name = "statusStrip1"; - this.statusStrip1.Padding = new System.Windows.Forms.Padding(1, 0, 12, 0); - this.statusStrip1.Size = new System.Drawing.Size(1638, 24); - this.statusStrip1.TabIndex = 322; - this.statusStrip1.Text = "statusStrip1"; - // - // lbl_BookList - // - this.lbl_BookList.Name = "lbl_BookList"; - this.lbl_BookList.Size = new System.Drawing.Size(119, 19); - this.lbl_BookList.Text = "{booklist}"; - // - // btClose - // - this.btClose.Dock = System.Windows.Forms.DockStyle.Right; - this.btClose.Location = new System.Drawing.Point(464, 3); - this.btClose.Name = "btClose"; - this.btClose.Size = new System.Drawing.Size(88, 27); - this.btClose.TabIndex = 324; - this.btClose.Text = "닫 기"; - this.btClose.UseVisualStyleBackColor = true; - this.btClose.Click += new System.EventHandler(this.btClose_Click); - // // panel2 // this.panel2.Controls.Add(this.marcEditorControl1); @@ -583,19 +545,9 @@ this.panel2.Location = new System.Drawing.Point(555, 0); this.panel2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(1083, 634); + this.panel2.Size = new System.Drawing.Size(1083, 658); this.panel2.TabIndex = 325; // - // marcEditorControl1 - // - this.marcEditorControl1.BackColor = System.Drawing.Color.Gray; - this.marcEditorControl1.Dock = System.Windows.Forms.DockStyle.Fill; - this.marcEditorControl1.Font = new System.Drawing.Font("돋움", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.marcEditorControl1.Location = new System.Drawing.Point(0, 0); - this.marcEditorControl1.Name = "marcEditorControl1"; - this.marcEditorControl1.Size = new System.Drawing.Size(1083, 634); - this.marcEditorControl1.TabIndex = 0; - // // panel3 // this.panel3.BackColor = System.Drawing.Color.White; @@ -608,28 +560,48 @@ this.panel3.Location = new System.Drawing.Point(0, 0); this.panel3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(555, 634); + this.panel3.Size = new System.Drawing.Size(555, 658); this.panel3.TabIndex = 325; // // panel4 // + this.panel4.Controls.Add(this.lbl_BookList); + this.panel4.Controls.Add(this.lbl_BookDate); this.panel4.Controls.Add(this.tbCustName); this.panel4.Controls.Add(this.lbCustIDX); - this.panel4.Controls.Add(this.btClose); this.panel4.Controls.Add(this.button1); this.panel4.Dock = System.Windows.Forms.DockStyle.Top; this.panel4.Location = new System.Drawing.Point(0, 0); this.panel4.Name = "panel4"; this.panel4.Padding = new System.Windows.Forms.Padding(3); - this.panel4.Size = new System.Drawing.Size(555, 33); + this.panel4.Size = new System.Drawing.Size(555, 68); this.panel4.TabIndex = 327; // + // lbl_BookList + // + this.lbl_BookList.BackColor = System.Drawing.Color.LightGray; + this.lbl_BookList.Font = new System.Drawing.Font("굴림체", 14.25F, System.Drawing.FontStyle.Bold); + this.lbl_BookList.Location = new System.Drawing.Point(163, 6); + this.lbl_BookList.Name = "lbl_BookList"; + this.lbl_BookList.Size = new System.Drawing.Size(383, 27); + this.lbl_BookList.TabIndex = 326; + this.lbl_BookList.Text = " "; + // + // lbl_BookDate + // + this.lbl_BookDate.BackColor = System.Drawing.Color.LightGray; + this.lbl_BookDate.Font = new System.Drawing.Font("굴림체", 14.25F, System.Drawing.FontStyle.Bold); + this.lbl_BookDate.Location = new System.Drawing.Point(6, 6); + this.lbl_BookDate.Name = "lbl_BookDate"; + this.lbl_BookDate.Size = new System.Drawing.Size(151, 27); + this.lbl_BookDate.TabIndex = 325; + this.lbl_BookDate.Text = " "; + // // button1 // - this.button1.Dock = System.Windows.Forms.DockStyle.Left; - this.button1.Location = new System.Drawing.Point(3, 3); + this.button1.Location = new System.Drawing.Point(6, 35); this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(100, 27); + this.button1.Size = new System.Drawing.Size(151, 27); this.button1.TabIndex = 324; this.button1.Text = "다시불러오기"; this.button1.UseVisualStyleBackColor = true; @@ -637,11 +609,12 @@ // // bn1 // - this.bn1.AddNewItem = this.bindingNavigatorAddNewItem; + this.bn1.AddNewItem = null; this.bn1.BindingSource = this.bs1; this.bn1.CountItem = this.bindingNavigatorCountItem; - this.bn1.DeleteItem = this.bindingNavigatorDeleteItem; + this.bn1.DeleteItem = null; this.bn1.Dock = System.Windows.Forms.DockStyle.Bottom; + this.bn1.ImageScalingSize = new System.Drawing.Size(20, 20); this.bn1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.bindingNavigatorMoveFirstItem, this.bindingNavigatorMovePreviousItem, @@ -651,52 +624,34 @@ this.bindingNavigatorSeparator1, this.bindingNavigatorMoveNextItem, this.bindingNavigatorMoveLastItem, - this.bindingNavigatorSeparator2, - this.bindingNavigatorAddNewItem, - this.bindingNavigatorDeleteItem}); - this.bn1.Location = new System.Drawing.Point(0, 609); + this.toolStripSeparator1, + this.toolStripLabel1, + this.lbListIdx}); + this.bn1.Location = new System.Drawing.Point(0, 631); this.bn1.MoveFirstItem = this.bindingNavigatorMoveFirstItem; this.bn1.MoveLastItem = this.bindingNavigatorMoveLastItem; this.bn1.MoveNextItem = this.bindingNavigatorMoveNextItem; this.bn1.MovePreviousItem = this.bindingNavigatorMovePreviousItem; this.bn1.Name = "bn1"; this.bn1.PositionItem = this.bindingNavigatorPositionItem; - this.bn1.Size = new System.Drawing.Size(555, 25); + this.bn1.Size = new System.Drawing.Size(555, 27); this.bn1.TabIndex = 326; this.bn1.Text = "bindingNavigator1"; // - // bindingNavigatorAddNewItem - // - this.bindingNavigatorAddNewItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.bindingNavigatorAddNewItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorAddNewItem.Image"))); - this.bindingNavigatorAddNewItem.Name = "bindingNavigatorAddNewItem"; - this.bindingNavigatorAddNewItem.RightToLeftAutoMirrorImage = true; - this.bindingNavigatorAddNewItem.Size = new System.Drawing.Size(23, 22); - this.bindingNavigatorAddNewItem.Text = "새로 추가"; - // // bindingNavigatorCountItem // this.bindingNavigatorCountItem.Name = "bindingNavigatorCountItem"; - this.bindingNavigatorCountItem.Size = new System.Drawing.Size(27, 22); + this.bindingNavigatorCountItem.Size = new System.Drawing.Size(27, 24); this.bindingNavigatorCountItem.Text = "/{0}"; this.bindingNavigatorCountItem.ToolTipText = "전체 항목 수"; // - // bindingNavigatorDeleteItem - // - this.bindingNavigatorDeleteItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.bindingNavigatorDeleteItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorDeleteItem.Image"))); - this.bindingNavigatorDeleteItem.Name = "bindingNavigatorDeleteItem"; - this.bindingNavigatorDeleteItem.RightToLeftAutoMirrorImage = true; - this.bindingNavigatorDeleteItem.Size = new System.Drawing.Size(23, 22); - this.bindingNavigatorDeleteItem.Text = "삭제"; - // // bindingNavigatorMoveFirstItem // this.bindingNavigatorMoveFirstItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; this.bindingNavigatorMoveFirstItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveFirstItem.Image"))); this.bindingNavigatorMoveFirstItem.Name = "bindingNavigatorMoveFirstItem"; this.bindingNavigatorMoveFirstItem.RightToLeftAutoMirrorImage = true; - this.bindingNavigatorMoveFirstItem.Size = new System.Drawing.Size(23, 22); + this.bindingNavigatorMoveFirstItem.Size = new System.Drawing.Size(24, 24); this.bindingNavigatorMoveFirstItem.Text = "처음으로 이동"; // // bindingNavigatorMovePreviousItem @@ -705,13 +660,13 @@ this.bindingNavigatorMovePreviousItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMovePreviousItem.Image"))); this.bindingNavigatorMovePreviousItem.Name = "bindingNavigatorMovePreviousItem"; this.bindingNavigatorMovePreviousItem.RightToLeftAutoMirrorImage = true; - this.bindingNavigatorMovePreviousItem.Size = new System.Drawing.Size(23, 22); + this.bindingNavigatorMovePreviousItem.Size = new System.Drawing.Size(24, 24); this.bindingNavigatorMovePreviousItem.Text = "이전으로 이동"; // // bindingNavigatorSeparator // this.bindingNavigatorSeparator.Name = "bindingNavigatorSeparator"; - this.bindingNavigatorSeparator.Size = new System.Drawing.Size(6, 25); + this.bindingNavigatorSeparator.Size = new System.Drawing.Size(6, 27); // // bindingNavigatorPositionItem // @@ -726,7 +681,7 @@ // bindingNavigatorSeparator1 // this.bindingNavigatorSeparator1.Name = "bindingNavigatorSeparator1"; - this.bindingNavigatorSeparator1.Size = new System.Drawing.Size(6, 25); + this.bindingNavigatorSeparator1.Size = new System.Drawing.Size(6, 27); // // bindingNavigatorMoveNextItem // @@ -734,7 +689,7 @@ this.bindingNavigatorMoveNextItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveNextItem.Image"))); this.bindingNavigatorMoveNextItem.Name = "bindingNavigatorMoveNextItem"; this.bindingNavigatorMoveNextItem.RightToLeftAutoMirrorImage = true; - this.bindingNavigatorMoveNextItem.Size = new System.Drawing.Size(23, 22); + this.bindingNavigatorMoveNextItem.Size = new System.Drawing.Size(24, 24); this.bindingNavigatorMoveNextItem.Text = "다음으로 이동"; // // bindingNavigatorMoveLastItem @@ -743,19 +698,36 @@ this.bindingNavigatorMoveLastItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveLastItem.Image"))); this.bindingNavigatorMoveLastItem.Name = "bindingNavigatorMoveLastItem"; this.bindingNavigatorMoveLastItem.RightToLeftAutoMirrorImage = true; - this.bindingNavigatorMoveLastItem.Size = new System.Drawing.Size(23, 22); + this.bindingNavigatorMoveLastItem.Size = new System.Drawing.Size(24, 24); this.bindingNavigatorMoveLastItem.Text = "마지막으로 이동"; // - // bindingNavigatorSeparator2 + // marcEditorControl1 // - this.bindingNavigatorSeparator2.Name = "bindingNavigatorSeparator2"; - this.bindingNavigatorSeparator2.Size = new System.Drawing.Size(6, 25); + this.marcEditorControl1.BackColor = System.Drawing.Color.Gray; + this.marcEditorControl1.Dock = System.Windows.Forms.DockStyle.Fill; + this.marcEditorControl1.Font = new System.Drawing.Font("돋움", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.marcEditorControl1.Location = new System.Drawing.Point(0, 0); + this.marcEditorControl1.Name = "marcEditorControl1"; + this.marcEditorControl1.Size = new System.Drawing.Size(1083, 658); + this.marcEditorControl1.TabIndex = 0; // - // lblBookDate + // toolStripSeparator1 // - this.lblBookDate.Name = "lblBookDate"; - this.lblBookDate.Size = new System.Drawing.Size(119, 19); - this.lblBookDate.Text = "{bookdate}"; + this.toolStripSeparator1.Name = "toolStripSeparator1"; + this.toolStripSeparator1.Size = new System.Drawing.Size(6, 27); + // + // toolStripLabel1 + // + this.toolStripLabel1.Name = "toolStripLabel1"; + this.toolStripLabel1.Size = new System.Drawing.Size(25, 24); + this.toolStripLabel1.Text = "List"; + // + // lbListIdx + // + this.lbListIdx.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold); + this.lbListIdx.Name = "lbListIdx"; + this.lbListIdx.Size = new System.Drawing.Size(14, 24); + this.lbListIdx.Text = "0"; // // Marc2 // @@ -765,7 +737,6 @@ this.ClientSize = new System.Drawing.Size(1638, 658); this.Controls.Add(this.panel2); this.Controls.Add(this.panel3); - this.Controls.Add(this.statusStrip1); this.Controls.Add(this.btCopy); this.KeyPreview = true; this.Name = "Marc2"; @@ -775,8 +746,6 @@ this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.Marc_KeyDown); ((System.ComponentModel.ISupportInitialize)(this.List_Book)).EndInit(); this.panel1.ResumeLayout(false); - this.statusStrip1.ResumeLayout(false); - this.statusStrip1.PerformLayout(); this.panel2.ResumeLayout(false); this.panel3.ResumeLayout(false); this.panel3.PerformLayout(); @@ -786,7 +755,6 @@ this.bn1.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.bs1)).EndInit(); this.ResumeLayout(false); - this.PerformLayout(); } @@ -824,18 +792,13 @@ public System.Windows.Forms.Button tbCustName; public System.Windows.Forms.Label lbCustIDX; private System.Windows.Forms.Button btCopy; - private System.Windows.Forms.StatusStrip statusStrip1; - private System.Windows.Forms.ToolStripStatusLabel lbl_BookList; - private System.Windows.Forms.Button btClose; private System.Windows.Forms.Panel panel2; private System.Windows.Forms.Panel panel3; private System.Windows.Forms.Button button1; public MarcEditorControl marcEditorControl1; private System.Windows.Forms.BindingSource bs1; private System.Windows.Forms.BindingNavigator bn1; - private System.Windows.Forms.ToolStripButton bindingNavigatorAddNewItem; private System.Windows.Forms.ToolStripLabel bindingNavigatorCountItem; - private System.Windows.Forms.ToolStripButton bindingNavigatorDeleteItem; private System.Windows.Forms.ToolStripButton bindingNavigatorMoveFirstItem; private System.Windows.Forms.ToolStripButton bindingNavigatorMovePreviousItem; private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator; @@ -843,8 +806,11 @@ private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator1; private System.Windows.Forms.ToolStripButton bindingNavigatorMoveNextItem; private System.Windows.Forms.ToolStripButton bindingNavigatorMoveLastItem; - private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator2; private System.Windows.Forms.Panel panel4; - private System.Windows.Forms.ToolStripStatusLabel lblBookDate; + public System.Windows.Forms.Label lbl_BookList; + public System.Windows.Forms.Label lbl_BookDate; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator1; + private System.Windows.Forms.ToolStripLabel toolStripLabel1; + private System.Windows.Forms.ToolStripLabel lbListIdx; } } \ No newline at end of file diff --git a/unimarc/unimarc/마크/Marc2.resx b/unimarc/unimarc/마크/Marc2.resx index a2fe968..e7efbe8 100644 --- a/unimarc/unimarc/마크/Marc2.resx +++ b/unimarc/unimarc/마크/Marc2.resx @@ -192,47 +192,17 @@ True - - 17, 17 - 273, 17 - - 273, 17 - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wQAADsEBuJFr7QAAAVdJREFUOE/Nz0tLAmEUBmB3kWRoCUVEISFUJGb1OywiKrDsIpZdkJAkDUvDQkij - UKSbVIvatKhNi9oERRAGEQXhjJdp7Hd83/eGs2jhLGQ20QtndTgP71Gp/m0KZ1XInlTjM6XG+4EG5fuK - yaTUIN8bIMUQ0gmtcuBtX/MLPMT0yoHnuA6kuA4iruI20lAZ+DiswWuyFum4Dk+7dbiP6kHEFVDBg+tQ - My4DLbjwG3DqbcORxygHXxJakGIQRFwDEf0gwjKI4AYtzIHmHaA5Oxg/CsYPIb7YIQced+qluvTLCyIs - gRYWQPNO0NwkWNYGxg+DcYNgGSu2Z0xy4C7SiJtwE66kuq049xlAs2Ng/AiS7nbszXci6jIh4jQjPGWR - A+U59hiluowbQMzVVfmgPKU/GdcPxlmx5TArB6KzJunf0gTtPcqBzeluhCYsCIz3wm/rUw78WX4AJCPY - nlwVm9EAAAAASUVORK5CYII= - - 134, 17 - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wQAADsEBuJFr7QAAAWtJREFUOE+1kE0ow2Ecx/9X5a2UiwtKOSCTmJBMhuQlMo3IvCUHDouEXHZwIOVC - DrhIDiQl5USy07zNa2tKf2laaRf84/J8xBCetab4XL/f76fn+SnKX4DrGLqrwbHDzywkWJlHdJYjLEbY - Wg8q4eYKlma+d1hbgF4TotWIaC+FuYmAktcXCksx2HrknBOHX1KbiTDngrXhW0kMdSBM2TA5Io+/wuI0 - oiz5TcRwB7hPYazfLx3rDz7+gCsXNBb4v1SdgajTQ19TaOMP2NtFmPSIilSo0v1y7FHBnAdZMWi6aO51 - kVCTGZoEzzWYciA/Dl9bBZwfvh3XmxIJy7PBJdx5odnAQ2E87qJUfPbtzwGjVpxJEWjH+4ElPD/BYBsY - EjhKicW3sSoVb0vSUFsq0W6upUxhdxMtOxZnYhhqVz1oj3JJUZSdpCg0p0POmLKhJofjNqaDeikX3tFG - uuHsQM65cML4ABzY5fA/eQGKIwMcVjm2bAAAAABJRU5ErkJggg== - - + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wQAADsEBuJFr7QAAATFJREFUOE9jYBg0oHDW8/9NC57/z5z4+D+6HAyEtz/AKceQO/PZ/1VH3v/HpSi+ + vAAADrwBlbxySQAAATFJREFUOE9jYBg0oHDW8/9NC57/z5z4+D+6HAyEtz/AKceQO/PZ/1VH3v/HpSi+ +8H/4IZrWOXAIGPK0/8L933Aqii+5+H/pfv///evvoAhBwcJPU/+T9vyHkNRRPt9sObMWf//e5WewG1A ZNej/72rP6AoCm29B9bcuu7/f//Ov/9d8g/gNiCw+eH/uvnv4IqCW+7+X7T3//+Odf//Z8z5+d+u7ud/ +4ztuA3wqLr/P3/aGxRFdsW3/6fP+f3fv+vbf53Cd/8tEtbjNsC+9O7/7MmvMRTpp5z/b1L04r9K1qf/ @@ -243,7 +213,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wQAADsEBuJFr7QAAALtJREFUOE9jYBgyILz9wX90MaJBfPeD/8EN18gzIL7n4f+l+///96++QLoBEe33 + vAAADrwBlbxySQAAALtJREFUOE9jYBgyILz9wX90MaJBfPeD/8EN18gzIL7n4f+l+///96++QLoBEe33 wZozZ/3/71V6gjQDQlvvgTW3rvv/37/z73+X/APEGxDccvf/or3//3es+/8/Y87P/3Z1P//bZ2wn3gAQ sCu+/T99zu///l3f/usUvvtvkbCeNANAQD/l/H+Tohf/VbI+/TeOXEa6ASBgkHTiv2za1/+6wfPIMwAE 9FMv/9fwnUa+ASCg4jGBMgMGLwAA0BRgmCws/7cAAAAASUVORK5CYII= @@ -252,7 +222,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wQAADsEBuJFr7QAAAKRJREFUOE9jYBh0oHDW8//oYiSB3JnP/id03yPfkIwpT//P2//7f0LXHfIMSeh5 + vAAADrwBlbxySQAAAKRJREFUOE9jYBh0oHDW8//oYiSB3JnP/id03yPfkIwpT//P2//7f0LXHfIMSeh5 8n/2vl//O7f+/e9Wepl0QyK7Hv2fsu3X/5Klf/8nTP/73yb3LGmGBDY//N+69j1Ys3HJl//S0df+G0cu I94Qj6r7/0vmvoNrVnTpIV4zCNiX3v0f2PKMPM0gYJF3579NwRXyNIOAYdZt8jWDgE7aDfI1D00AAKB+ X6Bjq5qXAAAAAElFTkSuQmCC @@ -261,7 +231,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wQAADsEBuJFr7QAAAStJREFUOE9jYBhUoHDW8//oYjAAkmta8Px/5sTHONUw5M589j+h+x5WBSC5VUfe + vAAADrwBlbxySQAAAStJREFUOE9jYBhUoHDW8//oYjAAkmta8Px/5sTHONUw5M589j+h+x5WBSC5VUfe /w9vf4BVHgwypjz9P2//7/8JXXcwFIHkFu778D+44RqGHBwk9Dz5P3vfr/+dW//+dyu9jKIQJDdty/v/ /tUXcBsQ2fXo/5Rtv/6XLP37P2H63/82uWfhikFyvas//PcqPYHbgMDmh/9b174HazYu+fJfOvraf+PI ZWANILm6+e/+u+QfwG2AR9X9/yVz38E1K7r0wBWD5PKnvflvn7EdtwH2pXf/B7Y8w9AMk8ue/Pq/RcJ6 diff --git a/unimarc/unimarc/마크/MarcEditorControl.Designer.cs b/unimarc/unimarc/마크/MarcEditorControl.Designer.cs index e73adc0..8a14ff3 100644 --- a/unimarc/unimarc/마크/MarcEditorControl.Designer.cs +++ b/unimarc/unimarc/마크/MarcEditorControl.Designer.cs @@ -28,14 +28,14 @@ /// private void InitializeComponent() { - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle25 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle26 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle27 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle28 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle29 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle30 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle31 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle32 = new System.Windows.Forms.DataGridViewCellStyle(); this.label31 = new System.Windows.Forms.Label(); this.label30 = new System.Windows.Forms.Label(); this.label33 = new System.Windows.Forms.Label(); @@ -85,6 +85,7 @@ this.btn_FillBlank = new System.Windows.Forms.Button(); this.tabControl1 = new System.Windows.Forms.TabControl(); this.tabPage1 = new System.Windows.Forms.TabPage(); + this.label7 = new System.Windows.Forms.Label(); this.tabPage2 = new System.Windows.Forms.TabPage(); this.panel4 = new System.Windows.Forms.Panel(); this.Btn_interlock = new System.Windows.Forms.Button(); @@ -360,9 +361,9 @@ this.richTextBox1.BorderStyle = System.Windows.Forms.BorderStyle.None; this.richTextBox1.Dock = System.Windows.Forms.DockStyle.Fill; this.richTextBox1.Font = new System.Drawing.Font("굴림체", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.richTextBox1.Location = new System.Drawing.Point(3, 3); + this.richTextBox1.Location = new System.Drawing.Point(3, 30); this.richTextBox1.Name = "richTextBox1"; - this.richTextBox1.Size = new System.Drawing.Size(935, 779); + this.richTextBox1.Size = new System.Drawing.Size(935, 752); this.richTextBox1.TabIndex = 32; this.richTextBox1.Text = ""; this.richTextBox1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.richTextBox1_KeyDown); @@ -768,6 +769,7 @@ // this.tabPage1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); this.tabPage1.Controls.Add(this.richTextBox1); + this.tabPage1.Controls.Add(this.label7); this.tabPage1.Location = new System.Drawing.Point(4, 23); this.tabPage1.Name = "tabPage1"; this.tabPage1.Padding = new System.Windows.Forms.Padding(3); @@ -775,6 +777,18 @@ this.tabPage1.TabIndex = 0; this.tabPage1.Text = "마크 편집"; // + // label7 + // + this.label7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); + this.label7.Dock = System.Windows.Forms.DockStyle.Top; + this.label7.Location = new System.Drawing.Point(3, 3); + this.label7.Name = "label7"; + this.label7.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0); + this.label7.Size = new System.Drawing.Size(935, 27); + this.label7.TabIndex = 33; + this.label7.Text = "Alt+(a~z) : ▼a~z , Alt+Enter : ▲"; + this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // // tabPage2 // this.tabPage2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); @@ -877,8 +891,8 @@ this.GridView020.Name = "GridView020"; this.GridView020.RowHeadersVisible = false; this.GridView020.RowHeadersWidth = 30; - dataGridViewCellStyle9.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.GridView020.RowsDefaultCellStyle = dataGridViewCellStyle9; + dataGridViewCellStyle25.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.GridView020.RowsDefaultCellStyle = dataGridViewCellStyle25; this.GridView020.RowTemplate.Height = 23; this.GridView020.Size = new System.Drawing.Size(408, 80); this.GridView020.TabIndex = 0; @@ -952,8 +966,8 @@ this.GridView505.Name = "GridView505"; this.GridView505.RowHeadersVisible = false; this.GridView505.RowHeadersWidth = 30; - dataGridViewCellStyle10.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.GridView505.RowsDefaultCellStyle = dataGridViewCellStyle10; + dataGridViewCellStyle26.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.GridView505.RowsDefaultCellStyle = dataGridViewCellStyle26; this.GridView505.RowTemplate.Height = 23; this.GridView505.Size = new System.Drawing.Size(401, 71); this.GridView505.TabIndex = 2; @@ -1092,14 +1106,14 @@ this.GridView246.AllowDrop = true; this.GridView246.AllowUserToAddRows = false; this.GridView246.AllowUserToResizeRows = false; - dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle11.Font = new System.Drawing.Font("돋움", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - dataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.GridView246.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle11; + dataGridViewCellStyle27.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle27.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle27.Font = new System.Drawing.Font("돋움", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + dataGridViewCellStyle27.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle27.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle27.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle27.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.GridView246.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle27; this.GridView246.ColumnHeadersHeight = 29; this.GridView246.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.Text246Jisi, @@ -1112,8 +1126,8 @@ this.GridView246.Name = "GridView246"; this.GridView246.RowHeadersVisible = false; this.GridView246.RowHeadersWidth = 30; - dataGridViewCellStyle12.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.GridView246.RowsDefaultCellStyle = dataGridViewCellStyle12; + dataGridViewCellStyle28.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.GridView246.RowsDefaultCellStyle = dataGridViewCellStyle28; this.GridView246.RowTemplate.Height = 23; this.GridView246.Size = new System.Drawing.Size(493, 138); this.GridView246.TabIndex = 31; @@ -1272,14 +1286,14 @@ this.GridView440.AllowDrop = true; this.GridView440.AllowUserToAddRows = false; this.GridView440.AllowUserToResizeRows = false; - dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle13.Font = new System.Drawing.Font("돋움", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - dataGridViewCellStyle13.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle13.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.GridView440.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle13; + dataGridViewCellStyle29.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle29.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle29.Font = new System.Drawing.Font("돋움", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + dataGridViewCellStyle29.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle29.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle29.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle29.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.GridView440.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle29; this.GridView440.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.GridView440.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.text440a, @@ -1292,8 +1306,8 @@ this.GridView440.Name = "GridView440"; this.GridView440.RowHeadersVisible = false; this.GridView440.RowHeadersWidth = 30; - dataGridViewCellStyle14.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.GridView440.RowsDefaultCellStyle = dataGridViewCellStyle14; + dataGridViewCellStyle30.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.GridView440.RowsDefaultCellStyle = dataGridViewCellStyle30; this.GridView440.RowTemplate.Height = 23; this.GridView440.Size = new System.Drawing.Size(597, 71); this.GridView440.TabIndex = 18; @@ -1401,14 +1415,14 @@ this.GridView490.AllowDrop = true; this.GridView490.AllowUserToAddRows = false; this.GridView490.AllowUserToResizeRows = false; - dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle15.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle15.Font = new System.Drawing.Font("돋움", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - dataGridViewCellStyle15.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle15.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle15.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.GridView490.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle15; + dataGridViewCellStyle31.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle31.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle31.Font = new System.Drawing.Font("돋움", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + dataGridViewCellStyle31.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle31.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle31.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle31.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.GridView490.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle31; this.GridView490.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.GridView490.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.text490a, @@ -1417,8 +1431,8 @@ this.GridView490.Name = "GridView490"; this.GridView490.RowHeadersVisible = false; this.GridView490.RowHeadersWidth = 30; - dataGridViewCellStyle16.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.GridView490.RowsDefaultCellStyle = dataGridViewCellStyle16; + dataGridViewCellStyle32.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.GridView490.RowsDefaultCellStyle = dataGridViewCellStyle32; this.GridView490.RowTemplate.Height = 23; this.GridView490.Size = new System.Drawing.Size(321, 71); this.GridView490.TabIndex = 19; @@ -2616,5 +2630,6 @@ private System.Windows.Forms.Panel panel6; private System.Windows.Forms.Button btNext; private System.Windows.Forms.Button btPrev; + private System.Windows.Forms.Label label7; } } \ No newline at end of file diff --git a/unimarc/unimarc/마크/MarcEditorControl.cs b/unimarc/unimarc/마크/MarcEditorControl.cs index 290cadc..c2324b7 100644 --- a/unimarc/unimarc/마크/MarcEditorControl.cs +++ b/unimarc/unimarc/마크/MarcEditorControl.cs @@ -176,7 +176,8 @@ namespace UniMarc private void richTextBox1_KeyDown(object sender, KeyEventArgs e) { - call = ((RichTextBox)sender).Name; + var rt = sender as RichTextBox; + call = rt.Name; richTextBox1.LanguageOption = 0; if (e.Control) @@ -186,7 +187,7 @@ namespace UniMarc case 70: // f string value = ""; if (search_Text.InputBox("찾을 단어를 입력해주세요.", "찾기(Ctrl+F)", ref value) == DialogResult.OK) - st.Color_change(value, richTextBox1); + st.Color_change(value, rt); break; case 72: // h @@ -199,6 +200,28 @@ namespace UniMarc } } + //260124 + if (e.Alt && e.KeyCode >= Keys.A && e.KeyCode <= Keys.Z) + { + var letter = e.KeyCode.ToString().ToLower(); + rt.SelectionColor = Color.Blue; + rt.SelectedText = "▼"; + rt.SelectionColor = rt.ForeColor; + rt.SelectedText = letter; + e.SuppressKeyPress = true; + return; + } + + if (e.Alt && e.KeyCode == Keys.Enter) + { + rt.SelectionColor = Color.Red; + rt.SelectedText = "▲"; + rt.SelectionColor = rt.ForeColor; + e.SuppressKeyPress = true; + return; + } + + if (e.KeyCode == Keys.F9) SaveGrade(Keys.F9); else if (e.KeyCode == Keys.F10) @@ -208,9 +231,17 @@ namespace UniMarc else if (e.KeyCode == Keys.F12) SaveGrade(Keys.F12); else if (e.KeyCode == Keys.F3) - richTextBox1.SelectedText = "▼"; + { + rt.SelectionColor = Color.Blue; + rt.SelectedText = "▼"; + rt.SelectionColor = rt.ForeColor; + } else if (e.KeyCode == Keys.F4) - richTextBox1.SelectedText = "▲"; + { + rt.SelectionColor = Color.Red; + rt.SelectedText = "▲"; + rt.SelectionColor = rt.ForeColor; + } else if (e.KeyCode == Keys.F8) //next btNext.PerformClick(); else if (e.KeyCode == Keys.F7) //prev @@ -301,7 +332,7 @@ namespace UniMarc public string SaveDate { get; set; } public string DBMarc { get; set; } - public MacEditorParameter griddata { get; set; } + public MacEditorParameter Param { get; set; } } public event EventHandler BookSaved; @@ -321,7 +352,7 @@ namespace UniMarc return; } - string BaseText = richTextBox1.Text; + string BaseText = richTextBox1.Text.Replace("▲▲", "▲").Replace("▼▼", "▼"); string lblisbn = Param.ISBN13; // lbl_ISBN.Text.Replace("[", "").Replace("]", ""); if (!BaseText.EndsWith("\n")) @@ -336,8 +367,9 @@ namespace UniMarc //ISBN이 변경되었다면 저장하지 못하게 한다 (경고 후 저장 가능하게 한다 26010?) if (BaseText.IndexOf(lblisbn) < 0) { - UTIL.MsgE("저장된 ISBN이 마크데이터에 없습니다.\nISBN값이 변경되었습니다"); - return; + var dlg = UTIL.MsgQ("저장된 ISBN이 마크데이터에 없습니다.\nISBN값이 변경되었습니다.\n그래도 저장 할까요?"); + if (dlg != DialogResult.Yes) + return; } string tag056 = Tag056(); string date = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); @@ -360,7 +392,7 @@ namespace UniMarc { SaveDate = date, DBMarc = orimarc, - griddata = this.Param + Param = this.Param }); } @@ -1113,25 +1145,16 @@ namespace UniMarc { TextBox tb = sender as TextBox; - //if (e.KeyCode == Keys.F3) - //{ - // int line = tb.SelectionStart; - // tb.Text = tb.Text.Insert(line, "▽"); - // tb.SelectionStart = line + 1; - //} + + if (e.KeyCode == Keys.F3) { - tb.InvokeInsertText("▽"); - //tb.Select(tb.Text.Length, 0); + tb.InvokeInsertText("▼"); } else if (e.KeyCode == Keys.F4) { - tb.InvokeInsertText("△"); - //tb.Select(tb.Text.Length, 0); + tb.InvokeInsertText("▲"); } - - //tb.SelectionStart = tb.Text.Length; - //tb.Select(tb.Text.Length, 0); } diff --git a/unimarc/unimarc/마크/Marc_Plan_Sub_MarcEdit2.cs b/unimarc/unimarc/마크/Marc_Plan_Sub_MarcEdit2.cs index 6f030ae..10f52db 100644 --- a/unimarc/unimarc/마크/Marc_Plan_Sub_MarcEdit2.cs +++ b/unimarc/unimarc/마크/Marc_Plan_Sub_MarcEdit2.cs @@ -101,9 +101,9 @@ namespace UniMarc { // Update Specs_Marc table string oriMarc = e.DBMarc; - string etc1 = e.griddata.Remark1 ?? ""; - string etc2 = e.griddata.Remark2 ?? ""; - string tag008 = e.griddata.text008; + string etc1 = e.Param.Remark1 ?? ""; + string etc2 = e.Param.Remark2 ?? ""; + string tag008 = e.Param.text008; // 등록번호 분류기호 저자기호 볼륨 복본 // 별치 총서명 총서번호 저자 출판사 @@ -125,7 +125,7 @@ namespace UniMarc // Current ListIdx (Wait, idx in Marc_Plan corresponds to ListIdx in Parameter?) // In Marc_Plan: ListIdx = idx. - string listIdx = e.griddata.ListIdx; + string listIdx = e.Param.ListIdx; string[] Search_data = { listIdx }; string[] Update_Col = {