vxe-pc-ui 4.7.16 → 4.7.18

package/packages/date-range-picker/src/date-range-picker.ts

@@ -53,6 +53,14 @@ export default defineVxeComponent({
       default: () => getConfig().dateRangePicker.size || getConfig().size
     },
 
+    // startDate: {
+    //   type: [String, Number, Date] as PropType<VxeDateRangePickerPropTypes.StartDate>,
+    //   default: () => getConfig().dateRangePicker.startDate
+    // },
+    // endDate: {
+    //   type: [String, Number, Date] as PropType<VxeDateRangePickerPropTypes.EndDate>,
+    //   default: () => getConfig().dateRangePicker.endDate
+    // },
     minDate: [String, Number, Date] as PropType<VxeDateRangePickerPropTypes.MinDate>,
     maxDate: [String, Number, Date] as PropType<VxeDateRangePickerPropTypes.MaxDate>,
     defaultDate: [String, Number, Date] as PropType<VxeDateRangePickerPropTypes.DefaultDate>,
@@ -619,10 +627,19 @@ export default defineVxeComponent({
     }
 
     const handleGlobalBlurEvent = () => {
-      const { visiblePanel } = reactData
+      const { visiblePanel, isActivated } = reactData
       if (visiblePanel) {
         hidePanel()
       }
+      if (isActivated) {
+        reactData.isActivated = false
+      }
+      if (visiblePanel || isActivated) {
+        const targetElem = refInputTarget.value
+        if (targetElem) {
+          targetElem.blur()
+        }
+      }
     }
 
     const handleGlobalResizeEvent = () => {
@@ -896,8 +913,8 @@ export default defineVxeComponent({
                         className: props.className,
                         minDate: props.minDate,
                         maxDate: props.maxDate,
-                        startDay: props.startDay,
                         endDate: endValue,
+                        startDay: props.startDay,
                         labelFormat: props.labelFormat,
                         valueFormat: props.valueFormat,
                         timeFormat: props.timeFormat,
@@ -913,8 +930,8 @@ export default defineVxeComponent({
                         className: props.className,
                         minDate: props.minDate,
                         maxDate: props.maxDate,
-                        startDay: props.startDay,
                         startDate: startValue,
+                        startDay: props.startDay,
                         labelFormat: props.labelFormat,
                         valueFormat: props.valueFormat,
                         timeFormat: props.timeFormat,

package/packages/form/src/itemInfo.ts

@@ -4,7 +4,7 @@ import { errLog } from '../../ui/src/log'
 
 export class ItemInfo {
   constructor ($xeForm: any, item: any) {
-    const { formatter } = item
+    const { field, itemRender, formatter } = item
     if (formatter) {
       if (XEUtils.isString(formatter)) {
         const gFormatOpts = formats.get(formatter)
@@ -19,10 +19,19 @@ export class ItemInfo {
       }
     }
 
+    if (field && itemRender) {
+      if (itemRender.startField && `${itemRender.startField}`.indexOf(field) >= 0) {
+        errLog('vxe.error.modelConflicts', [`field=${field}`, `item-render.startField=${itemRender.startField}`])
+      }
+      if (itemRender.endField && `${itemRender.endField}`.indexOf(field) >= 0) {
+        errLog('vxe.error.modelConflicts', [`field=${field}`, `item-render.endField=${itemRender.endField}`])
+      }
+    }
+
     Object.assign(this, {
       id: XEUtils.uniqueId('item_'),
       title: item.title,
-      field: item.field,
+      field: field,
       span: item.span,
       align: item.align,
       verticalAlign: item.verticalAlign,
@@ -49,7 +58,7 @@ export class ItemInfo {
       contentStyle: item.contentStyle,
       titleClassName: item.titleClassName,
       titleStyle: item.titleStyle,
-      itemRender: item.itemRender,
+      itemRender: itemRender,
       rules: item.rules,
       formatter,
       // 自定义参数

package/packages/icon-picker/src/icon-picker.ts

@@ -399,7 +399,19 @@ export default defineVxeComponent({
     }
 
     const handleGlobalBlurEvent = () => {
-      hideOptionPanel()
+      const { visiblePanel, isActivated } = reactData
+      if (visiblePanel) {
+        hideOptionPanel()
+      }
+      if (isActivated) {
+        reactData.isActivated = false
+      }
+      if (visiblePanel || isActivated) {
+        const $input = refInput.value
+        if ($input) {
+          $input.blur()
+        }
+      }
     }
 
     const dispatchEvent = (type: ValueOf<VxeIconPickerEmits>, params: Record<string, any>, evnt: Event | null) => {

package/packages/input/src/input.ts

@@ -1930,9 +1930,16 @@ export default defineVxeComponent({
       const { isActivated, visiblePanel } = reactData
       if (visiblePanel) {
         hidePanel()
+      }
+      if (isActivated) {
+        reactData.isActivated = false
+      }
+      if (visiblePanel || isActivated) {
+        const inputElem = refInputTarget.value
         afterCheckValue()
-      } else if (isActivated) {
-        afterCheckValue()
+        if (inputElem) {
+          inputElem.blur()
+        }
       }
     }
 

package/packages/language/ar-EG.ts

@@ -17,6 +17,7 @@ export default {
       groupTag: 'يجب أن تستخدم رؤوس عمود التجميع "{0}" بدلاً من "{1}" ، والتي قد تسبب أخطاء',
       scrollErrProp: 'لا يتم دعم هذه المعلمة "{0}" بعد تمكين التمرير الظاهري',
       errConflicts: 'المعلمة "{0}" تتعارض مع "{1}"',
+      modelConflicts: '绑定的字段值 "{0}" 与 "{1}" 存在冲突，将会出现错误',
       notSupportProp: 'لا يتم دعم "{1}" عند تمكين المعلمة "{0}" ، يجب أن يكون "{2}" ، وإلا',
       notConflictProp: 'عند استخدام "{0}" ، يجب تعيين "{1}" ، وإلا قد يكون هناك تعارضات وظيفية',
       unableInsert: 'لا يمكن إدراجها في الموقع المحدد ، يرجى التحقق مما إذا كانت المعلمات صحيحة',

package/packages/language/de-DE.ts

@@ -17,6 +17,7 @@ export default {
       groupTag: 'Gruppierungsspalten -Header sollten "{0}" anstelle von "{1}" verwenden, was zu Fehlern führen kann',
       scrollErrProp: 'Dieser Parameter "{0}" wird nicht unterstützt, nachdem die virtuelle Scrollen aktiviert ist',
       errConflicts: 'Parameter "{0}" Konflikte mit "{1}"',
+      modelConflicts: '绑定的字段值 "{0}" 与 "{1}" 存在冲突，将会出现错误',
       notSupportProp: '"{1}" wird nicht unterstützt, wenn der Parameter "{0}" aktiviert ist. Es sollte "{2}" sein, andernfalls tritt ein Fehler auf',
       notConflictProp: 'Wenn "{0}" verwendet wird, sollte "{1}" festgelegt werden, andernfalls kann es funktionale Konflikte geben',
       unableInsert: 'Kann nicht in den angegebenen Ort eingefügt werden. Überprüfen Sie bitte, ob die Parameter korrekt sind',

package/packages/language/en-US.ts

@@ -17,6 +17,7 @@ export default {
       groupTag: 'Grouping column headers should use "{0}" instead of "{1}", which may cause errors',
       scrollErrProp: 'This parameter "{0}" is not supported after virtual scrolling is enabled',
       errConflicts: 'Parameter "{0}" conflicts with "{1}"',
+      modelConflicts: 'The bound field values "{0}" and "{1}" conflict, an error will occur.',
       notSupportProp: '"{1}" is not supported when the parameter "{0}" is enabled, it should be "{2}", otherwise an error will occur',
       notConflictProp: 'When using "{0}", "{1}" should be set, otherwise there may be functional conflicts',
       unableInsert: 'Cannot be inserted into the specified location, please check whether the parameters are correct',

package/packages/language/es-ES.ts

@@ -17,6 +17,7 @@ export default {
       groupTag: 'Los encabezados de la columna de agrupación deben usar "{0}" en lugar de "{1}", lo que puede causar errores',
       scrollErrProp: 'Este parámetro "{0}" no es compatible después de que el desplazamiento virtual esté habilitado',
       errConflicts: 'Parámetro "{0}" En conflicto con "{1}"',
+      modelConflicts: '绑定的字段值 "{0}" 与 "{1}" 存在冲突，将会出现错误',
       notSupportProp: '"{1}" no se admite cuando el parámetro "{0}" está habilitado, debería ser "{2}", de lo contrario ocurrirá un error',
       notConflictProp: 'Cuando se usa "{0}", "{1}" debe establecerse, de lo contrario puede haber conflictos funcionales',
       unableInsert: 'No se puede insertar en la ubicación especificada, verifique si los parámetros son correctos',

package/packages/language/fr-FR.ts

@@ -17,6 +17,7 @@ export default {
       groupTag: 'Le regroupement des en-têtes de colonne doit utiliser "{0}" au lieu de "{1}", ce qui peut entraîner des erreurs',
       scrollErrProp: "Ce paramètre \"{0}\" n'est pas pris en charge après l'activation du défilement virtuel",
       errConflicts: 'Paramètre "{0}" entre en conflit avec "{1}"',
+      modelConflicts: '绑定的字段值 "{0}" 与 "{1}" 存在冲突，将会出现错误',
       notSupportProp: "\"{1}\" n'est pas pris en charge lorsque le paramètre \"{0}\" est activé, il devrait être \"{2}\", sinon une erreur se produira",
       notConflictProp: 'Lorsque vous utilisez "{0}", "{1}" doit être défini, sinon il peut y avoir des conflits fonctionnels',
       unableInsert: "Ne peut pas être inséré dans l'emplacement spécifié, veuillez vérifier si les paramètres sont corrects",

package/packages/language/hu-HU.ts

@@ -17,6 +17,7 @@ export default {
       groupTag: 'Az oszlopfejlécek csoportosításának a "{0}" -et használni kell a "{1}" helyett, amely hibákat okozhat',
       scrollErrProp: 'Ezt a "{0}" paramétert a virtuális görgetés engedélyezése után nem támogatják',
       errConflicts: 'A "{0}" paraméter konfliktusok "{1}"',
+      modelConflicts: '绑定的字段值 "{0}" 与 "{1}" 存在冲突，将会出现错误',
       notSupportProp: 'A "{1}" nem támogatott, ha a "{0}" paraméter engedélyezve van, "{2}" -nek kell lennie, különben hiba lép fel',
       notConflictProp: 'A "{0}" használatakor a "{1}" -et be kell állítani, különben funkcionális konfliktusok merülhetnek fel',
       unableInsert: 'Nem lehet beilleszteni a megadott helyre, kérjük, ellenőrizze, hogy a paraméterek helyesek -e',

package/packages/language/hy-AM.ts

@@ -17,6 +17,7 @@ export default {
       groupTag: '分组列头应该使用 "{0}" 而不是 "{1}"，这可能会出现错误',
       scrollErrProp: '启用虚拟滚动后不支持该参数 "{0}"',
       errConflicts: '参数 "{0}" 与 "{1}" 有冲突',
+      modelConflicts: '绑定的字段值 "{0}" 与 "{1}" 存在冲突，将会出现错误',
       notSupportProp: '当启用参数 "{0}" 时不支持 "{1}"，应该为 "{2}"，否则将会出现错误',
       notConflictProp: '当使用 "{0}" 时，应该设置 "{1}"，否则可能会存在功能冲突',
       unableInsert: '无法插入到指定位置，请检查参数是否正确',

package/packages/language/id-ID.ts

@@ -17,6 +17,7 @@ export default {
       groupTag: 'Mengelompokkan header kolom harus menggunakan "{0}" bukan "{1}", yang dapat menyebabkan kesalahan',
       scrollErrProp: 'Parameter ini "{0}" tidak didukung setelah pengguliran virtual diaktifkan',
       errConflicts: 'Parameter "{0}" bertentangan dengan "{1}"',
+      modelConflicts: '绑定的字段值 "{0}" 与 "{1}" 存在冲突，将会出现错误',
       notSupportProp: '"{1}" tidak didukung ketika parameter "{0}" diaktifkan, itu harus menjadi "{2}", jika tidak kesalahan akan terjadi',
       notConflictProp: 'Saat menggunakan "{0}", "{1}" harus diatur, jika tidak mungkin ada konflik fungsional',
       unableInsert: 'Tidak dapat dimasukkan ke lokasi yang ditentukan, silakan periksa apakah parameternya benar',

package/packages/language/it-IT.ts

@@ -17,6 +17,7 @@ export default {
       groupTag: 'Le intestazioni della colonna di raggruppamento dovrebbero usare "{0}" invece di "{1}", che può causare errori',
       scrollErrProp: 'Questo parametro "{0}" non è supportato dopo che lo scorrimento virtuale è abilitato',
       errConflicts: 'Parametro "{0}" conflitti con "{1}"',
+      modelConflicts: '绑定的字段值 "{0}" 与 "{1}" 存在冲突，将会出现错误',
       notSupportProp: '"{1}" non è supportato quando il parametro "{0}" è abilitato, dovrebbe essere "{2}", altrimenti si verificherà un errore',
       notConflictProp: 'Quando si utilizza "{0}", "{1}" dovrebbe essere impostato, altrimenti potrebbero esserci conflitti funzionali',
       unableInsert: 'Non può essere inserito nella posizione specificata, si prega di verificare se i parametri sono corretti',

package/packages/language/ja-JP.ts

@@ -17,6 +17,7 @@ export default {
       groupTag: 'グループ化列ヘッダーは、「{1}」の代わりに「{0}」を使用する必要があります。',
       scrollErrProp: 'このパラメーター「{0}」は、仮想スクロールが有効になった後にサポートされていません',
       errConflicts: 'パラメーター「{0}」は「{1}」と競合します',
+      modelConflicts: '绑定的字段值 "{0}" 与 "{1}" 存在冲突，将会出现错误',
       notSupportProp: '「{1}」はパラメーター「{0}」が有効になっている場合、「{2}」である必要があります。そうしないと、エラーが発生します。',
       notConflictProp: '「{0}」を使用する場合、「{1}」を設定する必要があります。',
       unableInsert: '指定された場所に挿入できません。パラメーターが正しいかどうかを確認してください',

package/packages/language/ko-KR.ts

@@ -17,6 +17,7 @@ export default {
       groupTag: '열 헤더 그룹화는 "{1}"대신 "{0}"을 사용해야하며 오류가 발생할 수 있습니다.',
       scrollErrProp: '이 매개 변수 "{0}"은 가상 스크롤링이 활성화 된 후에 지원되지 않습니다.',
       errConflicts: '매개 변수 "{0}" "{1}"과 충돌합니다.',
+      modelConflicts: '绑定的字段值 "{0}" 与 "{1}" 存在冲突，将会出现错误',
       notSupportProp: '"{1}"은 "{0}"매개 변수가 활성화 될 때 지원되지 않습니다. "{2}"이어야합니다. 그렇지 않으면 오류가 발생합니다.',
       notConflictProp: '"{0}"을 사용하는 경우 "{1}"을 설정해야합니다. 그렇지 않으면 기능적 충돌이있을 수 있습니다.',
       unableInsert: '지정된 위치에 삽입 할 수 없으므로 매개 변수가 올바른지 확인하십시오.',

package/packages/language/ms-MY.ts

@@ -17,6 +17,7 @@ export default {
       groupTag: 'Mengumpulkan tajuk lajur harus menggunakan "{0}" bukannya "{1}", yang boleh menyebabkan kesilapan',
       scrollErrProp: 'Parameter ini "{0}" tidak disokong selepas menatal maya diaktifkan',
       errConflicts: 'Parameter "{0}" Konflik dengan "{1}"',
+      modelConflicts: '绑定的字段值 "{0}" 与 "{1}" 存在冲突，将会出现错误',
       notSupportProp: '"{1}" tidak disokong apabila parameter "{0}" diaktifkan, ia harus "{2}", jika tidak, ralat akan berlaku',
       notConflictProp: 'Apabila menggunakan "{0}", "{1}" harus ditetapkan, jika tidak ada konflik fungsional',
       unableInsert: 'Tidak dapat dimasukkan ke lokasi yang ditentukan, sila periksa sama ada parameternya betul',

package/packages/language/nb-NO.ts

@@ -17,6 +17,7 @@ export default {
       groupTag: 'Gruppering av kolonneoverskrifter bør bruke "{0}" i stedet for "{1}", som kan forårsake feil',
       scrollErrProp: 'Denne parameteren "{0}" støttes ikke etter at virtuell rulling er aktivert',
       errConflicts: 'Parameter "{0}" Konflikter med "{1}"',
+      modelConflicts: '绑定的字段值 "{0}" 与 "{1}" 存在冲突，将会出现错误',
       notSupportProp: '"{1}" støttes ikke når parameteren "{0}" er aktivert, den skal være "{2}", ellers vil det oppstå en feil',
       notConflictProp: 'Når du bruker "{0}", "{1}" skal settes, ellers kan det være funksjonelle konflikter',
       unableInsert: 'Kan ikke settes inn på det spesifiserte stedet, vennligst sjekk om parametrene er riktige',

package/packages/language/pt-BR.ts

@@ -17,6 +17,7 @@ export default {
       groupTag: 'Os cabeçalhos da coluna de agrupamento devem usar "{0}" em vez de "{1}", o que pode causar erros',
       scrollErrProp: 'Este parâmetro "{0}" não é suportado após a rolagem virtual ser ativada',
       errConflicts: 'Parâmetro "{0}" conflita com "{1}"',
+      modelConflicts: '绑定的字段值 "{0}" 与 "{1}" 存在冲突，将会出现错误',
       notSupportProp: '"{1}" não é suportado quando o parâmetro "{0}" estiver ativado, ele deve ser "{2}", caso contrário, um erro ocorrerá',
       notConflictProp: 'Ao usar "{0}", "{1}" deve ser definido, caso contrário, pode haver conflitos funcionais',
       unableInsert: 'Não pode ser inserido no local especificado, verifique se os parâmetros estão corretos',

package/packages/language/ru-RU.ts

@@ -17,6 +17,7 @@ export default {
       groupTag: 'Заголовки столбцов группировки должны использовать «{0}» вместо «{1}», что может вызвать ошибки',
       scrollErrProp: 'Этот параметр "{0}" не поддерживается после включения виртуальной прокрутки',
       errConflicts: 'Параметр "{0}" Конфликт с "{1}"',
+      modelConflicts: '绑定的字段值 "{0}" 与 "{1}" 存在冲突，将会出现错误',
       notSupportProp: '"{1}" не поддерживается, когда параметр "{0}"',
       notConflictProp: 'При использовании "{0}", "{1}" должен быть установлен, в противном случае могут быть функциональные конфликты',
       unableInsert: 'Нельзя вставить в указанное место, пожалуйста, проверьте, являются ли параметры правильными',

package/packages/language/th-TH.ts

@@ -17,6 +17,7 @@ export default {
       groupTag: 'ส่วนหัวคอลัมน์การจัดกลุ่มควรใช้ "{0}" แทน "{1}" ซึ่งอาจทำให้เกิดข้อผิดพลาด',
       scrollErrProp: 'พารามิเตอร์นี้ "{0}" นี้ไม่ได้รับการสนับสนุนหลังจากเปิดใช้งานการเลื่อนเสมือนจริง',
       errConflicts: 'พารามิเตอร์ "{0}" ขัดแย้งกับ "{1}"',
+      modelConflicts: '绑定的字段值 "{0}" 与 "{1}" 存在冲突，将会出现错误',
       notSupportProp: '"{1}" ไม่ได้รับการสนับสนุนเมื่อเปิดใช้งานพารามิเตอร์ "{0}" มันควรจะเป็น "{2}" มิฉะนั้นจะเกิดข้อผิดพลาดเกิดขึ้น',
       notConflictProp: 'เมื่อใช้ "{0}", "{1}" ควรตั้งค่ามิฉะนั้นอาจมีความขัดแย้งในการทำงาน',
       unableInsert: 'ไม่สามารถแทรกลงในตำแหน่งที่ระบุได้โปรดตรวจสอบว่าพารามิเตอร์ถูกต้องหรือไม่',

package/packages/language/ug-CN.ts

@@ -17,6 +17,7 @@ export default {
       groupTag: 'گۇرۇپپا قۇر بىشىغا چوقۇم  "{0}" نى ئىشلىتىشىڭىز كىرەك،ھەرگىزمۇ "{1}"نى ئەمەس ،بولمىسا بۇ بەلكىم خاتالىق كەلتۈرۈپ چىقىرىشى مومكىن',
       scrollErrProp: 'مەۋھۇم يۇمىلاتما ئىقىدارىنى قوزغاتقاندىن كىيىن بۇ سېپىرنى تەكشەشكە بولمايدۇ "{0}"',
       errConflicts: 'سان سىپىر "{0}" بىلەن "{1}" دە ماسلاشماسلىق ئەھۋالى مەۋجۇت',
+      modelConflicts: '绑定的字段值 "{0}" 与 "{1}" 存在冲突，将会出现错误',
       notSupportProp: '当启用参数 "{0}" 时不支持 "{1}"，应该为 "{2}"，否则将会出现错误',
       notConflictProp: '当使用 "{0}" 时，应该设置 "{1}"，否则可能会存在功能冲突',
       unableInsert: 'بىكىتىلگەن ئورۇنغا قىستۇرۇشقا بولمايدۇ، پارامېتىرىڭىزنىڭ توغرا-خاتالىقىنى تەكشۈرۈڭ ',

package/packages/language/uk-UA.ts

@@ -17,6 +17,7 @@ export default {
       groupTag: 'Заголовок стовпців групування повинно використовувати "{0}" замість "{1}", що може спричинити помилки',
       scrollErrProp: 'Цей параметр "{0}" не підтримується після включення віртуальної прокрутки',
       errConflicts: 'Параметр "{0}" Конфлікти з "{1}"',
+      modelConflicts: '绑定的字段值 "{0}" 与 "{1}" 存在冲突，将会出现错误',
       notSupportProp: '"{1}" не підтримується, коли параметр "{0}" ввімкнено, він повинен бути "{2}", інакше помилка станеться',
       notConflictProp: 'При використанні "{0}", "{1}" слід встановити, інакше можуть бути функціональні конфлікти',
       unableInsert: 'Неможливо вставити у вказане місце, будь ласка, перевірте, чи правильні параметри',

package/packages/language/uz-UZ.ts

@@ -17,6 +17,7 @@ export default {
       groupTag: "\"Lim li}\" o'rniga guruh sarlavhalarida \"{1}\" o'rniga \"{0}\" o'rniga \"{0}\" dan foydalanish kerak",
       scrollErrProp: "Virtual aylantirish yoqilgandan so'ng \"{0}\" ushbu parametr qo'llab-quvvatlanmaydi",
       errConflicts: '"{0}" parametr "{1}" bilan ziddiyatlar',
+      modelConflicts: '绑定的字段值 "{0}" 与 "{1}" 存在冲突，将会出现错误',
       notSupportProp: '"{1}" parametri yoqilganda, u "{2}" parametrlari yoqilgan, aks holda xatolik yuz beradi',
       notConflictProp: "\"{0}\", \"{1}\" dan foydalanish kerak bo'lganda, aks holda funktsional to'qnashuvlar bo'lishi mumkin",
       unableInsert: "Belgilangan joyda kiritilishi mumkin emas, parametrlar to'g'ri yoki yo'qligini tekshiring",

package/packages/language/vi-VN.ts

@@ -17,6 +17,7 @@ export default {
       groupTag: 'Nhóm tiêu đề nhóm nên sử dụng "{0}" thay vì "{1}", có thể gây ra lỗi',
       scrollErrProp: 'Tham số này "{0}" không được hỗ trợ sau khi cuộn ảo được bật',
       errConflicts: 'Tham số "{0}" Xung đột với "{1}"',
+      modelConflicts: '绑定的字段值 "{0}" 与 "{1}" 存在冲突，将会出现错误',
       notSupportProp: '"{1}" không được hỗ trợ khi tham số "{0}" được bật, nó phải là "{2}", nếu không sẽ xảy ra lỗi',
       notConflictProp: 'Khi sử dụng "{0}", "{1}" nên được đặt, nếu không có thể có xung đột chức năng',
       unableInsert: 'Không thể được chèn vào vị trí đã chỉ định, vui lòng kiểm tra xem các tham số có đúng không',

package/packages/language/zh-CHT.ts

@@ -17,6 +17,7 @@ export default {
       groupTag: '分組列頭應該使用 "{0}" 而不是 "{1}"，這可能會出現錯誤',
       scrollErrProp: '啟用虛擬滾動後不支持該參數 "{0}"',
       errConflicts: '參數 "{0}" 與 "{1}" 有衝突',
+      modelConflicts: '绑定的字段值 "{0}" 与 "{1}" 存在冲突，将会出现错误',
       notSupportProp: '當啟用參數 "{0}" 時不支持 "{1}"，應該為 "{2}"，否則將會出現錯誤',
       notConflictProp: '當使用 "{0}" 時，應該設置 "{1}"，否則可能會存在功能衝突',
       unableInsert: '無法插入到指定位置，請檢查參數是否正確',

package/packages/language/zh-CN.ts

@@ -17,6 +17,7 @@ export default {
       groupTag: '分组列头应该使用 "{0}" 而不是 "{1}"，这可能会出现错误',
       scrollErrProp: '启用虚拟滚动后不支持该参数 "{0}"',
       errConflicts: '参数 "{0}" 与 "{1}" 有冲突',
+      modelConflicts: '绑定的字段值 "{0}" 与 "{1}" 存在冲突，将会出现错误',
       notSupportProp: '当启用参数 "{0}" 时不支持 "{1}"，应该为 "{2}"，否则将会出现错误',
       notConflictProp: '当使用 "{0}" 时，应该设置 "{1}"，否则可能会存在功能冲突',
       unableInsert: '无法插入到指定位置，请检查参数是否正确',

package/packages/pulldown/src/pulldown.ts

@@ -171,7 +171,7 @@ export default defineVxeComponent({
     /**
      * 隐藏下拉面板
      */
-    const hidePanel = () => {
+    const hideOptionPanel = () => {
       reactData.visiblePanel = false
       dispatchEvent('visible-change', { visible: false }, null)
       emit('update:modelValue', false)
@@ -196,7 +196,7 @@ export default defineVxeComponent({
      */
     const togglePanel = () => {
       if (reactData.visiblePanel) {
-        return hidePanel()
+        return hideOptionPanel()
       }
       return showPanel()
     }
@@ -204,7 +204,7 @@ export default defineVxeComponent({
     const handleOptionEvent = (evnt: Event, option: VxePulldownPropTypes.Option) => {
       if (!option.disabled) {
         if (reactData.visiblePanel) {
-          hidePanel()
+          hideOptionPanel()
           dispatchEvent('hide-panel', {}, evnt)
         }
         dispatchEvent('option-click', { option }, evnt)
@@ -215,7 +215,7 @@ export default defineVxeComponent({
       const { trigger } = props
       if (trigger === 'click') {
         if (reactData.visiblePanel) {
-          hidePanel()
+          hideOptionPanel()
           dispatchEvent('hide-panel', {}, evnt)
         } else {
           showPanel()
@@ -234,7 +234,7 @@ export default defineVxeComponent({
           if (getEventTargetNode(evnt, panelElem).flag) {
             updatePlacement()
           } else {
-            hidePanel()
+            hideOptionPanel()
             dispatchEvent('hide-panel', {}, evnt)
           }
         }
@@ -249,18 +249,21 @@ export default defineVxeComponent({
       if (!disabled) {
         reactData.isActivated = getEventTargetNode(evnt, el).flag || getEventTargetNode(evnt, panelElem).flag
         if (visiblePanel && !reactData.isActivated) {
-          hidePanel()
+          hideOptionPanel()
           dispatchEvent('hide-panel', {}, evnt)
         }
       }
     }
 
     const handleGlobalBlurEvent = (evnt: Event) => {
-      if (reactData.visiblePanel) {
-        reactData.isActivated = false
-        hidePanel()
+      const { visiblePanel, isActivated } = reactData
+      if (visiblePanel) {
+        hideOptionPanel()
         dispatchEvent('hide-panel', {}, evnt)
       }
+      if (isActivated) {
+        reactData.isActivated = false
+      }
     }
 
     const handleGlobalResizeEvent = () => {
@@ -279,7 +282,7 @@ export default defineVxeComponent({
       isPanelVisible,
       togglePanel,
       showPanel,
-      hidePanel
+      hidePanel: hideOptionPanel
     }
 
     Object.assign($xePulldown, pulldownMethods)
@@ -289,7 +292,7 @@ export default defineVxeComponent({
       if (value) {
         showPanel()
       } else {
-        hidePanel()
+        hideOptionPanel()
       }
     })
 

package/packages/select/src/select.ts

@@ -749,7 +749,19 @@ export default defineVxeComponent({
     }
 
     const handleGlobalBlurEvent = () => {
-      hideOptionPanel()
+      const { visiblePanel, isActivated } = reactData
+      if (visiblePanel) {
+        hideOptionPanel()
+      }
+      if (isActivated) {
+        reactData.isActivated = false
+      }
+      if (visiblePanel || isActivated) {
+        const $input = refInput.value
+        if ($input) {
+          $input.blur()
+        }
+      }
     }
 
     const handleGlobalResizeEvent = () => {

package/packages/table-select/src/table-select.ts

@@ -452,7 +452,19 @@ export default defineVxeComponent({
     }
 
     const handleGlobalBlurEvent = () => {
-      hideOptionPanel()
+      const { visiblePanel, isActivated } = reactData
+      if (visiblePanel) {
+        hideOptionPanel()
+      }
+      if (isActivated) {
+        reactData.isActivated = false
+      }
+      if (visiblePanel || isActivated) {
+        const $input = refInput.value
+        if ($input) {
+          $input.blur()
+        }
+      }
     }
 
     const handleGlobalResizeEvent = () => {

package/packages/tree-select/src/tree-select.ts

@@ -509,7 +509,19 @@ export default defineVxeComponent({
     }
 
     const handleGlobalBlurEvent = () => {
-      hideOptionPanel()
+      const { visiblePanel, isActivated } = reactData
+      if (visiblePanel) {
+        hideOptionPanel()
+      }
+      if (isActivated) {
+        reactData.isActivated = false
+      }
+      if (visiblePanel || isActivated) {
+        const $input = refInput.value
+        if ($input) {
+          $input.blur()
+        }
+      }
     }
 
     const handleGlobalResizeEvent = () => {

package/styles/components/date-panel.scss

@@ -169,6 +169,19 @@
     }
   }
 }
+
+.vxe-date-panel--view-body {
+  .vxe-date-panel--view-item {
+    cursor: pointer;
+    &.is--range-disabled,
+    &.is--disabled {
+      cursor: no-drop;
+    }
+    &.is--over {
+      cursor: no-drop;
+    }
+  }
+}
 .vxe-date-panel--view-row {
   display: flex;
   flex-direction: row;
@@ -233,6 +246,12 @@
       }
     }
   }
+  &.is--range-disabled {
+    .vxe-date-panel--view-item-inner {
+      color: var(--vxe-ui-input-disabled-color);
+      background-color: inherit;
+    }
+  }
   &.is--disabled {
     .vxe-date-panel--view-item-inner {
       color: var(--vxe-ui-input-disabled-color);
@@ -245,16 +264,16 @@
   }
 }
 
-.vxe-date-range-picker--panel {
-  .vxe-date-panel--view-item {
-    &.is--disabled {
-      .vxe-date-panel--view-item-inner {
-        color: var(--vxe-ui-input-disabled-color);
-        background-color: inherit;
-      }
-    }
-  }
-}
+// .vxe-date-range-picker--panel {
+//   .vxe-date-panel--view-item {
+//     &.is--range-disabled {
+//       .vxe-date-panel--view-item-inner {
+//         color: var(--vxe-ui-input-disabled-color);
+//         background-color: inherit;
+//       }
+//     }
+//   }
+// }
 
 .vxe-date-panel--view-wrapper {
   &.type--week {
@@ -298,17 +317,6 @@
     }
   }
 }
-.vxe-date-panel--view-body {
-  .vxe-date-panel--view-item {
-    cursor: pointer;
-    &.is--disabled {
-      cursor: no-drop;
-    }
-    &.is--over {
-      cursor: no-drop;
-    }
-  }
-}
 .vxe-date-panel--view-item-inner {
   display: flex;
   flex-direction: column;

package/types/components/date-range-picker.d.ts

@@ -41,9 +41,13 @@ export namespace VxeDateRangePickerPropTypes {
   export type Placeholder = string
   export type AutoComplete = string
   export type Form = string
+
+  // export type StartDate = string | number | Date
+  // export type EndDate = string | number | Date
   export type DefaultDate = string | number | Date
   export type MinDate = string | number | Date
   export type MaxDate = string | number | Date
+
   export type StartDay = 0 | 1 | 2 | 3 | 4 | 5 | 6
   export type SelectDay = 0 | 1 | 2 | 3 | 4 | 5 | 6
   export type LabelFormat = string
@@ -91,6 +95,8 @@ export interface VxeDateRangePickerProps {
   autoComplete?: VxeDateRangePickerPropTypes.AutoComplete
   form?: VxeDateRangePickerPropTypes.Form
 
+  // startDate?: VxeDateRangePickerPropTypes.StartDate
+  // endDate?: VxeDateRangePickerPropTypes.EndDate
   defaultDate?: VxeDateRangePickerPropTypes.DefaultDate
   minDate?: VxeDateRangePickerPropTypes.MinDate
   maxDate?: VxeDateRangePickerPropTypes.MaxDate