diff --git a/Bootstrap.Admin/Views/Admin/Dicts.cshtml b/Bootstrap.Admin/Views/Admin/Dicts.cshtml index 17e7a000..b0ce58bb 100644 --- a/Bootstrap.Admin/Views/Admin/Dicts.cshtml +++ b/Bootstrap.Admin/Views/Admin/Dicts.cshtml @@ -20,8 +20,8 @@
-
- +
+
-
- +
+
-
- +
+
-
- +
+
-
- +
+
-
- +
+
-
- +
+
-
- +
+
    @foreach (var kv in Model.Applications) { diff --git a/Bootstrap.Admin/Views/Admin/Settings.cshtml b/Bootstrap.Admin/Views/Admin/Settings.cshtml index d2608867..08727a2b 100644 --- a/Bootstrap.Admin/Views/Admin/Settings.cshtml +++ b/Bootstrap.Admin/Views/Admin/Settings.cshtml @@ -50,8 +50,8 @@
    -
    - +
    + diff --git a/Bootstrap.Admin/wwwroot/css/admin.css b/Bootstrap.Admin/wwwroot/css/admin.css index d7f663f9..ecf34a13 100644 --- a/Bootstrap.Admin/wwwroot/css/admin.css +++ b/Bootstrap.Admin/wwwroot/css/admin.css @@ -1,4 +1,4 @@ -.lgbDropdown .dropdown-menu > li > a:hover { +.dropdown-select + .dropdown-menu a:hover { background: #007AC0; color: #fff; } diff --git a/Bootstrap.Admin/wwwroot/js/Longbow.Common.js b/Bootstrap.Admin/wwwroot/js/Longbow.Common.js index cd763c1e..1ac1a687 100644 --- a/Bootstrap.Admin/wwwroot/js/Longbow.Common.js +++ b/Bootstrap.Admin/wwwroot/js/Longbow.Common.js @@ -354,27 +354,22 @@ }).insertBefore(this.parents('.bootstrap-table').find('.fixed-table-toolbar > .bs-bars')); return this; }, - lgbDropdown: function (options) { - var $this = $(this); - var op = typeof options === 'object' && options; - if (/val/.test(options)) { - if (arguments.length === 1) - return $this.find('[data-toggle="dropdown"').attr("data-val"); - else { - var $element = $this.find('[data-toggle="dropdown"]'); - $element.text($this.find('[data-val="' + arguments[1] + '"]').text()); - $element.attr('data-val', arguments[1]); - } - } - else { - $this.each(function () { - $(this).on('click', '.dropdown-menu a', { $parent: $(this) }, function (event) { - event.preventDefault(); - var $op = $(this); - event.data.$parent.children('button').attr('data-val', $op.attr('data-val')).text($op.text()); - }); - }); - } + }); + + //extend dropdown method + $.extend($.fn.dropdown.Constructor.prototype, { + val: function () { + var $element = $(this._element); + var $op = $(this._menu).find('[data-val="' + $element.val() + '"]:first'); + $element.text($op.text()); + }, + select: function () { + var $element = $(this._element); + $(this._menu).on('click', 'a', function (event) { + event.preventDefault(); + var $op = $(this); + $element.text($op.text()).val($op.attr('data-val')); + }); } }); })(jQuery); diff --git a/Bootstrap.Admin/wwwroot/js/Settings.js b/Bootstrap.Admin/wwwroot/js/Settings.js index 5826dac5..8989a40c 100644 --- a/Bootstrap.Admin/wwwroot/js/Settings.js +++ b/Bootstrap.Admin/wwwroot/js/Settings.js @@ -36,7 +36,7 @@ }); break; case 'css': - var cssDefine = $('#dictCssDefine').attr("data-val"); + var cssDefine = $css.val(); $.bc({ url: Settings.url, data: { name: '使用样式', code: cssDefine, category: '当前样式' }, title: '网站样式', callback: function (result) { @@ -153,6 +153,7 @@ listCacheUrl(); }); + var $css = $('#dictCssDefine'); $.bc({ url: Dicts.css, swal: false, callback: function (result) { @@ -162,7 +163,7 @@ url: Dicts.css, swal: false, method: 'get', callback: function (result) { if (result.length > 0) - $('.lgbDropdown').lgbDropdown('val', result); + $css.val(result).dropdown('val'); } }); } diff --git a/Bootstrap.Admin/wwwroot/js/common-scripts.js b/Bootstrap.Admin/wwwroot/js/common-scripts.js index afa48639..7679cd06 100644 --- a/Bootstrap.Admin/wwwroot/js/common-scripts.js +++ b/Bootstrap.Admin/wwwroot/js/common-scripts.js @@ -197,7 +197,7 @@ $(function () { } }); - $('.lgbDropdown').lgbDropdown(); + $('[data-toggle="dropdown"].dropdown-select').dropdown('select'); // load widget data $.reloadWidget(); diff --git a/Bootstrap.Admin/wwwroot/js/longbow.dataentity.js b/Bootstrap.Admin/wwwroot/js/longbow.dataentity.js index a7cca990..e3fc7ef6 100644 --- a/Bootstrap.Admin/wwwroot/js/longbow.dataentity.js +++ b/Bootstrap.Admin/wwwroot/js/longbow.dataentity.js @@ -12,10 +12,7 @@ for (name in this.options.map) { var ctl = $("#" + this.options.map[name]); if (ctl.attr('data-toggle') == "dropdown") { - var val = value[name]; - if ((typeof val == "string" && val == "") || val == undefined) val = ctl.attr('data-default-val'); - ctl.text(ctl.parent().find('.dropdown-menu [data-val="' + val + '"]').text()); - ctl.attr('data-val', val); + ctl.val(value[name]).dropdown('val'); } else if (ctl.attr('data-toggle') == 'toggle') { ctl.bootstrapToggle(value[name] ? 'on' : 'off'); @@ -29,7 +26,7 @@ var dv = ctl.attr("data-default-val"); if (dv === undefined) dv = ""; if (ctl.attr('data-toggle') == "dropdown") { - ctl.text(ctl.parent().find('.dropdown-menu [data-val="' + dv + '"]').text()); + ctl.val(dv).dropdown('val'); } else if (ctl.attr('data-toggle') == 'toggle') { ctl.bootstrapToggle(dv == "true" ? 'on' : 'off'); @@ -46,15 +43,10 @@ target[name] = ctl.prop('checked'); continue; } - else if (ctl.attr('data-toggle') == 'dropdown') { - target[name] = ctl.attr('data-val'); - continue; - } else if (dv != undefined && ctl.val() == "") target[name] = dv; else target[name] = ctl.val(); if (target[name] == "true" || target[name] == "True") target[name] = true; if (target[name] == "false" || target[name] == "False") target[name] = false; - } return target; }