zydx-plus 1.12.45 → 1.12.48

package/package.json

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

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

@@ -82,7 +82,7 @@ export default defineComponent({
         config: {
           placeholder: props.placeholder,
           readOnly: props.readOnly,
-          autoFocus: false,
+          autoFocus: (props.html !== ''),
           MENU_CONF: {
             // 上传图片
             uploadImage: props.uploadImage,

package/src/components/flip/src/flip.vue

@@ -6,8 +6,8 @@
     <div class="book">
       <flipbook class="flipbook" :pages="imgArr" @flip-left-end="flipLeft" @flip-right-end="flipRight" v-slot="flipbook" :singlePage="singlePage" :ambient="0" :gloss="1" :dragToFlip="false" :pagesHiRes="0">
         <div class="but">
-          <button class="but-brown" @click="flipbook.flipLeft">上一页</button>
-          <button class="but-brown" @click="flipbook.flipRight">下一页</button>
+          <button class="but-brown" :class="{'but-act': pageIndex === 1}" @click="flipbook.flipLeft">上一页</button>
+          <button class="but-brown" :class="{'but-act': pageIndex === pdfPages}" @click="flipbook.flipRight">下一页</button>
         </div>
       </flipbook>
     </div>
@@ -25,7 +25,8 @@ export default {
     return {
       pdfPages: 0,
       imgArr: [],
-      hei: 0
+      hei: 0,
+      pageIndex: 1
     }
   },
   props: {
@@ -45,10 +46,18 @@ export default {
   },
   methods: {
     flipLeft(e) {
-      this.$emit('flip',e)
+      this.pageIndex = e
+      this.$emit('flip',{
+        page: e,
+        total: this.pdfPages
+      })
     },
     flipRight(e) {
-      this.$emit('flip',e)
+      this.pageIndex = e
+      this.$emit('flip',{
+        page: e,
+        total: this.pdfPages
+      })
     },
     readPdf() {
       let that = this
@@ -81,7 +90,7 @@ export default {
             const dataURL = canvas.toDataURL("image/jpeg",1); //获取Base64编码
             that.imgArr.push(dataURL)
           }
-        },0)
+        },100)
       })
     }
   }
@@ -131,4 +140,8 @@ export default {
     left: 0;
     z-index: -100;
   }
+  .but-act{
+    background-color: #bbbbbb;
+    color: #fff;
+  }
 </style>

package/src/components/tipBox/index.js

@@ -8,7 +8,7 @@ render(divNode, document.body)
 const container = divNode.el
 
 // 导出函数可通过调用 Confirm() 函数动态创建 XtxConfirm 组件
-const Confirm = ({ type, url ,title, promptContent, middle, cancelShow, inputArr }) => {
+const Confirm = ({ type, url ,title,radioArr, promptContent, middle, cancelShow, inputArr }) => {
     // 返回 Promise 对象
     return new Promise((resolve, reject) => {
         // 2. 点击确认按钮，触发resolve同时销毁组件
@@ -23,6 +23,13 @@ const Confirm = ({ type, url ,title, promptContent, middle, cancelShow, inputArr
                     }
                 }
             }
+            if(type === 'radio') {
+                for(let i=0; i< radioArr.length; i++) {
+                    if(radioArr[i].checked) {
+                        val.push(radioArr[i].value)
+                    }
+                }
+            }
             render(null, container)
             resolve(val)
         }
@@ -32,7 +39,7 @@ const Confirm = ({ type, url ,title, promptContent, middle, cancelShow, inputArr
             reject('点击取消')
         }
         // 1. 创建 XtxConfirm 组件
-        const VNode = createVNode(XtxConfirm, { type, url ,title, promptContent, middle, cancelShow, inputArr, submit, cancel })
+        const VNode = createVNode(XtxConfirm, { type, url ,title, promptContent,radioArr, middle, cancelShow, inputArr, submit, cancel })
         render(VNode, container)
     })
 }

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

@@ -12,6 +12,14 @@
                         <div class="tip-img" v-if="type === 'img'">
                             <img :src="url"/>
                         </div>
+                        <div v-if="type === 'radio'">
+                            <div class="radio-list" v-for="(item,index) in radioArr" :key="index">
+                                <label>
+                                    <input type="radio" name="radio" :value="item.value" :checked="item.checked" @change="radioTao(index)" />
+                                    <span>{{ item.label }}</span>
+                                </label>
+                            </div>
+                        </div>
                         <div class="tip-img" v-if="type === 'input'">
                             <div class="tip-input" v-for="(item,index) in inputArr" :key="index">
                                 <span v-if="item.name">{{ item.name }}</span>
@@ -85,6 +93,10 @@ export default {
             type: Array,
             default: []
         },
+        radioArr: { // 单选数据
+            type: Array,
+            default: []
+        },
         // 确认按钮
         submit: {
             type: Function,
@@ -98,6 +110,12 @@ export default {
         }
     },
     methods: {
+        radioTao(index){
+            this.radioArr.forEach(item => {
+                item.checked = false
+            })
+            this.radioArr[index].checked = true
+        },
         focus() {
             this.tip = true
         },

package/src/components/tipBox/src/zydxStyle.css

@@ -99,7 +99,6 @@ font-size: 12px;
   display: inline-block;
   line-height: 30px;
   padding-right: 10px;
-  min-width: 80px;
   text-align: right;
 }
 .tip-input input{
@@ -151,4 +150,21 @@ font-size: 12px;
   line-height: 30px;
   border: 0;
   border-left: 1px solid #ccc;
+}
+.radio-list{
+  padding: 10px 20px;
+  text-align: left;
+  font-size: 16px;
+  position: relative;
+}
+.radio-list span{
+  padding-left: 22px;
+}
+.radio-list input{
+  width: 16px;
+  height: 16px;
+  position: absolute;
+  top: 12px;
+  left: 20px;
+  z-index: 1;
 }

package/src/index.js

@@ -43,7 +43,7 @@ function install(app) {
 }
 
 export default {
-    version: '1.12.45',
+    version: '1.12.48',
     install,
     Calendar,
     Message,