zydx-plus 1.35.518 → 1.35.520

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zydx-plus",
-  "version": "1.35.518",
+  "version": "1.35.520",
   "description": "Vue.js",
   "main": "src/index.js",
   "files": [

package/src/components/dragPopup/src/dragPopup.vue

@@ -87,9 +87,10 @@ export default {
       type: String,
       default: 'rgba(75, 12, 119, 1)'
     },
+    // 修改拖拽弹窗默认高度，不需要下面30px
     dragStatus: {
       type: Boolean,
-      default: true
+      default: false
     },
     enlargeShow: {
       type: Boolean,
@@ -103,9 +104,10 @@ export default {
       type: String,
       default: ''
     },
+    // 修改拖拽弹窗默认高度，不需要下面30px
     dragTextShow: {
       type: Boolean,
-      default: true
+      default: false
     },
     minimize: {
       type: Boolean,

package/src/components/dragPopup2/src/dragPopup.vue

@@ -88,9 +88,10 @@ export default {
       type: String,
       default: 'rgba(75, 12, 119, 1)'
     },
+    // 修改拖拽弹窗默认高度，不需要下面30px
     dragStatus: {
       type: Boolean,
-      default: true
+      default: false
     },
     enlargeShow: {
       type: Boolean,
@@ -104,9 +105,10 @@ export default {
       type: String,
       default: ''
     },
+    // 修改拖拽弹窗默认高度，不需要下面30px
     dragTextShow: {
       type: Boolean,
-      default: true
+      default: false
     },
     minimize: {
       type: Boolean,

package/src/components/editor/src/editor.vue

@@ -118,7 +118,7 @@
 
     <div v-if="page&&readOnly" class="read-only" ref="read-only">
       <!--      :style="{width: (wit + 20) + 'px'}"-->
-      <div v-if="signMenuShow" class="editing-header">
+      <div v-if="signMenuShow" class="editing-header only-logo">
         <img :src="menusData('signMenu')?.ico" alt=""/>
         <span>{{ menusData('signMenu')?.text }}</span>
       </div>
@@ -4344,11 +4344,16 @@ label {
   display: flex;
   z-index: 1;
 }
+.only-logo{
+  left: 15px !important;
+}
 
 .editing-header img {
   width: 15px;
   height: 15px;
   margin-right: 5px;
+  position: relative;
+  top: 2px;
 }
 
 .editing-header span {

package/src/components/paint/src/paint.vue

@@ -4,7 +4,7 @@
       <div class="paint" :id="ids">
         <div class="paint-title"></div>
         <div class="paint-cont">
-          <Sketchpad ref="sketchpad" :top="false"></Sketchpad>
+          <Sketchpad v-if="sketchpadShow" ref="sketchpad" :top="false"></Sketchpad>
         </div>
         <div class="paint-buts">
           <button class="buts" @click="exportTap">确定</button>
@@ -214,7 +214,8 @@ export default {
       ctx: null,
       canvasEle: null,
       appData: '',
-      full: false
+      full: false,
+      sketchpadShow: true
     }
   },
   props: {
@@ -314,14 +315,12 @@ export default {
       // 清屏
       if (this.toolId === 'clear') {
         this.$refs.sketchpad.clear()
-        // setTimeout(() => { // 解决清屏篡位的问题
-        //   this.width = this.width2 - 0.02
-        //   this.height = this.height2 - 0.02
-        //   setTimeout(() => {
-        //     this.width2 = this.width
-        //     this.height2 = this.height
-        //   },10)
-        // },10)
+        setTimeout(() => { // 解决清屏篡位的问题
+          this.sketchpadShow = false
+          setTimeout(() => {
+            this.sketchpadShow = true
+          },10)
+        },10)
       }
       // 橡皮
       if (this.toolId === 'rubber') {

package/src/components/tipBox/src/main.vue

@@ -83,7 +83,7 @@
                 </div>
                 <div v-if="item.type === 'select'" style="display: inline-block;width: 300px;">
                   <Select :options="item.option" :readonly="item.disabled" @select="item.select"
-                          v-model:value="item.selectValue"></Select>
+                          v-model:value="item.selectValue" :placeholder="item.placeholder"></Select>
                 </div>
                 <div class="cal" v-if="item.type === 'calender'">
                   <input type="text" :placeholder="item.placeholder" @focus="focus" :maxlength="item.maxlength"

package/src/index.js

@@ -89,7 +89,7 @@ function install(app) {
 }
 
 export default {
-    version: '1.35.518',
+    version: '1.35.520',
     install,
     Calendar,
     Message,