@deot/vc-components 1.0.52 → 1.0.54

package/dist/index.cjs

@@ -73,6 +73,10 @@ const defaults$2 = {
   },
   TableColumn: {
     line: nil
+  },
+  Snapshot: {
+    source: nil,
+    download: nil
   }
 };
 
@@ -10847,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);
@@ -12122,7 +12130,8 @@ const props$H = {
     default: "anonymous",
     validator: (v) => /^(|anonymous|use-credentials)$/.test(v)
   },
-  transformSource: Function,
+  source: Function,
+  download: Function,
   // 传递给snap-dom的配置项
   options: {
     type: Object,
@@ -12142,63 +12151,48 @@ const Snapshot = /* @__PURE__ */ vue.defineComponent({
     slots,
     expose
   }) {
+    let snapDOM;
+    const instance = vue.getCurrentInstance();
     const current = vue.ref();
-    const instance = vue.ref();
-
-    // 网络的图片如果没有加上crossOrigin，且没有放在第一个就会出现问题（Safari）
+    const snapdom = vue.ref();
     const refresh = async () => {
-      if (!props.crossOrigin) return;
-      const transformSource = props.transformSource || VcInstance.options.Snapshot?.transformSource || (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);
-            } 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();
-      return instance.value.toRaw();
+      return snapdom.value.toRaw();
     };
     const download = async options => {
       await refresh();
-      const _download = VcInstance.options.Snapshot?.download || (() => false);
-      const allow = _download(options);
-      if (allow && allow.then) {
-        allow.catch(() => {
-          instance.value.download(options);
+      const _download = props.download || VcInstance.options.Snapshot?.download || (() => false);
+      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 || instance.value.download(options);
+      skip || snapdom.value.download(options);
     };
     expose({
-      instance,
+      snapdom,
       refresh,
       toDataURL,
       download
     });
     vue.onMounted(async () => {
       try {
-        let snapDOM = window.snapdom || (await import('@zumer/snapdom'));
+        snapDOM = window.snapdom || (await import('@zumer/snapdom'));
         snapDOM = snapDOM.snapdom || snapDOM;
-        instance.value = await snapDOM(current.value, props.options);
+        await refresh();
         emit('ready', {
-          instance: instance.value,
+          instance,
           dependencies: {
             snapDOM
           }

package/dist/index.d.ts

@@ -8427,7 +8427,8 @@ type: StringConstructor;
 default: string;
 validator: (v: any) => boolean;
 };
-transformSource: FunctionConstructor;
+source: FunctionConstructor;
+download: FunctionConstructor;
 options: {
 type: ObjectConstructor;
 default: () => {};
@@ -8442,7 +8443,8 @@ type: StringConstructor;
 default: string;
 validator: (v: any) => boolean;
 };
-transformSource: FunctionConstructor;
+source: FunctionConstructor;
+download: FunctionConstructor;
 options: {
 type: ObjectConstructor;
 default: () => {};
@@ -13308,7 +13310,8 @@ type: StringConstructor;
 default: string;
 validator: (v: any) => boolean;
 };
-transformSource: FunctionConstructor;
+source: FunctionConstructor;
+download: FunctionConstructor;
 options: {
 type: ObjectConstructor;
 default: () => {};
@@ -13323,7 +13326,8 @@ type: StringConstructor;
 default: string;
 validator: (v: any) => boolean;
 };
-transformSource: FunctionConstructor;
+source: FunctionConstructor;
+download: FunctionConstructor;
 options: {
 type: ObjectConstructor;
 default: () => {};

package/dist/index.iife.js

@@ -35,6 +35,10 @@ var VcComponents = (function (exports, vue) {
 	  },
 	  TableColumn: {
 	    line: nil
+	  },
+	  Snapshot: {
+	    source: nil,
+	    download: nil
 	  }
 	};
 
@@ -19258,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);
@@ -20665,7 +20673,8 @@ var VcComponents = (function (exports, vue) {
 	    default: "anonymous",
 	    validator: (v) => /^(|anonymous|use-credentials)$/.test(v)
 	  },
-	  transformSource: Function,
+	  source: Function,
+	  download: Function,
 	  // 传递给snap-dom的配置项
 	  options: {
 	    type: Object,
@@ -20685,63 +20694,48 @@ var VcComponents = (function (exports, vue) {
 	    slots,
 	    expose
 	  }) {
+	    let snapDOM;
+	    const instance = vue.getCurrentInstance();
 	    const current = vue.ref();
-	    const instance = vue.ref();
-
-	    // 网络的图片如果没有加上crossOrigin，且没有放在第一个就会出现问题（Safari）
+	    const snapdom = vue.ref();
 	    const refresh = async () => {
-	      if (!props.crossOrigin) return;
-	      const transformSource = props.transformSource || VcInstance.options.Snapshot?.transformSource || (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);
-	            } 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();
-	      return instance.value.toRaw();
+	      return snapdom.value.toRaw();
 	    };
 	    const download = async options => {
 	      await refresh();
-	      const _download = VcInstance.options.Snapshot?.download || (() => false);
-	      const allow = _download(options);
-	      if (allow && allow.then) {
-	        allow.catch(() => {
-	          instance.value.download(options);
+	      const _download = props.download || VcInstance.options.Snapshot?.download || (() => false);
+	      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 || instance.value.download(options);
+	      skip || snapdom.value.download(options);
 	    };
 	    expose({
-	      instance,
+	      snapdom,
 	      refresh,
 	      toDataURL,
 	      download
 	    });
 	    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;
-	        instance.value = await snapDOM(current.value, props.options);
+	        await refresh();
 	        emit('ready', {
-	          instance: instance.value,
+	          instance,
 	          dependencies: {
 	            snapDOM
 	          }

package/dist/index.js

@@ -51,6 +51,10 @@ const defaults$2 = {
   },
   TableColumn: {
     line: nil
+  },
+  Snapshot: {
+    source: nil,
+    download: nil
   }
 };
 
@@ -10825,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);
@@ -12100,7 +12108,8 @@ const props$H = {
     default: "anonymous",
     validator: (v) => /^(|anonymous|use-credentials)$/.test(v)
   },
-  transformSource: Function,
+  source: Function,
+  download: Function,
   // 传递给snap-dom的配置项
   options: {
     type: Object,
@@ -12120,63 +12129,48 @@ const Snapshot = /* @__PURE__ */ defineComponent({
     slots,
     expose
   }) {
+    let snapDOM;
+    const instance = getCurrentInstance();
     const current = ref();
-    const instance = ref();
-
-    // 网络的图片如果没有加上crossOrigin，且没有放在第一个就会出现问题（Safari）
+    const snapdom = ref();
     const refresh = async () => {
-      if (!props.crossOrigin) return;
-      const transformSource = props.transformSource || VcInstance.options.Snapshot?.transformSource || (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);
-            } 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();
-      return instance.value.toRaw();
+      return snapdom.value.toRaw();
     };
     const download = async options => {
       await refresh();
-      const _download = VcInstance.options.Snapshot?.download || (() => false);
-      const allow = _download(options);
-      if (allow && allow.then) {
-        allow.catch(() => {
-          instance.value.download(options);
+      const _download = props.download || VcInstance.options.Snapshot?.download || (() => false);
+      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 || instance.value.download(options);
+      skip || snapdom.value.download(options);
     };
     expose({
-      instance,
+      snapdom,
       refresh,
       toDataURL,
       download
     });
     onMounted(async () => {
       try {
-        let snapDOM = window.snapdom || (await import('@zumer/snapdom'));
+        snapDOM = window.snapdom || (await import('@zumer/snapdom'));
         snapDOM = snapDOM.snapdom || snapDOM;
-        instance.value = await snapDOM(current.value, props.options);
+        await refresh();
         emit('ready', {
-          instance: instance.value,
+          instance,
           dependencies: {
             snapDOM
           }

package/dist/index.umd.cjs

@@ -38,6 +38,10 @@
 	  },
 	  TableColumn: {
 	    line: nil
+	  },
+	  Snapshot: {
+	    source: nil,
+	    download: nil
 	  }
 	};
 
@@ -19261,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);
@@ -20668,7 +20676,8 @@
 	    default: "anonymous",
 	    validator: (v) => /^(|anonymous|use-credentials)$/.test(v)
 	  },
-	  transformSource: Function,
+	  source: Function,
+	  download: Function,
 	  // 传递给snap-dom的配置项
 	  options: {
 	    type: Object,
@@ -20688,63 +20697,48 @@
 	    slots,
 	    expose
 	  }) {
+	    let snapDOM;
+	    const instance = vue.getCurrentInstance();
 	    const current = vue.ref();
-	    const instance = vue.ref();
-
-	    // 网络的图片如果没有加上crossOrigin，且没有放在第一个就会出现问题（Safari）
+	    const snapdom = vue.ref();
 	    const refresh = async () => {
-	      if (!props.crossOrigin) return;
-	      const transformSource = props.transformSource || VcInstance.options.Snapshot?.transformSource || (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);
-	            } 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();
-	      return instance.value.toRaw();
+	      return snapdom.value.toRaw();
 	    };
 	    const download = async options => {
 	      await refresh();
-	      const _download = VcInstance.options.Snapshot?.download || (() => false);
-	      const allow = _download(options);
-	      if (allow && allow.then) {
-	        allow.catch(() => {
-	          instance.value.download(options);
+	      const _download = props.download || VcInstance.options.Snapshot?.download || (() => false);
+	      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 || instance.value.download(options);
+	      skip || snapdom.value.download(options);
 	    };
 	    expose({
-	      instance,
+	      snapdom,
 	      refresh,
 	      toDataURL,
 	      download
 	    });
 	    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;
-	        instance.value = await snapDOM(current.value, props.options);
+	        await refresh();
 	        emit('ready', {
-	          instance: instance.value,
+	          instance,
 	          dependencies: {
 	            snapDOM
 	          }

package/package.json

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