askbot-dragon 1.4.57 → 1.4.58

package/package.json

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

package/src/components/formTemplate.vue

@@ -1106,11 +1106,14 @@ export default {
     if (this.formList.form.formFieldRelation && this.formList.form.formFieldRelation.length > 0) {
         this.formList.form.formFieldRelation.forEach(item => {
           if (item.formField.type === "TIME_PICKER") {
+            this.extInfoFieldValue[item.fieldId] = item.value;
             if (item.value.length === 5 && item.value.split(":").length === 2) {
               console.log(1112, item.value);
-              this.extInfoFieldValue[item.fieldId] = item.value;
               item.value = new Date().getFullYear() + "-" + (new Date().getMonth() + 1) + "-" + new Date().getDate() + " " + item.value + ":00";
             }
+            if (item.value.length === 8 && item.value.split(":").length === 3) {
+              item.value = new Date().getFullYear() + "-" + (new Date().getMonth() + 1) + "-" + new Date().getDate() + " " + item.value;
+            }
           }
         })
     }
@@ -2079,6 +2082,12 @@ export default {
           newForm.form.formFieldRelation[i].value =  newForm.form.formFieldRelation[i].value.replace(/<img/g, "<img onclick='previewImage(this)' ")
           console.log(newForm.form.formFieldRelation[i]);
         }
+        if (newForm.form.formFieldRelation[i].formField.type === "TIME_PICKER" &&
+            newForm.form.formFieldRelation[i].value &&
+            !(newForm.form.formFieldRelation[i].value.length === 5 && newForm.form.formFieldRelation[i].value.split(":").length === 2) &&
+          !(newForm.form.formFieldRelation[i].value.length === 8 && newForm.form.formFieldRelation[i].value.split(":").length === 3)){
+          newForm.form.formFieldRelation[i].value = new Date(newForm.form.formFieldRelation[i].value).Format('hh:mm:ss')
+        }
       }
       console.debug('formShow',this.formShow,this.formShow.form,newForm.form)
         this.$emit('submitClick',newForm)