innov
/
BootstrapAdmin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'dev'

This commit is contained in:
Argo Zhang 2019-05-08 16:25:36 +08:00
parent 8c8fe2d319 e577a5cf45
commit 8719b50f32
3 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Bootstrap.Admin/wwwroot/lib/longbow/longbow.dataentity.js
View File

@ -21,7 +21,12 @@
else if (ctl.attr('data-toggle') === 'toggle') { else if (ctl.attr('data-toggle') === 'toggle') {
ctl.bootstrapToggle(value[name] ? 'on' : 'off'); 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 () { reset: function () {
@ -35,7 +40,12 @@
else if (ctl.attr('data-toggle') === 'toggle') { else if (ctl.attr('data-toggle') === 'toggle') {
ctl.bootstrapToggle(dv === "true" ? 'on' : 'off'); 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 () { get: function () {

1
Bootstrap.Client/wwwroot/css/site.css
View File

@ -102,6 +102,7 @@
.userinfo img { .userinfo img {
height: 29px; height: 29px;
width: 29px; width: 29px;
border-radius: 2px;
} }
.userinfo .dropdown-toggle { .userinfo .dropdown-toggle {

5
DatabaseScripts/SQLite/InitData.sql
View File

@ -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() - 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 (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'; DELETE FROM GROUPS WHERE GroupName = 'Admin';
INSERT INTO [Groups] ([GroupName], [Description]) VALUES ('Admin', '系统默认组'); INSERT INTO [Groups] ([GroupName], [Description]) VALUES ('Admin', '系统默认组');