fstarter 2.10.45 → 2.10.48

package/src/plugins/components/BSVerCode.vue

@@ -1,135 +1,129 @@
-<template>
-
-  <van-field
-    :label="model.label"
-    v-model="model.value"
-    :placeholder="sent === 'leave' ?model.placeholder:''"
-    slot="button"
-    @blur="blur"
-    :class="ctlClass"
-    :clearable="model.clearable"
-    :error-message="model.hiddenValidate ? '': model.validateResult.message"
-  >
-    <van-button slot="button" @click="sendVerCode" :disabled="modelData.disabled">{{model.sendButtonLabel}}</van-button>
-  </van-field>
-
-</template>
-
-<script>
-
-    import  Rx from 'rxjs';
-    import {take} from 'rxjs/operators';
-    import { filter } from 'rxjs/operators';
-    import base2 from './base2.js'
-
-    export default {
-        name: "bs-vercode",
-        mixins: [base2],
-        props: {
-
-        },
-        data() {
-          return {
-            validateCtl:true,
-            sent: 'leave'
-          }
-        },
-        mounted() {
-
-
-        },
-        methods: {
-          createDefaultModel() {
-            return {
-              type:'BSVerCode',
-              value:'',
-              placeholder:'lang.ctl.BSVerCode.placeholder',
-              sendButtonLabel:'lang.ctl.BSVerCode.sendButtonLabel',
-              expiredTime:60,
-              expiredLabel:'{0}s',
-              disabled: false
-            };
-          },
-          sendVerCode(){
-            debugger
-            if(this.sent === 'sending'){
-              return
-            }
-
-            let self = this
-            this.$emit('send-verCode',function(){
-              
-              debugger
-              self.sent = 'sending'
-              self.model.expiredTime = self.modelData.expiredTime
-              
-              var source = Rx.Observable.timer(0, 1000)
-
-              source = source.pipe(take(self.modelData.expiredTime)).pipe(filter(num => self.sent === 'sending'));
-
-              source.subscribe({
-                  next: function(value) {
-                    // self.sent = true
-                    self.model.expiredTime = self.model.expiredTime - 1
-                    self.model.sendButtonLabel = self.modelData.expiredLabel.format(self.model.expiredTime)
-                    // self.sent = false
-                    
-                  },
-                  complete: function() {
-                    
-                    self.model.sendButtonLabel = self.modelData.sendButtonLabel
-                    self.sent = 'leave'
-                    self.model.value = ''
-                  },
-                  error: function(error) {
-                    console.log('Throw Error: ' + error)
-                  }
-              });
-
-            },this.fullName)
-
-          },
-          reset(){
-    
-            this.sent = 'leave'
-            this.model.label = this.modelData.label
-            this.model.disabled = this.modelData.disabled
-            this.model.value = this.modelData.value
-            this.model.placeholder = this.modelData.placeholder
-            this.model.sendButtonLabel= this.modelData.sendButtonLabel
-            this.model.expiredTime = this.modelData.expiredTime
-            this.model.expiredLabel = this.modelData.expiredLabel
-            
-          },
-          blur(){
-
-            if(!this.model.readonly)
-              this.model.validateToken++
-
-            this.$emit('blur',function(){
-
-            },this.fullName)
-
-          }
-        },
-      watch:{
-        'model.value':{
-          handler(val,oldval){
-
-            this.setEventString(this.fullName,this.sname,'value',val,oldval)
-          },
-          deep: false
-        }
-      }
-
-    }
-
-</script>
-
-<style scoped>
-
-  .BSVerCode_disabled{
-    color:#999999;
-  }
-
-</style>
+<template>
+
+  <van-field
+    :label="model.label"
+    v-model="model.value"
+    :placeholder="sent?model.placeholder:''"
+    slot="button"
+    @blur="blur"
+    :class="ctlClass"
+    :clearable="model.clearable"
+    :error-message="model.hiddenValidate ? '': model.validateResult.message"
+  >
+    <van-button slot="button" @click="sendVerCode"   :disabled="modelData.disabled">{{model.sendButtonLabel}}</van-button>
+  </van-field>
+
+</template>
+
+<script>
+
+import  Rx from 'rxjs';
+import {take} from 'rxjs/operators';
+import { filter } from 'rxjs/operators';
+import base2 from './base2.js'
+
+export default {
+  name: "bs-vercode",
+  mixins: [base2],
+  props: {
+
+  },
+  data() {
+    return {
+      validateCtl:true,
+      sent:false
+    }
+  },
+  mounted() {
+
+
+  },
+  methods: {
+    createDefaultModel() {
+      return {
+        type:'BSVerCode',
+        value:'',
+        placeholder:'lang.ctl.BSVerCode.placeholder',
+        sendButtonLabel:'lang.ctl.BSVerCode.sendButtonLabel',
+        expiredTime:60,
+        expiredLabel:'{0}s'
+      };
+    },
+    sendVerCode(){
+      if(this.sent){
+        return
+      }
+      this.sent=true
+      let self = this
+      this.$emit('send-verCode',function(){
+        self.model.expiredTime = self.modelData.expiredTime
+
+        var source = Rx.Observable.timer(0, 1000)
+
+        source = source.pipe(take(self.modelData.expiredTime)).pipe(filter(num => self.sent));
+
+        source.subscribe({
+          next: function(value) {
+
+            self.model.expiredTime = self.model.expiredTime - 1
+            self.model.sendButtonLabel = self.modelData.expiredLabel.format(self.model.expiredTime)
+          },
+          complete: function() {
+
+            self.model.sendButtonLabel = self.modelData.sendButtonLabel
+            self.sent = false
+            // self.model.value = ''
+          },
+          error: function(error) {
+            console.log('Throw Error: ' + error)
+            self.sent = false
+          }
+        });
+
+      },this.fullName)
+
+    },
+    reset(){
+
+      this.sent = false
+      this.model.label = this.modelData.label
+      this.model.disabled = this.modelData.disabled
+      this.model.value = this.modelData.value
+      this.model.placeholder = this.modelData.placeholder
+      this.model.sendButtonLabel= this.modelData.sendButtonLabel
+      this.model.expiredTime = this.modelData.expiredTime
+      this.model.expiredLabel = this.modelData.expiredLabel
+
+    },
+    blur(){
+
+      if(!this.model.readonly)
+        this.model.validateToken++
+
+      this.$emit('blur',function(){
+
+      },this.fullName)
+
+    }
+  },
+  watch:{
+    'model.value':{
+      handler(val,oldval){
+
+        this.setEventString(this.fullName,this.sname,'value',val,oldval)
+      },
+      deep: false
+    }
+  }
+
+}
+
+</script>
+
+<style scoped>
+
+.BSVerCode_disabled{
+  color:#999999;
+}
+
+</style>

package/src/plugins/components/BSViewer.vue

@@ -1,92 +1,92 @@
-<template>
-    <div id="viewc"></div>
-</template>
-
-<script>
-
-    import Pdfh5 from 'pdfh5'
-    import base2 from './base2.js'
-    import "pdfh5/css/pdfh5.css"
-
-    export default {
-        name: "bs-viewer",
-        mixins: [base2],
-        props: {
-
-        },
-        data() {
-          return {
-            fileType:''
-          }
-        },
-        mounted() {
-
-        },
-        methods: {
-            createDefaultModel() {
-                return {
-                    type:'BSViewer',
-                    value:''
-                }
-            },
-            setPdf(pdfUrl) {
-
-                if(this.pdfh5)
-                  this.pdfh5.destroy()
-
-                this.pdfh5 = new Pdfh5('#viewc', {
-                    pdfurl: pdfUrl,
-                    lazy: true,
-                    renderType: 'canvas'
-                })
-
-                let self = this
-                this.pdfh5.on('render', function(pageNum, time) {
-                    console.log('当前加载页码：' + pageNum + '，耗时：' + time + '毫秒，总页数：' + this.totalNum)
-                })
-                this.pdfh5.on('complete', function(status, msg, time) {
-                  self.$emit('onload',function(){
-
-                  },self.fullName)
-                })
-            },
-            getFileType(fileUrl){
-
-              if(this.$ak.utils.isEmpty(fileUrl)){
-                return null
-              }else{
-                let index = fileUrl.lastIndexOf('.')
-                if(index >= 0 ){
-                  return fileUrl.substr(index+1)
-                }else{
-                  return null
-                }
-              }
-
-            }
-        },
-        watch: {
-            'model.value':{
-              handler(val,oldval){
-
-                this.fileType = this.getFileType(val)
-
-                if(this.fileType == 'pdf'){
-                  this.setPdf(val)
-                }
-
-                this.setEventString(this.fullName,this.sname,'value',val,oldval)
-              },
-              deep:false
-            }
-        },
-        computed:{
-
-        }
-    }
-
-</script>
-
-<style scoped>
-
-</style>
+<template>
+    <div id="viewc"></div>
+</template>
+
+<script>
+
+    import Pdfh5 from 'pdfh5'
+    import base2 from './base2.js'
+    import "pdfh5/css/pdfh5.css"
+
+    export default {
+        name: "bs-viewer",
+        mixins: [base2],
+        props: {
+
+        },
+        data() {
+          return {
+            fileType:''
+          }
+        },
+        mounted() {
+
+        },
+        methods: {
+            createDefaultModel() {
+                return {
+                    type:'BSViewer',
+                    value:''
+                }
+            },
+            setPdf(pdfUrl) {
+
+                if(this.pdfh5)
+                  this.pdfh5.destroy()
+
+                this.pdfh5 = new Pdfh5('#viewc', {
+                    pdfurl: pdfUrl,
+                    lazy: true,
+                    renderType: 'canvas'
+                })
+
+                let self = this
+                this.pdfh5.on('render', function(pageNum, time) {
+                    console.log('当前加载页码：' + pageNum + '，耗时：' + time + '毫秒，总页数：' + this.totalNum)
+                })
+                this.pdfh5.on('complete', function(status, msg, time) {
+                  self.$emit('onload',function(){
+
+                  },self.fullName)
+                })
+            },
+            getFileType(fileUrl){
+
+              if(this.$ak.utils.isEmpty(fileUrl)){
+                return null
+              }else{
+                let index = fileUrl.lastIndexOf('.')
+                if(index >= 0 ){
+                  return fileUrl.substr(index+1)
+                }else{
+                  return null
+                }
+              }
+
+            }
+        },
+        watch: {
+            'model.value':{
+              handler(val,oldval){
+
+                this.fileType = this.getFileType(val)
+
+                if(this.fileType == 'pdf'){
+                  this.setPdf(val)
+                }
+
+                this.setEventString(this.fullName,this.sname,'value',val,oldval)
+              },
+              deep:false
+            }
+        },
+        computed:{
+
+        }
+    }
+
+</script>
+
+<style scoped>
+
+</style>