diff --git a/Bootstrap.Admin/wwwroot/lib/longbow/longbow.dataentity.js b/Bootstrap.Admin/wwwroot/lib/longbow/longbow.dataentity.js index 9e0f8c61..ccfee8ac 100644 --- a/Bootstrap.Admin/wwwroot/lib/longbow/longbow.dataentity.js +++ b/Bootstrap.Admin/wwwroot/lib/longbow/longbow.dataentity.js @@ -21,7 +21,12 @@ else if (ctl.attr('data-toggle') === 'toggle') { ctl.bootstrapToggle(value[name] ? 'on' : 'off'); } - else ctl.val(value[name]); + else if (ctl.attr('data-toggle') === 'lgbSelect') { + ctl.lgbSelect('val', value[name]); + } + else { + ctl.val(value[name]); + } } }, reset: function () { @@ -35,7 +40,12 @@ else if (ctl.attr('data-toggle') === 'toggle') { ctl.bootstrapToggle(dv === "true" ? 'on' : 'off'); } - else ctl.val(dv); + else if (ctl.attr('data-toggle') === 'lgbSelect') { + ctl.lgbSelect('val', dv); + } + else { + ctl.val(dv); + } } }, get: function () { diff --git a/Bootstrap.Client/wwwroot/css/site.css b/Bootstrap.Client/wwwroot/css/site.css index c68b3503..37111ff3 100644 --- a/Bootstrap.Client/wwwroot/css/site.css +++ b/Bootstrap.Client/wwwroot/css/site.css @@ -102,6 +102,7 @@ .userinfo img { height: 29px; width: 29px; + border-radius: 2px; } .userinfo .dropdown-toggle { diff --git a/DatabaseScripts/SQLite/InitData.sql b/DatabaseScripts/SQLite/InitData.sql index a6d1d96d..beab9355 100644 --- a/DatabaseScripts/SQLite/InitData.sql +++ b/DatabaseScripts/SQLite/InitData.sql @@ -103,6 +103,11 @@ INSERT INTO [Navigations] ([ParentId], [Name], [Order], [Icon], [Url], [Category INSERT INTO [Navigations] ([ParentId], [Name], [Order], [Icon], [Url], [Category]) VALUES (last_insert_rowid() - 1, 'API文档', 20, 'fa fa-wrench', '~/swagger', '0'); INSERT INTO [Navigations] ([ParentId], [Name], [Order], [Icon], [Url], [Category]) VALUES (last_insert_rowid() - 2, '图标集', 30, 'fa fa-dashboard', '~/Admin/FAIcon', '0'); +-- 控件集合菜单 +INSERT INTO [Navigations] ([ParentId], [Name], [Order], [Icon], [Url], [Category]) VALUES (0, '控件集合', 170, 'fa fa-stethoscope', '#', '0'); +INSERT INTO [Navigations] ([ParentId], [Name], [Order], [Icon], [Url], [Category]) VALUES (last_insert_rowid(), '行为式验证码', 10, 'fa fa-wrench', 'https://gitee.com/LongbowEnterprise/SliderCaptcha', '0'); +INSERT INTO [Navigations] ([ParentId], [Name], [Order], [Icon], [Url], [Category]) VALUES (last_insert_rowid() - 1, '下拉框', 20, 'fa fa-bars', 'http://longbowenterprise.gitee.io/longbow-select/', '0'); + DELETE FROM GROUPS WHERE GroupName = 'Admin'; INSERT INTO [Groups] ([GroupName], [Description]) VALUES ('Admin', '系统默认组');