askbot-dragon 0.7.95 → 0.7.98

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "askbot-dragon",
-  "version": "0.7.95",
+  "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">
@@ -214,7 +221,7 @@
               </template>
               <div
                 @click="lodeMore(item)"
-                v-if="dataQuery[item.fieldId] && dataQuery[item.fieldId].hasNextPage"
+                v-if="refNextPage[item.fieldId] && refNextPage[item.fieldId].hasNextPage"
                 style="width:100%;height:30px;display:flex;align-items: center;justify-content: center;color:#606266">
                   加载更多
               </div>
@@ -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">
@@ -486,6 +496,9 @@
                     label:'name'
                   }"
               >
+                <template slot="popup-footer" v-if="refNextPage[item.fieldId] && refNextPage[item.fieldId].hasNextPage">
+                  <span @click="lodeMore(item)">加载更多</span>
+                </template>
               </select-popup>
             </van-popup>
           </div>
@@ -494,7 +507,7 @@
               readonly
               clickable
               name="area"
-              :value="extInfoFieldValue[item.fieldId] && Array.isArray(extInfoFieldValue[item.fieldId])?extInfoFieldValue[item.fieldId].map(e=>e.label).join(','):''"
+              :value="extInfoFieldValue[item.fieldId] && Array.isArray(extInfoFieldValue[item.fieldId])?extInfoFieldValue[item.fieldId].map(e=>e.label).join('/'):''"
               :label=item.formField.name
               :placeholder="item.formField.extInfo&&item.formField.extInfo.placeholder?item.formField.extInfo.placeholder:'请选择'"
               @click="openDrawer(item,'cascader')"
@@ -697,11 +710,12 @@ export default {
       refTemplateList:{},
       refList:{},
       dataQuery:{},
+      refNextPage:{},
       drawer:false,
       detailField:{
         formField:{}
       },
-      extInfoFieldValue:[],
+      extInfoFieldValue:{},
       selectPopUp:false,
       options:[],
       defaultValue:[],
@@ -1177,10 +1191,8 @@ export default {
         let type = this.formList.form.formFieldRelation[i].formField.type
         let extInfo = this.formList.form.formFieldRelation[i].formField.extInfo
         if (type === 'CASCADER') {
-          let fieldValue = this.formList.form.formFieldRelation[i].formField.extInfo.extInfoFieldValue?
-              this.formList.form.formFieldRelation[i].formField.extInfo.extInfoFieldValue:
-              (this.formList.form.formFieldRelation[i].formField.extInfo.fieldValue?
-                  this.formList.form.formFieldRelation[i].formField.extInfo.fieldValue:[])
+          let fieldValue = this.formList.form.formFieldRelation[i].formField.extInfo.fieldValue ?
+              this.formList.form.formFieldRelation[i].formField.extInfo.fieldValue :[]
           if (!this.extInfoFieldValue[this.formList.form.formFieldRelation[i].fieldId]){
             this.extInfoFieldValue[this.formList.form.formFieldRelation[i].fieldId] = fieldValue
           }
@@ -1461,9 +1473,11 @@ export default {
             }
         }
       }
-      this.formShow.extInfo = {
-        extInfoFieldValue : this.extInfoFieldValue
+      let extInfo = {
+        extInfoFieldValue:this.extInfoFieldValue
       }
+        this.$set(this.formShow,'extInfo',extInfo)
+      console.debug('form',this.formShow)
         this.$emit('submitClick',this.formShow)
         this.disableds = true
         this.submitValue = '已提交'
@@ -1505,7 +1519,7 @@ export default {
         return
       }
       this.selectDetail = item;
-      this.defaultValue = ''
+      this.defaultValue = []
       if(type == 'client') {
         let selectOption
         this.selectValue=[]
@@ -1537,7 +1551,10 @@ export default {
     SelectClear(fieldId) {
       if(this.disableds === false){
         let i = this.formShow.form.formFieldRelation.findIndex(item => { console.log(item.fieldId); return item.fieldId == fieldId })
-        this.selectValues[this.formShow.form.formFieldRelation[i].fieldId] = ''
+        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()
       }
     },
@@ -1886,7 +1903,7 @@ export default {
       let fields = field.formField.type === 'REF' ? field.formField.extInfo.ref.field : field.formField.extInfo.ref.vars
       if (visible) {
         if (
-          !this.refTemplateList[field.fieldId] || this.dataQuery[field.fieldId].hasNextPage
+          !this.refTemplateList[field.fieldId] || this.refNextPage[field.fieldId].hasNextPage
         ) {
           this.$set(this.refTemplateList, field.fieldId, [])
           !this.dataQuery[field.fieldId] &&   this.$set(this.dataQuery,field.fieldId, {
@@ -1903,7 +1920,8 @@ export default {
             templateId:field.formField.extInfo.ref.source,
             fieldId:fields,
             field:field,
-            dataQuery:this.dataQuery
+            dataQuery:this.dataQuery,
+            refNextPage:this.refNextPage
           }
           this.$emit('getTemplateList',param)
         }
@@ -1940,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;
@@ -1994,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

package/src/components/tree.vue

@@ -31,7 +31,10 @@ export default {
   name: "tree",
   data(){
     return{
-      defaultProps:{},
+      defaultProps:{
+        label:"label",
+        value:"value"
+      },
       checked:'',
       dataTree:[],
       checkList:[],
@@ -96,6 +99,7 @@ export default {
     else if (this.dataOptions.extInfo.cascadeDown && this.dataOptions.extInfo.cascadeDown[0]){
       this.dataTree = this.dataOptions.extInfo.cascadeDown[0].options
     }
+    console.debug('dataTree',this.dataOptions,this.dataTree)
   }
 };
 </script>