@jetlinks-web/components 2.0.4 → 2.0.6

package/es/ProLayout/SiderMenu/BaseMenu.js

@@ -12,15 +12,14 @@ import IconFont from '../../Icon';
 import { regular } from '@jetlinks-web/utils';
 import { Menu } from 'ant-design-vue';
 import { createFromIconfontCN } from '@ant-design/icons-vue';
+import 'ant-design-vue/es/_util/vue-types';
 function _isSlot(s) {
   return typeof s === 'function' || Object.prototype.toString.call(s) === '[object Object]' && !_isVNode(s);
 }
 export var baseMenuProps = _objectSpread(_objectSpread({}, defaultSettingProps), {}, {
   prefixCls: {
     type: String,
-    default: function _default() {
-      return defaultPrefixCls;
-    }
+    default: defaultPrefixCls
   },
   locale: {
     type: [Function, Boolean],

package/es/ProLayout/SiderMenu/SiderMenu.js

@@ -1,10 +1,10 @@
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-import { createVNode as _createVNode, isVNode as _isVNode, Fragment as _Fragment } from "vue";
+import { createVNode as _createVNode, resolveDirective as _resolveDirective, isVNode as _isVNode, Fragment as _Fragment } from "vue";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import { LayoutSider as Sider, Menu } from 'ant-design-vue';
+import { LayoutSider as Sider, Menu, Tooltip } from 'ant-design-vue';
 import BaseMenu, { baseMenuProps } from './BaseMenu';
-import { defaultSettingProps } from '../defaultSettings';
+import { defaultSettingProps, LayoutType } from '../defaultSettings';
 import PropTypes from 'ant-design-vue/es/_util/vue-types';
 import IconFont from '../../Icon';
 import { useRouteContext } from '../RouteContext';
@@ -103,12 +103,37 @@ export var defaultRenderLogoAndTitle = function defaultRenderLogoAndTitle(props)
     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 === 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]);
+  }
   if (layout === 'mix' && renderFunction === false) {
     return null;
   }
-  var logoDom = defaultRenderLogo(logo, logoStyle);
   var titleDom = _createVNode("h1", null, _isSlot(title) ? title : {
     default: function _default() {
       return [title];
@@ -173,9 +198,11 @@ var SiderMenu = function SiderMenu(props) {
       props.onSelect($event);
     }
   };
-  var headerDom = defaultRenderLogoAndTitle(props);
+  var headerDom = defaultRenderLogoAndTitle(_objectSpread(_objectSpread({}, props), {}, {
+    baseClassName: baseClassName
+  }));
   var extraDom = menuExtraRender && menuExtraRender(props);
-  if (hasSplitMenu.value && unref(context.flatMenuData).length === 0) {
+  if (props.layoutType !== LayoutType.CARD && hasSplitMenu.value && unref(context.flatMenuData).length === 0) {
     return null;
   }
   var defaultMenuDom = _createVNode(BaseMenu, {
@@ -245,7 +272,7 @@ var SiderMenu = function SiderMenu(props) {
         }
       }), _createVNode("div", {
         "style": "flex: 1; overflow: hidden auto;"
-      }, [menuContentRender && menuContentRender(props, defaultMenuDom) || defaultMenuDom]), _createVNode("div", {
+      }, [props.layoutType === LayoutType.LIST ? menuContentRender && menuContentRender(props, defaultMenuDom) || defaultMenuDom : null]), _createVNode("div", {
         "class": "".concat(baseClassName, "-links")
       }, [collapsedButtonRender !== false ? _createVNode(Menu, {
         "class": "".concat(baseClassName, "-link-menu"),

package/es/ProLayout/SiderMenu/index.less

@@ -1,212 +1,226 @@
-@import '../style/default.less';
-
-@pro-layout-sider-menu-prefix-cls: ~'@{ant-prefix}-pro-sider';
-
-@nav-header-height: @pro-layout-header-height;
-
-.@{pro-layout-sider-menu-prefix-cls} {
-    position: relative;
-    background-color: @layout-sider-background;
-    border-right: 0;
-    // FIXME: 临时修正(可能不会做兼容)
-    z-index: 20;
-
-    // 这里关掉了动画，不然使用无法兼容
-    .@{ant-prefix}-menu {
-        background: transparent;
-    }
-
-    &.@{ant-prefix}-layout-sider-light {
-        .@{ant-prefix}-menu-item a {
-            color: @heading-color;
-        }
-        .@{ant-prefix}-menu-item-selected a,
-        .@{ant-prefix}-menu-item a:hover {
-            color: @primary-color;
-        }
-    }
-
-    &-logo {
-        position: relative;
-        display: flex;
-        align-items: center;
-        padding: 16px 16px;
-        cursor: pointer;
-        transition: padding 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-
-        > a {
-            display: flex;
-            align-items: center;
-            justify-content: center;
-            min-height: 32px;
-        }
-
-        img {
-            display: inline-block;
-            height: 32px;
-            vertical-align: middle;
-        }
-
-        h1 {
-            display: inline-block;
-            height: 32px;
-            margin: 0 0 0 12px;
-            color: white;
-            font-weight: 600;
-            font-size: 18px;
-            line-height: 32px;
-            vertical-align: middle;
-            animation: pro-layout-title-hide 0.3s;
-        }
-    }
-
-    &-extra {
-        margin-bottom: 16px;
-        padding: 0 16px;
-        &-no-logo {
-            margin-top: 16px;
-        }
-    }
-
-    &-menu {
-        position: relative;
-        z-index: 10;
-        min-height: 100%;
-        box-shadow: 2px 0 6px rgba(0, 21, 41, 0.35);
-    }
-
-    .@{ant-prefix}-layout-sider-children {
-        display: flex;
-        flex-direction: column;
-        height: 100%;
-
-        ::-webkit-scrollbar {
-            width: 6px;
-            height: 6px;
-        }
-
-        ::-webkit-scrollbar-track {
-            background: rgba(255, 255, 255, 0.15);
-            border-radius: 3px;
-            box-shadow: inset 0 0 5px rgba(37, 37, 37, 0.05);
-        }
-
-        /* 滚动条滑块 */
-        ::-webkit-scrollbar-thumb {
-            background: rgba(255, 255, 255, 0.2);
-            border-radius: 3px;
-            box-shadow: inset 0 0 5px rgba(255, 255, 255, 0.05);
-        }
-    }
-
-    &.@{ant-prefix}-layout-sider-collapsed {
-        .@{ant-prefix}-menu-inline-collapsed {
-            width: 48px;
-        }
-        .@{pro-layout-sider-menu-prefix-cls} {
-            &-logo {
-                padding: 16px 8px;
-            }
-        }
-    }
-
-    &.@{ant-prefix}-layout-sider.@{pro-layout-sider-menu-prefix-cls}-fixed {
-        position: fixed;
-        top: 0;
-        left: 0;
-        z-index: 99; // react pro-components: z-index: 100;
-        height: 100%;
-        overflow: auto;
-        overflow-x: hidden;
-        box-shadow: 2px 0 8px 0 rgba(29, 35, 41, 0.05);
-        > .@{ant-prefix}-menu-root {
-            :not(.@{pro-layout-sider-menu-prefix-cls}-link-menu) {
-                height: ~'calc(100vh - @{nav-header-height})';
-                overflow-y: auto;
-            }
-        }
-    }
-
-    &-light {
-        background-color: @component-background;
-        box-shadow: 2px 0 8px 0 rgba(29, 35, 41, 0.05);
-
-        .@{ant-prefix}-layout-sider-children {
-            ::-webkit-scrollbar-track {
-                background: rgba(0, 0, 0, 0.06);
-                border-radius: 3px;
-                box-shadow: inset 0 0 5px rgba(0, 21, 41, 0.05);
-            }
-
-            /* 滚动条滑块 */
-            ::-webkit-scrollbar-thumb {
-                background: rgba(0, 0, 0, 0.12);
-                border-radius: 3px;
-                box-shadow: inset 0 0 5px rgba(0, 21, 41, 0.05);
-            }
-        }
-
-        .@{pro-layout-sider-menu-prefix-cls}-logo {
-            h1 {
-                color: @primary-color;
-            }
-        }
-        .@{ant-prefix}-menu-light {
-            border-right-color: transparent;
-        }
-
-        .@{pro-layout-sider-menu-prefix-cls}-collapsed-button {
-            border-top: @border-width-base @border-style-base
-                @border-color-split;
-        }
-    }
-
-    &-icon {
-        width: 14px;
-        vertical-align: baseline;
-    }
-
-    &-links {
-        width: 100%;
-        ul.@{ant-prefix}-menu-root {
-            height: auto;
-        }
-    }
-
-    &-collapsed-button {
-        border-top: @border-width-base @border-style-base rgba(0, 0, 0, 0.25);
-        .anticon {
-            font-size: 16px;
-        }
-    }
-
-    .top-nav-menu li.@{ant-prefix}-menu-item {
-        height: 100%;
-        line-height: 1;
-    }
-    .drawer .drawer-content {
-        background: @layout-sider-background;
-    }
-}
-
-// 修正菜单 collapsed 时，icon 与 title 的间距
-.@{ant-prefix}-pro-menu-item {
-    .anticon + .@{ant-prefix}-pro-menu-item-title {
-        margin-left: 10px;
-    }
-}
-
-@keyframes pro-layout-title-hide {
-    0% {
-        display: none;
-        opacity: 0;
-    }
-    80% {
-        display: none;
-        opacity: 0;
-    }
-    100% {
-        display: unset;
-        opacity: 1;
-    }
-}
+@import '../style/default.less';
+
+@pro-layout-sider-menu-prefix-cls: ~'@{ant-prefix}-pro-sider';
+
+@nav-header-height: @pro-layout-header-height;
+
+.@{pro-layout-sider-menu-prefix-cls} {
+    position: relative;
+    background-color: @layout-sider-background;
+    border-right: 0;
+    // FIXME: 临时修正(可能不会做兼容)
+    z-index: 20;
+
+    // 这里关掉了动画，不然使用无法兼容
+    .@{ant-prefix}-menu {
+        background: transparent;
+    }
+
+    &.@{ant-prefix}-layout-sider-light {
+        .@{ant-prefix}-menu-item a {
+            color: @heading-color;
+        }
+        .@{ant-prefix}-menu-item-selected a,
+        .@{ant-prefix}-menu-item a:hover {
+            color: @primary-color;
+        }
+    }
+
+    &-logo {
+        position: relative;
+        display: flex;
+        align-items: center;
+        padding: 16px 16px;
+        cursor: pointer;
+        transition: padding 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
+
+        > a {
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            min-height: 32px;
+        }
+
+        img {
+            display: inline-block;
+            height: 32px;
+            vertical-align: middle;
+        }
+
+        h1 {
+            display: inline-block;
+            height: 32px;
+            margin: 0 0 0 12px;
+            color: white;
+            font-weight: 600;
+            font-size: 18px;
+            line-height: 32px;
+            vertical-align: middle;
+            animation: pro-layout-title-hide 0.3s;
+        }
+    }
+
+    &-extra {
+        margin-bottom: 16px;
+        padding: 0 16px;
+        &-no-logo {
+            margin-top: 16px;
+        }
+    }
+
+    &-menu {
+        position: relative;
+        z-index: 10;
+        min-height: 100%;
+        box-shadow: 2px 0 6px rgba(0, 21, 41, 0.35);
+    }
+
+    .@{ant-prefix}-layout-sider-children {
+        display: flex;
+        flex-direction: column;
+        height: 100%;
+
+        ::-webkit-scrollbar {
+            width: 6px;
+            height: 6px;
+        }
+
+        ::-webkit-scrollbar-track {
+            background: rgba(255, 255, 255, 0.15);
+            border-radius: 3px;
+            box-shadow: inset 0 0 5px rgba(37, 37, 37, 0.05);
+        }
+
+        /* 滚动条滑块 */
+        ::-webkit-scrollbar-thumb {
+            background: rgba(255, 255, 255, 0.2);
+            border-radius: 3px;
+            box-shadow: inset 0 0 5px rgba(255, 255, 255, 0.05);
+        }
+    }
+
+    &.@{ant-prefix}-layout-sider-collapsed {
+        .@{ant-prefix}-menu-inline-collapsed {
+            width: 48px;
+        }
+        .@{pro-layout-sider-menu-prefix-cls} {
+            &-logo {
+                padding: 16px 8px;
+            }
+        }
+    }
+
+    &.@{ant-prefix}-layout-sider.@{pro-layout-sider-menu-prefix-cls}-fixed {
+        position: fixed;
+        top: 0;
+        left: 0;
+        z-index: 99; // react pro-components: z-index: 100;
+        height: 100%;
+        overflow: auto;
+        overflow-x: hidden;
+        box-shadow: 2px 0 8px 0 rgba(29, 35, 41, 0.05);
+        > .@{ant-prefix}-menu-root {
+            :not(.@{pro-layout-sider-menu-prefix-cls}-link-menu) {
+                height: ~'calc(100vh - @{nav-header-height})';
+                overflow-y: auto;
+            }
+        }
+    }
+
+    &-light {
+        background-color: @component-background;
+        box-shadow: 2px 0 8px 0 rgba(29, 35, 41, 0.05);
+
+        .@{ant-prefix}-layout-sider-children {
+            ::-webkit-scrollbar-track {
+                background: rgba(0, 0, 0, 0.06);
+                border-radius: 3px;
+                box-shadow: inset 0 0 5px rgba(0, 21, 41, 0.05);
+            }
+
+            /* 滚动条滑块 */
+            ::-webkit-scrollbar-thumb {
+                background: rgba(0, 0, 0, 0.12);
+                border-radius: 3px;
+                box-shadow: inset 0 0 5px rgba(0, 21, 41, 0.05);
+            }
+        }
+
+        .@{pro-layout-sider-menu-prefix-cls}-logo {
+            h1 {
+                color: @primary-color;
+            }
+        }
+        .@{ant-prefix}-menu-light {
+            border-right-color: transparent;
+        }
+
+        .@{pro-layout-sider-menu-prefix-cls}-collapsed-button {
+            border-top: @border-width-base @border-style-base
+                @border-color-split;
+        }
+    }
+
+    &-icon {
+        width: 14px;
+        vertical-align: baseline;
+    }
+
+    &-links {
+        width: 100%;
+        ul.@{ant-prefix}-menu-root {
+            height: auto;
+        }
+    }
+
+    &-collapsed-button {
+        border-top: @border-width-base @border-style-base rgba(0, 0, 0, 0.25);
+        .anticon {
+            font-size: 16px;
+        }
+    }
+
+    .top-nav-menu li.@{ant-prefix}-menu-item {
+        height: 100%;
+        line-height: 1;
+    }
+    .drawer .drawer-content {
+        background: @layout-sider-background;
+    }
+}
+
+// 修正菜单 collapsed 时，icon 与 title 的间距
+.@{ant-prefix}-pro-menu-item {
+    .anticon + .@{ant-prefix}-pro-menu-item-title {
+        margin-left: 10px;
+    }
+}
+
+.sider-app-menus {
+  width: 100px;
+  background-color: #fff;
+  cursor: pointer;
+  padding: 6px;
+  transition: all .3s;
+  border-radius: 4px;
+  color: #333;
+
+  &:hover {
+    background-color: #efefef;
+  }
+}
+
+@keyframes pro-layout-title-hide {
+    0% {
+        display: none;
+        opacity: 0;
+    }
+    80% {
+        display: none;
+        opacity: 0;
+    }
+    100% {
+        display: unset;
+        opacity: 1;
+    }
+}

package/es/ProLayout/defaultSettings.js

@@ -1,3 +1,5 @@
+import "vue";
+import PropTypes from "ant-design-vue/es/_util/vue-types";
 export var defaultSettings = {
   theme: 'light',
   layout: 'mix',
@@ -12,6 +14,10 @@ export var defaultSettings = {
   iconfontUrl: '',
   primaryColor: '#315EFB'
 };
+export var LayoutType = {
+  CARD: 'card',
+  LIST: 'list'
+};
 export var defaultSettingProps = {
   theme: {
     type: String,
@@ -62,5 +68,36 @@ export var defaultSettingProps = {
     default: function _default() {
       return defaultSettings.primaryColor;
     }
-  }
+  },
+  layoutType: {
+    type: String,
+    default: LayoutType.LIST
+  },
+  cardSiderWidth: {
+    type: Number,
+    default: 60
+  },
+  historyRoutes: {
+    type: Array,
+    default: function _default() {
+      return [];
+    }
+  },
+  historyActive: {
+    type: String,
+    default: undefined
+  },
+  pageFooterStyle: {
+    type: Object,
+    default: function _default() {
+      return undefined;
+    }
+  },
+  apps: {
+    type: Array,
+    default: function _default() {
+      return [];
+    }
+  },
+  onAppMenuClick: PropTypes.func
 };

package/es/ProLayout/index.js

@@ -1,4 +1,8 @@
 import ProLayout from './Basic/BasicLayout';
 import PageContainer from './PageContainer';
-export { PageContainer };
+import { LayoutType } from './defaultSettings';
+ProLayout.install = function (app) {
+  app.component(ProLayout.name, ProLayout);
+};
+export { PageContainer, LayoutType };
 export default ProLayout;

package/es/ProLayout/style/default.less

@@ -1,4 +1,4 @@
-@import 'ant-design-vue/es/style/themes/index.less';
-
-@basicLayout-prefix-cls: ~'@{ant-prefix}-pro-basicLayout';
-@pro-layout-header-height: 48px;
+@import 'ant-design-vue/es/style/themes/index.less';
+
+@basicLayout-prefix-cls: ~'@{ant-prefix}-pro-basicLayout';
+@pro-layout-header-height: 48px;

package/es/ProTable/index.js

@@ -111,7 +111,7 @@ var tableProps = function tableProps() {
   });
 };
 var ProTable = defineComponent({
-  name: 'ProTable',
+  name: 'JProTable',
   slots: ['headerTitle', 'card', 'rightExtraRender', 'paginationRender' // 分页
   ],
   props: tableProps(),
@@ -408,4 +408,7 @@ var ProTable = defineComponent({
     };
   }
 });
+ProTable.install = function (app) {
+  app.component(ProTable.name, ProTable);
+};
 export default ProTable;

package/es/ProTable/style/index.css

@@ -1,3 +1,7 @@
+/* stylelint-disable at-rule-empty-line-before,at-rule-name-space-after,at-rule-no-unknown */
+/* stylelint-disable no-duplicate-selectors */
+/* stylelint-disable */
+/* stylelint-disable declaration-bang-space-before,no-duplicate-selectors,string-no-newline */
 .jtable-body-spin {
   min-height: 100%;
   width: 100%;
@@ -35,7 +39,7 @@
   padding: 0 8px;
 }
 .jtable-body-spin .jtable-body .jtable-body-header .jtable-body-header-right .jtable-body-header-right-button .ant-radio-button-wrapper-checked .right-button-icon {
-  color: #315EFB;
+  color: #1890ff;
 }
 .jtable-body-spin .jtable-body .jtable-content {
   flex: 1;

package/es/Scrollbar/index.js

@@ -1,2 +1,5 @@
 import Scrollbar from './Scrollbar.js';
+Scrollbar.install = function (app) {
+  app.component(Scrollbar.name, Scrollbar);
+};
 export default Scrollbar;

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-1712901448911"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1713333272038"), n = n(), _popScopeId(), n);
 const _hoisted_1 = {
     key: 0,
     style: { "width": "240px" }

package/es/Search/Advanced/index.js

@@ -105,6 +105,9 @@ import { Select, Button, Form, FormItemRest } from 'ant-design-vue';
 import { AIcon } from '../../../';
 import { cloneDeep } from 'lodash-es';
 const __sfc_main__ = _defineComponent({
+    ...{
+        name: 'JAdvancedSearch',
+    },
     props: {
         columns: {
             type: Array,