n20-common-lib 3.3.8 → 3.3.9

package/package.json

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

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/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) {

package/src/i18n.json

@@ -10121,6 +10121,13 @@
     "ja": "ビュー名を入力してください",
     "zh-hk": "請輸入視圖名稱"
   },
+  "视图名称不能重复": {
+    "en": "View names cannot be duplicated",
+    "th": "ชื่อมุมมองต้องไม่ซ้ำกัน",
+    "vi": "Tên chế độ xem không được trùng lặp",
+    "ja": "ビュー名は重複できません",
+    "zh-hk": "視圖名稱不能重複"
+  },
   "至少添加一个条件": {
     "en": "Add at least one condition",
     "th": "เพิ่มอย่างน้อยหนึ่งเงื่อนไข",