lew-ui 2.6.14 → 2.6.16

package/dist/components/tree/src/LewTreeItem.vue.d.ts

@@ -4,11 +4,11 @@ declare function __VLS_template(): {
             checked: any;
             certain: boolean;
             label: string;
-            render: Function;
             disabled: boolean;
             level: number;
             isLeaf: boolean;
             extend: Record<string, any>;
+            icon?: (() => any) | undefined;
             __key?: string | number | undefined;
         };
     }): any;
@@ -26,9 +26,9 @@ declare const __VLS_component: import('vue').DefineComponent<globalThis.ExtractP
         description: string;
         validator(value: string | number): boolean;
     };
-    render: {
-        type: FunctionConstructor;
-        default: () => void;
+    icon: {
+        type: PropType<() => any>;
+        default: undefined;
         description: string;
     };
     disabled: {
@@ -66,9 +66,9 @@ declare const __VLS_component: import('vue').DefineComponent<globalThis.ExtractP
         description: string;
         validator(value: string | number): boolean;
     };
-    render: {
-        type: FunctionConstructor;
-        default: () => void;
+    icon: {
+        type: PropType<() => any>;
+        default: undefined;
         description: string;
     };
     disabled: {
@@ -95,8 +95,8 @@ declare const __VLS_component: import('vue').DefineComponent<globalThis.ExtractP
     onChange?: ((...args: any[]) => any) | undefined;
     onExpand?: ((...args: any[]) => any) | undefined;
 }>, {
+    icon: () => any;
     label: string;
-    render: Function;
     disabled: boolean;
     level: number;
     isLeaf: boolean;

package/dist/components/tree/src/props.d.ts

@@ -116,9 +116,9 @@ export declare const treeItemProps: {
         description: string;
         validator(value: string | number): boolean;
     };
-    render: {
-        type: FunctionConstructor;
-        default: () => void;
+    icon: {
+        type: PropType<() => any>;
+        default: undefined;
         description: string;
     };
     disabled: {

package/dist/index.mjs

@@ -3499,9 +3499,7 @@ const isVueComponent = (value) => {
       return false;
     }
     if (typeof value === "function") {
-      const str = value.toString();
-      if (str.includes("return h(") || str.includes("() => h(") || str.includes("createElement"))
-        return true;
+      return true;
     }
     if (value && typeof value === "object") {
       if (value.__file || value.__name || value.setup || value.render || value.template)
@@ -3517,6 +3515,12 @@ const isVueComponent = (value) => {
     return false;
   }
 };
+const formatComponent = (value) => {
+  if (isFunction$1(value)) {
+    return value();
+  }
+  return value;
+};
 const imageProps = {
   src: {
     type: String,
@@ -8244,7 +8248,7 @@ const _sfc_main$T = /* @__PURE__ */ defineComponent({
                 }]),
                 onClick: ($event) => select(cItem)
               }, [
-                cItem.icon ? (openBlock(), createBlock(resolveDynamicComponent(cItem.icon), {
+                unref(isVueComponent)(cItem.icon) ? (openBlock(), createBlock(resolveDynamicComponent(unref(formatComponent)(cItem.icon)), {
                   key: 0,
                   class: "lew-menu-icon",
                   size: 14
@@ -8272,7 +8276,7 @@ const _sfc_main$T = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const LewMenu = /* @__PURE__ */ _export_sfc(_sfc_main$T, [["__scopeId", "data-v-68440613"]]);
+const LewMenu = /* @__PURE__ */ _export_sfc(_sfc_main$T, [["__scopeId", "data-v-e5879da8"]]);
 const menuTreeModel = {
   modelValue: {
     type: String,
@@ -8399,7 +8403,7 @@ const _sfc_main$S = /* @__PURE__ */ defineComponent({
             "lew-menu-tree-item-label-collapsed": unref(collapsed)
           }]),
           style: normalizeStyle({
-            paddingLeft: unref(collapsed) ? "0px" : _ctx.icon() ? "36px" : "11.5px"
+            paddingLeft: unref(collapsed) ? "0px" : unref(isVueComponent)(_ctx.icon) ? "36px" : "11.5px"
           }),
           onClick: withModifiers(change2, ["stop"])
         }, {
@@ -8408,22 +8412,25 @@ const _sfc_main$S = /* @__PURE__ */ defineComponent({
               key: 0,
               props: props2
             }, void 0, true) : (openBlock(), createElementBlock(Fragment, { key: 1 }, [
-              (openBlock(), createBlock(resolveDynamicComponent(_ctx.icon()), { class: "lew-menu-tree-item-icon" })),
-              unref(isVueComponent)(_ctx.label) ? (openBlock(), createBlock(resolveDynamicComponent(_ctx.label), {
+              unref(isVueComponent)(_ctx.icon) ? (openBlock(), createBlock(resolveDynamicComponent(unref(formatComponent)(_ctx.icon)), {
                 key: 0,
+                class: "lew-menu-tree-item-icon"
+              })) : createCommentVNode("", true),
+              unref(isVueComponent)(_ctx.label) ? (openBlock(), createBlock(resolveDynamicComponent(unref(formatComponent)(_ctx.label)), {
+                key: 1,
                 class: "lew-menu-tree-item-text"
               })) : (openBlock(), createBlock(_component_lew_text_trim, {
-                key: 1,
+                key: 2,
                 class: "lew-menu-tree-item-text",
                 placement: "right",
                 style: normalizeStyle({
-                  maxWidth: `calc(100% - ${_ctx.icon() ? 30 : 0}px)`
+                  maxWidth: `calc(100% - ${unref(isVueComponent)(_ctx.icon) ? 30 : 0}px)`
                 }),
                 text: _ctx.label,
                 delay: [250, 250]
               }, null, 8, ["style", "text"])),
               !_ctx.isLeaf ? (openBlock(), createBlock(Icon, {
-                key: 2,
+                key: 3,
                 class: "lew-menu-tree-item-chevron-right",
                 size: 14,
                 style: normalizeStyle({
@@ -8454,7 +8461,7 @@ const _sfc_main$S = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const LewMenuTreeItem = /* @__PURE__ */ _export_sfc(_sfc_main$S, [["__scopeId", "data-v-56731985"]]);
+const LewMenuTreeItem = /* @__PURE__ */ _export_sfc(_sfc_main$S, [["__scopeId", "data-v-968be483"]]);
 const _sfc_main$R = /* @__PURE__ */ defineComponent({
   __name: "LewMenuTree",
   props: /* @__PURE__ */ mergeModels(menuTreeProps, {
@@ -8851,7 +8858,7 @@ const _sfc_main$O = /* @__PURE__ */ defineComponent({
         default: withCtx(() => [
           (openBlock(true), createElementBlock(Fragment, null, renderList(visibleOptions.value, (option, index2) => {
             return openBlock(), createElementBlock(Fragment, null, [
-              unref(isVueComponent)(option.customRender) ? (openBlock(), createBlock(resolveDynamicComponent(option.customRender), {
+              unref(isVueComponent)(option.customRender) ? (openBlock(), createBlock(resolveDynamicComponent(unref(formatComponent)(option.customRender)), {
                 key: 0,
                 onClick: ($event) => {
                   var _a;
@@ -8865,11 +8872,11 @@ const _sfc_main$O = /* @__PURE__ */ defineComponent({
                 },
                 class: "lew-action-box-item"
               }, [
-                unref(isVueComponent)(option.icon) ? (openBlock(), createBlock(resolveDynamicComponent(option.icon), {
+                unref(isVueComponent)(option.icon) ? (openBlock(), createBlock(resolveDynamicComponent(unref(formatComponent)(option.icon)), {
                   key: 0,
                   class: "lew-action-box-icon"
                 })) : createCommentVNode("", true),
-                unref(isVueComponent)(option.label) ? (openBlock(), createBlock(resolveDynamicComponent(option.label), {
+                unref(isVueComponent)(option.label) ? (openBlock(), createBlock(resolveDynamicComponent(unref(formatComponent)(option.label)), {
                   key: 1,
                   onClick: ($event) => {
                     var _a;
@@ -8888,11 +8895,11 @@ const _sfc_main$O = /* @__PURE__ */ defineComponent({
           }, {
             default: withCtx(() => [
               createElementVNode("div", _hoisted_3$g, [
-                unref(isVueComponent)(_ctx.dropdownIcon) ? (openBlock(), createBlock(resolveDynamicComponent(_ctx.dropdownIcon), {
+                unref(isVueComponent)(_ctx.dropdownIcon) ? (openBlock(), createBlock(resolveDynamicComponent(unref(formatComponent)(_ctx.dropdownIcon)), {
                   key: 0,
                   class: "lew-action-box-icon"
                 })) : createCommentVNode("", true),
-                unref(isVueComponent)(_ctx.dropdownLabel) ? (openBlock(), createBlock(resolveDynamicComponent(_ctx.dropdownLabel), { key: 1 })) : (openBlock(), createElementBlock(Fragment, { key: 2 }, [
+                unref(isVueComponent)(_ctx.dropdownLabel) ? (openBlock(), createBlock(resolveDynamicComponent(unref(formatComponent)(_ctx.dropdownLabel)), { key: 1 })) : (openBlock(), createElementBlock(Fragment, { key: 2 }, [
                   createTextVNode(toDisplayString$1(_ctx.dropdownLabel), 1)
                 ], 64))
               ])
@@ -8905,7 +8912,7 @@ const _sfc_main$O = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const LewActionBox = /* @__PURE__ */ _export_sfc(_sfc_main$O, [["__scopeId", "data-v-19fa6d64"]]);
+const LewActionBox = /* @__PURE__ */ _export_sfc(_sfc_main$O, [["__scopeId", "data-v-0fde1e16"]]);
 const _hoisted_1$C = ["width", "height"];
 const _sfc_main$N = /* @__PURE__ */ defineComponent({
   __name: "RequiredIcon",
@@ -22817,10 +22824,9 @@ const treeItemProps = {
       return true;
     }
   },
-  render: {
+  icon: {
     type: Function,
-    default: () => {
-    },
+    default: void 0,
     description: "菜单树项的图标。"
   },
   disabled: {
@@ -23209,7 +23215,7 @@ const _sfc_main$f = /* @__PURE__ */ defineComponent({
                 certain: unref(isNodePartiallySelected)
               }
             }, void 0, true) : (openBlock(), createElementBlock(Fragment, { key: 2 }, [
-              _ctx.render() ? (openBlock(), createBlock(resolveDynamicComponent(_ctx.render()), {
+              unref(isVueComponent)(_ctx.icon) ? (openBlock(), createBlock(resolveDynamicComponent(unref(formatComponent)(_ctx.icon)), {
                 key: 0,
                 class: "lew-tree-item-text"
               })) : (openBlock(), createBlock(unref(LewTextTrim), {
@@ -23234,7 +23240,7 @@ const _sfc_main$f = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const LewTreeItem = /* @__PURE__ */ _export_sfc(_sfc_main$f, [["__scopeId", "data-v-fe37a6d7"]]);
+const LewTreeItem = /* @__PURE__ */ _export_sfc(_sfc_main$f, [["__scopeId", "data-v-71f8c23d"]]);
 const _hoisted_1$a = {
   key: 0,
   class: "lew-result-count"
@@ -25972,7 +25978,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
                   })) : createCommentVNode("", true)
                 ])) : createCommentVNode("", true),
                 createElementVNode("div", _hoisted_3$1, [
-                  unref(isVueComponent)(item.icon) ? (openBlock(), createBlock(resolveDynamicComponent(item.icon), { key: 0 })) : createCommentVNode("", true),
+                  unref(isVueComponent)(item.icon) ? (openBlock(), createBlock(resolveDynamicComponent(unref(formatComponent)(item.icon)), { key: 0 })) : createCommentVNode("", true),
                   createElementVNode("div", _hoisted_4$1, toDisplayString$1(item.label), 1)
                 ]),
                 _ctx.options.filter((e) => e.children).length > 0 ? (openBlock(), createBlock(Icon, {
@@ -26000,7 +26006,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const _LewContextMenu = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__scopeId", "data-v-ad419d70"]]);
+const _LewContextMenu = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__scopeId", "data-v-fb151e7c"]]);
 const initLewHoverMenu = () => {
   window.LewHoverMenu = {
     menu: {},
@@ -32698,6 +32704,7 @@ export {
   formProps,
   formTypeAsMap,
   formatBytes,
+  formatComponent,
   formatFormByMap,
   fr,
   getAssetsFile,