n20-common-lib 2.4.35 → 2.4.37

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "2.4.34",
+  "version": "2.4.37",
   "private": false,
   "main": "src/index.js",
   "scripts": {

package/src/assets/css/cl-layout-content.scss

@@ -1,14 +1,14 @@
 .content-box {
   box-sizing: border-box;
-  margin: 8px;
+  margin: 0 8px 8px 8px;
   padding: 8px;
-  border-radius: 6px;
+  border-radius: 0 0 6px 6px;
   height: var(--client-height);
   background: $--color-white;
   overflow: auto;
 
   &.element-doc {
-    margin: 8px;
+    margin: 0 8px 8px 8px;
     padding: 8px;
     height: var(--client-height);
     overflow: auto;

package/src/assets/css/cl-layout-tabs.scss

@@ -1,10 +1,13 @@
-$--item-margin: 8px;
+$--item-margin: 4px;
 $--item-radius: 4px;
+$--layout-margin-top: 0;
 $--item-hover-padding: 12px;
 
 .tabs-nav-wrap {
   &.el-tabs--card > .el-tabs__header {
     border-bottom: none;
+    height: $--tabsnav-height;
+    margin-bottom: 0;
   }
   &.el-tabs--card > .el-tabs__header .el-tabs__item {
     transition: color 0.3s cubic-bezier(0.645, 0.045, 0.355, 1), padding 0.3s cubic-bezier(0.645, 0.045, 0.355, 1),
@@ -12,16 +15,16 @@ $--item-hover-padding: 12px;
   }
   .el-tabs__nav {
     border: none !important;
-    padding-top: $--layou-margin;
+    padding-top: $--layout-margin-top;
   }
   .el-tabs__item {
-    height: $--tabsnav-height - 2 * $--layou-margin;
-    line-height: $--tabsnav-height - 2 * $--layou-margin;
+    height: $--tabsnav-height;
+    line-height: $--tabsnav-height;
     padding-left: $--item-hover-padding !important;
     padding-right: $--item-hover-padding !important;
     margin-right: $--item-margin;
-    border-radius: $--item-radius;
-    background: $--color-white;
+    border-radius: $--item-radius $--item-radius 0 0;
+    background: $--button-default-border-color;
     border: none !important;
     font-weight: $--font-weight-primary;
     &:first-child {
@@ -34,13 +37,16 @@ $--item-hover-padding: 12px;
       margin-right: $--layou-margin;
     }
 
-    // &:hover {
-    //   background: #f4f5f8;
-    // }
+    &:hover {
+      color: $--color-text-primary;
+      background: $--color-white;
+      font-weight: $--font-weight-bold;
+    }
 
     &.is-active {
-      color: $--color-white;
-      background: $--color-primary;
+      color: $--color-text-primary;
+      background: $--color-white;
+      font-weight: $--font-weight-bold;
     }
 
     &:focus.is-active.is-focus {

package/src/assets/css/cl-layout.scss

@@ -3,7 +3,7 @@ $--aside-width: 190px;
 $--aside-height: 40px;
 $--aside-collapse-width: 50px;
 $--header-height: 48px;
-$--tabsnav-height: 42px;
+$--tabsnav-height: 28px;
 $--layou-margin: 8px;
 
 body {
@@ -86,7 +86,7 @@ body {
 .content-wrap {
   box-sizing: border-box;
   position: fixed !important;
-  top: $--header-height + $--tabsnav-height - 6;
+  top: $--header-height + $--tabsnav-height;
   left: $--aside-width;
   right: 0;
   bottom: 0;

package/src/components/Layout/HeaderWrap/index.vue

@@ -426,14 +426,19 @@ export default {
       })
     },
     logoutA() {
-      axios.delete('/bems/prod_1.0/uas/api/authorization/logout').then(() => {
-        if (this.afterLogout) {
-          let After = this.afterLogout()
-          After.then && After.then(auth.removeToken())
-        } else {
+      axios
+        .delete('/bems/prod_1.0/uas/api/authorization/logout', {}, { noMsg: true })
+        .then(() => {
+          if (this.afterLogout) {
+            let After = this.afterLogout()
+            After.then && After.then(auth.removeToken())
+          } else {
+            auth.removeToken()
+          }
+        })
+        .catch(() => {
           auth.removeToken()
-        }
-      })
+        })
     },
     // 检查是否代理中
     async getProxyAuthIing() {

package/src/components/Layout/HeaderWrap/indexN.vue

@@ -570,14 +570,19 @@ export default {
       })
     },
     logoutA() {
-      axios.delete('/bems/prod_1.0/uas/api/authorization/logout').then(() => {
-        if (this.afterLogout) {
-          let After = this.afterLogout()
-          After.then && After.then(auth.removeToken())
-        } else {
+      axios
+        .delete('/bems/prod_1.0/uas/api/authorization/logout', {}, { noMsg: true })
+        .then(() => {
+          if (this.afterLogout) {
+            let After = this.afterLogout()
+            After.then && After.then(auth.removeToken())
+          } else {
+            auth.removeToken()
+          }
+        })
+        .catch(() => {
           auth.removeToken()
-        }
-      })
+        })
     },
     // 检查是否代理中
     async getProxyAuthIing() {

package/src/components/Layout/indexN.vue

@@ -92,8 +92,8 @@ export default {
   },
   data() {
     let headerH = 48
-    let tabsH = 35
-    let clientM = 8 + 1
+    let tabsH = 28
+    let clientM = 0
 
     return {
       dnsKey: this.isTest || (process.env.NODE_ENV === 'production' && process.env.VUE_APP_KEEP_ALIVE === 'true'),

package/src/components/LoginTemporary/form.vue

@@ -219,15 +219,15 @@ export default {
       },
       pwd: '',
       rules: {
-        username: [{ required: true, message: '请输入账号!', trigger: 'blur' }],
-        password: [{ required: true, message: '请输入密码!', trigger: 'blur' }],
-        code: [{ required: true, message: '请输入验证码!', trigger: 'blur' }],
-        imageCode: [{ required: true, message: '请输入图形验证码!', trigger: 'blur' }],
+        username: [{ required: true, message: $lc('请输入账号!'), trigger: 'blur' }],
+        password: [{ required: true, message: $lc('请输入密码!'), trigger: 'blur' }],
+        code: [{ required: true, message: $lc('请输入验证码!'), trigger: 'blur' }],
+        imageCode: [{ required: true, message: $lc('请输入图形验证码!'), trigger: 'blur' }],
         phone: [
-          { required: true, message: '请输入手机号!', trigger: 'blur' },
+          { required: true, message: $lc('请输入手机号!'), trigger: 'blur' },
           {
             pattern: /^1\d{10}$/,
-            message: '请输入正确手机号!',
+            message: $lc('请输入正确手机号!'),
             trigger: 'blur'
           }
         ]

package/src/components/LoginTemporary/index.vue

@@ -60,7 +60,7 @@
 import getJsonc from '../../assets/getJsonc'
 import realUrl from '../../assets/realUrl'
 import axios from '../../utils/axios'
-
+import { $lc } from '../../utils/i18n/index'
 import loginForm from './form.vue'
 import retrievePw from './retrievePw.vue'
 export default {
@@ -170,9 +170,41 @@ export default {
     this.init()
   },
   methods: {
+    // 系统分辨率是否缩放
+    getScreenSetting() {
+      var ratio = 0
+      var screen = window.screen
+      var ua = navigator.userAgent.toLowerCase()
+      if (window.devicePixelRatio !== undefined) {
+        ratio = window.devicePixelRatio
+        console.log(ratio)
+      } else if (~ua.indexOf('msie')) {
+        if (screen.deviceXDPI && screen.logicalXDPI) {
+          //IE
+          ratio = screen.deviceXDPI / screen.logicalXDPI
+        }
+      } else if (window.outerWidth !== undefined && window.innerWidth !== undefined) {
+        ratio = window.outerWidth / window.innerWidth
+      }
+      if (ratio !== 1) {
+        if (ua.includes('mac os') && ratio !== 2) {
+          this.$notify.info({
+            title: $lc('提示'),
+            message: $lc('检测到当前屏幕分辨率不是100%，建议调整分辨率后刷新业务来确保呈现效果最佳。')
+          })
+        }
+        if (!ua.includes('mac os')) {
+          this.$notify.info({
+            title: $lc('提示'),
+            message: $lc('检测到当前屏幕分辨率不是100%，建议调整分辨率后刷新业务来确保呈现效果最佳。')
+          })
+        }
+      }
+    },
     async init() {
-      const { _layoutData = {}, loginSetting } = await getJsonc('/server-config.jsonc')
+      const { _layoutData = {}, loginSetting, screenInspect } = await getJsonc('/server-config.jsonc')
       let _loginSetting = loginSetting || _layoutData.loginSetting
+      screenInspect && this.getScreenSetting()
       if (_loginSetting !== 'JSON') {
         let P_1 = axios.get(`/bems/1.0/sysSetting/list`, null, { loading: false, noMsg: true }).then(({ data }) => {
           this.pageData.LOGIN_MODE = data.find((d) => d.pmName === 'LOGIN_MODE')

package/src/components/LoginTemporary/indexN.vue

@@ -131,7 +131,7 @@
 <script>
 import 'swiper/swiper.min.css'
 import Swiper from 'swiper'
-
+import { $lc } from '../../utils/i18n/index'
 import getJsonc from '../../assets/getJsonc'
 import realUrl from '../../assets/realUrl'
 import axios from '../../utils/axios'
@@ -359,6 +359,7 @@ export default {
     // window.addEventListener('resize', this.setWrapSty)
 
     this.init()
+
     localStorage.setItem('pageInSystemNo', this.form.SYSTEM_LIST[0].NO)
   },
   beforeDestroy() {
@@ -392,12 +393,45 @@ export default {
     //     this.wrapStyle = `.login-wrap{width:${W}px; height:${Math.floor(W / ratioO)}px; transform: scale(${winW / W});}`
     //   }
     // },
+    // 系统分辨率是否缩放
+    getScreenSetting() {
+      var ratio = 0
+      var screen = window.screen
+      var ua = navigator.userAgent.toLowerCase()
+      if (window.devicePixelRatio !== undefined) {
+        ratio = window.devicePixelRatio
+        console.log(ratio)
+      } else if (~ua.indexOf('msie')) {
+        if (screen.deviceXDPI && screen.logicalXDPI) {
+          //IE
+          ratio = screen.deviceXDPI / screen.logicalXDPI
+        }
+      } else if (window.outerWidth !== undefined && window.innerWidth !== undefined) {
+        ratio = window.outerWidth / window.innerWidth
+      }
+      if (ratio !== 1) {
+        if (ua.includes('mac os') && ratio !== 2) {
+          this.$notify.info({
+            title: $lc('提示'),
+            message: $lc('检测到当前屏幕分辨率不是100%，建议调整分辨率后刷新业务来确保呈现效果最佳。')
+          })
+        }
+        if (!ua.includes('mac os')) {
+          this.$notify.info({
+            title: $lc('提示'),
+            message: $lc('检测到当前屏幕分辨率不是100%，建议调整分辨率后刷新业务来确保呈现效果最佳。')
+          })
+        }
+      }
+    },
+
     async init() {
-      const { _layoutData = {}, loginSetting } = await getJsonc('/server-config.jsonc')
+      const { _layoutData = {}, loginSetting, screenInspect } = await getJsonc('/server-config.jsonc')
       let _loginSetting = loginSetting || _layoutData.loginSetting
       if (_loginSetting !== 'JSON') {
         await this.getSysSet()
       }
+      screenInspect && this.getScreenSetting()
       this.jsonData = _layoutData
 
       if (this.systemList.length <= 1) {

package/src/i18n.json

@@ -1235,6 +1235,9 @@
   "锚点定位": {
     "en": "Anchor point positioning"
   },
+  "检测到当前屏幕分辨率不是100%，建议调整分辨率后刷新业务来确保呈现效果最佳。": {
+    "en": "Detected that the current screen resolution is not 100%, it is recommended to adjust the resolution after refreshing the business to ensure that the best effect is displayed."
+  },
   "拖拽列表组件": {
     "en": "Drag and drop list components"
   },