zhangjie пре 2 година
родитељ
комит
eacf8debe8
2 измењених фајлова са 13 додато и 8 уклоњено
  1. 7 3
      src/modules/card/views/CardEdit.vue
  2. 6 5
      src/modules/card/views/CardPreview.vue

+ 7 - 3
src/modules/card/views/CardEdit.vue

@@ -217,8 +217,8 @@ export default {
       this.cardPreviewUrl = href;
     },
     registWindowSubmit() {
-      window.submitCardTemp = async (model, cardImages) => {
-        if (!model || !cardImages || !cardImages.length) {
+      window.submitCardTemp = async (model, cardImages, cardContentTemp) => {
+        if (!model || !cardImages || !cardImages.length || !cardContentTemp) {
           this.$refs.CardDesign.unloading();
           window.cardData = null;
           this.cardPreviewUrl = "";
@@ -226,7 +226,11 @@ export default {
           return;
         }
 
-        let datas = { content: model, images: cardImages };
+        let datas = {
+          content: model,
+          images: cardImages,
+          htmlContent: cardContentTemp,
+        };
         datas.id = this.cardId;
         datas.formal = true;
         let saveFunc = null;

+ 6 - 5
src/modules/card/views/CardPreview.vue

@@ -60,20 +60,21 @@ export default {
       });
     },
     async buildData(cardData) {
-      // const cardContentTemp = this.$refs.CardView.getPreviewTemp(
-      //   this.$el.outerHTML
-      // );
+      const cardContentTemp = this.$refs.CardView.getPreviewTemp(
+        this.$el.outerHTML
+      );
+      // console.log(cardContentTemp);
       const cardImages = await this.transformImags().catch(() => {});
       try {
         const model = this.$refs.CardView.getPageModel(cardData);
         window.parent &&
           window.parent.submitCardTemp &&
-          window.parent.submitCardTemp(model, cardImages);
+          window.parent.submitCardTemp(model, cardImages, cardContentTemp);
       } catch (error) {
         console.dir(error);
         window.parent &&
           window.parent.submitCardTemp &&
-          window.parent.submitCardTemp("", "");
+          window.parent.submitCardTemp("", "", "");
       }
     },
     async init() {