!456 发布 2.21.1 版本

sleeprite · sleeprite · commit 64cccc795778 · 2024-12-12T03:33:30.000Z
* feat: 发布 2.21.1 版本
* feat: update
* feat: 更新日志
* fix: 修复 table cell 内 progress 不显示的问题
* !455 fix(table): 切换defaultExpandAll异常
* Merge branch 'master' into 2.x
* !453 feat(layer): 新增moveEnd/resizeEnd返回值
diff --git a/docs/src/document/zh-CN/guide/changelog.md b/docs/src/document/zh-CN/guide/changelog.md
@@ -14,6 +14,16 @@
 <template>
   <lay-timeline>
     <lay-timeline-item title="2.21.x">
+      <ul>
+        <a name="2-21-1"></a>
+        <li>
+          <h3>2.21.1 <span class="layui-badge-rim">2024-12-11</span></h3>
+          <ul>
+              <li>[修复] table 组件 defaultExpandAll 切换异常。</li>
+              <li>[修复] table 组件 cell 内 progress 组件无法正常加载的问题。</li>
+          </ul>
+        </li>
+      </ul>
       <ul>
         <a name="2-21-0"></a>
         <li>
diff --git a/docs/vite.config.ts b/docs/vite.config.ts
@@ -9,10 +9,7 @@ export default defineConfig({
       "layui-component": path.resolve(__dirname, "../packages/component"),
       "layui-vue": path.resolve(__dirname, "../packages/layui"),
       "layui-layer": path.resolve(__dirname, "../packages/layer"),
-      "json-schema-form": path.resolve(
-        __dirname,
-        "../packages/json-schema-form"
-      ),
+      "json-schema-form": path.resolve(__dirname,"../packages/json-schema-form"),
     },
   },
   build: {
diff --git a/packages/component/component/table/__tests__/table.test.tsx b/packages/component/component/table/__tests__/table.test.tsx
@@ -121,4 +121,48 @@ describe("LayTable", () => {
     const colspan = td.attributes("colspan");
     expect(colspan).toBe("2");
   });
+
+  test("切换defaultExpandAll ", async () => {
+    const defaultExpandAll = ref(true);
+
+    const columns = [
+      { title: "姓名", width: "80px", key: "name", sort: "desc" },
+      { title: "状态", width: "180px", key: "status" },
+    ];
+    const dataSource = [
+      {
+        id: "1",
+        name: "张三",
+        children: [
+          {
+            id: "1-1",
+            name: "张三",
+          },
+        ],
+      },
+      { id: "2", name: "张三" },
+    ];
+    const wrapper = mount({
+      setup() {
+        return () => (
+          <LayTable
+            columns={columns}
+            dataSource={dataSource}
+            defaultExpandAll={defaultExpandAll.value}
+          ></LayTable>
+        );
+      },
+    });
+    await nextTick();
+
+    const trs1 = wrapper.findAll(".layui-table-body table tbody tr");
+    expect(trs1.length).toBe(3);
+
+    defaultExpandAll.value = false;
+
+    await nextTick();
+
+    const trs2 = wrapper.findAll(".layui-table-body table tbody tr");
+    expect(trs2.length).toBe(2);
+  });
 });
diff --git a/packages/component/component/table/index.less b/packages/component/component/table/index.less
@@ -650,6 +650,10 @@
   margin: 0;
 }
 
+.layui-table-cell-content > .layui-progress {
+  flex: 1;
+}
+
 .layui-table-view .layui-table-cell-number,
 .layui-table-view .layui-table-cell-radio,
 .layui-table-view .layui-table-cell-checkbox {
diff --git a/packages/component/component/table/index.vue b/packages/component/component/table/index.vue
@@ -321,6 +321,18 @@ watch(
   }
 );
 
+watch(
+  () => [props.defaultExpandAll],
+  () => {
+    if (!props.defaultExpandAll) {
+      tableExpandKeys.value = [];
+    }
+  },
+  {
+    deep: true,
+  }
+);
+
 const tableSelectedKey: WritableComputedRef<string> = computed({
   get() {
     return props.selectedKey;
diff --git a/packages/layui/package.json b/packages/layui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@layui/layui-vue",
-  "version": "2.21.0",
+  "version": "2.21.1",
   "author": "就眠儀式",
   "license": "MIT",
   "description": "a component library for Vue 3 base on layui-vue",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@layui/layui-vue",`
`3`		`- "version": "2.21.0",`
	`3`	`+ "version": "2.21.1",`
`4`	`4`	`"author": "就眠儀式",`
`5`	`5`	`"license": "MIT",`
`6`	`6`	`"description": "a component library for Vue 3 base on layui-vue",`