@yeeyoon/library 2.2.4 → 2.2.5

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 (7) hide show
  1. package/lib/components/DefaultFooter/index.jsx +1 -1
  2. package/lib/components/Header/index.less +4 -3
  3. package/lib/components/TenantSelector/index.jsx +2 -1
  4. package/lib/styles/design-system-overwrite.less +43 -7
  5. package/package.json +2 -1
  6. package/src/global.css +1 -1
  7. package/src/pages/index.js +6 -4
package/lib/components/DefaultFooter/index.jsx CHANGED
@@ -4,7 +4,7 @@ import { DefaultFooter } from '@ant-design/pro-layout';
4
4
  const CustomDefaultFooter = () => {
5
5
  return (
6
6
  <DefaultFooter
7
- copyright={`${new Date().getFullYear()} 宜云信息`}
7
+ copyright={`${new Date().getFullYear()} 津ICP备20000674号-1`}
8
8
  links={false}
9
9
  />
10
10
  );
package/lib/components/Header/index.less CHANGED
@@ -2,11 +2,12 @@
2
2
  display: flex;
3
3
  align-items: center;
4
4
  justify-content: space-between;
5
- height: 62px;
5
+ height: 56px;
6
6
  padding: 0 18px;
7
- line-height: 62px;
7
+ line-height: 56px;
8
8
  background-color: #fff;
9
- border-radius: 5px;
9
+ border-radius: 6px;
10
+ box-shadow: 0px 4px 24px rgba(0, 0, 0, 0.12);
10
11
  &__logo {
11
12
  margin-left: 10px;
12
13
  cursor: pointer;
package/lib/components/TenantSelector/index.jsx CHANGED
@@ -25,8 +25,9 @@ const TenantSelector = (props) => {
25
25
 
26
26
  return (
27
27
  <Select
28
+ showSearch
29
+ optionFilterProp="children"
28
30
  bordered={false}
29
- // size="large"
30
31
  value={currentTenantId}
31
32
  style={{ width: '200px' }}
32
33
  onChange={(value) => {
package/lib/styles/design-system-overwrite.less CHANGED
@@ -1,7 +1,36 @@
1
1
  @import '~antd/lib/style/themes/default.less';
2
2
  @import '~antd/dist/antd.less';
3
3
 
4
+ :global {
5
+ .ant-pro-basicLayout {
6
+ .ant-layout-header {
7
+ &:first-child {
8
+ display: none;
9
+ }
10
+ left: 24px !important;
11
+ right: 24px !important;
12
+ width: auto !important;
13
+ }
14
+ .ant-layout-sider {
15
+ left: 24px !important;
16
+ top: 80px !important;
17
+ padding-top: 0 !important;
18
+ }
19
+ .ant-pro-basicLayout-content {
20
+ margin: 80px 24px 0 48px !important;
21
+ }
22
+ .ant-layout-footer {
23
+ background-color: @modal-header-bg !important;
24
+ .ant-pro-global-footer {
25
+ margin-left: 24px;
26
+ text-align: left;
27
+ }
28
+ }
29
+ }
30
+ }
31
+
4
32
  body {
33
+ background-color: @modal-header-bg !important;
5
34
  // :global {
6
35
  // Scrollbar
7
36
  ::-webkit-scrollbar {
@@ -682,17 +711,24 @@ body {
682
711
  color: @white !important;
683
712
  }
684
713
  &:hover {
685
- background-color: #f8f8f8;
714
+ background-color: @modal-header-bg;
686
715
  }
687
716
  }
688
717
  .ant-menu-light .ant-menu-item:hover {
689
718
  color: @font-color;
690
719
  }
720
+ .ant-menu-submenu-selected {
721
+ .ant-menu-submenu-title {
722
+ background-color: @modal-header-bg;
723
+ &:hover {
724
+ .ant-menu-submenu-arrow {
725
+ color: @font-paragraph-color;
726
+ }
727
+ }
728
+ }
729
+ }
691
730
  .ant-menu-submenu-title {
692
- // height: auto !important;
693
- // line-height: normal !important;
694
- color: @placeholder-color !important;
695
- // font-size: @font-paragraph-small;
731
+ color: @font-color !important;
696
732
  &:active {
697
733
  background: transparent;
698
734
  }
@@ -705,7 +741,7 @@ body {
705
741
  }
706
742
  .ant-menu-item-selected {
707
743
  color: @white;
708
- background: linear-gradient(46.62deg, @primary-color 0%, @primary-color-gradient 93.64%);
744
+ background: linear-gradient(46.62deg, #7367f0 0%, #9e95f5 93.64%);
709
745
  &:hover {
710
746
  color: @white !important;
711
747
  }
@@ -848,7 +884,7 @@ body {
848
884
  .ant-list-item {
849
885
  color: @font-paragraph-color;
850
886
  &:hover {
851
- background-color: #f8f8f8;
887
+ background-color: @modal-header-bg;
852
888
  }
853
889
  p {
854
890
  color: @placeholder-color;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@yeeyoon/library",
3
- "version": "2.2.4",
3
+ "version": "2.2.5",
4
4
  "description": "宜云前端组件库和通用服务",
5
5
  "main": "index.js",
6
6
  "repository": {
@@ -20,6 +20,7 @@
20
20
  "precommit": "lint-staged"
21
21
  },
22
22
  "dependencies": {
23
+ "@ant-design/pro-layout": "^6.26.0",
23
24
  "@ant-design/pro-list": "^1.12.0",
24
25
  "antd": "^4.10.0",
25
26
  "dva": "^2.6.0-beta.6",
package/src/global.css CHANGED
@@ -4,7 +4,7 @@ html, body, #root {
4
4
 
5
5
  body {
6
6
  margin: 0;
7
- background-color: #000 !important;
7
+ /* background-color: #000 !important; */
8
8
  }
9
9
 
10
10
  body * {
package/src/pages/index.js CHANGED
@@ -1,22 +1,24 @@
1
1
  import React from 'react';
2
2
  import Header from '../../lib/components/Header/';
3
3
  import TenantSelector from '../../lib/components/TenantSelector/';
4
+ import CustomDefaultFooter from '../../lib/components/DefaultFooter/';
4
5
 
5
6
  // eslint-disable-next-line react/display-name
6
7
  export default function () {
7
8
  return (
8
9
  <>
9
- <Header
10
+ {/* <Header
10
11
  productName="profile"
11
12
  tenantId="053a033a063711ecb0c00c42a1ff8370"
12
13
  token="ZmI1YzU4NzEyOTdlNDM2MTg2YjI0N2IyZGQzOGI3NDg1NDE2MzI2MjU4NjMzNzY="
13
14
  avatar="https://demo-yeeyoon-fm.oss-cn-zhangjiakou.aliyuncs.com/userCenter/userAvatar/user_avatar2.png"
14
15
  userName="王甍"
15
- />
16
- {/* <TenantSelector
16
+ /> */}
17
+ <TenantSelector
17
18
  tenantId="14bfb5d71d1011eca9820c42a1f6bf88"
18
19
  tenantIdChangeCb={(id) => console.log(id)}
19
- /> */}
20
+ />
21
+ {/* <CustomDefaultFooter /> */}
20
22
  </>
21
23
  );
22
24
  }