## Added new features / Bug fixed

・プロセスの「データ変更」に「値の関数操作」機能を追加。・ダッシュボードのクイックアクセスのボタンをカスタマイズする機能を追加。・リンクの＋ボタンで子レコードを作成後、親レコードに戻らない機能を追加。・「通知」の宛先にCC、BCCを指定する機能を追加。・MySQLのアクセス制御機能によりOwner、Userの接続が拒否される場合がある問題を解消。・標準カレンダで表示期間外のレコードが表示される問題を解消。・サーバスクリプトでExtendedCellCssカラムで指定したクラスのHide属性が効かない場合がある問題を解消。・サーバスクリプトのitems.GetClosestSite で作成権限のあるユーザがサイトIDを取得できない問題を解消。・DevelopmentToolsで作成されたテーブルがある場合にCodeDefinerが失敗する問題を解消。・テナントの管理画面で指定したタイトル画像が全文検索の結果画面で表示されない問題を解消。・パスワード誤りでログイン失敗した際に最終ログイン日が更新される問題を解消。・ダッシュボードに追加した標準カレンダーで、「分類」に指定した項目が「検索機能を使う」設定の場合に行が表示されない問題を解消。・一覧画面で追加レコード読み込み時にコンソールにサーバスクリプトのログが出力されない問題を解消。・APIでリクエストJSONの内容に不備がある場合のエラーの内容が適切でない問題を解消。・一覧画面以外を表示していてもURLコピーボタンで取得するURLが「/index」（一覧画面）になる問題を解消。・項目連携対象の項目で自動ポストバックを設定している場合にレコードの作成や更新後のメッセージが消えてしまう問題を解消。・新UIテーマのレイアウトを調整。
Implem · Nov 12, 2024 · 1cb2a73 · 1cb2a73
1 parent c9a2506
commit 1cb2a73
Show file tree

Hide file tree

Showing 107 changed files with 10,967 additions and 7,810 deletions.
diff --git a/Implem.CodeDefiner/Functions/Rds/PrivilegeConfigurator.cs b/Implem.CodeDefiner/Functions/Rds/PrivilegeConfigurator.cs
@@ -33,24 +33,17 @@ private static void Execute(ISqlObjectFactory factory, string connectionString)
             }
             else
             {
+                var ocn = new TextData(Parameters.Rds.OwnerConnectionString, ';', '=');
                 Def.SqlIoByAdmin(factory).ExecuteNonQuery(
                     factory: factory,
                     dbTransaction: null,
                     dbConnection: null,
                     commandText: Def.Sql.GrantPrivilegeUser
                         .Replace("#Uid#", cn["uid"])
+                        .Replace("#Oid#", ocn["uid"])
                         .Replace("#ServiceName#", Environments.ServiceName)
                         .Replace("#SchemaName#", factory.SqlDefinitionSetting.SchemaName));
             }
         }
-
-        private static string CommandText(ISqlObjectFactory factory, string uid)
-        {
-            return (uid.EndsWith("_Owner")
-                ? Def.Sql.GrantPrivilegeAdmin.Replace("#Uid#", uid)
-                : Def.Sql.GrantPrivilegeUser.Replace("#Uid#", uid))
-                    .Replace("#ServiceName#", Environments.ServiceName)
-                    .Replace("#SchemaName#", factory.SqlDefinitionSetting.SchemaName);
-        }
     }
 }
diff --git a/Implem.CodeDefiner/Implem.CodeDefiner.csproj b/Implem.CodeDefiner/Implem.CodeDefiner.csproj
@@ -5,9 +5,9 @@
     <TargetFramework>net8.0</TargetFramework>
     <Copyright>Copyright © Implem Inc 2014 - 2024</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.9.2</AssemblyVersion>
-    <FileVersion>1.4.9.2</FileVersion>
-    <Version>1.4.9.2</Version>
+    <AssemblyVersion>1.4.10.0</AssemblyVersion>
+    <FileVersion>1.4.10.0</FileVersion>
+    <Version>1.4.10.0</Version>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
   </PropertyGroup>
 

diff --git a/Implem.DefinitionAccessor/Implem.DefinitionAccessor.csproj b/Implem.DefinitionAccessor/Implem.DefinitionAccessor.csproj
@@ -3,9 +3,9 @@
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <Copyright>Copyright © Implem Inc 2014 - 2024</Copyright>
-    <AssemblyVersion>1.4.9.2</AssemblyVersion>
-    <FileVersion>1.4.9.2</FileVersion>
-    <Version>1.4.9.2</Version>
+    <AssemblyVersion>1.4.10.0</AssemblyVersion>
+    <FileVersion>1.4.10.0</FileVersion>
+    <Version>1.4.10.0</Version>
     <Nullable>disable</Nullable>
   </PropertyGroup>
 

diff --git a/Implem.DefinitionAccessor/Initializer.cs b/Implem.DefinitionAccessor/Initializer.cs
@@ -182,7 +182,7 @@ public static void SetParameters()
                 Parameters.CommercialLicense()
                     ? "ee"
                     : "com");
-            if(Parameters.Security.AspNetCoreDataProtection == null)
+            if (Parameters.Security.AspNetCoreDataProtection == null)
             {
                 Parameters.Security.AspNetCoreDataProtection = new AspNetCoreDataProtection();
             }
@@ -491,7 +491,10 @@ private static List<ExtendedScript> ExtendedScripts(
             path = path ?? Path.Combine(
                 ParametersPath,
                 "ExtendedScripts");
-            foreach (var file in new DirectoryInfo(path).GetFiles("*.js"))
+            var files = new DirectoryInfo(path)
+                .GetFiles("*.js")
+                .OrderBy(file => file.Name);
+            foreach (var file in files)
             {
                 var script = Files.Read(file.FullName);
                 if (script != null)
@@ -504,7 +507,10 @@ private static List<ExtendedScript> ExtendedScripts(
                     });
                 }
             }
-            foreach (var dir in new DirectoryInfo(path).GetDirectories())
+            var dirs = new DirectoryInfo(path)
+                .GetDirectories()
+                .OrderBy(dir => dir.Name);
+            foreach (var dir in dirs)
             {
                 list = ExtendedScripts(dir.FullName, list);
             }
@@ -612,7 +618,10 @@ private static List<ExtendedStyle> ExtendedStyles(
             path = path ?? Path.Combine(
                 ParametersPath,
                 "ExtendedStyles");
-            foreach (var file in new DirectoryInfo(path).GetFiles("*.css"))
+            var files = new DirectoryInfo(path)
+                .GetFiles("*.css")
+                .OrderBy(file => file.Name);
+            foreach (var file in files)
             {
                 var style = Files.Read(file.FullName);
                 if (style != null)
@@ -625,7 +634,10 @@ private static List<ExtendedStyle> ExtendedStyles(
                     });
                 }
             }
-            foreach (var dir in new DirectoryInfo(path).GetDirectories())
+            var dirs = new DirectoryInfo(path)
+                .GetDirectories()
+                .OrderBy(dir => dir.Name);
+            foreach (var dir in dirs)
             {
                 list = ExtendedStyles(dir.FullName, list);
             }
@@ -936,7 +948,7 @@ private static void SetColumnDefinitionAccessControl()
                     SetManageServiceToDisableSecondaryAuthentication();
                     break;
             }
-            if((Parameters.Security.SecondaryAuthentication?.Mode
+            if ((Parameters.Security.SecondaryAuthentication?.Mode
                 is null
                 or SecondaryAuthentication.SecondaryAuthenticationMode.None)
                     || Parameters.Security.SecondaryAuthentication?.NotificationType

diff --git a/Implem.DisplayAccessor/Implem.DisplayAccessor.csproj b/Implem.DisplayAccessor/Implem.DisplayAccessor.csproj
@@ -3,9 +3,9 @@
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <Copyright>Copyright © Implem Inc 2014 - 2024</Copyright>
-    <AssemblyVersion>1.4.9.2</AssemblyVersion>
-    <FileVersion>1.4.9.2</FileVersion>
-    <Version>1.4.9.2</Version>
+    <AssemblyVersion>1.4.10.0</AssemblyVersion>
+    <FileVersion>1.4.10.0</FileVersion>
+    <Version>1.4.10.0</Version>
     <Nullable>disable</Nullable>
   </PropertyGroup>
 

diff --git a/Implem.Factory/Implem.Factory.csproj b/Implem.Factory/Implem.Factory.csproj
@@ -3,9 +3,9 @@
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <Copyright>Copyright © Implem Inc 2014 - 2024</Copyright>
-    <AssemblyVersion>1.4.9.2</AssemblyVersion>
-    <FileVersion>1.4.9.2</FileVersion>
-    <Version>1.4.9.2</Version>
+    <AssemblyVersion>1.4.10.0</AssemblyVersion>
+    <FileVersion>1.4.10.0</FileVersion>
+    <Version>1.4.10.0</Version>
     <Nullable>disable</Nullable>
   </PropertyGroup>
 

diff --git a/Implem.Libraries/Implem.Libraries.csproj b/Implem.Libraries/Implem.Libraries.csproj
@@ -3,9 +3,9 @@
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <Copyright>Copyright © Implem Inc 2014 - 2024</Copyright>
-    <AssemblyVersion>1.4.9.2</AssemblyVersion>
-    <FileVersion>1.4.9.2</FileVersion>
-    <Version>1.4.9.2</Version>
+    <AssemblyVersion>1.4.10.0</AssemblyVersion>
+    <FileVersion>1.4.10.0</FileVersion>
+    <Version>1.4.10.0</Version>
     <Nullable>disable</Nullable>
   </PropertyGroup>
 

diff --git a/Implem.ParameterAccessor/Implem.ParameterAccessor.csproj b/Implem.ParameterAccessor/Implem.ParameterAccessor.csproj
@@ -3,9 +3,9 @@
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <Copyright>Copyright © Implem Inc 2014 - 2024</Copyright>
-    <AssemblyVersion>1.4.9.2</AssemblyVersion>
-    <FileVersion>1.4.9.2</FileVersion>
-    <Version>1.4.9.2</Version>
+    <AssemblyVersion>1.4.10.0</AssemblyVersion>
+    <FileVersion>1.4.10.0</FileVersion>
+    <Version>1.4.10.0</Version>
     <Nullable>disable</Nullable>
   </PropertyGroup>
 

diff --git a/Implem.Pleasanter/App_Data/Definitions/Definition_Code/HtmlLinks_Body.txt b/Implem.Pleasanter/App_Data/Definitions/Definition_Code/HtmlLinks_Body.txt
@@ -476,11 +476,11 @@ namespace Implem.Pleasanter.Libraries.HtmlParts
                     context: context,
                     dataRows: dataRows);
             }
-            return hb.Table(
+            return hb.GridTable(
                 id: dataTableName,
-                css: "grid" + (ss.GetNoDisplayIfReadOnly(context: context)
+                css: ss.GetNoDisplayIfReadOnly(context: context)
                     ? " not-link"
-                    : string.Empty),
+                    : string.Empty,
                 attributes: new HtmlAttributes()
                     .DataId(ss.SiteId.ToString())
                     .DataName(direction)

diff --git a/Implem.Pleasanter/App_Data/Definitions/Definition_Code/Model_CreatedNotice_Body.txt b/Implem.Pleasanter/App_Data/Definitions/Definition_Code/Model_CreatedNotice_Body.txt
@@ -26,7 +26,19 @@
                         context: context,
                         ss: ss,
                         value: notification.Body),
-                    values: ss.IncludedColumns(notification.Address)
+                    valuesTo: ss.IncludedColumns(notification.Address)
+                        .ToDictionary(
+                            column => column,
+                            column => PropertyValue(
+                                context: context,
+                                column: column)),
+                    valuesCc: ss.IncludedColumns(notification.CcAddress)
+                        .ToDictionary(
+                            column => column,
+                            column => PropertyValue(
+                                context: context,
+                                column: column)),
+                    valuesBcc: ss.IncludedColumns(notification.BccAddress)
                         .ToDictionary(
                             column => column,
                             column => PropertyValue(

diff --git a/Implem.Pleasanter/App_Data/Definitions/Definition_Code/Model_Notice_Body.txt b/Implem.Pleasanter/App_Data/Definitions/Definition_Code/Model_Notice_Body.txt
@@ -78,7 +78,19 @@ public void Notice(
                 context: context,
                 users: users);
         }
-        var values = ss.IncludedColumns(notification.Address)
+        var valuesTo = ss.IncludedColumns(notification.Address)
+            .ToDictionary(
+                column => column,
+                column => PropertyValue(
+                    context: context,
+                    column: column));
+        var valuesCc = ss.IncludedColumns(notification.CcAddress)
+            .ToDictionary(
+                column => column,
+                column => PropertyValue(
+                    context: context,
+                    column: column));
+        var valuesBcc = ss.IncludedColumns(notification.BccAddress)
             .ToDictionary(
                 column => column,
                 column => PropertyValue(
@@ -108,7 +120,9 @@ public void Notice(
                             context: context,
                             ss: ss,
                             notification: notification),
-                        values: values);
+                        valuesTo: valuesTo,
+                        valuesCc: valuesCc,
+                        valuesBcc: valuesBcc);
                 }
                 break;
             case "Updated":
@@ -136,7 +150,9 @@ public void Notice(
                                     "[NotificationTrigger]",
                                     Displays.UpdatedWord(context: context))),
                         body: body,
-                        values: values);
+                        valuesTo: valuesTo,
+                        valuesCc: valuesCc,
+                        valuesBcc: valuesBcc);
                 }
                 break;
             case "Deleted":
@@ -159,7 +175,9 @@ public void Notice(
                             context: context,
                             ss: ss,
                             notification: notification),
-                        values: values);
+                        valuesTo: valuesTo,
+                        valuesCc: valuesCc,
+                        valuesBcc: valuesBcc);
                 }
                 break;
         }

diff --git a/Implem.Pleasanter/App_Data/Definitions/Definition_Code/Model_OnUpdatedNotice_Body.txt b/Implem.Pleasanter/App_Data/Definitions/Definition_Code/Model_OnUpdatedNotice_Body.txt
@@ -26,7 +26,19 @@
                         context: context,
                         ss: ss,
                         value: notification.Body),
-                    values: ss.IncludedColumns(notification.Address)
+                    valuesTo: ss.IncludedColumns(notification.Address)
+                        .ToDictionary(
+                            column => column,
+                            column => PropertyValue(
+                                context: context,
+                                column: column)),
+                    valuesCc: ss.IncludedColumns(notification.CcAddress)
+                        .ToDictionary(
+                            column => column,
+                            column => PropertyValue(
+                                context: context,
+                                column: column)),
+                    valuesBcc: ss.IncludedColumns(notification.BccAddress)
                         .ToDictionary(
                             column => column,
                             column => PropertyValue(

diff --git a/Implem.Pleasanter/App_Data/Definitions/Definition_Code/Model_SetByDataChanges_Body.txt b/Implem.Pleasanter/App_Data/Definitions/Definition_Code/Model_SetByDataChanges_Body.txt
@@ -42,6 +42,35 @@
                             column: column,
                             mine: Mine(context: context))));
                 break;
+            case DataChange.Types.InputValueFormula:
+                var formulaSet = new FormulaSet()
+                {
+                    Id = dataChange.Id
+                };
+                var err = FormulaBuilder.SetFormula(
+                    formulaSet: formulaSet,
+                    ss: ss,
+                    calculationMethod: "Extended",
+                    target: dataChange.ColumnName,
+                    condition: null,
+                    formula: dataChange.Value,
+                    notUseDisplayName: false,
+                    isDisplayError: dataChange.ValueFormulaIsDisplayError,
+                    outOfCondition: null);
+                if (err == Error.Types.None)
+                {
+                    formData[key] = ExecFormulaExtended(
+                        context: context,
+                        ss: ss,
+                        columnName: dataChange.ColumnName,
+                        formulaSet: formulaSet,
+                        outputFormulaLogs: ss.ProcessOutputFormulaLogs);
+                }
+                else
+                {
+                    throw new Exception($"Formula error {formulaSet.Id}:{err.Message(context: context)}");
+                }
+                break;
             case DataChange.Types.InputDate:
             case DataChange.Types.InputDateTime:
                 var baseDateTimeColumn = ss.GetColumn(