From 89cd8317442453fefc9191ac4b40a31644586e25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=80=A1=E6=A0=8B?= Date: Tue, 14 Sep 2021 17:33:43 +0800 Subject: [PATCH] * adjust for 15.5. --- module/common/view/kanban.html.php | 2 +- module/gitlab/control.php | 6 +++--- www/js/zui/kanban/min.js | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/module/common/view/kanban.html.php b/module/common/view/kanban.html.php index af7f856fbb..d4eabbd19f 100644 --- a/module/common/view/kanban.html.php +++ b/module/common/view/kanban.html.php @@ -400,7 +400,7 @@ $.extend($.fn.kanban.Constructor.DEFAULTS, /* laneItemsClass: 'scrollbar-hover', */ // only show scrollbar on mouse hover itemRender: renderKanbanItem, useFlex: false, - showZeroCount: true, + showCount: false, onRenderHeaderCol: function($col, col) { if(col.type === 'doingProject') $col.attr('data-span-text', doingText); diff --git a/module/gitlab/control.php b/module/gitlab/control.php index fc46a8057c..28eaf84610 100644 --- a/module/gitlab/control.php +++ b/module/gitlab/control.php @@ -71,7 +71,7 @@ class gitlab extends control if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError())); $this->loadModel('action'); - $actionID = $this->action->create('gitlab', $gitlabID, 'create'); + $actionID = $this->action->create('gitlab', $gitlabID, 'created'); return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('browse'))); } @@ -117,7 +117,7 @@ class gitlab extends control if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError())); $this->loadModel('action'); - $actionID = $this->action->create('gitlab', $id, 'edit'); + $actionID = $this->action->create('gitlab', $id, 'edited'); $changes = common::createChanges($oldGitLab, $gitLab); $this->action->logHistory($actionID, $changes); return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('browse'))); @@ -222,7 +222,7 @@ class gitlab extends control $this->gitlab->delete(TABLE_PIPELINE, $id); $gitLab = $this->gitlab->getByID($id); - $actionID = $this->action->create('gitlab', $id, 'delete'); + $actionID = $this->action->create('gitlab', $id, 'deleted'); $changes = common::createChanges($oldGitLab, $gitLab); $this->action->logHistory($actionID, $changes); die(js::reload('parent')); diff --git a/www/js/zui/kanban/min.js b/www/js/zui/kanban/min.js index c27ab2cbb5..5cf7eee888 100644 --- a/www/js/zui/kanban/min.js +++ b/www/js/zui/kanban/min.js @@ -4,4 +4,4 @@ * GitHub: https://github.com/easysoft/zui.git * Copyright (c) 2021 cnezsoft.com; Licensed MIT */ -!function(a){"use strict";var n="zui.kanban",e="object"==typeof CSS&&CSS.supports("display","flex"),t=function(i,d){var o=this;o.name=n,o.$=a(i),o.options=d=a.extend({},t.DEFAULTS,this.$.data(),d),o.data=d.data||[],o.render(o.data);var s=function(n){if(d.onAction){var e=a(this);d.onAction(e.data("action"),e,n,o)}};if(o.$.on("click",".action",s).on("dblclick",".action-dbc",s),"auto"===d.droppable&&(d.droppable=!d.readonly),d.droppable){var r={selector:".kanban-item",target:'.kanban-lane-col:not([data-type="EMPTY"])',drop:function(a){"function"==typeof d.droppable?d.droppable(a):d.onAction&&d.onAction("dropItem",a.element,a,o)}};"object"==typeof d.droppable&&a.extend(r,d.droppable),o.$.droppable(r)}e&&d.useFlex||a(window).on("resize",function(){o.adjustSize()}),d.useFlex&&e||o.$.addClass("not-use-flex")};t.prototype.render=function(a){var n=this;a&&(n.data=a),n.data&&!Array.isArray(n.data)&&(n.data=[n.data]);var t=n.data||[];n.options.beforeRender&&n.options.beforeRender(n,t),n.$.toggleClass("kanban-readonly",!!n.options.readonly).toggleClass("kanban-no-lane-name",!!n.options.noLaneName),n.$.children(".kanban-board").addClass("kanban-expired");for(var i=0;i-1){var i=this.data[t];n=a.extend(i,n),this.data[t]=n}else this.data.push(n)}n.id||(n.id=a.zui.uuid());var d=this,o=d.$,s=o.children('.kanban-board[data-id="'+n.id+'"]');s.length?s.removeClass("kanban-expired"):(s=a('
').appendTo(o),e||s.addClass("no-flex")),d.renderKanbanHeader(n,s),s.children(".kanban-lane").addClass("kanban-expired");for(var r=n.lanes||[],l=0;l .kanban-lane-items .kanban-item').length;s.find('.kanban-header-col[data-id="'+c+'"] > .title > .count').text(p||(d.options.showZeroCount?0:""))}d.adjustKanbanSize(n,s),d.options.onRenderKanban&&d.options.onRenderKanban(s,n,d)},t.prototype.renderKanbanHeader=function(n,t){var i=this;t=t||i.$.children('.kanban-board[data-id="'+n.id+'"]');var d=t.children(".kanban-header");d.length||(d=a('
').prependTo(t),e||d.addClass("clearfix")),d.children(".kanban-col").addClass("kanban-expired");for(var o=n.columns,s=0;s',"<"+(d?"a":"div")+' class="title">','','','',"",""].join("")).appendTo(e),d?i.children(".title").addClass("action").attr("data-action","addCol"):(i.children(".title").addClass("action-dbc").attr("data-action","editCol"),t.options.readonly||i.append(['
','',"
"].join("")));var o=t.options.minColumnWidth;o&&i.css("min-width",o)}i.data("col",n),i.attr("data-type",n.type),i.find(".title>.icon").attr("class","icon icon-"+(n.icon||"")),i.find(".title>.text").text(n.name),i.find(".title>.count").text(n.count||(t.options.showZeroCount?0:"")),t.options.onRenderHeaderCol&&t.options.onRenderHeaderCol(i,n,e)},t.prototype.renderLane=function(n,t,i){var d=this;i=i||d.$.children('.kanban-board[data-id="'+n.kanban+'"]');var o=i.children('.kanban-lane[data-id="'+n.id+'"]');if(o.length?o.removeClass("kanban-expired"):(o=a('
').appendTo(i),e||o.addClass("clearfix")),o.data("lane",n),!d.options.noLaneName){var s=o.children('.kanban-lane-name[data-id="'+n.id+'"]');s.length||(s=a('
').appendTo(o)),s.empty().attr("title",n.name).append(a('').text(n.name)),n.color&&s.css("background-color",n.color),d.options.onRenderLaneName&&d.options.onRenderLaneName(s,n,i,t)}o.children(".kanban-col,.kanban-sub-lanes").addClass("kanban-expired"),o.toggleClass("has-sub-lane",!!n.subLanes),n.subLanes?d.renderSubLanes(n,t,o):d.renderLaneItems(t,n.items,o),d.options.readonly||d.renderLaneCol({id:"EMPTY",type:"EMPTY"},o),o.children(".kanban-expired").remove()},t.prototype.renderSubLanes=function(n,e,t){var i=this,d=t.children('.kanban-sub-lanes[data-id="'+n.id+'"]');d.length?d.removeClass("kanban-expired"):d=a('
').appendTo(t),d.children(".kanban-sub-lane").addClass("kanban-expired");for(var o=0;o').appendTo(i),e||d.addClass("clearfix")),d.children(".kanban-col").addClass("kanban-expired"),this.renderLaneItems(t,n.items,d),d.children(".kanban-expired").remove()},t.prototype.renderLaneItems=function(a,n,e){for(var t=this,i=0;i').appendTo(e),"EMPTY"!==n.id&&(i.append('
'),t.options.readonly||i.append(['
','","
"].join("")));var d=t.options;d.minColumnWidth&&i.css("min-width",d.minColumnWidth),d.maxColHeight&&i.find(".kanban-lane-items").css("max-height",d.maxColHeight),d.laneItemsClass&&i.find(".kanban-lane-items").addClass(d.laneItemsClass),d.laneColClass&&i.addClass(d.laneColClass)}return"EMPTY"===n.id&&i.appendTo(e),i.attr("data-type",n.type),i},t.prototype.renderLaneItem=function(n,e,t){var i=e.children('.kanban-item[data-id="'+n.id+'"]');if(i.length?i.removeClass("kanban-expired"):i=a('
').appendTo(e),this.options.itemRender)this.options.itemRender(n,i,t);else{var d=i.find(".title");d.length||(d=a('
').appendTo(i)),d.text(n.name||n.title)}return i},t.prototype.adjustKanbanSize=function(n,t){var i=this,d=i.options.noLaneName?0:i.options.laneNameWidth,o=n.columns.length+(i.options.readonly?0:1),s=i.options.minColumnWidth*o+d;if(t=t||i.$.children('.kanban-board[data-id="'+n.id+'"]'),t.removeClass("kanban-size-inited").css({minWidth:s}),!i.options.useFlex||!e){var r=Math.max(s,i.$.width()),l=Math.floor((r-d)/o);t.find(".kanban-col").css("width",l),i.options.maxColHeight&&"auto"!==i.options.maxColHeight&&(t.children(".kanban-lane").each(function(){var n=a(this),e=n.height();n.children(".kanban-col,.kanban-sub-lanes").css("min-height",e)}),t.find(".kanban-lane:not(.has-sub-lane),.kanban-sub-lane").each(function(){var n=a(this),e=n.height(),t=n.children(".kanban-lane-col").css("height","auto");t.each(function(){e=Math.max(e,a(this).outerHeight()+1)}),t.css("height",e)})),t.addClass("kanban-size-inited")}},t.prototype.adjustSize=function(){for(var a=0;a-1){var i=this.data[t];n=a.extend(i,n),this.data[t]=n}else this.data.push(n)}n.id||(n.id=a.zui.uuid());var d=this,o=d.$,s=o.children('.kanban-board[data-id="'+n.id+'"]');s.length?s.removeClass("kanban-expired"):(s=a('
').appendTo(o),e||s.addClass("no-flex")),d.renderKanbanHeader(n,s),s.children(".kanban-lane").addClass("kanban-expired");for(var r=n.lanes||[],l=0;l .kanban-lane-items .kanban-item').length;s.find('.kanban-header-col[data-id="'+c+'"] > .title > .count').text(p||(d.options.showZeroCount?0:""))}d.adjustKanbanSize(n,s),d.options.onRenderKanban&&d.options.onRenderKanban(s,n,d)},t.prototype.renderKanbanHeader=function(n,t){var i=this;t=t||i.$.children('.kanban-board[data-id="'+n.id+'"]');var d=t.children(".kanban-header");d.length||(d=a('
').prependTo(t),e||d.addClass("clearfix")),d.children(".kanban-col").addClass("kanban-expired");for(var o=n.columns,s=0;s',"<"+(d?"a":"div")+' class="title">','','',t.options.showCount?'':"","",""].join("")).appendTo(e),d?i.children(".title").addClass("action").attr("data-action","addCol"):(i.children(".title").addClass("action-dbc").attr("data-action","editCol"),t.options.readonly||i.append(['
','',"
"].join("")));var o=t.options.minColumnWidth;o&&i.css("min-width",o)}i.data("col",n),i.attr("data-type",n.type),i.find(".title>.icon").attr("class","icon icon-"+(n.icon||"")),i.find(".title>.text").text(n.name),t.options.showCount&&i.find(".title>.count").text(n.count||(t.options.showZeroCount?0:"")),t.options.onRenderHeaderCol&&t.options.onRenderHeaderCol(i,n,e)},t.prototype.renderLane=function(n,t,i){var d=this;i=i||d.$.children('.kanban-board[data-id="'+n.kanban+'"]');var o=i.children('.kanban-lane[data-id="'+n.id+'"]');if(o.length?o.removeClass("kanban-expired"):(o=a('
').appendTo(i),e||o.addClass("clearfix")),o.data("lane",n),!d.options.noLaneName){var s=o.children('.kanban-lane-name[data-id="'+n.id+'"]');s.length||(s=a('
').appendTo(o)),s.empty().attr("title",n.name).append(a('').text(n.name)),n.color&&s.css("background-color",n.color),d.options.onRenderLaneName&&d.options.onRenderLaneName(s,n,i,t)}o.children(".kanban-col,.kanban-sub-lanes").addClass("kanban-expired"),o.toggleClass("has-sub-lane",!!n.subLanes),n.subLanes?d.renderSubLanes(n,t,o):d.renderLaneItems(t,n.items,o),d.options.readonly||d.renderLaneCol({id:"EMPTY",type:"EMPTY"},o),o.children(".kanban-expired").remove()},t.prototype.renderSubLanes=function(n,e,t){var i=this,d=t.children('.kanban-sub-lanes[data-id="'+n.id+'"]');d.length?d.removeClass("kanban-expired"):d=a('
').appendTo(t),d.children(".kanban-sub-lane").addClass("kanban-expired");for(var o=0;o').appendTo(i),e||d.addClass("clearfix")),d.children(".kanban-col").addClass("kanban-expired"),this.renderLaneItems(t,n.items,d),d.children(".kanban-expired").remove()},t.prototype.renderLaneItems=function(a,n,e){for(var t=this,i=0;i').appendTo(e),"EMPTY"!==n.id&&(i.append('
'),t.options.readonly||i.append(['
','","
"].join("")));var d=t.options;d.minColumnWidth&&i.css("min-width",d.minColumnWidth),d.maxColHeight&&i.find(".kanban-lane-items").css("max-height",d.maxColHeight),d.laneItemsClass&&i.find(".kanban-lane-items").addClass(d.laneItemsClass),d.laneColClass&&i.addClass(d.laneColClass)}return"EMPTY"===n.id&&i.appendTo(e),i.attr("data-type",n.type),i},t.prototype.renderLaneItem=function(n,e,t){var i=e.children('.kanban-item[data-id="'+n.id+'"]');if(i.length?i.removeClass("kanban-expired"):i=a('
').appendTo(e),this.options.itemRender)this.options.itemRender(n,i,t);else{var d=i.find(".title");d.length||(d=a('
').appendTo(i)),d.text(n.name||n.title)}return i},t.prototype.adjustKanbanSize=function(n,t){var i=this,d=i.options.noLaneName?0:i.options.laneNameWidth,o=n.columns.length+(i.options.readonly?0:1),s=i.options.minColumnWidth*o+d;if(t=t||i.$.children('.kanban-board[data-id="'+n.id+'"]'),t.removeClass("kanban-size-inited").css({minWidth:s}),!i.options.useFlex||!e){var r=Math.max(s,i.$.width()),l=Math.floor((r-d)/o);t.find(".kanban-col").css("width",l),i.options.maxColHeight&&"auto"!==i.options.maxColHeight&&(t.children(".kanban-lane").each(function(){var n=a(this),e=n.height();n.children(".kanban-col,.kanban-sub-lanes").css("min-height",e)}),t.find(".kanban-lane:not(.has-sub-lane),.kanban-sub-lane").each(function(){var n=a(this),e=n.height(),t=n.children(".kanban-lane-col").css("height","auto");t.each(function(){e=Math.max(e,a(this).outerHeight()+1)}),t.css("height",e)})),t.addClass("kanban-size-inited")}},t.prototype.adjustSize=function(){for(var a=0;a