From 387fabbbce5bc905890efa6d77f37886f1cf1ebc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B4=A4=E5=BF=83?= <3277200+sentsim@users.noreply.github.com> Date: Mon, 18 Dec 2023 11:33:42 +0800 Subject: [PATCH 1/6] =?UTF-8?q?chore:=20=E5=9B=9E=E6=BB=9A=20CONTRIBUTING?= =?UTF-8?q?=20=E6=96=87=E4=BB=B6=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/ISSUE_TEMPLATE/bug-feature.yml | 2 +- .github/workflows/issue-labeled.yml | 2 +- .github/CONTRIBUTING.md => CONTRIBUTING.md | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename .github/CONTRIBUTING.md => CONTRIBUTING.md (100%) diff --git a/.github/ISSUE_TEMPLATE/bug-feature.yml b/.github/ISSUE_TEMPLATE/bug-feature.yml index d8d5a9ff..dd8c4a2c 100644 --- a/.github/ISSUE_TEMPLATE/bug-feature.yml +++ b/.github/ISSUE_TEMPLATE/bug-feature.yml @@ -10,7 +10,7 @@ body: required: true - label: 我确认已在 [Issues](https://github.com/layui/layui/issues?q=is%3Aissue ) 中搜索过类似的问题，但没有找到相关解决方案。 required: true - - label: 我已仔细阅读： 🍀[ Layui Issue 贡献指南](https://github.com/layui/layui/blob/main/.github/CONTRIBUTING.md) + - label: 我已仔细阅读： 🍀[ Layui Issue 贡献指南](https://github.com/layui/layui/blob/main/CONTRIBUTING.md) required: true - type: dropdown id: type diff --git a/.github/workflows/issue-labeled.yml b/.github/workflows/issue-labeled.yml index 86828ab2..ebb725fa 100644 --- a/.github/workflows/issue-labeled.yml +++ b/.github/workflows/issue-labeled.yml @@ -17,7 +17,7 @@ jobs: - name: content template id: template run: | - DIR_NAME="详见：🍀 [Layui Issue 贡献指南](https://github.com/layui/layui/blob/main/.github/CONTRIBUTING.md)" + DIR_NAME="详见：🍀 [Layui Issue 贡献指南](https://github.com/layui/layui/blob/main/CONTRIBUTING.md)" echo "CONTRIBUTING=$DIR_NAME" >> $GITHUB_OUTPUT - name: help wanted diff --git a/.github/CONTRIBUTING.md b/CONTRIBUTING.md similarity index 100% rename from .github/CONTRIBUTING.md rename to CONTRIBUTING.md From 9ee8a361cc7bb0752b341c0d9b547ccb524a06c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B4=A4=E5=BF=83?= <3277200+sentsim@users.noreply.github.com> Date: Mon, 18 Dec 2023 13:52:56 +0800 Subject: [PATCH 2/6] =?UTF-8?q?chore:=20=E6=9B=B4=E6=AD=A3=20Issue=20?= =?UTF-8?q?=E9=93=BE=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitee/ISSUE_TEMPLATE/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitee/ISSUE_TEMPLATE/config.yml b/.gitee/ISSUE_TEMPLATE/config.yml index 8f34eece..65ab8e19 100644 --- a/.gitee/ISSUE_TEMPLATE/config.yml +++ b/.gitee/ISSUE_TEMPLATE/config.yml @@ -1,7 +1,7 @@ blank_issues_enabled: false contact_links: - name: 😄 创建议题 - url: https://github.com/layui/layui/issues/new?template=bug.yml + url: https://github.com/layui/layui/issues/new?template=bug-feature.yml about: 为了加强 Issue 规范、提升沟通效率，Layui Issues 已统一在 Github 受理 - name: 📄 官方文档 url: https://layui.dev/ From 780bd490fb0d971dd3d0a337af13238493a89d02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B4=A4=E5=BF=83?= <3277200+sentsim@users.noreply.github.com> Date: Mon, 18 Dec 2023 13:53:38 +0800 Subject: [PATCH 3/6] =?UTF-8?q?docs(table):=20=E6=9B=B4=E6=AD=A3=E7=A4=BA?= =?UTF-8?q?=E4=BE=8B=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/table/index.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/table/index.md b/docs/table/index.md index 79caaf96..1a3ac49d 100644 --- a/docs/table/index.md +++ b/docs/table/index.md @@ -331,9 +331,9 @@ table.render({ // 获取选中行相关数据 var tableStatus = table.checkStatus('test'); -console.log(checkStatus.data) // 选中行的数据 -console.log(checkStatus.data.length) // 选中行数量，可作为是否有选中行的条件 -console.log(checkStatus.isAll ) // 表格是否全选 +console.log(tableStatus.data) // 选中行的数据 +console.log(tableStatus.data.length) // 选中行数量，可作为是否有选中行的条件 +console.log(tableStatus.isAll ) // 表格是否全选 ```

设置行选中状态 2.8+

From 1c177f297015c0d0dbdabe22558ffcf135b7daf1 Mon Sep 17 00:00:00 2001 From: morning-star <1453017105@qq.com> Date: Wed, 20 Dec 2023 10:19:44 +0800 Subject: [PATCH 4/6] =?UTF-8?q?fix(treetable):=20=E4=BF=AE=E5=A4=8D=20tree?= =?UTF-8?q?Table.updateNode()=20=E6=9B=B4=E6=96=B0=E5=B7=B2=E6=89=93?= =?UTF-8?q?=E5=BC=80=E7=9A=84=E8=8A=82=E7=82=B9=E6=97=B6=EF=BC=8C=E6=9C=AA?= =?UTF-8?q?=E9=87=8D=E6=96=B0=E6=B8=B2=E6=9F=93=E8=A1=A8=E5=8D=95=E5=85=83?= =?UTF-8?q?=E7=B4=A0=E7=9A=84=E9=97=AE=E9=A2=98=20(#1468)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit close #1463 --- src/modules/treeTable.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/modules/treeTable.js b/src/modules/treeTable.js index d8d3ad91..6b25496c 100644 --- a/src/modules/treeTable.js +++ b/src/modules/treeTable.js @@ -1037,6 +1037,10 @@ layui.define(['table'], function (exports) { trDefaultExpand.find('.layui-table-tree-flexIcon').html(treeOptionsView.flexIconOpen); expandNode({trElem: trDefaultExpand.first()}, true); }); + // #1463 expandNode 中已经展开过的节点不会重新渲染 + debounceFn('renderTreeTable2-' + tableId, function () { + form.render($('.layui-table-tree[lay-id="' + tableId + '"]')); + }, 0)(); } else { debounceFn('renderTreeTable-' + tableId, function () { options.hasNumberCol && formatNumber(that); From dc7183f7b4e6ed7e62df0a8edf4cccbf3f44618c Mon Sep 17 00:00:00 2001 From: morning-star <1453017105@qq.com> Date: Wed, 20 Dec 2023 14:54:46 +0800 Subject: [PATCH 5/6] =?UTF-8?q?fix(touch):=20=E4=BF=AE=E5=A4=8D=E7=A7=BB?= =?UTF-8?q?=E5=8A=A8=E7=AB=AF=20rate,=20carousel=20=E4=B8=80=E4=BA=9B?= =?UTF-8?q?=E5=B0=8F=E9=97=AE=E9=A2=98=20(#1469)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 修复 carousel 移动端滑动切换后，点击箭头切换异常的问题 * 修复 rate 移动端滑动时，评分文本未更新的问题 --- src/modules/lay.js | 3 +++ src/modules/rate.js | 1 + 2 files changed, 4 insertions(+) diff --git a/src/modules/lay.js b/src/modules/lay.js index 65dd2439..d4c3e3e0 100644 --- a/src/modules/lay.js +++ b/src/modules/lay.js @@ -568,9 +568,12 @@ var onStart = function(e){ if(e.touches.length !== 1) return; bindEvents(); + // 重置状态 state.timeStart = Date.now(); state.pointerStart.x = state.pointerEnd.x = e.touches[0].clientX; state.pointerStart.y = state.pointerEnd.y = e.touches[0].clientY; + state.distanceX = state.distanceY = 0; + state.direction = 'none' options.onTouchStart && options.onTouchStart(e, state); } diff --git a/src/modules/rate.js b/src/modules/rate.js index 7750a824..842a8080 100644 --- a/src/modules/rate.js +++ b/src/modules/rate.js @@ -253,6 +253,7 @@ layui.define(['jquery', 'lay'],function(exports){ // 更新最终值 options.value = score; + if(options.text) _ul.next("span").text(options.value + "星"); options.setText && options.setText(options.value); }, onTouchEnd: function(e, state){ From 83555710509b44145b8851f859db9f0483450a24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B4=A4=E5=BF=83?= <3277200+sentsim@users.noreply.github.com> Date: Wed, 20 Dec 2023 21:59:44 +0800 Subject: [PATCH 6/6] =?UTF-8?q?ci(close-issue):=20=E5=89=94=E9=99=A4=20`di?= =?UTF-8?q?scussion`=20=E6=A0=87=E7=AD=BE=E7=9A=84=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=85=B3=E9=97=AD=E7=9A=84=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=EF=BC=8C=E5=9B=A0=E4=B8=BA=E5=AE=83=E6=9C=AC=E8=BA=AB=E4=BC=9A?= =?UTF-8?q?=E5=85=B3=E9=97=AD=20issue?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/issue-close-require.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/issue-close-require.yml b/.github/workflows/issue-close-require.yml index 03ac5792..aaf5d0ea 100644 --- a/.github/workflows/issue-close-require.yml +++ b/.github/workflows/issue-close-require.yml @@ -22,9 +22,9 @@ jobs: inactive-day: 3 body: | 由于超过 3 天仍未收到相关重现或其他更多信息，该 issue 已被自动关闭。 - - name: Close inactive issues within 7 days + - name: Close issues with inactive days of 7 uses: actions-cool/issues-helper@v3 with: actions: 'close-issues' - labels: 'compatibility,discussion,resolved,unrelated,usage' + labels: 'compatibility,resolved,unrelated,usage' inactive-day: 7