vue-devui 1.6.19 → 1.6.21

package/editor-md/index.es.js

@@ -58,11 +58,15 @@ function debounce(func, wait, immediate) {
     return result;
   };
 }
+function judgeFireIsElement(element) {
+  const str = Object.prototype.toString.call(element);
+  return str.includes("object") && str.includes("HTML") && str.includes("Element");
+}
 function getElement(element) {
-  if (element instanceof Element) {
+  if (element instanceof Element || judgeFireIsElement(element)) {
     return element;
   }
-  if (element && typeof element === "object" && element.$el instanceof Element) {
+  if (element && typeof element === "object" && (element.$el instanceof Element || judgeFireIsElement(element.$el))) {
     return element.$el;
   }
   return null;
@@ -1796,7 +1800,7 @@ function locale(key) {
     loading: "\u6B63\u5728\u52A0\u8F7D\u4E2D...",
     pasting: "\u60A8\u7C98\u8D34\u5185\u5BB9\u8F83\u591A, \u6B63\u5728\u52AA\u529B\u52A0\u8F7D\u4E2D\uFF0C\u8BF7\u8010\u5FC3\u7B49\u5F85..."
   };
-  return localeMap[key];
+  return localeMap[key] || key;
 }
 function _enforceMaxLength(cm, changes) {
   const maxLength = cm.getOption("maxLength");
@@ -7587,8 +7591,10 @@ function useEditorMd(props, ctx) {
     renderRef,
     containerRef,
     toolbars,
+    toolbarConfig,
     previewHtmlList,
     isHintShow,
+    customToolbars,
     getEditorIns,
     onPaste,
     previewContentChange,
@@ -8801,8 +8807,8 @@ var ToolbarItem = defineComponent({
   }
 });
 function useToolbar() {
-  const { toolbars, toolbarConfig } = inject(EditorMdInjectionKey);
-  return { toolbars, toolbarConfig };
+  const { toolbars, toolbarConfig, customToolbars } = inject(EditorMdInjectionKey);
+  return { toolbars, toolbarConfig, customToolbars };
 }
 var toolbar = "";
 var Toolbar = defineComponent({
@@ -8810,17 +8816,22 @@ var Toolbar = defineComponent({
   setup() {
     const {
       toolbars,
-      toolbarConfig
+      toolbarConfig,
+      customToolbars
     } = useToolbar();
+    const tempToolbars = {
+      ...toolbars,
+      ...customToolbars == null ? void 0 : customToolbars.value
+    };
     return () => createVNode("div", {
       "class": "md-toolbar-container"
     }, [toolbarConfig.value.map((item, index2) => Array.isArray(item) ? createVNode(Fragment, null, [item.map((key, idx) => createVNode(ToolbarItem, {
-      "config": toolbars[key],
+      "config": tempToolbars[key],
       "key": `${index2}-${idx}`
     }, null)), createVNode("span", {
       "class": "md-toolbar-span"
     }, null)]) : createVNode(ToolbarItem, {
-      "config": toolbars[item],
+      "config": tempToolbars[item],
       "key": index2
     }, null))]);
   }
@@ -9332,6 +9343,7 @@ var EditorMd = defineComponent({
     const {
       mode,
       toolbarConfig,
+      customToolbars,
       editorContainerHeight,
       hidePreviewView,
       placeholder,
@@ -9380,6 +9392,7 @@ var EditorMd = defineComponent({
       showFullscreen,
       toolbars,
       toolbarConfig,
+      customToolbars,
       getEditorIns,
       t: locale
     });