merge

dotnetcore · Jan 13, 2023 · 3ba1e85 · 3ba1e85
2 parents fc50121 + 7ed689e
commit 3ba1e85
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 ## v6.x.x
 
-##6.3.13(2023-1-13)
+##6.3.14(2023-1-13)
 * **修改：**  修复多租户情况下上传和导入可能出现的异常
 * **修改：**  修复Layui模式下Tree和Combobox的bug
 * **修改：**  修复OSS上传图片没有自动指定ContentType的问题
@@ -141,7 +141,7 @@
 
 ## v5.x.x
 
-##5.10.13(2023-1-13)
+##5.10.14(2023-1-13)
 * **修改：**  修复多租户情况下上传和导入可能出现的异常
 * **修改：**  修复Layui模式下Tree和Combobox的bug
 * **修改：**  修复OSS上传图片没有自动指定ContentType的问题

diff --git a/src/WalkingTec.Mvvm.Mvc/framework_layui.js b/src/WalkingTec.Mvvm.Mvc/framework_layui.js
@@ -599,7 +599,7 @@ window.ff = {
         }
     },
 
-    ChainChange: function (url, self) {
+    ChainChange: function (url, self, usedefaultvalue) {
         var form = layui.form;
         var linkto = self.attributes["wtm-linkto"];
         if (linkto == undefined) {
@@ -662,7 +662,12 @@ window.ff = {
                     }
 
                     if (controltype === "combo") {
-                        window[comboid].update({ data: ff.getComboItems(data.Data) });
+                        var df = [];
+                        if (usedefaultvalue == true) {
+                            df = eval(comboid + "defaultvalues"); 
+                            debugger;
+                      }
+                        window[comboid].update({ data: ff.getComboItems(data.Data,df) });
                     }
                     if (controltype === "checkbox") {
                         for (i = 0; i < data.Data.length; i++) {

diff --git a/src/WalkingTec.Mvvm.TagHelpers.LayUI/Form/ComboBoxTagHelper.cs b/src/WalkingTec.Mvvm.TagHelpers.LayUI/Form/ComboBoxTagHelper.cs
@@ -313,18 +313,19 @@ public override void Process(TagHelperContext context, TagHelperOutput output)
    }},
 	data:  {JsonSerializer.Serialize(GetLayuiTree(listItems,selectVal))}
 }});
+     {Id}defaultvalues = {JsonSerializer.Serialize(selectVal)};
         {((LinkField != null || string.IsNullOrEmpty(LinkId) == false) ? @$"
             if (eval(""{(string.IsNullOrEmpty(ChangeFunc) ? "1==1" : FormatFuncName(ChangeFunc))}"") != false) {{
                 var {Id}u = ""{(TriggerUrl ?? "")}"";
                 if ({Id}u.indexOf(""?"") == -1) {{
                     {Id}u += ""?t="" + new Date().getTime();
                 }}
-                var idata = {JsonSerializer.Serialize(selectVal)};
-                for (var i = 0; i < idata.length; i++) {{
-                    {Id}u += ""&id="" + idata[i];
+                var {Id}data = {JsonSerializer.Serialize(selectVal)};
+                for (var i = 0; i < {Id}data.length; i++) {{
+                    {Id}u += ""&id="" + {Id}data[i];
                 }};
                 setTimeout(function(){{
-                    ff.ChainChange({Id}u, $('#{Id}')[0]);
+                    ff.ChainChange({Id}u, $('#{Id}')[0], true);
                 }},100);
         }}" : FormatFuncName(ChangeFunc))}
 </script>