From 1494f264d8ba56e67f1f7bda4c60794878b09b0c Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Wed, 31 Mar 2021 17:49:39 +0800 Subject: [PATCH] roojs-bootstrap.js roojs-bootstrap-debug.js Roo/bootstrap/Card.js --- Roo/bootstrap/Card.js | 2 +- roojs-bootstrap-debug.js | 1 + roojs-bootstrap.js | 57 +++++++++++++++++++++------------------- 3 files changed, 32 insertions(+), 28 deletions(-) diff --git a/Roo/bootstrap/Card.js b/Roo/bootstrap/Card.js index 413d063b83..24829c5a9a 100644 --- a/Roo/bootstrap/Card.js +++ b/Roo/bootstrap/Card.js @@ -765,7 +765,7 @@ Roo.extend(Roo.bootstrap.Card, Roo.bootstrap.Component, { var ww = he.width; if (hw > 1) { Roo.get(he).setSize( ww * (1/hw), ww); - Roo.get(he).setX( (ww - (ww * (1/hw)/ 2); + Roo.get(he).setX( (ww - (ww * (1/hw)))/ 2); } } diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js index 2e1e7105a1..ee6b1cf90e 100644 --- a/roojs-bootstrap-debug.js +++ b/roojs-bootstrap-debug.js @@ -2700,6 +2700,7 @@ Roo.extend(Roo.bootstrap.Card, Roo.bootstrap.Component, { var ww = he.width; if (hw > 1) { Roo.get(he).setSize( ww * (1/hw), ww); + Roo.get(he).setX( (ww - (ww * (1/hw))/ 2); } } diff --git a/roojs-bootstrap.js b/roojs-bootstrap.js index 29a4595e14..9822b354a5 100644 --- a/roojs-bootstrap.js +++ b/roojs-bootstrap.js @@ -80,38 +80,41 @@ return this.el.select('.panel-body',true).first()},titleEl:function(){if(!this.e },getTitle:function(){var A=this.titleEl();if(!A){return '';}return A.dom.innerHTML;},setRightTitle:function(v){var t=this.el.select('.panel-header-right',true).first();if(!t){return;}t.dom.innerHTML=v;},onClick:function(e){e.preventDefault();this.fireEvent('click',this,e); }}); // Roo/bootstrap/Card.js -Roo.bootstrap.Card=function(A){Roo.bootstrap.Card.superclass.constructor.call(this,A);this.addEvents({'drop':true,'rotate':true});};Roo.extend(Roo.bootstrap.Card,Roo.bootstrap.Component,{weight:'',margin:'',margin_top:'',margin_bottom:'',margin_left:'',margin_right:'',margin_x:'',margin_y:'',padding:'',padding_top:'',padding_bottom:'',padding_left:'',padding_right:'',padding_x:'',padding_y:'',display:'',display_xs:'',display_sm:'',display_lg:'',display_xl:'',header_image:'',header:'',header_size:0,title:'',subtitle:'',html:'',footer:'',collapsable:false,collapsed:false,rotateable:false,rotated:false,dragable:false,drag_group:false,dropable:false,drop_group:false,childContainer:false,dropEl:false,containerEl:false,bodyEl:false,headerContainerEl:false,headerEl:false,header_imageEl:false,layoutCls:function(){var A=''; -var t=this;Roo.log(this.margin_bottom.length);['','top','bottom','left','right','x','y'].forEach(function(v){if((''+t['margin'+(v.length?'_':'')+v]).length){A+=' m'+(v.length?v[0]:'')+'-'+t['margin'+(v.length?'_':'')+v];}if((''+t['padding'+(v.length?'_':'')+v]).length){A+=' p'+(v.length?v[0]:'')+'-'+t['padding'+(v.length?'_':'')+v]; -}});['','xs','sm','lg','xl'].forEach(function(v){if((''+t['display'+(v.length?'_':'')+v]).length){A+=' d'+(v.length?'-':'')+v+'-'+t['display'+(v.length?'_':'')+v]}});if(this.hidden){A+=' d-none';}return A;},getAutoCreate:function(){var A={tag:'div',cls:'card',cn:[]} -;if(this.weight.length&&this.weight!='light'){A.cls+=' text-white';}else{A.cls+=' text-dark';}if(this.weight.length){A.cls+=' bg-'+this.weight;}A.cls+=' '+this.layoutCls();var B=false;var C=false;if(this.header.length){B={tag:this.header_size>0?'h'+this.header_size:'div',cls:'card-header '+(this.header_weight?'bg-'+this.header_weight:''),cn:[]} -;A.cn.push(B);C=B;}else{B={tag:'div',cls:'card-header d-none '+(this.header_weight?'bg-'+this.header_weight:''),cn:[]};A.cn.push(B);C=B;}if(this.collapsable){C={tag:'a',cls:'d-block user-select-none',cn:[{tag:'i',cls:'roo-collapse-toggle fa fa-chevron-down float-right '+(this.collapsed?'collapsed':'')} -]};B.cn.push(C);}C.cn.push({tag:'span',cls:'roo-card-header-ctr'+(this.header.length?'':' d-none'),html:this.header});if(this.header_image.length){A.cn.push({tag:'img',cls:'card-img-top',src:this.header_image});}else{A.cn.push({tag:'div',cls:'card-img-top d-none'} -);}var D={tag:'div',cls:'card-body'+(this.html===false?' d-none':''),cn:[]};var E=D;if(this.collapsable||this.rotateable){E={tag:'div',cls:'roo-collapsable collapse '+(this.collapsed||this.rotated?'':'show'),cn:[D]};}A.cn.push(E);if(this.title.length){D.cn.push({tag:'div',cls:'card-title',src:this.title} -);}if(this.subtitle.length){D.cn.push({tag:'div',cls:'card-title',src:this.subtitle});}D.cn.push({tag:'div',cls:'roo-card-body-ctr'});if(this.html.length){D.cn.push({tag:'div',html:this.html});}if(this.footer.length){A.cn.push({cls:'card-footer '+(this.rotated?'d-none':''),html:this.footer} -);}else{A.cn.push({cls:'card-footer d-none'});}return A;},getCardHeader:function(){var A=this.el.select('.card-header',true).first();if(A.hasClass('d-none')){A.removeClass('d-none');}return A;},getCardFooter:function(){var A=this.el.select('.card-footer',true).first(); -if(A.hasClass('d-none')){A.removeClass('d-none');}return A;},getCardImageTop:function(){var A=this.header_imageEl;if(A.hasClass('d-none')){A.removeClass('d-none');}return A;},getChildContainer:function(){if(!this.el){return false;}return this.el.select('.roo-card-body-ctr',true).first(); +Roo.bootstrap.Card=function(A){Roo.bootstrap.Card.superclass.constructor.call(this,A);this.addEvents({'drop':true,'rotate':true});};Roo.extend(Roo.bootstrap.Card,Roo.bootstrap.Component,{weight:'',margin:'',margin_top:'',margin_bottom:'',margin_left:'',margin_right:'',margin_x:'',margin_y:'',padding:'',padding_top:'',padding_bottom:'',padding_left:'',padding_right:'',padding_x:'',padding_y:'',display:'',display_xs:'',display_sm:'',display_lg:'',display_xl:'',header_image:'',header:'',header_size:0,title:'',subtitle:'',html:'',footer:'',collapsable:false,collapsed:false,rotateable:false,rotated:false,dragable:false,drag_group:false,dropable:false,drop_group:false,childContainer:false,dropEl:false,containerEl:false,bodyEl:false,headerContainerEl:false,headerEl:false,header_imageEl:false,layoutCls:function(){var cls=''; +var t=this;Roo.log(this.margin_bottom.length);['','top','bottom','left','right','x','y'].forEach(function(v){if((''+t['margin'+(v.length?'_':'')+v]).length){cls+=' m'+(v.length?v[0]:'')+'-'+t['margin'+(v.length?'_':'')+v];}if((''+t['padding'+(v.length?'_':'')+v]).length){cls+=' p'+(v.length?v[0]:'')+'-'+t['padding'+(v.length?'_':'')+v]; +}});['','xs','sm','lg','xl'].forEach(function(v){if((''+t['display'+(v.length?'_':'')+v]).length){cls+=' d'+(v.length?'-':'')+v+'-'+t['display'+(v.length?'_':'')+v]}});if(this.hidden){cls+=' d-none';}return cls;},getAutoCreate:function(){var cfg={tag:'div',cls:'card',cn:[]} +;if(this.weight.length&&this.weight!='light'){cfg.cls+=' text-white';}else{cfg.cls+=' text-dark';}if(this.weight.length){cfg.cls+=' bg-'+this.weight;}cfg.cls+=' '+this.layoutCls();var hdr=false;var hdr_ctr=false;if(this.header.length){hdr={tag:this.header_size>0?'h'+this.header_size:'div',cls:'card-header '+(this.header_weight?'bg-'+this.header_weight:''),cn:[]} +;cfg.cn.push(hdr);hdr_ctr=hdr;}else{hdr={tag:'div',cls:'card-header d-none '+(this.header_weight?'bg-'+this.header_weight:''),cn:[]};cfg.cn.push(hdr);hdr_ctr=hdr;}if(this.collapsable){hdr_ctr={tag:'a',cls:'d-block user-select-none',cn:[{tag:'i',cls:'roo-collapse-toggle fa fa-chevron-down float-right '+(this.collapsed?'collapsed':'')} +]};hdr.cn.push(hdr_ctr);}hdr_ctr.cn.push({tag:'span',cls:'roo-card-header-ctr'+(this.header.length?'':' d-none'),html:this.header});if(this.header_image.length){cfg.cn.push({tag:'img',cls:'card-img-top',src:this.header_image});}else{cfg.cn.push({tag:'div',cls:'card-img-top d-none'} +);}var body={tag:'div',cls:'card-body'+(this.html===false?' d-none':''),cn:[]};var obody=body;if(this.collapsable||this.rotateable){obody={tag:'div',cls:'roo-collapsable collapse '+(this.collapsed||this.rotated?'':'show'),cn:[body]};}cfg.cn.push(obody);if(this.title.length){body.cn.push({tag:'div',cls:'card-title',src:this.title} +);}if(this.subtitle.length){body.cn.push({tag:'div',cls:'card-title',src:this.subtitle});}body.cn.push({tag:'div',cls:'roo-card-body-ctr'});if(this.html.length){body.cn.push({tag:'div',html:this.html});}if(this.footer.length){cfg.cn.push({cls:'card-footer '+(this.rotated?'d-none':''),html:this.footer} +);}else{cfg.cn.push({cls:'card-footer d-none'});}return cfg;},getCardHeader:function(){var ret=this.el.select('.card-header',true).first();if(ret.hasClass('d-none')){ret.removeClass('d-none');}return ret;},getCardFooter:function(){var ret=this.el.select('.card-footer',true).first(); +if(ret.hasClass('d-none')){ret.removeClass('d-none');}return ret;},getCardImageTop:function(){var ret=this.header_imageEl;if(ret.hasClass('d-none')){ret.removeClass('d-none');}return ret;},getChildContainer:function(){if(!this.el){return false;}return this.el.select('.roo-card-body-ctr',true).first(); },initEvents:function(){this.bodyEl=this.el.select('.card-body',true).first();this.containerEl=this.getChildContainer();if(this.dragable){this.dragZone=new Roo.dd.DragZone(this.getEl(),{containerScroll:true,ddGroup:this.drag_group||'default_card_drag_group'} );this.dragZone.getDragData=this.getDragData.createDelegate(this);}if(this.dropable){this.dropZone=new Roo.dd.DropZone(this.el.select('.card-body',true).first(),{containerScroll:true,ddGroup:this.drop_group||'default_card_drag_group'});this.dropZone.getTargetFromEvent=this.getTargetFromEvent.createDelegate(this); this.dropZone.onNodeEnter=this.onNodeEnter.createDelegate(this);this.dropZone.onNodeOver=this.onNodeOver.createDelegate(this);this.dropZone.onNodeOut=this.onNodeOut.createDelegate(this);this.dropZone.onNodeDrop=this.onNodeDrop.createDelegate(this);}if(this.collapsable){this.el.select('.card-header',true).on('click',this.onToggleCollapse,this); }if(this.rotateable){this.el.select('.card-header',true).on('click',this.onToggleRotate,this);}this.collapsableEl=this.el.select('.roo-collapsable').first();this.footerEl=this.el.select('.card-footer').first();this.collapsableToggleEl=this.el.select('.roo-collapse-toggle'); this.headerContainerEl=this.el.select('.roo-card-header-ctr').first();this.headerEl=this.el.select('.card-header',true).first();if(this.rotated){this.el.addClass('roo-card-rotated');this.fireEvent('rotate',this,true);}this.header_imageEl=this.el.select('.card-img-top',true).first(); -this.header_imageEl.on('load',this.onHeaderImageLoad,this);},getDragData:function(e){var A=this.getEl();if(A){var B={source:this,copy:false,nodes:this.getEl(),records:[]};B.ddel=A.dom;Roo.log(A.getWidth());B.ddel.style.width=A.getWidth()+'px';return B;}return false; -},getTargetFromEvent:function(e,A){var B=e.getTarget();while((B!==null)&&(B.parentNode!=this.containerEl.dom)){B=B.parentNode;}var C={position:'',cards:[],card_n:-1,items_n:-1,card:false};var D=false;var E=0;var F=0;for(var i=0;i0?'below':D;C.items_n=i>0?i-1:0;C.card_n=F>0?F-1:0;C.card=C.cards[C.card_n];}}if(!C.cards.length){C.card=true;C.position='below'; -C.items_n;return C;}if(C.card_n<0){C.card_n=E;C.card=C.cards[E];C.items_n=this.items.indexOf(C.cards[E]);C.position='below';}if(this.items[C.items_n].el==A){return false;}if(C.position=='below'){var G=C.card_n+1==C.cards.length?false:C.cards[C.card_n+1];if(G&&G.el==A){return false; -}return C;}var H=C.card_n>0?C.cards[C.card_n-1]:false;if(H&&H.el==A){return false;}return C;},onNodeEnter:function(n,dd,e,A){return false;},onNodeOver:function(n,dd,e,A){var B=this.getTargetFromEvent(e,A.source.el);if(B===false){this.dropPlaceHolder('hide'); -return false;}Roo.log(['getTargetFromEvent',B]);this.dropPlaceHolder('show',B,A);return false;},onNodeOut:function(n,dd,e,A){this.dropPlaceHolder('hide');},onNodeDrop:function(n,dd,e,A){var B=this.getTargetFromEvent(e,A.source.el);if(B===false){return false; -}this.dropPlaceHolder('hide');this.acceptCard(A.source,B.position,B.card,B.items_n);return true;},firstChildCard:function(){for(var i=0;i1){Roo.get(he).setSize(ww*(1/hw),ww);}}}); +this.header_imageEl.on('load',this.onHeaderImageLoad,this);},getDragData:function(e){var target=this.getEl();if(target){var dragData={source:this,copy:false,nodes:this.getEl(),records:[]};dragData.ddel=target.dom;Roo.log(target.getWidth());dragData.ddel.style.width=target.getWidth()+'px'; +return dragData;}return false;},getTargetFromEvent:function(e,dragged_card_el){var target=e.getTarget();while((target!==null)&&(target.parentNode!=this.containerEl.dom)){target=target.parentNode;}var ret={position:'',cards:[],card_n:-1,items_n:-1,card:false} +;var pos=false;var last_card_n=0;var cards_len=0;for(var i=0;i0?'below':pos; +ret.items_n=i>0?i-1:0;ret.card_n=cards_len>0?cards_len-1:0;ret.card=ret.cards[ret.card_n];}}if(!ret.cards.length){ret.card=true;ret.position='below';ret.items_n;return ret;}if(ret.card_n<0){ret.card_n=last_card_n;ret.card=ret.cards[last_card_n];ret.items_n=this.items.indexOf(ret.cards[last_card_n]); +ret.position='below';}if(this.items[ret.items_n].el==dragged_card_el){return false;}if(ret.position=='below'){var card_after=ret.card_n+1==ret.cards.length?false:ret.cards[ret.card_n+1];if(card_after&&card_after.el==dragged_card_el){return false;}return ret; +}var card_before=ret.card_n>0?ret.cards[ret.card_n-1]:false;if(card_before&&card_before.el==dragged_card_el){return false;}return ret;},onNodeEnter:function(n,dd,e,data){return false;},onNodeOver:function(n,dd,e,data){var target_info=this.getTargetFromEvent(e,data.source.el); +if(target_info===false){this.dropPlaceHolder('hide');return false;}Roo.log(['getTargetFromEvent',target_info]);this.dropPlaceHolder('show',target_info,data);return false;},onNodeOut:function(n,dd,e,data){this.dropPlaceHolder('hide');},onNodeDrop:function(n,dd,e,data){var info=this.getTargetFromEvent(e,data.source.el); +if(info===false){return false;}this.dropPlaceHolder('hide');this.acceptCard(data.source,info.position,info.card,info.items_n);return true;},firstChildCard:function(){for(var i=0;i1){Roo.get(he).setSize(ww*(1/hw),ww);Roo.get(he).setX((ww-(ww*(1/hw))/2);}}}); // Roo/bootstrap/CardHeader.js Roo.bootstrap.CardHeader=function(A){Roo.bootstrap.CardHeader.superclass.constructor.call(this,A);};Roo.extend(Roo.bootstrap.CardHeader,Roo.bootstrap.Element,{container_method:'getCardHeader'}); // Roo/bootstrap/CardFooter.js -- 2.39.2