@deot/vc-components 1.0.53 → 1.0.55

package/dist/index.cjs

@@ -75,6 +75,7 @@ const defaults$2 = {
     line: nil
   },
   Snapshot: {
+    options: nil,
     source: nil,
     download: nil
   }
@@ -10851,14 +10852,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);
@@ -12128,6 +12133,14 @@ const props$H = {
   },
   source: Function,
   download: Function,
+  lazy: {
+    type: Boolean,
+    default: true
+  },
+  showLoading: {
+    type: Boolean,
+    default: true
+  },
   // 传递给snap-dom的配置项
   options: {
     type: Object,
@@ -12147,62 +12160,71 @@ const Snapshot = /* @__PURE__ */ vue.defineComponent({
     slots,
     expose
   }) {
+    let snapDOM;
     const instance = vue.getCurrentInstance();
     const current = vue.ref();
-    const snapdom = vue.ref();
-
-    // 网络的图片如果没有加上crossOrigin，且没有放在第一个就会出现问题（Safari）
+    const snapshot = vue.ref();
     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();
+      snapshot.value = await snapDOM(current.value, {
+        fast: false,
+        // dom太大时会卡死一会儿
+        ...VcInstance.options.Snapshot?.options,
+        ...props.options
+      });
+      return snapshot.value;
+    };
+    const onLoad = () => {
+      return props.showLoading && Message.loading('正在生成...');
+    };
+    const onLoaded = ctx => {
+      ctx?.destroy?.();
     };
     const toDataURL = async () => {
+      const loadContext = onLoad();
+      try {
+        await refresh();
+        return snapshot.value.toRaw();
+      } finally {
+        onLoaded(loadContext);
+      }
+    };
+    const downloadByDefault = async options => {
       await refresh();
-      return snapdom.value.toRaw();
+      return snapshot.value.download(options);
     };
     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 loadContext = onLoad();
+      const downloadByUser = props.download || VcInstance.options.Snapshot?.download || (() => false);
+      const skip = downloadByUser(instance, options);
+      const done = async v => {
+        try {
+          v || (await downloadByDefault(options));
+        } finally {
+          onLoaded(loadContext);
+        }
+      };
+      if (skip && skip.then) {
+        let skip$ = false;
+        skip.then(v => {
+          skip$ = typeof v === 'undefined' ? true : !!v;
+          return v;
+        }).finally(() => done(skip$));
         return;
       }
-      allow || snapdom.value.download(options);
+      done(skip);
     };
     expose({
-      snapdom,
+      snapshot,
       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;
-        snapdom.value = await snapDOM(current.value, props.options);
+        !props.lazy && (await refresh());
         emit('ready', {
           instance,
           dependencies: {

package/dist/index.d.ts

@@ -8425,10 +8425,18 @@ default: string;
 crossOrigin: {
 type: StringConstructor;
 default: string;
-validator: (v: any) => boolean;
+validator: (v: string) => boolean;
 };
 source: FunctionConstructor;
 download: FunctionConstructor;
+lazy: {
+type: BooleanConstructor;
+default: boolean;
+};
+showLoading: {
+type: BooleanConstructor;
+default: boolean;
+};
 options: {
 type: ObjectConstructor;
 default: () => {};
@@ -8441,10 +8449,18 @@ default: string;
 crossOrigin: {
 type: StringConstructor;
 default: string;
-validator: (v: any) => boolean;
+validator: (v: string) => boolean;
 };
 source: FunctionConstructor;
 download: FunctionConstructor;
+lazy: {
+type: BooleanConstructor;
+default: boolean;
+};
+showLoading: {
+type: BooleanConstructor;
+default: boolean;
+};
 options: {
 type: ObjectConstructor;
 default: () => {};
@@ -8454,7 +8470,9 @@ onReady?: ((...args: any[]) => any) | undefined;
 }>, {
 tag: string;
 options: Record<string, any>;
+showLoading: boolean;
 crossOrigin: string;
+lazy: boolean;
 }, {}, {}, {}, string, ComponentProvideOptions, true, {}, any>;
 
 export declare const MSortList: DefineComponent<ExtractPropTypes<    {
@@ -13308,10 +13326,18 @@ default: string;
 crossOrigin: {
 type: StringConstructor;
 default: string;
-validator: (v: any) => boolean;
+validator: (v: string) => boolean;
 };
 source: FunctionConstructor;
 download: FunctionConstructor;
+lazy: {
+type: BooleanConstructor;
+default: boolean;
+};
+showLoading: {
+type: BooleanConstructor;
+default: boolean;
+};
 options: {
 type: ObjectConstructor;
 default: () => {};
@@ -13324,10 +13350,18 @@ default: string;
 crossOrigin: {
 type: StringConstructor;
 default: string;
-validator: (v: any) => boolean;
+validator: (v: string) => boolean;
 };
 source: FunctionConstructor;
 download: FunctionConstructor;
+lazy: {
+type: BooleanConstructor;
+default: boolean;
+};
+showLoading: {
+type: BooleanConstructor;
+default: boolean;
+};
 options: {
 type: ObjectConstructor;
 default: () => {};
@@ -13337,7 +13371,9 @@ onReady?: ((...args: any[]) => any) | undefined;
 }>, {
 tag: string;
 options: Record<string, any>;
+showLoading: boolean;
 crossOrigin: string;
+lazy: boolean;
 }, {}, {}, {}, string, ComponentProvideOptions, true, {}, any>;
 
 export declare const SortList: DefineComponent<ExtractPropTypes<    {

package/dist/index.iife.js

@@ -37,6 +37,7 @@ var VcComponents = (function (exports, vue) {
 	    line: nil
 	  },
 	  Snapshot: {
+	    options: nil,
 	    source: nil,
 	    download: nil
 	  }
@@ -19262,14 +19263,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);
@@ -20671,6 +20676,14 @@ var VcComponents = (function (exports, vue) {
 	  },
 	  source: Function,
 	  download: Function,
+	  lazy: {
+	    type: Boolean,
+	    default: true
+	  },
+	  showLoading: {
+	    type: Boolean,
+	    default: true
+	  },
 	  // 传递给snap-dom的配置项
 	  options: {
 	    type: Object,
@@ -20690,62 +20703,71 @@ var VcComponents = (function (exports, vue) {
 	    slots,
 	    expose
 	  }) {
+	    let snapDOM;
 	    const instance = vue.getCurrentInstance();
 	    const current = vue.ref();
-	    const snapdom = vue.ref();
-
-	    // 网络的图片如果没有加上crossOrigin，且没有放在第一个就会出现问题（Safari）
+	    const snapshot = vue.ref();
 	    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();
+	      snapshot.value = await snapDOM(current.value, {
+	        fast: false,
+	        // dom太大时会卡死一会儿
+	        ...VcInstance.options.Snapshot?.options,
+	        ...props.options
+	      });
+	      return snapshot.value;
+	    };
+	    const onLoad = () => {
+	      return props.showLoading && Message.loading('正在生成...');
+	    };
+	    const onLoaded = ctx => {
+	      ctx?.destroy?.();
 	    };
 	    const toDataURL = async () => {
+	      const loadContext = onLoad();
+	      try {
+	        await refresh();
+	        return snapshot.value.toRaw();
+	      } finally {
+	        onLoaded(loadContext);
+	      }
+	    };
+	    const downloadByDefault = async options => {
 	      await refresh();
-	      return snapdom.value.toRaw();
+	      return snapshot.value.download(options);
 	    };
 	    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 loadContext = onLoad();
+	      const downloadByUser = props.download || VcInstance.options.Snapshot?.download || (() => false);
+	      const skip = downloadByUser(instance, options);
+	      const done = async v => {
+	        try {
+	          v || (await downloadByDefault(options));
+	        } finally {
+	          onLoaded(loadContext);
+	        }
+	      };
+	      if (skip && skip.then) {
+	        let skip$ = false;
+	        skip.then(v => {
+	          skip$ = typeof v === 'undefined' ? true : !!v;
+	          return v;
+	        }).finally(() => done(skip$));
 	        return;
 	      }
-	      allow || snapdom.value.download(options);
+	      done(skip);
 	    };
 	    expose({
-	      snapdom,
+	      snapshot,
 	      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;
-	        snapdom.value = await snapDOM(current.value, props.options);
+	        !props.lazy && (await refresh());
 	        emit('ready', {
 	          instance,
 	          dependencies: {

package/dist/index.js

@@ -53,6 +53,7 @@ const defaults$2 = {
     line: nil
   },
   Snapshot: {
+    options: nil,
     source: nil,
     download: nil
   }
@@ -10829,14 +10830,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);
@@ -12106,6 +12111,14 @@ const props$H = {
   },
   source: Function,
   download: Function,
+  lazy: {
+    type: Boolean,
+    default: true
+  },
+  showLoading: {
+    type: Boolean,
+    default: true
+  },
   // 传递给snap-dom的配置项
   options: {
     type: Object,
@@ -12125,62 +12138,71 @@ const Snapshot = /* @__PURE__ */ defineComponent({
     slots,
     expose
   }) {
+    let snapDOM;
     const instance = getCurrentInstance();
     const current = ref();
-    const snapdom = ref();
-
-    // 网络的图片如果没有加上crossOrigin，且没有放在第一个就会出现问题（Safari）
+    const snapshot = ref();
     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();
+      snapshot.value = await snapDOM(current.value, {
+        fast: false,
+        // dom太大时会卡死一会儿
+        ...VcInstance.options.Snapshot?.options,
+        ...props.options
+      });
+      return snapshot.value;
+    };
+    const onLoad = () => {
+      return props.showLoading && Message.loading('正在生成...');
+    };
+    const onLoaded = ctx => {
+      ctx?.destroy?.();
     };
     const toDataURL = async () => {
+      const loadContext = onLoad();
+      try {
+        await refresh();
+        return snapshot.value.toRaw();
+      } finally {
+        onLoaded(loadContext);
+      }
+    };
+    const downloadByDefault = async options => {
       await refresh();
-      return snapdom.value.toRaw();
+      return snapshot.value.download(options);
     };
     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 loadContext = onLoad();
+      const downloadByUser = props.download || VcInstance.options.Snapshot?.download || (() => false);
+      const skip = downloadByUser(instance, options);
+      const done = async v => {
+        try {
+          v || (await downloadByDefault(options));
+        } finally {
+          onLoaded(loadContext);
+        }
+      };
+      if (skip && skip.then) {
+        let skip$ = false;
+        skip.then(v => {
+          skip$ = typeof v === 'undefined' ? true : !!v;
+          return v;
+        }).finally(() => done(skip$));
         return;
       }
-      allow || snapdom.value.download(options);
+      done(skip);
     };
     expose({
-      snapdom,
+      snapshot,
       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;
-        snapdom.value = await snapDOM(current.value, props.options);
+        !props.lazy && (await refresh());
         emit('ready', {
           instance,
           dependencies: {

package/dist/index.umd.cjs

@@ -40,6 +40,7 @@
 	    line: nil
 	  },
 	  Snapshot: {
+	    options: nil,
 	    source: nil,
 	    download: nil
 	  }
@@ -19265,14 +19266,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);
@@ -20674,6 +20679,14 @@
 	  },
 	  source: Function,
 	  download: Function,
+	  lazy: {
+	    type: Boolean,
+	    default: true
+	  },
+	  showLoading: {
+	    type: Boolean,
+	    default: true
+	  },
 	  // 传递给snap-dom的配置项
 	  options: {
 	    type: Object,
@@ -20693,62 +20706,71 @@
 	    slots,
 	    expose
 	  }) {
+	    let snapDOM;
 	    const instance = vue.getCurrentInstance();
 	    const current = vue.ref();
-	    const snapdom = vue.ref();
-
-	    // 网络的图片如果没有加上crossOrigin，且没有放在第一个就会出现问题（Safari）
+	    const snapshot = vue.ref();
 	    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();
+	      snapshot.value = await snapDOM(current.value, {
+	        fast: false,
+	        // dom太大时会卡死一会儿
+	        ...VcInstance.options.Snapshot?.options,
+	        ...props.options
+	      });
+	      return snapshot.value;
+	    };
+	    const onLoad = () => {
+	      return props.showLoading && Message.loading('正在生成...');
+	    };
+	    const onLoaded = ctx => {
+	      ctx?.destroy?.();
 	    };
 	    const toDataURL = async () => {
+	      const loadContext = onLoad();
+	      try {
+	        await refresh();
+	        return snapshot.value.toRaw();
+	      } finally {
+	        onLoaded(loadContext);
+	      }
+	    };
+	    const downloadByDefault = async options => {
 	      await refresh();
-	      return snapdom.value.toRaw();
+	      return snapshot.value.download(options);
 	    };
 	    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 loadContext = onLoad();
+	      const downloadByUser = props.download || VcInstance.options.Snapshot?.download || (() => false);
+	      const skip = downloadByUser(instance, options);
+	      const done = async v => {
+	        try {
+	          v || (await downloadByDefault(options));
+	        } finally {
+	          onLoaded(loadContext);
+	        }
+	      };
+	      if (skip && skip.then) {
+	        let skip$ = false;
+	        skip.then(v => {
+	          skip$ = typeof v === 'undefined' ? true : !!v;
+	          return v;
+	        }).finally(() => done(skip$));
 	        return;
 	      }
-	      allow || snapdom.value.download(options);
+	      done(skip);
 	    };
 	    expose({
-	      snapdom,
+	      snapshot,
 	      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;
-	        snapdom.value = await snapDOM(current.value, props.options);
+	        !props.lazy && (await refresh());
 	        emit('ready', {
 	          instance,
 	          dependencies: {

package/package.json

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