wenyongda/ZrAdminNetCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🐛fix bug

Browse Source
This commit is contained in:
不做码农 2023-08-02 12:25:36 +08:00
parent 5f063ad9d3
commit 66a8d5793d
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ZR.Admin.WebApi/Extensions/DbExtension.cs
View File

@ -125,7 +125,7 @@ namespace ZR.Admin.WebApi.Extensions
SqlDiffLog log = new() SqlDiffLog log = new()
{ {
BeforeData = pars, BeforeData = pars,
BusinessData = data.ToString(), BusinessData = data?.ToString(),
DiffType = diffType.ToString(), DiffType = diffType.ToString(),
Sql = sql, Sql = sql,
TableName = item.TableName, TableName = item.TableName,

4
ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt
View File

@ -390,6 +390,7 @@ $if(sub)
$foreach(column in genTable.SubTable.Columns) $foreach(column in genTable.SubTable.Columns)
$set(labelName = column.ColumnComment) $set(labelName = column.ColumnComment)
$set(columnName = column.CsharpFieldFl) $set(columnName = column.CsharpFieldFl)
$set(value = "item.dictValue")
$if(column.CsharpType == "int" || column.CsharpType == "long") $if(column.CsharpType == "int" || column.CsharpType == "long")
$set(value = "parseInt(item.dictValue)") $set(value = "parseInt(item.dictValue)")
$set(number = ".number") $set(number = ".number")
@ -425,7 +426,7 @@ $elseif(column.HtmlType == "switch")
<el-table-column label="${labelName}" prop="${columnName}"> <el-table-column label="${labelName}" prop="${columnName}">
<template #default="scope"> <template #default="scope">
<el-switch v-model="scope.row.${columnName}" ${switchType} /> <el-switch v-model="scope.row.${columnName}" ${switchType} />
<template #default="scope"> </template>
</el-table-column> </el-table-column>
$else $else
<el-table-column label="${labelName}" align="center" prop="${columnName}"> <el-table-column label="${labelName}" align="center" prop="${columnName}">
@ -792,6 +793,7 @@ const handleFileSuccess = (response) => {
proxy.${alert}alert(item1 + '<p>' + error + '</p>', '导入结果', { proxy.${alert}alert(item1 + '<p>' + error + '</p>', '导入结果', {
dangerouslyUseHTMLString: true dangerouslyUseHTMLString: true
}) })
getList()
} }
$end $end