@jetlinks-web/components 2.0.11 → 2.0.13

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

@@ -297,11 +297,11 @@ export default defineComponent({
             }), null), _createVNode(Layout, null, {
               default: function _default() {
                 return [_createVNode(Layout.Header, {
-                  "style": {
+                  "style": _objectSpread({
                     background: 'transparent',
                     padding: 0,
                     height: '40px'
-                  }
+                  }, props.pageHeaderStyle || {})
                 }, _isSlot(_slot3 = _createVNode(Tabs, {
                   "hide-add": true,
                   "type": "editable-card",
@@ -330,7 +330,8 @@ export default defineComponent({
                   }
                 }), _createVNode(LayoutContent, {
                   "style": {
-                    height: "calc(100vh - 84px)"
+                    height: "calc(100vh - 84px)",
+                    overflow: 'auto'
                   }
                 }, {
                   default: function _default() {
@@ -339,7 +340,7 @@ export default defineComponent({
                 }), _createVNode(Layout.Footer, {
                   "style": _objectSpread({
                     padding: '11px 24px'
-                  }, props.pageFooterStyle)
+                  }, props.pageFooterStyle || {})
                 }, _isSlot(_slot4 = _createVNode(Breadcrumb, {
                   "routes": props.breadcrumb.routes,
                   "itemRender": props.breadcrumbRender

package/es/ProLayout/SiderMenu/SiderMenu.js

@@ -1,6 +1,6 @@
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-import { createVNode as _createVNode, resolveDirective as _resolveDirective, isVNode as _isVNode, Fragment as _Fragment } from "vue";
+import { createVNode as _createVNode, resolveDirective as _resolveDirective, createTextVNode as _createTextVNode, isVNode as _isVNode, Fragment as _Fragment } from "vue";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import { LayoutSider as Sider, Menu, Tooltip } from 'ant-design-vue';
 import BaseMenu, { baseMenuProps } from './BaseMenu';
@@ -87,12 +87,36 @@ export var siderMenuProps = _objectSpread(_objectSpread(_objectSpread({}, defaul
     type: Function
   }
 });
-export var defaultRenderLogo = function defaultRenderLogo(logo, logoStyle) {
+export var defaultRenderLogo = function defaultRenderLogo(logo, logoStyle, application, onAppMenuClick) {
   if (!logo) {
     return null;
   }
   if (typeof logo === 'string') {
-    return _createVNode("img", {
+    return application.length ? _createVNode(Tooltip, {
+      "placement": "rightTop",
+      "color": "#fff",
+      "arrowPointAtCenter": true
+    }, {
+      default: function _default() {
+        return [_createVNode("img", {
+          "src": logo,
+          "alt": "logo",
+          "style": logoStyle
+        }, null)];
+      },
+      title: function title() {
+        return application.map(function (item) {
+          return _createVNode("div", {
+            "class": "sider-app-menus"
+          }, [_createVNode("div", {
+            "class": "sider-app-menus-item",
+            "onClick": function onClick() {
+              return onAppMenuClick(item);
+            }
+          }, [item.label])]);
+        });
+      }
+    }) : _createVNode("img", {
       "src": logo,
       "alt": "logo",
       "style": logoStyle
@@ -113,31 +137,11 @@ export var defaultRenderLogoAndTitle = function defaultRenderLogoAndTitle(props)
     layout = props.layout,
     apps = props.apps,
     baseClassName = props.baseClassName;
-  var logoDom = defaultRenderLogo(logo, logoStyle);
-  var renderFunction = props[renderKey || ''];
+  var logoDom = defaultRenderLogo(logo, logoStyle, apps, props.onAppMenuClick);
   if (props.layoutType === LayoutType.CARD) {
-    return _createVNode("a", null, [apps.length ? _createVNode(Tooltip, {
-      "placement": "rightTop",
-      "color": "#fff",
-      "arrowPointAtCenter": true
-    }, {
-      default: function _default() {
-        return [logoDom];
-      },
-      title: function title() {
-        return apps.map(function (item) {
-          return _createVNode("div", {
-            "class": "sider-app-menus"
-          }, [_createVNode("div", {
-            "class": "sider-app-menus-item",
-            "onClick": function onClick() {
-              return props.onAppMenuClick(item);
-            }
-          }, [item.label])]);
-        });
-      }
-    }) : logoDom]);
+    return _createVNode("a", null, [_createTextVNode(" "), logoDom]);
   }
+  var renderFunction = props[renderKey || ''];
   if (layout === 'mix' && renderFunction === false) {
     return null;
   }

package/es/ProLayout/defaultSettings.js

@@ -93,6 +93,12 @@ export var defaultSettingProps = {
       return undefined;
     }
   },
+  pageHeaderStyle: {
+    type: Object,
+    default: function _default() {
+      return undefined;
+    }
+  },
   apps: {
     type: Array,
     default: function _default() {

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-1713349162140"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1713511881052"), 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-1713349161559"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1713511878778"), 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-1713349161731"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1713511879380"), 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-1713349160977"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1713511880704"), 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

@@ -306,11 +306,11 @@ var _default2 = exports.default = (0, _vue.defineComponent)({
             }), null), (0, _vue.createVNode)(_antDesignVue.Layout, null, {
               default: function _default() {
                 return [(0, _vue.createVNode)(_antDesignVue.Layout.Header, {
-                  "style": {
+                  "style": (0, _objectSpread2.default)({
                     background: 'transparent',
                     padding: 0,
                     height: '40px'
-                  }
+                  }, props.pageHeaderStyle || {})
                 }, _isSlot(_slot3 = (0, _vue.createVNode)(_antDesignVue.Tabs, {
                   "hide-add": true,
                   "type": "editable-card",
@@ -339,7 +339,8 @@ var _default2 = exports.default = (0, _vue.defineComponent)({
                   }
                 }), (0, _vue.createVNode)(_antDesignVue.LayoutContent, {
                   "style": {
-                    height: "calc(100vh - 84px)"
+                    height: "calc(100vh - 84px)",
+                    overflow: 'auto'
                   }
                 }, {
                   default: function _default() {
@@ -348,7 +349,7 @@ var _default2 = exports.default = (0, _vue.defineComponent)({
                 }), (0, _vue.createVNode)(_antDesignVue.Layout.Footer, {
                   "style": (0, _objectSpread2.default)({
                     padding: '11px 24px'
-                  }, props.pageFooterStyle)
+                  }, props.pageFooterStyle || {})
                 }, _isSlot(_slot4 = (0, _vue.createVNode)(_antDesignVue.Breadcrumb, {
                   "routes": props.breadcrumb.routes,
                   "itemRender": props.breadcrumbRender

package/lib/ProLayout/SiderMenu/SiderMenu.js

@@ -96,12 +96,36 @@ var siderMenuProps = exports.siderMenuProps = (0, _objectSpread2.default)((0, _o
     type: Function
   }
 });
-var defaultRenderLogo = exports.defaultRenderLogo = function defaultRenderLogo(logo, logoStyle) {
+var defaultRenderLogo = exports.defaultRenderLogo = function defaultRenderLogo(logo, logoStyle, application, onAppMenuClick) {
   if (!logo) {
     return null;
   }
   if (typeof logo === 'string') {
-    return (0, _vue.createVNode)("img", {
+    return application.length ? (0, _vue.createVNode)(_antDesignVue.Tooltip, {
+      "placement": "rightTop",
+      "color": "#fff",
+      "arrowPointAtCenter": true
+    }, {
+      default: function _default() {
+        return [(0, _vue.createVNode)("img", {
+          "src": logo,
+          "alt": "logo",
+          "style": logoStyle
+        }, null)];
+      },
+      title: function title() {
+        return application.map(function (item) {
+          return (0, _vue.createVNode)("div", {
+            "class": "sider-app-menus"
+          }, [(0, _vue.createVNode)("div", {
+            "class": "sider-app-menus-item",
+            "onClick": function onClick() {
+              return onAppMenuClick(item);
+            }
+          }, [item.label])]);
+        });
+      }
+    }) : (0, _vue.createVNode)("img", {
       "src": logo,
       "alt": "logo",
       "style": logoStyle
@@ -122,31 +146,11 @@ var defaultRenderLogoAndTitle = exports.defaultRenderLogoAndTitle = function def
     layout = props.layout,
     apps = props.apps,
     baseClassName = props.baseClassName;
-  var logoDom = defaultRenderLogo(logo, logoStyle);
-  var renderFunction = props[renderKey || ''];
+  var logoDom = defaultRenderLogo(logo, logoStyle, apps, props.onAppMenuClick);
   if (props.layoutType === _defaultSettings.LayoutType.CARD) {
-    return (0, _vue.createVNode)("a", null, [apps.length ? (0, _vue.createVNode)(_antDesignVue.Tooltip, {
-      "placement": "rightTop",
-      "color": "#fff",
-      "arrowPointAtCenter": true
-    }, {
-      default: function _default() {
-        return [logoDom];
-      },
-      title: function title() {
-        return apps.map(function (item) {
-          return (0, _vue.createVNode)("div", {
-            "class": "sider-app-menus"
-          }, [(0, _vue.createVNode)("div", {
-            "class": "sider-app-menus-item",
-            "onClick": function onClick() {
-              return props.onAppMenuClick(item);
-            }
-          }, [item.label])]);
-        });
-      }
-    }) : logoDom]);
+    return (0, _vue.createVNode)("a", null, [(0, _vue.createTextVNode)(" "), logoDom]);
   }
+  var renderFunction = props[renderKey || ''];
   if (layout === 'mix' && renderFunction === false) {
     return null;
   }

package/lib/ProLayout/defaultSettings.js

@@ -100,6 +100,12 @@ var defaultSettingProps = exports.defaultSettingProps = {
       return undefined;
     }
   },
+  pageHeaderStyle: {
+    type: Object,
+    default: function _default() {
+      return undefined;
+    }
+  },
   apps: {
     type: Array,
     default: function _default() {

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-1713349162154"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1713511881023"), 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-1713349161627"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1713511879001"), 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-1713349161709"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1713511879434"), 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.11",
+  "version": "2.0.13",
   "description": "",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -134,8 +134,8 @@
     "webpack-merge": "^5.0.0",
     "webpackbar": "^5.0.2",
     "@jetlinks-web/constants": "^1.0.2",
-    "@jetlinks-web/utils": "^1.0.6",
-    "@jetlinks-web/hooks": "^1.0.12"
+    "@jetlinks-web/hooks": "^1.0.12",
+    "@jetlinks-web/utils": "^1.0.6"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",