Merge commit 'd1108700e0ad43b6bfea3f9a79bbb14799a2d29c'

ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplService.txt

@@ -117,7 +117,7 @@ $end
 $if(null != genTable.SubTableName && "" != genTable.SubTableName)
             return Context.InsertNav(model).Include(s1 => s1.${genTable.SubTable.ClassName}Nav).ExecuteReturnEntity();
 $else
-            return Insertable(model).IgnoreColumns(true).ExecuteReturnEntity();
+            return Context.Insertable(model).ExecuteReturnEntity();
 $end
         }
 

ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt

@@ -778,7 +778,22 @@ function handlePreview(row) {
   open.value = true
   title.value = '查看'
   opertype.value = 3
-  form.value = row
+  form.value = { ...row }
+}
+$end
+
+$if(replaceDto.ShowBtnImport)
+// 导入数据成功处理
+const handleFileSuccess = (response) => {
+  const { item1, item2 } = response.data
+  var error = ''
+  item2.forEach((item) => {
+    error += item.storageMessage + ','
+  })
+  proxy.${alert}alert(item1 + '<p>' + error + '</p>', '导入结果', {
+    dangerouslyUseHTMLString: true
+  })
+  getList()
 }
 $end