@keyblade/tinymce-editor-vue2 1.0.4 → 1.2.1

package/README.md

@@ -6,21 +6,13 @@
 
 升级指南：https://v2.cn.vuejs.org/v2/guide/migration-vue-2-7.html
 
-## 版本区分
-- 0.x.x - 图片使用第三方 imgpond 组件
-- 1.x.x - 图片使用自己封装的 ProVue2ImageUpload 组件
-
 ## 一、安装
 ```shell
 yarn add @keyblade/tinymce-editor-vue2
 # 下面两个是编辑器需要的第三方依赖，如原项目中有，可以不用安装，但要注意版本，必须匹配，否则css样式有问题。
 
-# 0.x.x版本 需要安装如下:
-yarn add pic-viewer@0.5.1
-yarn add imgpond@0.6.2
-
-# 1.x.x版本 需要安装如下:
-yarn add @keyblade/pro-components-vue2@1.12.6
+# 需要安装如下:
+yarn add @keyblade/pro-components-vue2@1.13.1
 ```
 
 ## 二、使用
@@ -28,28 +20,13 @@ yarn add @keyblade/pro-components-vue2@1.12.6
 ```typescript
 import TinymceEditor from '@keyblade/tinymce-editor-vue2'
 
-// 0.x.x版本
-// 如原项目中，则不需要
-import PicViewer from 'pic-viewer'
-import 'pic-viewer/dist/style.css'
-
-// 如原项目中，则不需要(0.x.x版本)
-import ImgPond from 'imgpond'
-import 'imgpond/dist/style.css'
-
-Vue.use(PicViewer, {})
-Vue.use(ImgPond, {})
-
-// 1.x.x版本
 import { ProVue2ImageUpload } from '@keyblade/pro-components-vue2'
 import '@keyblade/pro-components-vue2/es/style.css'
 Vue.use(ProVue2ImageUpload)
 
-
 Vue.use(TinymceEditor, {
   // 图片
   imageUploadOptions: {
-    /** 1.x.x版本新增 */
     action: '/api/man/uploadFile/uploadSingleFile',
     handlerResponse: (response: any) => {
       return new Promise((resolve) => {
@@ -67,7 +44,6 @@ Vue.use(TinymceEditor, {
     data: (parameters: { file: File | Blob, extParameters: Record<string, any> }) => {
       return {}
     },
-    /** 1.x.x版本新增 */
     
     handleRequest: (file: File, filename: string, parameters: { extParameters: Record<string, any> }) => {
       return new Promise((resolve) => {
@@ -156,9 +132,6 @@ interface TinymceEditorGlobalOptions {
   /** 图片上传选项 */
   imageUploadOptions?: ImageUploadOptions;
   
-  /** imgPond 选项（1.x.x版本废弃） */
-  imgPondOptions?: Record<string, any>;
-
   /** 音频上传选项 */
   audioUploadOptions?: AudioUploadOptions;
 
@@ -183,9 +156,6 @@ interface ComponentOptions {
   /** 图片上传选项 */
   imageUploadOptions?: ImageUploadOptions;
   
-  /** imgPond选项（1.x.x版本废弃） */
-  imgPondOptions?: Record<string, any>;
-
   /** 音频上传组件选项 */
   audioUploadOptions?: AudioUploadOptions;
 
@@ -199,7 +169,6 @@ interface ComponentOptions {
 
 ### 3.图片上传配置
 ```typescript
-// 1.x.x版本
 export interface ImageUploadOptions {
   /** 上传的文件字段名 - 默认: file */
   name?: string;
@@ -239,34 +208,6 @@ export interface ImageUploadOptions {
     extParameters?: Record<string, any>
   }) => Promise<{success: boolean; url?: string; errorMessage?: string}>;
 }
-
-// 0.x.x版本
-export interface ImageUploadOptions {
-  /** 图片上传组件最大数量 */
-  maxCount?: number;
-  /** 图片上传组件下方文字 */
-  tipText?: string;
-  /** 图片最大值(单位M，主要用于错误提示) */
-  maxSize?: number;
-  /** 图片允许的后缀类型(小写，如: png、jpg) */
-  allowedType?: string[];
-  /** 图片最小宽度 */
-  minWidth?: number;
-  /** 图片最小高度 */
-  minHeight?: number;
-  /** 图片最大宽度 */
-  maxWidth?: number;
-  /** 图片最大高度 */
-  maxHeight?: number;
-  /** 图片上传请求处理 */
-  handleRequest?: (file: File, filename: string, options?: {
-    extParameters?: Record<string, any>
-  }) => Promise<{success: boolean; url?: string; errorMessage?: string}>;
-  /** 图片URL上传请求处理（前端跨域，交给后端处理） */
-  handleRequestByUrl?: (url: string, options?: {
-    extParameters?: Record<string, any>
-  }) => Promise<{success: boolean; url?: string; errorMessage?: string}>;
-}
 ```
 
 ### 4.视频上传配置

package/es/_virtual/_plugin-vue2_normalizer.js

@@ -1,10 +1,10 @@
-function u(e, o, t, i, a, d, f, l) {
+function f(e, o, t, d, i, a, l, u) {
   var n = typeof e == "function" ? e.options : e;
-  return o && (n.render = o, n.staticRenderFns = t, n._compiled = !0), {
+  return n.render = o, n.staticRenderFns = t, n._compiled = !0, {
     exports: e,
     options: n
   };
 }
 export {
-  u as default
+  f as default
 };

package/es/editor.vue.d.ts

@@ -1,52 +1,31 @@
 import { Editor, RawEditorOptions } from 'tinymce';
 import { AudioUploadOptions, ImageUploadOptions, VideoUploadOptions } from './types';
-
-declare const _default: import('vue').DefineComponent<__VLS_WithDefaults<__VLS_TypePropsToRuntimeProps<{
+type __VLS_Props = {
     /** vue2 v-model */
-    value?: string | undefined;
+    value?: string;
     /** 是否禁止编辑 */
-    disabled?: boolean | undefined;
+    disabled?: boolean;
     /** 额外参数 */
-    extParameters?: Record<string, any> | undefined;
+    extParameters?: Record<string, any>;
     /** 富文本编辑器选项 */
-    options?: Partial<RawEditorOptions> | undefined;
+    options?: Partial<RawEditorOptions>;
     /** 图片上传选项 */
-    imageUploadOptions?: ImageUploadOptions | undefined;
+    imageUploadOptions?: ImageUploadOptions;
     /** 音频上传组件选项 */
-    audioUploadOptions?: AudioUploadOptions | undefined;
+    audioUploadOptions?: AudioUploadOptions;
     /** 视频上传选项 */
-    videoUploadOptions?: VideoUploadOptions | undefined;
+    videoUploadOptions?: VideoUploadOptions;
     /** 初始化完成 */
-    initComplete?: ((params: {
+    initComplete?: (params: {
         editorIns: Editor;
-    }) => void) | undefined;
-}>, {
+    }) => void;
+};
+declare const _default: import('vue').DefineComponent<__VLS_WithDefaults<__VLS_TypePropsToOption<__VLS_Props>, {
     value: string;
     disabled: boolean;
     extParameters: () => {};
     options: () => {};
-}>, {}, {}, {}, {}, import('vue/types/v3-component-options').ComponentOptionsMixin, import('vue/types/v3-component-options').ComponentOptionsMixin, {
-    input: (value: string) => void;
-}, string, Readonly<import('vue').ExtractPropTypes<__VLS_WithDefaults<__VLS_TypePropsToRuntimeProps<{
-    /** vue2 v-model */
-    value?: string | undefined;
-    /** 是否禁止编辑 */
-    disabled?: boolean | undefined;
-    /** 额外参数 */
-    extParameters?: Record<string, any> | undefined;
-    /** 富文本编辑器选项 */
-    options?: Partial<RawEditorOptions> | undefined;
-    /** 图片上传选项 */
-    imageUploadOptions?: ImageUploadOptions | undefined;
-    /** 音频上传组件选项 */
-    audioUploadOptions?: AudioUploadOptions | undefined;
-    /** 视频上传选项 */
-    videoUploadOptions?: VideoUploadOptions | undefined;
-    /** 初始化完成 */
-    initComplete?: ((params: {
-        editorIns: Editor;
-    }) => void) | undefined;
-}>, {
+}>, {}, {}, {}, {}, import('vue/types/v3-component-options').ComponentOptionsMixin, import('vue/types/v3-component-options').ComponentOptionsMixin, {}, string, Readonly<import('vue').ExtractPropTypes<__VLS_WithDefaults<__VLS_TypePropsToOption<__VLS_Props>, {
     value: string;
     disabled: boolean;
     extParameters: () => {};
@@ -58,8 +37,13 @@ declare const _default: import('vue').DefineComponent<__VLS_WithDefaults<__VLS_T
     extParameters: Record<string, any>;
 }>;
 export default _default;
+type __VLS_WithDefaults<P, D> = {
+    [K in keyof Pick<P, keyof P>]: K extends keyof D ? __VLS_PrettifyLocal<P[K] & {
+        default: D[K];
+    }> : P[K];
+};
 type __VLS_NonUndefinedable<T> = T extends undefined ? never : T;
-type __VLS_TypePropsToRuntimeProps<T> = {
+type __VLS_TypePropsToOption<T> = {
     [K in keyof T]-?: {} extends Pick<T, K> ? {
         type: import('vue').PropType<__VLS_NonUndefinedable<T[K]>>;
     } : {
@@ -67,11 +51,6 @@ type __VLS_TypePropsToRuntimeProps<T> = {
         required: true;
     };
 };
-type __VLS_WithDefaults<P, D> = {
-    [K in keyof Pick<P, keyof P>]: K extends keyof D ? __VLS_Prettify<P[K] & {
-        default: D[K];
-    }> : P[K];
-};
-type __VLS_Prettify<T> = {
+type __VLS_PrettifyLocal<T> = {
     [K in keyof T]: T[K];
 } & {};

package/es/editor.vue.js

@@ -1,23 +1,23 @@
 import A from "./editor.vue2.js";
 import I from "./_virtual/_plugin-vue2_normalizer.js";
 var h = function() {
-  var i, l, s, u, d, r, p, n, m, c, g, f, C, v, F, U, _, D, E, b, y;
+  var i, l, s, d, u, r, p, n, m, c, g, f, C, v, F, U, _, D, E, b, y;
   var a = this, o = a._self._c, e = a._self._setupProxy;
   return o("div", { staticClass: "tinymce-editor" }, [o("textarea", { ref: "insRef" }), o("el-dialog", { staticClass: "tinymce-editor-dialog tinymce-editor-upload-image-dialog", attrs: { visible: e.uploadImage.dialogVisible, title: "插入图片", "append-to-body": !0, "close-on-click-modal": !1, "destroy-on-close": "" }, on: { close: e.onUploadImageClose } }, [o("el-form", { ref: "uploadImageFormRef", staticClass: "uploadImageForm", attrs: { model: e.uploadImage.formData } }, [o("el-form-item", { attrs: { prop: "images", rules: { required: !0, message: "必填项" } } }, [o("kb-pro-vue2-image-upload", a._b({ attrs: { accept: (i = e.mergeImageUploadOptions) == null ? void 0 : i.accept, action: e.mergeImageUploadOptions.action || "", data: e.getUploadImageData(), headers: e.getUploadImageHeaders(), onInnerBeforeUploadEnd: e.onUploadImageInnerBeforeUploadEnd }, model: { value: e.uploadImage.formData.images, callback: function(t) {
     a.$set(e.uploadImage.formData, "images", t);
-  }, expression: "uploadImage.formData.images" } }, "kb-pro-vue2-image-upload", e.mergeImageUploadOptions, !1))], 1), o("div", { staticClass: "tips" }, [o("span", { staticStyle: { "font-size": "15px", "font-weight": "bold" } }, [a._v("注意：")]), o("span", [a._v("1. 单次最多可同时选择" + a._s(e.mergeImageUploadOptions.singleLimit) + "张图片")]), o("span", [a._v("2. 仅支持" + a._s((s = (l = e.mergeImageUploadOptions) == null ? void 0 : l.accept) == null ? void 0 : s.map((t) => t.toUpperCase()).join("、")) + "格式")]), o("span", [a._v("3. 单张图片大小不可超过" + a._s((d = (u = e.mergeImageUploadOptions) == null ? void 0 : u.checkOptions) == null ? void 0 : d.maxSize) + "M")]), o("span", [a._v("4. 像素不低于" + a._s((p = (r = e.mergeImageUploadOptions) == null ? void 0 : r.checkOptions) == null ? void 0 : p.minWidth) + "*" + a._s((m = (n = e.mergeImageUploadOptions) == null ? void 0 : n.checkOptions) == null ? void 0 : m.minHeight) + "且像素不高于" + a._s((g = (c = e.mergeImageUploadOptions) == null ? void 0 : c.checkOptions) == null ? void 0 : g.maxWidth) + "*" + a._s((C = (f = e.mergeImageUploadOptions) == null ? void 0 : f.checkOptions) == null ? void 0 : C.maxHeight))])])], 1), o("div", { attrs: { slot: "footer" }, slot: "footer" }, [o("el-button", { on: { click: e.onUploadImageClose } }, [a._v("取消")]), o("el-button", { attrs: { type: "primary" }, on: { click: e.onUploadImageConfirm } }, [a._v("确定")])], 1)], 1), o("el-dialog", { staticClass: "tinymce-editor-dialog tinymce-editor-upload-audio-dialog", attrs: { visible: e.uploadAudio.dialogVisible, title: "插入音频", "append-to-body": !0, "close-on-click-modal": !1, "destroy-on-close": "" }, on: { close: e.onUploadAudioClose } }, [o("el-form", { ref: "uploadAudioFormRef", staticClass: "uploadAudioForm", attrs: { model: e.uploadAudio.formData, "label-width": "auto" } }, [o("el-form-item", { attrs: { label: "名称", prop: "name", rules: { required: !0, message: "必填项" } } }, [o("el-input", { attrs: { maxlength: "14", "show-word-limit": "", placeholder: "请输入" }, model: { value: e.uploadAudio.formData.name, callback: function(t) {
+  }, expression: "uploadImage.formData.images" } }, "kb-pro-vue2-image-upload", e.mergeImageUploadOptions, !1))], 1), o("div", { staticClass: "tips" }, [o("span", { staticStyle: { "font-size": "15px", "font-weight": "bold" } }, [a._v("注意：")]), o("span", [a._v("1. 单次最多可同时选择" + a._s(e.mergeImageUploadOptions.singleLimit) + "张图片")]), o("span", [a._v("2. 仅支持" + a._s((s = (l = e.mergeImageUploadOptions) == null ? void 0 : l.accept) == null ? void 0 : s.map((t) => t.toUpperCase()).join("、")) + "格式")]), o("span", [a._v("3. 单张图片大小不可超过" + a._s((u = (d = e.mergeImageUploadOptions) == null ? void 0 : d.checkOptions) == null ? void 0 : u.maxSize) + "M")]), o("span", [a._v("4. 像素不低于" + a._s((p = (r = e.mergeImageUploadOptions) == null ? void 0 : r.checkOptions) == null ? void 0 : p.minWidth) + "*" + a._s((m = (n = e.mergeImageUploadOptions) == null ? void 0 : n.checkOptions) == null ? void 0 : m.minHeight) + "且像素不高于" + a._s((g = (c = e.mergeImageUploadOptions) == null ? void 0 : c.checkOptions) == null ? void 0 : g.maxWidth) + "*" + a._s((C = (f = e.mergeImageUploadOptions) == null ? void 0 : f.checkOptions) == null ? void 0 : C.maxHeight))])])], 1), o("div", { attrs: { slot: "footer" }, slot: "footer" }, [o("el-button", { on: { click: e.onUploadImageClose } }, [a._v("取消")]), o("el-button", { attrs: { type: "primary" }, on: { click: e.onUploadImageConfirm } }, [a._v("确定")])], 1)], 1), o("el-dialog", { staticClass: "tinymce-editor-dialog tinymce-editor-upload-audio-dialog", attrs: { visible: e.uploadAudio.dialogVisible, title: "插入音频", "append-to-body": !0, "close-on-click-modal": !1, "destroy-on-close": "" }, on: { close: e.onUploadAudioClose } }, [o("el-form", { ref: "uploadAudioFormRef", staticClass: "uploadAudioForm", attrs: { model: e.uploadAudio.formData, "label-width": "auto" } }, [o("el-form-item", { attrs: { label: "名称", prop: "name", rules: { required: !0, message: "必填项" } } }, [o("el-input", { attrs: { maxlength: "14", "show-word-limit": "", placeholder: "请输入" }, model: { value: e.uploadAudio.formData.name, callback: function(t) {
     a.$set(e.uploadAudio.formData, "name", t);
   }, expression: "uploadAudio.formData.name" } })], 1), o("el-form-item", { attrs: { label: "封面", prop: "cover", rules: { required: !0, message: "必填项" } } }, [o("kb-pro-vue2-image-upload", a._b({ attrs: { accept: (v = e.mergeImageUploadOptions) == null ? void 0 : v.accept, action: e.mergeImageUploadOptions.action || "", data: e.getUploadImageData(), headers: e.getUploadImageHeaders(), onInnerBeforeUploadEnd: e.onUploadImageInnerBeforeUploadEnd, limit: 1, multiple: !1 }, model: { value: e.uploadAudio.formData.cover, callback: function(t) {
     a.$set(e.uploadAudio.formData, "cover", t);
-  }, expression: "uploadAudio.formData.cover" } }, "kb-pro-vue2-image-upload", e.mergeImageUploadOptions, !1))], 1), o("el-form-item", { attrs: { label: "音频", prop: "file", rules: { required: !0, message: "必填项" } } }, [o("el-upload", { class: ["upload", { "upload-hide": e.uploadAudio.formData.file.length >= 1 }], attrs: { name: "file", "file-list": e.uploadAudio.formData.file, action: ((F = e.mergeAudioUploadOptions) == null ? void 0 : F.action) || "", data: e.getUploadAudioData(), accept: e.mergeAudioUploadOptions.accept, "list-type": "headTextContent", "before-upload": e.onUploadAudioBeforeUpload, headers: e.getUploadAudioHeaders(), "on-remove": e.onUploadAudioRemove, "on-success": e.onUploadAudioSuccess, "on-error": e.onUploadAudioError, limit: 1 } }, [o("el-button", { attrs: { size: "small", type: "primary" } }, [a._v("上传文件"), o("i", { staticClass: "el-icon-upload el-icon--right" })]), o("div", { staticClass: "el-upload__tip", attrs: { slot: "tip" }, slot: "tip" }, [o("div", { staticClass: "tips" }, [o("p", [a._v("注意：")]), o("div", [o("span", [a._v("1. 仅支持" + a._s((_ = (U = e.mergeAudioUploadOptions) == null ? void 0 : U.allowedType) == null ? void 0 : _.map((t) => t.toUpperCase()).join("、")) + "格式")]), o("span", [a._v("2. 单个音频大小不可超过" + a._s((D = e.mergeAudioUploadOptions) == null ? void 0 : D.maxSize) + "M")])])])])], 1)], 1)], 1), o("div", { attrs: { slot: "footer" }, slot: "footer" }, [o("el-button", { on: { click: e.onUploadAudioClose } }, [a._v("取消")]), o("el-button", { attrs: { type: "primary" }, on: { click: e.onUploadAudioConfirm } }, [a._v("确定")])], 1)], 1), o("el-dialog", { staticClass: "tinymce-editor-dialog tinymce-editor-upload-video-dialog", attrs: { visible: e.uploadVideo.dialogVisible, title: "插入视频", "append-to-body": !0, "close-on-click-modal": !1, "destroy-on-close": "" }, on: { close: e.onUploadVideoClose } }, [o("el-form", { ref: "uploadVideoFormRef", staticClass: "uploadVideoForm", attrs: { model: e.uploadVideo.formData, "label-width": "auto" } }, [o("el-form-item", { attrs: { label: "视频", prop: "file", rules: { required: !0, message: "必填项" } } }, [o("el-upload", { class: ["upload", { "upload-hide": e.uploadVideo.formData.file.length >= 1 }], attrs: { name: "file", "file-list": e.uploadVideo.formData.file, action: e.mergeVideoUploadOptions.action || "", data: e.getUploadVideoData(), accept: e.mergeVideoUploadOptions.accept, "list-type": "headTextContent", "before-upload": e.onUploadVideoBeforeUpload, headers: e.getUploadVideoHeaders(), "on-remove": e.onUploadVideoRemove, "on-success": e.onUploadVideoSuccess, "on-error": e.onUploadVideoError, limit: 1 } }, [o("el-button", { attrs: { size: "small", type: "primary" } }, [a._v("上传文件"), o("i", { staticClass: "el-icon-upload el-icon--right" })]), o("div", { staticClass: "el-upload__tip", attrs: { slot: "tip" }, slot: "tip" }, [o("div", { staticClass: "tips" }, [o("p", [a._v("注意：")]), o("div", [o("span", [a._v("1. 仅支持" + a._s((b = (E = e.mergeVideoUploadOptions) == null ? void 0 : E.allowedType) == null ? void 0 : b.map((t) => t.toUpperCase()).join("、")) + "格式")]), o("span", [a._v("2. 单个视频大小不可超过" + a._s((y = e.mergeVideoUploadOptions) == null ? void 0 : y.maxSize) + "M")])])])])], 1)], 1)], 1), o("div", { attrs: { slot: "footer" }, slot: "footer" }, [o("el-button", { on: { click: e.onUploadVideoClose } }, [a._v("取消")]), o("el-button", { attrs: { type: "primary" }, on: { click: e.onUploadVideoConfirm } }, [a._v("确定")])], 1)], 1), o("el-dialog", { staticClass: "tinymce-editor-loading-dialog", attrs: { fullscreen: "", "append-to-body": "", visible: e.uploadLoadingConfig.show, "show-close": !1, "close-on-press-escape": !1, "close-on-click-modal": !1, "destroy-on-close": "" }, on: { "update:visible": function(t) {
+  }, expression: "uploadAudio.formData.cover" } }, "kb-pro-vue2-image-upload", e.mergeImageUploadOptions, !1))], 1), o("el-form-item", { attrs: { label: "音频", prop: "file", rules: { required: !0, message: "必填项" } } }, [o("el-upload", { class: ["upload", { "upload-hide": e.uploadAudio.formData.file.length >= 1 }], attrs: { name: e.mergeAudioUploadOptions.name, "file-list": e.uploadAudio.formData.file, action: ((F = e.mergeAudioUploadOptions) == null ? void 0 : F.action) || "", data: e.getUploadAudioData(), accept: e.mergeAudioUploadOptions.accept, "list-type": "headTextContent", "before-upload": e.onUploadAudioBeforeUpload, headers: e.getUploadAudioHeaders(), "on-remove": e.onUploadAudioRemove, "on-success": e.onUploadAudioSuccess, "on-error": e.onUploadAudioError, limit: 1 } }, [o("el-button", { attrs: { size: "small", type: "primary" } }, [a._v("上传文件"), o("i", { staticClass: "el-icon-upload el-icon--right" })]), o("div", { staticClass: "el-upload__tip", attrs: { slot: "tip" }, slot: "tip" }, [o("div", { staticClass: "tips" }, [o("p", [a._v("注意：")]), o("div", [o("span", [a._v("1. 仅支持" + a._s((_ = (U = e.mergeAudioUploadOptions) == null ? void 0 : U.allowedType) == null ? void 0 : _.map((t) => t.toUpperCase()).join("、")) + "格式")]), o("span", [a._v("2. 单个音频大小不可超过" + a._s((D = e.mergeAudioUploadOptions) == null ? void 0 : D.maxSize) + "M")])])])])], 1)], 1)], 1), o("div", { attrs: { slot: "footer" }, slot: "footer" }, [o("el-button", { on: { click: e.onUploadAudioClose } }, [a._v("取消")]), o("el-button", { attrs: { type: "primary" }, on: { click: e.onUploadAudioConfirm } }, [a._v("确定")])], 1)], 1), o("el-dialog", { staticClass: "tinymce-editor-dialog tinymce-editor-upload-video-dialog", attrs: { visible: e.uploadVideo.dialogVisible, title: "插入视频", "append-to-body": !0, "close-on-click-modal": !1, "destroy-on-close": "" }, on: { close: e.onUploadVideoClose } }, [o("el-form", { ref: "uploadVideoFormRef", staticClass: "uploadVideoForm", attrs: { model: e.uploadVideo.formData, "label-width": "auto" } }, [o("el-form-item", { attrs: { label: "视频", prop: "file", rules: { required: !0, message: "必填项" } } }, [o("el-upload", { class: ["upload", { "upload-hide": e.uploadVideo.formData.file.length >= 1 }], attrs: { name: e.mergeVideoUploadOptions.name, "file-list": e.uploadVideo.formData.file, action: e.mergeVideoUploadOptions.action || "", data: e.getUploadVideoData(), accept: e.mergeVideoUploadOptions.accept, "list-type": "headTextContent", "before-upload": e.onUploadVideoBeforeUpload, headers: e.getUploadVideoHeaders(), "on-remove": e.onUploadVideoRemove, "on-success": e.onUploadVideoSuccess, "on-error": e.onUploadVideoError, limit: 1 } }, [o("el-button", { attrs: { size: "small", type: "primary" } }, [a._v("上传文件"), o("i", { staticClass: "el-icon-upload el-icon--right" })]), o("div", { staticClass: "el-upload__tip", attrs: { slot: "tip" }, slot: "tip" }, [o("div", { staticClass: "tips" }, [o("p", [a._v("注意：")]), o("div", [o("span", [a._v("1. 仅支持" + a._s((b = (E = e.mergeVideoUploadOptions) == null ? void 0 : E.allowedType) == null ? void 0 : b.map((t) => t.toUpperCase()).join("、")) + "格式")]), o("span", [a._v("2. 单个视频大小不可超过" + a._s((y = e.mergeVideoUploadOptions) == null ? void 0 : y.maxSize) + "M")])])])])], 1)], 1)], 1), o("div", { attrs: { slot: "footer" }, slot: "footer" }, [o("el-button", { on: { click: e.onUploadVideoClose } }, [a._v("取消")]), o("el-button", { attrs: { type: "primary" }, on: { click: e.onUploadVideoConfirm } }, [a._v("确定")])], 1)], 1), o("el-dialog", { staticClass: "tinymce-editor-loading-dialog", attrs: { fullscreen: "", "append-to-body": "", visible: e.uploadLoadingConfig.show, "show-close": !1, "close-on-press-escape": !1, "close-on-click-modal": !1, "destroy-on-close": "" }, on: { "update:visible": function(t) {
     return a.$set(e.uploadLoadingConfig, "show", t);
   } } }, [o("div", { staticClass: "tinymce-editor-loading-dialog-content" }, [o("div", { staticClass: "tinymce-editor-spinner" }, [o("div", { staticClass: "tinymce-editor-spinner-dot1" }), o("div", { staticClass: "tinymce-editor-spinner-dot2" }), o("div", { staticClass: "tinymce-editor-spinner-dot3" })]), o("span", [a._v(a._s(e.uploadLoadingConfig.text))])])])], 1);
-}, O = [], k = /* @__PURE__ */ I(
+}, O = [], V = /* @__PURE__ */ I(
   A,
   h,
   O
 );
-const w = k.exports;
+const w = V.exports;
 export {
   w as default
 };

package/es/editor.vue2.js

@@ -29,9 +29,8 @@ var L = (u, n, i) => new Promise((O, T) => {
 });
 var G = (u, n, i) => (n = u[ce("asyncIterator")]) ? n.call(u) : (u = u[ce("iterator")](), n = {}, i = (O, T) => (T = u[O]) && (n[O] = (P) => new Promise((V, c, g) => (P = T.call(u, P), g = P.done, Promise.resolve(P.value).then((I) => V({ value: I, done: g }), c)))), i("next"), i("return"), n);
 import { defineComponent as Ee, ref as A, computed as X, onMounted as Re, onUnmounted as qe, watch as de } from "vue";
-import { oneTravelImageCheckAndTransform as Fe, oneTravelImageCompressor as We } from "@keyblade/one-travel";
-import { blobToFile as Ne, getImagePixel as Le, getFileExtension as Ge } from "./util.js";
-import "./style.less.js";
+import { oneTravelImageCheckAndTransform as Fe, oneTravelImageCompressor as We, blobToFile as Ne, getImagePixel as Le, getFileExtension as Ge } from "@keyblade/one-travel";
+/* empty css           */
 import { conclude as F } from "vue-global-config";
 import pe from "tinymce";
 import Xe from "./langs/zh_CN.js";
@@ -68,7 +67,7 @@ import "tinymce/plugins/wordcount";
 import { globalProps as W } from "./index.js";
 import { Message as b } from "element-ui";
 import { defaultImageUploadOptions as S, EImageUploadInnerBeforeUploadStep as Je } from "@keyblade/pro-components-vue2";
-const $a = /* @__PURE__ */ Ee({
+const Ha = /* @__PURE__ */ Ee({
   __name: "editor",
   props: {
     value: { default: "" },
@@ -95,11 +94,13 @@ const $a = /* @__PURE__ */ Ee({
       compressorOptions: S.compressorOptions,
       cropOptions: S.cropOptions
     }, T = {
+      name: "file",
       enable: !0,
       maxSize: 300,
       allowedType: ["avi", "wmv", "mp4", "mov", "3gp"],
       accept: ".avi,.wmv,.mp4,.mov,.3gp"
     }, P = {
+      name: "file",
       enable: !0,
       maxSize: 200,
       allowedType: ["wav", "mp3", "mp4", "m4a", "wma", "aac"],
@@ -223,8 +224,8 @@ const $a = /* @__PURE__ */ Ee({
         for (const k of [...Te, ...ze])
           k == null || k.remove();
         try {
-          for (var ie = G([...se]), Ke, qa, Fa; Ke = !(qa = yield ie.next()).done; Ke = !1) {
-            const k = qa.value;
+          for (var ie = G([...se]), Ke, Ra, qa; Ke = !(Ra = yield ie.next()).done; Ke = !1) {
+            const k = Ra.value;
             if (k.removeAttribute("crossorigin"), k.src.startsWith("http"))
               if ((l = p.value) != null && l.handleRequestByUrl) {
                 const x = yield (m = p.value) == null ? void 0 : m.handleRequestByUrl(k.src, { extParameters: i.extParameters });
@@ -236,21 +237,20 @@ const $a = /* @__PURE__ */ Ee({
             else
               k.remove(), b.error("不支持Word中批量复制图片或视频，请改为单个复制，或者从工具栏中手动插入上传");
           }
-        } catch (qa) {
-          Fa = [qa];
+        } catch (Ra) {
+          qa = [Ra];
         } finally {
           try {
-            Ke && (qa = ie.return) && (yield qa.call(ie));
+            Ke && (Ra = ie.return) && (yield Ra.call(ie));
           } finally {
-            if (Fa)
-              throw Fa[0];
+            if (qa)
+              throw qa[0];
           }
         }
         $.value.show = !1;
         const Oe = new XMLSerializer().serializeToString(H.body);
         e.insertContent(Oe);
-      } else
-        a.includes("text/plain") && e.insertContent(o.getData("text/plain"));
+      } else a.includes("text/plain") && e.insertContent(o.getData("text/plain"));
       const t = Array.from((o == null ? void 0 : o.files) || []), r = [];
       for (const z of t) {
         if (!z)
@@ -264,22 +264,22 @@ const $a = /* @__PURE__ */ Ee({
           text: "图片上传中，请稍等"
         };
         try {
-          for (var Wa = G(r), Na, La, Ga; Na = !(La = yield Wa.next()).done; Na = !1) {
-            const z = La.value;
+          for (var Fa = G(r), Wa, Na, La; Wa = !(Na = yield Fa.next()).done; Wa = !1) {
+            const z = Na.value;
             const q = yield ae(z);
             if (q) {
               const H = `<img src="${q}" alt="" />`;
               e.insertContent(H);
             }
           }
-        } catch (La) {
-          Ga = [La];
+        } catch (Na) {
+          La = [Na];
         } finally {
           try {
-            Na && (La = Wa.return) && (yield La.call(Wa));
+            Wa && (Na = Fa.return) && (yield Na.call(Fa));
           } finally {
-            if (Ga)
-              throw Ga[0];
+            if (La)
+              throw La[0];
           }
         }
         $.value.show = !1;
@@ -545,5 +545,5 @@ const $a = /* @__PURE__ */ Ee({
   }
 });
 export {
-  $a as default
+  Ha as default
 };

package/es/index.d.ts

@@ -1,6 +1,5 @@
 import { RawEditorOptions } from 'tinymce';
 import { AudioUploadOptions, ImageUploadOptions, VideoUploadOptions } from './types';
-
 interface TinymceEditorGlobalOptions {
     /** 富文本编辑器选项 */
     options?: RawEditorOptions;
@@ -74,9 +73,7 @@ declare const TinymceEditor: import('vue/types/v3-component-public-instance').Co
             editorIns: import('tinymce').Editor;
         }) => void>;
     };
-}>>, {
-    input: (value: string) => void;
-}, {
+}>>, {}, {
     options: Partial<RawEditorOptions>;
     value: string;
     disabled: boolean;
@@ -174,9 +171,7 @@ declare const TinymceEditor: import('vue/types/v3-component-public-instance').Co
             editorIns: import('tinymce').Editor;
         }) => void>;
     };
-}>>, {}, {}, {}, {}, import('vue/types/v3-component-options').ComponentOptionsMixin, import('vue/types/v3-component-options').ComponentOptionsMixin, {
-    input: (value: string) => void;
-}, string, {
+}>>, {}, {}, {}, {}, import('vue/types/v3-component-options').ComponentOptionsMixin, import('vue/types/v3-component-options').ComponentOptionsMixin, {}, string, {
     options: Partial<RawEditorOptions>;
     value: string;
     disabled: boolean;
@@ -219,5 +214,4 @@ declare const TinymceEditor: import('vue/types/v3-component-public-instance').Co
 };
 export { TinymceEditor, globalProps, type TinymceEditorGlobalOptions };
 export default TinymceEditor;
-export * from './util';
 export type {} from './components';

package/es/index.js

@@ -1,18 +1,13 @@
-import './style.css';
-import o from "./editor.vue.js";
-import { Button as s, Slider as i, Dialog as n, Upload as r, Tag as u, Form as m, FormItem as l, ButtonGroup as g, InputNumber as c, Loading as b } from "element-ui";
-import { blobToFile as I, generateUUID as y, getFileExtension as U, getImagePixel as a } from "./util.js";
-const d = {}, x = Object.assign(o, {
-  install: (e, t) => {
-    Object.assign(d, t || {}), e.use(s), e.use(i), e.use(n), e.use(r), e.use(u), e.use(m), e.use(l), e.use(g), e.use(c), e.use(b), e.component("KbTinymceEditor", o);
+import './tinymce-editor-vue2.css';
+import e from "./editor.vue.js";
+import { Button as t, Slider as u, Dialog as i, Upload as n, Tag as r, Form as m, FormItem as c, ButtonGroup as l, InputNumber as d, Loading as g } from "element-ui";
+const b = {}, y = Object.assign(e, {
+  install: (o, s) => {
+    Object.assign(b, s || {}), o.use(t), o.use(u), o.use(i), o.use(n), o.use(r), o.use(m), o.use(c), o.use(l), o.use(d), o.use(g), o.component("KbTinymceEditor", e);
   }
 });
 export {
-  x as TinymceEditor,
-  I as blobToFile,
-  x as default,
-  y as generateUUID,
-  U as getFileExtension,
-  a as getImagePixel,
-  d as globalProps
+  y as TinymceEditor,
+  y as default,
+  b as globalProps
 };

package/es/types.d.ts

@@ -1,5 +1,4 @@
-import { ImageUploadCheckOptions, ImageUploadCompressorOptions, ImageUploadCropOptions } from '@keyblade/pro-components-vue2';
-
+import { ImageUploadCheckOptions, ImageUploadCompressorOptions, ImageUploadCropOptions } from '@keyblade/one-travel';
 /** 图片选项 */
 export interface ImageUploadOptions {
     /** 上传的文件字段名 - 默认: file */
@@ -59,6 +58,8 @@ export interface ImageUploadOptions {
 }
 /** 视频选项 */
 export interface VideoUploadOptions {
+    /** 上传的文件字段名 - 默认: file */
+    name?: string;
     /** 是否启用 */
     enable?: boolean;
     /** 最大尺寸(M) */
@@ -89,6 +90,8 @@ export interface VideoUploadOptions {
 }
 /** 音频选项 */
 export interface AudioUploadOptions {
+    /** 上传的文件字段名 - 默认: file */
+    name?: string;
     /** 是否启用 */
     enable?: boolean;
     /** 最大尺寸(M) */

package/package.json

@@ -2,7 +2,7 @@
   "name": "@keyblade/tinymce-editor-vue2",
   "description": "KeyBlade Tinymce Editor Vue2",
   "author": "yangshuai <704807396@qq.com>",
-  "version": "1.0.4",
+  "version": "1.2.1",
   "private": false,
   "type": "module",
   "main": "es/index.js",
@@ -23,11 +23,11 @@
     "vue-global-config": "^0.2.6",
     "tinymce": "^7.1.0",
     "element-ui": "^2.15.14",
-    "@keyblade/one-travel": "^2.0.18"
+    "@keyblade/one-travel": "^3.0.0"
   },
   "peerDependencies": {
     "vue": "^2.7.0",
-    "@keyblade/pro-components-vue2": "^1.12.8"
+    "@keyblade/pro-components-vue2": "^1.13.2"
   },
   "scripts": {
     "build": "vite build",

package/es/style.less.js

@@ -1 +0,0 @@
-

package/es/util.d.ts

@@ -1,21 +0,0 @@
-/**
- * 获取图片像素
- * @param src url或 base64
- */
-export declare function getImagePixel(src: string): Promise<{
-    width: number;
-    height: number;
-    image: HTMLImageElement;
-} | undefined>;
-/**
- * 获取文件扩展名
- * @param filename 文件名
- */
-export declare function getFileExtension(filename: string): string;
-/**
- * blob 转 file
- * @param data
- * @param filename
- */
-export declare function blobToFile(data: File | Blob, filename: string): File;
-export declare function generateUUID(): string;

package/es/util.js

@@ -1,27 +0,0 @@
-function o(e) {
-  return new Promise((n) => {
-    const t = new Image();
-    t.onload = function() {
-      n({ width: t.width, height: t.height, image: t }), t.remove();
-    }, t.onerror = function(i) {
-      n(void 0), t.remove();
-    }, t.src = e;
-  });
-}
-function r(e) {
-  const n = e.split(".");
-  return n ? n[n.length - 1] : "";
-}
-function c(e, n) {
-  return e.name ? e : new File([e], n, { type: e.type });
-}
-function g() {
-  const e = Date.now().toString(16), n = Math.random().toString(16).slice(2);
-  return `${e}-${n}`;
-}
-export {
-  c as blobToFile,
-  g as generateUUID,
-  r as getFileExtension,
-  o as getImagePixel
-};

package/src/index.ts

@@ -1,54 +0,0 @@
-import type { RawEditorOptions } from 'tinymce'
-import _TinymceEditor from './editor.vue'
-
-// 导入 ElementUI
-import { Button, Slider, Dialog, Upload, Tag, Form, FormItem, ButtonGroup, Loading, InputNumber } from 'element-ui'
-import { AudioUploadOptions, ImageUploadOptions, VideoUploadOptions } from './types'
-
-interface TinymceEditorGlobalOptions {
-  /** 富文本编辑器选项 */
-  options?: RawEditorOptions;
-
-  /** 图片上传选项 */
-  imageUploadOptions?: ImageUploadOptions;
-
-  /** 音频上传选项 */
-  audioUploadOptions?: AudioUploadOptions;
-
-  /** 视频上传选项 */
-  videoUploadOptions?: VideoUploadOptions;
-}
-
-// 全局属性
-const globalProps: TinymceEditorGlobalOptions = {}
-
-const TinymceEditor = Object.assign(_TinymceEditor, {
-  install: (app: any, options?: TinymceEditorGlobalOptions) => {
-    // 合并
-    Object.assign(globalProps, (options || {}))
-
-    // 注入element-ui
-    app.use(Button)
-    app.use(Slider)
-    app.use(Dialog)
-    app.use(Upload)
-    app.use(Tag)
-    app.use(Form)
-    app.use(FormItem)
-    app.use(ButtonGroup)
-    app.use(InputNumber)
-    app.use(Loading)
-
-    // 注册组件
-    app.component('KbTinymceEditor', _TinymceEditor)
-  }
-})
-
-export { TinymceEditor, globalProps, type TinymceEditorGlobalOptions }
-export default TinymceEditor
-
-// 导出工具类
-export * from './util'
-
-// components.d.ts
-export type {} from './components'