n20-common-lib 2.9.35 → 2.9.36

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "2.9.35",
+  "version": "2.9.36",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

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

@@ -257,7 +257,7 @@ export default {
     }
   },
   created() {
-    getJsonc('/server-config.jsonc').then(({ _layoutData = {}, loginSetting }) => {
+    getJsonc('/server-config.jsonc').then(({ _layoutData = {}, loginSetting, langConf = {} }) => {
       let _loginSetting = loginSetting || _layoutData.loginSetting
       this.headerLogoUrl = realUrl(_layoutData.headerLogoUrl)
       this.headerUserUrl = realUrl(_layoutData.headerUserUrl)
@@ -268,7 +268,7 @@ export default {
       this.headerBgUrl = realUrl(_layoutData.headerBgUrl)
       this.headerBgColor = _layoutData.headerBgColor
       this.hideHelpDoc = _layoutData.hideHelpDoc
-      this.hideLang = _layoutData.hideLang
+      this.hideLang = (_layoutData.hideLang || langConf.hideLang) ?? false
       this.hideDowApp = _layoutData.hideDowApp
       this.hideTheme = _layoutData.hideTheme
 

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

@@ -22,11 +22,11 @@
     <h3 :class="['header-title ', showNavigation ? 'm-r-s' : 'm-r-auto']">{{ headerTitle | $l }}</h3>
     <div v-if="showNavigation" class="m-r-auto p-a-ss pointer header_change_system_box" @click="handleChangeSystem">
       <svg class="icon" aria-hidden="true">
-        <use xlink:href="#n20-icon-caidan"></use>
+        <use xlink:href="#n20-icon-caidan" />
       </svg>
       <span class="m-l-ss f-s-b color-primary">{{ $lc('导航') }}</span>
       <svg class="icon m-l-ss f-s-s" aria-hidden="true">
-        <use xlink:href="#n20-icon-lujing"></use>
+        <use xlink:href="#n20-icon-lujing" />
       </svg>
     </div>
 
@@ -493,7 +493,7 @@ export default {
     }
   },
   created() {
-    getJsonc('/server-config.jsonc').then(({ _layoutData = {}, loginSetting }) => {
+    getJsonc('/server-config.jsonc').then(({ _layoutData = {}, loginSetting, langConf = {} }) => {
       let _loginSetting = loginSetting || _layoutData.loginSetting
       this.headerLogoUrl = realUrl(_layoutData.headerLogoUrl)
       this.headerLogoWidth = _layoutData.headerLogoWidth
@@ -503,7 +503,7 @@ export default {
       this.headerBgUrl = realUrl(_layoutData.headerBgUrl)
       this.headerBgColor = _layoutData.headerBgColor
       this.hideHelpDoc = _layoutData.hideHelpDoc
-      this.hideLang = _layoutData.hideLang
+      this.hideLang = (_layoutData.hideLang || langConf.hideLang) ?? false
       this.langMap = _layoutData.lang
       this.hideDowApp = _layoutData.hideDowApp
       this.hideTheme = _layoutData.hideTheme

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,
@@ -456,11 +460,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()

package/src/components/Preview/index.vue

@@ -1,20 +1,20 @@
 <template>
   <Dialog
+    v-drag
     class="p-a-0"
     :title="'附件预览' | $lc"
     :visible.sync="visibleP"
     top="4vh"
     width="96%"
     append-to-body
-    @close="closeSee"
-    v-drag
     :close-on-click-modal="false"
+    @close="closeSee"
   >
     <span class="file-upload-table_preview-pn">
       <el-button round onlyicon plain size="mini" icon="el-icon-back" @click="$emit('preSee')" />
       <el-button round onlyicon plain size="mini" icon="el-icon-right" @click="$emit('nextSee')" />
     </span>
-    <div class="p-a" v-if="visiblePv" style="height: 82vh">
+    <div v-if="visiblePv" class="p-a" style="height: 82vh">
       <ViewerImg v-if="imgType.test(previewName)" :options="viewerOptions" style="height: 100%">
         <img :src="previewUrl" :alt="previewName" style="display: none" />
       </ViewerImg>