diff --git a/ZR.Admin.WebApi/Controllers/System/SysLoginController.cs b/ZR.Admin.WebApi/Controllers/System/SysLoginController.cs
index 93af7f7..13cfd24 100644
--- a/ZR.Admin.WebApi/Controllers/System/SysLoginController.cs
+++ b/ZR.Admin.WebApi/Controllers/System/SysLoginController.cs
@@ -137,7 +137,7 @@ namespace ZR.Admin.WebApi.Controllers.System
{
string uuid = Guid.NewGuid().ToString().Replace("-", "");
var code = SecurityCodeHelper.GetRandomEnDigitalText(4);
- var imgByte = SecurityCodeHelper.GetGifEnDigitalCodeByte(code);
+ var imgByte = SecurityCodeHelper.GetEnDigitalCodeByte(code);
string base64Str = Convert.ToBase64String(imgByte);
CacheHelper.SetCache(uuid, code);
var obj = new { uuid, img = base64Str };// File(stream, "image/png")
diff --git a/ZR.CodeGenerator/CodeGeneratorTool.cs b/ZR.CodeGenerator/CodeGeneratorTool.cs
index 9f547cc..acd00b9 100644
--- a/ZR.CodeGenerator/CodeGeneratorTool.cs
+++ b/ZR.CodeGenerator/CodeGeneratorTool.cs
@@ -482,6 +482,7 @@ namespace ZR.CodeGenerator
Create_by = genTable.Create_by,
Create_time = DateTime.Now,
IsInsert = !column.IsIdentity,//非自增字段都需要插入
+ IsEdit = true,
IsQuery = false,
HtmlType = GenConstants.HTML_INPUT
};
@@ -509,9 +510,9 @@ namespace ZR.CodeGenerator
genTableColumn.HtmlType = GenConstants.HTML_TEXTAREA;
}
//编辑字段
- if (GenConstants.COLUMNNAME_NOT_EDIT.Any(f => column.DbColumnName.Contains(f)) && !column.IsIdentity && !column.IsPrimarykey)
+ if (column.IsIdentity || column.IsPrimarykey || GenConstants.COLUMNNAME_NOT_EDIT.Any(f => column.DbColumnName.Contains(f)) )
{
- genTableColumn.IsEdit = true;
+ genTableColumn.IsEdit = false;
}
//列表字段
if (!GenConstants.COLUMNNAME_NOT_LIST.Any(f => column.DbColumnName.Contains(f) && !column.IsPrimarykey))
diff --git a/ZR.Vue/README.md b/ZR.Vue/README.md
index b3030b7..6508c90 100644
--- a/ZR.Vue/README.md
+++ b/ZR.Vue/README.md
@@ -30,7 +30,7 @@ npm run build:prod
```
# 插件说明
-### Autoprefixer
+### Autoprefixer (已删除)
浏览器自动补全前缀
例如:
```
diff --git a/ZR.Vue/package.json b/ZR.Vue/package.json
index fcb7cc9..873c7e6 100644
--- a/ZR.Vue/package.json
+++ b/ZR.Vue/package.json
@@ -51,7 +51,6 @@
"@vue/cli-plugin-babel": "4.4.4",
"@vue/cli-plugin-eslint": "4.4.4",
"@vue/cli-service": "4.4.4",
- "autoprefixer": "9.5.1",
"babel-eslint": "10.1.0",
"babel-plugin-dynamic-import-node": "2.3.3",
"chalk": "4.1.0",
@@ -59,13 +58,11 @@
"eslint": "6.7.2",
"eslint-plugin-vue": "6.2.2",
"lint-staged": "8.1.5",
- "node-sass": "4.14.1",
- "runjs": "4.3.2",
- "sass-loader": "8.0.2",
+ "sass": "1.32.13",
+ "runjs": "4.4.2",
+ "sass-loader": "10.1.0",
"script-ext-html-webpack-plugin": "2.1.3",
- "serve-static": "1.13.2",
"svg-sprite-loader": "4.1.3",
- "svgo": "2.8.0",
"vue-template-compiler": "2.6.12"
},
"engines": {
diff --git a/ZR.Vue/src/components/HeaderSearch/index.vue b/ZR.Vue/src/components/HeaderSearch/index.vue
index 2980c06..f814c29 100644
--- a/ZR.Vue/src/components/HeaderSearch/index.vue
+++ b/ZR.Vue/src/components/HeaderSearch/index.vue
@@ -168,7 +168,7 @@ export default {
display: inline-block;
vertical-align: middle;
- /deep/ .el-input__inner {
+ ::v-deep .el-input__inner {
border-radius: 0;
border: 0;
padding-left: 0;
diff --git a/ZR.Vue/src/views/tool/gen/editTable.vue b/ZR.Vue/src/views/tool/gen/editTable.vue
index 6f3930c..81a6f7c 100644
--- a/ZR.Vue/src/views/tool/gen/editTable.vue
+++ b/ZR.Vue/src/views/tool/gen/editTable.vue
@@ -51,7 +51,7 @@
-
+
diff --git a/document/admin-sqlserver.sql b/document/admin-sqlserver.sql
index d4d39a3..2d60ad3 100644
Binary files a/document/admin-sqlserver.sql and b/document/admin-sqlserver.sql differ