同步生成样式文件

public/static/admin.js

@@ -308,8 +308,8 @@ $(function () {
             }, load, tips);
         };
         /*! 打开 IFRAME 窗口 */
-        this.iframe = function (url, name, area, offset) {
-            return layer.open({title: name || '窗口', type: 2, area: area || ['800px', '580px'], offset: offset, fixed: true, maxmin: false, content: url});
+        this.iframe = function (url, name, area, offset, destroy) {
+            return layer.open({title: name || '窗口', type: 2, area: area || ['800px', '580px'], end: destroy || null, offset: offset, fixed: true, maxmin: false, content: url});
         };
         /*! 加载 HTML 到弹出层 */
         this.modal = function (url, data, name, call, load, tips, area, offset) {
@@ -689,11 +689,16 @@ $(function () {
             opt.loading = params.loading === true, opt.autoSort = params.autoSort === true, opt.cols = params.cols || [[]];
             // 默认动态设置页数, 动态设置最大高度
             if (opt.page === true) opt.page = {curr: layui.sessionData('pages')[opt.id] || 1}
-            if (opt.height === 'full') opt.height = $(window).height() - $(elem).removeClass('layui-hide').offset().top - 35;
+            if (opt.height === 'full') if ($(elem).parents('.iframe-pagination').size()) {
+                $(elem).parents('.iframe-pagination').addClass('not-footer');
+                opt.height = $(window).height() - $(elem).removeClass('layui-hide').offset().top - 20;
+            } else {
+                opt.height = $(window).height() - $(elem).removeClass('layui-hide').offset().top - 35;
+            }
             // 动态计算最大页数
             opt.done = function () {
                 layui.sessionData('pages', {key: elem.id, value: this.page.curr || 1}), (this.loading = true);
-                this.elem.next().find('[data-load],[data-queue],[data-action]').not('[data-table-id]').attr('data-table-id', elem.id);
+                this.elem.next().find('[data-load],[data-queue],[data-action],[data-iframe]').not('[data-table-id]').attr('data-table-id', elem.id);
             }, opt.parseData = function (res) {
                 var maxPage = Math.ceil(res.count / this.limit), curPage = layui.sessionData('pages')[opt.id] || 1;
                 if (curPage > maxPage && curPage > 1) this.elem.trigger('reload', {page: {curr: maxPage}});
@@ -956,10 +961,14 @@ $(function () {
     onEvent('click', '[data-iframe]', function () {
         var emap = this.dataset, data = {open_type: 'iframe'};
         if (emap.rule && (applyRuleValue(this, data)) === false) return false;
+        var name = emap.title || this.innerText || 'IFRAME 窗口';
+        var area = emap.area || [emap.width || '800px', emap.height || '580px'];
         var frame = emap.iframe + (emap.iframe.indexOf('?') > -1 ? '&' : '?') + $.param(data);
-        $(this).attr('data-index', $.form.iframe(frame, emap.title || this.innerText || '窗口', emap.area || [
-            emap.width || '800px', emap.height || '580px'
-        ], emap.offset || 'auto'));
+        $(this).attr('data-index', $.form.iframe(frame, name, area, emap.offset || 'auto', emap.tableId ? function () {
+            typeof emap.refresh !== 'undefined' && $('#' + emap.tableId).trigger('reload');
+        } : function () {
+            typeof emap.refresh !== 'undefined' && $.form.reload();
+        }));
     });
 
     /*! 注册 data-icon 事件行为 */

public/static/plugs/ckeditor/plugins/scayt/dialogs/dialog.css

@@ -1,23 +1,23 @@
 div.cke_dialog_ui_scaytItemList {
-    border: 1px solid #c9cccf;
+	border: 1px solid #c9cccf;
 }
 
 .cke_scaytItemList-child {
-    position: relative;
-    padding: 6px 30px 6px 5px;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
+	position: relative;
+	padding: 6px 30px 6px 5px;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
 }
 
 .cke_scaytItemList-child:hover {
-    background: #ebebeb;
+	background: #ebebeb;
 }
 
 .cke_scaytItemList-child .cke_scaytItemList_remove {
-    position: absolute;
-    top: 0;
-    right: 5px;
-    width: 26px;
-    height: 26px;
+	position: absolute;
+	top: 0;
+	right: 5px;
+	width: 26px;
+	height: 26px;
 }

public/static/plugs/ckeditor/plugins/scayt/dialogs/toolbar.css

@@ -1,72 +1,71 @@
-a {
-    text-decoration: none;
-    padding: 2px 4px 4px 6px;
-    display: block;
-    border-width: 1px;
-    border-style: solid;
-    margin: 0px;
+a
+{
+	text-decoration:none;
+	padding: 2px 4px 4px 6px;
+	display : block;
+	border-width: 1px;
+	border-style: solid;
+	margin : 0px;
 }
 
 a.cke_scayt_toogle:hover,
 a.cke_scayt_toogle:focus,
-a.cke_scayt_toogle:active {
-    border-color: #316ac5;
-    background-color: #dff1ff;
-    color: #000;
-    cursor: pointer;
-    margin: 0px;
+a.cke_scayt_toogle:active
+{
+	border-color: #316ac5;
+	background-color: #dff1ff;
+	color : #000;
+	cursor: pointer;
+	margin : 0px;
 }
-
 a.cke_scayt_toogle {
-    color: #316ac5;
-    border-color: #fff;
+	color : #316ac5;
+	border-color: #fff;
 }
-
 .scayt_enabled a.cke_scayt_item {
-    color: #316ac5;
-    border-color: #fff;
-    margin: 0px;
+	color : #316ac5;
+	border-color: #fff;
+	margin : 0px;
 }
-
 .scayt_disabled a.cke_scayt_item {
-    color: gray;
-    border-color: #fff;
+	color : gray;
+	border-color : #fff;
 }
-
 .scayt_enabled a.cke_scayt_item:hover,
 .scayt_enabled a.cke_scayt_item:focus,
-.scayt_enabled a.cke_scayt_item:active {
-    border-color: #316ac5;
-    background-color: #dff1ff;
-    color: #000;
-    cursor: pointer;
+.scayt_enabled a.cke_scayt_item:active
+{
+	border-color: #316ac5;
+	background-color: #dff1ff;
+	color : #000;
+	cursor: pointer;
 }
-
 .scayt_disabled a.cke_scayt_item:hover,
 .scayt_disabled a.cke_scayt_item:focus,
-.scayt_disabled a.cke_scayt_item:active {
-    border-color: gray;
-    background-color: #dff1ff;
-    color: gray;
-    cursor: no-drop;
+.scayt_disabled a.cke_scayt_item:active
+{
+	border-color: gray;
+	background-color: #dff1ff;
+	color : gray;
+	cursor: no-drop;
 }
-
-.cke_scayt_set_on, .cke_scayt_set_off {
-    display: none;
+.cke_scayt_set_on, .cke_scayt_set_off
+{
+	display: none;
 }
-
-.scayt_enabled .cke_scayt_set_on {
-    display: none;
+.scayt_enabled .cke_scayt_set_on
+{
+	display: none;
 }
-
-.scayt_disabled .cke_scayt_set_on {
-    display: inline;
+.scayt_disabled .cke_scayt_set_on
+{
+	display: inline;
 }
-
-.scayt_disabled .cke_scayt_set_off {
-    display: none;
+.scayt_disabled .cke_scayt_set_off
+{
+	display: none;
 }
-
-.scayt_enabled .cke_scayt_set_off {
-    display: inline;
+.scayt_enabled  .cke_scayt_set_off
+{
+	display: inline;
 }

public/static/plugs/ckeditor/plugins/scayt/skins/moono-lisa/scayt.css

@@ -1,20 +1,25 @@
-.scayt-lang-list > div {
+.scayt-lang-list > div
+{
     padding-bottom: 6px !important;
 }
 
-.scayt-lang-list > div input {
+.scayt-lang-list > div input
+{
     margin-right: 4px;
 }
 
-#scayt_about_ {
+#scayt_about_
+{
     margin: 30px auto 0 auto;
 }
 
-#scayt_about_ p {
-    text-align: center;
-    margin-bottom: 10px;
+#scayt_about_ p
+{
+	text-align: center;
+	margin-bottom: 10px;
 }
 
-.cke_dialog_contents_body div[name=dictionaries] .cke_dialog_ui_hbox_last > a.cke_dialog_ui_button {
+.cke_dialog_contents_body div[name=dictionaries] .cke_dialog_ui_hbox_last > a.cke_dialog_ui_button
+{
     margin-top: 0;
 }

public/static/plugs/ckeditor/plugins/tableselection/styles/tableselection.css

@@ -1,33 +1,28 @@
 .cke_table-faked-selection-editor *::selection, table[data-cke-table-faked-selection-table] *::selection {
-    background: transparent;
+	background: transparent;
 }
 
 .cke_table-faked-selection {
-    background: darkgray !important;
-    color: black;
+	background: darkgray !important;
+	color: black;
 }
-
 .cke_table-faked-selection a {
-    color: black;
+	color: black;
 }
-
 .cke_editable:focus .cke_table-faked-selection {
-    /* We have to use !important here, as td might specify it's own background, thus table selection
-    would not be visible. */
-    background: #0076cb !important;
-    color: white;
+	/* We have to use !important here, as td might specify it's own background, thus table selection
+	would not be visible. */
+	background: #0076cb !important;
+	color: white;
 }
-
 .cke_editable:focus .cke_table-faked-selection a {
-    color: white;
+	color: white;
 }
-
 .cke_table-faked-selection::-moz-selection, .cke_table-faked-selection ::-moz-selection {
-    background: transparent;
+	background: transparent;
 }
-
 .cke_table-faked-selection::selection, .cke_table-faked-selection ::selection {
-    background: transparent;
+	background: transparent;
 }
 
 /* Change the cursor when selecting cells (#706).
@@ -37,5 +32,5 @@
  * https://bugs.webkit.org/show_bug.cgi?id=53341
  */
 table[data-cke-table-faked-selection-table] {
-    cursor: cell;
+	cursor: cell;
 }

public/static/plugs/ckeditor/plugins/wsc/skins/moono-lisa/wsc.css

@@ -1,35 +1,43 @@
 .cke_dialog_body #overlayBlock,
-.cke_dialog_body #no_check_over {
+.cke_dialog_body #no_check_over
+{
     top: 39px !important;
 }
 
-div[name=SpellTab] .wsc-spelltab-bottom .cke_dialog_ui_vbox td > .cke_dialog_ui_button:first-child {
+div[name=SpellTab] .wsc-spelltab-bottom .cke_dialog_ui_vbox td > .cke_dialog_ui_button:first-child
+{
     margin-top: 4px;
 }
 
-div[name=SpellTab] .wsc-spelltab-bottom .cke_dialog_ui_hbox_first .cke_dialog_ui_select > label {
+div[name=SpellTab] .wsc-spelltab-bottom .cke_dialog_ui_hbox_first .cke_dialog_ui_select > label
+{
     margin-left: 0;
 }
 
-div[name=SpellTab] .wsc-spelltab-bottom .cke_dialog_ui_hbox_first .cke_dialog_ui_select div.cke_dialog_ui_input_select {
+div[name=SpellTab] .wsc-spelltab-bottom .cke_dialog_ui_hbox_first .cke_dialog_ui_select div.cke_dialog_ui_input_select
+{
     width: 140px !important;
 }
 
 div[name=SpellTab] .wsc-spelltab-bottom .cke_dialog_ui_hbox_first .cke_dialog_ui_select select.cke_dialog_ui_input_select,
-div[name=Thesaurus] div.cke_dialog_ui_input_select select.cke_dialog_ui_input_select {
+div[name=Thesaurus] div.cke_dialog_ui_input_select select.cke_dialog_ui_input_select
+{
     margin-top: 1px;
 }
 
 div[name=SpellTab] .wsc-spelltab-bottom .cke_dialog_ui_hbox_first .cke_dialog_ui_select select.cke_dialog_ui_input_select:focus,
-div[name=Thesaurus] div.cke_dialog_ui_input_select select.cke_dialog_ui_input_select:focus {
+div[name=Thesaurus] div.cke_dialog_ui_input_select select.cke_dialog_ui_input_select:focus
+{
     margin-top: 0;
 }
 
 div[name=GrammTab] .cke_dialog_ui_vbox tbody > tr:first-child .cke_dialog_ui_button,
-div[name=Thesaurus] .cke_dialog_ui_vbox tbody > tr:first-child .cke_dialog_ui_button {
+div[name=Thesaurus] .cke_dialog_ui_vbox tbody > tr:first-child .cke_dialog_ui_button
+{
     margin-top: 4px !important;
 }
 
-div[name=Thesaurus] div.cke_dialog_ui_input_select {
+div[name=Thesaurus] div.cke_dialog_ui_input_select
+{
     width: 180px !important;
 }

public/static/theme/css/console.display.less

@@ -724,7 +724,7 @@ fieldset {
 .iframe-pagination {
   padding: 20px;
 
-  &:after {
+  &:not(.not-footer):after {
     content: '';
     height: 30px;
     display: block;