@deot/vc 1.0.52 → 1.0.54

package/dist/index.d.ts

@@ -4112,7 +4112,8 @@ export declare const Components: {
     default: string;
     validator: (v: any) => boolean;
     };
-    transformSource: FunctionConstructor;
+    source: FunctionConstructor;
+    download: FunctionConstructor;
     options: {
     type: ObjectConstructor;
     default: () => {};
@@ -4127,7 +4128,8 @@ export declare const Components: {
     default: string;
     validator: (v: any) => boolean;
     };
-    transformSource: FunctionConstructor;
+    source: FunctionConstructor;
+    download: FunctionConstructor;
     options: {
     type: ObjectConstructor;
     default: () => {};
@@ -4149,7 +4151,8 @@ export declare const Components: {
     default: string;
     validator: (v: any) => boolean;
     };
-    transformSource: FunctionConstructor;
+    source: FunctionConstructor;
+    download: FunctionConstructor;
     options: {
     type: ObjectConstructor;
     default: () => {};
@@ -4164,7 +4167,8 @@ export declare const Components: {
     default: string;
     validator: (v: any) => boolean;
     };
-    transformSource: FunctionConstructor;
+    source: FunctionConstructor;
+    download: FunctionConstructor;
     options: {
     type: ObjectConstructor;
     default: () => {};

package/dist/index.iife.js

@@ -9102,6 +9102,10 @@ var Vc = (function (exports, vue) {
     },
     TableColumn: {
       line: nil
+    },
+    Snapshot: {
+      source: nil,
+      download: nil
     }
   };
   class Instance {
@@ -19313,14 +19317,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);
@@ -20547,7 +20555,8 @@ var Vc = (function (exports, vue) {
       default: "anonymous",
       validator: (v) => /^(|anonymous|use-credentials)$/.test(v)
     },
-    transformSource: Function,
+    source: Function,
+    download: Function,
     // 传递给snap-dom的配置项
     options: {
       type: Object,
@@ -20564,61 +20573,48 @@ var Vc = (function (exports, vue) {
       slots,
       expose
     }) {
+      let snapDOM;
+      const instance = vue.getCurrentInstance();
       const current = vue.ref();
-      const instance = vue.ref();
+      const snapdom = vue.ref();
       const refresh = async () => {
-        if (!props2.crossOrigin) return;
-        const transformSource = props2.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 = props2.crossOrigin;
-              image.src = `${url}?=${(/* @__PURE__ */ new Date()).getTime()}`;
-              image.onload = () => {
-                node.src = image.src;
-                resolve(1);
-              };
-              image.onerror = () => resolve(0);
-            })();
-          });
-        }));
+        await vue.nextTick();
+        snapdom.value = await snapDOM(current.value, props2.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 = props2.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, props2.options);
+          await refresh();
           emit("ready", {
-            instance: instance.value,
+            instance,
             dependencies: {
               snapDOM
             }

package/dist/index.umd.cjs

@@ -9105,6 +9105,10 @@
     },
     TableColumn: {
       line: nil
+    },
+    Snapshot: {
+      source: nil,
+      download: nil
     }
   };
   class Instance {
@@ -19316,14 +19320,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);
@@ -20550,7 +20558,8 @@
       default: "anonymous",
       validator: (v) => /^(|anonymous|use-credentials)$/.test(v)
     },
-    transformSource: Function,
+    source: Function,
+    download: Function,
     // 传递给snap-dom的配置项
     options: {
       type: Object,
@@ -20567,61 +20576,48 @@
       slots,
       expose
     }) {
+      let snapDOM;
+      const instance = vue.getCurrentInstance();
       const current = vue.ref();
-      const instance = vue.ref();
+      const snapdom = vue.ref();
       const refresh = async () => {
-        if (!props2.crossOrigin) return;
-        const transformSource = props2.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 = props2.crossOrigin;
-              image.src = `${url}?=${(/* @__PURE__ */ new Date()).getTime()}`;
-              image.onload = () => {
-                node.src = image.src;
-                resolve(1);
-              };
-              image.onerror = () => resolve(0);
-            })();
-          });
-        }));
+        await vue.nextTick();
+        snapdom.value = await snapDOM(current.value, props2.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 = props2.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, props2.options);
+          await refresh();
           emit("ready", {
-            instance: instance.value,
+            instance,
             dependencies: {
               snapDOM
             }

package/package.json

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