zydx-plus 1.19.97 → 1.19.99

package/package.json

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

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

@@ -180,7 +180,7 @@ export default {
                 Image.configure({
                     inline: true,
                     HTMLAttributes: {
-                        width: '100%'
+                        class: 'editor-img'
                     }
                 }),
             ],
@@ -258,7 +258,7 @@ export default {
                                     },
                                     tag: 'img',
                                     node: "element",
-                                }]
+                                }],
                             }
                         ]
                         this.insertContent(html)
@@ -267,8 +267,8 @@ export default {
             }else {
                 this.uploadFile(file,(v === 'uploadAtt')? this.uploadAttachment: this.uploadImage).then(r => {
                     if(v === 'uploadAtt') {
-                        r.data.active = true
-                        this.uploadAttData.push(r.data)
+                        r.data.annex.active = true
+                        this.uploadAttData.push(r.data.annex)
                     }else {
                         const url = this.uploadImage.url + r.data
                         const html = [
@@ -350,6 +350,9 @@ export default {
 </script>
 
 <style scoped>
+:deep(.editor-img){
+    max-width: 100%;
+}
 .editor-but{
     text-align: right;
     margin: 10px 0;

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

@@ -25,6 +25,11 @@
                 <button class="but-brown" :disabled="pageIndex === pdfPages" :class="{'but-act': pageIndex === pdfPages}" @click="flipRight(pageIndex+=1,false)">下一页</button>
             </div>
         </div>
+        <div v-if="loading" class="loading-back">
+            <div class="loading-cont">
+                <div class="loading">Loading</div>
+            </div>
+        </div>
     </div>
 </template>
 
@@ -45,7 +50,8 @@ export default {
             pages: false,
             pagesData: [],
             opacity: 1,
-            id: null
+            id: null,
+            loading: false
         }
     },
     props: {
@@ -110,6 +116,7 @@ export default {
         },
         readPdf() {
             let that = this
+            that.loading = true
             const loadingTask = PdfJs.getDocument(this.source)
             loadingTask.promise.then((pdf) => {
                 that.pdfPages = pdf.numPages // 获取pdf文件的总页数
@@ -127,6 +134,7 @@ export default {
                         transform: [2, 0, 0, 2, 0, 0]//这里会进行放大，解决模糊问题
                     }
                     page.render(renderContext)
+                    that.loading = false
                 })
             })
         }
@@ -179,6 +187,7 @@ export default {
 }
 .docView{
     height: 100%;
+    position: relative;
 }
 .but-brown{
     background-color: #c64c10;
@@ -200,4 +209,50 @@ export default {
     background-color: #bbbbbb;
     color: #fff;
 }
+.loading-back{
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    z-index: 100;
+    display: flex;
+    align-items: center;
+}
+.loading-cont{
+    display: inline-block;
+    margin: 0 auto;
+}
+.loading {
+    display: inline-block;
+    font-size: 28px;
+    font-family: Arial, Helvetica, sans-serif;
+    font-weight: bold;
+    color: #fff;
+    text-shadow: 0 0 2px #ff3d00, 0 0 1px #ff3d00, 0 0 1px #ff3d00;
+    letter-spacing: 2px;
+    position: relative;
+}
+
+.loading::after {
+    content: "Loading";
+    position: absolute;
+    left: 0;
+    top: 0;
+    color: #ff3d00;
+    width: 0%;
+    height: 100%;
+    overflow: hidden;
+    animation: loading-animation 6s linear infinite;
+}
+
+@keyframes loading-animation {
+    0% {
+        width: 0%;
+    }
+
+    100% {
+        width: 100%;
+    }
+}
 </style>

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

@@ -25,13 +25,13 @@
                             <div class="tip-input" v-for="(item,index) in inputArr" :key="index">
                                 <span v-if="item.name">{{ item.name }}</span>
                                 <div style="display: inline-block;" v-if="item.type === 'input'">
-                                    <input v-if="!item.number" type="text" :placeholder="item.placeholder"
-                                           v-model="item.value" :disabled="item.disabled"/>
-                                    <div v-else class="number-input">
+                                    <div v-if="item.number" class="number-input">
                                         <input type="number" @keypress="isNumberKey($event,index)"
                                                :placeholder="item.placeholder"
                                                v-model="item.value" :disabled="item.disabled"/>
                                     </div>
+                                    <input v-else type="text" :placeholder="item.placeholder"
+                                           v-model="item.value" :disabled="item.disabled"/>
                                 </div>
                                 <div style="display: inline-block;">
                                     <Select v-if="item.type === 'select'" :options="item.option"
@@ -66,20 +66,6 @@
 <script>
 import Select from '../../select/src/select.vue'
 import Calendar from '../../calendar/src/Calendar'
-function isNumberKey(evt) {
-    var charCode = (evt.which) ? evt.which : event.keyCode;
-    if (charCode === 46) {
-        // Check if the text already contains a decimal point
-        return evt.target.value.indexOf('.') === -1;
-    } else if (charCode > 31 && (charCode < 48 || charCode > 57))
-        return false;
-
-    // Check if the first character is zero
-    return !(evt.target.value === '' && String.fromCharCode(charCode) === '0');
-
-
-}
-
 
 export default {
     name: 'zydx-tip-box',
@@ -137,8 +123,10 @@ export default {
     methods: {
         isNumberKey(evt,index) {
             const charCode = (evt.which) ? evt.which : event.keyCode;
+            if(this.inputArr[index].value === undefined) return true
+            let val = this.inputArr[index].value.toString()
             if (charCode === 46) {
-                if (this.inputArr[index].value.indexOf('.') !== -1)
+                if (val.indexOf('.') !== -1)
                     evt.preventDefault();
                 else
                     return true;
@@ -148,10 +136,8 @@ export default {
             if (this.valueState(this.inputArr[index].value) && String.fromCharCode(charCode) === '0')
                 evt.preventDefault();
             // 判断是否有小数点
-            if(this.inputArr[index].value === undefined) return true
-            if (this.inputArr[index].value.indexOf('.') !== -1) {
-                // 判断小数点的位数
-                if (this.inputArr[index].value.split('.')[1].length >= 1) {
+            if (val.indexOf('.') !== -1) {
+                if (val[1].length >= 1) {
                     evt.preventDefault();
                 }
             }

package/src/index.js

@@ -57,7 +57,7 @@ function install(app) {
 }
 
 export default {
-    version: '1.19.97',
+    version: '1.19.99',
     install,
     Calendar,
     Message,