@douyinfe/semi-foundation 2.55.0-beta.0 → 2.55.1

package/descriptions/foundation.ts

@@ -1,6 +1,8 @@
 import BaseFoundation, { DefaultAdapter } from '../base/foundation';
 
-export interface DescriptionsAdapter<P = Record<string, any>, S = Record<string, any>> extends DefaultAdapter<P, S> {}
+export interface DescriptionsAdapter<P = Record<string, any>, S = Record<string, any>> extends DefaultAdapter<P, S> {
+    getColumns: () => any[]
+}
 
 export default class DescriptionsFoundation<P = Record<string, any>, S = Record<string, any>> extends BaseFoundation<DescriptionsAdapter<P, S>, P, S> {
     constructor(adapter: DescriptionsAdapter<P, S>) {
@@ -9,16 +11,7 @@ export default class DescriptionsFoundation<P = Record<string, any>, S = Record<
 
     getHorizontalList() {
         const { column, data, children } = this.getProps();
-        let columns;
-        if (data?.length) {
-            columns = data || [];
-        } else {
-            columns =
-                children?.map(item => ({
-                    value: item.props.children,
-                    ...item.props,
-                })) || [];
-        }
+        const columns = this._adapter.getColumns();
         const horizontalList = [];
         const curSpan = { totalSpan: 0, itemList: [] };
         for (const item of columns) {
@@ -30,7 +23,19 @@ export default class DescriptionsFoundation<P = Record<string, any>, S = Record<
                 curSpan.totalSpan = 0;
             }
         }
-        if (curSpan.itemList.length != 0) horizontalList.push(curSpan.itemList);
+        if (curSpan.itemList.length != 0) {
+            const lastSpan = curSpan.itemList[curSpan.itemList.length - 1];
+            if (isNaN(lastSpan.span)) {
+                let total = 0;
+                curSpan.itemList.forEach(item=>{
+                    return total += !isNaN(item.span)?item.span:1;
+                });
+                if (total < column) {
+                    lastSpan.span = column - total + 1;
+                }
+            }
+            horizontalList.push(curSpan.itemList);
+        }
         return horizontalList;
     }
 }

package/lib/cjs/descriptions/foundation.d.ts

@@ -1,5 +1,6 @@
 import BaseFoundation, { DefaultAdapter } from '../base/foundation';
 export interface DescriptionsAdapter<P = Record<string, any>, S = Record<string, any>> extends DefaultAdapter<P, S> {
+    getColumns: () => any[];
 }
 export default class DescriptionsFoundation<P = Record<string, any>, S = Record<string, any>> extends BaseFoundation<DescriptionsAdapter<P, S>, P, S> {
     constructor(adapter: DescriptionsAdapter<P, S>);

package/lib/cjs/descriptions/foundation.js

@@ -16,14 +16,7 @@ class DescriptionsFoundation extends _foundation.default {
       data,
       children
     } = this.getProps();
-    let columns;
-    if (data === null || data === void 0 ? void 0 : data.length) {
-      columns = data || [];
-    } else {
-      columns = (children === null || children === void 0 ? void 0 : children.map(item => Object.assign({
-        value: item.props.children
-      }, item.props))) || [];
-    }
+    const columns = this._adapter.getColumns();
     const horizontalList = [];
     const curSpan = {
       totalSpan: 0,
@@ -38,7 +31,19 @@ class DescriptionsFoundation extends _foundation.default {
         curSpan.totalSpan = 0;
       }
     }
-    if (curSpan.itemList.length != 0) horizontalList.push(curSpan.itemList);
+    if (curSpan.itemList.length != 0) {
+      const lastSpan = curSpan.itemList[curSpan.itemList.length - 1];
+      if (isNaN(lastSpan.span)) {
+        let total = 0;
+        curSpan.itemList.forEach(item => {
+          return total += !isNaN(item.span) ? item.span : 1;
+        });
+        if (total < column) {
+          lastSpan.span = column - total + 1;
+        }
+      }
+      horizontalList.push(curSpan.itemList);
+    }
     return horizontalList;
   }
 }

package/lib/cjs/table/foundation.js

@@ -790,7 +790,7 @@ class TableFoundation extends _foundation.default {
       }
       return true;
     } else {
-      const isAllSelected = allKeys.every(rowKey => selectedRowKeysSet.has(rowKey));
+      const isAllSelected = allKeys.length && allKeys.every(rowKey => selectedRowKeysSet.has(rowKey));
       return isAllSelected || false;
     }
   }

package/lib/es/descriptions/foundation.d.ts

@@ -1,5 +1,6 @@
 import BaseFoundation, { DefaultAdapter } from '../base/foundation';
 export interface DescriptionsAdapter<P = Record<string, any>, S = Record<string, any>> extends DefaultAdapter<P, S> {
+    getColumns: () => any[];
 }
 export default class DescriptionsFoundation<P = Record<string, any>, S = Record<string, any>> extends BaseFoundation<DescriptionsAdapter<P, S>, P, S> {
     constructor(adapter: DescriptionsAdapter<P, S>);

package/lib/es/descriptions/foundation.js

@@ -9,14 +9,7 @@ export default class DescriptionsFoundation extends BaseFoundation {
       data,
       children
     } = this.getProps();
-    let columns;
-    if (data === null || data === void 0 ? void 0 : data.length) {
-      columns = data || [];
-    } else {
-      columns = (children === null || children === void 0 ? void 0 : children.map(item => Object.assign({
-        value: item.props.children
-      }, item.props))) || [];
-    }
+    const columns = this._adapter.getColumns();
     const horizontalList = [];
     const curSpan = {
       totalSpan: 0,
@@ -31,7 +24,19 @@ export default class DescriptionsFoundation extends BaseFoundation {
         curSpan.totalSpan = 0;
       }
     }
-    if (curSpan.itemList.length != 0) horizontalList.push(curSpan.itemList);
+    if (curSpan.itemList.length != 0) {
+      const lastSpan = curSpan.itemList[curSpan.itemList.length - 1];
+      if (isNaN(lastSpan.span)) {
+        let total = 0;
+        curSpan.itemList.forEach(item => {
+          return total += !isNaN(item.span) ? item.span : 1;
+        });
+        if (total < column) {
+          lastSpan.span = column - total + 1;
+        }
+      }
+      horizontalList.push(curSpan.itemList);
+    }
     return horizontalList;
   }
 }

package/lib/es/table/foundation.js

@@ -783,7 +783,7 @@ class TableFoundation extends BaseFoundation {
       }
       return true;
     } else {
-      const isAllSelected = allKeys.every(rowKey => selectedRowKeysSet.has(rowKey));
+      const isAllSelected = allKeys.length && allKeys.every(rowKey => selectedRowKeysSet.has(rowKey));
       return isAllSelected || false;
     }
   }

package/package.json

@@ -1,13 +1,13 @@
 {
     "name": "@douyinfe/semi-foundation",
-    "version": "2.55.0-beta.0",
+    "version": "2.55.1",
     "description": "",
     "scripts": {
         "build:lib": "node ./scripts/compileLib.js",
         "prepublishOnly": "npm run build:lib"
     },
     "dependencies": {
-        "@douyinfe/semi-animation": "2.55.0-beta.0",
+        "@douyinfe/semi-animation": "2.55.1",
         "async-validator": "^3.5.0",
         "classnames": "^2.2.6",
         "date-fns": "^2.29.3",
@@ -24,7 +24,7 @@
         "*.scss",
         "*.css"
     ],
-    "gitHead": "1b20ba60f41785e247a71987235b5f3bbd577ff0",
+    "gitHead": "d74bd5368afc88bc49abc4ba432be9dd74fa707b",
     "devDependencies": {
         "@babel/plugin-transform-runtime": "^7.15.8",
         "@babel/preset-env": "^7.15.8",

package/table/foundation.ts

@@ -988,7 +988,7 @@ class TableFoundation<RecordType> extends BaseFoundation<TableAdapter<RecordType
             }
             return true;
         } else {
-            const isAllSelected = allKeys.every(rowKey => selectedRowKeysSet.has(rowKey));
+            const isAllSelected = allKeys.length && allKeys.every(rowKey => selectedRowKeysSet.has(rowKey));
             return isAllSelected || false;
         }
     }