From 4127eb025d8e992f749c6f8b52fdd87e470d6bc9 Mon Sep 17 00:00:00 2001 From: yumoqing Date: Fri, 28 Jun 2024 11:41:39 +0800 Subject: [PATCH] bugfix --- bricks/build.sh | 2 +- bricks/css/bricks.css | 4 ++++ bricks/dynamiccolumn.js | 15 +++++++-------- docs/.DS_Store | Bin 6148 -> 6148 bytes 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/bricks/build.sh b/bricks/build.sh index 041bd66..7daf8ee 100755 --- a/bricks/build.sh +++ b/bricks/build.sh @@ -4,7 +4,7 @@ SOURCES=" page_data_loader.js factory.js uitypesdef.js utils.js uitype.js \ markdown_viewer.js video.js audio.js toolbar.js tab.js \ input.js registerfunction.js button.js accordion.js \ tree.js multiple_state_image.js dynamiccolumn.js form.js message.js conform.js \ - paging.js datagrid.js iframe.js \ + paging.js datagrid.js iframe.js cols.js \ floaticonbar.js miniform.js wterm.js dynamicaccordion.js \ llm_dialog.js llm.js websocket.js datarow.js tabular.js " echo ${SOURCES} diff --git a/bricks/css/bricks.css b/bricks/css/bricks.css index ee658fa..972bb40 100755 --- a/bricks/css/bricks.css +++ b/bricks/css/bricks.css @@ -186,6 +186,10 @@ body { border: 1px solid #c1c1c1; } +.selected_record { + border-radius: 8px; + border: 1px solid #f00; +} .inputbox { background-color: #f8f8f8; color: #111111; diff --git a/bricks/dynamiccolumn.js b/bricks/dynamiccolumn.js index fdc4946..70c497e 100644 --- a/bricks/dynamiccolumn.js +++ b/bricks/dynamiccolumn.js @@ -19,14 +19,14 @@ bricks.DynamicColumn = class extends bricks.Layout { opts.mobile_cols = opts.mobile_cols|| 1; super(opts); this.set_style('display', 'grid'); - this.set_column_width(); + // this.set_column_width(); + this.bind('on_parent', this.set_column_width.bind(this)); this.bind('resize', this.set_column_width.bind(this)); if (this.cwidth){ bricks.app.bind('charsize', this.set_column_width.bind(this)); } } set_column_width(){ - bricks.debug('set_column_width() called ....'); var cw; var cols; var gap; @@ -36,13 +36,12 @@ bricks.DynamicColumn = class extends bricks.Layout { } else { cw = this.col_width; } - gap = bricks.app.charsize * this.col_cgap; + gap = bricks.app.charsize * (this.col_cgap || 0.1); if (width > 0){ - if (bricks.is_mobile()){ - if (width < this.get_height()){ - cw = (width - (cols - 1) * gap) / this.mobile_cols; - alert('here: width=' + width + ' height=' + this.get_height()) - } + 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; diff --git a/docs/.DS_Store b/docs/.DS_Store index 8bc2c8d170501a93f2efa02e4412b5c23033af00..39cb0f3bbaaf19a2906b549f1befd08b4005f9fc 100755 GIT binary patch delta 253 zcmZoMXfc@J&&azmU^g=(?_?ep>v|@JWQM$?^5TM|octsP28LZp1v#0;B?bo97@3$^ zSlQS)*g3d4VuLgC%Y#c2OG=BK5{sfiypa6-oFo`KF)1uFwLD%x#5q5&Br!8DwFs;s zGbI(MBqlsFFD1X+DZex?r5LO?7$U*J$&tVrFCbN2ZD?R