zydx-plus 1.10.35 → 1.10.37

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zydx-plus",
-  "version": "1.10.35",
+  "version": "1.10.37",
   "description": "Vue.js",
   "main": "src/index.js",
   "files": [

package/src/components/editor/src/wangeditor5-for-vue3/core/editable.js

@@ -84,25 +84,31 @@ const Editable = defineComponent({
             const { mode, config, defaultContent, extendCache } = toRaw(opts).editable;
             const option = {
                 selector: rootRef.value,
-                mode: mode ?? 'default',
+                mode: mode || 'default',
                 config: Object.assign({}, config, {
                     customAlert(info, type) {
-                        opts.editable.config.customAlert?.(info, type);
+                        // opts.editable.config.customAlert?.(info, type)
+                        if(opts.editable.config.customAlert) opts.editable.config.customAlert(info, type);
                     },
                     onCreated(editor) {
-                        opts.editable.config.onCreated?.(editor);
+                        // opts.editable.config.onCreated?.(editor);
+                        if(opts.editable.config.onCreated) opts.editable.config.onCreated(editor);
                     },
                     onDestroyed(editor) {
-                        opts.editable.config.onDestroyed?.(editor);
+                        if(opts.editable.config.onDestroyed) opts.editable.config.onDestroyed(editor);
+                        // opts.editable.config.onDestroyed?.(editor);
                     },
                     onMaxLength(editor) {
-                        opts.editable.config.onMaxLength?.(editor);
+                        if(opts.editable.config.onMaxLength) opts.editable.config.onMaxLength(editor);
+                        // opts.editable.config.onMaxLength?.(editor);
                     },
                     onFocus(editor) {
-                        opts.editable.config.onFocus?.(editor);
+                        if(opts.editable.config.onFocus) opts.editable.config.onFocus(editor);
+                        // opts.editable.config.onFocus?.(editor);
                     },
                     onBlur(editor) {
-                        opts.editable.config.onBlur?.(editor);
+                        if(opts.editable.config.onBlur) opts.editable.config.onBlur(editor);
+                        // opts.editable.config.onBlur?.(editor);
                         formField.blur();
                     },
                     onChange(editor) {
@@ -117,10 +123,10 @@ const Editable = defineComponent({
                         ? content.jstr
                         : Array.isArray(defaultContent)
                             ? JSON.stringify(defaultContent)
-                            : defaultContent ?? '';
+                            : defaultContent || '';
             }
             else {
-                data = Array.isArray(defaultContent) ? JSON.stringify(defaultContent) : defaultContent ?? content.jstr;
+                data = Array.isArray(defaultContent) ? JSON.stringify(defaultContent) : defaultContent || content.jstr;
             }
             try {
                 const json = JSON.parse(data);
@@ -139,9 +145,9 @@ const Editable = defineComponent({
                 instance.editable = createEditor(createOption());
                 syncContent();
                 dispatch && emit('reloaded', createEvent());
-                if (cache.toolbar?.timer)
+                if (cache.toolbar.timer)
                     clearTimeout(cache.toolbar.timer);
-                cache.toolbar?.create();
+                cache.toolbar.create();
             },
             throttle() {
                 if (editable.timer)
@@ -218,7 +224,7 @@ const Editable = defineComponent({
             // 以 v-model:json 为主，无 v-model:json 时才会继续操作
             if (modelJson.value || !modelHtml.value)
                 return;
-            html = html ?? '';
+            html = html || '';
             if (content.html === html)
                 return;
             const { editable: inst } = instance;
@@ -248,13 +254,20 @@ const Editable = defineComponent({
         });
         // placeholder
         watch(() => opts.editable.config.placeholder, (nv) => {
-            const target = rootRef.value?.querySelector('.w-e-text-placeholder');
+            let target = null;
+            if(rootRef.value){
+                target = rootRef.value.querySelector('.w-e-text-placeholder')
+            }
             if (target instanceof HTMLElement)
-                target.innerHTML = nv ?? '';
+                target.innerHTML = nv || '';
         });
         // scroll
         watch(() => opts.editable.config.scroll, (nv) => {
-            const target = rootRef.value?.querySelector('.w-e-scroll');
+            // const target = rootRef.value?.querySelector('.w-e-scroll');
+            let target = null
+            if(rootRef.value){
+                target = rootRef.value.querySelector('.w-e-scroll')
+            }
             if (target instanceof HTMLElement)
                 target.style.overflowY = nv ? 'auto' : '';
         });

package/src/components/editor/src/wangeditor5-for-vue3/core/hooks.js

@@ -49,7 +49,11 @@ const GlobalPropertiesInit = {
     formFieldInit: () => defaultFormFieldInit
 };
 export function useWeGlobalConfig(key) {
-    const properties = getCurrentInstance()?.appContext.config.globalProperties;
+    // const properties = getCurrentInstance()?.appContext.config.globalProperties;
+    let properties = null
+    if(getCurrentInstance()) {
+        properties = getCurrentInstance().appContext.config.globalProperties;
+    }
     if (properties) {
         const name = createGlobalPropertyName(key);
         if (!Reflect.has(properties, name)) {
@@ -98,13 +102,16 @@ export function useWangEditor(option = null, formField) {
         globalAttrs: useWeGlobalConfig('attrs')
     });
     function clearContent() {
-        cache.clearContent?.();
+        if(cache.clearContent) cache.clearContent()
+        // cache.clearContent?.();
     }
     function syncContent() {
-        cache.syncContent?.();
+        if(cache.syncContent) cache.syncContent()
+        // cache.syncContent?.();
     }
     function reloadEditor() {
-        cache.editable?.create();
+        if(cache.create) cache.create()
+        // cache.editable?.create();
     }
     return { opts, instance, handle, clearContent, syncContent, reloadEditor };
 }
@@ -113,7 +120,7 @@ export function useWangEditor(option = null, formField) {
  * @param handle - 句柄
  */
 export function useWeContent(handle) {
-    return (inject(handle) ?? {
+    return (inject(handle) || {
         cache: {},
         opts: reactive(defaultOptions()),
         instance: shallowReactive({
@@ -124,4 +131,4 @@ export function useWeContent(handle) {
         formFieldInit: useWeGlobalConfig('formFieldInit').value
     });
 }
-//# sourceMappingURL=hooks.js.map
+//# sourceMappingURL=hooks.js.map

package/src/components/editor/src/wangeditor5-for-vue3/core/toolbar.js

@@ -55,7 +55,7 @@ const Toolbar = defineComponent({
             throttle() {
                 if (toolbar.timer)
                     clearTimeout(toolbar.timer);
-                if (cache.editable?.timer)
+                if (cache.editable || cache.editable.timer)
                     return;
                 toolbar.timer = setTimeout(() => {
                     toolbar.timer = null;
@@ -76,4 +76,4 @@ const Toolbar = defineComponent({
     }
 });
 export const WeToolbar = withInstall(Toolbar);
-//# sourceMappingURL=toolbar.js.map
+//# sourceMappingURL=toolbar.js.map

package/src/index.js

@@ -39,7 +39,7 @@ function install(app) {
 }
 
 export default {
-    version: '1.10.35',
+    version: '1.10.37',
     install,
     Calendar,
     Message,