askbot-dragon 0.9.5 → 0.9.7

package/package.json

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

package/src/components/formTemplate.vue

@@ -2,7 +2,7 @@
   <div class="media-body">
     <div class="formClass" :class="isPhone?'remPhoneClassForm':'remCompanyClassForm'" v-if="formShow.form">
       <div class="titleName" >
-        {{formShow.form.name}}
+        {{!!formShow.form.formShowName?formShow.form.formShowName:formShow.form.name}}
       </div>
       <div class="title-link"></div>
       <div class="pcFormClass" v-if="isCompany">
@@ -64,6 +64,7 @@
               :config="{...ckeditor.editorConfig,placeholder:item.formField.extInfo && item.formField.extInfo.placeholder?item.formField.extInfo.placeholder:'请输入'}"
               v-else-if="item.fieldId==='workorder_description'"
               @ready="(editor)=>currentEditor=editor"
+              @focus="(zh,editor)=>currentEditor=editor"
           ></ckeditor>
           <el-date-picker
                   v-model=item.value
@@ -325,7 +326,8 @@
             <ckeditor
                 :editor="ckeditor.editor"
                 v-model="item.value"
-                @onReady="onReady"
+                @ready="(editor)=>currentEditor=editor"
+                @focus="(zh,editor)=>currentEditor=editor"
                 :config="{...ckeditor.editorConfig,placeholder:item.formField.extInfo && item.formField.extInfo.placeholder?item.formField.extInfo.placeholder:'请输入'}"
             ></ckeditor>
           </div>
@@ -864,7 +866,8 @@ export default {
       selectOptionWidth:null,
       fieldValue:{},
       optionsList:{},
-      currentEditor:null
+      currentEditor:null,
+      workOrderDes:""
     }
   },
   props: {
@@ -952,6 +955,9 @@ export default {
             item.formField.extInfo.extInfoFieldValue = ''
           }
         }
+        if (item.fieldId==='workorder_description'){
+          this.workOrderDes = item.value;
+        }
       })
       let newArr = arr.filter(item=>item.relationDisplay)
       console.debug('arr',arr,newArr)
@@ -2409,6 +2415,21 @@ export default {
         console.log(value);
       },
       deep:true
+    },
+    workOrderDes:{
+      handler(val){
+        let newVal = ''
+        newVal = val.replace(/ style=".*?"/g, '');
+        if (this.currentEditor){
+          this.workOrderDes = newVal;
+          this.currentEditor.model.change( writer => {
+            writer.setSelection( writer.createPositionAt( this.currentEditor.model.document.getRoot(), 'end' ) );
+          });
+        }
+        console.debug('workOrderDes',this.workOrderDes)
+      },
+      deep:true,
+      immediate:true
     }
   }