@jetlinks-web/components 2.0.12 → 2.0.14-1

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

@@ -330,7 +330,8 @@ export default defineComponent({
                   }
                 }), _createVNode(LayoutContent, {
                   "style": {
-                    height: "calc(100vh - 84px)"
+                    height: "calc(100vh - 84px)",
+                    overflow: 'auto'
                   }
                 }, {
                   default: function _default() {

package/es/ProLayout/PageContainer/index.js

@@ -13,6 +13,7 @@ import { useRouteContext } from '../RouteContext';
 import { getSlotVNode } from '../util';
 import 'ant-design-vue/es/_util/type';
 import PropTypes from 'ant-design-vue/es/_util/vue-types';
+import { LayoutType } from "../defaultSettings";
 function _isSlot(s) {
   return typeof s === 'function' || Object.prototype.toString.call(s) === '[object Object]' && !_isVNode(s);
 }
@@ -236,11 +237,17 @@ 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'
+  } : {};
   return _createVNode("div", {
     "class": "".concat(prefixedClassName, "-wrap")
-  }, [_createVNode(PageHeader, _objectSpread(_objectSpread(_objectSpread({}, backProps), restProps), {}, {
+  }, [_createVNode(PageHeader, _objectSpread(_objectSpread(_objectSpread({
+    "style": styles
+  }, backProps), restProps), {}, {
     "title": pageHeaderTitle,
-    "breadcrumb": breadcrumb,
+    "breadcrumb": value.layoutType === LayoutType.LIST ? breadcrumb : null,
     "footer": renderFooter(_objectSpread(_objectSpread({}, restProps), {}, {
       tabList: tabList,
       tabActiveKey: tabActiveKey

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/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-1713353276710"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1713949335703"), 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-1713353275857"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1713949334657"), 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-1713353276059"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1713949335246"), 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-1713353275115"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1713949331416"), 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

@@ -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() {

package/lib/ProLayout/PageContainer/index.js

@@ -15,6 +15,7 @@ var _pageHeader = require("ant-design-vue/es/page-header");
 var _RouteContext = require("../RouteContext");
 var _util = require("../util");
 var _vueTypes = _interopRequireDefault(require("ant-design-vue/es/_util/vue-types"));
+var _defaultSettings = require("../defaultSettings");
 var _excluded = ["title", "tabList", "tabActiveKey", "content", "pageHeaderRender", "header", "extraContent", "prefixedClassName", "prefixCls", "fixedHeader", "showBack"];
 function _isSlot(s) {
   return typeof s === 'function' || Object.prototype.toString.call(s) === '[object Object]' && !(0, _vue.isVNode)(s);
@@ -239,11 +240,17 @@ 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'
+  } : {};
   return (0, _vue.createVNode)("div", {
     "class": "".concat(prefixedClassName, "-wrap")
-  }, [(0, _vue.createVNode)(_antDesignVue.PageHeader, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, backProps), restProps), {}, {
+  }, [(0, _vue.createVNode)(_antDesignVue.PageHeader, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
+    "style": styles
+  }, backProps), restProps), {}, {
     "title": pageHeaderTitle,
-    "breadcrumb": breadcrumb,
+    "breadcrumb": value.layoutType === _defaultSettings.LayoutType.LIST ? breadcrumb : null,
     "footer": renderFooter((0, _objectSpread2.default)((0, _objectSpread2.default)({}, restProps), {}, {
       tabList: tabList,
       tabActiveKey: tabActiveKey

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/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-1713353276692"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1713949335645"), 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-1713353275929"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1713949334395"), 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-1713353276081"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1713949335077"), 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.12",
+  "version": "2.0.14-1",
   "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/hooks": "^1.0.12",
-    "@jetlinks-web/utils": "^1.0.6"
+    "@jetlinks-web/utils": "^1.0.6",
+    "@jetlinks-web/hooks": "^1.0.12"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",