@lambo-design/shared 1.0.0-beta.83 → 1.0.0-beta.84

package/config/themes/eap/var.less

@@ -1,4 +1,4 @@
-@primary-color          : #0091FF;
+@primary-color          :#306BE3;
 @primary-color-tint-20  : tint(@primary-color,20%);
 @primary-color-tint-90  : tint(@primary-color,90%);
 @primary-color-tint-80  : tint(@primary-color,80%);
@@ -107,19 +107,29 @@
 @table-td-stripe-bg           : #f2fafe;
 @table-td-hover-bg            : #eaf4fe;
 @table-td-highlight-bg        : #b5def3;
-@menu-dark-title              : #333333;
-@menu-dark-active-bg          : #363e4f;
+@menu-dark-title              : #306BE3;
+@menu-dark-active-bg          : rgb(0, 44, 107);
 @menu-dark-subsidiary-color   : rgba(255,255,255,.7);
 @menu-dark-group-title-color  : rgba(255,255,255,.36);
+@menu-dark-item-selected-bg: rgb(2, 35, 76);
+@menu-dark-bg: @menu-dark-active-bg ; // 侧边栏背景色
+@menu-dark-item-active-bg: @menu-dark-bg; // 激活的一级菜单背景色
+@menu-dark-submenu-bg: #0E356E; // 二级菜单背景色
+@menu-dark-item-selected-bg: @menu-dark-bg; // 最内部的菜单背景色
 @date-picker-cell-hover-bg    : #e1f0fe;
+// 使用LESS的颜色函数调整颜色值
+@selected-menu-item-bg: rgb(61, 123, 246); // 选中的一级菜单颜色
+@selected-submenu-bg: rgb(14, 53, 110); // 二级菜单颜色
+@selected-innermost-bg: rgb(2, 35, 76); // 最内部的颜色
+@menu-item-hover-bg: darken(@menu-dark-bg, 5%); // 鼠标悬停时稍暗一些的颜色
 
 // Shadow
-@shadow-color           : rgba(0, 0, 0, .2);
+@shadow-color           : rgb(2, 35, 76);
 @shadow-base            : @shadow-down;
-@shadow-card            : 0 1px 1px 0 rgba(0,0,0,.1);
+@shadow-card            : 0 1px 1px 0 rgb(14, 53, 110);
 @shadow-up              : 0 -1px 6px @shadow-color;
 @shadow-down            : 0 1px 6px @shadow-color;
-@shadow-left            : -1px 0 6px @shadow-color;
+@shadow-left            : -1px 0 6px rgb(2, 35, 76);
 @shadow-right           : 1px 0 6px @shadow-color;
 
 // Button
@@ -189,12 +199,13 @@
 @grid-columns                : 24;
 @grid-gutter-width           : 0;
 @layout-body-background      : #f5f7f9;
-@layout-header-background    : #333333;
+@layout-header-background    : @primary-color;
+@layout-header-selected-background: @primary-color; // 选中的顶部菜单背景颜色稍亮
 @layout-header-height        : 64px;
 @layout-header-padding       : 0 50px;
 @layout-footer-padding       : 24px 50px;
 @layout-footer-background    : @layout-body-background;
-@layout-sider-background     : @layout-header-background;
+@layout-sider-background     :  #002C6B;
 @layout-sider-background-tint-10 : tint(@layout-sider-background, 10%);
 @layout-trigger-height       : 48px;
 @layout-trigger-color        : #fff;
@@ -474,7 +485,7 @@ vxe-table
 @vxe-table-checkbox-range-border-color                  : #006af1;
 @vxe-table-checkbox-range-background-color              : rgba(50, 128, 252, 0.2);
 
-@vxe-table-fixed-left-scrolling-box-shadow              : 8px 0px 10px -5px rgba(0, 0, 0, 0.12);
+@vxe-table-fixed-left-scrolling-box-shadow              : 8px 0px 10px -5px rgb(14, 53, 110);
 @vxe-table-fixed-right-scrolling-box-shadow             : -8px 0px 10px -5px rgba(0, 0, 0, 0.12);
 
 /*filter*/
@@ -621,8 +632,36 @@ vxe-table
 @vxe-switch-font-color                                  : #fff;
 @vxe-switch-icon-background-color                       : #fff;
 @vxe-switch-open-background-color                       : @vxe-primary-color;
-@vxe-switch-close-background-color                      : rgba(0, 0, 0, 0.35);
-@vxe-switch-disabled-background-color                   : rgba(0, 0, 0, 0.15);
+@vxe-switch-close-background-color                      : rgb(14, 53, 110);
+@vxe-switch-disabled-background-color                   : rgb(14, 53, 120);
 
 /*pulldown*/
 @vxe-pulldown-panel-background-color                    : #fff;
+// 顶部菜单样式
+.layout-header {
+  background-color: @layout-header-background;
+  .menu-item-selected {
+    background-color: @layout-header-selected-background;
+  }
+}
+
+// 更新侧边栏菜单样式
+// 侧边菜单样式
+.menu-dark {
+  background: @menu-dark-bg; // 侧边栏背景色
+
+  .ivu-dropdown-item  {
+    background-color: rgb(2, 35, 76); // 设置所有下拉菜单项的背景色
+
+    &.active, &.open {
+      background-color: @menu-dark-item-selected-bg;
+
+      // 子菜单项的样式
+      .ivu-dropdown-item {
+        background-color: @menu-dark-item-selected-bg;
+      }
+    }
+  }
+
+
+}

package/config/themes/theme-default.js

@@ -90,7 +90,7 @@ export default {
   --table-td-hover-bg: #ebf7ff;
   --table-td-highlight-bg: #ebf7ff;
   --menu-dark-title: #333333;
-  --menu-dark-active-bg: #363e4f;
+  --menu-dark-active-bg:fade(#000, 85%);
   --menu-dark-subsidiary-color: rgba(255, 255, 255, 0.7);
   --menu-dark-group-title-color: rgba(255, 255, 255, 0.36);
   --date-picker-cell-hover-bg: #e1f0fe;

package/config/themes/theme-eap.js

@@ -1,9 +1,9 @@
 export default {
   key: "eap",
   title: "深邃蓝",
-  primaryColor: "#0091FF",
+  primaryColor: "#306BE3",
   vars: `
-  --primary-color: #0091FF;
+  --primary-color:  #306BE3;
   --primary-color-tint-20: #33a7ff;
   --primary-color-tint-90: #e6f4ff;
   --primary-color-tint-80: #cce9ff;
@@ -89,18 +89,26 @@ export default {
   --table-td-stripe-bg: #f2fafe;
   --table-td-hover-bg: #eaf4fe;
   --table-td-highlight-bg: #b5def3;
-  --menu-dark-title: #333333;
-  --menu-dark-active-bg: #363e4f;
+  --menu-dark-title: #306BE3;
+  --menu-dark-item-active-bg: #02234C; /* 激活的一级菜单项 */
+    --menu-dark-submenu-bg: #0E356E; /* 二级菜单项 */
+    --menu-dark-item-selected-bg: rgb(2, 35, 76); /* 选中的内部菜单项 */
+    --menu-dark-bg:rgb(0, 44, 107);
+  --menu-dark-active-bg: rgb(0, 44, 107);
   --menu-dark-subsidiary-color: rgba(255, 255, 255, 0.7);
   --menu-dark-group-title-color: rgba(255, 255, 255, 0.36);
+  --selected-menu-item-bg: rgb(61, 123, 246);
+  --selected-submenu-bg: rgb(14, 53, 110);
+  --selected-innermost-bg: rgb(2, 35, 76);
+  --menu-item-hover-bg: darken(@menu-dark-bg, 5%);
   --date-picker-cell-hover-bg: #e1f0fe;
-  --shadow-color: rgba(0, 0, 0, 0.2);
-  --shadow-base: 0 1px 6px rgba(0, 0, 0, 0.2);
-  --shadow-card: 0 1px 1px 0 rgba(0, 0, 0, 0.1);
-  --shadow-up: 0 -1px 6px rgba(0, 0, 0, 0.2);
-  --shadow-down: 0 1px 6px rgba(0, 0, 0, 0.2);
-  --shadow-left: -1px 0 6px rgba(0, 0, 0, 0.2);
-  --shadow-right: 1px 0 6px rgba(0, 0, 0, 0.2);
+  --shadow-color: rgb(2, 35, 76);
+  --shadow-base: 0 1px 6px rgb(2, 35, 76);
+  --shadow-card: 0 1px 1px 0 rgb(14, 53, 110);
+  --shadow-up: 0 -1px 6px rgb(2, 35, 76);
+  --shadow-down: 0 1px 6px rgb(2, 35, 76);
+  --shadow-left: -1px 0 6px rgb(2, 35, 76);
+  --shadow-right: 1px 0 6px rgb(2, 35, 76);
   --btn-height-base: 26px;
   --btn-height-large: 32px;
   --btn-height-small: 20px;
@@ -155,12 +163,13 @@ export default {
   --grid-columns: 24;
   --grid-gutter-width: 0;
   --layout-body-background: #f5f7f9;
-  --layout-header-background: #333333;
+  --layout-header-background: #306BE3;
   --layout-header-height: 64px;
+  --layout-header-selected-background: #306BE3;
   --layout-header-padding: 0 50px;
   --layout-footer-padding: 24px 50px;
   --layout-footer-background: #f5f7f9;
-  --layout-sider-background: #333333;
+  --layout-sider-background: #002C6B;
   --layout-sider-background-tint-10: #474747;
   --layout-trigger-height: 48px;
   --layout-trigger-color: #fff;
@@ -374,7 +383,7 @@ export default {
   --vxe-table-checkbox-range-border-width: 1px;
   --vxe-table-checkbox-range-border-color: #006af1;
   --vxe-table-checkbox-range-background-color: rgba(50, 128, 252, 0.2);
-  --vxe-table-fixed-left-scrolling-box-shadow: 8px 0px 10px -5px rgba(0, 0, 0, 0.12);
+  --vxe-table-fixed-left-scrolling-box-shadow: 8px 0px 10px -5px rgb(14, 53, 110);
   --vxe-table-fixed-right-scrolling-box-shadow: -8px 0px 10px -5px rgba(0, 0, 0, 0.12);
   /*filter*/
   --vxe-table-filter-panel-background-color: #fff;
@@ -512,4 +521,5 @@ export default {
       margin:0;
     }
     `
+
 };

package/package.json

@@ -1,23 +1,23 @@
-{
-  "name": "@lambo-design/shared",
-  "version": "1.0.0-beta.83",
-  "description": "",
-  "main": "index.js",
-  "author": "lambo",
-  "license": "ISC",
-  "publishConfig": {
-    "access": "public",
-    "registry": "https://registry.npmjs.org/"
-  },
-  "dependencies": {
-    "axios": "^0.24.0",
-    "axios-cache-plugin": "^0.1.0",
-    "classnames": "^2.3.1",
-    "css-vars-ponyfill": "^2.4.8",
-    "moment": "2.29.4",
-    "qs": "^6.11.0",
-    "xlsx": "http://cicd.lambo.top/package/cdn/xlsx-0.19.1.tgz",
-    "xlsx-style": "^0.8.13"
-  },
-  "scripts": {}
-}
+{
+  "name": "@lambo-design/shared",
+  "version": "1.0.0-beta.84",
+  "description": "",
+  "main": "index.js",
+  "scripts": {},
+  "author": "lambo",
+  "license": "ISC",
+  "publishConfig": {
+    "access": "public",
+    "registry": "https://registry.npmjs.org/"
+  },
+  "dependencies": {
+    "axios": "^0.24.0",
+    "axios-cache-plugin": "^0.1.0",
+    "classnames": "^2.3.1",
+    "css-vars-ponyfill": "^2.4.8",
+    "moment": "2.29.4",
+    "qs": "^6.11.0",
+    "xlsx": "http://cicd.lambo.top/package/cdn/xlsx-0.19.1.tgz",
+    "xlsx-style": "^0.8.13"
+  }
+}

package/utils/dict/built-in-dict.js

@@ -1,20 +1,20 @@
-export const builtInDictKeys = [
-  'SEX_ENUM',
-  'WHETHER_ENUM'
-]
-
-export const builtInDictMap = {
-  'SEX_ENUM' : { '0': '女', '1': '男' },
-  'WHETHER_ENUM' : { '0': '否', '1': '是' }
-}
-
-export const builtInDictList = {
-  'SEX_ENUM' : [
-    { K: '0', V: '女' },
-    { K: '1', V: '男' },
-  ],
-  'WHETHER_ENUM' : [
-    { K: '0', V: '否' },
-    { K: '1', V: '是' },
-  ]
-}
+export const builtInDictKeys = [
+  'SEX_ENUM',
+  'WHETHER_ENUM'
+]
+
+export const builtInDictMap = {
+  'SEX_ENUM' : { '0': '女', '1': '男' },
+  'WHETHER_ENUM' : { '0': '否', '1': '是' }
+}
+
+export const builtInDictList = {
+  'SEX_ENUM' : [
+    { K: '0', V: '女' },
+    { K: '1', V: '男' },
+  ],
+  'WHETHER_ENUM' : [
+    { K: '0', V: '否' },
+    { K: '1', V: '是' },
+  ]
+}

package/utils/dict/index.js

@@ -1,75 +1,75 @@
-import config from '../../config/config'
-import ajax from '../ajax'
-import { builtInDictKeys, builtInDictMap, builtInDictList} from './built-in-dict'
-import { setSessionStorage, getSessionStorage} from "../platform";
-
-export async function getAllDict(dictIdArray) {
-  if (dictIdArray.length > 0) {
-    try {
-      const { data } = await ajax.get(`${config.upmsServerContext}/manage/acDict/getDictsForMulti`, { params: { dictIds : dictIdArray.join(",") } })
-      let result = {}
-      if (data.code == 1) {
-        let dictList = data.data;
-        for (let key in dictList) {
-          let dicts = dictList[key]
-          result[key] = {};
-          if (dicts.length > 0) {
-            result[key]['enumList'] = dicts
-            setSessionStorage(key + '_LIST', dicts)
-            let dictMap = {}
-            for(let dict of dicts) {
-              dictMap[dict.K] = dict.V;
-            }
-            result[key]['enumData'] = dictMap
-              setSessionStorage(key + '_MAP', dictMap)
-          } else if (builtInDictKeys.includes(key)) {
-            let dicts = builtInDictList[key]
-            result[key]['enumList'] = dicts
-            setSessionStorage(key + '_LIST', dicts)
-            let dictMap = {}
-            for(let dict of dicts) {
-              dictMap[dict.K] = dict.V;
-            }
-            result[key]['enumData'] = dictMap
-            setSessionStorage(key + '_MAP', dictMap)
-          }
-        }
-      }
-      return result
-    } catch (error) {
-      console.error(`getDictsForMulti error dictId=${dictIdArray}`, error)
-    }
-  }
-}
-
-export async function getDictList(dictId) {
-  if (builtInDictKeys.includes(dictId)) {
-    return builtInDictList[dictId]
-  }
-  const dictValue = getSessionStorage(dictId + '_LIST')
-  if (!!dictValue) {
-    return dictValue
-  }
-  let data = await getAllDict([dictId]);
-  return data[dictId];
-}
-
-export async function getDictMap(dictId) {
-  if (builtInDictKeys.includes(dictId)) {
-    return builtInDictMap[dictId]
-  }
-  const dictValue = getSessionStorage(dictId + '_MAP')
-  if (!!dictValue) {
-    return dictValue
-  }
-
-  try {
-    const { data } = await ajax.get(`${config.upmsServerContext}/manage/acDict/getDictsMap`, { params: { dictId : dictId } })
-    if (data.code == 1) {
-      setSessionStorage(dictId + '_MAP', data.data)
-    }
-    return data.data
-  } catch (error) {
-    console.error(`getDictsMap error dictId=${dictId}`, error)
-  }
-}
+import config from '../../config/config'
+import ajax from '../ajax'
+import { builtInDictKeys, builtInDictMap, builtInDictList} from './built-in-dict'
+import { setSessionStorage, getSessionStorage} from "../platform";
+
+export async function getAllDict(dictIdArray) {
+  if (dictIdArray.length > 0) {
+    try {
+      const { data } = await ajax.get(`${config.upmsServerContext}/manage/acDict/getDictsForMulti`, { params: { dictIds : dictIdArray.join(",") } })
+      let result = {}
+      if (data.code == 1) {
+        let dictList = data.data;
+        for (let key in dictList) {
+          let dicts = dictList[key]
+          result[key] = {};
+          if (dicts.length > 0) {
+            result[key]['enumList'] = dicts
+            setSessionStorage(key + '_LIST', dicts)
+            let dictMap = {}
+            for(let dict of dicts) {
+              dictMap[dict.K] = dict.V;
+            }
+            result[key]['enumData'] = dictMap
+              setSessionStorage(key + '_MAP', dictMap)
+          } else if (builtInDictKeys.includes(key)) {
+            let dicts = builtInDictList[key]
+            result[key]['enumList'] = dicts
+            setSessionStorage(key + '_LIST', dicts)
+            let dictMap = {}
+            for(let dict of dicts) {
+              dictMap[dict.K] = dict.V;
+            }
+            result[key]['enumData'] = dictMap
+            setSessionStorage(key + '_MAP', dictMap)
+          }
+        }
+      }
+      return result
+    } catch (error) {
+      console.error(`getDictsForMulti error dictId=${dictIdArray}`, error)
+    }
+  }
+}
+
+export async function getDictList(dictId) {
+  if (builtInDictKeys.includes(dictId)) {
+    return builtInDictList[dictId]
+  }
+  const dictValue = getSessionStorage(dictId + '_LIST')
+  if (!!dictValue) {
+    return dictValue
+  }
+  let data = await getAllDict([dictId]);
+  return data[dictId];
+}
+
+export async function getDictMap(dictId) {
+  if (builtInDictKeys.includes(dictId)) {
+    return builtInDictMap[dictId]
+  }
+  const dictValue = getSessionStorage(dictId + '_MAP')
+  if (!!dictValue) {
+    return dictValue
+  }
+
+  try {
+    const { data } = await ajax.get(`${config.upmsServerContext}/manage/acDict/getDictsMap`, { params: { dictId : dictId } })
+    if (data.code == 1) {
+      setSessionStorage(dictId + '_MAP', data.data)
+    }
+    return data.data
+  } catch (error) {
+    console.error(`getDictsMap error dictId=${dictId}`, error)
+  }
+}