yumoqing/bricks
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bugfix

Browse Source
This commit is contained in:
yumoqing 2024-11-21 21:38:33 +08:00
parent 9f3b4cf05d
commit e34c6773a6
4 changed files with 37 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bricks/build.sh
View File

@ -8,7 +8,7 @@ SOURCES=" page_data_loader.js factory.js uitypesdef.js utils.js uitype.js \
floaticonbar.js miniform.js wterm.js dynamicaccordion.js \ floaticonbar.js miniform.js wterm.js dynamicaccordion.js \
binstreaming.js streaming_audio.js vadtext.js rtc.js \ binstreaming.js streaming_audio.js vadtext.js rtc.js \
llm_dialog.js llm.js websocket.js datarow.js tabular.js \ llm_dialog.js llm.js websocket.js datarow.js tabular.js \
line.js pie.js bar.js gobang.js " line.js pie.js bar.js gobang.js period.js "
echo ${SOURCES} echo ${SOURCES}
cat ${SOURCES} > ../dist/bricks.js cat ${SOURCES} > ../dist/bricks.js
# uglifyjs --compress --mangle -- ../dist/bricks.js > ../dist/bricks.min.js # uglifyjs --compress --mangle -- ../dist/bricks.js > ../dist/bricks.min.js

12
bricks/css/bricks.css
View File

@ -33,6 +33,14 @@ hr {
background-color: #f5f5f5; background-color: #f5f5f5;
border: 1px solid #888888; border: 1px solid #888888;
} }
.subcard {
background-color: #eeeeee;
}
.clickable {
color: #80ff88;
cursor: pointer;
}
.video-in-video { .video-in-video {
position: relative; position: relative;
} }
@ -78,6 +86,10 @@ hr {
padding: 4px; padding: 4px;
} }
.toppopup {
box-shadow: 10px 5px 10px #000, 0 -5px 5px #fff;
}
.modal { .modal {
display:none; display:none;
position: absolute; position: absolute;

17
bricks/dynamiccolumn.js
View File

@ -30,21 +30,18 @@ bricks.DynamicColumn = class extends bricks.Layout {
var cw; var cw;
var cols; var cols;
var gap; var gap;
var width = this.get_width(); gap = bricks.app.charsize * (this.col_cgap || 0.1);
var width = bricks.app.screenWidth();
var height = bricks.app.screenHeight();
if (bricks.is_mobile() && width < height){
cols = this.mobile_cols;
cw = (width - (cols - 1) * gap) / cols;
} else {
if (this.col_cwidth){ if (this.col_cwidth){
cw = bricks.app.charsize * this.col_cwidth; cw = bricks.app.charsize * this.col_cwidth;
} else { } else {
cw = this.col_width; cw = this.col_width;
} }
gap = bricks.app.charsize * (this.col_cgap || 0.1);
if (width > 0){
if (bricks.is_mobile() && (width < this.get_height())){
cols = this.mobile_cols || 1;
} else {
cols = (width + gap) / (cw + gap)
}
cols = Math.floor(width/cw);
cw = (width - (cols - 1) * gap) / cols;
} }
this.dom_element.style.gridTemplateColumns = "repeat(auto-fill, minmax(" + cw + "px, 1fr))"; this.dom_element.style.gridTemplateColumns = "repeat(auto-fill, minmax(" + cw + "px, 1fr))";
this.set_style('gap', gap + 'px'); this.set_style('gap', gap + 'px');

16
bricks/popup.js
View File

@ -20,8 +20,7 @@ bricks.Popup = class extends bricks.VBox {
this.issub = false; this.issub = false;
this.opened = false; this.opened = false;
this.set_css('popup'); this.set_css('popup');
const zindex = bricks.app.new_zindex(); this.bring_to_top();
this.set_style('zIndex', zindex);
this.moving_w = this; this.moving_w = this;
this.content_box = new bricks.VBox({width:'100%', height:'100%'}); this.content_box = new bricks.VBox({width:'100%', height:'100%'});
this.content_box.set_style('display', 'flex'); this.content_box.set_style('display', 'flex');
@ -41,7 +40,20 @@ bricks.Popup = class extends bricks.VBox {
} }
this.set_style('display', 'none'); this.set_style('display', 'none');
bricks.Body.add_widget(this); bricks.Body.add_widget(this);
this.bind('click', this.bring_to_top.bind(this));
} }
bring_to_top(){
if (this == bricks.app.toppopup){
return;
}
if (bricks.app.toppopup)
bricks.app.toppopup.set_css('toppopup', true);
this.zindex = bricks.app.new_zindex();
this.set_style('zIndex', this.zindex);
this.set_css('toppopup');
bricks.app.toppopup = this;
}
setup_resizable(){ setup_resizable(){
this.resizable_w = new bricks.Icon({rate:1.5, url:bricks_resource('imgs/right-bottom-triangle.png')}); this.resizable_w = new bricks.Icon({rate:1.5, url:bricks_resource('imgs/right-bottom-triangle.png')});
super.add_widget(this.resizable_w); super.add_widget(this.resizable_w);