n20-common-lib 3.3.8 → 3.3.10

package/package.json

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

package/src/components/DateChoose/index.vue

@@ -176,7 +176,10 @@ export default {
           value: 6
         }
       ],
-      weeks: [$lc("一"), $lc("二"), $lc("三"), $lc("四"), $lc("五"), $lc("六"), $lc("日")],
+      // 西班牙语星期使用缩写，避免与季度共用的数字词条混淆。
+      weeks: this._lang === 'es'
+        ? ['周一', '周二', '周三', '周四', '周五', '周六', '周日'].map(day => $lc(day))
+        : [$lc("一"), $lc("二"), $lc("三"), $lc("四"), $lc("五"), $lc("六"), $lc("日")],
       months: [
         1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30,
         31

package/src/components/DatePicker/index.vue

@@ -152,10 +152,6 @@ export default {
   display: inline-block;
 }
 
-.n20-date-picker > .n20-date-editor {
-  width: 100%;
-}
-
 .n20-date-picker.has-long-term {
   display: inline-flex;
   align-items: center;
@@ -163,7 +159,6 @@ export default {
 
 .n20-date-picker.has-long-term > .n20-date-editor {
   flex: 1;
-  width: auto;
   min-width: 0;
 }
 

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

@@ -133,7 +133,8 @@
         <el-radio-group v-model="langVal" @change="setLang">
           <el-radio label="zh-cn" border>{{ $lc('简体中文') }}</el-radio>
           <el-radio label="zh-hk" border>{{ $lc('繁體中文') }}</el-radio>
-          <el-radio label="en" border>English</el-radio>
+          <el-radio label="en" border>{{ $lc('英文') }}</el-radio>
+          <el-radio label="es" border>{{ $lc('西班牙语') }}</el-radio>
         </el-radio-group>
       </div>
     </dialogWrap>
@@ -170,26 +171,26 @@
 </template>
 
 <script>
-import { $lc } from '../../../utils/i18n/index'
+import dayjs from 'dayjs'
+import duration from 'dayjs/plugin/duration'
 import Cookies from 'js-cookie'
-import { themeList } from '../../../utils/theme.config.js'
 
-import operatingStatus from '../../operatingStatus/index.vue'
-import dialogWrap from '../../Dialog/index.vue'
 import changePwd from './changePwd.vue'
 import noticePop from './noticePop.vue'
 import switchUser from './switchUser.vue'
 
-import axios from '../../../utils/axios'
 import getJsonc from '../../../assets/getJsonc'
 import realUrl from '../../../assets/realUrl'
 import auth from '../../../utils/auth'
+import axios from '../../../utils/axios'
+import { $lc } from '../../../utils/i18n/index'
+import { themeList } from '../../../utils/theme.config.js'
 import { linkPush } from '../../../utils/urlToGo'
-import dayjs from 'dayjs'
-import duration from 'dayjs/plugin/duration'
-dayjs.extend(duration)
-
+import dialogWrap from '../../Dialog/index.vue'
 import { siteTree2menus } from '../../LoginTemporary/utils'
+import operatingStatus from '../../operatingStatus/index.vue'
+
+dayjs.extend(duration)
 
 const prefix = window.__INJECTED_PUBLIC_PATH_BY_QIANKUN__ || process.env.BASE_URL || '/'
 

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

@@ -87,7 +87,7 @@
         :class="{
           'icon-zhongwen': langVal === 'zh-cn',
           'icon-fanti': langVal === 'zh-hk',
-          'icon-yuyanqiehuan': langVal === 'en'
+          'icon-yuyanqiehuan': ['en', 'es'].includes(langVal)
         }"
       ></span>
 
@@ -112,6 +112,10 @@
           ><i class="n20-icon-a-yuenanyuyanqiehuan_huaban1 f-s-icon"></i
           >{{ '越南语' | $lc }}</el-dropdown-item
         >
+        <el-dropdown-item v-if="langMap.includes('es')" command="es"
+          ><i class="iconfont icon-yuyanqiehuan f-s-icon"></i
+          >{{ '西班牙语' | $lc }}</el-dropdown-item
+        >
       </el-dropdown-menu>
     </el-dropdown>
 

package/src/components/LoginTemporary/indexN.vue

@@ -111,6 +111,7 @@
               <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-item v-if="langConf.lang.includes('es')" command="es">{{ '西班牙语' | $lc }}</el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
           <slot name="header">{{ '欢 迎 登 录' | $lc }}</slot>
@@ -224,7 +225,8 @@ export default {
         'zh-hk': $lc("繁体中文"),
         en: $lc("英文"),
         th: $lc("泰文"),
-        vi: $lc("越南语")
+        vi: $lc("越南语"),
+        es: $lc("西班牙语")
       },
       wrapStyle: '',
       logUrl: `${protocol}//${host}${pathname}`,

package/src/components/ProFilterView/index.vue

@@ -140,7 +140,10 @@
         <el-form-item
           :label="$lc('视图名称')"
           prop="viewName"
-          :rules="[{ required: true, message: $lc('请输入'), trigger: 'blur' }]"
+          :rules="[
+            { required: true, message: $lc('请输入视图名称'), trigger: 'blur' },
+            { validator: validateViewName, trigger: 'blur' }
+          ]"
         >
           <el-input v-model="form.viewName" maxlength="30" show-word-limit />
         </el-form-item>
@@ -653,6 +656,22 @@ export default {
         return fallback
       }
     },
+    // 编辑时排除当前视图，避免将未修改的原名称误判为重复
+    validateViewName(rule, value, callback) {
+      const viewName = typeof value === 'string' ? value.trim() : ''
+      if (!viewName) {
+        callback()
+        return
+      }
+      const isDuplicate = this.list.some(
+        (item) => typeof item.viewName === 'string' && item.viewName.trim() === viewName && item.viewId !== this.viewId
+      )
+      if (isDuplicate) {
+        callback(new Error($lc('视图名称不能重复')))
+        return
+      }
+      callback()
+    },
     // 保存筛选条件
     saveCheckData(data = []) {
       this.form.keyIds = data.map((item) => item.id).filter((id) => id !== undefined && id !== null && id !== '')
@@ -704,9 +723,14 @@ export default {
         return
       }
 
+      if (typeof this.form.viewName === 'string') {
+        this.form.viewName = this.form.viewName.trim()
+      }
       this.$refs.form.validate(async (valid) => {
         if (!valid) {
-          this.$message.error($lc('请输入视图名称'))
+          if (!this.form.viewName) {
+            this.$message.error($lc('请输入视图名称'))
+          }
           return
         }
         if (this.form.viewType === VIEW_TYPE.BASIC) {