@jetlinks-web/components 2.0.25 → 2.0.27

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-1715250764327"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1715679981327"), 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

@@ -209,6 +209,7 @@ export default defineComponent({
       var subMenuItemRender = getSlot(slots, props, 'subMenuItemRender');
       var linksRender = getSlot(slots, props, 'linksRender');
       var logoRender = getSlot(slots, props, 'logoRender');
+      var historyRender = getSlot(slots, props, 'historyRender');
       var headerDom = computed(function () {
         return headerRender(_objectSpread(_objectSpread({}, props), {}, {
           menuItemRender: menuItemRender,
@@ -225,6 +226,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);
@@ -280,7 +282,7 @@ export default defineComponent({
         })])]);
       } else {
         var _slots$default3;
-        var _slot2, _slot3, _slot4;
+        var _slot2, _slot3;
         return _createVNode(_Fragment, null, [_createVNode("div", {
           "class": className.value
         }, [_createVNode(Layout, null, {
@@ -308,7 +310,7 @@ export default defineComponent({
                     padding: 0,
                     height: '40px'
                   }, props.pageHeaderStyle || {})
-                }, _isSlot(_slot3 = _createVNode(Tabs, {
+                }, _isSlot(_slot2 = _createVNode(Tabs, {
                   "hide-add": true,
                   "type": "editable-card",
                   "class": "history-tabs",
@@ -320,23 +322,23 @@ export default defineComponent({
                   "onEdit": onTabEdit,
                   "activeKey": props.historyActive,
                   "onChange": onTabChange
-                }, _isSlot(_slot2 = props.historyRoutes.map(function (item) {
-                  return _createVNode(Tabs.TabPane, {
-                    "key": item.name,
-                    "tab": item.label,
-                    "closable": true
-                  }, null);
-                })) ? _slot2 : {
+                }, {
                   default: function _default() {
-                    return [_slot2];
+                    return [historyRender ? historyRender() : props.historyRoutes.map(function (item) {
+                      return _createVNode(Tabs.TabPane, {
+                        "key": item.name,
+                        "tab": item.label,
+                        "closable": true
+                      }, null);
+                    })];
                   }
-                })) ? _slot3 : {
+                })) ? _slot2 : {
                   default: function _default() {
-                    return [_slot3];
+                    return [_slot2];
                   }
                 }), _createVNode(LayoutContent, {
                   "style": {
-                    height: "calc(100vh - 84px)",
+                    flex: '1 1 0%',
                     overflow: 'auto'
                   }
                 }, {
@@ -347,13 +349,13 @@ export default defineComponent({
                   "style": _objectSpread({
                     padding: '11px 24px'
                   }, props.pageFooterStyle || {})
-                }, _isSlot(_slot4 = _createVNode(Breadcrumb, {
+                }, _isSlot(_slot3 = _createVNode(Breadcrumb, {
                   "routes": breadcrumb.value.routes
                 }, {
                   itemRender: breadcrumb.value.itemRender
-                })) ? _slot4 : {
+                })) ? _slot3 : {
                   default: function _default() {
-                    return [_slot4];
+                    return [_slot3];
                   }
                 })];
               }

package/es/ProLayout/SiderMenu/SiderMenu.js

@@ -87,11 +87,10 @@ export var siderMenuProps = _objectSpread(_objectSpread(_objectSpread({}, defaul
     type: Function
   }
 });
-export var defaultRenderLogo = function defaultRenderLogo(logo, logoStyle, application, props, logoRender) {
+export var defaultRenderLogo = function defaultRenderLogo(logo, logoStyle, application, props) {
   if (!logo) {
     return null;
   }
-  console.log('logo', logo);
   if (typeof logo === 'function') {
     // @ts-ignore
     return logo();
@@ -131,7 +130,6 @@ export var defaultRenderLogo = function defaultRenderLogo(logo, logoStyle, appli
 };
 export var defaultRenderLogoAndTitle = function defaultRenderLogoAndTitle(props) {
   var renderKey = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'menuHeaderRender';
-  var logoRender = arguments.length > 2 ? arguments[2] : undefined;
   var _props$logo = props.logo,
     logo = _props$logo === void 0 ? 'http://demo.jetlinks.cn/static/logo.760eb65c.png' : _props$logo,
     logoStyle = props.logoStyle,
@@ -139,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, logoRender);
+  var logoDom = defaultRenderLogo(logo, logoStyle, apps, props);
   if (props.layoutType === LayoutType.CARD) {
     return _createVNode("a", null, [_createTextVNode(" "), logoDom]);
   }

package/es/ProLayout/TopHeader/index.js

@@ -97,7 +97,7 @@ export var TopNavHeader = function TopNavHeader(props) {
   // REMARK:: Any time render header title
   // layout === 'mix' ? 'headerTitleRender' : undefined,
   // layout !== 'side' ? 'headerTitleRender' : undefined,
-  'headerTitleRender', context.logoRender);
+  'headerTitleRender');
   //
   var MenusData = props.layout === 'side' ? [] : menuData;
   if (props.layout === 'mix' && props.splitMenus) {

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-1715250765671"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1715679982497"), 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-1715250765086"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1715679981884"), 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-1715250765229"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1715679982063"), 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-1715250764340"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1715679981335"), 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

@@ -218,6 +218,7 @@ var _default2 = exports.default = (0, _vue.defineComponent)({
       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 historyRender = (0, _util.getSlot)(slots, props, 'historyRender');
       var headerDom = (0, _vue.computed)(function () {
         return headerRender((0, _objectSpread2.default)((0, _objectSpread2.default)({}, props), {}, {
           menuItemRender: menuItemRender,
@@ -234,6 +235,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);
@@ -289,7 +291,7 @@ var _default2 = exports.default = (0, _vue.defineComponent)({
         })])]);
       } else {
         var _slots$default3;
-        var _slot2, _slot3, _slot4;
+        var _slot2, _slot3;
         return (0, _vue.createVNode)(_vue.Fragment, null, [(0, _vue.createVNode)("div", {
           "class": className.value
         }, [(0, _vue.createVNode)(_antDesignVue.Layout, null, {
@@ -317,7 +319,7 @@ var _default2 = exports.default = (0, _vue.defineComponent)({
                     padding: 0,
                     height: '40px'
                   }, props.pageHeaderStyle || {})
-                }, _isSlot(_slot3 = (0, _vue.createVNode)(_antDesignVue.Tabs, {
+                }, _isSlot(_slot2 = (0, _vue.createVNode)(_antDesignVue.Tabs, {
                   "hide-add": true,
                   "type": "editable-card",
                   "class": "history-tabs",
@@ -329,23 +331,23 @@ var _default2 = exports.default = (0, _vue.defineComponent)({
                   "onEdit": onTabEdit,
                   "activeKey": props.historyActive,
                   "onChange": onTabChange
-                }, _isSlot(_slot2 = props.historyRoutes.map(function (item) {
-                  return (0, _vue.createVNode)(_antDesignVue.Tabs.TabPane, {
-                    "key": item.name,
-                    "tab": item.label,
-                    "closable": true
-                  }, null);
-                })) ? _slot2 : {
+                }, {
                   default: function _default() {
-                    return [_slot2];
+                    return [historyRender ? historyRender() : props.historyRoutes.map(function (item) {
+                      return (0, _vue.createVNode)(_antDesignVue.Tabs.TabPane, {
+                        "key": item.name,
+                        "tab": item.label,
+                        "closable": true
+                      }, null);
+                    })];
                   }
-                })) ? _slot3 : {
+                })) ? _slot2 : {
                   default: function _default() {
-                    return [_slot3];
+                    return [_slot2];
                   }
                 }), (0, _vue.createVNode)(_antDesignVue.LayoutContent, {
                   "style": {
-                    height: "calc(100vh - 84px)",
+                    flex: '1 1 0%',
                     overflow: 'auto'
                   }
                 }, {
@@ -356,13 +358,13 @@ var _default2 = exports.default = (0, _vue.defineComponent)({
                   "style": (0, _objectSpread2.default)({
                     padding: '11px 24px'
                   }, props.pageFooterStyle || {})
-                }, _isSlot(_slot4 = (0, _vue.createVNode)(_antDesignVue.Breadcrumb, {
+                }, _isSlot(_slot3 = (0, _vue.createVNode)(_antDesignVue.Breadcrumb, {
                   "routes": breadcrumb.value.routes
                 }, {
                   itemRender: breadcrumb.value.itemRender
-                })) ? _slot4 : {
+                })) ? _slot3 : {
                   default: function _default() {
-                    return [_slot4];
+                    return [_slot3];
                   }
                 })];
               }

package/lib/ProLayout/SiderMenu/SiderMenu.js

@@ -96,11 +96,10 @@ var siderMenuProps = exports.siderMenuProps = (0, _objectSpread2.default)((0, _o
     type: Function
   }
 });
-var defaultRenderLogo = exports.defaultRenderLogo = function defaultRenderLogo(logo, logoStyle, application, props, logoRender) {
+var defaultRenderLogo = exports.defaultRenderLogo = function defaultRenderLogo(logo, logoStyle, application, props) {
   if (!logo) {
     return null;
   }
-  console.log('logo', logo);
   if (typeof logo === 'function') {
     // @ts-ignore
     return logo();
@@ -140,7 +139,6 @@ var defaultRenderLogo = exports.defaultRenderLogo = function defaultRenderLogo(l
 };
 var defaultRenderLogoAndTitle = exports.defaultRenderLogoAndTitle = function defaultRenderLogoAndTitle(props) {
   var renderKey = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'menuHeaderRender';
-  var logoRender = arguments.length > 2 ? arguments[2] : undefined;
   var _props$logo = props.logo,
     logo = _props$logo === void 0 ? 'http://demo.jetlinks.cn/static/logo.760eb65c.png' : _props$logo,
     logoStyle = props.logoStyle,
@@ -148,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, logoRender);
+  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/ProLayout/TopHeader/index.js

@@ -102,7 +102,7 @@ var TopNavHeader = exports.TopNavHeader = function TopNavHeader(props) {
   // REMARK:: Any time render header title
   // layout === 'mix' ? 'headerTitleRender' : undefined,
   // layout !== 'side' ? 'headerTitleRender' : undefined,
-  'headerTitleRender', context.logoRender);
+  'headerTitleRender');
   //
   var MenusData = props.layout === 'side' ? [] : menuData;
   if (props.layout === 'mix' && props.splitMenus) {

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-1715250765689"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1715679982485"), 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-1715250765161"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1715679981960"), 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-1715250765257"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1715679982041"), 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.25",
+  "version": "2.0.27",
   "description": "",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -136,7 +136,7 @@
     "webpackbar": "^5.0.2",
     "@jetlinks-web/constants": "^1.0.2",
     "@jetlinks-web/hooks": "^1.0.12",
-    "@jetlinks-web/utils": "^1.0.6"
+    "@jetlinks-web/utils": "^1.0.7"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",