diff --git a/public/assets/js/backend/addon.js b/public/assets/js/backend/addon.js index c3d56735..95c51f85 100644 --- a/public/assets/js/backend/addon.js +++ b/public/assets/js/backend/addon.js @@ -156,7 +156,10 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'template', 'cookie'] title: __('Operate'), table: table, formatter: Controller.api.formatter.operate, - align: 'right' + align: 'right', + cellStyle: function (value, row, index) { + return {css: {'min-width': '158px'}}; + } }, ] ], diff --git a/public/assets/js/fast.js b/public/assets/js/fast.js index f963e9b4..6f07964d 100644 --- a/public/assets/js/fast.js +++ b/public/assets/js/fast.js @@ -133,6 +133,10 @@ define(['jquery', 'bootstrap', 'toastr', 'layer', 'lang'], function ($, undefine url = Fast.api.fixurl(url); url = url + (url.indexOf("?") > -1 ? "&" : "?") + "dialog=1"; var area = Fast.config.openArea != undefined ? Fast.config.openArea : [$(window).width() > 800 ? '800px' : '95%', $(window).height() > 600 ? '600px' : '95%']; + var success = options && typeof options.success === 'function' ? options.success : $.noop; + if (options && typeof options.success === 'function') { + delete options.success; + } options = $.extend({ type: 2, title: title, @@ -186,6 +190,7 @@ define(['jquery', 'bootstrap', 'toastr', 'layer', 'lang'], function ($, undefine height: $(window).height() }); } + success.call(this, layero, index); } }, options ? options : {}); if ($(window).width() < 480 || (/iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream && top.$(".tab-pane.active").length > 0)) { diff --git a/public/assets/js/require-table.js b/public/assets/js/require-table.js index d0b7a781..ce75cdb2 100755 --- a/public/assets/js/require-table.js +++ b/public/assets/js/require-table.js @@ -504,6 +504,39 @@ define(['jquery', 'bootstrap'], function ($, undefined) { } ); }); + table.on("mouseenter mouseleave", ".autocontent", function (e) { + var target = $(".autocontent-item", this).get(0); + if (!target) return; + if (e.type === 'mouseenter') { + if (target.scrollWidth > target.offsetWidth && $(".autocontent-caret", this).length === 0) { + $(this).append("