askbot-dragon 0.7.99 → 0.8.13

package/package.json

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

package/src/components/ConversationContainer.vue

@@ -1929,7 +1929,7 @@ export default {
                 "id":null,
                 "name":"附件",
                 "description":null,
-                "type":"ATTACHMENT",
+                "type":"FILE",
                 "deleted":null,
                 "lastOperatorId":null,
                 "mainId":null,

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
@@ -133,7 +133,22 @@
                   :value="items.value">
               </el-option>
             </el-select>
-            <div class="cascader-input" v-else @click="openDrawer(item,'select')">
+            <el-select
+                v-model=item.value
+                :placeholder="item.formField.extInfo&&item.formField.extInfo.placeholder?item.formField.extInfo.placeholder:'请选择'"
+                style="width: 100%"
+                filterable
+                v-else
+                :multiple="item.formField.extInfo && item.formField.extInfo.selectType == '多选'"
+            >
+              <el-option
+                  v-for="(items,index) in item.formField.extInfo.option?item.formField.extInfo.option:item.formField.extInfo.options"
+                  :key="index"
+                  :label="items.label"
+                  :value="items.value">
+              </el-option>
+            </el-select>
+<!--            <div class="cascader-input" v-else @click="openDrawer(item,'select')">
               <template v-if="item.value && (!Array.isArray(item.value) || (Array.isArray(item.value) && item.value.length))">
                 <template v-if="Array.isArray(item.value)">
                   <span v-for="(select,selectIndex) in item.value" :key="selectIndex">
@@ -143,7 +158,7 @@
                 <template v-else>{{item.value}}</template>
               </template>
               <span v-else>{{item.formField.extInfo&&item.formField.extInfo.placeholder?item.formField.extInfo.placeholder:'请选择'}}</span>
-            </div>
+            </div>-->
           </div>
           <template v-else-if="item.formField.type==='CASCADER'">
             <div class="cascader-input" @click="openDrawer(item,'pc_cascader')">
@@ -179,9 +194,9 @@
           <div v-else-if="item.formField.type==='FILE' || item.formField.type === 'IMAGE' || item.formField.type === 'ATTACHMENT' || item.formField.type === 'VIDEO'">
             <div @click="checkUpload(item.fieldId,item.formField.extInfo)" @mouseover="checkUpload(item.fieldId,item.formField.extInfo)" style="flex: 0.75;display:flex;align-items: center;">
               <el-upload
-                      class="upload-demo"
+
                       ref="upload"
-                      :list-type="item.formField.type === 'IMAGE'?'picture-card':''"
+                      :list-type="item.formField.type === 'IMAGE' || item.formField.type==='FILE'?'picture-card':''"
                       :accept="acceptFieldType(item.formField.type)"
                       name="file"
                       action="/open/media/file/upload"
@@ -195,7 +210,9 @@
                       :on-change="handleEditChange"
                       :on-success="successUpload"
               >
-                <i class="el-icon-plus"></i>
+                <div class="upload-demo">
+                  <i class="el-icon-plus"></i>
+                </div>
 <!--                <el-button size="small" type="primary" v-else class="uploadBtn">点击上传</el-button>-->
               </el-upload>
             </div>
@@ -210,13 +227,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 +299,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>
@@ -569,6 +589,7 @@
         :withHeader="false"
         :visible.sync="drawer"
         size="400px"
+        :append-to-body="true"
         direction="btt">
       <div class="drawer-container">
        <tree ref="drawerTree"
@@ -721,7 +742,8 @@ export default {
       defaultValue:[],
       timeDetailData:{},
       selectDetail:{},
-      refDefaultValue:{}
+      refDefaultValue:{},
+      selectOptionWidth:null,
     }
   },
   props: {
@@ -805,7 +827,7 @@ export default {
       return (type)=>{
         console.debug('type',type)
         if (type == 'FILE'){
-          return '*'
+          return 'image/*'
         } else if( type == 'IMAGE') {
           return 'image/*'
         } else if(type == 'VIDEO') {
@@ -896,7 +918,7 @@ export default {
       console.debug('file',file)
       console.debug('fileType',!Array.isArray(file))
       if (!Array.isArray(file)){
-        if (type === 'IMAGE'){
+        if (type === 'IMAGE' || type === 'FILE'){
           const isLte2M = file.size / 1024 / 1024 <= 8;
           const isSupportedFormat =file.type.indexOf('image')!==-1
           if (!isSupportedFormat){
@@ -922,7 +944,7 @@ export default {
           }
           return true
         }
-        else if (type === 'FILE' || type === 'ATTACHMENT'){
+        else if (type === 'ATTACHMENT'){
           const isLte2M = file.size / 1024 / 1024 <= 100;
           if (!isLte2M) {
             this.$message.error("上传附件大小不能超过100MB!");
@@ -938,7 +960,7 @@ export default {
         }
         if (file.length<=this.limitNum-length){
           for (let i=0;i<file.length;i++){
-            if (type === 'IMAGE'){
+            if (type === 'IMAGE' || type === 'FILE'){
               const isLte2M = file.size / 1024 / 1024 <= 8;
               const isSupportedFormat =file.type.indexOf('image')!==-1
               if (!isSupportedFormat){
@@ -964,7 +986,7 @@ export default {
               }
               return true
             }
-            else if (type === 'FILE' || type === 'ATTACHMENT'){
+            else if (type === 'ATTACHMENT'){
               const isLte2M = file.size / 1024 / 1024 <= 100;
               if (!isLte2M) {
                 this.$message.error("上传附件大小不能超过100MB!");
@@ -1453,9 +1475,15 @@ export default {
             file.url = item.url
             value.push(file)
           })
-          this.formShow.form.formFieldRelation[i].value = value.map(item=>{
-            return item.name
-          })
+          if (this.formShow.form.formFieldRelation[i].formField.type == 'FILE'){
+            this.formShow.form.formFieldRelation[i].value = value
+          }
+          else {
+            this.formShow.form.formFieldRelation[i].value = value.map(item=>{
+              return item.name
+            })
+          }
+
         }
         if(this.formShow.form.formFieldRelation[i].display &&
             (this.formShow.form.formFieldRelation[i].required || this.isRequiredFn(this.formShow.form.formFieldRelation[i].formField)) &&
@@ -1903,7 +1931,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 +1982,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 +2119,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;
     },