Merge branch 'master' of http://192.168.4.246:3000/zhangs/surveyMaker

src/components/EditPanel.vue

@@ -269,8 +269,7 @@
             </el-select>
           </div>
         </div>
-        <div style="text-align: left;border-bottom: #E2E4EE solid 1px; width: 100%;padding-left: 20px;"
-          v-show="panelState != 13">
+        <div style="text-align: left;border-bottom: #E2E4EE solid 1px; width: 100%;padding-left: 20px;">
           <div style="display: inline-flex; margin-left: -6px" v-show="panelState == 11">
             <el-checkbox v-model="element.fontWeight" true-label="bold" false-label="normal">加粗</el-checkbox>
           </div>

src/components/Element/FrameElement.vue

@@ -31,12 +31,16 @@
               </mt-swipe>
               <!--<img style="width:100%;height:100%;" :src="element.imgSrc">-->
             </MorePicElement>
-
+            <!-- 单图元素 -->
+            <ButtonElement :stopEvent="true" :type="type" v-if="element.type==='button'" :class="[element.playing?'animated ' + element.animatedName:'',element.loop?'infinite':'']" :element="element"
+                        :style="{transform:'rotate('+element.transform+'deg)','z-index':element.zindex,opacity:element.opacity/100,width:element.width+'px',height:element.height+'px',top:element.top+'px',left:element.left + 'px','animation-duration':element.duration + 's','-webkit-animation-duration':element.duration + 's','animation-delay':element.delay + 's','-webkit-animation-delay':element.delay + 's'}">
+              <img style="width:100%;height:100%;" :src="element.imgSrc">
+            </ButtonElement>
             <!--<FrameElement :stopEvent="true" class="element" v-if="element.type === 'frame'" :element="element" :children="element.children" :style="elementPosition(element)">-->
               <!--<div style="width:394px;height:394px;"></div>-->
             <!--</FrameElement>-->
           </div>
-        </template>
+        </template> 
       </div>
     </section>
   </div>
@@ -46,9 +50,11 @@
   import Operate from '../Operate'
   import appConst from '../../util/appConst'
   import PicElement from './PicElement'
+  import ButtonElement from './ButtonElement'
   import FontElement from './FontElement'
   import ShapesElement from './ShapesElement'
   import MorePicElement from './morePicElement'
+  
   export default{
     props: {
       element: {
@@ -319,7 +325,7 @@
       }
     },
     components: {
-      Operate,PicElement, FontElement, ShapesElement, MorePicElement
+      Operate,PicElement, FontElement, ShapesElement, MorePicElement,ButtonElement
     }
   }
 </script>