fix page preview bug

4xmen · May 24, 2021 · f24d7fc · f24d7fc
1 parent 21c964b
commit f24d7fc
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 22 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "anubias",
-  "version": "0.2.1",
+  "version": "0.3.1",
   "private": true,
   "description": "anubias desktop application",
   "author": {

diff --git a/src/components/elements/PageElement.vue b/src/components/elements/PageElement.vue
@@ -1,8 +1,9 @@
 <!--page symbol for element of list of pages-->
 <template>
   <div id="page" :class="active?'active':''">
-    <div id="page-content">
+    <div id="page-content" :style="'background:'+bg">
       <img :src="image !== undefined ? image:''" alt="no preview">
+      <slot></slot>
     </div>
     <h3 id="page-title">
       <span :class="{main:isMain}">
@@ -19,7 +20,8 @@ export default {
     'title',
     'active',
     'isMain',
-    'image'
+    'image',
+    'bg'
   ]
 }
 </script>
@@ -54,7 +56,8 @@ export default {
   overflow: hidden;
   overflow-y: scroll;
 }
-#page-content img{
+
+#page-content img {
   max-width: 100%;
 }
 

diff --git a/src/components/elements/PropertyElement.vue b/src/components/elements/PropertyElement.vue
@@ -91,11 +91,14 @@ import {fnc} from '@/assets/js/functions';
 export default {
   name: "PropertyElement",
   mounted() {
+    var setme ;
     var $ = window.jQuery;
     let updatePreview=function () {
-      setTimeout(function () {
+      clearTimeout(setme);
+      setme = setTimeout(function () {
+        console.log('exet');
         fnc.takeScreenShot("#preview",function (e) {
-          self.page.image = e;
+          window.appData.pages[self.page].image = e;
         });
       },300);
     };
@@ -118,10 +121,8 @@ export default {
       type: Object
     },
     page: {
-      default: function () {
-        return {}
-      },
-      type: Object
+      default:0,
+      type: Number
     }
   }, methods: {
     nameCheck: function (e, isBlur) {

diff --git a/src/components/pages/MainAppPage.vue b/src/components/pages/MainAppPage.vue
@@ -71,22 +71,26 @@
           <!-- make device size and scale -->
           <!-- bgcolor and text color apply -->
           <div id="mobile" :style="'width:'+(display.landscape?display.height:display.width  )* display.scale
-               +'px;height:'+(display.landscape?display.width:display.height  ) * display.scale+'px'" :class="(data.pages.length < 1?'inactive':'')">
-            <div id="preview" :style="';background-color:'+(data.project.isDark?'#2e2e2e':data.project.bgColor)
-               +';color:'+(data.project.isDark?'white':data.project.textColor)+' !important' ">
+               +'px;height:'+(display.landscape?display.width:display.height  ) * display.scale+'px;'+'background-color:'+(data.project.isDark?'#2e2e2e':data.project.bgColor)
+               +';color:'+(data.project.isDark?'white':data.project.textColor)+' !important' "
+               :class="(data.pages.length < 1?'inactive':'')">
 
-              <!-- direction of project and page padding -->
-              <div id="dir"
-                   :style="'direction:'+(data.project.isRTL?'rtl':'ltr')+';padding:'+calcPadding(data.pages[currentPage].padding,this.display.scale)">
-                <!-- visual components of page -->
-                <div
-                    v-if="data.pages[currentPage] !== undefined && data.pages[currentPage].children.visual !== undefined">
+            <div id="preview">
+              <div :style="'background-color:'+(data.project.isDark?'#2e2e2e':data.project.bgColor)
+               +';color:'+(data.project.isDark?'white':data.project.textColor)+' !important' ">
+                <!-- direction of project and page padding -->
+                <div id="dir"
+                     :style="'direction:'+(data.project.isRTL?'rtl':'ltr')+';padding:'+calcPadding(data.pages[currentPage].padding,this.display.scale)">
+                  <!-- visual components of page -->
+                  <div
+                      v-if="data.pages[currentPage] !== undefined && data.pages[currentPage].children.visual !== undefined">
                 <span v-for="(comp,i) in data.pages[currentPage].children.visual"
                       :key="i">
                   <simulator @dblclick.native="removeVisual(i)" @click.native="currentProperties = comp;"
                              :type="comp.type" :properties="comp" :scale="display.scale"
                              :page="data.pages[currentPage]"></simulator>
                 </span>
+                  </div>
                 </div>
 
                 <drop class="drop visual" @drop="onVisualDrop" :accepts-data="(n) => isVisual(n)"></drop>
@@ -126,7 +130,7 @@
         </h2>
         <!-- if project init sho properties-->
         <div v-if="isInitProject">
-          <property :properties="currentProperties" :page="data.pages[currentPage]"></property>
+          <property :properties="currentProperties" :page="currentPage"></property>
         </div>
         <div v-else class="text-center">
           <img src="../../assets/img/logo.svg" class="logo-sm" alt="">
@@ -140,7 +144,7 @@
           <!-- list of pages -->
           <page v-for="(page,i) in data.pages" :image="page.image!= undefined? page.image: null"
                 :isMain="data.project.mainPage === i" @click.native="changePage(i)" :key="i" :title="page.name"
-                :active="currentPage === i">
+                :active="currentPage === i" :bg="(data.project.isDark?'#2e2e2e':data.project.bgColor)">
             <i class="fa fa-times" @click="removePage(i)"></i>
           </page>
           <i class="fa fa-plus-circle" id="page-add" @click="newPage"></i>
@@ -300,9 +304,10 @@ export default {
         }
       } while (nextName);
       visuals[visuals.length - 1].name = component.type + i.toString();
-
+      // update page preview
       setTimeout(function () {
         fnc.takeScreenShot("#preview", function (e) {
+          console.log(self.data.pages[self.currentPage].name);
           self.data.pages[self.currentPage].image = e;
         });
       }, 1000);
@@ -443,6 +448,7 @@ export default {
   top: 0;
   color: red;
   font-size: 18px;
+  z-index: 999;
 }
 
 #page-add {