From 03d8a26ed550f7730ebc82eeea6fd847ca97e43f Mon Sep 17 00:00:00 2001 From: Hao Sun Date: Tue, 16 Nov 2021 16:27:46 +0800 Subject: [PATCH] * update kanban lib, fix kanban rerender not work as expected. --- www/js/zui/kanban/min.css | 2 +- www/js/zui/kanban/min.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/www/js/zui/kanban/min.css b/www/js/zui/kanban/min.css index 568d02a2b2..2c726d5a2e 100644 --- a/www/js/zui/kanban/min.css +++ b/www/js/zui/kanban/min.css @@ -1,5 +1,5 @@ /*! - * ZUI: ZUI Kanban View - v1.10.0 - 2021-11-15 + * ZUI: ZUI Kanban View - v1.10.0 - 2021-11-16 * http://openzui.com * GitHub: https://github.com/easysoft/zui.git * Copyright (c) 2021 cnezsoft.com; Licensed MIT diff --git a/www/js/zui/kanban/min.js b/www/js/zui/kanban/min.js index 5ba976bbc8..70ddafbe87 100644 --- a/www/js/zui/kanban/min.js +++ b/www/js/zui/kanban/min.js @@ -1,7 +1,7 @@ /*! - * ZUI: ZUI Kanban View - v1.10.0 - 2021-11-15 + * ZUI: ZUI Kanban View - v1.10.0 - 2021-11-16 * http://openzui.com * 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(d,o){var i=this;i.name=n,i.$=a(d).addClass("kanban"),i.options=o=a.extend({},t.DEFAULTS,this.$.data(),o),i.data=o.data||[],i.render(i.data);var s=function(n){if(o.onAction){var e=a(this);o.onAction(e.data("action"),e,n,i)}};if(i.$.on("click",".action",s).on("dblclick",".action-dbc",s),"auto"===o.droppable&&(o.droppable=!o.readonly),o.droppable){var r=0,l={selector:".kanban-item",target:'.kanban-lane-col:not([data-type="EMPTY"])',drop:function(a){"function"==typeof o.droppable?o.droppable(a):o.onAction&&o.onAction("dropItem",a.element,a,i)},start:function(n){i.$.addClass("kanban-dragging"),r&&clearTimeout(r),r=setTimeout(function(){a(n.shadowElement).addClass("in"),r=0},50)},always:function(){i.$.removeClass("kanban-dragging"),r&&(clearTimeout(r),r=0)}};"object"==typeof o.droppable&&a.extend(l,o.droppable),i.$.droppable(l)}e&&o.useFlex||a(window).on("resize",function(){i.adjustSize()}),o.useFlex&&e||i.$.addClass("not-use-flex"),o.onCreate&&o.onCreate(i)};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 d=0;d-1){var d=this.data[t];n=a.extend(d,n),this.data[t]=n}else this.data.push(n)}n.id||(n.id=a.zui.uuid());var o=this,i=o.$,s=i.children('.kanban-board[data-id="'+n.id+'"]');s.length?s.removeClass("kanban-expired"):(s=a('
').appendTo(i),e||s.addClass("no-flex")),o.renderKanbanHeader(n,s),s.children(".kanban-lane").addClass("kanban-expired");for(var r=n.lanes||[],l=0;l.kanban-lane-items .kanban-item").length,b=s.find('.kanban-header-col[data-id="'+p.id+'"]'+(p.asParent?">.kanban-header-col":"")+">.title>.count");b.text(h||(o.options.showZeroCount?0:"")),o.options.onRenderCount&&o.options.onRenderCount(b,h,p,o)}o.adjustKanbanSize(n,s),o.options.onRenderKanban&&o.options.onRenderKanban(s,n,o)},t.prototype.renderKanbanHeader=function(n,t){var d=this;t=t||d.$.children('.kanban-board[data-id="'+n.id+'"]');var o=t.children(".kanban-header");o.length||(o=a('
').prependTo(t),e||o.addClass("clearfix")),o.children(".kanban-col").addClass("kanban-expired");for(var i=n.columns,s={},r=!1,l=0;l.kanban-col").addClass("kanban-expired"):o=a(['
','
','
','','',d.options.showCount?'':"","
","
",'
',"
","
"].join("")).appendTo(e),o.data("col",n),o.attr("data-type",n.type).attr("data-subs-count",n.subs.length);var i=o.children(".kanban-header-col");i.find(".title>.icon").attr("class","icon icon-"+(n.icon||""));var s=i.find(".title>.text").text(n.name);n.color&&s.css("color",n.color),d.options.showCount&&i.find(".title>.count").text(n.count||(d.options.showZeroCount?0:"")),d.options.onRenderHeaderCol&&d.options.onRenderHeaderCol(o,n,e,t)},t.prototype.renderHeaderCol=function(n,e,t,d){var o=this;if(n.parentType&&t){var i=e.children('.kanban-header-parent-col[data-id="'+t.id+'"]');i.attr("data-subs-count",t.subs.length),o.options.useFlex&&i.css("flex",t.subs.length+" 1 0%"),e=i.children(".kanban-header-sub-cols")}var s=e.children('.kanban-header-col[data-id="'+n.id+'"]'),r="ADD"===n.id;if(s.length)s.removeClass("kanban-expired"),r&&s.appendTo(e);else{s=a(['
',"<"+(r?"a":"div")+' class="title">','','',o.options.showCount?'':"","","
"].join("")).appendTo(e),r?s.children(".title").addClass("action").attr("data-action","addCol"):(s.children(".title").addClass("action-dbc").attr("data-action","editCol"),o.options.readonly||s.append('
'));var l=o.options.minColWidth;l&&s.css("min-width",l);var c=o.options.maxColWidth;c&&s.css("max-width",o.options.maxColWidth)}s.data("col",n),s.attr("data-type",n.type),s.find(".title>.icon").attr("class","icon icon-"+(n.icon||""));var p=s.find(".title>.text").text(n.name);n.color&&p.css("color",n.color),o.options.showCount&&s.find(".title>.count").text(n.count||(o.options.showZeroCount?0:"")),o.options.onRenderHeaderCol&&o.options.onRenderHeaderCol(s,n,e,d)},t.prototype.renderLane=function(n,t,d,o,i){var s=this;d=d||s.$.children('.kanban-board[data-id="'+n.kanban+'"]');var r=d.children('.kanban-lane[data-id="'+n.id+'"]');if(r.length?r.removeClass("kanban-expired"):(r=a('
').appendTo(d),e||r.addClass("clearfix")),r.attr("data-index",i).data("lane",n),!s.options.noLaneName){var l=r.children('.kanban-lane-name[data-id="'+n.id+'"]');l.length||(l=a('
').appendTo(r)),l.empty().attr("title",n.name).append(a('').text(n.name)),n.color&&l.css("background-color",n.color),s.options.onRenderLaneName&&s.options.onRenderLaneName(l,n,d,t,o)}if(r.children(".kanban-col,.kanban-sub-lanes").addClass("kanban-expired"),r.toggleClass("has-sub-lane",!!n.subLanes),n.subLanes)s.renderSubLanes(n,t,r,o);else{var c=n.items||n.cards;c&&s.renderLaneItems(t,c,r,n,o)}s.options.showAddCol&&s.renderLaneCol({id:"EMPTY",type:"EMPTY"},r),r.children(".kanban-expired").remove()},t.prototype.renderSubLanes=function(n,e,t,d){var o=this,i=t.children('.kanban-sub-lanes[data-id="'+n.id+'"]');i.length?i.removeClass("kanban-expired"):i=a('
').appendTo(t),i.children(".kanban-sub-lane").addClass("kanban-expired");for(var s=0;s').appendTo(d),e||s.addClass("clearfix")),s.attr("data-index",i).data("lane",n),s.children(".kanban-col").addClass("kanban-expired");var r=n.items||n.cards;r&&this.renderLaneItems(t,r,s,n,o),s.children(".kanban-expired").remove()},t.prototype.renderLaneItems=function(a,n,e,t,d){var o=this;console.log("renderLaneItems",a,n,e,t,d);for(var i=0;i').appendTo(e),"EMPTY"!==n.id&&(d.append('
'),t.options.readonly||d.append(['
','","
"].join("")));var o=t.options;o.minColWidth&&d.css("min-width",o.minColWidth),o.maxColWidth&&d.css("max-width",o.maxColWidth),o.maxColHeight&&d.find(".kanban-lane-items").css("max-height",o.maxColHeight),o.laneItemsClass&&d.find(".kanban-lane-items").addClass(o.laneItemsClass),o.laneColClass&&d.addClass(o.laneColClass)}return"EMPTY"===n.id&&d.appendTo(e),d.attr({"data-parent":n.parentType?n.parentType:null,"data-type":n.type}),d},t.prototype.renderLaneItem=function(n,e,t,d,o){var i=e.children('.kanban-item[data-id="'+n.id+'"]');if(i.length?i.removeClass("kanban-expired"):i=a('
').appendTo(e),i.data("item",n),this.options.itemRender)this.options.itemRender(n,i,t,d,o);else{var s=i.find(".title");s.length||(s=a('
').appendTo(i)),s.text(n.name||n.title)}return i},t.prototype.adjustKanbanSize=function(n,t){for(var d=this,o=n.columns,i=d.options.noLaneName?0:d.options.laneNameWidth,s=d.options.showAddCol?1:0,r=0;r-1){var d=this.data[t];n=a.extend(d,n),this.data[t]=n}else this.data.push(n)}n.id||(n.id=a.zui.uuid());var i=this,o=i.$,s=o.children('.kanban-board[data-id="'+n.id+'"]');s.length?s.removeClass("kanban-expired"):(s=a('
').appendTo(o),e||s.addClass("no-flex")),i.renderKanbanHeader(n,s),s.children(".kanban-lane").addClass("kanban-expired");for(var r=n.lanes||[],l=0;l.kanban-lane-items .kanban-item").length,b=s.find('.kanban-header-col[data-id="'+p.id+'"]'+(p.asParent?">.kanban-header-col":"")+">.title>.count");b.text(h||(i.options.showZeroCount?0:"")),i.options.onRenderCount&&i.options.onRenderCount(b,h,p,i)}i.adjustKanbanSize(n,s),i.options.onRenderKanban&&i.options.onRenderKanban(s,n,i)},t.prototype.renderKanbanHeader=function(n,t){var d=this;t=t||d.$.children('.kanban-board[data-id="'+n.id+'"]');var i=t.children(".kanban-header");i.length||(i=a('
').prependTo(t),e||i.addClass("clearfix")),i.children(".kanban-col").addClass("kanban-expired");for(var o=n.columns,s={},r=!1,l=0;l.kanban-col").addClass("kanban-expired"):o=a(['
','
','
','','',i.options.showCount?'':"","
","
",'
',"
","
"].join("")),s&&s.length?s.after(o):e.prepend(o),o.data("col",n),o.attr("data-type",n.type).attr("data-subs-count",n.subs.length);var r=o.children(".kanban-header-col");r.find(".title>.icon").attr("class","icon icon-"+(n.icon||""));var l=r.find(".title>.text").text(n.name);n.color&&l.css("color",n.color),i.options.showCount&&r.find(".title>.count").text(n.count||(i.options.showZeroCount?0:"")),i.options.onRenderHeaderCol&&i.options.onRenderHeaderCol(o,n,e,d)},t.prototype.renderHeaderCol=function(n,e,t,d,i){var o=this;if(n.parentType&&t){var s=e.children('.kanban-header-parent-col[data-id="'+t.id+'"]');s.attr("data-subs-count",t.subs.length),o.options.useFlex&&s.css("flex",t.subs.length+" 1 0%"),e=s.children(".kanban-header-sub-cols")}var r=e.children('.kanban-header-col[data-id="'+n.id+'"]'),l=d?e.children('.kanban-header-col[data-id="'+d.id+'"]'):null,c="ADD"===n.id;if(r.length)r.removeClass("kanban-expired");else{r=a(['
',"<"+(c?"a":"div")+' class="title">','','',o.options.showCount?'':"","","
"].join("")),c?r.children(".title").addClass("action").attr("data-action","addCol"):(r.children(".title").addClass("action-dbc").attr("data-action","editCol"),o.options.readonly||r.append('
'));var p=o.options.minColWidth;p&&r.css("min-width",p);var h=o.options.maxColWidth;h&&r.css("max-width",o.options.maxColWidth)}l&&l.length?l.after(r):e.prepend(r),r.data("col",n),r.attr("data-type",n.type),r.find(".title>.icon").attr("class","icon icon-"+(n.icon||""));var b=r.find(".title>.text").text(n.name);n.color&&b.css("color",n.color),o.options.showCount&&r.find(".title>.count").text(n.count||(o.options.showZeroCount?0:"")),o.options.onRenderHeaderCol&&o.options.onRenderHeaderCol(r,n,e,i)},t.prototype.renderLane=function(n,t,d,i,o){var s=this;d=d||s.$.children('.kanban-board[data-id="'+n.kanban+'"]');var r=d.children('.kanban-lane[data-id="'+n.id+'"]');if(r.length?r.removeClass("kanban-expired"):(r=a('
').appendTo(d),e||r.addClass("clearfix")),r.attr("data-index",o).data("lane",n),!s.options.noLaneName){var l=r.children('.kanban-lane-name[data-id="'+n.id+'"]');l.length||(l=a('
').appendTo(r)),l.empty().attr("title",n.name).append(a('').text(n.name)),n.color&&l.css("background-color",n.color),s.options.onRenderLaneName&&s.options.onRenderLaneName(l,n,d,t,i)}if(r.children(".kanban-col,.kanban-sub-lanes").addClass("kanban-expired"),r.toggleClass("has-sub-lane",!!n.subLanes),n.subLanes)s.renderSubLanes(n,t,r,i);else{var c=n.items||n.cards;c&&s.renderLaneItems(t,c,r,n,i)}s.options.showAddCol&&s.renderLaneCol({id:"EMPTY",type:"EMPTY"},r),r.children(".kanban-expired").remove()},t.prototype.renderSubLanes=function(n,e,t,d){var i=this,o=t.children('.kanban-sub-lanes[data-id="'+n.id+'"]');o.length?o.removeClass("kanban-expired"):o=a('
').appendTo(t),o.children(".kanban-sub-lane").addClass("kanban-expired");for(var s=0;s').appendTo(d),e||s.addClass("clearfix")),s.attr("data-index",o).data("lane",n),s.children(".kanban-col").addClass("kanban-expired");var r=n.items||n.cards;r&&this.renderLaneItems(t,r,s,n,i),s.children(".kanban-expired").remove()},t.prototype.renderLaneItems=function(a,n,e,t,d){for(var i=this,o=0;o').appendTo(e),"EMPTY"!==n.id&&(d.append('
'),t.options.readonly||d.append(['
','","
"].join("")));var i=t.options;i.minColWidth&&d.css("min-width",i.minColWidth),i.maxColWidth&&d.css("max-width",i.maxColWidth),i.maxColHeight&&d.find(".kanban-lane-items").css("max-height",i.maxColHeight),i.laneItemsClass&&d.find(".kanban-lane-items").addClass(i.laneItemsClass),i.laneColClass&&d.addClass(i.laneColClass)}return"EMPTY"===n.id&&d.appendTo(e),d.attr({"data-parent":n.parentType?n.parentType:null,"data-type":n.type}),d},t.prototype.renderLaneItem=function(n,e,t,d,i){var o=e.children('.kanban-item[data-id="'+n.id+'"]');if(o.length?o.removeClass("kanban-expired"):o=a('
').appendTo(e),o.data("item",n),this.options.itemRender)this.options.itemRender(n,o,t,d,i);else{var s=o.find(".title");s.length||(s=a('
').appendTo(o)),s.text(n.name||n.title)}return o},t.prototype.adjustKanbanSize=function(n,t){for(var d=this,i=n.columns,o=d.options.noLaneName?0:d.options.laneNameWidth,s=d.options.showAddCol?1:0,r=0;r