y-element-ultra 0.0.4 → 0.0.6

package/es/utils/common.d.ts

@@ -45,6 +45,19 @@ export declare function joinStyle(style?: StyleValue | string): string;
  * @param reduce 处理方法
  */
 export declare function normalizeStringArray(content: string | string[] | undefined, comment: Array<any>, reduce: (item: string) => string): string[];
+/**
+ * 将内容统一转换为字符串数组。
+ * 规则说明：
+ * - 如果 content 为数组，则原样返回；
+ * - 如果 content 为 null / undefined / false / ''，则返回空数组 [];
+ * - 其他情况则包装为单元素数组 [content]。
+ *
+ * @param content - 需要处理的内容
+ * @returns 规范化后的字符串数组
+ *
+ * @author 姚成健
+ */
+export declare function normalizeContentArray(content: any): any[];
 /**
  * 获取映射后的组件插槽数据
  * @param slots 原始的插槽数据

package/es/utils/common.js

@@ -88,6 +88,15 @@ function normalizeStringArray(content, comment, reduce) {
   ];
   return [flat.join("").toUpperCase()];
 }
+function normalizeContentArray(content) {
+  if (content === null || content === void 0 || content === false || content === "") {
+    return [];
+  }
+  if (Array.isArray(content)) {
+    return content;
+  }
+  return [content];
+}
 function getMappedSlots(slots, compSlotsMap, excludeMapNames, excludeSlots, reserveSlots) {
   const resultSlots = {};
   const compSlotNames = compSlotsMap || {};
@@ -200,6 +209,7 @@ export {
   getValue,
   joinStyle,
   localize,
+  normalizeContentArray,
   normalizeStringArray,
   omit,
   pick,

package/es/y-config-provider/components/receiver-view.js

@@ -1,22 +1,22 @@
-import { defineComponent as v, ref as u, computed as h, watch as l, createVNode as w } from "vue";
+import { defineComponent as v, ref as u, computed as l, watch as h, createVNode as w } from "vue";
 import x from "../../y-watermark/index";
-import { svgText as e, getProps as P, svgContents as s, svgProp as r, getOption as C } from "../../y-watermark/util";
+import { svgText as e, getProps as P, svgContents as s, svgProp as n, getOption as C } from "../../y-watermark/util";
 const b = /* @__PURE__ */ v({
   name: "ReceiverView",
   props: {
     wrapHeight: [String, Number]
   },
-  setup(g, {
-    slots: a
+  setup(a, {
+    slots: g
   }) {
-    const n = u(), o = e[e.length - 2], {
+    const o = u(), r = e[e.length - 2], {
       svgKey: p,
       svgProps: i,
       svgConfig: d
       // imageId
-    } = P(s), m = h(() => d.key), c = r[e.findIndex((t) => t === e[e.length - 1])];
-    return l(m, (t) => {
-      n.value = C(t, c, i, 2, 13, o, p, s, r, r[e.findIndex((f) => f === o)]);
+    } = P(s), f = l(() => d.key), m = n[e.findIndex((t) => t === e[e.length - 1])];
+    return h(f, (t) => {
+      o.value = C(t, m, i, 2, 13, r, p, s, n, n[e.findIndex((c) => c === r)]);
     }, {
       immediate: !0
     }), () => (
@@ -35,14 +35,14 @@ const b = /* @__PURE__ */ v({
       w(x, {
         width: 236,
         height: 74,
-        wrapHeight: g.wrapHeight,
-        disabled: !0,
-        fixed: !n.value,
+        wrapHeight: a.wrapHeight,
+        disabled: !1,
+        fixed: !o.value,
         content: "\u6C34\u5370",
         wrapPosition: !1,
         svgRender: !0
       }, {
-        default: () => [a.default?.(i)]
+        default: () => [g.default?.(i)]
       })
     );
   }

package/es/y-watermark/index.js

@@ -1,7 +1,6 @@
-import { defineComponent, ref, computed, inject, watch, onActivated, onDeactivated, createElementBlock, openBlock, normalizeStyle, unref, renderSlot, createBlock, createCommentVNode, Teleport, createVNode, normalizeProps, guardReactiveProps } from "vue";
-import { normalizeStringArray } from "../utils/common";
+import { defineComponent, ref, computed, inject, watch, onActivated, onDeactivated, createElementBlock, openBlock, normalizeStyle, unref, renderSlot, createCommentVNode } from "vue";
+import { normalizeContentArray } from "../utils/common";
 import { useMutation } from "../y-qr-code-svg/util";
-import SvgRender from "../y-qr-code-svg/components/svg-render";
 import { svgContents } from "./util";
 import { watermarkProps } from "./props";
 const _sfc_main = /* @__PURE__ */ defineComponent({
@@ -69,11 +68,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           fontStyle: "normal",
           ...props.font || {}
         },
-        contents: normalizeStringArray(
-          props.content,
-          [imageConfig && !imageConfig.id, "el", "NDSP"],
-          observeText
-        ),
+        contents: normalizeContentArray(props.content),
         image: props.image,
         width: props.width,
         height: props.height,
@@ -99,12 +94,17 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         offsetY: props.offset?.[1] ?? 0
       };
     };
-    const { imageId, imageStyleId, imageStyle, observeText, updateImageStyle } = useMutation({
+    const {
+      imageId,
+      imageStyleId,
+      imageStyle,
+      //  observeText,
+      updateImageStyle
+    } = useMutation({
       getWrapperEl: () => wrapperRef.value,
       getImageEl: () => imageRef.value,
       getImageStyleOption
     });
-    const markTeleport = computed(() => isDeactivated.value || !props.fixed);
     const markDisabled = computed(() => !props.disabled || markId.value);
     watch(
       [
@@ -145,13 +145,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           ref: imageRef,
           key: unref(imageStyleId),
           style: normalizeStyle(unref(imageStyle))
-        }, null, 4)) : svgMarkOption.value && markDisabled.value ? (openBlock(), createBlock(Teleport, {
-          key: 1,
-          to: "body",
-          disabled: markTeleport.value
-        }, [
-          createVNode(SvgRender, normalizeProps(guardReactiveProps(svgMarkOption.value)), null, 16)
-        ], 8, ["disabled"])) : createCommentVNode("", true)
+        }, null, 4)) : createCommentVNode("", true)
       ], 4);
     };
   }

package/lib/utils/common.cjs

@@ -90,6 +90,15 @@ function normalizeStringArray(content, comment, reduce) {
   ];
   return [flat.join("").toUpperCase()];
 }
+function normalizeContentArray(content) {
+  if (content === null || content === void 0 || content === false || content === "") {
+    return [];
+  }
+  if (Array.isArray(content)) {
+    return content;
+  }
+  return [content];
+}
 function getMappedSlots(slots, compSlotsMap, excludeMapNames, excludeSlots, reserveSlots) {
   const resultSlots = {};
   const compSlotNames = compSlotsMap || {};
@@ -201,6 +210,7 @@ exports.getSlotsMap = getSlotsMap;
 exports.getValue = getValue;
 exports.joinStyle = joinStyle;
 exports.localize = localize;
+exports.normalizeContentArray = normalizeContentArray;
 exports.normalizeStringArray = normalizeStringArray;
 exports.omit = omit;
 exports.pick = pick;

package/lib/utils/common.d.ts

@@ -45,6 +45,19 @@ export declare function joinStyle(style?: StyleValue | string): string;
  * @param reduce 处理方法
  */
 export declare function normalizeStringArray(content: string | string[] | undefined, comment: Array<any>, reduce: (item: string) => string): string[];
+/**
+ * 将内容统一转换为字符串数组。
+ * 规则说明：
+ * - 如果 content 为数组，则原样返回；
+ * - 如果 content 为 null / undefined / false / ''，则返回空数组 [];
+ * - 其他情况则包装为单元素数组 [content]。
+ *
+ * @param content - 需要处理的内容
+ * @returns 规范化后的字符串数组
+ *
+ * @author 姚成健
+ */
+export declare function normalizeContentArray(content: any): any[];
 /**
  * 获取映射后的组件插槽数据
  * @param slots 原始的插槽数据

package/lib/y-config-provider/components/receiver-view.cjs

@@ -1 +1 @@
-"use strict";const t=require("vue"),d=require("../../y-watermark/index"),e=require("../../y-watermark/util"),x=t.defineComponent({name:"ReceiverView",props:{wrapHeight:[String,Number]},setup(g,{slots:i}){const n=t.ref(),r=e.svgText[e.svgText.length-2],{svgKey:v,svgProps:o,svgConfig:a}=e.getProps(e.svgContents),c=t.computed(()=>a.key),p=e.svgProp[e.svgText.findIndex(s=>s===e.svgText[e.svgText.length-1])];return t.watch(c,s=>{n.value=e.getOption(s,p,o,2,13,r,v,e.svgContents,e.svgProp,e.svgProp[e.svgText.findIndex(u=>u===r)])},{immediate:!0}),()=>t.createVNode(d,{width:236,height:74,wrapHeight:g.wrapHeight,disabled:!0,fixed:!n.value,content:"\u6C34\u5370",wrapPosition:!1,svgRender:!0},{default:()=>[i.default?.(o)]})}});module.exports=x;
+"use strict";const t=require("vue"),u=require("../../y-watermark/index"),e=require("../../y-watermark/util"),f=t.defineComponent({name:"ReceiverView",props:{wrapHeight:[String,Number]},setup(g,{slots:i}){const n=t.ref(),r=e.svgText[e.svgText.length-2],{svgKey:v,svgProps:o,svgConfig:a}=e.getProps(e.svgContents),c=t.computed(()=>a.key),p=e.svgProp[e.svgText.findIndex(s=>s===e.svgText[e.svgText.length-1])];return t.watch(c,s=>{n.value=e.getOption(s,p,o,2,13,r,v,e.svgContents,e.svgProp,e.svgProp[e.svgText.findIndex(d=>d===r)])},{immediate:!0}),()=>t.createVNode(u,{width:236,height:74,wrapHeight:g.wrapHeight,disabled:!1,fixed:!n.value,content:"\u6C34\u5370",wrapPosition:!1,svgRender:!0},{default:()=>[i.default?.(o)]})}});module.exports=f;

package/lib/y-watermark/index.cjs

@@ -2,7 +2,6 @@
 const vue = require("vue");
 const common = require("../utils/common");
 const util$1 = require("../y-qr-code-svg/util");
-const SvgRender = require("../y-qr-code-svg/components/svg-render");
 const util = require("./util");
 const props = require("./props");
 const _sfc_main = /* @__PURE__ */ vue.defineComponent({
@@ -70,11 +69,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
           fontStyle: "normal",
           ...props2.font || {}
         },
-        contents: common.normalizeStringArray(
-          props2.content,
-          [imageConfig && !imageConfig.id, "el", "NDSP"],
-          observeText
-        ),
+        contents: common.normalizeContentArray(props2.content),
         image: props2.image,
         width: props2.width,
         height: props2.height,
@@ -100,12 +95,17 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         offsetY: props2.offset?.[1] ?? 0
       };
     };
-    const { imageId, imageStyleId, imageStyle, observeText, updateImageStyle } = util$1.useMutation({
+    const {
+      imageId,
+      imageStyleId,
+      imageStyle,
+      //  observeText,
+      updateImageStyle
+    } = util$1.useMutation({
       getWrapperEl: () => wrapperRef.value,
       getImageEl: () => imageRef.value,
       getImageStyleOption
     });
-    const markTeleport = vue.computed(() => isDeactivated.value || !props2.fixed);
     const markDisabled = vue.computed(() => !props2.disabled || markId.value);
     vue.watch(
       [
@@ -146,13 +146,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
           ref: imageRef,
           key: vue.unref(imageStyleId),
           style: vue.normalizeStyle(vue.unref(imageStyle))
-        }, null, 4)) : svgMarkOption.value && markDisabled.value ? (vue.openBlock(), vue.createBlock(vue.Teleport, {
-          key: 1,
-          to: "body",
-          disabled: markTeleport.value
-        }, [
-          vue.createVNode(SvgRender, vue.normalizeProps(vue.guardReactiveProps(svgMarkOption.value)), null, 16)
-        ], 8, ["disabled"])) : vue.createCommentVNode("", true)
+        }, null, 4)) : vue.createCommentVNode("", true)
       ], 4);
     };
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "y-element-ultra",
-  "version": "0.0.4",
+  "version": "0.0.6",
   "type": "module",
   "scripts": {
     "dev": "vite --host",