From fe56927b09b83c9d7fdc51ef878f24fb8ee992fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com>
Date: Fri, 13 Mar 2020 11:17:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=BB=B4=E6=8A=A4=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5token=5Fflag?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package-lock.json                             | 57 +++++++++----------
 package.json                                  |  1 +
 .../majorfunctionconf-add-or-update.vue       | 16 +++++-
 3 files changed, 41 insertions(+), 33 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index bcdd264e..782eb148 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6218,8 +6218,7 @@
         },
         "ansi-regex": {
           "version": "2.1.1",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -6237,13 +6236,11 @@
         },
         "balanced-match": {
           "version": "1.0.0",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
-          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -6256,18 +6253,15 @@
         },
         "code-point-at": {
           "version": "1.1.0",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "concat-map": {
           "version": "0.0.1",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "console-control-strings": {
           "version": "1.1.0",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -6370,8 +6364,7 @@
         },
         "inherits": {
           "version": "2.0.3",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "ini": {
           "version": "1.3.5",
@@ -6381,7 +6374,6 @@
         "is-fullwidth-code-point": {
           "version": "1.0.0",
           "bundled": true,
-          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -6394,20 +6386,17 @@
         "minimatch": {
           "version": "3.0.4",
           "bundled": true,
-          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
         },
         "minimist": {
           "version": "0.0.8",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "minipass": {
           "version": "2.2.4",
           "bundled": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.1",
             "yallist": "^3.0.0"
@@ -6424,7 +6413,6 @@
         "mkdirp": {
           "version": "0.5.1",
           "bundled": true,
-          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -6497,8 +6485,7 @@
         },
         "number-is-nan": {
           "version": "1.0.1",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -6508,7 +6495,6 @@
         "once": {
           "version": "1.4.0",
           "bundled": true,
-          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -6584,8 +6570,7 @@
         },
         "safe-buffer": {
           "version": "5.1.1",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -6615,7 +6600,6 @@
         "string-width": {
           "version": "1.0.2",
           "bundled": true,
-          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -6633,7 +6617,6 @@
         "strip-ansi": {
           "version": "3.0.1",
           "bundled": true,
-          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -6672,13 +6655,11 @@
         },
         "wrappy": {
           "version": "1.0.2",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "yallist": {
           "version": "3.0.2",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         }
       }
     },
@@ -16112,6 +16093,22 @@
         "vue-style-loader": "^4.1.0"
       }
     },
+    "vue-quill-editor": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/vue-quill-editor/-/vue-quill-editor-3.0.6.tgz",
+      "integrity": "sha512-g20oSZNWg8Hbu41Kinjd55e235qVWPLfg4NvsLW6d+DhgBTFbEuMpcWlUdrD6qT3+Noim6DRu18VLM9lVShXOQ==",
+      "requires": {
+        "object-assign": "^4.1.1",
+        "quill": "^1.3.4"
+      },
+      "dependencies": {
+        "object-assign": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+          "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
+        }
+      }
+    },
     "vue-router": {
       "version": "3.0.1",
       "resolved": "http://r.cnpmjs.org/vue-router/download/vue-router-3.0.1.tgz",
diff --git a/package.json b/package.json
index 74a500e1..03cfcda2 100644
--- a/package.json
+++ b/package.json
@@ -34,6 +34,7 @@
     "svg-sprite-loader": "^4.1.1",
     "vue": "^2.5.17",
     "vue-i18n": "^8.1.0",
+    "vue-quill-editor": "^3.0.6",
     "vue-router": "^3.0.1",
     "vuex": "^3.0.1"
   },
diff --git a/src/views/modules/custom/majorfunctionconf-add-or-update.vue b/src/views/modules/custom/majorfunctionconf-add-or-update.vue
index 0b0ca914..f65b6308 100644
--- a/src/views/modules/custom/majorfunctionconf-add-or-update.vue
+++ b/src/views/modules/custom/majorfunctionconf-add-or-update.vue
@@ -44,6 +44,15 @@
                     label="1">是</el-radio>
         </template>
       </el-form-item>
+      <el-form-item label="需要拼接token"
+                    prop="tokenFlag">
+        <template>
+          <el-radio v-model="dataForm.tokenFlag"
+                    label="0">否</el-radio>
+          <el-radio v-model="dataForm.tokenFlag"
+                    label="1">是</el-radio>
+        </template>
+      </el-form-item>
       <el-form-item label="是否访问外链"
                     prop="externalFlag">
         <template>
@@ -108,7 +117,8 @@ export default {
         createdTime: '',
         updatedBy: '',
         updatedTime: '',
-        imgUrl: ''
+        imgUrl: '',
+        tokenFlag: '0'
       },
       codeList: [],
       uploadUrl: '',
@@ -148,10 +158,10 @@ export default {
         createdTime: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
-        updatedBy: [
+        tokenFlag: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
-        updatedTime: [
+        imgUrl: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ]
       }