n20-common-lib 2.9.13 → 2.9.14

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

@@ -1,9 +1,18 @@
 <template>
   <div>
     <keep-alive v-if="dnsKey" :max="32">
-      <router-view v-if="!$route.meta.noCache" ref="content-cache" :key="$route | keyF" class="content-box" />
+      <router-view
+        v-if="!$route.meta.noCache"
+        ref="content-cache"
+        :key="$route | keyF"
+        class="content-box"
+      />
     </keep-alive>
-    <router-view v-if="!dnsKey || $route.meta.noCache" :key="$route | keyF" class="content-box" />
+    <router-view
+      v-if="!dnsKey || $route.meta.noCache"
+      :key="$route | keyF"
+      class="content-box"
+    />
   </div>
 </template>
 
@@ -16,7 +25,13 @@ export default {
   filters: {
     keyF({ path, query = {} }) {
       path = path.replace(/^\//, routerBase)
-      return path + '^' + JSON.stringify({ ...query, _fromNo: undefined }) + '^' + window._tab_route_key[path]
+      return (
+        path +
+        '^' +
+        JSON.stringify({ ...query, _fromNo: undefined }) +
+        '^' +
+        window._tab_route_key[path]
+      )
     }
   },
   props: {
@@ -27,10 +42,6 @@ export default {
     isTest: {
       type: Boolean,
       default: false
-    },
-    isCache: {
-      type: Boolean,
-      default: false
     }
   },
   data() {
@@ -38,7 +49,8 @@ export default {
       dnsKey:
         this.isCache ||
         this.isTest ||
-        (process.env.NODE_ENV === 'production' && process.env.VUE_APP_KEEP_ALIVE === 'true')
+        (process.env.NODE_ENV === 'production' &&
+          process.env.VUE_APP_KEEP_ALIVE === 'true')
     }
   },
   beforeCreate() {
@@ -70,11 +82,26 @@ export default {
   },
   methods: {
     watchMessage(ev) {
-      const { updateActiveCache, originName, targetName, activatedMicroRouter } = ev.data
-      if (updateActiveCache && originName === 'main' && targetName === '*' && this.$router.mode !== 'abstract') {
+      const {
+        updateActiveCache,
+        originName,
+        targetName,
+        activatedMicroRouter
+      } = ev.data
+      if (
+        updateActiveCache &&
+        originName === 'main' &&
+        targetName === '*' &&
+        this.$router.mode !== 'abstract'
+      ) {
         this.updateActiveCache()
-      } else if (activatedMicroRouter && activatedMicroRouter === this.$route.path.replace(/^\//, routerBase)) {
-        window._tab_route_key[activatedMicroRouter] = window._tab_route_key[activatedMicroRouter]
+      } else if (
+        activatedMicroRouter &&
+        activatedMicroRouter === this.$route.path.replace(/^\//, routerBase)
+      ) {
+        window._tab_route_key[activatedMicroRouter] = window._tab_route_key[
+          activatedMicroRouter
+        ]
           ? window._tab_route_key[activatedMicroRouter] + 1
           : 1
         this.updateActiveCache()
@@ -86,13 +113,17 @@ export default {
     removeCacheTimerFn() {
       this.removeCacheTimer = setInterval(() => {
         if (this.$refs['content-cache']) {
-          let cache = this.$refs['content-cache'].$vnode.parent.componentInstance.cache
+          let cache =
+            this.$refs['content-cache'].$vnode.parent.componentInstance.cache
           for (let k in cache) {
             if (cache[k]) {
               let kM = k.split('^')
               let _K = kM[0]
               let _V = kM[2]
-              if (window._tab_route_key[_K] && window._tab_route_key[_K] !== Number(_V)) {
+              if (
+                window._tab_route_key[_K] &&
+                window._tab_route_key[_K] !== Number(_V)
+              ) {
                 cache[k].componentInstance.destroy?.()
                 cache[k] = null
               }

package/src/components/Layout/indexN.vue

@@ -1,27 +1,36 @@
 <template>
   <div class="layout-wrap">
     <headerWrap
+      v-if="!isMobile"
       class="header-wrap"
       :ectad="ectad"
       :system-change="systemChange"
       :operation-status="operationStatus"
       :before-logout="beforeLogout"
       :after-logout="afterLogout"
-      :drawerVisible.sync="showDrawerBox"
+      :drawer-visible.sync="showDrawerBox"
       @clickSystem="clickSystem"
       @custom-event="(par) => $emit('custom-event', par)"
     >
       <slot slot="header-ectad" name="header-ectad"></slot>
       <slot slot="header-dropdown" name="header-dropdown"></slot>
     </headerWrap>
-    <div v-if="showDrawerBox" class="wrapper-mask" @click="showDrawerBox = false"></div>
+    <div v-if="showDrawerBox && !isMobile" class="wrapper-mask" @click="showDrawerBox = false"></div>
     <menuDrawer
+      v-if="!isMobile"
       :class="showDrawerBox ? 'show_drawer' : ''"
       :menus="systemMenu"
       @clickMenu="(row) => (this.showDrawerBox = row)"
-    ></menuDrawer>
-    <asideNav :menus="menusC" :active-nav="activeNavC" :collapse.sync="collapse" @menu-click="menuClick" />
+    />
+    <asideNav
+      v-if="!isMobile"
+      :menus="menusC"
+      :active-nav="activeNavC"
+      :collapse.sync="collapse"
+      @menu-click="menuClick"
+    />
     <tabsNav
+      v-if="!isMobile"
       class="tabs-nav-wrap"
       :tab-list="tabList"
       :active-nav="activeNav"
@@ -31,7 +40,7 @@
       @tab-close-others="tabCloseOthers"
       @tab-refresh="tabRefresh"
     />
-    <div ref="content-wrap" class="content-wrap">
+    <div ref="content-wrap" class="content-wrap" :class="{ isMobile: isMobile }">
       <keep-alive v-if="dnsKey" :max="32">
         <router-view v-if="!$route.meta.noCache" ref="content-cache" :key="$route | keyF" class="content-box" />
       </keep-alive>
@@ -131,6 +140,9 @@ export default {
     }
   },
   computed: {
+    isMobile() {
+      return window.innerWidth <= 768
+    },
     activeNavC() {
       let acTab = this.tabList.find((t) => t.uuid === this.activeNav)
       let acNav = acTab?.query?.startPath || this.activeNav
@@ -532,3 +544,12 @@ function getShowUuid(uuid, list) {
   return '/'
 }
 </script>
+<style>
+.isMobile {
+  left: 0 !important;
+  top: 8px !important;
+}
+.isMobile .content-box {
+  height: calc(100vh - 16px) !important;
+}
+</style>

package/src/components/LoginTemporary/form.vue

@@ -3,7 +3,12 @@
   <div v-loading="!!loadingN" class="login-form-wrap flex-column p-a">
     <slot name="header"></slot>
     <svg v-if="loginTypes.includes('qrcode')" class="cut-qrcode-h">
-      <image v-if="theType === 'qrcode'" width="52" height="52" xlink:href="./qrt.png" />
+      <image
+        v-if="theType === 'qrcode'"
+        width="52"
+        height="52"
+        xlink:href="./qrt.png"
+      />
       <image v-else width="52" height="52" xlink:href="./qr.png" />
       <path d="M0,0L52,0L52,52Z" @click="cutQrcode" />
     </svg>
@@ -20,7 +25,11 @@
           <el-input v-model="form.username" :placeholder="'请输入账号' | $lc" />
         </el-form-item>
         <el-form-item class="m-b" :label="'密码' | $lc" prop="password">
-          <el-input v-model="form.password" :placeholder="'请输入密码' | $lc" show-password />
+          <el-input
+            v-model="form.password"
+            :placeholder="'请输入密码' | $lc"
+            show-password
+          />
           <!-- 不自动填充密码
           <input
             :value="fakePwd"
@@ -43,16 +52,35 @@
           </el-input>
           不自动填充密码End -->
         </el-form-item>
-        <el-form-item v-if="showImageCode" class="m-b" :label="'图形验证码' | $lc" prop="imageCode">
+        <el-form-item
+          v-if="showImageCode"
+          class="m-b"
+          :label="'图形验证码' | $lc"
+          prop="imageCode"
+        >
           <br />
           <div class="flex-box">
-            <el-input v-model="form.imageCode" class="flex-item m-r-s" :placeholder="'请输入图形验证码' | $lc" />
+            <el-input
+              v-model="form.imageCode"
+              class="flex-item m-r-s"
+              :placeholder="'请输入图形验证码' | $lc"
+            />
             <el-button plain class="p-a-0" @click="getImgCode">
-              <img v-if="imageUrl" :src="imageUrl" style="width: 80px; height: 30px; margin-bottom: -2px" />
+              <img
+                v-if="imageUrl"
+                :src="imageUrl"
+                style="width: 80px; height: 30px; margin-bottom: -2px"
+              />
             </el-button>
           </div>
         </el-form-item>
-        <el-button class="m-t" type="primary" native-type="submit" style="width: 100%">{{ '登　录' | $lc }}</el-button>
+        <el-button
+          class="m-t"
+          type="primary"
+          native-type="submit"
+          style="width: 100%"
+          >{{ '登　录' | $lc }}</el-button
+        >
       </el-form>
     </div>
     <!-- 二维码扫码登录 -->
@@ -72,17 +100,26 @@
         <el-form-item class="m-b" :label="'验证码' | $lc" prop="code">
           <br />
           <div class="flex-box">
-            <el-input v-model="form.code" class="flex-item m-r-s" :placeholder="'请输入验证码' | $lc" />
+            <el-input
+              v-model="form.code"
+              class="flex-item m-r-s"
+              :placeholder="'请输入验证码' | $lc"
+            />
             <el-button
               plain
-              style="4em"
               :disabled="!form.phone || codeNum !== $lc('验证码')"
               @click="sendMsg('phone', $lc('手机号'))"
               >{{ codeNum }}</el-button
             >
           </div>
         </el-form-item>
-        <el-button class="m-t" type="primary" native-type="submit" style="width: 100%">{{ '登　录' | $lc }}</el-button>
+        <el-button
+          class="m-t"
+          type="primary"
+          native-type="submit"
+          style="width: 100%"
+          >{{ '登　录' | $lc }}</el-button
+        >
       </el-form>
     </div>
     <!-- 账户密码验证码登录 -->
@@ -98,33 +135,54 @@
           <el-input v-model="form.username" :placeholder="'请输入账号' | $lc" />
         </el-form-item>
         <el-form-item class="m-b" :label="'密码' | $lc" prop="password">
-          <el-input v-model="form.password" :placeholder="'请输入密码' | $lc" show-password />
+          <el-input
+            v-model="form.password"
+            :placeholder="'请输入密码' | $lc"
+            show-password
+          />
         </el-form-item>
         <el-form-item class="m-b" :label="'验证码' | $lc" prop="code">
           <br />
           <div class="flex-box">
-            <el-input v-model="form.code" class="flex-item m-r-s" :placeholder="'请输入验证码' | $lc" />
+            <el-input
+              v-model="form.code"
+              class="flex-item m-r-s"
+              :placeholder="'请输入验证码' | $lc"
+            />
             <el-button
               plain
-              style="4em"
               :disabled="!form.username || codeNum !== $lc('验证码')"
               @click="sendMsg('username', $lc('账户'))"
               >{{ codeNum }}</el-button
             >
           </div>
         </el-form-item>
-        <el-button class="m-t" type="primary" native-type="submit" style="width: 100%">{{ '登　录' | $lc }}</el-button>
+        <el-button
+          class="m-t"
+          type="primary"
+          native-type="submit"
+          style="width: 100%"
+          >{{ '登　录' | $lc }}</el-button
+        >
       </el-form>
     </div>
     <!--  -->
     <div v-if="theType !== 'qrcode'" class="flex-box m-t-s m-b-s">
-      <el-dropdown v-if="loginTypes.length > 1" size="mini" placement="bottom-start" @command="changeLoginType">
+      <el-dropdown
+        v-if="loginTypes.length > 1"
+        size="mini"
+        placement="bottom-start"
+        @command="changeLoginType"
+      >
         <span>{{ '其他登录方式' | $lc }}</span>
         <el-dropdown-menu slot="dropdown">
           <template v-for="item in loginTypes">
-            <el-dropdown-item v-if="item !== theType" :key="item" :command="item">{{
-              loginTypeMap[item]
-            }}</el-dropdown-item>
+            <el-dropdown-item
+              v-if="item !== theType"
+              :key="item"
+              :command="item"
+              >{{ loginTypeMap[item] }}</el-dropdown-item
+            >
           </template>
           <el-dropdown-item command="account">
             <slot name="other"></slot>
@@ -132,9 +190,13 @@
         </el-dropdown-menu>
       </el-dropdown>
 
-      <el-link v-if="showForgetBtn" class="m-l-auto" :underline="false" @click="forgetPw">{{
-        '忘记密码' | $lc
-      }}</el-link>
+      <el-link
+        v-if="showForgetBtn"
+        class="m-l-auto"
+        :underline="false"
+        @click="forgetPw"
+        >{{ '忘记密码' | $lc }}</el-link
+      >
     </div>
     <slot name="footer"></slot>
   </div>
@@ -154,7 +216,9 @@ function encode(pwd = '', key = 0) {
   if (pwd === '') return ''
 
   let pwdArr = pwd.trim().split('')
-  let resultArr = pwdArr.map((oPwd) => String.fromCharCode(oPwd.charCodeAt() ^ key))
+  let resultArr = pwdArr.map((oPwd) =>
+    String.fromCharCode(oPwd.charCodeAt() ^ key)
+  )
   let result = resultArr.join('')
 
   return window.btoa(window.unescape(window.encodeURIComponent(result)))
@@ -224,10 +288,18 @@ export default {
       },
       pwd: '',
       rules: {
-        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' }],
+        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: $lc('请输入手机号!'), trigger: 'blur' },
           {
@@ -331,7 +403,9 @@ export default {
               { loading: this.loadingSub }
             )
             .then(() => {
-              this.$message.success(`${typeName}: ${this.form[type]} 验证码发送成功`)
+              this.$message.success(
+                `${typeName}: ${this.form[type]} 验证码发送成功`
+              )
             })
             .catch(() => {
               clearTimeout(this.setTimeNum)
@@ -375,7 +449,11 @@ export default {
         if (this.getAzCount <= 3) {
           this.loadingAdd()
           axios
-            .get('/bems/prod_1.0/uas/api/authorization/authorizationCode', {}, { loading: this.loadingSub })
+            .get(
+              '/bems/prod_1.0/uas/api/authorization/authorizationCode',
+              {},
+              { loading: this.loadingSub }
+            )
             .then(({ data = {} }) => {
               try {
                 pwd = encode(pwd, data.authorizationValue)
@@ -430,9 +508,13 @@ export default {
       } else if (cL.data === false /* 签名验签 */) {
         // 获取线上签名uDn
         this.loadingAdd()
-        let uDnPro = axios.get(`/bems/prod_1.0/dssc/sign/getUserDn/${username}/password`, null, {
-          loading: this.loadingSub
-        })
+        let uDnPro = axios.get(
+          `/bems/prod_1.0/dssc/sign/getUserDn/${username}/password`,
+          null,
+          {
+            loading: this.loadingSub
+          }
+        )
 
         uDnPro.catch(this.getImgCode)
         let uDn = await uDnPro
@@ -442,13 +524,17 @@ export default {
         let sign = undefined
         let certDn = undefined
         if (supplier) {
-          let CaItem = Object.values(CaMap).find((item) => item.supplier === supplier) || CaMap['null']
+          let CaItem =
+            Object.values(CaMap).find((item) => item.supplier === supplier) ||
+            CaMap['null']
           window.sessionStorage.setItem('signType', CaItem.type)
         }
         if (checkCert) {
           this.loadingAdd()
           let { getSign } = await import('../../plugins/Sign')
-          let signVersion = process.env.VUE_APP_NetSign_VERSION || window.VUE_APP_NetSign_VERSION
+          let signVersion =
+            process.env.VUE_APP_NetSign_VERSION ||
+            window.VUE_APP_NetSign_VERSION
           let signPro = getSign(username + userDn, userDn, signVersion)
 
           uDnPro.catch(this.getImgCode)
@@ -566,7 +652,9 @@ export default {
       this.loadingAdd()
       try {
         let { default: decode } = await importG('jsonwebtoken/decode', () =>
-          import(/*webpackChunkName: "jsonwebtoken_decode"*/ 'jsonwebtoken/decode')
+          import(
+            /*webpackChunkName: "jsonwebtoken_decode"*/ 'jsonwebtoken/decode'
+          )
         )
 
         let tokenObj = decode(data.accessToken)
@@ -578,7 +666,11 @@ export default {
       }
       this.loadingSub()
 
-      Promise.all([this.getUserInfo(), this.getMicroAppsInfo(), this.getCltRelaNos()]).then(() => {
+      Promise.all([
+        this.getUserInfo(),
+        this.getMicroAppsInfo(),
+        this.getCltRelaNos()
+      ]).then(() => {
         if (this.loginThen) {
           this.loginThen().then(() => {
             this.$router.replace('/')

package/src/components/LoginTemporary/index.vue

@@ -6,7 +6,7 @@
       :before-login="beforeLogin"
       :login-types="loginTypes"
       :login-then="loginThen"
-      :syncRelated="syncRelated"
+      :sync-related="syncRelated"
       :async-rela-nos="asyncRelaNos"
       :show-forget-btn="showForgetBtn"
       style="display: none"
@@ -26,7 +26,7 @@
       :before-login="beforeLogin"
       :login-types="loginTypes"
       :login-then="loginThen"
-      :syncRelated="syncRelated"
+      :sync-related="syncRelated"
       :async-rela-nos="asyncRelaNos"
       :show-image-code="showImageCode"
       :show-forget-btn="showForgetBtn"
@@ -165,7 +165,18 @@ export default {
       return this.pageData.MAIN_PAGE_TEXT?.pmValue || this.jsonData.loginCopyright || ''
     },
     loginSloganHtml() {
-      return this.jsonData.loginSloganHtml || ''
+      switch (this._lang) {
+        case 'zh':
+          return this.jsonData.loginSloganHtml || ''
+        case 'en':
+          return this.jsonData.loginSloganHtmlEn || ''
+        case 'th':
+          return this.jsonData.loginSloganHtmlTh || ''
+        case 'vi':
+          return this.jsonData.loginSloganHtmlVi || ''
+        default:
+          return this.jsonData.loginSloganHtml || ''
+      }
     }
   },
   created() {

package/src/components/LoginTemporary/indexN.vue

@@ -7,7 +7,7 @@
         :login-types="loginTypes"
         :login-then="loginThen"
         :async-rela-nos="asyncRelaNos"
-        :syncRelated="syncRelated"
+        :sync-related="syncRelated"
         :show-forget-btn="showForgetBtn"
         :extra-form="extraForm"
         style="display: none"
@@ -82,13 +82,13 @@
 
       <loginForm
         v-if="operateType === 'login'"
-        class="login-form"
         ref="simpleLogin"
+        class="login-form"
         :before-login="beforeLogin"
         :login-types="loginTypes"
         :login-then="loginThenT"
         :async-rela-nos="asyncRelaNos"
-        :syncRelated="syncRelated"
+        :sync-related="syncRelated"
         :extra-form="extraForm"
         :show-image-code="imgCode"
         :show-forget-btn="showForgetBtn"
@@ -96,21 +96,21 @@
       >
         <div slot="header" class="login-form-header m-b text-c">
           <el-dropdown
-            v-if="!jsonData.hideLang && jsonData.lang.length > 1"
+            v-if="!langConf.hideLang && langConf.lang && langConf.lang.length > 1"
             class="m-l-lg login-language-box"
             @command="setLang"
           >
             <span>{{ langMap[langVal] | $lc }}<i class="el-icon-arrow-down el-icon--right"></i></span>
             <el-dropdown-menu slot="dropdown">
-              <el-dropdown-item v-if="jsonData.lang.includes('zh-cn')" command="zh-cn">{{
+              <el-dropdown-item v-if="langConf.lang.includes('zh-cn')" command="zh-cn">{{
                 '简体中文' | $lc
               }}</el-dropdown-item>
-              <el-dropdown-item v-if="jsonData.lang.includes('zh-hk')" command="zh-hk">{{
+              <el-dropdown-item v-if="langConf.lang.includes('zh-hk')" command="zh-hk">{{
                 '繁体中文' | $lc
               }}</el-dropdown-item>
-              <el-dropdown-item v-if="jsonData.lang.includes('en')" command="en">{{ '英文' | $lc }}</el-dropdown-item>
-              <el-dropdown-item v-if="jsonData.lang.includes('th')" command="th">{{ '泰文' | $lc }}</el-dropdown-item>
-              <el-dropdown-item v-if="jsonData.lang.includes('vi')" command="vi">{{ '越南语' | $lc }}</el-dropdown-item>
+              <el-dropdown-item v-if="langConf.lang.includes('en')" command="en">{{ '英文' | $lc }}</el-dropdown-item>
+              <el-dropdown-item v-if="langConf.lang.includes('th')" command="th">{{ '泰文' | $lc }}</el-dropdown-item>
+              <el-dropdown-item v-if="langConf.lang.includes('vi')" command="vi">{{ '越南语' | $lc }}</el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
           <slot name="header">{{ '欢 迎 登 录' | $lc }}</slot>
@@ -240,6 +240,10 @@ export default {
         hideLang: undefined,
         lang: []
       },
+      langConf: {
+        hideLang: false,
+        lang: ['zh-cn', 'zh-hk', 'en']
+      },
       langVal: window.localStorage.getItem('pageLang') || 'zh-cn',
       operateType: 'login',
       alV: false,
@@ -355,7 +359,18 @@ export default {
       return this.jsonData.showSystem ?? true
     },
     loginSloganHtml() {
-      return this.form.LOGIN_SLOGAN || this.jsonData.loginSloganHtml || ''
+      switch (this._lang) {
+        case 'zh':
+          return this.form.LOGIN_SLOGAN || this.jsonData.loginSloganHtml || ''
+        case 'en':
+          return this.form.LOGIN_SLOGAN || this.jsonData.loginSloganHtmlEn || ''
+        case 'th':
+          return this.form.LOGIN_SLOGAN || this.jsonData.loginSloganHtmlTh || ''
+        case 'vi':
+          return this.form.LOGIN_SLOGAN || this.jsonData.loginSloganHtmlVi || ''
+        default:
+          return this.form.LOGIN_SLOGAN || this.jsonData.loginSloganHtml || ''
+      }
     },
     systemList() {
       return this.form.SYSTEM_LIST.filter((d) => d.OPEN)
@@ -456,11 +471,18 @@ export default {
       this.$refs.simpleLogin.loginAfter(data)
     },
     async init() {
-      const { _layoutData = {}, loginSetting, screenInspect } = await getJsonc('/server-config.jsonc')
+      const { _layoutData = {}, langConf = {}, loginSetting, screenInspect } = await getJsonc('/server-config.jsonc')
       let _loginSetting = loginSetting || _layoutData.loginSetting
       this.jsonData = _layoutData
-      if (this.jsonData?.lang?.length) {
-        window.localStorage.setItem('pageLang', this.jsonData?.lang[0])
+      // 兼容旧的配置项 先取_layoutData中的配置没有再取langConf中的配置
+      langConf.hideLang = (this.jsonData?.hideLang || langConf?.hideLang) ?? false
+      langConf.lang = this.jsonData?.lang || langConf?.lang || ['zh-cn', 'zh-hk', 'en']
+      this.langConf = langConf
+      if (!langConf.hideLang && langConf?.lang?.length) {
+        window.localStorage.setItem('pageLang', langConf.lang[0])
+        Cookies.set('language', ['zh-cn', 'zh-hk'].includes(langConf.lang[0]) ? 'zh' : langConf.lang[0], {
+          expires: 365
+        })
       }
       if (_loginSetting !== 'JSON' && this.jsonData.showSystem) {
         await this.getSysSet()