Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
xuliangzhan committed Sep 17, 2024
1 parent afd57c2 commit 8be4770
Show file tree
Hide file tree
Showing 17 changed files with 1,281 additions and 1,340 deletions.
9 changes: 7 additions & 2 deletions packages/date-picker/src/date-picker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -884,14 +884,19 @@ export default defineComponent({
const blurEvent = (evnt: Event & { type: 'blur' }) => {
const { inputValue } = reactData
const inpImmediate = computeInpImmediate.value
const value = inputValue
if (!inpImmediate) {
handleChange(inputValue, evnt)
handleChange(value, evnt)
}
afterCheckValue()
if (!reactData.visiblePanel) {
reactData.isActivated = false
}
datePickerMethods.dispatchEvent('blur', { value: inputValue }, evnt)
datePickerMethods.dispatchEvent('blur', { value }, evnt)
// 自动更新校验状态
if ($xeForm && formItemInfo) {
$xeForm.triggerItemEvent(evnt, formItemInfo.itemConfig.field, value)
}
}

const keydownEvent = (evnt: KeyboardEvent & { type: 'keydown' }) => {
Expand Down
31 changes: 18 additions & 13 deletions packages/input/src/input.ts
Original file line number Diff line number Diff line change
Expand Up @@ -821,6 +821,24 @@ export default defineComponent({
}
}

const blurEvent = (evnt: Event & { type: 'blur' }) => {
const { inputValue } = reactData
const inpImmediate = computeInpImmediate.value
const value = inputValue
if (!inpImmediate) {
handleChange(value, evnt)
}
afterCheckValue()
if (!reactData.visiblePanel) {
reactData.isActivated = false
}
inputMethods.dispatchEvent('blur', { value }, evnt)
// 自动更新校验状态
if ($xeForm && formItemInfo) {
$xeForm.triggerItemEvent(evnt, formItemInfo.itemConfig.field, value)
}
}

const focusEvent = (evnt: Event & { type: 'focus' }) => {
reactData.isActivated = true
const isDatePickerType = computeIsDatePickerType.value
Expand Down Expand Up @@ -1070,19 +1088,6 @@ export default defineComponent({
}
}

const blurEvent = (evnt: Event & { type: 'blur' }) => {
const { inputValue } = reactData
const inpImmediate = computeInpImmediate.value
if (!inpImmediate) {
handleChange(inputValue, evnt)
}
afterCheckValue()
if (!reactData.visiblePanel) {
reactData.isActivated = false
}
inputMethods.dispatchEvent('blur', { value: inputValue }, evnt)
}

// 密码
const passwordToggleEvent = (evnt: Event) => {
const { showPwd } = reactData
Expand Down
9 changes: 0 additions & 9 deletions packages/language/en-US.ts
Original file line number Diff line number Diff line change
Expand Up @@ -472,10 +472,6 @@ export default {
ss: 'Second'
}
},

/**
* 扩展插件
*/
plugins: {
extendCellArea: {
area: {
Expand Down Expand Up @@ -580,11 +576,6 @@ export default {
notData: 'No data'
}
},

/**
* 以下废弃
* @deprecated
*/
renderer: {
search: 'Search',
cases: {
Expand Down
Loading

0 comments on commit 8be4770

Please sign in to comment.