Skip to content

Commit

Permalink
## Added new features / Bug fixed
Browse files Browse the repository at this point in the history
・サーバスクリプトで特定ディレクトリのファイル読み書きができる機能を追加。
・一つのテーブルに対しCSVインポートや一括更新などの重い処理中は再投入できない機能を追加。
・スクリプトに項目の値を取得する関数($p.getValue)を追加。
・複数選択可能な検索ダイアログに「全て選択」「全て無効」ボタンを追加。
・サイト一覧のパネルにサイト種別を識別できるアイコンを追加。
・サーバスクリプトをtry-catchブロック内で実行する機能を追加。
・サーバスクリプトを無名関数化して実行する機能を追加。
・サーバスクリプトにシステムログへログを出力する機能を追加。
・サーバスクリプトを無効にする機能を追加。
・添付ファイル項目のファイル数及び容量制限のエラー表示の文言を修正。
・選択肢一覧に選択項目を設定する際に、カンマを含む項目名が正しく識別されない問題を解消。
・「行表示の前」のサーバスクリプトでUpdateOnExit=trueとするとレコードのバージョン番号に不整合が起きる問題を解消。
・リンクの選択肢一覧で特定のフィルタに選択肢が表示されない問題を解消。
・APIで0バイトの添付ファイルが不正に登録される問題を解消。
・エディタにリンクを個別で配置した場合にNotReturnParentRecordが動作しない問題を解消。
  • Loading branch information
pierre3 committed Jan 14, 2025
1 parent ec43af7 commit 5773a27
Show file tree
Hide file tree
Showing 104 changed files with 2,854 additions and 418 deletions.
9 changes: 5 additions & 4 deletions Implem.CodeDefiner/Implem.CodeDefiner.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<Copyright>Copyright © Implem Inc 2014 - 2024</Copyright>
<Year>$([System.DateTime]::Now.Year.ToString())</Year>
<Copyright>Copyright © Implem Inc 2014 - $(Year)</Copyright>
<Description>This program does the automatic code creation and merging of existing code based on the definition. Also it will make the configuration change of sql server database.</Description>
<AssemblyVersion>1.4.11.0</AssemblyVersion>
<FileVersion>1.4.11.0</FileVersion>
<Version>1.4.11.0</Version>
<AssemblyVersion>1.4.12.0</AssemblyVersion>
<FileVersion>1.4.12.0</FileVersion>
<Version>1.4.12.0</Version>
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
</PropertyGroup>

Expand Down
3 changes: 3 additions & 0 deletions Implem.DefinitionAccessor/Def.cs
Original file line number Diff line number Diff line change
Expand Up @@ -819,6 +819,7 @@ public static void SetCodeDefinition()
case "Model_Utilities_Export": Code.Model_Utilities_Export = definitionRow[1].ToString().NoSpace(definitionRow["NoSpace"].ToBool()); SetCodeTable(CodeTable.Model_Utilities_Export, definitionRow, CodeXls); break;
case "Model_Utilities_ExportCrosstab": Code.Model_Utilities_ExportCrosstab = definitionRow[1].ToString().NoSpace(definitionRow["NoSpace"].ToBool()); SetCodeTable(CodeTable.Model_Utilities_ExportCrosstab, definitionRow, CodeXls); break;
case "Model_Utilities_FieldCases": Code.Model_Utilities_FieldCases = definitionRow[1].ToString().NoSpace(definitionRow["NoSpace"].ToBool()); SetCodeTable(CodeTable.Model_Utilities_FieldCases, definitionRow, CodeXls); break;
case "Model_Utilities_FieldCases_RawValue": Code.Model_Utilities_FieldCases_RawValue = definitionRow[1].ToString().NoSpace(definitionRow["NoSpace"].ToBool()); SetCodeTable(CodeTable.Model_Utilities_FieldCases_RawValue, definitionRow, CodeXls); break;
case "Model_Utilities_FieldResponse": Code.Model_Utilities_FieldResponse = definitionRow[1].ToString().NoSpace(definitionRow["NoSpace"].ToBool()); SetCodeTable(CodeTable.Model_Utilities_FieldResponse, definitionRow, CodeXls); break;
case "Model_Utilities_FieldResponse_ColumnCases": Code.Model_Utilities_FieldResponse_ColumnCases = definitionRow[1].ToString().NoSpace(definitionRow["NoSpace"].ToBool()); SetCodeTable(CodeTable.Model_Utilities_FieldResponse_ColumnCases, definitionRow, CodeXls); break;
case "Model_Utilities_FieldResponse_ToResponsel": Code.Model_Utilities_FieldResponse_ToResponsel = definitionRow[1].ToString().NoSpace(definitionRow["NoSpace"].ToBool()); SetCodeTable(CodeTable.Model_Utilities_FieldResponse_ToResponsel, definitionRow, CodeXls); break;
Expand Down Expand Up @@ -7348,6 +7349,7 @@ public class CodeColumn2nd
public string Model_Utilities_Export;
public string Model_Utilities_ExportCrosstab;
public string Model_Utilities_FieldCases;
public string Model_Utilities_FieldCases_RawValue;
public string Model_Utilities_FieldResponse;
public string Model_Utilities_FieldResponse_ColumnCases;
public string Model_Utilities_FieldResponse_ToResponsel;
Expand Down Expand Up @@ -8195,6 +8197,7 @@ public class CodeTable
public CodeDefinition Model_Utilities_Export = new CodeDefinition();
public CodeDefinition Model_Utilities_ExportCrosstab = new CodeDefinition();
public CodeDefinition Model_Utilities_FieldCases = new CodeDefinition();
public CodeDefinition Model_Utilities_FieldCases_RawValue = new CodeDefinition();
public CodeDefinition Model_Utilities_FieldResponse = new CodeDefinition();
public CodeDefinition Model_Utilities_FieldResponse_ColumnCases = new CodeDefinition();
public CodeDefinition Model_Utilities_FieldResponse_ToResponsel = new CodeDefinition();
Expand Down
9 changes: 5 additions & 4 deletions Implem.DefinitionAccessor/Implem.DefinitionAccessor.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<Copyright>Copyright © Implem Inc 2014 - 2024</Copyright>
<AssemblyVersion>1.4.11.0</AssemblyVersion>
<FileVersion>1.4.11.0</FileVersion>
<Version>1.4.11.0</Version>
<Year>$([System.DateTime]::Now.Year.ToString())</Year>
<Copyright>Copyright © Implem Inc 2014 - $(Year)</Copyright>
<AssemblyVersion>1.4.12.0</AssemblyVersion>
<FileVersion>1.4.12.0</FileVersion>
<Version>1.4.12.0</Version>
<Nullable>disable</Nullable>
</PropertyGroup>

Expand Down
9 changes: 5 additions & 4 deletions Implem.DisplayAccessor/Implem.DisplayAccessor.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<Copyright>Copyright © Implem Inc 2014 - 2024</Copyright>
<AssemblyVersion>1.4.11.0</AssemblyVersion>
<FileVersion>1.4.11.0</FileVersion>
<Version>1.4.11.0</Version>
<Year>$([System.DateTime]::Now.Year.ToString())</Year>
<Copyright>Copyright © Implem Inc 2014 - $(Year)</Copyright>
<AssemblyVersion>1.4.12.0</AssemblyVersion>
<FileVersion>1.4.12.0</FileVersion>
<Version>1.4.12.0</Version>
<Nullable>disable</Nullable>
</PropertyGroup>

Expand Down
9 changes: 5 additions & 4 deletions Implem.Factory/Implem.Factory.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<Copyright>Copyright © Implem Inc 2014 - 2024</Copyright>
<AssemblyVersion>1.4.11.0</AssemblyVersion>
<FileVersion>1.4.11.0</FileVersion>
<Version>1.4.11.0</Version>
<Year>$([System.DateTime]::Now.Year.ToString())</Year>
<Copyright>Copyright © Implem Inc 2014 - $(Year)</Copyright>
<AssemblyVersion>1.4.12.0</AssemblyVersion>
<FileVersion>1.4.12.0</FileVersion>
<Version>1.4.12.0</Version>
<Nullable>disable</Nullable>
</PropertyGroup>

Expand Down
9 changes: 5 additions & 4 deletions Implem.Libraries/Implem.Libraries.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<Copyright>Copyright © Implem Inc 2014 - 2024</Copyright>
<AssemblyVersion>1.4.11.0</AssemblyVersion>
<FileVersion>1.4.11.0</FileVersion>
<Version>1.4.11.0</Version>
<Year>$([System.DateTime]::Now.Year.ToString())</Year>
<Copyright>Copyright © Implem Inc 2014 - $(Year)</Copyright>
<AssemblyVersion>1.4.12.0</AssemblyVersion>
<FileVersion>1.4.12.0</FileVersion>
<Version>1.4.12.0</Version>
<Nullable>disable</Nullable>
</PropertyGroup>

Expand Down
22 changes: 13 additions & 9 deletions Implem.Libraries/Utilities/Strings.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,14 @@ public static string MaxLength(this string self, int maxLength)
: self ?? string.Empty;
}

public static bool IsNullOrEmpty(this string self)
{
return string.IsNullOrEmpty(self);
}
public static bool IsNullOrEmpty(this string self)
=> string.IsNullOrEmpty(self);

public static bool IsNullOrWhiteSpace(this string self)
=> string.IsNullOrWhiteSpace(self);

public static bool IsNoValidCharacters(this string self)
=> self.IsNullOrEmpty() || self.IsNullOrWhiteSpace();

public static string IsNotEmpty(this string self, string trueStr = null)
{
Expand Down Expand Up @@ -49,7 +53,7 @@ public static string ToLowerFirstChar(this string self)
: strTemp;
}

public static string ToUpperFirstChar(this string self)
public static string ToUpperFirstChar(this string self)
{
return !self.IsNullOrEmpty()
? self.Length == 1
Expand Down Expand Up @@ -106,11 +110,11 @@ public static string EnclosedString(string self)
{
switch (self[count])
{
case '(':
openCount++;
started = true;
case '(':
openCount++;
started = true;
break;
case ')':
case ')':
openCount--;
if (started && openCount == 0)
{
Expand Down
9 changes: 5 additions & 4 deletions Implem.ParameterAccessor/Implem.ParameterAccessor.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<Copyright>Copyright © Implem Inc 2014 - 2024</Copyright>
<AssemblyVersion>1.4.11.0</AssemblyVersion>
<FileVersion>1.4.11.0</FileVersion>
<Version>1.4.11.0</Version>
<Year>$([System.DateTime]::Now.Year.ToString())</Year>
<Copyright>Copyright © Implem Inc 2014 - $(Year)</Copyright>
<AssemblyVersion>1.4.12.0</AssemblyVersion>
<FileVersion>1.4.12.0</FileVersion>
<Version>1.4.12.0</Version>
<Nullable>disable</Nullable>
</PropertyGroup>

Expand Down
213 changes: 111 additions & 102 deletions Implem.ParameterAccessor/Parts/General.cs
Original file line number Diff line number Diff line change
@@ -1,109 +1,118 @@
using System;
using System.ComponentModel;
namespace Implem.ParameterAccessor.Parts
{
public class General
{
public string HtmlHeadKeywords;
public string HtmlHeadDescription;
public string HtmlHeadViewport;
public string HtmlLogoText;
public string HtmlPortalUrl;
public string HtmlApplicationBuildingGuideUrl;
public string HtmlUserManualUrl;
public string HtmlBlogUrl;
public string HtmlSupportUrl;
public string HtmlContactUrl;
public string HtmlAGPLUrl;
public string HtmlEnterPriseEditionUrl;
public string HtmlCasesUrl;
public string HtmlUrlPrefix;
public bool DisplayLogoText;
public bool DisableAutoComplete;
public int SiteMenuHotSpan;
public bool AnchorTargetBlank;
public int LimitWarning1;
public int LimitWarning2;
public int LimitWarning3;
public int DeleteTempOldThan;
public int DeleteHistoriesOldThan;
public int NearCompletionTimeBeforeDays;
public int NearCompletionTimeBeforeDaysMin;
public int NearCompletionTimeBeforeDaysMax;
public int NearCompletionTimeAfterDays;
public int NearCompletionTimeAfterDaysMin;
public int NearCompletionTimeAfterDaysMax;
public int GridPageSize;
public int GridPageSizeMin;
public int GridPageSizeMax;
public bool AllowViewReset;
public int ExportOutputColumnMax;
public string ImportEncoding;
public bool UpdatableImport;
public bool AllowStandardExport;
public int ImportMax;
public int ViewerSwitchingType;
public bool UseNegativeFilters;
public bool AllowCopy;
public bool AllowReferenceCopy;
public string CharToAddWhenCopying;
public int UpdateResponseType;
public string SolutionBackupPath;
public string SolutionBackupExcludeDirectories;
public int SizeToUseTextArea;
public int CompletionCode;
public int CommentDisplayLimitHistories;
public int CommentDisplayLimit;
public int WorkValueHeight;
public int WorkValueTextTop;
public int ProgressRateWidth;
public int ProgressRateItemHeight;
public int ProgressRateTextTop;
public int CalendarBegin;
public int CalendarEnd;
public int CalendarLimit;
public int CalendarYLimit;
public int DefaultCalendarType;
public int CrosstabBegin;
public int CrosstabEnd;
public int CrosstabXLimit;
public int CrosstabYLimit;
public int GanttLimit;
public int GanttPeriodMin;
public int GanttPeriodMax;
public int BurnDownLimit;
public int TimeSeriesLimit;
public int AnalyPartPeriodValueMin;
public int AnalyPartPeriodValueMax;
public int KambanLimit;
public int KambanXLimit;
public int KambanYLimit;
public int KambanMinColumns;
public int KambanMaxColumns;
public int KambanColumns;
public int ImageLibPageSize;
public int ImageLibPageSizeMin;
public int ImageLibPageSizeMax;
public int ImageSizeRegular;
public int ImageSizeThumbnail;
public int ImageSizeIcon;
public int ImageSizeLogo;
public int DropDownSearchPageSize;
public int SwitchTargetsLimit;
public int SeparateMin;
public int SeparateMax;
public int FirstDayOfWeek;
public int FirstMonth;
public int DateFilterMinSpan;
public int DateFilterMaxSpan;
public DateTime MinTime;
public DateTime MaxTime;
public int DateTimeStep;
public bool HideCurrentTimeIcon;
public bool HideCurrentUserIcon;
public bool HideCurrentDeptIcon;
public bool EnableLightBox;
public bool EnableCodeEditor;
public int GroupsDepthMax;
public int BulkUpsertMax;
public string HtmlHeadKeywords { get; set; }
public string HtmlHeadDescription { get; set; }
public string HtmlHeadViewport { get; set; }
public string HtmlLogoText { get; set; }
public string HtmlPortalUrl { get; set; }
public string HtmlApplicationBuildingGuideUrl { get; set; }
public string HtmlUserManualUrl { get; set; }
public string HtmlBlogUrl { get; set; }
public string HtmlSupportUrl { get; set; }
public string HtmlContactUrl { get; set; }
public string HtmlAGPLUrl { get; set; }
public string HtmlEnterPriseEditionUrl { get; set; }
public string HtmlCasesUrl { get; set; }
public string HtmlUrlPrefix { get; set; }
public bool DisplayLogoText { get; set; }
public bool DisableAutoComplete { get; set; }
public int SiteMenuHotSpan { get; set; }
public bool AnchorTargetBlank { get; set; }
public int LimitWarning1 { get; set; }
public int LimitWarning2 { get; set; }
public int LimitWarning3 { get; set; }
public int DeleteTempOldThan { get; set; }
public int DeleteHistoriesOldThan { get; set; }
public int NearCompletionTimeBeforeDays { get; set; }
public int NearCompletionTimeBeforeDaysMin { get; set; }
public int NearCompletionTimeBeforeDaysMax { get; set; }
public int NearCompletionTimeAfterDays { get; set; }
public int NearCompletionTimeAfterDaysMin { get; set; }
public int NearCompletionTimeAfterDaysMax { get; set; }
public int GridPageSize { get; set; }
public int GridPageSizeMin { get; set; }
public int GridPageSizeMax { get; set; }
public bool AllowViewReset { get; set; }
public int ExportOutputColumnMax { get; set; }
public string ImportEncoding { get; set; }
public bool UpdatableImport { get; set; }
public bool AllowStandardExport { get; set; }
public int ImportMax { get; set; }
public int ViewerSwitchingType { get; set; }
public bool UseNegativeFilters { get; set; }
public bool AllowCopy { get; set; }
public bool AllowReferenceCopy { get; set; }
public string CharToAddWhenCopying { get; set; }
[DefaultValue(@"(?<!\\),")]
public string ChoiceSplitRegexPattern { get; set; } = @"(?<!\\),";
[DefaultValue(@"\\(,)")]
public string ChoiceReplaceRegexPattern { get; set; } = @"\\(,)";
[DefaultValue(@"$1")]
public string ChoiceReplaceRegexReplacement { get; set; } = @"$1";
public int UpdateResponseType { get; set; }
public string SolutionBackupPath { get; set; }
public string SolutionBackupExcludeDirectories { get; set; }
public int SizeToUseTextArea { get; set; }
public int CompletionCode { get; set; }
public int CommentDisplayLimitHistories { get; set; }
public int CommentDisplayLimit { get; set; }
public int WorkValueHeight { get; set; }
public int WorkValueTextTop { get; set; }
public int ProgressRateWidth { get; set; }
public int ProgressRateItemHeight { get; set; }
public int ProgressRateTextTop { get; set; }
public int CalendarBegin { get; set; }
public int CalendarEnd { get; set; }
public int CalendarLimit { get; set; }
public int CalendarYLimit { get; set; }
public int DefaultCalendarType { get; set; }
public int CrosstabBegin { get; set; }
public int CrosstabEnd { get; set; }
public int CrosstabXLimit { get; set; }
public int CrosstabYLimit { get; set; }
public int GanttLimit { get; set; }
public int GanttPeriodMin { get; set; }
public int GanttPeriodMax { get; set; }
public int BurnDownLimit { get; set; }
public int TimeSeriesLimit { get; set; }
public int AnalyPartPeriodValueMin { get; set; }
public int AnalyPartPeriodValueMax { get; set; }
public int KambanLimit { get; set; }
public int KambanXLimit { get; set; }
public int KambanYLimit { get; set; }
public int KambanMinColumns { get; set; }
public int KambanMaxColumns { get; set; }
public int KambanColumns { get; set; }
public int ImageLibPageSize { get; set; }
public int ImageLibPageSizeMin { get; set; }
public int ImageLibPageSizeMax { get; set; }
public int ImageSizeRegular { get; set; }
public int ImageSizeThumbnail { get; set; }
public int ImageSizeIcon { get; set; }
public int ImageSizeLogo { get; set; }
public int DropDownSearchPageSize { get; set; }
public int SwitchTargetsLimit { get; set; }
public int SeparateMin { get; set; }
public int SeparateMax { get; set; }
public int FirstDayOfWeek { get; set; }
public int FirstMonth { get; set; }
public int DateFilterMinSpan { get; set; }
public int DateFilterMaxSpan { get; set; }
public DateTime MinTime { get; set; }
public DateTime MaxTime { get; set; }
public int DateTimeStep { get; set; }
public bool HideCurrentTimeIcon { get; set; }
public bool HideCurrentUserIcon { get; set; }
public bool HideCurrentDeptIcon { get; set; }
public bool EnableLightBox { get; set; }
public bool EnableCodeEditor { get; set; }
public int GroupsDepthMax { get; set; }
public int BulkUpsertMax { get; set; }
public bool EnableExpandLinkPath { get; set; }
public bool BlockSiteTaskWhileRunning { get; set; }
}
}
3 changes: 3 additions & 0 deletions Implem.ParameterAccessor/Parts/Script.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,8 @@ public class Script
public int ServerScriptTimeOutMin;
public int ServerScriptTimeOutMax;
public int ServerScriptIncludeDepthLimit;
public bool DisableServerScriptFile;
public long ServerScriptFileSizeMax;
public string ServerScriptFilePath;
}
}
Loading

0 comments on commit 5773a27

Please sign in to comment.