zhangjie 1 an în urmă
părinte
comite
4f8e4912cb

+ 7 - 1
src/modules/card/components/CardDesign.vue

@@ -280,7 +280,13 @@ export default {
     ]),
     cardHeadSampleData() {
       if (!this.cardConfig["pageSize"]) return;
-      const data = getCardHeadModel(this.cardConfig);
+      const { templateInfo } = this.cardConfig;
+      let cardheadData = templateInfo.elements.find(
+        (item) => item.type === "CARD_HEAD"
+      );
+      cardheadData = cardheadData || {};
+      cardheadData = { ...this.cardConfig, ...cardheadData };
+      const data = getCardHeadModel(cardheadData);
       data.isSimple = true;
       return data;
     },

+ 9 - 2
src/modules/card/views/CardBuild.vue

@@ -55,10 +55,11 @@ import { getPageInitElements } from "../pageModel";
 import { buildCardFromPaperSimpleStruct } from "../autoBuild/simplePaperCard";
 import { saveCard } from "../api";
 import { getCardHeadModel } from "../elementModel";
+import CardHeadSample from "../elements/card-head/CardHead";
 
 export default {
   name: "CardBuild",
-  components: { CardView, TopicElementPreview },
+  components: { CardView, TopicElementPreview, CardHeadSample },
   data() {
     return {
       cardId: "",
@@ -74,7 +75,13 @@ export default {
     ]),
     cardHeadSampleData() {
       if (!this.cardConfig["pageSize"]) return;
-      const data = getCardHeadModel(this.cardConfig);
+      const { templateInfo } = this.cardConfig;
+      let cardheadData = templateInfo.elements.find(
+        (item) => item.type === "CARD_HEAD"
+      );
+      cardheadData = cardheadData || {};
+      cardheadData = { ...this.cardConfig, ...cardheadData };
+      const data = getCardHeadModel(cardheadData);
       data.isSimple = true;
       return data;
     },