From 9183f4f8ab45d16b10cc68bab5353f16c54b5c01 Mon Sep 17 00:00:00 2001 From: CJY Date: Thu, 12 Mar 2026 15:39:16 +0900 Subject: [PATCH] =?UTF-8?q?=20-=20(=EB=B2=84=EA=B7=B8=EC=88=98=EC=A0=95)?= =?UTF-8?q?=EB=8B=A8=EC=88=9C=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=EA=B8=B0?= =?UTF-8?q?=EB=8A=A5=20=EC=82=AC=EC=9A=A9=20=EC=8B=9C,=20admin=20=EB=B9=84?= =?UTF-8?q?=EB=B2=88=20=EB=B3=80=EA=B2=BD=ED=95=98=EB=A9=B4=20Level1?= =?UTF-8?q?=EB=A1=9C=20=EB=B3=80=ED=95=98=EB=8A=94=20=EB=B2=84=EA=B7=B8=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=20->=20=EC=88=98=EC=A0=95=20=EC=95=88?= =?UTF-8?q?=EB=90=98=EC=96=B4=EC=9E=88=EC=96=B4=EC=84=9C=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=ED=95=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- INT69DB_2A/Forms/FormInformation.cs | 2 +- INT69DB_2A/Forms/FormMotorSetting.Designer.cs | 1 - INT69DB_2A/Forms/FormUserEditor.cs | 32 +++++++++++++------ INT69DB_2A/Version.txt | 6 +++- 4 files changed, 28 insertions(+), 13 deletions(-) diff --git a/INT69DB_2A/Forms/FormInformation.cs b/INT69DB_2A/Forms/FormInformation.cs index 9553209..7475ee8 100644 --- a/INT69DB_2A/Forms/FormInformation.cs +++ b/INT69DB_2A/Forms/FormInformation.cs @@ -113,7 +113,7 @@ namespace INT69DB_2A.Forms } private void DefaultSetting() { - this.labelDisplayVer.Text = "6.6.1"; + this.labelDisplayVer.Text = "6.6.2"; this.labelUserMgerVer.Text = ""; this.labelAes128Ver.Text = ""; this.labelSerialNo.Text = this.ParentForm.SystemConfig.SerialNumber; diff --git a/INT69DB_2A/Forms/FormMotorSetting.Designer.cs b/INT69DB_2A/Forms/FormMotorSetting.Designer.cs index 25e60a1..51ac6f7 100644 --- a/INT69DB_2A/Forms/FormMotorSetting.Designer.cs +++ b/INT69DB_2A/Forms/FormMotorSetting.Designer.cs @@ -128,7 +128,6 @@ this.buttonCom1TestForward = new SmartX.SmartButton(); this.buttonCom1TestReverse = new SmartX.SmartButton(); this.panel1 = new System.Windows.Forms.Panel(); - this.radioButtonImpellerMotorAngle180180 = new SmartX.SmartRadioButton(); ((System.ComponentModel.ISupportInitialize)(this.smartForm1)).BeginInit(); this.groupBoxSelectImpeller.SuspendLayout(); this.groupBoxEach.SuspendLayout(); diff --git a/INT69DB_2A/Forms/FormUserEditor.cs b/INT69DB_2A/Forms/FormUserEditor.cs index aec3ccd..67bacca 100644 --- a/INT69DB_2A/Forms/FormUserEditor.cs +++ b/INT69DB_2A/Forms/FormUserEditor.cs @@ -28,6 +28,7 @@ namespace INT69DB_2A.Forms private string BeforeID; private string BeforePassword; + private string CurrentUserPassword; #endregion #region Constructor @@ -164,6 +165,7 @@ namespace INT69DB_2A.Forms this.PasswordChar = false; this.BeforeID = ""; this.BeforePassword = ""; + this.CurrentUserPassword = "Password12!"; this.UpdateAccessRightComboBoxDisplay(); this.comboBoxAccessRight.SelectedIndexChanged -= new EventHandler(this.comboBoxAccessRight_SelectedIndexChanged); @@ -251,6 +253,7 @@ namespace INT69DB_2A.Forms else isNewReg = false; + #region listbox 미선택 시 신규 유저 등록, 선택 시 기존 유저 정보 수정 if (isNewReg == true) { switch (this.ParentForm.SystemConfig.Language) @@ -327,6 +330,7 @@ namespace INT69DB_2A.Forms break; } } + #endregion DialogFormYesNo dlg = new DialogFormYesNo(DataStore.MessageBoxIcon.Question, code, message1, message2); if (dlg.ShowDialog() == DialogResult.Yes) @@ -360,22 +364,27 @@ namespace INT69DB_2A.Forms #endregion item.ID = this.labelID.Text; - item.Password = this.labelPassword.Text; - item.ExpireId = int.Parse(this.labelExpiryDateOfAccount.Text); - item.ExpirePassword = int.Parse(this.labelExpiryDateOfPassword.Text); - - //item.IsAdmin = this.cbAdministrator.Checked; - - if (this.SelectedUserItem.Group == DataStore.UserGroup.Admin) + if (isNewReg == true) + item.Password = this.SelectedUserItem.ResetPW; + else + item.Password = this.CurrentUserPassword; + if (this.ParentForm.SystemConfig.IsPart11 == true) { - if (this.ParentForm.SystemConfig.IsPart11 == true) - item.ActiveLevel = 9; + item.ExpireId = int.Parse(this.labelExpiryDateOfAccount.Text); + item.ExpirePassword = int.Parse(this.labelExpiryDateOfPassword.Text); } else { - item.ActiveLevel = this.comboBoxAccessRight.SelectedIndex + 1; + item.ExpireId = -1; + item.ExpirePassword = -1; } + //item.IsAdmin = this.cbAdministrator.Checked; + if (this.SelectedUserItem.Group == DataStore.UserGroup.Admin) + item.ActiveLevel = 9; + else + item.ActiveLevel = this.comboBoxAccessRight.SelectedIndex + 1; + menuId.fMenu = new bool[UserManager.USER_MENU_ID_MAX]; for (int i = 0; i < UserManager.USER_MENU_ID_MAX; i++) menuId.fMenu[i] = false; @@ -403,6 +412,8 @@ namespace INT69DB_2A.Forms //UserManager.UserManager_AutoLogoutSetTimeout(this.ParentForm.ParentForm.SystemConfig.AUTOMATIC_LOGOUT, this.ParentForm.ParentForm.FlagAutomaticLogoutWarningTime); #endregion + + this.buttonSave.Visible = false; } } private void UserNew() @@ -696,6 +707,7 @@ namespace INT69DB_2A.Forms this.labelPassword.Text = item.Password; else this.labelPassword.Text = this.PasswordToAsterisk(item.Password); + this.CurrentUserPassword = item.Password; this.UpdateAccessRightDisplay(item.ActiveLevel); this.buttonSave.Visible = false; diff --git a/INT69DB_2A/Version.txt b/INT69DB_2A/Version.txt index a6e1964..18e596d 100644 --- a/INT69DB_2A/Version.txt +++ b/INT69DB_2A/Version.txt @@ -15,6 +15,11 @@ Ƽ 2~6 ƽ 跮 */ +@ Ver 6.6.2 by CJY + - 2026.03.12 + - Ver 6.6.1 Modify + - (׼)ܼ α , admin ϸ Level1 ϴ -> ȵǾ־ + @ Ver 6.6.1 by LSJ - 2026.01.16 - Ver 6.6.0 Modify @@ -138,7 +143,6 @@ -> draw.SetChartCfg(103, 310, 627, 290, 16, SmartX.SmartDraw.CHARTREFRESH.LEFTSCROLL, 1); 627/2 = 313 627/16 = 39 ->>>>>>> 5d6775a ( - ?테?팩 ?청?항 추?) @ Ver 5.2.1 by CJY - 2024.08.21