askbot-dragon 0.6.18 → 0.6.22

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "askbot-dragon",
-  "version": "0.6.18",
+  "version": "0.6.22",
   "scripts": {
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",
     "lint": "vue-cli-service lint"
   },
   "dependencies": {
-    "@ckeditor/ckeditor5-build-classic": "^29.2.0",
     "@ckeditor/ckeditor5-vue": "^1.0.3",
     "ali-oss": "^6.2.1",
+    "ckeditor": "^4.12.1",
     "core-js": "^3.6.5",
     "element-ui": "^2.13.2",
     "install": "^0.13.0",

package/public/index.html

@@ -9,6 +9,7 @@
     <title><%= htmlWebpackPlugin.options.title %></title>
     <link href="//at.alicdn.com/t/font_1566110_eump2lzv89s.css"/>
     <script src="https://res.wx.qq.com/open/js/jweixin-1.2.0.js"></script>
+    <script src="https://static.guoranbot.com/ckeditor5-build-classic/0.3.7/build/ckeditor.js"></script>
     <style>
       *{
         margin: 0;

package/src/components/formTemplate.vue

@@ -437,9 +437,8 @@
 <script>
 let that
 import {multipartUpload,ossFileUrl} from "./utils/AliyunIssUtil";
-import ClassicEditor from '@ckeditor/ckeditor5-build-classic'
 import {MyCustomUploadAdapterPlugin} from "./utils/ckeditor";
-
+import CKEDITOR from 'ckeditor'
 export default {
   name: "formTemplate",
   data() {
@@ -523,7 +522,7 @@ export default {
       hideUploadEdit:false,
       limitNum:1,
       ckeditor: {
-        editor: ClassicEditor,
+        editor: CKEDITOR.ClassicEditor,
         editorConfig: {
           extraPlugins: [MyCustomUploadAdapterPlugin],
           toolbar: [
@@ -1649,12 +1648,19 @@ export default {
     text-align: center;
     border-top: 1px solid #EEEEEE;
   }
+  /deep/.ck.ck-editor{
+   padding: 0 16px;
+  }
   /deep/.ck.ck-toolbar{
     border-color:#E0E6F7;
+    border-top-left-radius: 9px!important;
+    border-top-right-radius: 9px!important;
   }
   /deep/.ck.ck-editor__editable_inline{
     border-color:#E0E6F7;
-    min-height: 120px!important;
+    min-height: 150px!important;
+    border-bottom-left-radius: 9px!important;
+    border-bottom-right-radius: 9px!important;
   }
 }
 .pcFormClass{
@@ -1664,7 +1670,8 @@ export default {
     padding: 8px 0;
     .field-item-name{
       padding-bottom: 8px;
-      color: #A9B3C6;
+      /*color: #A9B3C6;*/
+      color: #000000;
     }
   }
   /deep/.el-upload--picture-card{
@@ -1745,22 +1752,25 @@ export default {
           padding: 8px 16px;
           .fileName{
             padding-bottom: 8px;
-            color: #A9B3C6;
+           /* color: #A9B3C6;*/
+            color: #000000;
           }
         }
         .workorder_description{
-          padding: 8px 16px;
+         /* padding: 8px 16px;*/
+          padding: 8px 0;
           /*font-size: 14px;*/
           .field-name{
             width: 100%;
             text-align: left;
-            color: #A9B3C6;
+           /* color: #A9B3C6;*/
+            color: #000000;
             line-height: 1;
             padding-bottom: 8px;
           }
-          .required-name{
+          /*.required-name{
             margin-left: -6px;
-          }
+          }*/
 
          /* /deep/.ck-content .image img{
             max-width: 200px!important;
@@ -1778,7 +1788,8 @@ export default {
       .explan-ation{
         .explan-ation-div{
           display: flex;
-          padding: 4px 16px;
+         /* padding: 4px 16px;*/
+          padding: 4px;
         }
         .explan-ation-p{
           color: #4C61E1;font-size: 14px;margin: 16px 4px;
@@ -1822,7 +1833,8 @@ export default {
   /deep/.van-field__label{
     width: 100%;
     text-align: left;
-    color: #A9B3C6!important;
+    /*color: #A9B3C6!important;*/
+    color: #000000!important;
     display: flex;
     align-items: center;
     line-height: 1;

package/vue.config.js

@@ -25,5 +25,11 @@ module.exports = {
             },
         },
     },
+    configureWebpack: {
+
+        externals: {
+            'ckeditor': 'CKEDITOR'
+        },
+    },
 
 };