@jetlinks-web/components 2.0.5 → 2.0.6

package/lib/ProLayout/Basic/BasicLayout.js

@@ -99,7 +99,7 @@ var _default2 = exports.default = (0, _vue.defineComponent)({
   name: 'JProLayout',
   inheritAttrs: false,
   props: basicLayoutProps,
-  emits: ['update:collapsed', 'update:open-keys', 'update:selected-keys', 'collapse', 'openKeys', 'select', 'menuHeaderClick', 'menuClick', 'backClick'],
+  emits: ['update:collapsed', 'update:open-keys', 'update:selected-keys', 'update:active-key', 'collapse', 'openKeys', 'select', 'menuHeaderClick', 'menuClick', 'backClick', 'historyTabClick', 'historyTabEdit', 'appMenuClick'],
   setup: function setup(props, _ref) {
     var emit = _ref.emit,
       attrs = _ref.attrs,
@@ -142,6 +142,18 @@ var _default2 = exports.default = (0, _vue.defineComponent)({
     var onBack = function onBack(args) {
       emit('backClick', args);
     };
+    var onTabClick = function onTabClick(args) {
+      emit('historyTabClick', args);
+    };
+    var onTabEdit = function onTabEdit(args) {
+      emit('historyTabEdit', args);
+    };
+    var onAppMenuClick = function onAppMenuClick(args) {
+      emit('appMenuClick', args);
+    };
+    var onTabChange = function onTabChange(key) {
+      emit('update:active-key', key);
+    };
     var baseClassName = (0, _vue.computed)(function () {
       return "".concat(props.prefixCls, "-basicLayout");
     });
@@ -180,12 +192,11 @@ var _default2 = exports.default = (0, _vue.defineComponent)({
       hasSide: hasSide,
       back: onBack,
       hasHeader: true,
-      flatMenu: hasFlatMenu
+      flatMenu: hasFlatMenu,
+      layoutType: props.layoutType
     }));
     (0, _vue.provide)(_RouteContext.routeContextInjectKey, routeContext);
     return function () {
-      var _slot;
-      var _slots$default, _slots$default2;
       var pure = props.pure,
         propsOnCollapse = props.onCollapse,
         propsOnOpenKeys = props.onOpenKeys,
@@ -226,43 +237,131 @@ var _default2 = exports.default = (0, _vue.defineComponent)({
       var contentClassName = (0, _vue.computed)(function () {
         return (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, "".concat(baseClassName.value, "-content"), true), "".concat(baseClassName.value, "-has-header"), headerDom), "".concat(baseClassName.value, "-content-disable-margin"), props.disableContentMargin);
       });
-      return (0, _vue.createVNode)(_vue.Fragment, null, [pure ? (_slots$default = slots.default) === null || _slots$default === void 0 ? void 0 : _slots$default.call(slots) : (0, _vue.createVNode)("div", {
-        "class": className.value
-      }, [(0, _vue.createVNode)(_antDesignVue.Layout, {
-        "style": (0, _objectSpread2.default)({
-          minHeight: '100vh'
-        }, attrs.style || {})
-      }, {
-        default: function _default() {
-          return [headerDom.value, (0, _vue.createVNode)(_antDesignVue.Layout, {
-            "style": genLayoutStyle,
-            "class": prefixCls.value
-          }, {
-            default: function _default() {
-              return [!isTop.value && (0, _vue.createVNode)(_SiderMenu.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, restProps), {}, {
-                "menuHeaderRender": menuHeaderRender,
-                "menuExtraRender": menuExtraRender,
-                "menuContentRender": menuContentRender,
-                "menuItemRender": menuItemRender,
-                "subMenuItemRender": subMenuItemRender,
-                "collapsedButtonRender": collapsedButtonRender,
-                "onCollapse": onCollapse,
-                "onSelect": onSelect,
-                "onOpenKeys": onOpenKeys,
-                "onMenuClick": onMenuClick
-              }), null), (0, _vue.createVNode)(_antDesignVue.Layout, null, _isSlot(_slot = (0, _vue.createVNode)(_antDesignVue.LayoutContent, null, {
-                default: function _default() {
-                  return [(_slots$default2 = slots.default) === null || _slots$default2 === void 0 ? void 0 : _slots$default2.call(slots)];
-                }
-              })) ? _slot : {
-                default: function _default() {
-                  return [_slot];
-                }
-              })];
-            }
-          })];
-        }
-      })])]);
+      if (pure) {
+        var _slots$default;
+        return (_slots$default = slots.default) === null || _slots$default === void 0 ? void 0 : _slots$default.call(slots);
+      }
+      if (props.layoutType === _defaultSettings.LayoutType.LIST) {
+        var _slot;
+        var _slots$default2;
+        return (0, _vue.createVNode)(_vue.Fragment, null, [(0, _vue.createVNode)("div", {
+          "class": className.value
+        }, [(0, _vue.createVNode)(_antDesignVue.Layout, {
+          "style": (0, _objectSpread2.default)({
+            minHeight: '100vh'
+          }, attrs.style || {})
+        }, {
+          default: function _default() {
+            return [headerDom.value, (0, _vue.createVNode)(_antDesignVue.Layout, {
+              "style": genLayoutStyle,
+              "class": prefixCls.value
+            }, {
+              default: function _default() {
+                return [!isTop.value && (0, _vue.createVNode)(_SiderMenu.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, restProps), {}, {
+                  "menuHeaderRender": menuHeaderRender,
+                  "menuExtraRender": menuExtraRender,
+                  "menuContentRender": menuContentRender,
+                  "menuItemRender": menuItemRender,
+                  "subMenuItemRender": subMenuItemRender,
+                  "collapsedButtonRender": collapsedButtonRender,
+                  "onCollapse": onCollapse,
+                  "onSelect": onSelect,
+                  "onOpenKeys": onOpenKeys,
+                  "onMenuClick": onMenuClick
+                }), null), (0, _vue.createVNode)(_antDesignVue.Layout, null, _isSlot(_slot = (0, _vue.createVNode)(_antDesignVue.LayoutContent, null, {
+                  default: function _default() {
+                    return [(_slots$default2 = slots.default) === null || _slots$default2 === void 0 ? void 0 : _slots$default2.call(slots)];
+                  }
+                })) ? _slot : {
+                  default: function _default() {
+                    return [_slot];
+                  }
+                })];
+              }
+            })];
+          }
+        })])]);
+      } else {
+        var _slots$default3;
+        var _slot2, _slot3, _slot4;
+        return (0, _vue.createVNode)(_vue.Fragment, null, [(0, _vue.createVNode)("div", {
+          "class": className.value
+        }, [(0, _vue.createVNode)(_antDesignVue.Layout, null, {
+          default: function _default() {
+            return [(0, _vue.createVNode)(_SiderMenu.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, restProps), {}, {
+              "siderWidth": props.cardSiderWidth,
+              "headerHeight": 0,
+              "menuHeaderRender": menuHeaderRender,
+              "menuExtraRender": menuExtraRender,
+              "menuContentRender": menuContentRender,
+              "menuItemRender": menuItemRender,
+              "subMenuItemRender": subMenuItemRender,
+              "onCollapse": onCollapse,
+              "onSelect": onSelect,
+              "onOpenKeys": onOpenKeys,
+              "onMenuClick": onMenuClick,
+              "onAppMenuClick": onAppMenuClick
+            }), null), (0, _vue.createVNode)(_antDesignVue.Layout, null, {
+              default: function _default() {
+                return [(0, _vue.createVNode)(_antDesignVue.Layout.Header, {
+                  "style": {
+                    background: 'transparent',
+                    padding: 0,
+                    height: '40px'
+                  }
+                }, _isSlot(_slot3 = (0, _vue.createVNode)(_antDesignVue.Tabs, {
+                  "hide-add": true,
+                  "type": "editable-card",
+                  "class": "history-tabs",
+                  "id": 'history-route-tabs',
+                  "tabBarStyle": {
+                    margin: 0
+                  },
+                  "onTabClick": onTabClick,
+                  "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];
+                  }
+                })) ? _slot3 : {
+                  default: function _default() {
+                    return [_slot3];
+                  }
+                }), (0, _vue.createVNode)(_antDesignVue.LayoutContent, {
+                  "style": {
+                    height: "calc(100vh - 88px)"
+                  }
+                }, {
+                  default: function _default() {
+                    return [(_slots$default3 = slots.default) === null || _slots$default3 === void 0 ? void 0 : _slots$default3.call(slots)];
+                  }
+                }), (0, _vue.createVNode)(_antDesignVue.Layout.Footer, {
+                  "style": {
+                    padding: '11px 24px'
+                  }
+                }, _isSlot(_slot4 = (0, _vue.createVNode)("div", {
+                  "style": props.pageFooterStyle
+                }, [(0, _vue.createVNode)(_antDesignVue.Breadcrumb, {
+                  "routes": props.breadcrumb.routes,
+                  "itemRender": props.breadcrumbRender
+                }, null)])) ? _slot4 : {
+                  default: function _default() {
+                    return [_slot4];
+                  }
+                })];
+              }
+            })];
+          }
+        })])]);
+      }
     };
   }
 });

package/lib/ProLayout/PageContainer/index.js

@@ -15,7 +15,6 @@ 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"));
-require("./index.less");
 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);

package/lib/ProLayout/SiderMenu/SiderMenu.js

@@ -112,12 +112,37 @@ var defaultRenderLogoAndTitle = exports.defaultRenderLogoAndTitle = function def
     logo = _props$logo === void 0 ? 'http://demo.jetlinks.cn/static/logo.760eb65c.png' : _props$logo,
     logoStyle = props.logoStyle,
     title = props.title,
-    layout = props.layout;
+    layout = props.layout,
+    apps = props.apps,
+    baseClassName = props.baseClassName;
+  var logoDom = defaultRenderLogo(logo, logoStyle);
   var renderFunction = props[renderKey || ''];
+  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]);
+  }
   if (layout === 'mix' && renderFunction === false) {
     return null;
   }
-  var logoDom = defaultRenderLogo(logo, logoStyle);
   var titleDom = (0, _vue.createVNode)("h1", null, _isSlot(title) ? title : {
     default: function _default() {
       return [title];
@@ -182,9 +207,11 @@ var SiderMenu = function SiderMenu(props) {
       props.onSelect($event);
     }
   };
-  var headerDom = defaultRenderLogoAndTitle(props);
+  var headerDom = defaultRenderLogoAndTitle((0, _objectSpread2.default)((0, _objectSpread2.default)({}, props), {}, {
+    baseClassName: baseClassName
+  }));
   var extraDom = menuExtraRender && menuExtraRender(props);
-  if (hasSplitMenu.value && (0, _vue.unref)(context.flatMenuData).length === 0) {
+  if (props.layoutType !== _defaultSettings.LayoutType.CARD && hasSplitMenu.value && (0, _vue.unref)(context.flatMenuData).length === 0) {
     return null;
   }
   var defaultMenuDom = (0, _vue.createVNode)(_BaseMenu.default, {
@@ -254,7 +281,7 @@ var SiderMenu = function SiderMenu(props) {
         }
       }), (0, _vue.createVNode)("div", {
         "style": "flex: 1; overflow: hidden auto;"
-      }, [menuContentRender && menuContentRender(props, defaultMenuDom) || defaultMenuDom]), (0, _vue.createVNode)("div", {
+      }, [props.layoutType === _defaultSettings.LayoutType.LIST ? menuContentRender && menuContentRender(props, defaultMenuDom) || defaultMenuDom : null]), (0, _vue.createVNode)("div", {
         "class": "".concat(baseClassName, "-links")
       }, [collapsedButtonRender !== false ? (0, _vue.createVNode)(_antDesignVue.Menu, {
         "class": "".concat(baseClassName, "-link-menu"),