@jetlinks-web/components 3.3.1 → 3.3.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/es/ProLayout/Basic/BasicLayout.js +8 -2
  2. package/lib/ProLayout/Basic/BasicLayout.js +20 -14
  3. package/package.json +3 -3
package/es/ProLayout/Basic/BasicLayout.js CHANGED
@@ -10,12 +10,18 @@ import { defaultSettingProps, LayoutType } from '../defaultSettings';
10
10
  import { baseHeaderProps } from '../TopHeader';
11
11
  import Header, { headerViewProps } from './Header';
12
12
  import useConfigInject from "ant-design-vue/es/config-provider/hooks/useConfigInject";
13
- import { pick } from 'lodash-es';
13
+ import { pick, isObject } from 'lodash-es';
14
14
  import { defaultRouteContext, routeContextInjectKey } from '../RouteContext';
15
15
  import { getMenuFirstChildren, getSlot } from '../util';
16
16
  import { Layout, LayoutContent, Breadcrumb, Tabs } from 'ant-design-vue';
17
17
  import useProLayoutStyle from '../style';
18
18
  export var basicLayoutProps = _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, defaultSettingProps), siderMenuProps), baseHeaderProps), headerViewProps), {}, {
19
+ classNames: {
20
+ type: Object,
21
+ default: function _default() {
22
+ return {};
23
+ }
24
+ },
19
25
  pure: Boolean,
20
26
  loading: Boolean,
21
27
  locale: {
@@ -158,7 +164,7 @@ export default defineComponent({
158
164
  return "".concat(props.prefixCls, "-basicLayout");
159
165
  });
160
166
  var className = computed(function () {
161
- return _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, baseClassName.value, true), "".concat(baseClassName.value, "-top-menu"), isTop.value), "".concat(baseClassName.value, "-is-children"), props.isChildrenLayout), "".concat(baseClassName.value, "-fix-siderbar"), props.fixSiderbar), "".concat(baseClassName.value, "-").concat(props.layout), props.layout), "".concat(baseClassName.value, "-").concat(props.layoutType), props.layoutType), hashId.value, true);
167
+ return _objectSpread(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, baseClassName.value, true), "".concat(baseClassName.value, "-top-menu"), isTop.value), "".concat(baseClassName.value, "-is-children"), props.isChildrenLayout), "".concat(baseClassName.value, "-fix-siderbar"), props.fixSiderbar), "".concat(baseClassName.value, "-").concat(props.layout), props.layout), "".concat(baseClassName.value, "-").concat(props.layoutType), props.layoutType), hashId.value, true), isObject(props.classNames) ? props.classNames || {} : {});
162
168
  });
163
169
  var genLayoutStyle = reactive({
164
170
  position: 'relative'
package/lib/ProLayout/Basic/BasicLayout.js CHANGED
@@ -10,7 +10,7 @@ var _vue = require("vue");
10
10
  var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
11
11
  var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
12
12
  var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
13
- var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
13
+ var _objectSpread3 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
14
14
  var _SiderMenu = _interopRequireWildcard(require("../SiderMenu/SiderMenu"));
15
15
  var _defaultSettings = require("../defaultSettings");
16
16
  var _TopHeader = require("../TopHeader");
@@ -23,7 +23,13 @@ var _antDesignVue = require("ant-design-vue");
23
23
  var _style = _interopRequireDefault(require("../style"));
24
24
  var _excluded = ["pure", "onCollapse", "onOpenKeys", "onSelect", "onMenuClick"];
25
25
  function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
26
- var basicLayoutProps = exports.basicLayoutProps = (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, _defaultSettings.defaultSettingProps), _SiderMenu.siderMenuProps), _TopHeader.baseHeaderProps), _Header.headerViewProps), {}, {
26
+ var basicLayoutProps = exports.basicLayoutProps = (0, _objectSpread3.default)((0, _objectSpread3.default)((0, _objectSpread3.default)((0, _objectSpread3.default)((0, _objectSpread3.default)({}, _defaultSettings.defaultSettingProps), _SiderMenu.siderMenuProps), _TopHeader.baseHeaderProps), _Header.headerViewProps), {}, {
27
+ classNames: {
28
+ type: Object,
29
+ default: function _default() {
30
+ return {};
31
+ }
32
+ },
27
33
  pure: Boolean,
28
34
  loading: Boolean,
29
35
  locale: {
@@ -166,7 +172,7 @@ var _default2 = exports.default = (0, _vue.defineComponent)({
166
172
  return "".concat(props.prefixCls, "-basicLayout");
167
173
  });
168
174
  var className = (0, _vue.computed)(function () {
169
- return (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, baseClassName.value, true), "".concat(baseClassName.value, "-top-menu"), isTop.value), "".concat(baseClassName.value, "-is-children"), props.isChildrenLayout), "".concat(baseClassName.value, "-fix-siderbar"), props.fixSiderbar), "".concat(baseClassName.value, "-").concat(props.layout), props.layout), "".concat(baseClassName.value, "-").concat(props.layoutType), props.layoutType), hashId.value, true);
175
+ return (0, _objectSpread3.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, baseClassName.value, true), "".concat(baseClassName.value, "-top-menu"), isTop.value), "".concat(baseClassName.value, "-is-children"), props.isChildrenLayout), "".concat(baseClassName.value, "-fix-siderbar"), props.fixSiderbar), "".concat(baseClassName.value, "-").concat(props.layout), props.layout), "".concat(baseClassName.value, "-").concat(props.layoutType), props.layoutType), hashId.value, true), (0, _lodashEs.isObject)(props.classNames) ? props.classNames || {} : {});
170
176
  });
171
177
  var genLayoutStyle = (0, _vue.reactive)({
172
178
  position: 'relative'
@@ -180,13 +186,13 @@ var _default2 = exports.default = (0, _vue.defineComponent)({
180
186
  if (p.headerRender === false || p.pure || p.layout === 'sider') {
181
187
  return null;
182
188
  }
183
- return (0, _vue.h)(_Header.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, p), {}, {
189
+ return (0, _vue.h)(_Header.default, (0, _objectSpread3.default)((0, _objectSpread3.default)({}, p), {}, {
184
190
  matchMenuKeys: matchMenuKeys || []
185
191
  }));
186
192
  // <Header {...p} matchMenuKeys={matchMenuKeys || []} />;
187
193
  };
188
194
  var breadcrumb = (0, _vue.computed)(function () {
189
- return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, props.breadcrumb), {}, {
195
+ return (0, _objectSpread3.default)((0, _objectSpread3.default)({}, props.breadcrumb), {}, {
190
196
  itemRender: (0, _util.getSlot)(slots, props, 'breadcrumbRender')
191
197
  });
192
198
  });
@@ -196,7 +202,7 @@ var _default2 = exports.default = (0, _vue.defineComponent)({
196
202
  var layoutType = (0, _vue.computed)(function () {
197
203
  return props.layoutType;
198
204
  });
199
- var routeContext = (0, _vue.reactive)((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, _RouteContext.defaultRouteContext), (0, _lodashEs.pick)((0, _vue.toRefs)(props), ['pure', 'locale', 'menuData', 'openKeys', 'selectedKeys', 'contentWidth', 'disableMobile', 'fixSiderbar', 'fixedHeader', 'headerHeight', 'collapsedWidth', 'headerLeftWidth'])), {}, {
205
+ var routeContext = (0, _vue.reactive)((0, _objectSpread3.default)((0, _objectSpread3.default)((0, _objectSpread3.default)({}, _RouteContext.defaultRouteContext), (0, _lodashEs.pick)((0, _vue.toRefs)(props), ['pure', 'locale', 'menuData', 'openKeys', 'selectedKeys', 'contentWidth', 'disableMobile', 'fixSiderbar', 'fixedHeader', 'headerHeight', 'collapsedWidth', 'headerLeftWidth'])), {}, {
200
206
  siderWidth: siderWidth,
201
207
  breadcrumb: breadcrumb,
202
208
  flatMenuData: flatMenuData,
@@ -230,7 +236,7 @@ var _default2 = exports.default = (0, _vue.defineComponent)({
230
236
  var historyRender = (0, _util.getSlot)(slots, props, 'historyRender');
231
237
  var topHeaderMenuRender = (0, _util.getSlot)(slots, props, 'topHeaderMenuRender');
232
238
  var headerDom = (0, _vue.computed)(function () {
233
- return headerRender((0, _objectSpread2.default)((0, _objectSpread2.default)({}, props), {}, {
239
+ return headerRender((0, _objectSpread3.default)((0, _objectSpread3.default)({}, props), {}, {
234
240
  menuItemRender: menuItemRender,
235
241
  subMenuItemRender: subMenuItemRender,
236
242
  hasSiderMenu: hasSide.value,
@@ -271,7 +277,7 @@ var _default2 = exports.default = (0, _vue.defineComponent)({
271
277
  return (0, _vue.createVNode)(_vue.Fragment, null, [(0, _vue.createVNode)("div", {
272
278
  "class": className.value
273
279
  }, [(0, _vue.createVNode)(_antDesignVue.Layout, {
274
- "style": (0, _objectSpread2.default)({
280
+ "style": (0, _objectSpread3.default)({
275
281
  minHeight: '100vh'
276
282
  }, attrs.style || {})
277
283
  }, {
@@ -281,7 +287,7 @@ var _default2 = exports.default = (0, _vue.defineComponent)({
281
287
  "class": prefixCls.value
282
288
  }, {
283
289
  default: function _default() {
284
- return [!isTop.value && (0, _vue.createVNode)(_SiderMenu.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, restProps), {}, {
290
+ return [!isTop.value && (0, _vue.createVNode)(_SiderMenu.default, (0, _objectSpread3.default)((0, _objectSpread3.default)({}, restProps), {}, {
285
291
  "logo": logoRender || restProps.logo,
286
292
  "headerHeight": siderHeaderHeight.value,
287
293
  "menuHeaderRender": menuHeaderRender,
@@ -313,12 +319,12 @@ var _default2 = exports.default = (0, _vue.defineComponent)({
313
319
  return (0, _vue.createVNode)("div", {
314
320
  "class": className.value
315
321
  }, [(0, _vue.createVNode)(_antDesignVue.Layout, {
316
- "style": (0, _objectSpread2.default)({
322
+ "style": (0, _objectSpread3.default)({
317
323
  minHeight: '100vh'
318
324
  }, attrs.style || {})
319
325
  }, {
320
326
  default: function _default() {
321
- return [(0, _vue.createVNode)(_SiderMenu.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, restProps), {}, {
327
+ return [(0, _vue.createVNode)(_SiderMenu.default, (0, _objectSpread3.default)((0, _objectSpread3.default)({}, restProps), {}, {
322
328
  "logo": logoRender || restProps.logo,
323
329
  "collapsedWidth": 0,
324
330
  "headerHeight": 0,
@@ -352,7 +358,7 @@ var _default2 = exports.default = (0, _vue.defineComponent)({
352
358
  "class": className.value
353
359
  }, [(0, _vue.createVNode)(_antDesignVue.Layout, null, {
354
360
  default: function _default() {
355
- return [(0, _vue.createVNode)(_SiderMenu.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, restProps), {}, {
361
+ return [(0, _vue.createVNode)(_SiderMenu.default, (0, _objectSpread3.default)((0, _objectSpread3.default)({}, restProps), {}, {
356
362
  "logo": logoRender || restProps.logo,
357
363
  "siderWidth": props.cardSiderWidth,
358
364
  "headerHeight": 0,
@@ -370,7 +376,7 @@ var _default2 = exports.default = (0, _vue.defineComponent)({
370
376
  }), null), (0, _vue.createVNode)(_antDesignVue.Layout, null, {
371
377
  default: function _default() {
372
378
  return [(0, _vue.createVNode)(_antDesignVue.Layout.Header, {
373
- "style": (0, _objectSpread2.default)({
379
+ "style": (0, _objectSpread3.default)({
374
380
  background: 'transparent',
375
381
  padding: 0,
376
382
  height: '40px'
@@ -411,7 +417,7 @@ var _default2 = exports.default = (0, _vue.defineComponent)({
411
417
  return [(_slots$default4 = slots.default) === null || _slots$default4 === void 0 ? void 0 : _slots$default4.call(slots)];
412
418
  }
413
419
  }), (0, _vue.createVNode)(_antDesignVue.Layout.Footer, {
414
- "style": (0, _objectSpread2.default)({
420
+ "style": (0, _objectSpread3.default)({
415
421
  padding: '11px 24px'
416
422
  }, props.pageFooterStyle || {})
417
423
  }, {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@jetlinks-web/components",
3
- "version": "3.3.1",
3
+ "version": "3.3.3",
4
4
  "description": "",
5
5
  "main": "lib/index.js",
6
6
  "module": "es/index.js",
@@ -155,8 +155,8 @@
155
155
  "webpack-merge": "^5.0.0",
156
156
  "webpackbar": "^5.0.2",
157
157
  "@jetlinks-web/constants": "^1.0.9",
158
- "@jetlinks-web/utils": "^1.3.3",
159
- "@jetlinks-web/hooks": "^1.1.1"
158
+ "@jetlinks-web/hooks": "^1.1.1",
159
+ "@jetlinks-web/utils": "^1.3.3"
160
160
  },
161
161
  "publishConfig": {
162
162
  "registry": "https://registry.npmjs.org/",