askbot-dragon 0.7.97 → 0.7.98

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "askbot-dragon",
-  "version": "0.7.97",
+  "version": "0.7.98",
   "scripts": {
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",

package/src/components/formTemplate.vue

@@ -22,6 +22,13 @@
                     :placeholder="item.formField.extInfo&&item.formField.extInfo.placeholder?item.formField.extInfo.placeholder:'请输入'"
                     :maxlength="item.formField.extInfo&&item.formField.extInfo.maxNum?item.formField.extInfo.maxNum*1:1000"
                     v-if="item.formField.type==='INPUT'&&item.fieldId!=='workorder_name'"
+                    :type="item.formField.extInfo.inputType==='NUMBER'||
+                          item.formField.extInfo.inputType==='RATE'? 'number':'text'"
+                    @blur="typeCheck(item.formField,item)"
+                    :min="item.formField.extInfo.inputType==='NUMBER'||
+                          item.formField.extInfo.inputType==='RATE'?Number(item.formField.extInfo.range.start):''"
+                    :max="item.formField.extInfo.inputType==='NUMBER'||
+                          item.formField.extInfo.inputType==='RATE'?Number(item.formField.extInfo.range.end):''"
           ></el-input>
           <template v-else-if="item.formField.type==='EXPLANATION'">
             <div class="explanation">
@@ -235,6 +242,9 @@
                      :disabled="disableds"
                      :placeholder="item.formField.extInfo&&item.formField.extInfo.placeholder?item.formField.extInfo.placeholder:'请输入'"
                      :maxlength="item.formField.extInfo&&item.formField.extInfo.maxNum?item.formField.extInfo.maxNum*1:1000"
+                     @blur="typeCheck(item.formField,item)"
+                     :type="item.formField.extInfo.inputType==='NUMBER'||
+                          item.formField.extInfo.inputType==='RATE'? 'number':'text'"
           />
         </div>
         <div v-else-if="item.formField.type==='EXPLANATION'||item.formField.type==='EXPLAIN'" class="explan-ation">
@@ -1509,7 +1519,7 @@ export default {
         return
       }
       this.selectDetail = item;
-      this.defaultValue = ''
+      this.defaultValue = []
       if(type == 'client') {
         let selectOption
         this.selectValue=[]
@@ -1544,6 +1554,7 @@ export default {
         this.selectValues[this.formShow.form.formFieldRelation[i].fieldId] = '';
         this.formShow.form.formFieldRelation[i].value = "";
         this.extInfoFieldValue[this.formShow.form.formFieldRelation[i].fieldId] = ""
+        this.defaultValue = []
         this.$forceUpdate()
       }
     },
@@ -1947,6 +1958,71 @@ export default {
       this.dataQuery[item.fieldId].pageInfo.pageNo += 1
       this.refTemplateVisibleChange(true,item)
     },
+    //校验输入框
+    typeCheck(field,item){
+      if (!item.value){
+        return
+      }
+      console.debug('typeCheck',field)
+      if (field.extInfo.inputType==='MOBILE'){
+        const phone = /^[1][3,4,5,7,8][0-9]{9}$/
+        if (!phone.test(item.value)) {
+          this.$message({
+            message: "请输入有效的手机号",
+            duration: 2000,
+            type: "warning",
+          });
+          item.value = ''
+          return
+        }
+      }
+      else if (field.extInfo.inputType ==='MAIL'){
+        const reg =
+            /^([a-z0-9A-Z]+[-|_|\.]?)+[a-z0-9A-Z]@([a-z0-9A-Z]+(-[a-z0-9A-Z]+)?\.)+[a-zA-Z]{2,4}$/;
+        if (!reg.test(item.value)) {
+          this.$message({
+            message: "请输入有效的邮箱",
+            duration: 2000,
+            type: "warning",
+          });
+          item.value = ''
+          return
+        }
+
+      }
+      else if (field.extInfo.inputType === 'ID_CARD'){
+        const reg = /^(([1-9][0-9]{5}(19|20)[0-9]{2}((0[1-9])|(1[0-2]))([0-2][1-9]|10|20|30|31)[0-9]{3}([0-9]|X|x))|([1-9][0-9]{5}[0-9]{2}((0[1-9])|(1[0-2]))([0-2][1-9]|10|20|30|31)[0-9]{3}))$/
+        if (!reg.test(item.value)) {
+          this.$message({
+            message: "请输入有效的身份证号",
+            duration: 2000,
+            type: "warning",
+          });
+          item.value = ''
+          return
+        }
+      }
+      else if (field.extInfo.inputType ==='LINK'){
+        const reg = /^([hH][tT]{2}[pP]:\/\/|[hH][tT]{2}[pP][sS]:\/\/)(([A-Za-z0-9-~]+)\.)+([A-Za-z0-9-~\/])/;
+        if (!reg.test(item.value)) {
+          this.$message({
+            message: "请输入合法的链接地址",
+            duration: 2000,
+            type: "warning",
+          });
+          item.value = ''
+          return
+        }
+      }
+      else if (field.extInfo.inputType ==='NUMBER'||field.extInfo.inputType ==='RATE'){
+        if ( item.value < Number(field.extInfo.range.start)){
+          item.value = Number(field.extInfo.range.start)
+        }
+        else if (item.value > Number(field.extInfo.range.end)){
+          item.value = Number(field.extInfo.range.end)
+        }
+      }
+    },
     //打开级联/下拉抽屉选择
     openDrawer(field,type){
       this.detailField = field;
@@ -2001,6 +2077,11 @@ export default {
     //保存所选下拉值
     confirmSelect(option, list){
       console.debug('option',option,list)
+      if (!option || !list){
+        this.selectPopUp = false
+        this.selectPicker = false
+        return
+      }
       this.detailField.value = list;
       this.selectPopUp = false
       this.selectPicker = false