diff --git a/src/module/Common_Global_Cache.bas b/src/module/Common_Global_Cache.bas index 649409b..bbb8fc9 100644 --- a/src/module/Common_Global_Cache.bas +++ b/src/module/Common_Global_Cache.bas @@ -537,7 +537,7 @@ Private Sub RefreshSheetDict() Set sheetConf = CreateObject("Scripting.Dictionary") sheetConf("StartRow") = 3 sheetConf("KeyCol") = 6 - sheetConf("ValueCols") = Array(6) + sheetConf("ValueCols") = Array(7) Set sheetConfDict("oufukuList") = sheetConf Debug.Print "RefreshSheetDict oufukuList ok." @@ -574,20 +574,14 @@ Public Function GetSheetConfig() As Object End Function Public Function RefreshAllCache() As Boolean - ' refresh Dim refreshCacheNames As Variant - refreshCacheNames = Array("M1", "M1KukanDCache", "M2", "Z1", "Z2", "Z3", "Z4", "T1", "T2", "T3", "O1","O2") + refreshCacheNames = Array("Z1", "Z2", "Z3", "Z4", "T1", "T2", "T3", "M1", "M1KukanDCache", "M2", "O1","O2", _ + "tokubetuList", "kenshuList", "oufukuList", "koutaiList", "higaitouList", "errorList") Dim refreshCacheName As Variant For Each refreshCacheName In refreshCacheNames Call RefreshCache(refreshCacheName) Next refreshCacheName - - Call RefreshTokubetu - Call RefreshOufukuList - Call RefreshKoutaiList - Call RefreshHigaitouList - Call RefreshKenshuList - Call RefreshErrorList - RefreshCache = True + + RefreshAllCache = True End Function \ No newline at end of file diff --git a/src/sheet/C1.cls b/src/sheet/C1.cls index 5fe1d6f..3388ee6 100644 --- a/src/sheet/C1.cls +++ b/src/sheet/C1.cls @@ -571,13 +571,14 @@ End Sub ' Clear row data and validation Private Sub ClearRowData(ByVal rowNum As Long) Dim sheetConfDict As Object: Set sheetConfDict = GetSheetConfig() - Dim sheetConf As Object: Set sheetConf = sheetConfDict(ws.CodeName) + Dim sheetConf As Object: Set sheetConf = sheetConfDict(Me.CodeName) Dim startCol As String: startCol = sheetConf("StartCol") Dim endCol As String: endCol = sheetConf("EndCol") Dim errorCol As String: errorCol = sheetConf("ErrorCol") Me.Range(Me.Cells(rowNum, startCol), Me.Cells(rowNum, endCol)).ClearContents + Me.Range(Me.Cells(rowNum, startCol), Me.Cells(rowNum, endCol)).Interior.Color = vbWhite Me.Cells(rowNum, errorCol).ClearContents Dim clearValidationCols As Variant diff --git a/通勤手当テンプレート_案.xlsm b/通勤手当テンプレート_案.xlsm index e71ca4b..07bbbf5 100644 Binary files a/通勤手当テンプレート_案.xlsm and b/通勤手当テンプレート_案.xlsm differ