prepare 5.10.15

dotnetcore · Jan 30, 2023 · 1c90de3 · 1c90de3
1 parent 45e4246
commit 1c90de3
Show file tree

Hide file tree

Showing 8 changed files with 46 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 ## v6.x.x
 
+##6.3.15(2023-1-30)
+* **修改：**  更新Blazor控件库到最新版本
+* **修改：**  修复Layui模式下的一些js错误
+* **修改：**  修复Layui模式下TextBox的Change-Func和Done-Func无效的问题
+
 ##6.3.14(2023-1-13)
 * **修改：**  修复多租户情况下上传和导入可能出现的异常
 * **修改：**  修复Layui模式下Tree和Combobox的bug
@@ -141,6 +146,11 @@
 
 ## v5.x.x
 
+##5.10.15(2023-1-30)
+* **修改：**  更新Blazor控件库到最新版本
+* **修改：**  修复Layui模式下的一些js错误
+* **修改：**  修复Layui模式下TextBox的Change-Func和Done-Func无效的问题
+
 ##5.10.14(2023-1-13)
 * **修改：**  修复多租户情况下上传和导入可能出现的异常
 * **修改：**  修复Layui模式下Tree和Combobox的bug

diff --git a/...vvm.BlazorDemo/WalkingTec.Mvvm.BlazorDemo.Shared/WalkingTec.Mvvm.BlazorDemo.Shared.csproj b/...vvm.BlazorDemo/WalkingTec.Mvvm.BlazorDemo.Shared/WalkingTec.Mvvm.BlazorDemo.Shared.csproj
@@ -5,8 +5,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BootstrapBlazor" Version="7.0.0" />
-    <PackageReference Include="BootstrapBlazor.Chart" Version="7.0.0" />
+    <PackageReference Include="BootstrapBlazor" Version="7.2.4" />
+    <PackageReference Include="BootstrapBlazor.Chart" Version="7.0.1" />
     <PackageReference Include="BootstrapBlazor.SummerNote" Version="7.0.0" />
   </ItemGroup>
 

diff --git a/demo/WalkingTec.Mvvm.BlazorDemo/WalkingTec.Mvvm.BlazorDemo/appsettings.json b/demo/WalkingTec.Mvvm.BlazorDemo/WalkingTec.Mvvm.BlazorDemo/appsettings.json
@@ -37,7 +37,7 @@
   "IsFilePublic": true,
   "ErrorHandler": "/_Framework/Error",
   "Languages": "zh,en",
-  "BlazorMode": "server", // server or wasm
+  "BlazorMode": "wasm", // server or wasm
   "CorsOptions": {
     "EnableAll": true //所有方法是否默认跨域
   },

diff --git a/demo/WalkingTec.Mvvm.Demo/Views/City/Create.cshtml b/demo/WalkingTec.Mvvm.Demo/Views/City/Create.cshtml
@@ -3,7 +3,7 @@
 
 <wt:form vm="@Model">
   <wt:row items-per-row="ItemsPerRowEnum.Two">
-    <wt:textbox field="Entity.Name" />
+    <wt:textbox field="Entity.Name" change-func="abc" done-func="abc2"/>
     <wt:textbox field="Entity.Test" />
     <wt:tree field="Entity.ParentId" item-url="/City/GetAllCities" show-toolbar="false"/>
   </wt:row>
@@ -13,3 +13,12 @@
     <wt:closebutton />
   </wt:row>
 </wt:form>
+<script>
+  function abc(data){
+    console.log("change"+data);
+  }
+    function abc2(data) {
+        console.log("done" + data);
+      }
+
+</script>
diff --git a/demo/WalkingTec.Mvvm.Demo/Views/School/Create.cshtml b/demo/WalkingTec.Mvvm.Demo/Views/School/Create.cshtml
@@ -9,7 +9,7 @@
         <wt:upload field="Entity.FileId"  />
         <wt:multiupload field="Entity.Photos" upload-type="ImageFile" preview-width="128" />
     <wt:multiupload field="Entity.Files" upload-type="AllFiles" />
-        <wt:datetime field="Entity.Duration" format="HH:mm:ss" type="Time" default-value="1:1:1" />
+        <wt:datetime field="Entity.Duration" format="HH:mm:ss" type="Time" default-value="1:1:1" done-func="aaa"/>
     <wt:ueditor field="Entity.Remark" height="300" upload-group-name="test" upload-subdir="bbb" id="abc"/>
   </wt:row>
   <wt:row align="AlignEnum.Right">
@@ -31,5 +31,7 @@
     alert("test不提交");
     return false;
   }
-
+  function aaa(a,b,c){
+    alert(a);
+  }
 </script>
diff --git a/src/WalkingTec.Mvvm.Core/Support/FileHandlers/WtmOssFileHandler.cs b/src/WalkingTec.Mvvm.Core/Support/FileHandlers/WtmOssFileHandler.cs
@@ -100,7 +100,7 @@ public override (string path, string handlerInfo) Upload(string fileName, long f
             ext = ext.ToLower();
             if (imagetypes.Contains(ext))
             {
-                md.ContentType = "image/" + ext;
+                md.ContentType = "image/jpg";
             }
             OssClient client = new OssClient(groupInfo.ServerUrl, groupInfo.Key, groupInfo.Secret);
             var result = client.PutObject(groupInfo.GroupLocation, fullPath, data,md);

diff --git a/src/WalkingTec.Mvvm.TagHelpers.LayUI/Form/TextBoxTagHelper.cs b/src/WalkingTec.Mvvm.TagHelpers.LayUI/Form/TextBoxTagHelper.cs
@@ -17,15 +17,19 @@ public class TextBoxTagHelper : BaseFieldTag
 
 
         /// <summary>
-        /// 改变选择时触发的js函数，func(data)格式;
+        /// 文本时触发的js函数，func(data)格式;
         /// <para>
-        /// data.Text得到选中文本;
+        /// data得到文本;
         /// </para>
+        /// </summary>
+        public string ChangeFunc { get; set; }
+        /// <summary>
+        /// 文本修改后焦点离开时触发的js函数，func(data)格式;
         /// <para>
-        /// data.Value得到被选中的值;
+        /// data得到文本;
         /// </para>
         /// </summary>
-        public string ChangeFunc { get; set; }
+        public string DoneFunc { get; set; }
 
 
         public bool IsPassword { get; set; }
@@ -38,6 +42,15 @@ public override void Process(TagHelperContext context, TagHelperOutput output)
             output.Attributes.Add("type", type);
             output.Attributes.Add("name", Field.Name);
             output.Attributes.Add("wtm-name", Field.Name);
+            if(string.IsNullOrEmpty(ChangeFunc) == false)
+            {
+                output.Attributes.Add("oninput", $"{FormatFuncName(ChangeFunc, false)}(this.value)");
+            }
+            if (string.IsNullOrEmpty(DoneFunc) == false)
+            {
+                output.Attributes.Add("onchange", $"{FormatFuncName(DoneFunc, false)}(this.value)");
+            }
+
             if (string.IsNullOrEmpty(Field?.Model?.ToString()) == false)
             {
                 DefaultValue = null;

diff --git a/version.props b/version.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <VersionPrefix>5.10.14</VersionPrefix>
+    <VersionPrefix>5.10.15</VersionPrefix>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">