Merge pull request #11151 from zhangtao07/master

折叠容器折叠异常 & table2数据更新问题
baidu · Nov 4, 2024 · 05e6aa2 · 05e6aa2
2 parents e53d6d0 + 65a2448
commit 05e6aa2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/packages/amis/src/renderers/CollapseGroup.tsx b/packages/amis/src/renderers/CollapseGroup.tsx
@@ -78,7 +78,7 @@ export class CollapseGroupRender extends React.Component<
     collapseId: string | number,
     collapsed: boolean
   ) {
-    const {dispatchEvent, onCollapse} = this.props;
+    const {dispatchEvent} = this.props;
     const renderEvent = await dispatchEvent(
       'change',
       resolveEventData(this.props, {
@@ -90,7 +90,6 @@ export class CollapseGroupRender extends React.Component<
     if (renderEvent?.prevented) {
       return;
     }
-    onCollapse?.(activeKeys, collapseId, collapsed);
   }
 
   render() {

diff --git a/packages/amis/src/renderers/Form/FieldSet.tsx b/packages/amis/src/renderers/Form/FieldSet.tsx
@@ -116,8 +116,6 @@ export default class FieldSetControl extends React.Component<
     } = this.props;
 
     let props: any = {
-      store,
-      data: store?.data,
       render,
       disabled,
       formMode: subFormMode || formMode,

diff --git a/packages/amis/src/renderers/Table2/index.tsx b/packages/amis/src/renderers/Table2/index.tsx
@@ -1304,7 +1304,7 @@ export default class Table2 extends React.Component<Table2Props, object> {
       {
         data: {
           ...this.props.data,
-          record,
+          ...record,
           rowIndex
         }
       }
@@ -1580,7 +1580,11 @@ export default class Table2 extends React.Component<Table2Props, object> {
       dispatchEvent
     } = this.props;
     actions = Array.isArray(actions) ? actions.concat() : [];
-    const config = isObject(columnsTogglable) ? columnsTogglable : {};
+    const config = isObject(columnsTogglable)
+      ? columnsTogglable
+      : {
+          align: 'left'
+        };
 
     // 现在默认从crud里传进来的columnsTogglable是boolean类型
     // table单独配置的是SchemaNode类型