@gm-pc/frame 1.13.3-alpha.1 → 1.14.0-alpha.0

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/package.json +3 -3
  2. package/src/component/framework.tsx +12 -14
  3. package/src/index.less +0 -9
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@gm-pc/frame",
3
- "version": "1.13.3-alpha.1",
3
+ "version": "1.14.0-alpha.0",
4
4
  "description": "",
5
5
  "author": "liyatang <liyatang@qq.com>",
6
6
  "homepage": "https://github.com/gmfe/gm-pc#readme",
@@ -23,7 +23,7 @@
23
23
  },
24
24
  "dependencies": {
25
25
  "@gm-common/tool": "^2.10.0",
26
- "@gm-pc/react": "^1.13.3-alpha.1",
26
+ "@gm-pc/react": "^1.14.0-alpha.0",
27
27
  "classnames": "^2.2.5",
28
28
  "lodash": "^4.17.19"
29
29
  },
@@ -31,5 +31,5 @@
31
31
  "react": "^16.14.0",
32
32
  "react-dom": "^16.14.0"
33
33
  },
34
- "gitHead": "4605da606ef3651da81968ad6802fae8806a10d6"
34
+ "gitHead": "68355f8611699df931fb04ab0fbfc5501d6392ae"
35
35
  }
package/src/component/framework.tsx CHANGED
@@ -76,21 +76,19 @@ const Framework: FC<FrameworkProps> & FrameworkStatic = ({
76
76
  )}
77
77
  >
78
78
  <div className='gm-framework-inner'>
79
- <div className='gm-framework-full-height'>
80
- <Flex className='gm-framework-container'>
81
- {menu && <div className='gm-framework-left'>{menu}</div>}
82
- <Flex flex column className='gm-framework-right'>
83
- {rightTop && <div className='gm-framework-right-top'>{rightTop}</div>}
84
- <div
85
- className={classNames('gm-framework-content', {
86
- 'gm-framework-content-fullscreen': isFullScreen,
87
- })}
88
- >
89
- {children}
90
- </div>
79
+ {isFullScreen ? (
80
+ children
81
+ ) : (
82
+ <div className='gm-framework-full-height'>
83
+ <Flex className='gm-framework-container'>
84
+ {menu && <div className='gm-framework-left'>{menu}</div>}
85
+ <Flex flex column className='gm-framework-right'>
86
+ {rightTop && <div className='gm-framework-right-top'>{rightTop}</div>}
87
+ <div className='gm-framework-content'>{children}</div>
88
+ </Flex>
91
89
  </Flex>
92
- </Flex>
93
- </div>
90
+ </div>
91
+ )}
94
92
  </div>
95
93
  </div>
96
94
  )
package/src/index.less CHANGED
@@ -123,15 +123,6 @@
123
123
  height: calc(100vh - var(--gm-framework-size-top-right-height));
124
124
  }
125
125
 
126
- .gm-framework-content-fullscreen {
127
- position: fixed;
128
- left: 0;
129
- top: 0;
130
- width: 100vw;
131
- height: 100vh;
132
- z-index: 999;
133
- }
134
-
135
126
  .gm-framework-full-tabs {
136
127
  min-height: calc(100% - var(--gm-framework-size-top-right-height));
137
128