@deot/vc-components 1.0.53 → 1.0.54

package/dist/index.cjs

@@ -10851,14 +10851,18 @@ const Upload$1 = vue.defineComponent({
       }
       let { enhancer } = VcInstance.options.Upload || {};
       enhancer = props.enhancer || enhancer || (() => false);
-      const allow = enhancer(instance);
-      if (allow && allow.then) {
-        allow.catch(() => {
-          el.click?.();
+      const skip = enhancer(instance);
+      if (skip && skip.then) {
+        let skip$ = false;
+        skip.then((v) => {
+          skip$ = typeof v === "undefined" ? true : !!v;
+          return v;
+        }).finally(() => {
+          skip$ || el.click?.();
         });
         return;
       }
-      allow || el.click();
+      skip || el.click();
     };
     const handleChange = (e) => {
       uploadFiles(e.target.files);
@@ -12147,34 +12151,14 @@ const Snapshot = /* @__PURE__ */ vue.defineComponent({
     slots,
     expose
   }) {
+    let snapDOM;
     const instance = vue.getCurrentInstance();
     const current = vue.ref();
     const snapdom = vue.ref();
-
-    // 网络的图片如果没有加上crossOrigin，且没有放在第一个就会出现问题（Safari）
     const refresh = async () => {
-      if (!props.crossOrigin) return;
-      const transformSource = props.source || VcInstance.options.Snapshot?.source || (v => v);
-      return Promise.all(Array.from(current.value.querySelectorAll('img')).map(node => {
-        return new Promise(resolve => {
-          (async () => {
-            let url;
-            try {
-              url = await transformSource(node.src, 'image');
-            } catch (e) {
-              console.error(e);
-            }
-            const image = new Image();
-            image.crossOrigin = props.crossOrigin;
-            image.src = `${url}?=${new Date().getTime()}`; // 强制不缓存
-            image.onload = () => {
-              node.src = image.src;
-              resolve(1);
-            };
-            image.onerror = () => resolve(0);
-          })();
-        });
-      }));
+      await vue.nextTick();
+      snapdom.value = await snapDOM(current.value, props.options);
+      return snapdom.value;
     };
     const toDataURL = async () => {
       await refresh();
@@ -12183,14 +12167,18 @@ const Snapshot = /* @__PURE__ */ vue.defineComponent({
     const download = async options => {
       await refresh();
       const _download = props.download || VcInstance.options.Snapshot?.download || (() => false);
-      const allow = _download(instance, options);
-      if (allow && allow.then) {
-        allow.catch(() => {
-          snapdom.value.download(options);
+      const skip = _download(instance, options);
+      if (skip && skip.then) {
+        let skip$ = false;
+        skip.then(v => {
+          skip$ = typeof v === 'undefined' ? true : !!v;
+          return v;
+        }).finally(() => {
+          skip$ || snapdom.value.download(options);
         });
         return;
       }
-      allow || snapdom.value.download(options);
+      skip || snapdom.value.download(options);
     };
     expose({
       snapdom,
@@ -12200,9 +12188,9 @@ const Snapshot = /* @__PURE__ */ vue.defineComponent({
     });
     vue.onMounted(async () => {
       try {
-        let snapDOM = window.snapdom || (await import('@zumer/snapdom'));
+        snapDOM = window.snapdom || (await import('@zumer/snapdom'));
         snapDOM = snapDOM.snapdom || snapDOM;
-        snapdom.value = await snapDOM(current.value, props.options);
+        await refresh();
         emit('ready', {
           instance,
           dependencies: {

package/dist/index.iife.js

@@ -19262,14 +19262,18 @@ var VcComponents = (function (exports, vue) {
 	      }
 	      let { enhancer } = VcInstance.options.Upload || {};
 	      enhancer = props.enhancer || enhancer || (() => false);
-	      const allow = enhancer(instance);
-	      if (allow && allow.then) {
-	        allow.catch(() => {
-	          el.click?.();
+	      const skip = enhancer(instance);
+	      if (skip && skip.then) {
+	        let skip$ = false;
+	        skip.then((v) => {
+	          skip$ = typeof v === "undefined" ? true : !!v;
+	          return v;
+	        }).finally(() => {
+	          skip$ || el.click?.();
 	        });
 	        return;
 	      }
-	      allow || el.click();
+	      skip || el.click();
 	    };
 	    const handleChange = (e) => {
 	      uploadFiles(e.target.files);
@@ -20690,34 +20694,14 @@ var VcComponents = (function (exports, vue) {
 	    slots,
 	    expose
 	  }) {
+	    let snapDOM;
 	    const instance = vue.getCurrentInstance();
 	    const current = vue.ref();
 	    const snapdom = vue.ref();
-
-	    // 网络的图片如果没有加上crossOrigin，且没有放在第一个就会出现问题（Safari）
 	    const refresh = async () => {
-	      if (!props.crossOrigin) return;
-	      const transformSource = props.source || VcInstance.options.Snapshot?.source || (v => v);
-	      return Promise.all(Array.from(current.value.querySelectorAll('img')).map(node => {
-	        return new Promise(resolve => {
-	          (async () => {
-	            let url;
-	            try {
-	              url = await transformSource(node.src, 'image');
-	            } catch (e) {
-	              console.error(e);
-	            }
-	            const image = new Image();
-	            image.crossOrigin = props.crossOrigin;
-	            image.src = `${url}?=${new Date().getTime()}`; // 强制不缓存
-	            image.onload = () => {
-	              node.src = image.src;
-	              resolve(1);
-	            };
-	            image.onerror = () => resolve(0);
-	          })();
-	        });
-	      }));
+	      await vue.nextTick();
+	      snapdom.value = await snapDOM(current.value, props.options);
+	      return snapdom.value;
 	    };
 	    const toDataURL = async () => {
 	      await refresh();
@@ -20726,14 +20710,18 @@ var VcComponents = (function (exports, vue) {
 	    const download = async options => {
 	      await refresh();
 	      const _download = props.download || VcInstance.options.Snapshot?.download || (() => false);
-	      const allow = _download(instance, options);
-	      if (allow && allow.then) {
-	        allow.catch(() => {
-	          snapdom.value.download(options);
+	      const skip = _download(instance, options);
+	      if (skip && skip.then) {
+	        let skip$ = false;
+	        skip.then(v => {
+	          skip$ = typeof v === 'undefined' ? true : !!v;
+	          return v;
+	        }).finally(() => {
+	          skip$ || snapdom.value.download(options);
 	        });
 	        return;
 	      }
-	      allow || snapdom.value.download(options);
+	      skip || snapdom.value.download(options);
 	    };
 	    expose({
 	      snapdom,
@@ -20743,9 +20731,9 @@ var VcComponents = (function (exports, vue) {
 	    });
 	    vue.onMounted(async () => {
 	      try {
-	        let snapDOM = window.snapdom || (await Promise.resolve().then(() => snapdom$1));
+	        snapDOM = window.snapdom || (await Promise.resolve().then(() => snapdom$1));
 	        snapDOM = snapDOM.snapdom || snapDOM;
-	        snapdom.value = await snapDOM(current.value, props.options);
+	        await refresh();
 	        emit('ready', {
 	          instance,
 	          dependencies: {

package/dist/index.js

@@ -10829,14 +10829,18 @@ const Upload$1 = defineComponent({
       }
       let { enhancer } = VcInstance.options.Upload || {};
       enhancer = props.enhancer || enhancer || (() => false);
-      const allow = enhancer(instance);
-      if (allow && allow.then) {
-        allow.catch(() => {
-          el.click?.();
+      const skip = enhancer(instance);
+      if (skip && skip.then) {
+        let skip$ = false;
+        skip.then((v) => {
+          skip$ = typeof v === "undefined" ? true : !!v;
+          return v;
+        }).finally(() => {
+          skip$ || el.click?.();
         });
         return;
       }
-      allow || el.click();
+      skip || el.click();
     };
     const handleChange = (e) => {
       uploadFiles(e.target.files);
@@ -12125,34 +12129,14 @@ const Snapshot = /* @__PURE__ */ defineComponent({
     slots,
     expose
   }) {
+    let snapDOM;
     const instance = getCurrentInstance();
     const current = ref();
     const snapdom = ref();
-
-    // 网络的图片如果没有加上crossOrigin，且没有放在第一个就会出现问题（Safari）
     const refresh = async () => {
-      if (!props.crossOrigin) return;
-      const transformSource = props.source || VcInstance.options.Snapshot?.source || (v => v);
-      return Promise.all(Array.from(current.value.querySelectorAll('img')).map(node => {
-        return new Promise(resolve => {
-          (async () => {
-            let url;
-            try {
-              url = await transformSource(node.src, 'image');
-            } catch (e) {
-              console.error(e);
-            }
-            const image = new Image();
-            image.crossOrigin = props.crossOrigin;
-            image.src = `${url}?=${new Date().getTime()}`; // 强制不缓存
-            image.onload = () => {
-              node.src = image.src;
-              resolve(1);
-            };
-            image.onerror = () => resolve(0);
-          })();
-        });
-      }));
+      await nextTick();
+      snapdom.value = await snapDOM(current.value, props.options);
+      return snapdom.value;
     };
     const toDataURL = async () => {
       await refresh();
@@ -12161,14 +12145,18 @@ const Snapshot = /* @__PURE__ */ defineComponent({
     const download = async options => {
       await refresh();
       const _download = props.download || VcInstance.options.Snapshot?.download || (() => false);
-      const allow = _download(instance, options);
-      if (allow && allow.then) {
-        allow.catch(() => {
-          snapdom.value.download(options);
+      const skip = _download(instance, options);
+      if (skip && skip.then) {
+        let skip$ = false;
+        skip.then(v => {
+          skip$ = typeof v === 'undefined' ? true : !!v;
+          return v;
+        }).finally(() => {
+          skip$ || snapdom.value.download(options);
         });
         return;
       }
-      allow || snapdom.value.download(options);
+      skip || snapdom.value.download(options);
     };
     expose({
       snapdom,
@@ -12178,9 +12166,9 @@ const Snapshot = /* @__PURE__ */ defineComponent({
     });
     onMounted(async () => {
       try {
-        let snapDOM = window.snapdom || (await import('@zumer/snapdom'));
+        snapDOM = window.snapdom || (await import('@zumer/snapdom'));
         snapDOM = snapDOM.snapdom || snapDOM;
-        snapdom.value = await snapDOM(current.value, props.options);
+        await refresh();
         emit('ready', {
           instance,
           dependencies: {

package/dist/index.umd.cjs

@@ -19265,14 +19265,18 @@
 	      }
 	      let { enhancer } = VcInstance.options.Upload || {};
 	      enhancer = props.enhancer || enhancer || (() => false);
-	      const allow = enhancer(instance);
-	      if (allow && allow.then) {
-	        allow.catch(() => {
-	          el.click?.();
+	      const skip = enhancer(instance);
+	      if (skip && skip.then) {
+	        let skip$ = false;
+	        skip.then((v) => {
+	          skip$ = typeof v === "undefined" ? true : !!v;
+	          return v;
+	        }).finally(() => {
+	          skip$ || el.click?.();
 	        });
 	        return;
 	      }
-	      allow || el.click();
+	      skip || el.click();
 	    };
 	    const handleChange = (e) => {
 	      uploadFiles(e.target.files);
@@ -20693,34 +20697,14 @@
 	    slots,
 	    expose
 	  }) {
+	    let snapDOM;
 	    const instance = vue.getCurrentInstance();
 	    const current = vue.ref();
 	    const snapdom = vue.ref();
-
-	    // 网络的图片如果没有加上crossOrigin，且没有放在第一个就会出现问题（Safari）
 	    const refresh = async () => {
-	      if (!props.crossOrigin) return;
-	      const transformSource = props.source || VcInstance.options.Snapshot?.source || (v => v);
-	      return Promise.all(Array.from(current.value.querySelectorAll('img')).map(node => {
-	        return new Promise(resolve => {
-	          (async () => {
-	            let url;
-	            try {
-	              url = await transformSource(node.src, 'image');
-	            } catch (e) {
-	              console.error(e);
-	            }
-	            const image = new Image();
-	            image.crossOrigin = props.crossOrigin;
-	            image.src = `${url}?=${new Date().getTime()}`; // 强制不缓存
-	            image.onload = () => {
-	              node.src = image.src;
-	              resolve(1);
-	            };
-	            image.onerror = () => resolve(0);
-	          })();
-	        });
-	      }));
+	      await vue.nextTick();
+	      snapdom.value = await snapDOM(current.value, props.options);
+	      return snapdom.value;
 	    };
 	    const toDataURL = async () => {
 	      await refresh();
@@ -20729,14 +20713,18 @@
 	    const download = async options => {
 	      await refresh();
 	      const _download = props.download || VcInstance.options.Snapshot?.download || (() => false);
-	      const allow = _download(instance, options);
-	      if (allow && allow.then) {
-	        allow.catch(() => {
-	          snapdom.value.download(options);
+	      const skip = _download(instance, options);
+	      if (skip && skip.then) {
+	        let skip$ = false;
+	        skip.then(v => {
+	          skip$ = typeof v === 'undefined' ? true : !!v;
+	          return v;
+	        }).finally(() => {
+	          skip$ || snapdom.value.download(options);
 	        });
 	        return;
 	      }
-	      allow || snapdom.value.download(options);
+	      skip || snapdom.value.download(options);
 	    };
 	    expose({
 	      snapdom,
@@ -20746,9 +20734,9 @@
 	    });
 	    vue.onMounted(async () => {
 	      try {
-	        let snapDOM = window.snapdom || (await Promise.resolve().then(() => snapdom$1));
+	        snapDOM = window.snapdom || (await Promise.resolve().then(() => snapdom$1));
 	        snapDOM = snapDOM.snapdom || snapDOM;
-	        snapdom.value = await snapDOM(current.value, props.options);
+	        await refresh();
 	        emit('ready', {
 	          instance,
 	          dependencies: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deot/vc-components",
-  "version": "1.0.53",
+  "version": "1.0.54",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",