fix: 修复 card 组件渲染异常 Close: #10229

baidu · May 17, 2024 · 6bf2de5 · 6bf2de5
1 parent 3eacf02
commit 6bf2de5
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/packages/amis-core/src/utils/style-helper.ts b/packages/amis-core/src/utils/style-helper.ts
@@ -451,9 +451,12 @@ export function insertEditCustomStyle(params: {
 
   insertStyle({
     style: content,
-    classId: 'wrapperCustomStyle-' + (id?.replace('u:', '') || uuid()) + index,
+    classId:
+      'wrapperCustomStyle-' +
+      ((typeof id === 'string' ? id.replace('u:', '') : '') || uuid()) +
+      index,
     doc,
-    id: id?.replace('u:', '').replace(/(-.*)/, '')
+    id: typeof id === 'string' ? id.replace('u:', '').replace(/(-.*)/, '') : ''
   });
 }
 
@@ -475,6 +478,10 @@ export function removeCustomStyle(
   doc?: Document,
   data?: any
 ) {
+  if (typeof id !== 'string') {
+    debugger;
+  }
+
   let styleId = 'amis-' + (type ? type + '-' : '') + id.replace('u:', '');
   if (typeof data?.index === 'number') {
     styleId += `-${data.index}`;

diff --git a/packages/amis/src/renderers/Card.tsx b/packages/amis/src/renderers/Card.tsx
@@ -595,7 +595,11 @@ export class CardRenderer extends React.Component<CardProps> {
       const {subTitle: subTitleTpl} = header || {};
 
       // const subTitle = filter(subTitleTpl, data);
-      return subTitleTpl ? render('sub-title', subTitleTpl, data) : undefined;
+      return subTitleTpl
+        ? render('sub-title', subTitleTpl, {
+            data
+          })
+        : undefined;
     }
     return;
   }