Added new features / Bug fixed

・HTMLヘッダ及びBODYのスクリプトの位置に任意のHTMLを出力する機能を追加。・横断検索時に検索文字列をハイライトする機能を追加。・パスワードの非表示状態を解除する機能を追加。・スイッチユーザを実行した後に元のユーザに復帰できない問題を解消。・新規作成時のプロセス処理でルックアップが正しく動作しない問題を解消。・サマータイムに関連する特定の日時入力時にエラーが発生する問題を解消。・SAMLログイン後にトップに設定したダッシュボードに遷移しない問題を解消。・分類項目に設定した複数リンクがサイトパッケージのインポートで正しく復元できない問題を解消。・フィルタボタンを使用するを有効にしてリンク項目のフィルタを変更するとフィルタが動作する問題を解消。・内容、説明項目を読取専用に設定した場合に入力ガイドが表示される問題を解消。
Implem · Aug 20, 2023 · fef4b03 · fef4b03
1 parent b36ef80
commit fef4b03
Show file tree

Hide file tree

Showing 53 changed files with 1,345 additions and 116 deletions.
diff --git a/Implem.CodeDefiner/Implem.CodeDefiner.csproj b/Implem.CodeDefiner/Implem.CodeDefiner.csproj
@@ -5,9 +5,9 @@
     <TargetFramework>net6.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.44.0</AssemblyVersion>
-    <FileVersion>1.3.44.0</FileVersion>
-    <Version>1.3.44.0</Version>
+    <AssemblyVersion>1.3.45.0</AssemblyVersion>
+    <FileVersion>1.3.45.0</FileVersion>
+    <Version>1.3.45.0</Version>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
   </PropertyGroup>
 

diff --git a/Implem.DefinitionAccessor/Def.cs b/Implem.DefinitionAccessor/Def.cs
@@ -4797,7 +4797,7 @@ public static void SetTemplateDefinition()
             {
                 switch (definitionRow[0].ToString())
                 {
-                    case "Dashboard": Template.Dashboard = definitionRow[1].ToString(); SetTemplateTable(TemplateTable.Dashboard, definitionRow, TemplateXls); break;
+                    case "Dashboard_en": Template.Dashboard_en = definitionRow[1].ToString(); SetTemplateTable(TemplateTable.Dashboard_en, definitionRow, TemplateXls); break;
                     case "Dashboard_ja": Template.Dashboard_ja = definitionRow[1].ToString(); SetTemplateTable(TemplateTable.Dashboard_ja, definitionRow, TemplateXls); break;
                     case "Template1": Template.Template1 = definitionRow[1].ToString(); SetTemplateTable(TemplateTable.Template1, definitionRow, TemplateXls); break;
                     case "Template10": Template.Template10 = definitionRow[1].ToString(); SetTemplateTable(TemplateTable.Template10, definitionRow, TemplateXls); break;
@@ -12438,7 +12438,7 @@ public void RestoreBySavedMemory()
 
     public class TemplateColumn2nd
     {
-        public string Dashboard;
+        public string Dashboard_en;
         public string Dashboard_ja;
         public string Template1;
         public string Template10;
@@ -12846,7 +12846,7 @@ public class TemplateColumn2nd
 
     public class TemplateTable
     {
-        public TemplateDefinition Dashboard = new TemplateDefinition();
+        public TemplateDefinition Dashboard_en = new TemplateDefinition();
         public TemplateDefinition Dashboard_ja = new TemplateDefinition();
         public TemplateDefinition Template1 = new TemplateDefinition();
         public TemplateDefinition Template10 = new TemplateDefinition();

diff --git a/Implem.DefinitionAccessor/Implem.DefinitionAccessor.csproj b/Implem.DefinitionAccessor/Implem.DefinitionAccessor.csproj
@@ -3,9 +3,9 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Copyright>Copyright © Implem Inc 2014 - 2023</Copyright>
-    <AssemblyVersion>1.3.44.0</AssemblyVersion>
-    <FileVersion>1.3.44.0</FileVersion>
-    <Version>1.3.44.0</Version>
+    <AssemblyVersion>1.3.45.0</AssemblyVersion>
+    <FileVersion>1.3.45.0</FileVersion>
+    <Version>1.3.45.0</Version>
     <Nullable>disable</Nullable>
   </PropertyGroup>
 

diff --git a/Implem.DisplayAccessor/Implem.DisplayAccessor.csproj b/Implem.DisplayAccessor/Implem.DisplayAccessor.csproj
@@ -3,9 +3,9 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Copyright>Copyright © Implem Inc 2014 - 2023</Copyright>
-    <AssemblyVersion>1.3.44.0</AssemblyVersion>
-    <FileVersion>1.3.44.0</FileVersion>
-    <Version>1.3.44.0</Version>
+    <AssemblyVersion>1.3.45.0</AssemblyVersion>
+    <FileVersion>1.3.45.0</FileVersion>
+    <Version>1.3.45.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>net6.0</TargetFramework>
     <Copyright>Copyright © Implem Inc 2014 - 2023</Copyright>
-    <AssemblyVersion>1.3.44.0</AssemblyVersion>
-    <FileVersion>1.3.44.0</FileVersion>
-    <Version>1.3.44.0</Version>
+    <AssemblyVersion>1.3.45.0</AssemblyVersion>
+    <FileVersion>1.3.45.0</FileVersion>
+    <Version>1.3.45.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>net6.0</TargetFramework>
     <Copyright>Copyright © Implem Inc 2014 - 2023</Copyright>
-    <AssemblyVersion>1.3.44.0</AssemblyVersion>
-    <FileVersion>1.3.44.0</FileVersion>
-    <Version>1.3.44.0</Version>
+    <AssemblyVersion>1.3.45.0</AssemblyVersion>
+    <FileVersion>1.3.45.0</FileVersion>
+    <Version>1.3.45.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>net6.0</TargetFramework>
     <Copyright>Copyright © Implem Inc 2014 - 2023</Copyright>
-    <AssemblyVersion>1.3.44.0</AssemblyVersion>
-    <FileVersion>1.3.44.0</FileVersion>
-    <Version>1.3.44.0</Version>
+    <AssemblyVersion>1.3.45.0</AssemblyVersion>
+    <FileVersion>1.3.45.0</FileVersion>
+    <Version>1.3.45.0</Version>
     <Nullable>disable</Nullable>
   </PropertyGroup>
 

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
@@ -73,6 +73,7 @@
             formData: formData);
         SetByLookups(
             context: context,
-            ss: ss);
+            ss: ss,
+            formData: formData);
     });
 }
diff --git a/Implem.Pleasanter/App_Data/Definitions/Definition_Code/Model_SetByLookups_Body.txt b/Implem.Pleasanter/App_Data/Definitions/Definition_Code/Model_SetByLookups_Body.txt
@@ -23,9 +23,13 @@
                 ?.Select(lookup => ss.GetColumn(
                     context: context,
                     columnName: lookup.To))
-                .Where(column => column?.BlankValue(value: SavedPropertyValue(
-                    context: context,
-                    column: column)) == true)
+                .Where(column => column?.BlankValue(value: AccessStatus == Databases.AccessStatuses.Selected
+                    ? SavedPropertyValue(
+                        context: context,
+                        column: column)
+                    : PropertyValue(
+                        context: context,
+                        column: column)) == true)
                 .Select(column => column.ColumnName)
                 .ToList(),
             copyByDefaultOnly: copyByDefaultOnly))

diff --git a/Implem.Pleasanter/App_Data/Definitions/Definition_Code/Model_Utilities_EditorItem_Body.txt b/Implem.Pleasanter/App_Data/Definitions/Definition_Code/Model_Utilities_EditorItem_Body.txt
@@ -109,6 +109,7 @@ public static string Editor(
                 context: context, methodType: #modelName#Model.MethodType),
             userStyle: ss.EditorStyles(
                 context: context, methodType: #modelName#Model.MethodType),
+            methodType: #modelName#Model.MethodType,
             serverScriptModelRow: serverScriptModelRow,
             action: () => hb
                 .Editor(

diff --git a/Implem.Pleasanter/App_Data/Displays/Html.json b/Implem.Pleasanter/App_Data/Displays/Html.json
@@ -0,0 +1,9 @@
+{
+    "Id": "Html",
+    "Type": 110,
+    "Languages": [
+        {
+            "Body": "HTML"
+        }
+    ]
+}
diff --git a/Implem.Pleasanter/App_Data/Displays/HtmlBodyScriptBottom.json b/Implem.Pleasanter/App_Data/Displays/HtmlBodyScriptBottom.json
@@ -0,0 +1,9 @@
+{
+    "Id": "HtmlBodyScriptBottom",
+    "Type": 110,
+    "Languages": [
+        {
+            "Body": "Body script bottom"
+        }
+    ]
+}
diff --git a/Implem.Pleasanter/App_Data/Displays/HtmlBodyScriptTop.json b/Implem.Pleasanter/App_Data/Displays/HtmlBodyScriptTop.json
@@ -0,0 +1,9 @@
+{
+    "Id": "HtmlBodyScriptTop",
+    "Type": 110,
+    "Languages": [
+        {
+            "Body": "Body script top"
+        }
+    ]
+}
diff --git a/Implem.Pleasanter/App_Data/Displays/HtmlHeadBottom.json b/Implem.Pleasanter/App_Data/Displays/HtmlHeadBottom.json
@@ -0,0 +1,9 @@
+{
+    "Id": "HtmlHeadBottom",
+    "Type": 110,
+    "Languages": [
+        {
+            "Body": "Head bottom"
+        }
+    ]
+}
diff --git a/Implem.Pleasanter/App_Data/Displays/HtmlHeadTop.json b/Implem.Pleasanter/App_Data/Displays/HtmlHeadTop.json
@@ -0,0 +1,9 @@
+{
+    "Id": "HtmlHeadTop",
+    "Type": 110,
+    "Languages": [
+        {
+            "Body": "Head top"
+        }
+    ]
+}
diff --git a/Implem.Pleasanter/App_Data/Displays/HtmlPositionType.json b/Implem.Pleasanter/App_Data/Displays/HtmlPositionType.json
@@ -0,0 +1,33 @@
+{
+    "Id": "HtmlPositionType",
+    "Type": 110,
+    "Languages": [
+        {
+            "Body": "Insertion potision"
+        },
+        {
+            "Language": "zh",
+            "Body": "插入位置"
+        },
+        {
+            "Language": "ja",
+            "Body": "挿入位置"
+        },
+        {
+            "Language": "de",
+            "Body": "Einfügeposition"
+        },
+        {
+            "Language": "ko",
+            "Body": "삽입 위치"
+        },
+        {
+            "Language": "es",
+            "Body": "Posición de inserción"
+        },
+        {
+            "Language": "vn",
+            "Body": "vị trí chèn"
+        }
+    ]
+}
diff --git a/Implem.Pleasanter/App_Data/Displays/Script.json b/Implem.Pleasanter/App_Data/Displays/Script.json
@@ -1,4 +1,4 @@
-{
+{
     "Id": "Script",
     "Type": 110,
     "Languages": [

diff --git a/Implem.Pleasanter/App_Start/BundleConfig.cs b/Implem.Pleasanter/App_Start/BundleConfig.cs
@@ -64,6 +64,7 @@ public static IEnumerable<string> Generals()
                 "~/scripts/loading.js",
                 "~/scripts/lockevents.js",
                 "~/scripts/log.js",
+                "~/scripts/showpassword.js",
                 "~/scripts/markdown.js",
                 "~/scripts/markdownevents.js",
                 "~/scripts/menuevents.js",

diff --git a/Implem.Pleasanter/Implem.Pleasanter.csproj b/Implem.Pleasanter/Implem.Pleasanter.csproj
@@ -5,9 +5,9 @@
     <Copyright>Copyright © Implem Inc 2014 - 2023</Copyright>
     <Description>Business application platform</Description>
     <AssemblyName>Implem.Pleasanter</AssemblyName>
-    <AssemblyVersion>1.3.44.0</AssemblyVersion>
-    <FileVersion>1.3.44.0</FileVersion>
-    <Version>1.3.44.0</Version>
+    <AssemblyVersion>1.3.45.0</AssemblyVersion>
+    <FileVersion>1.3.45.0</FileVersion>
+    <Version>1.3.45.0</Version>
     <Nullable>disable</Nullable>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
     <DockerComposeProjectPath>..\docker-compose.dcproj</DockerComposeProjectPath>

diff --git a/Implem.Pleasanter/Libraries/DataSources/Saml.cs b/Implem.Pleasanter/Libraries/DataSources/Saml.cs
@@ -568,7 +568,7 @@ public static Sustainsys.Saml2.IdentityProvider SetIdpCache(Context context, int
             }
         }
 
-        public static (string redirectResultUrl, string html) SamlLogin(Context context, string returnUrl="")
+        public static (string redirectResultUrl, string html) SamlLogin(Context context, string returnUrl = "")
         {
             if (!Authentications.SAML()
                 || context.AuthenticationType != "Federation"
@@ -650,30 +650,26 @@ public static (string redirectResultUrl, string html) SamlLogin(Context context,
                 }
                 throw;
             }
-            var user = new UserModel().Get(
+            var userModel = new UserModel().Get(
                 context: context,
                 ss: null,
                 where: Rds.UsersWhere()
                     .TenantId(tenant.TenantId)
                     .LoginId(loginId.Value));
-            if (user.AccessStatus == Databases.AccessStatuses.Selected)
+            if (userModel.AccessStatus == Databases.AccessStatuses.Selected)
             {
-                if (user.Disabled)
+                if (userModel.Disabled)
                 {
                     return (Responses.Locations.UserDisabled(context: context), null);
                 }
-                if (user.Lockout)
+                if (userModel.Lockout)
                 {
                     return (Responses.Locations.UserLockout(context: context), null);
                 }
-                var redirectResultUrl = Strings.CoalesceEmpty(
-                    user.GetReturnUrl(
-                        context: context,
-                        returnUrl: returnUrl),
-                    Responses.Locations.Top(context: context));
-                user.Allow(
+                context.LoginId = userModel.LoginId;
+                var redirectResultUrl = userModel.AllowAfterUrl(    
                     context: context,
-                    returnUrl: redirectResultUrl,
+                    returnUrl: returnUrl,
                     createPersistentCookie: true);
                 return (redirectResultUrl, null);
             }

diff --git a/Implem.Pleasanter/Libraries/HtmlParts/HtmlFields.cs b/Implem.Pleasanter/Libraries/HtmlParts/HtmlFields.cs
@@ -432,7 +432,6 @@ private static HtmlBuilder SwitchField(
                                 controlContainerCss: controlContainerCss,
                                 controlCss: controlCss,
                                 labelText: labelText,
-                                placeholder: placeholder,
                                 labelRaw: labelRaw,
                                 controlOnly: controlOnly,
                                 text: value,
@@ -1240,6 +1239,14 @@ public static HtmlBuilder FieldTextBox(
                             action: action,
                             method: method,
                             attributes: attributes);
+                        if (textType == HtmlTypes.TextTypes.Password)
+                        {
+                            hb.Div(
+                                attributes: new HtmlAttributes()
+                                    .Class("material-symbols-outlined show-password")
+                                    .OnClick("$p.showPassword(this)"),
+                                action: () => hb.Text("visibility"));
+                        }
                         controlOption?.Invoke();
                         hb.Span(
                             css: "unit",