diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt index 029e462..b27dca6 100644 --- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt +++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt @@ -53,7 +53,7 @@ $elseif(column.HtmlType == "datePicker") :default-time="defaultTime"> -$elseif(column.HtmlType.Contains("select") || column.HtmlType == "radio") +$elseif(column.HtmlType.Contains("select")) @@ -65,6 +65,7 @@ $elseif(column.HtmlType.Contains("select") || column.HtmlType == "radio") $elseif(column.HtmlType == "radio") + 全部 {{item.dictLabel}} @@ -187,7 +188,7 @@ $elseif(column.HtmlType == "imageUpload") $elseif(column.HtmlType == "checkbox" || column.HtmlType.Contains("select") || column.HtmlType == "radio") $elseif(column.HtmlType == "datetime") @@ -326,10 +327,16 @@ $elseif(column.HtmlType == "editor") +$elseif(column.HtmlType == "slider") + + + + + $elseif(column.HtmlType == "select" || column.HtmlType == "selectMulti") - + { if (valid) { $foreach(item in genTable.Columns) -$if(item.HtmlType == "checkbox") +$if(item.HtmlType == "checkbox" || item.HtmlType == "selectMulti") form.value.${item.CsharpFieldFl} = form.value.${item.CsharpFieldFl}Checked.toString(); $end $end @@ -725,7 +732,6 @@ $if(replaceDto.ShowBtnEdit) open.value = false getList() }) - .catch(() => {}) $end } else { $if(replaceDto.ShowBtnAdd) @@ -734,7 +740,6 @@ $if(replaceDto.ShowBtnAdd) open.value = false getList() }) - .catch(() => {}) $end } } @@ -755,7 +760,6 @@ function handleDelete(row) { getList() proxy.${modal}modal.msgSuccess("删除成功") }) - .catch(() => {}) } $end diff --git a/ZR.Admin.WebApi/wwwroot/data.xlsx b/ZR.Admin.WebApi/wwwroot/data.xlsx index 0fef28e..6fe8cda 100644 Binary files a/ZR.Admin.WebApi/wwwroot/data.xlsx and b/ZR.Admin.WebApi/wwwroot/data.xlsx differ diff --git a/ZR.Vue/src/views/tool/gen/editTable.vue b/ZR.Vue/src/views/tool/gen/editTable.vue index 372b7ff..fdb1191 100644 --- a/ZR.Vue/src/views/tool/gen/editTable.vue +++ b/ZR.Vue/src/views/tool/gen/editTable.vue @@ -204,7 +204,6 @@ export default { checkedBtn: genTable.checkedBtn, permissionPrefix: genTable.permissionPrefix, } - console.log('genForm', genTable) updateGenTable(genTable).then((res) => { this.msgSuccess(res.msg)