askbot-dragon 0.7.98 → 0.8.12

package/package.json

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

package/src/components/ConversationContainer.vue

@@ -1633,6 +1633,7 @@ export default {
                   "cascadeDown":{
                     "options":[
                       {
+                        checked:true,
                         "_default":false,
                         "optionStruct":{
                           "d63aeeef437e4186af4a2efcd7a6a31b":[
@@ -1662,6 +1663,7 @@ export default {
                         },
                         "children":[
                           {
+                            checked:true,
                             "_default":false,
                             "optionStruct":{
                               "d63aeeef437e4186af4a2efcd7a6a31b":[
@@ -1691,6 +1693,7 @@ export default {
                             },
                             "children":[
                               {
+                                checked:true,
                                 "_default":false,
                                 "optionStruct":{
                                   "d63aeeef437e4186af4a2efcd7a6a31b":[
@@ -1742,6 +1745,7 @@ export default {
                         ]
                       },
                       {
+                        checked:true,
                         "_default":false,
                         "optionStruct":{
                           "d63aeeef437e4186af4a2efcd7a6a31b":[

package/src/components/formTemplate.vue

@@ -55,7 +55,7 @@
           <ckeditor
               :editor="ckeditor.editor"
               v-model="item.value"
-              :config="ckeditor.editorConfig"
+              :config="{...ckeditor.editorConfig,placeholder:item.formField.extInfo && item.formField.extInfo.placeholder?item.formField.extInfo.placeholder:'请输入'}"
               v-else-if="item.fieldId==='workorder_description'"
           ></ckeditor>
           <el-date-picker
@@ -210,13 +210,16 @@
                     @visible-change="(visible) =>{ return refTemplateVisibleChange(visible,item)  }"
                     collapse-tags
                     @change="changeRefData($event,item)"
+                    @focus="setOptionWidth"
             >
               <template v-for="(items,index) in refTemplateList[item.fieldId]">
                 <el-option
                         v-if="refTemplateList[item.fieldId]"
                         :key="index"
                         :label="items.name"
-                        :value="items.id">
+                        :value="items.id"
+                        :style="{width:selectOptionWidth}"
+                >
                 </el-option>
               </template>
               <div
@@ -279,7 +282,7 @@
                 :editor="ckeditor.editor"
                 v-model="item.value"
                 @onReady="onReady"
-                :config="ckeditor.editorConfig"
+                :config="{...ckeditor.editorConfig,placeholder:item.formField.extInfo && item.formField.extInfo.placeholder?item.formField.extInfo.placeholder:'请输入'}"
             ></ckeditor>
           </div>
         </div>
@@ -451,7 +454,7 @@
                 :required="item.required || isRequiredFn(item.formField)"
                 :disabled="disableds"
                 @click-right-icon.stop="SelectClear(item.fieldId)"
-                :right-icon="item.value || (Array.isArray(item.value) && item.value.length > 0)? 'close' : 'van-icon van-icon-arrow van-cell__right-icon'"
+                :right-icon="item.value && item.value.length? 'close' : 'van-icon van-icon-arrow van-cell__right-icon'"
             />
             <van-popup v-model="selectPicker" position="bottom" :style="{ height: '300px' }">
               <select-popup
@@ -473,7 +476,7 @@
             <van-field
               readonly
               clickable
-              :value="Array.isArray(extInfoFieldValue[item.fieldId])?extInfoFieldValue[item.fieldId].join(','):extInfoFieldValue[item.fieldId]"
+              :value="Array.isArray(extInfoFieldValue[item.fieldId])?extInfoFieldValue[item.fieldId].map(v=>v.name).join(','):(extInfoFieldValue[item.fieldId] && extInfoFieldValue[item.fieldId].name?extInfoFieldValue[item.fieldId].name:'')"
               :label="item.formField.name"
               name="picker"
               :placeholder="item.formField.extInfo&&item.formField.extInfo.placeholder?item.formField.extInfo.placeholder:'请选择'"
@@ -481,7 +484,7 @@
               @click-right-icon.stop="SelectClear(item.fieldId)"
               :required="item.required || isRequiredFn(item.formField)"
               :disabled="disableds"
-              :right-icon="extInfoFieldValue[item.fieldId]? 'close' : 'van-icon van-icon-arrow van-cell__right-icon'"
+              :right-icon="extInfoFieldValue[item.fieldId] && extInfoFieldValue[item.fieldId].length? 'close' : 'van-icon van-icon-arrow van-cell__right-icon'"
             />
             <van-popup v-model="refShowPicker" position="bottom" :style="{ height: '300px' }">
               <select-popup
@@ -721,7 +724,8 @@ export default {
       defaultValue:[],
       timeDetailData:{},
       selectDetail:{},
-      refDefaultValue:{}
+      refDefaultValue:{},
+      selectOptionWidth:null,
     }
   },
   props: {
@@ -1214,7 +1218,7 @@ export default {
             if (!this.formList.form.formFieldRelation[i].formField.extInfo.mold ||
                 this.formList.form.formFieldRelation[i].formField.extInfo.mold == 'TIME' ||
                 this.getMoldTime(this.formList.form.formFieldRelation[i].formField.formField) == 'TIME'){
-              this.extInfoFieldValue[this.formList.form.formFieldRelation[i].fieldId]=dateTime.Format('hh:mm')
+              this.extInfoFieldValue[this.formList.form.formFieldRelation[i].fieldId]= dateTime
             }
             else if (this.formList.form.formFieldRelation[i].formField.extInfo.mold == 'DATA_TIME' ||
                 this.formList.form.formFieldRelation[i].formField.extInfo.mold == 'DATE_TIME' ||
@@ -1903,7 +1907,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.refNextPage[field.fieldId].hasNextPage
+          !this.refNextPage[field.fieldId] || this.refNextPage[field.fieldId].hasNextPage
         ) {
           this.$set(this.refTemplateList, field.fieldId, [])
           !this.dataQuery[field.fieldId] &&   this.$set(this.dataQuery,field.fieldId, {
@@ -1954,6 +1958,9 @@ export default {
       }
       this.extInfoFieldValue[item.fieldId] = arr
     },
+    setOptionWidth(){
+      this.selectOptionWidth = event.srcElement.offsetParent.offsetWidth + 40 + "px";
+    },
     lodeMore(item) {
       this.dataQuery[item.fieldId].pageInfo.pageNo += 1
       this.refTemplateVisibleChange(true,item)
@@ -2088,22 +2095,22 @@ export default {
     },
     //保存ref类型值
     confirmRefSelect(option, list){
-      console.debug('options',option,list)
+      console.debug('options',option,list,this.selectDetail)
       if (!option || !list){
         this.refShowPicker = false;
         return
       }
-      this.detailField.value = list;
+      this.selectDetail.value = list;
       let val = ''
       if (Array.isArray(option)){
         val = option.map(item=>{
           return item.id
         })
-        this.extInfoFieldValue[this.detailField.fieldId] = option
+        this.extInfoFieldValue[this.selectDetail.fieldId] = option
       }
       else {
         val = option.id
-        this.extInfoFieldValue[this.detailField.fieldId] = [option]
+        this.extInfoFieldValue[this.selectDetail.fieldId] = [option]
       }
       this.refShowPicker = false;
     },