@deot/vc 1.0.53 → 1.0.55

package/dist/index.d.ts

@@ -4110,10 +4110,18 @@ export declare const Components: {
     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: () => {};
@@ -4126,10 +4134,18 @@ export declare const Components: {
     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: () => {};
@@ -4139,7 +4155,9 @@ export declare const Components: {
     }>, {
     tag: string;
     options: Record<string, any>;
+    showLoading: boolean;
     crossOrigin: string;
+    lazy: boolean;
     }, {}, {}, {}, string, ComponentProvideOptions, true, {}, any>;
     MSnapshot: DefineComponent<ExtractPropTypes<    {
     tag: {
@@ -4149,10 +4167,18 @@ export declare const Components: {
     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: () => {};
@@ -4165,10 +4191,18 @@ export declare const Components: {
     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: () => {};
@@ -4178,7 +4212,9 @@ export declare const Components: {
     }>, {
     tag: string;
     options: Record<string, any>;
+    showLoading: boolean;
     crossOrigin: string;
+    lazy: boolean;
     }, {}, {}, {}, string, ComponentProvideOptions, true, {}, any>;
     Icon: DefineComponent<ExtractPropTypes<    {
     type: StringConstructor;

package/dist/index.iife.js

@@ -9104,6 +9104,7 @@ var Vc = (function (exports, vue) {
       line: nil
     },
     Snapshot: {
+      options: nil,
       source: nil,
       download: nil
     }
@@ -19317,14 +19318,18 @@ var Vc = (function (exports, vue) {
         }
         let { enhancer } = VcInstance.options.Upload || {};
         enhancer = props2.enhancer || enhancer || (() => false);
-        const allow = enhancer(instance);
-        if (allow && allow.then) {
-          allow.catch(() => {
-            el2.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$ || el2.click?.();
           });
           return;
         }
-        allow || el2.click();
+        skip || el2.click();
       };
       const handleChange = (e) => {
         uploadFiles(e.target.files);
@@ -20553,6 +20558,14 @@ var Vc = (function (exports, vue) {
     },
     source: Function,
     download: Function,
+    lazy: {
+      type: Boolean,
+      default: true
+    },
+    showLoading: {
+      type: Boolean,
+      default: true
+    },
     // 传递给snap-dom的配置项
     options: {
       type: Object,
@@ -20569,60 +20582,71 @@ var Vc = (function (exports, vue) {
       slots,
       expose
     }) {
+      let snapDOM;
       const instance = vue.getCurrentInstance();
       const current = vue.ref();
-      const snapdom = vue.ref();
+      const snapshot = vue.ref();
       const refresh = async () => {
-        if (!props2.crossOrigin) return;
-        const transformSource = props2.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 = props2.crossOrigin;
-              image.src = `${url}?=${(/* @__PURE__ */ 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,
+          ...props2.options
+        });
+        return snapshot.value;
+      };
+      const onLoad = () => {
+        return props2.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 = props2.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 = props2.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, props2.options);
+          !props2.lazy && await refresh();
           emit("ready", {
             instance,
             dependencies: {

package/dist/index.umd.cjs

@@ -9107,6 +9107,7 @@
       line: nil
     },
     Snapshot: {
+      options: nil,
       source: nil,
       download: nil
     }
@@ -19320,14 +19321,18 @@
         }
         let { enhancer } = VcInstance.options.Upload || {};
         enhancer = props2.enhancer || enhancer || (() => false);
-        const allow = enhancer(instance);
-        if (allow && allow.then) {
-          allow.catch(() => {
-            el2.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$ || el2.click?.();
           });
           return;
         }
-        allow || el2.click();
+        skip || el2.click();
       };
       const handleChange = (e) => {
         uploadFiles(e.target.files);
@@ -20556,6 +20561,14 @@
     },
     source: Function,
     download: Function,
+    lazy: {
+      type: Boolean,
+      default: true
+    },
+    showLoading: {
+      type: Boolean,
+      default: true
+    },
     // 传递给snap-dom的配置项
     options: {
       type: Object,
@@ -20572,60 +20585,71 @@
       slots,
       expose
     }) {
+      let snapDOM;
       const instance = vue.getCurrentInstance();
       const current = vue.ref();
-      const snapdom = vue.ref();
+      const snapshot = vue.ref();
       const refresh = async () => {
-        if (!props2.crossOrigin) return;
-        const transformSource = props2.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 = props2.crossOrigin;
-              image.src = `${url}?=${(/* @__PURE__ */ 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,
+          ...props2.options
+        });
+        return snapshot.value;
+      };
+      const onLoad = () => {
+        return props2.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 = props2.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 = props2.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, props2.options);
+          !props2.lazy && await refresh();
           emit("ready", {
             instance,
             dependencies: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deot/vc",
-  "version": "1.0.53",
+  "version": "1.0.55",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -19,9 +19,9 @@
     "access": "public"
   },
   "dependencies": {
-    "@deot/vc-components": "^1.0.53",
-    "@deot/vc-hooks": "^1.0.53",
-    "@deot/vc-shared": "^1.0.53"
+    "@deot/vc-components": "^1.0.55",
+    "@deot/vc-hooks": "^1.0.55",
+    "@deot/vc-shared": "^1.0.55"
   },
   "peerDependencies": {
     "vue": "*"