Skip to content

Commit

Permalink
Added new features / Bug fixed
Browse files Browse the repository at this point in the history
・対象のフレームワークを.NET8に変更。
・アクセス権の継承の設定に検索機能を追加。
・計算式に関数を追加。($DATETIME/$EOMONTH/$TEXT/$IFERROR/$ISBLANK/$ISERROR/$ABS/$POWER/$RAND/$SQRT)
・サイトAPIで「プロセス」と「状況による制御」を更新する機能を追加。
・ダッシュボードパーツにカンバンを追加。
・システムログの管理画面にフィルタボタンを追加。
・タイトル文字列が1024文字を超える場合にエラーとなる問題を解消。
・「検索機能を使う」チェックONで項目連携した場合、初期表示でマスタ全件表示する問題を解消。
・サイトパッケージのインポート、エクスポートのメニューが利用できないページで表示される問題を解消。
・バックグラウンドサーバスクリプト のユーザ選択で500件以降のユーザを選択できない問題を解消。
・Wikiの画面で「ゴミ箱」メニューが表示される問題を解消。
・フォルダ管理画面で[新規作成]押下時にエラーページに遷移する問題を解消。
・サーバスクリプトデバッグ時に、不要なコードが挿入される問題を解消。
・サイトパッケージのエクスポートでデータエクスポート権限がない場合にファイルが出力されない問題を解消。
・フルカレンダーでのビュー「カレンダーの設定」が保持されない問題を解消。
・リマインダー種別がメール以外の場合に「該当しない場合は送信しない」が動作しない問題を解消。
  • Loading branch information
uchi-ta committed Jan 16, 2024
1 parent c602fd6 commit 5ad6cf7
Show file tree
Hide file tree
Showing 95 changed files with 3,311 additions and 728 deletions.
9 changes: 6 additions & 3 deletions Implem.CodeDefiner/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging.

FROM mcr.microsoft.com/dotnet/runtime:6.0 AS base
FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
FROM mcr.microsoft.com/dotnet/runtime:8.0 AS base
FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
WORKDIR /src
COPY ["Implem.CodeDefiner/Implem.CodeDefiner.csproj", "Implem.CodeDefiner/"]
COPY ["Implem.DefinitionAccessor/Implem.DefinitionAccessor.csproj", "Implem.DefinitionAccessor/"]
Expand All @@ -19,7 +19,10 @@ RUN dotnet build "Implem.CodeDefiner/Implem.CodeDefiner.csproj" -c Release -o /a
RUN dotnet build "Implem.Pleasanter/Implem.Pleasanter.csproj" -c Release -o /app/build/Implem.Pleasanter

FROM build AS publish
RUN apt-get update && apt-get install -y jq
RUN apt-get update && apt-get install -y jq \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*

RUN dotnet publish "Implem.CodeDefiner/Implem.CodeDefiner.csproj" -c Release -o /app/publish/Implem.CodeDefiner
RUN dotnet publish "Implem.Pleasanter/Implem.Pleasanter.csproj" -c Release -o /app/publish/Implem.Pleasanter
RUN cat Implem.Pleasanter/App_Data/Parameters/Rds.json \
Expand Down
8 changes: 4 additions & 4 deletions Implem.CodeDefiner/Implem.CodeDefiner.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<Copyright>Copyright © Implem Inc 2014 - 2023</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.3.50.2</AssemblyVersion>
<FileVersion>1.3.50.2</FileVersion>
<Version>1.3.50.2</Version>
<AssemblyVersion>1.4.0.0</AssemblyVersion>
<FileVersion>1.4.0.0</FileVersion>
<Version>1.4.0.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 @@ -1044,6 +1044,7 @@ public static void SetCodeDefinition()
case "SiteSettings_GetModels_Items": Code.SiteSettings_GetModels_Items = definitionRow[1].ToString().NoSpace(definitionRow["NoSpace"].ToBool()); SetCodeTable(CodeTable.SiteSettings_GetModels_Items, definitionRow, CodeXls); break;
case "SiteSettings_GetModels_Items_Choices": Code.SiteSettings_GetModels_Items_Choices = definitionRow[1].ToString().NoSpace(definitionRow["NoSpace"].ToBool()); SetCodeTable(CodeTable.SiteSettings_GetModels_Items_Choices, definitionRow, CodeXls); break;
case "SiteSettings_GetModels_Items_SiteIntegration": Code.SiteSettings_GetModels_Items_SiteIntegration = definitionRow[1].ToString().NoSpace(definitionRow["NoSpace"].ToBool()); SetCodeTable(CodeTable.SiteSettings_GetModels_Items_SiteIntegration, definitionRow, CodeXls); break;
case "SiteSettings_GetModels_SysLogs_UseFilterButton": Code.SiteSettings_GetModels_SysLogs_UseFilterButton = definitionRow[1].ToString().NoSpace(definitionRow["NoSpace"].ToBool()); SetCodeTable(CodeTable.SiteSettings_GetModels_SysLogs_UseFilterButton, definitionRow, CodeXls); break;
case "SiteSettings_GetModels_Users": Code.SiteSettings_GetModels_Users = definitionRow[1].ToString().NoSpace(definitionRow["NoSpace"].ToBool()); SetCodeTable(CodeTable.SiteSettings_GetModels_Users, definitionRow, CodeXls); break;
case "Summaries": Code.Summaries = definitionRow[1].ToString().NoSpace(definitionRow["NoSpace"].ToBool()); SetCodeTable(CodeTable.Summaries, definitionRow, CodeXls); break;
case "Summaries_DataTablesCases": Code.Summaries_DataTablesCases = definitionRow[1].ToString().NoSpace(definitionRow["NoSpace"].ToBool()); SetCodeTable(CodeTable.Summaries_DataTablesCases, definitionRow, CodeXls); break;
Expand Down Expand Up @@ -7499,6 +7500,7 @@ public class CodeColumn2nd
public string SiteSettings_GetModels_Items;
public string SiteSettings_GetModels_Items_Choices;
public string SiteSettings_GetModels_Items_SiteIntegration;
public string SiteSettings_GetModels_SysLogs_UseFilterButton;
public string SiteSettings_GetModels_Users;
public string Summaries;
public string Summaries_DataTablesCases;
Expand Down Expand Up @@ -8304,6 +8306,7 @@ public class CodeTable
public CodeDefinition SiteSettings_GetModels_Items = new CodeDefinition();
public CodeDefinition SiteSettings_GetModels_Items_Choices = new CodeDefinition();
public CodeDefinition SiteSettings_GetModels_Items_SiteIntegration = new CodeDefinition();
public CodeDefinition SiteSettings_GetModels_SysLogs_UseFilterButton = new CodeDefinition();
public CodeDefinition SiteSettings_GetModels_Users = new CodeDefinition();
public CodeDefinition Summaries = new CodeDefinition();
public CodeDefinition Summaries_DataTablesCases = new CodeDefinition();
Expand Down
8 changes: 4 additions & 4 deletions Implem.DefinitionAccessor/Implem.DefinitionAccessor.csproj
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<Copyright>Copyright © Implem Inc 2014 - 2023</Copyright>
<AssemblyVersion>1.3.50.2</AssemblyVersion>
<FileVersion>1.3.50.2</FileVersion>
<Version>1.3.50.2</Version>
<AssemblyVersion>1.4.0.0</AssemblyVersion>
<FileVersion>1.4.0.0</FileVersion>
<Version>1.4.0.0</Version>
<Nullable>disable</Nullable>
</PropertyGroup>

Expand Down
8 changes: 4 additions & 4 deletions Implem.DisplayAccessor/Implem.DisplayAccessor.csproj
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<Copyright>Copyright © Implem Inc 2014 - 2023</Copyright>
<AssemblyVersion>1.3.50.2</AssemblyVersion>
<FileVersion>1.3.50.2</FileVersion>
<Version>1.3.50.2</Version>
<AssemblyVersion>1.4.0.0</AssemblyVersion>
<FileVersion>1.4.0.0</FileVersion>
<Version>1.4.0.0</Version>
<Nullable>disable</Nullable>
</PropertyGroup>

Expand Down
8 changes: 4 additions & 4 deletions Implem.Factory/Implem.Factory.csproj
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<Copyright>Copyright © Implem Inc 2014 - 2023</Copyright>
<AssemblyVersion>1.3.50.2</AssemblyVersion>
<FileVersion>1.3.50.2</FileVersion>
<Version>1.3.50.2</Version>
<AssemblyVersion>1.4.0.0</AssemblyVersion>
<FileVersion>1.4.0.0</FileVersion>
<Version>1.4.0.0</Version>
<Nullable>disable</Nullable>
</PropertyGroup>

Expand Down
17 changes: 1 addition & 16 deletions Implem.Libraries/Classes/XlsIo.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using DocumentFormat.OpenXml.Wordprocessing;
using Implem.Libraries.Utilities;
using Implem.Libraries.Utilities;
using System;
using System.Collections.Generic;
using System.IO;
Expand Down Expand Up @@ -125,20 +124,6 @@ public XlsRow(Dictionary<string, string> data)
data.ForEach(o => Add(o.Key, o.Value));
}

protected XlsRow(
SerializationInfo serializationInfo,
StreamingContext streamingContext)
: base(serializationInfo, streamingContext)
{
}

public override void GetObjectData(
SerializationInfo serializationInfo,
StreamingContext streamingContext)
{
base.GetObjectData(serializationInfo, streamingContext);
}

public string this[int index]
{
get
Expand Down
11 changes: 5 additions & 6 deletions Implem.Libraries/Implem.Libraries.csproj
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<Copyright>Copyright © Implem Inc 2014 - 2023</Copyright>
<AssemblyVersion>1.3.50.2</AssemblyVersion>
<FileVersion>1.3.50.2</FileVersion>
<Version>1.3.50.2</Version>
<AssemblyVersion>1.4.0.0</AssemblyVersion>
<FileVersion>1.4.0.0</FileVersion>
<Version>1.4.0.0</Version>
<Nullable>disable</Nullable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="CsvHelper" Version="30.0.1" />
<PackageReference Include="DocumentFormat.OpenXml" Version="3.0.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="SixLabors.ImageSharp" Version="3.0.2" />
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.1" />
<PackageReference Include="System.IO.FileSystem.Primitives" Version="4.3.0" />
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
</ItemGroup>
Expand Down
8 changes: 4 additions & 4 deletions Implem.ParameterAccessor/Implem.ParameterAccessor.csproj
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<Copyright>Copyright © Implem Inc 2014 - 2023</Copyright>
<AssemblyVersion>1.3.50.2</AssemblyVersion>
<FileVersion>1.3.50.2</FileVersion>
<Version>1.3.50.2</Version>
<AssemblyVersion>1.4.0.0</AssemblyVersion>
<FileVersion>1.4.0.0</FileVersion>
<Version>1.4.0.0</Version>
<Nullable>disable</Nullable>
</PropertyGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,40 +67,45 @@
ss: ss,
formulaScript: formulaSet.FormulaScript,
calculationMethod: formulaSet.CalculationMethod);
try
var value = FormulaServerScriptUtilities.Execute(
context: context,
ss: ss,
itemModel: this,
formulaScript: formulaSet.FormulaScript);
switch (value)
{
var value = FormulaServerScriptUtilities.Execute(
context: context,
ss: ss,
itemModel: this,
formulaScript: formulaSet.FormulaScript);
var formData = new Dictionary<string, string>
{
{ $"#TableName#_{columnName}", value.ToString() }
};
SetByFormData(
context: context,
ss: ss,
formData: formData);
if (ss.OutputFormulaLogs == true)
{
context.LogBuilder?.AppendLine($"formulaSet: {formulaSet.GetRecordingData().ToJson()}");
context.LogBuilder?.AppendLine($"formulaSource: {this.ToJson()}");
context.LogBuilder?.AppendLine($"formulaResult: {{\"{columnName}\":{value}}}");
}
case "#N/A":
case "#VALUE!":
case "#REF!":
case "#DIV/0!":
case "#NUM!":
case "#NAME?":
case "#NULL!":
case "Invalid Parameter":
if (formulaSet.IsDisplayError == true)
{
throw new Exception($"Formula error {value}");
}
new SysLogModel(
context: context,
method: nameof(SetByFormula),
message: $"Formula error {value}",
sysLogType: SysLogModel.SysLogTypes.Execption);
break;
}
catch (Exception exception)
var formData = new Dictionary<string, string>
{
if (formulaSet.IsDisplayError == true)
{
throw new Exception($"Formula error {exception.Message}");
}
new SysLogModel(
context: context,
method: nameof(SetByFormula),
message: $"Formula error {exception.Message}",
errStackTrace: exception.StackTrace,
sysLogType: SysLogModel.SysLogTypes.Execption);
{ $"#TableName#_{columnName}", value.ToString() }
};
SetByFormData(
context: context,
ss: ss,
formData: formData);
if (ss.OutputFormulaLogs == true)
{
context.LogBuilder?.AppendLine($"formulaSet: {formulaSet.GetRecordingData().ToJson()}");
context.LogBuilder?.AppendLine($"formulaSource: {this.ToJson()}");
context.LogBuilder?.AppendLine($"formulaResult: {{\"{columnName}\":{value}}}");
}
}
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
"Indent": "4",
"Separator": "\\r\\n",
"ItemOnly": "1",
"Exclude": "Sites,Wikis,Dashboards"
"Exclude": "Sites,Wikis"
}
Loading

0 comments on commit 5ad6cf7

Please sign in to comment.