From d7e54c9d8778c1f0e4a64dfaf5060e5b2f67e97b Mon Sep 17 00:00:00 2001 From: gjq Date: Fri, 17 Dec 2021 18:04:05 +0800 Subject: [PATCH] .... --- .../css/bootstrap-table.min.css | 2 +- .../kindeditor/kindeditor-all-custom-src.js | 101 ++++++++++-------- .../static/libs/kindeditor/kindeditor-all.js | 100 +++++++++-------- .../templates/content/application.html | 2 +- .../resources/templates/content/edit2.html | 52 ++++++--- .../resources/templates/content/list2.html | 2 +- src/main/resources/templates/index/index.html | 10 +- 7 files changed, 155 insertions(+), 114 deletions(-) diff --git a/src/main/resources/static/libs/bootstrap-table/css/bootstrap-table.min.css b/src/main/resources/static/libs/bootstrap-table/css/bootstrap-table.min.css index 770b672..13c160b 100644 --- a/src/main/resources/static/libs/bootstrap-table/css/bootstrap-table.min.css +++ b/src/main/resources/static/libs/bootstrap-table/css/bootstrap-table.min.css @@ -1 +1 @@ -.fixed-table-container .bs-checkbox,.fixed-table-container .no-records-found{text-align:center}.fixed-table-body thead th .th-inner,.table td,.table th{box-sizing:border-box}.bootstrap-table .table{margin-bottom:0!important;border-bottom:1px solid #ddd;border-collapse:collapse!important;border-radius:1px}.bootstrap-table .table:not(.table-condensed),.bootstrap-table .table:not(.table-condensed)>tbody>tr>td,.bootstrap-table .table:not(.table-condensed)>tbody>tr>th,.bootstrap-table .table:not(.table-condensed)>tfoot>tr>td,.bootstrap-table .table:not(.table-condensed)>tfoot>tr>th,.bootstrap-table .table:not(.table-condensed)>thead>tr>td{padding:8px}.bootstrap-table .table.table-no-bordered>tbody>tr>td,.bootstrap-table .table.table-no-bordered>thead>tr>th{border-right:2px solid transparent}.bootstrap-table .table.table-no-bordered>tbody>tr>td:last-child{border-right:none}.fixed-table-container{position:relative;clear:both;border:1px solid #ddd;border-radius:4px;-webkit-border-radius:4px;-moz-border-radius:4px}.fixed-table-container.table-no-bordered{border:1px solid transparent}.fixed-table-footer,.fixed-table-header{overflow:hidden}.fixed-table-footer{border-top:1px solid #ddd}.fixed-table-body{overflow-x:auto;overflow-y:auto;height:100%}.fixed-table-container table{width:100%}.fixed-table-container thead th{height:0;padding:0;margin:0;border-left:1px solid #ddd}.fixed-table-container thead th:focus{outline:transparent solid 0}.fixed-table-container thead th:first-child:not([data-not-first-th]){border-left:none;border-top-left-radius:4px;-webkit-border-top-left-radius:4px;-moz-border-radius-topleft:4px}.fixed-table-container tbody td .th-inner,.fixed-table-container thead th .th-inner{padding:8px;line-height:24px;vertical-align:top;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.fixed-table-container thead th .sortable{cursor:pointer;background-position:right;background-repeat:no-repeat;padding-right:30px}.fixed-table-container thead th .both{background-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABMAAAATCAQAAADYWf5HAAAAkElEQVQoz7X QMQ5AQBCF4dWQSJxC5wwax1Cq1e7BAdxD5SL+Tq/QCM1oNiJidwox0355mXnG/DrEtIQ6azioNZQxI0ykPhTQIwhCR+BmBYtlK7kLJYwWCcJA9M4qdrZrd8pPjZWPtOqdRQy320YSV17OatFC4euts6z39GYMKRPCTKY9UnPQ6P+GtMRfGtPnBCiqhAeJPmkqAAAAAElFTkSuQmCC')}.fixed-table-container thead th .asc{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABMAAAATCAYAAAByUDbMAAAAZ0lEQVQ4y2NgGLKgquEuFxBPAGI2ahhWCsS/gDibUoO0gPgxEP8H4ttArEyuQYxAPBdqEAxPBImTY5gjEL9DM+wTENuQahAvEO9DMwiGdwAxOymGJQLxTyD+jgWDxCMZRsEoGAVoAADeemwtPcZI2wAAAABJRU5ErkJggg==)}.fixed-table-container thead th .desc{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABMAAAATCAYAAAByUDbMAAAAZUlEQVQ4y2NgGAWjYBSggaqGu5FA/BOIv2PBIPFEUgxjB+IdQPwfC94HxLykus4GiD+hGfQOiB3J8SojEE9EM2wuSJzcsFMG4ttQgx4DsRalkZENxL+AuJQaMcsGxBOAmGvopk8AVz1sLZgg0bsAAAAASUVORK5CYII=)}.fixed-table-container th.detail{width:30px}.fixed-table-container tbody td{border-left:1px solid #ddd}.fixed-table-container tbody tr:first-child td{border-top:none}.fixed-table-container tbody td:first-child{border-left:none}.fixed-table-container tbody .selected td{background-color:#f5f5f5}.fixed-table-container input[type=radio],.fixed-table-container input[type=checkbox]{margin:0 auto!important}.fixed-table-pagination .pagination-detail,.fixed-table-pagination div.pagination{margin-top:10px;margin-bottom:10px}.fixed-table-pagination div.pagination .pagination{margin:0}.fixed-table-pagination .pagination a{padding:6px 12px;line-height:1.428571429}.fixed-table-pagination .pagination-info{line-height:34px;margin-right:5px}.fixed-table-pagination .btn-group{position:relative;display:inline-block;vertical-align:middle}.fixed-table-pagination .dropup .dropdown-menu{margin-bottom:0}.fixed-table-pagination .page-list{display:inline-block}.fixed-table-toolbar .columns-left{margin-right:5px}.fixed-table-toolbar .columns-right{margin-left:5px}.fixed-table-toolbar .columns label{display:block;padding:3px 20px;clear:both;font-weight:400;line-height:1.428571429}.fixed-table-toolbar .bs-bars,.fixed-table-toolbar .columns,.fixed-table-toolbar .search{position:relative;margin-top:10px;margin-bottom:10px;line-height:34px}.fixed-table-pagination li.disabled a{pointer-events:none;cursor:default}.fixed-table-loading{display:none;position:absolute;top:42px;right:0;bottom:0;left:0;z-index:99;background-color:#fff;text-align:center}.fixed-table-body .card-view .title{font-weight:700;display:inline-block;min-width:30%;text-align:left!important}.table td,.table th{vertical-align:middle}.fixed-table-toolbar .dropdown-menu{text-align:left;max-height:300px;overflow:auto}.fixed-table-toolbar .btn-group>.btn-group{display:inline-block;margin-left:-1px!important}.fixed-table-toolbar .btn-group>.btn-group>.btn{border-radius:0}.fixed-table-toolbar .btn-group>.btn-group:first-child>.btn{border-top-left-radius:4px;border-bottom-left-radius:4px}.fixed-table-toolbar .btn-group>.btn-group:last-child>.btn{border-top-right-radius:4px;border-bottom-right-radius:4px}.bootstrap-table .table>thead>tr>th{vertical-align:bottom;border-bottom:1px solid #ddd}.bootstrap-table .table thead>tr>th{padding:0;margin:0}.bootstrap-table .fixed-table-footer tbody>tr>td{padding:0!important}.bootstrap-table .fixed-table-footer .table{border-bottom:none;border-radius:0;padding:0!important}.bootstrap-table .pull-right .dropdown-menu{right:0;left:auto}p.fixed-table-scroll-inner{width:100%;height:200px}div.fixed-table-scroll-outer{top:0;left:0;visibility:hidden;width:200px;height:150px;overflow:hidden}.fixed-table-pagination:after,.fixed-table-toolbar:after{content:"";display:block;clear:both}.fullscreen{position:fixed;top:0;left:0;z-index:1050;width:100%!important;background:#FFF} \ No newline at end of file +.fixed-table-container .bs-checkbox,.fixed-table-container .no-records-found{text-align:center}.fixed-table-body thead th .th-inner,.table td,.table th{box-sizing:border-box}.bootstrap-table .table{margin-bottom:0!important;border-bottom:1px solid #ddd;border-collapse:collapse!important;border-radius:1px}.bootstrap-table .table:not(.table-condensed),.bootstrap-table .table:not(.table-condensed)>tbody>tr>td,.bootstrap-table .table:not(.table-condensed)>tbody>tr>th,.bootstrap-table .table:not(.table-condensed)>tfoot>tr>td,.bootstrap-table .table:not(.table-condensed)>tfoot>tr>th,.bootstrap-table .table:not(.table-condensed)>thead>tr>td{padding:8px}.bootstrap-table .table.table-no-bordered>tbody>tr>td,.bootstrap-table .table.table-no-bordered>thead>tr>th{border-right:2px solid transparent}.bootstrap-table .table.table-no-bordered>tbody>tr>td:last-child{border-right:none}.fixed-table-container{position:relative;clear:both;border:1px solid #ddd;border-radius:4px;-webkit-border-radius:4px;-moz-border-radius:4px}.fixed-table-container.table-no-bordered{border:1px solid transparent}.fixed-table-footer,.fixed-table-header{overflow:hidden}.fixed-table-footer{border-top:1px solid #ddd}.fixed-table-body{overflow-x:auto;overflow-y:auto;height:100%}.fixed-table-container table{width:100%}.fixed-table-container thead th{height:0;padding:0;margin:0;border-left:1px solid #ddd}.fixed-table-container thead th:focus{outline:transparent solid 0}.fixed-table-container thead th:first-child:not([data-not-first-th]){border-left:none;border-top-left-radius:4px;-webkit-border-top-left-radius:4px;-moz-border-radius-topleft:4px}.fixed-table-container tbody td .th-inner,.fixed-table-container thead th .th-inner{padding:12px;line-height:24px;vertical-align:top;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.fixed-table-container thead th .sortable{cursor:pointer;background-position:right;background-repeat:no-repeat;padding-right:30px}.fixed-table-container thead th .both{background-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABMAAAATCAQAAADYWf5HAAAAkElEQVQoz7X QMQ5AQBCF4dWQSJxC5wwax1Cq1e7BAdxD5SL+Tq/QCM1oNiJidwox0355mXnG/DrEtIQ6azioNZQxI0ykPhTQIwhCR+BmBYtlK7kLJYwWCcJA9M4qdrZrd8pPjZWPtOqdRQy320YSV17OatFC4euts6z39GYMKRPCTKY9UnPQ6P+GtMRfGtPnBCiqhAeJPmkqAAAAAElFTkSuQmCC')}.fixed-table-container thead th .asc{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABMAAAATCAYAAAByUDbMAAAAZ0lEQVQ4y2NgGLKgquEuFxBPAGI2ahhWCsS/gDibUoO0gPgxEP8H4ttArEyuQYxAPBdqEAxPBImTY5gjEL9DM+wTENuQahAvEO9DMwiGdwAxOymGJQLxTyD+jgWDxCMZRsEoGAVoAADeemwtPcZI2wAAAABJRU5ErkJggg==)}.fixed-table-container thead th .desc{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABMAAAATCAYAAAByUDbMAAAAZUlEQVQ4y2NgGAWjYBSggaqGu5FA/BOIv2PBIPFEUgxjB+IdQPwfC94HxLykus4GiD+hGfQOiB3J8SojEE9EM2wuSJzcsFMG4ttQgx4DsRalkZENxL+AuJQaMcsGxBOAmGvopk8AVz1sLZgg0bsAAAAASUVORK5CYII=)}.fixed-table-container th.detail{width:30px}.fixed-table-container tbody td{border-left:1px solid #ddd}.fixed-table-container tbody tr:first-child td{border-top:none}.fixed-table-container tbody td:first-child{border-left:none}.fixed-table-container tbody .selected td{background-color:#f5f5f5}.fixed-table-container input[type=radio],.fixed-table-container input[type=checkbox]{margin:0 auto!important}.fixed-table-pagination .pagination-detail,.fixed-table-pagination div.pagination{margin-top:10px;margin-bottom:10px}.fixed-table-pagination div.pagination .pagination{margin:0}.fixed-table-pagination .pagination a{padding:6px 12px;line-height:1.428571429}.fixed-table-pagination .pagination-info{line-height:34px;margin-right:5px}.fixed-table-pagination .btn-group{position:relative;display:inline-block;vertical-align:middle}.fixed-table-pagination .dropup .dropdown-menu{margin-bottom:0}.fixed-table-pagination .page-list{display:inline-block}.fixed-table-toolbar .columns-left{margin-right:5px}.fixed-table-toolbar .columns-right{margin-left:5px}.fixed-table-toolbar .columns label{display:block;padding:3px 20px;clear:both;font-weight:400;line-height:1.428571429}.fixed-table-toolbar .bs-bars,.fixed-table-toolbar .columns,.fixed-table-toolbar .search{position:relative;margin-top:10px;margin-bottom:10px;line-height:34px}.fixed-table-pagination li.disabled a{pointer-events:none;cursor:default}.fixed-table-loading{display:none;position:absolute;top:42px;right:0;bottom:0;left:0;z-index:99;background-color:#fff;text-align:center}.fixed-table-body .card-view .title{font-weight:700;display:inline-block;min-width:30%;text-align:left!important}.table td,.table th{vertical-align:middle}.fixed-table-toolbar .dropdown-menu{text-align:left;max-height:300px;overflow:auto}.fixed-table-toolbar .btn-group>.btn-group{display:inline-block;margin-left:-1px!important}.fixed-table-toolbar .btn-group>.btn-group>.btn{border-radius:0}.fixed-table-toolbar .btn-group>.btn-group:first-child>.btn{border-top-left-radius:4px;border-bottom-left-radius:4px}.fixed-table-toolbar .btn-group>.btn-group:last-child>.btn{border-top-right-radius:4px;border-bottom-right-radius:4px}.bootstrap-table .table>thead>tr>th{vertical-align:bottom;border-bottom:1px solid #ddd}.bootstrap-table .table thead>tr>th{padding:0;margin:0}.bootstrap-table .fixed-table-footer tbody>tr>td{padding:0!important}.bootstrap-table .fixed-table-footer .table{border-bottom:none;border-radius:0;padding:0!important}.bootstrap-table .pull-right .dropdown-menu{right:0;left:auto}p.fixed-table-scroll-inner{width:100%;height:200px}div.fixed-table-scroll-outer{top:0;left:0;visibility:hidden;width:200px;height:150px;overflow:hidden}.fixed-table-pagination:after,.fixed-table-toolbar:after{content:"";display:block;clear:both}.fullscreen{position:fixed;top:0;left:0;z-index:1050;width:100%!important;background:#FFF} diff --git a/src/main/resources/static/libs/kindeditor/kindeditor-all-custom-src.js b/src/main/resources/static/libs/kindeditor/kindeditor-all-custom-src.js index 8907878..7cb8aac 100644 --- a/src/main/resources/static/libs/kindeditor/kindeditor-all-custom-src.js +++ b/src/main/resources/static/libs/kindeditor/kindeditor-all-custom-src.js @@ -157,7 +157,7 @@ function _extend(child, parent, proto) { child.prototype = childProto; child.parent = parent ? parent.prototype : null; } - + function _json(text) { var match; if ((match = /\{[\s\S]*\}|\[[\s\S]*\]/.exec(text))) { @@ -317,9 +317,9 @@ K.options = { var _useCapture = false; - -var _INPUT_KEY_MAP = _toMap('8,9,13,32,46,48..57,59,61,65..90,106,109..111,188,190..192,219..222'); -var _CURSORMOVE_KEY_MAP = _toMap('33..40'); + +var _INPUT_KEY_MAP = _toMap('8,9,13,32,46,48..57,59,61,65..90,106,109..111,188,190..192,219..222'); +var _CURSORMOVE_KEY_MAP = _toMap('33..40'); var _CHANGE_KEY_MAP = {}; _each(_INPUT_KEY_MAP, function(key, val) { _CHANGE_KEY_MAP[key] = val; @@ -327,14 +327,14 @@ _each(_INPUT_KEY_MAP, function(key, val) { _each(_CURSORMOVE_KEY_MAP, function(key, val) { _CHANGE_KEY_MAP[key] = val; }); - + function _bindEvent(el, type, fn) { if (el.addEventListener){ el.addEventListener(type, fn, _useCapture); } else if (el.attachEvent){ el.attachEvent('on' + type, fn); } -} +} function _unbindEvent(el, type, fn) { if (el.removeEventListener){ el.removeEventListener(type, fn, _useCapture); @@ -345,7 +345,7 @@ function _unbindEvent(el, type, fn) { var _EVENT_PROPS = ('altKey,attrChange,attrName,bubbles,button,cancelable,charCode,clientX,clientY,ctrlKey,currentTarget,' + 'data,detail,eventPhase,fromElement,handler,keyCode,metaKey,newValue,offsetX,offsetY,originalTarget,pageX,' + 'pageY,prevValue,relatedNode,relatedTarget,screenX,screenY,shiftKey,srcElement,target,toElement,view,wheelDelta,which').split(','); - + function KEvent(el, event) { this.init(el, event); } @@ -902,7 +902,7 @@ function _formatHtml(html, htmlTags, urlType, wellFormatted, indentChar) { html = html.replace(/\n\s*\n/g, '\n'); html = html.replace(/\n/g, '\n'); return _trim(html); -} +} function _clearMsWord(html, htmlTags) { html = html.replace(//ig, '') .replace(//ig, '') @@ -915,7 +915,7 @@ function _clearMsWord(html, htmlTags) { return full.replace(/border-bottom:([#\w\s]+)/ig, 'border:$1'); }); return _formatHtml(html, htmlTags); -} +} function _mediaType(src) { if (/\.(rm|rmvb)(\?|$)/i.test(src)) { return 'audio/x-pn-realaudio-plugin'; @@ -936,7 +936,7 @@ function _mediaType(src) { return 'video/webm'; } return 'video/x-ms-asf-plugin'; -} +} function _mediaClass(type) { if (/realaudio/i.test(type)) { return 'ke-rm'; @@ -960,7 +960,7 @@ function _mediaEmbed(attrs) { if (val=='video/webm') video = true; }); html += '/>'; - + if (video) { html = '"; } - + return html; } function _mediaImg(blankPath, attrs) { @@ -1002,7 +1002,9 @@ function _mediaImg(blankPath, attrs) { html += 'data-ke-tag="' + escape(srcTag) + '" alt="" />'; return html; } - + + + function _tmpl(str, data) { var fn = new Function("obj", "var p=[],print=function(){p.push.apply(p,arguments);};" + @@ -1339,7 +1341,7 @@ function _getScrollPos(doc) { } return {x : x, y : y}; } - + function KNode(node) { this.init(node); } @@ -1975,7 +1977,7 @@ function _copyAndDelete(range, isCopy, isDelete) { } } return isCopy ? frag : range; -} +} function _moveToElementText(range, el) { var node = el; while (node) { @@ -1988,7 +1990,7 @@ function _moveToElementText(range, el) { try { range.moveToElementText(el); } catch(e) {} -} +} function _getStartEnd(rng, isStart) { var doc = rng.parentElement().ownerDocument, pointRange = rng.duplicate(); @@ -2053,7 +2055,7 @@ function _getStartEnd(rng, isStart) { } } return {node: startNode, offset: startPos}; -} +} function _getEndRange(node, offset) { var doc = node.ownerDocument || node, range = doc.body.createTextRange(); @@ -2110,7 +2112,7 @@ function _getEndRange(node, offset) { range.moveStart('character', offset); K(dummy).remove(); return range; -} +} function _toRange(rng) { var doc, range; function tr2td(start) { @@ -2143,7 +2145,7 @@ function _toRange(rng) { range.setEnd(rng.endContainer, rng.endOffset); return range; } - + function KRange(doc) { this.init(doc); } @@ -2561,12 +2563,12 @@ K.START_TO_END = _START_TO_END; K.END_TO_END = _END_TO_END; K.END_TO_START = _END_TO_START; - + function _nativeCommand(doc, key, val) { try { doc.execCommand(key, false, val); } catch(e) {} -} +} function _nativeCommandValue(doc, key) { var val = ''; try { @@ -2576,11 +2578,11 @@ function _nativeCommandValue(doc, key) { val = ''; } return val; -} +} function _getSel(doc) { var win = _getWin(doc); return _IERANGE ? doc.selection : win.getSelection(); -} +} function _getRng(doc) { var sel = _getSel(doc), rng; try { @@ -2594,7 +2596,7 @@ function _getRng(doc) { return null; } return rng; -} +} function _singleKeyMap(map) { var newMap = {}, arr, v; _each(map, function(key, val) { @@ -2605,7 +2607,7 @@ function _singleKeyMap(map) { } }); return newMap; -} +} function _hasAttrOrCss(knode, map) { return _hasAttrOrCssByKey(knode, map, '*') || _hasAttrOrCssByKey(knode, map); } @@ -2636,7 +2638,7 @@ function _hasAttrOrCssByKey(knode, map, mapKey) { } } return false; -} +} function _removeAttrOrCss(knode, map) { if (knode.type != 1) { return; @@ -2674,20 +2676,23 @@ function _removeAttrOrCssByKey(knode, map, mapKey) { if (allFlag) { knode.remove(true); } -} +} function _getInnerNode(knode) { var inner = knode; while (inner.first()) { inner = inner.first(); } return inner; -} +} function _isEmptyNode(knode) { if (knode.type != 1 || knode.isSingle()) { return false; } return knode.html().replace(/<[^>]+>/g, '') === ''; -} +} + + + function _mergeWrapper(a, b) { a = a.clone(true); var lastA = _getInnerNode(a), childA = a, merged = false; @@ -2706,7 +2711,7 @@ function _mergeWrapper(a, b) { b = b.first(); } return a; -} +} function _wrapNode(knode, wrapper) { wrapper = wrapper.clone(true); if (knode.type == 3) { @@ -2730,7 +2735,7 @@ function _wrapNode(knode, wrapper) { } nodeWrapper.replaceWith(wrapper); return wrapper; -} +} function _mergeAttrs(knode, attrs, styles) { _each(attrs, function(key, val) { if (key !== 'style') { @@ -2740,7 +2745,7 @@ function _mergeAttrs(knode, attrs, styles) { _each(styles, function(key, val) { knode.css(key, val); }); -} +} function _inPreElement(knode) { while (knode && knode.name != 'body') { if (_PRE_TAG_MAP[knode.name] || knode.name == 'div' && knode.hasClass('ke-script')) { @@ -2749,7 +2754,7 @@ function _inPreElement(knode) { knode = knode.parent(); } return false; -} +} function KCmd(range) { this.init(range); } @@ -3433,7 +3438,7 @@ function _drag(options) { } }); } - + function KWidget(options) { this.init(options); } @@ -3673,7 +3678,7 @@ function _elementVal(knode, val) { } return knode.html(val); } - + function KEdit(options) { this.init(options); } @@ -3934,7 +3939,7 @@ function _selectToolbar(name, fn) { fn(knode); } } - + function KToolbar(options) { this.init(options); } @@ -4054,7 +4059,7 @@ function _toolbar(options) { K.ToolbarClass = KToolbar; K.toolbar = _toolbar; - + function KMenu(options) { this.init(options); } @@ -4137,7 +4142,7 @@ function _menu(options) { K.MenuClass = KMenu; K.menu = _menu; - + function KColorPicker(options) { this.init(options); } @@ -4319,7 +4324,7 @@ function _createButton(arg) { span.append(btn); return span; } - + function KDialog(options) { this.init(options); } @@ -4518,7 +4523,7 @@ function _loadScript(url, fn) { } }; } - + function _chopQuery(url) { var index = url.indexOf('?'); return index > 0 ? url.substr(0, index) : url; @@ -4614,7 +4619,7 @@ function _lang(mixed, langType) { _language[langType][obj.ns][obj.key] = val; }); } - + function _getImageFromRange(range, fn) { if (range.collapsed) { return; @@ -4825,7 +4830,8 @@ function _addBookmarkToStack(stack, bookmark) { stack.push(bookmark); } } - + + function _undoToRedo(fromStack, toStack) { var self = this, edit = self.edit, body = edit.doc.body, @@ -5584,7 +5590,7 @@ K.appendHtml = function(expr, val) { this.appendHtml(val); }); }; - + if (_IE && _V < 7) { _nativeCommand(document, 'BackgroundImageCache', true); } @@ -5594,7 +5600,7 @@ K.create = _create; K.instances = _instances; K.plugin = _plugin; K.lang = _lang; - + _plugin('core', function(K) { var self = this, shortcutKeys = { @@ -6495,7 +6501,7 @@ KindEditor.plugin('baidumap', function(K) { * @site http://www.kindsoft.net/ * @licence http://www.kindsoft.net/license.php *******************************************************************************/ - + KindEditor.plugin('map', function(K) { var self = this, name = 'map', lang = self.lang(name + '.'); self.clickToolbar(name, function() { @@ -6655,7 +6661,8 @@ KindEditor.plugin('clearhtml', function(K) { * @site http://www.kindsoft.net/ * @licence http://www.kindsoft.net/license.php *******************************************************************************/ - + + KindEditor.plugin('code', function(K) { var self = this, name = 'code'; self.clickToolbar(name, function() { diff --git a/src/main/resources/static/libs/kindeditor/kindeditor-all.js b/src/main/resources/static/libs/kindeditor/kindeditor-all.js index 0697b6e..2b06459 100644 --- a/src/main/resources/static/libs/kindeditor/kindeditor-all.js +++ b/src/main/resources/static/libs/kindeditor/kindeditor-all.js @@ -156,7 +156,7 @@ function _extend(child, parent, proto) { child.prototype = childProto; child.parent = parent ? parent.prototype : null; } - + function _json(text) { var match; if ((match = /\{[\s\S]*\}|\[[\s\S]*\]/.exec(text))) { @@ -316,9 +316,9 @@ K.options = { var _useCapture = false; - -var _INPUT_KEY_MAP = _toMap('8,9,13,32,46,48..57,59,61,65..90,106,109..111,188,190..192,219..222'); -var _CURSORMOVE_KEY_MAP = _toMap('33..40'); + +var _INPUT_KEY_MAP = _toMap('8,9,13,32,46,48..57,59,61,65..90,106,109..111,188,190..192,219..222'); +var _CURSORMOVE_KEY_MAP = _toMap('33..40'); var _CHANGE_KEY_MAP = {}; _each(_INPUT_KEY_MAP, function(key, val) { _CHANGE_KEY_MAP[key] = val; @@ -326,14 +326,14 @@ _each(_INPUT_KEY_MAP, function(key, val) { _each(_CURSORMOVE_KEY_MAP, function(key, val) { _CHANGE_KEY_MAP[key] = val; }); - + function _bindEvent(el, type, fn) { if (el.addEventListener){ el.addEventListener(type, fn, _useCapture); } else if (el.attachEvent){ el.attachEvent('on' + type, fn); } -} +} function _unbindEvent(el, type, fn) { if (el.removeEventListener){ el.removeEventListener(type, fn, _useCapture); @@ -344,7 +344,7 @@ function _unbindEvent(el, type, fn) { var _EVENT_PROPS = ('altKey,attrChange,attrName,bubbles,button,cancelable,charCode,clientX,clientY,ctrlKey,currentTarget,' + 'data,detail,eventPhase,fromElement,handler,keyCode,metaKey,newValue,offsetX,offsetY,originalTarget,pageX,' + 'pageY,prevValue,relatedNode,relatedTarget,screenX,screenY,shiftKey,srcElement,target,toElement,view,wheelDelta,which').split(','); - + function KEvent(el, event) { this.init(el, event); } @@ -901,7 +901,7 @@ function _formatHtml(html, htmlTags, urlType, wellFormatted, indentChar) { html = html.replace(/\n\s*\n/g, '\n'); html = html.replace(/\n/g, '\n'); return _trim(html); -} +} function _clearMsWord(html, htmlTags) { html = html.replace(//ig, '') .replace(//ig, '') @@ -914,7 +914,7 @@ function _clearMsWord(html, htmlTags) { return full.replace(/border-bottom:([#\w\s]+)/ig, 'border:$1'); }); return _formatHtml(html, htmlTags); -} +} function _mediaType(src) { if (/\.(rm|rmvb)(\?|$)/i.test(src)) { return 'audio/x-pn-realaudio-plugin'; @@ -923,7 +923,7 @@ function _mediaType(src) { return 'application/x-shockwave-flash'; } return 'video/x-ms-asf-plugin'; -} +} function _mediaClass(type) { if (/realaudio/i.test(type)) { return 'ke-rm'; @@ -967,7 +967,9 @@ function _mediaImg(blankPath, attrs) { html += 'data-ke-tag="' + escape(srcTag) + '" alt="" />'; return html; } - + + + function _tmpl(str, data) { var fn = new Function("obj", "var p=[],print=function(){p.push.apply(p,arguments);};" + @@ -1304,7 +1306,7 @@ function _getScrollPos(doc) { } return {x : x, y : y}; } - + function KNode(node) { this.init(node); } @@ -1940,7 +1942,7 @@ function _copyAndDelete(range, isCopy, isDelete) { } } return isCopy ? frag : range; -} +} function _moveToElementText(range, el) { var node = el; while (node) { @@ -1953,7 +1955,7 @@ function _moveToElementText(range, el) { try { range.moveToElementText(el); } catch(e) {} -} +} function _getStartEnd(rng, isStart) { var doc = rng.parentElement().ownerDocument, pointRange = rng.duplicate(); @@ -2018,7 +2020,7 @@ function _getStartEnd(rng, isStart) { } } return {node: startNode, offset: startPos}; -} +} function _getEndRange(node, offset) { var doc = node.ownerDocument || node, range = doc.body.createTextRange(); @@ -2075,7 +2077,7 @@ function _getEndRange(node, offset) { range.moveStart('character', offset); K(dummy).remove(); return range; -} +} function _toRange(rng) { var doc, range; function tr2td(start) { @@ -2108,7 +2110,7 @@ function _toRange(rng) { range.setEnd(rng.endContainer, rng.endOffset); return range; } - + function KRange(doc) { this.init(doc); } @@ -2526,12 +2528,12 @@ K.START_TO_END = _START_TO_END; K.END_TO_END = _END_TO_END; K.END_TO_START = _END_TO_START; - + function _nativeCommand(doc, key, val) { try { doc.execCommand(key, false, val); } catch(e) {} -} +} function _nativeCommandValue(doc, key) { var val = ''; try { @@ -2541,11 +2543,11 @@ function _nativeCommandValue(doc, key) { val = ''; } return val; -} +} function _getSel(doc) { var win = _getWin(doc); return _IERANGE ? doc.selection : win.getSelection(); -} +} function _getRng(doc) { var sel = _getSel(doc), rng; try { @@ -2559,7 +2561,7 @@ function _getRng(doc) { return null; } return rng; -} +} function _singleKeyMap(map) { var newMap = {}, arr, v; _each(map, function(key, val) { @@ -2570,7 +2572,7 @@ function _singleKeyMap(map) { } }); return newMap; -} +} function _hasAttrOrCss(knode, map) { return _hasAttrOrCssByKey(knode, map, '*') || _hasAttrOrCssByKey(knode, map); } @@ -2601,7 +2603,7 @@ function _hasAttrOrCssByKey(knode, map, mapKey) { } } return false; -} +} function _removeAttrOrCss(knode, map) { if (knode.type != 1) { return; @@ -2639,20 +2641,23 @@ function _removeAttrOrCssByKey(knode, map, mapKey) { if (allFlag) { knode.remove(true); } -} +} function _getInnerNode(knode) { var inner = knode; while (inner.first()) { inner = inner.first(); } return inner; -} +} function _isEmptyNode(knode) { if (knode.type != 1 || knode.isSingle()) { return false; } return knode.html().replace(/<[^>]+>/g, '') === ''; -} +} + + + function _mergeWrapper(a, b) { a = a.clone(true); var lastA = _getInnerNode(a), childA = a, merged = false; @@ -2671,7 +2676,7 @@ function _mergeWrapper(a, b) { b = b.first(); } return a; -} +} function _wrapNode(knode, wrapper) { wrapper = wrapper.clone(true); if (knode.type == 3) { @@ -2695,7 +2700,7 @@ function _wrapNode(knode, wrapper) { } nodeWrapper.replaceWith(wrapper); return wrapper; -} +} function _mergeAttrs(knode, attrs, styles) { _each(attrs, function(key, val) { if (key !== 'style') { @@ -2705,7 +2710,7 @@ function _mergeAttrs(knode, attrs, styles) { _each(styles, function(key, val) { knode.css(key, val); }); -} +} function _inPreElement(knode) { while (knode && knode.name != 'body') { if (_PRE_TAG_MAP[knode.name] || knode.name == 'div' && knode.hasClass('ke-script')) { @@ -2714,7 +2719,7 @@ function _inPreElement(knode) { knode = knode.parent(); } return false; -} +} function KCmd(range) { this.init(range); } @@ -3398,7 +3403,7 @@ function _drag(options) { } }); } - + function KWidget(options) { this.init(options); } @@ -3638,7 +3643,7 @@ function _elementVal(knode, val) { } return knode.html(val); } - + function KEdit(options) { this.init(options); } @@ -3899,7 +3904,7 @@ function _selectToolbar(name, fn) { fn(knode); } } - + function KToolbar(options) { this.init(options); } @@ -4019,7 +4024,7 @@ function _toolbar(options) { K.ToolbarClass = KToolbar; K.toolbar = _toolbar; - + function KMenu(options) { this.init(options); } @@ -4102,7 +4107,7 @@ function _menu(options) { K.MenuClass = KMenu; K.menu = _menu; - + function KColorPicker(options) { this.init(options); } @@ -4284,7 +4289,7 @@ function _createButton(arg) { span.append(btn); return span; } - + function KDialog(options) { this.init(options); } @@ -4483,7 +4488,7 @@ function _loadScript(url, fn) { } }; } - + function _chopQuery(url) { var index = url.indexOf('?'); return index > 0 ? url.substr(0, index) : url; @@ -4579,7 +4584,7 @@ function _lang(mixed, langType) { _language[langType][obj.ns][obj.key] = val; }); } - + function _getImageFromRange(range, fn) { if (range.collapsed) { return; @@ -4790,7 +4795,8 @@ function _addBookmarkToStack(stack, bookmark) { stack.push(bookmark); } } - + + function _undoToRedo(fromStack, toStack) { var self = this, edit = self.edit, body = edit.doc.body, @@ -5411,6 +5417,9 @@ KEditor.prototype = { if (_IE && self.cmd) { self.cmd.select(); } + console.log(e) + e.preventDefault(); + $(".ui-tooltip").remove() } }); options.noBtn = _undef(options.noBtn, { @@ -5420,6 +5429,7 @@ KEditor.prototype = { if (_IE && self.cmd) { self.cmd.select(); } + $(".ui-tooltip").remove() } }); if (self.dialogAlignType != 'page') { @@ -5549,7 +5559,7 @@ K.appendHtml = function(expr, val) { this.appendHtml(val); }); }; - + if (_IE && _V < 7) { _nativeCommand(document, 'BackgroundImageCache', true); } @@ -5559,7 +5569,7 @@ K.create = _create; K.instances = _instances; K.plugin = _plugin; K.lang = _lang; - + _plugin('core', function(K) { var self = this, shortcutKeys = { @@ -6297,6 +6307,7 @@ KindEditor.plugin('anchor', function(K) { yesBtn : { name : self.lang('yes'), click : function(e) { + $(".ui-tooltip").remove() self.insertHtml('').hideDialog().focus(); } } @@ -6459,7 +6470,7 @@ KindEditor.plugin('baidumap', function(K) { * @site http://www.kindsoft.net/ * @licence http://www.kindsoft.net/license.php *******************************************************************************/ - + KindEditor.plugin('map', function(K) { var self = this, name = 'map', lang = self.lang(name + '.'); self.clickToolbar(name, function() { @@ -6619,7 +6630,8 @@ KindEditor.plugin('clearhtml', function(K) { * @site http://www.kindsoft.net/ * @licence http://www.kindsoft.net/license.php *******************************************************************************/ - + + KindEditor.plugin('code', function(K) { var self = this, name = 'code'; self.clickToolbar(name, function() { diff --git a/src/main/resources/templates/content/application.html b/src/main/resources/templates/content/application.html index 33641e6..bfa9e2c 100644 --- a/src/main/resources/templates/content/application.html +++ b/src/main/resources/templates/content/application.html @@ -221,7 +221,7 @@ var editFlag = "[[${@perms.hasPerm('cases-h5')}]]"; var delFlag = "[[${@perms.hasPerm('cases-h5')}]]"; var columns = [ - {checkbox: true }, + {checkbox: true}, {field: 'id', title: '案例编号', align : "center"}, //{field: 'title', title: '标题', align : "center", width: "155"}, {field: 'title', title: '标题', align : "center", formatter: function(value, row, index) { diff --git a/src/main/resources/templates/content/edit2.html b/src/main/resources/templates/content/edit2.html index 695e080..698de06 100644 --- a/src/main/resources/templates/content/edit2.html +++ b/src/main/resources/templates/content/edit2.html @@ -92,6 +92,18 @@ +
+ +
+ + + +
+ +
+
+
+
@@ -101,16 +113,6 @@     
- - -
- - - -
- -
-
- + @@ -47,17 +47,13 @@ - + - +