@lambo-design/shared 1.0.0-beta.277 → 1.0.0-beta.279

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 (4) hide show
  1. package/nstyles/third/view-design.less +1 -1
  2. package/package.json +1 -1
  3. package/utils/menu/index.js +2 -11
  4. package/utils/platform.js +9 -0
package/nstyles/third/view-design.less CHANGED
@@ -366,7 +366,7 @@ body > .ivu-tooltip-popper {
366
366
  top: var(--ivu-card-extra, 3px) !important;
367
367
  }
368
368
 
369
- .ag-cell, .ivu-table-cell-tooltip-content {
369
+ .ag-cell .ivu-table-cell-tooltip-content {
370
370
  display: block;
371
371
  overflow: hidden;
372
372
  text-overflow: ellipsis;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@lambo-design/shared",
3
- "version": "1.0.0-beta.277",
3
+ "version": "1.0.0-beta.279",
4
4
  "description": "",
5
5
  "main": "index.js",
6
6
  "author": "lambo",
package/utils/menu/index.js CHANGED
@@ -97,17 +97,8 @@ const listToMenuTree = (list, menuTree, pageNode, parentId, crumbs, root, appId,
97
97
  list.forEach(item => {
98
98
  let appIdCondition = !appId || item.appId == appId || appId.indexOf(item.appId) > -1;//过滤是否要求的应用
99
99
  let hideInMenuCondition = !(item.hasOwnProperty("hideInMenu") && item.hideInMenu);//过滤是否隐藏的菜单
100
- let hideInIbp = false;
101
- if( item && item.extendProps){
102
- try{
103
- hideInIbp = JSON.parse(item.extendProps).hideInIbp=== '1';
104
- }catch (error){
105
- console.log('Json解析失败:',item);
106
- }
107
- }
108
- item.hideInMenu = hideInIbp || item.hideInMenu;
109
- if ((!hideInIbp) && (generateType && generateType == 'router' && appIdCondition) ||
110
- (generateType == 'menu' && appIdCondition && hideInMenuCondition)) {
100
+ if ((generateType && generateType == 'router' && appIdCondition) ||
101
+ (generateType == 'menu' && appIdCondition && hideInMenuCondition)) {
111
102
  // 判断是否为父级菜单
112
103
  if (item.pid === parentId) {
113
104
  if (item.type === 1 || item.type === 2) {
package/utils/platform.js CHANGED
@@ -33,6 +33,15 @@ export let getSsoTokenKey = function () {
33
33
  return "lambo-sso-token"
34
34
  }
35
35
 
36
+ export let PASSWORD_EXPIRED_KEY = "lambo-password-expired-time"
37
+
38
+ export let getPasswordExpiredKey = function () {
39
+ if (config.passwordExpiredKey) {
40
+ return config.passwordExpiredKey
41
+ }
42
+ return "lambo-password-expired-time"
43
+ }
44
+
36
45
  export function objEqual(obj1, obj2) {
37
46
  const keysArr1 = Object.keys(obj1)
38
47
  const keysArr2 = Object.keys(obj2)