Merge branch 'master' of https://gitee.com/ZhongBangKeJi/crmeb_java

* 'master' of https://gitee.com/ZhongBangKeJi/crmeb_java:
  增加安装查询
  修改富文本编辑器更换CDN引发的一些问题
  修改y移动端图片上传配置api
  移动端提前缓存城市数据，避免编辑地址时等待请求

admin/src/components/Tinymce/index.vue

@@ -1,72 +1,47 @@
 <template>
-  <div
-    :class="{ fullscreen: fullscreen }"
-    class="tinymce-container"
-    :style="{ width: containerWidth }"
-  >
+  <div :class="{fullscreen:fullscreen}" class="tinymce-container editor-container">
     <textarea :id="tinymceId" class="tinymce-textarea" />
     <div class="editor-custom-btn-container">
-      <editorImage
-        color="#1890ff"
-        class="editor-upload-btn"
-        @successCBK="imageSuccessCBK"
-      />
+      <editorImage color="#1890ff" class="editor-upload-btn" @successCBK="imageSuccessCBK" />
     </div>
   </div>
 </template>
 
 <script>
-/**
- * docs:
- * https://panjiachen.github.io/vue-element-admin-site/feature/component/rich-editor.html#tinymce
- */
-import editorImage from "./components/EditorImage";
-import plugins from "./plugins";
-import toolbar from "./toolbar";
-import load from "./dynamicLoadScript";
-// why use this cdn, detail see https://github.com/PanJiaChen/tinymce-all-in-one
-// const tinymceCDN = "https://cdn.jsdelivr.net/npm/tinymce-all-in-one@4.9.3/tinymce.min.js";
-const tinymceCDN = "https://cdn.bootcdn.net/ajax/libs/tinymce/4.9.3/tinymce.min.js";
+import editorImage from './components/EditorImage'
+import plugins from './plugins'
+import toolbar from './toolbar'
 
 export default {
-  name: "Tinymce",
+  name: 'Tinymce',
   components: { editorImage },
   props: {
     id: {
       type: String,
-      default: function () {
-        return (
-          "vue-tinymce-" +
-          +new Date() +
-          ((Math.random() * 1000).toFixed(0) + "")
-        );
-      },
+      default: function() {
+        return 'vue-tinymce-' + +new Date() + ((Math.random() * 1000).toFixed(0) + '')
+      }
     },
     value: {
       type: String,
-      default: "",
+      default: ''
     },
     toolbar: {
       type: Array,
       required: false,
       default() {
-        return [];
-      },
+        return []
+      }
     },
     menubar: {
       type: String,
-      default: "file edit insert view format table",
+      default: 'file edit insert view format table'
     },
     height: {
-      type: [Number, String],
+      type: Number,
       required: false,
-      default: 400,
-    },
-    width: {
-      type: [Number, String],
-      required: false,
-      default: "auto",
-    },
+      default: 400
+    }
   },
   data() {
     return {
@@ -75,122 +50,109 @@ export default {
       tinymceId: this.id,
       fullscreen: false,
       languageTypeList: {
-        en: "en",
-        zh: "zh_CN",
-        es: "es_MX",
-        ja: "ja",
-      },
-    };
+        'en': 'en',
+        'zh': 'zh_CN'
+      }
+    }
   },
   computed: {
-    containerWidth() {
-      const width = this.width;
-      if (/^[\d]+(\.[\d]+)?$/.test(width)) {
-        // matches `100`, `'100'`
-        return `${width}px`;
-      }
-      return width;
-    },
+    language() {
+      // return this.languageTypeList[this.$store.getters.language]
+      return this.languageTypeList['zh']
+    }
   },
   watch: {
     value(val) {
-      // if (!this.hasChange && this.hasInit) {
+      if (!this.hasChange && this.hasInit) {
         this.$nextTick(() =>
-          window.tinymce.get(this.tinymceId).setContent(val || "")
-        );
-      // }
+          window.tinymce.get(this.tinymceId).setContent(val || ''))
+      }
     },
-  },
-  mounted() {
-    this.init();
-  },
-  
-  activated() {
-    if (window.tinymce) {
-      this.initTinymce();
+    language() {
+      this.destroyTinymce()
+      this.$nextTick(() => this.initTinymce())
     }
   },
+  mounted() {
+    this.initTinymce()
+  },
+  activated() {
+    this.initTinymce()
+  },
   deactivated() {
-    this.destroyTinymce();
+    this.destroyTinymce()
   },
   destroyed() {
-    this.destroyTinymce();
+    this.destroyTinymce()
   },
   methods: {
-    init() {
-      // dynamic load tinymce from cdn
-      load(tinymceCDN, (err) => {
-        if (err) {
-          this.$message.error(err.message);
-          return;
-        }
-        this.initTinymce();
-      });
-    },
     initTinymce() {
-      const _this = this;
+      const _this = this
       window.tinymce.init({
+        language: this.language,
         selector: `#${this.tinymceId}`,
-        language: this.languageTypeList["en"],
         height: this.height,
-        body_class: "panel-body ",
+        body_class: 'panel-body ',
         object_resizing: false,
         toolbar: this.toolbar.length > 0 ? this.toolbar : toolbar,
         menubar: this.menubar,
         plugins: plugins,
-        fontsize_formats: "8pt 10pt 12pt 14pt 18pt 24pt 30pt 36pt", // 第二步
-        font_formats:
-          "微软雅黑='微软雅黑';宋体='宋体';黑体='黑体';仿宋='仿宋';楷体='楷体';隶书='隶书';幼圆='幼圆';Andale Mono=andale mono,times;Arial=arial,helvetica,sans-serif;Arial Black=arial black,avant garde;Book Antiqua=book antiqua,palatino;Comic Sans MS=comic sans ms,sans-serif;Courier New=courier new,courier;Georgia=georgia,palatino;Helvetica=helvetica;Impact=impact,chicago;Symbol=symbol;Tahoma=tahoma,arial,helvetica,sans-serif;Terminal=terminal,monaco;Times New Roman=times new roman,times;Trebuchet MS=trebuchet ms,geneva;Verdana=verdana,geneva;Webdings=webdings;Wingdings=wingdings",
         end_container_on_empty_block: true,
-        powerpaste_word_import: "clean",
+        powerpaste_word_import: 'clean',
         code_dialog_height: 450,
         code_dialog_width: 1000,
-        advlist_bullet_styles: "square",
-        advlist_number_styles: "default",
-        imagetools_cors_hosts: ["www.tinymce.com", "codepen.io"],
-        default_link_target: "_blank",
+        advlist_bullet_styles: 'square',
+        advlist_number_styles: 'default',
+        imagetools_cors_hosts: ['www.tinymce.com', 'codepen.io'],
+        default_link_target: '_blank',
         link_title: false,
         nonbreaking_force_tab: true, // inserting nonbreaking space &nbsp; need Nonbreaking Space Plugin
-        init_instance_callback: (editor) => {
+        init_instance_callback: editor => {
           if (_this.value) {
-            editor.setContent(_this.value);
+            editor.setContent(_this.value)
           }
-          _this.hasInit = true;
-          editor.on("NodeChange Change KeyUp SetContent", () => {
-            this.hasChange = true;
-            this.$emit("input", editor.getContent());
-          });
+          _this.hasInit = true
+          editor.on('NodeChange Change KeyUp SetContent', () => {
+            this.hasChange = true
+            this.$emit('input', editor.getContent())
+          })
         },
         setup(editor) {
-          editor.on("FullscreenStateChanged", (e) => {
-            _this.fullscreen = e.state;
-          });
-        },
-      });
+          editor.on('FullscreenStateChanged', (e) => {
+            _this.fullscreen = e.state
+          })
+        }
+      })
     },
     destroyTinymce() {
-      const tinymce = window.tinymce.get(this.tinymceId);
+      const tinymce = window.tinymce.get(this.tinymceId)
       if (this.fullscreen) {
-        tinymce.execCommand("mceFullScreen");
+        tinymce.execCommand('mceFullScreen')
       }
 
       if (tinymce) {
-        tinymce.destroy();
+        tinymce.destroy()
       }
     },
     setContent(value) {
-      window.tinymce.get(this.tinymceId).setContent(value);
+      window.tinymce.get(this.tinymceId).setContent(value)
     },
     getContent() {
-      window.tinymce.get(this.tinymceId).getContent();
+      window.tinymce.get(this.tinymceId).getContent()
     },
     imageSuccessCBK(arr) {
       const _this = this;
       arr.forEach((v) => {
         if (this.getFileType(v) == "video") {
-          window.tinymce.get(_this.tinymceId).insertContent( `<video class="wscnph" src="${v}" controls muted></video>`);
+          window.tinymce
+            .get(_this.tinymceId)
+            .insertContent(
+              `<video class="wscnph" src="${v}" controls muted></video>`
+            );
         } else {
-          window.tinymce.get(_this.tinymceId).insertContent(`<img class="wscnph" src="${v}" />`);
+          window.tinymce
+            .get(_this.tinymceId)
+            .insertContent(`<img class="wscnph" src="${v}" />`);
         }
       });
     },
@@ -218,7 +180,17 @@ export default {
         return "image";
       }
       // 匹配 视频
-      const videolist = ["mp4","m2v","mkv", "rmvb", "wmv","avi","flv","mov","m4v",];
+      const videolist = [
+        "mp4",
+        "m2v",
+        "mkv",
+        "rmvb",
+        "wmv",
+        "avi",
+        "flv",
+        "mov",
+        "m4v",
+      ];
       result = videolist.find((item) => item === suffix);
       if (result) {
         return "video";
@@ -226,8 +198,8 @@ export default {
       // 其他 文件类型
       return "other";
     },
-  },
-};
+  }
+}
 </script>
 
 <style scoped>
@@ -235,7 +207,7 @@ export default {
   position: relative;
   line-height: normal;
 }
-.tinymce-container >>> .mce-fullscreen {
+.tinymce-container>>>.mce-fullscreen {
   z-index: 10000;
 }
 .tinymce-textarea {