@jetlinks-web/components 2.0.24 → 2.0.26

package/es/FullPage/FullPage.js

@@ -6,7 +6,7 @@
 } */
 import { defineComponent as _defineComponent } from 'vue';
 import { unref as _unref, renderSlot as _renderSlot, createElementVNode as _createElementVNode, normalizeStyle as _normalizeStyle, openBlock as _openBlock, createElementBlock as _createElementBlock, pushScopeId as _pushScopeId, popScopeId as _popScopeId } from "vue";
-const _withScopeId = n => (_pushScopeId("data-v-1715247100159"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1715308409364"), n = n(), _popScopeId(), n);
 const _hoisted_1 = { class: "full-page-warp-content" };
 import { ref } from 'vue';
 import { useElementBounding } from '@vueuse/core';

package/es/ProLayout/Basic/BasicLayout.js

@@ -208,6 +208,7 @@ export default defineComponent({
       var menuItemRender = getSlot(slots, props, 'menuItemRender');
       var subMenuItemRender = getSlot(slots, props, 'subMenuItemRender');
       var linksRender = getSlot(slots, props, 'linksRender');
+      var logoRender = getSlot(slots, props, 'logoRender');
       var headerDom = computed(function () {
         return headerRender(_objectSpread(_objectSpread({}, props), {}, {
           menuItemRender: menuItemRender,
@@ -224,6 +225,7 @@ export default defineComponent({
           menuExtraRender: menuExtraRender,
           menuContentRender: menuContentRender,
           headerContentRender: headerContentRender,
+          logo: logoRender || props.logo,
           headerRender: customHeaderRender,
           theme: (props.theme || 'dark').toLocaleLowerCase().includes('dark') ? 'dark' : 'light'
         }), props.matchMenuKeys);
@@ -253,6 +255,7 @@ export default defineComponent({
             }, {
               default: function _default() {
                 return [!isTop.value && _createVNode(SiderMenu, _objectSpread(_objectSpread({}, restProps), {}, {
+                  "logo": logoRender || restProps.logo,
                   "menuHeaderRender": menuHeaderRender,
                   "menuExtraRender": menuExtraRender,
                   "menuContentRender": menuContentRender,
@@ -284,6 +287,7 @@ export default defineComponent({
         }, [_createVNode(Layout, null, {
           default: function _default() {
             return [_createVNode(SiderMenu, _objectSpread(_objectSpread({}, restProps), {}, {
+              "logo": logoRender || restProps.logo,
               "siderWidth": props.cardSiderWidth,
               "headerHeight": 0,
               "menuHeaderRender": menuHeaderRender,

package/es/ProLayout/PageContainer/index.js

@@ -237,7 +237,6 @@ var ProPageHeader = function ProPageHeader(props) {
       (_value$back = value.back) === null || _value$back === void 0 ? void 0 : _value$back.call(value);
     };
   }
-  console.log(props, pageHeaderTitle, value, tabList);
   var styles = value.layoutType === LayoutType.CARD ? {
     padding: props.extra || props.subTitle || pageHeaderTitle || tabList || props.extraContent || props.showBack || props.title ? '16px 24px' : '0px'
   } : {};

package/es/ProLayout/SiderMenu/SiderMenu.js

@@ -87,10 +87,14 @@ export var siderMenuProps = _objectSpread(_objectSpread(_objectSpread({}, defaul
     type: Function
   }
 });
-export var defaultRenderLogo = function defaultRenderLogo(logo, logoStyle, application, onAppMenuClick) {
+export var defaultRenderLogo = function defaultRenderLogo(logo, logoStyle, application, props) {
   if (!logo) {
     return null;
   }
+  if (typeof logo === 'function') {
+    // @ts-ignore
+    return logo();
+  }
   if (typeof logo === 'string') {
     return application.length ? _createVNode(Tooltip, {
       "placement": "rightTop",
@@ -111,7 +115,7 @@ export var defaultRenderLogo = function defaultRenderLogo(logo, logoStyle, appli
           }, [_createVNode("div", {
             "class": "sider-app-menus-item",
             "onClick": function onClick() {
-              return onAppMenuClick(item);
+              return props.onAppMenuClick(item);
             }
           }, [item.label])]);
         });
@@ -122,10 +126,6 @@ export var defaultRenderLogo = function defaultRenderLogo(logo, logoStyle, appli
       "style": logoStyle
     }, null);
   }
-  if (typeof logo === 'function') {
-    // @ts-ignore
-    return logo();
-  }
   return logo;
 };
 export var defaultRenderLogoAndTitle = function defaultRenderLogoAndTitle(props) {
@@ -137,7 +137,7 @@ export var defaultRenderLogoAndTitle = function defaultRenderLogoAndTitle(props)
     layout = props.layout,
     apps = props.apps,
     baseClassName = props.baseClassName;
-  var logoDom = defaultRenderLogo(logo, logoStyle, apps, props.onAppMenuClick);
+  var logoDom = defaultRenderLogo(logo, logoStyle, apps, props);
   if (props.layoutType === LayoutType.CARD) {
     return _createVNode("a", null, [_createTextVNode(" "), logoDom]);
   }

package/es/Search/Advanced/SaveHistory.js

@@ -21,7 +21,7 @@
 } */
 import { defineComponent as _defineComponent } from 'vue';
 import { unref as _unref, createVNode as _createVNode, withCtx as _withCtx, createTextVNode as _createTextVNode, openBlock as _openBlock, createElementBlock as _createElementBlock, createCommentVNode as _createCommentVNode, createBlock as _createBlock, pushScopeId as _pushScopeId, popScopeId as _popScopeId } from "vue";
-const _withScopeId = n => (_pushScopeId("data-v-1715247101778"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1715308410881"), n = n(), _popScopeId(), n);
 const _hoisted_1 = {
     key: 0,
     style: { "width": "240px" }

package/es/Search/Item.js

@@ -78,7 +78,7 @@ function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]
 } */
 import { defineComponent as _defineComponent } from 'vue';
 import { unref as _unref, openBlock as _openBlock, createBlock as _createBlock, createCommentVNode as _createCommentVNode, toDisplayString as _toDisplayString, createElementBlock as _createElementBlock, createVNode as _createVNode, Fragment as _Fragment, normalizeStyle as _normalizeStyle, mergeProps as _mergeProps, resolveDynamicComponent as _resolveDynamicComponent, withCtx as _withCtx, createElementVNode as _createElementVNode, pushScopeId as _pushScopeId, popScopeId as _popScopeId } from "vue";
-const _withScopeId = n => (_pushScopeId("data-v-1715247101264"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1715308410238"), n = n(), _popScopeId(), n);
 const _hoisted_1 = { class: "JSearch-item" };
 const _hoisted_2 = {
     key: 0,

package/es/Search/Search.js

@@ -36,7 +36,7 @@
 } */
 import { defineComponent as _defineComponent } from 'vue';
 import { renderList as _renderList, Fragment as _Fragment, openBlock as _openBlock, createElementBlock as _createElementBlock, createVNode as _createVNode, unref as _unref, withCtx as _withCtx, createBlock as _createBlock, renderSlot as _renderSlot, toDisplayString as _toDisplayString, createTextVNode as _createTextVNode, normalizeStyle as _normalizeStyle, createElementVNode as _createElementVNode, normalizeClass as _normalizeClass, pushScopeId as _pushScopeId, popScopeId as _popScopeId } from "vue";
-const _withScopeId = n => (_pushScopeId("data-v-1715247101363"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1715308410461"), n = n(), _popScopeId(), n);
 const _hoisted_1 = { class: "JSearch-content simple" };
 const _hoisted_2 = { class: "JSearch-items" };
 import { Button, Row, Col, Form, FormItemRest, } from 'ant-design-vue';

package/lib/FullPage/FullPage.js

@@ -6,7 +6,7 @@
 } */
 import { defineComponent as _defineComponent } from 'vue';
 import { unref as _unref, renderSlot as _renderSlot, createElementVNode as _createElementVNode, normalizeStyle as _normalizeStyle, openBlock as _openBlock, createElementBlock as _createElementBlock, pushScopeId as _pushScopeId, popScopeId as _popScopeId } from "vue";
-const _withScopeId = n => (_pushScopeId("data-v-1715247100144"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1715308409372"), n = n(), _popScopeId(), n);
 const _hoisted_1 = { class: "full-page-warp-content" };
 import { ref } from 'vue';
 import { useElementBounding } from '@vueuse/core';

package/lib/ProLayout/Basic/BasicLayout.js

@@ -217,6 +217,7 @@ var _default2 = exports.default = (0, _vue.defineComponent)({
       var menuItemRender = (0, _util.getSlot)(slots, props, 'menuItemRender');
       var subMenuItemRender = (0, _util.getSlot)(slots, props, 'subMenuItemRender');
       var linksRender = (0, _util.getSlot)(slots, props, 'linksRender');
+      var logoRender = (0, _util.getSlot)(slots, props, 'logoRender');
       var headerDom = (0, _vue.computed)(function () {
         return headerRender((0, _objectSpread2.default)((0, _objectSpread2.default)({}, props), {}, {
           menuItemRender: menuItemRender,
@@ -233,6 +234,7 @@ var _default2 = exports.default = (0, _vue.defineComponent)({
           menuExtraRender: menuExtraRender,
           menuContentRender: menuContentRender,
           headerContentRender: headerContentRender,
+          logo: logoRender || props.logo,
           headerRender: customHeaderRender,
           theme: (props.theme || 'dark').toLocaleLowerCase().includes('dark') ? 'dark' : 'light'
         }), props.matchMenuKeys);
@@ -262,6 +264,7 @@ var _default2 = exports.default = (0, _vue.defineComponent)({
             }, {
               default: function _default() {
                 return [!isTop.value && (0, _vue.createVNode)(_SiderMenu.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, restProps), {}, {
+                  "logo": logoRender || restProps.logo,
                   "menuHeaderRender": menuHeaderRender,
                   "menuExtraRender": menuExtraRender,
                   "menuContentRender": menuContentRender,
@@ -293,6 +296,7 @@ var _default2 = exports.default = (0, _vue.defineComponent)({
         }, [(0, _vue.createVNode)(_antDesignVue.Layout, null, {
           default: function _default() {
             return [(0, _vue.createVNode)(_SiderMenu.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, restProps), {}, {
+              "logo": logoRender || restProps.logo,
               "siderWidth": props.cardSiderWidth,
               "headerHeight": 0,
               "menuHeaderRender": menuHeaderRender,

package/lib/ProLayout/PageContainer/index.js

@@ -240,7 +240,6 @@ var ProPageHeader = function ProPageHeader(props) {
       (_value$back = value.back) === null || _value$back === void 0 ? void 0 : _value$back.call(value);
     };
   }
-  console.log(props, pageHeaderTitle, value, tabList);
   var styles = value.layoutType === _defaultSettings.LayoutType.CARD ? {
     padding: props.extra || props.subTitle || pageHeaderTitle || tabList || props.extraContent || props.showBack || props.title ? '16px 24px' : '0px'
   } : {};

package/lib/ProLayout/SiderMenu/SiderMenu.js

@@ -96,10 +96,14 @@ var siderMenuProps = exports.siderMenuProps = (0, _objectSpread2.default)((0, _o
     type: Function
   }
 });
-var defaultRenderLogo = exports.defaultRenderLogo = function defaultRenderLogo(logo, logoStyle, application, onAppMenuClick) {
+var defaultRenderLogo = exports.defaultRenderLogo = function defaultRenderLogo(logo, logoStyle, application, props) {
   if (!logo) {
     return null;
   }
+  if (typeof logo === 'function') {
+    // @ts-ignore
+    return logo();
+  }
   if (typeof logo === 'string') {
     return application.length ? (0, _vue.createVNode)(_antDesignVue.Tooltip, {
       "placement": "rightTop",
@@ -120,7 +124,7 @@ var defaultRenderLogo = exports.defaultRenderLogo = function defaultRenderLogo(l
           }, [(0, _vue.createVNode)("div", {
             "class": "sider-app-menus-item",
             "onClick": function onClick() {
-              return onAppMenuClick(item);
+              return props.onAppMenuClick(item);
             }
           }, [item.label])]);
         });
@@ -131,10 +135,6 @@ var defaultRenderLogo = exports.defaultRenderLogo = function defaultRenderLogo(l
       "style": logoStyle
     }, null);
   }
-  if (typeof logo === 'function') {
-    // @ts-ignore
-    return logo();
-  }
   return logo;
 };
 var defaultRenderLogoAndTitle = exports.defaultRenderLogoAndTitle = function defaultRenderLogoAndTitle(props) {
@@ -146,7 +146,7 @@ var defaultRenderLogoAndTitle = exports.defaultRenderLogoAndTitle = function def
     layout = props.layout,
     apps = props.apps,
     baseClassName = props.baseClassName;
-  var logoDom = defaultRenderLogo(logo, logoStyle, apps, props.onAppMenuClick);
+  var logoDom = defaultRenderLogo(logo, logoStyle, apps, props);
   if (props.layoutType === _defaultSettings.LayoutType.CARD) {
     return (0, _vue.createVNode)("a", null, [(0, _vue.createTextVNode)(" "), logoDom]);
   }

package/lib/Search/Advanced/SaveHistory.js

@@ -21,7 +21,7 @@
 } */
 import { defineComponent as _defineComponent } from 'vue';
 import { unref as _unref, createVNode as _createVNode, withCtx as _withCtx, createTextVNode as _createTextVNode, openBlock as _openBlock, createElementBlock as _createElementBlock, createCommentVNode as _createCommentVNode, createBlock as _createBlock, pushScopeId as _pushScopeId, popScopeId as _popScopeId } from "vue";
-const _withScopeId = n => (_pushScopeId("data-v-1715247101791"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1715308410898"), n = n(), _popScopeId(), n);
 const _hoisted_1 = {
     key: 0,
     style: { "width": "240px" }

package/lib/Search/Item.js

@@ -78,7 +78,7 @@ function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]
 } */
 import { defineComponent as _defineComponent } from 'vue';
 import { unref as _unref, openBlock as _openBlock, createBlock as _createBlock, createCommentVNode as _createCommentVNode, toDisplayString as _toDisplayString, createElementBlock as _createElementBlock, createVNode as _createVNode, Fragment as _Fragment, normalizeStyle as _normalizeStyle, mergeProps as _mergeProps, resolveDynamicComponent as _resolveDynamicComponent, withCtx as _withCtx, createElementVNode as _createElementVNode, pushScopeId as _pushScopeId, popScopeId as _popScopeId } from "vue";
-const _withScopeId = n => (_pushScopeId("data-v-1715247101189"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1715308410170"), n = n(), _popScopeId(), n);
 const _hoisted_1 = { class: "JSearch-item" };
 const _hoisted_2 = {
     key: 0,

package/lib/Search/Search.js

@@ -36,7 +36,7 @@
 } */
 import { defineComponent as _defineComponent } from 'vue';
 import { renderList as _renderList, Fragment as _Fragment, openBlock as _openBlock, createElementBlock as _createElementBlock, createVNode as _createVNode, unref as _unref, withCtx as _withCtx, createBlock as _createBlock, renderSlot as _renderSlot, toDisplayString as _toDisplayString, createTextVNode as _createTextVNode, normalizeStyle as _normalizeStyle, createElementVNode as _createElementVNode, normalizeClass as _normalizeClass, pushScopeId as _pushScopeId, popScopeId as _popScopeId } from "vue";
-const _withScopeId = n => (_pushScopeId("data-v-1715247101338"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1715308410439"), n = n(), _popScopeId(), n);
 const _hoisted_1 = { class: "JSearch-content simple" };
 const _hoisted_2 = { class: "JSearch-items" };
 import { Button, Row, Col, Form, FormItemRest, } from 'ant-design-vue';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jetlinks-web/components",
-  "version": "2.0.24",
+  "version": "2.0.26",
   "description": "",
   "main": "lib/index.js",
   "module": "es/index.js",