@jetlinks-web/components 2.0.13 → 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-1713511880712"), 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/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/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-1713511881052"), 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-1713511878778"), 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-1713511879380"), 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-1713511880704"), 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/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/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-1713511881023"), 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-1713511879001"), 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-1713511879434"), 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.13",
+  "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/",