diff --git a/projects/Infrastructure/Application/Entites/Settings/SettingType.cs b/projects/Infrastructure/Application/Entites/Settings/SettingType.cs index 5b7f6cce..e5c63316 100644 --- a/projects/Infrastructure/Application/Entites/Settings/SettingType.cs +++ b/projects/Infrastructure/Application/Entites/Settings/SettingType.cs @@ -4,28 +4,31 @@ namespace Infrastructure.Application.Entites.Settings { public enum SettingType { - [Display(Name = "数值")] - Number, + [Display(Name = "整数")] + Integer32 = 10, - [Display(Name = "复选框")] - Boolean, + [Display(Name = "浮点数")] + Doubule = 20, + + [Display(Name = "布尔值")] + Boolean = 30, [Display(Name = "文本")] - Text, + Text = 40, - [Display(Name = "Html代码")] - Html, + [Display(Name = "Html")] + Html = 50, [Display(Name = "图片")] - ImageUrl, + ImageUrl = 60, [Display(Name = "文件")] - FileUrl, + FileUrl = 70, [Display(Name = "时间")] - DateTime, + DateTime = 80, [Display(Name = "日期")] - Date + Date = 90 } } \ No newline at end of file diff --git a/projects/WebMVC/wwwroot/js/components.js b/projects/WebMVC/wwwroot/js/components.js index 26a0bd91..03f1bfe1 100644 --- a/projects/WebMVC/wwwroot/js/components.js +++ b/projects/WebMVC/wwwroot/js/components.js @@ -22,25 +22,4 @@ Vue.component('update', function (resolve, reject) { axios.get("/router/shared/update.html").then(function (response) { resolve(parseModel(response)); }); -}); -// -Vue.component('index', function (resolve, reject) { - axios.get("/router/shared/index.html").then(function (response) { - resolve(parseModel(response)); - }); -}); -Vue.component('detail', function (resolve, reject) { - axios.get("/router/shared/detail.html").then(function (response) { - resolve(parseModel(response)); - }); -}); -Vue.component('add', function (resolve, reject) { - axios.get("/router/shared/add.html").then(function (response) { - resolve(parseModel(response)); - }); -}); -Vue.component('edit', function (resolve, reject) { - axios.get("/router/shared/edit.html").then(function (response) { - resolve(parseModel(response)); - }); }); \ No newline at end of file diff --git a/projects/WebMVC/wwwroot/router/admin/setting/detail.html b/projects/WebMVC/wwwroot/router/admin/setting/detail.html new file mode 100644 index 00000000..3d688645 --- /dev/null +++ b/projects/WebMVC/wwwroot/router/admin/setting/detail.html @@ -0,0 +1,7 @@ + + \ No newline at end of file diff --git a/projects/WebMVC/wwwroot/router/admin/setting/edit.html b/projects/WebMVC/wwwroot/router/admin/setting/edit.html index 5ebbef69..bdaef536 100644 --- a/projects/WebMVC/wwwroot/router/admin/setting/edit.html +++ b/projects/WebMVC/wwwroot/router/admin/setting/edit.html @@ -3,7 +3,7 @@

{{title}}

-
+
- +
- {{getErrors('name')}} + {{getPropertyErrors('name')}}
{{data.schema.properties.name.description}}
- +
- {{getErrors('type')}} + {{getPropertyErrors('type')}}
{{data.schema.properties.type.description}}
- +
- {{getErrors('value')}} + {{getPropertyErrors('value')}}
@@ -60,7 +60,7 @@
- 返回 + 返回
@@ -72,10 +72,15 @@ \ No newline at end of file diff --git a/projects/WebMVC/wwwroot/router/shared/display.html b/projects/WebMVC/wwwroot/router/shared/display.html index c4ef5239..d4fdf707 100644 --- a/projects/WebMVC/wwwroot/router/shared/display.html +++ b/projects/WebMVC/wwwroot/router/shared/display.html @@ -17,7 +17,7 @@
- 返回 + 返回
@@ -54,6 +54,9 @@ title: function () { return this.name + '列表'; }, + base: function () { + return this.$route.path.substr(0, this.$route.path.lastIndexOf('/') + 1); + } }, mounted: function () { this.load(); diff --git a/projects/WebMVC/wwwroot/router/shared/edit.html b/projects/WebMVC/wwwroot/router/shared/edit.html index 9700163b..b0ead8b9 100644 --- a/projects/WebMVC/wwwroot/router/shared/edit.html +++ b/projects/WebMVC/wwwroot/router/shared/edit.html @@ -1,5 +1,5 @@