From a1e9b18a4dbfd21e1bf4d5cb60974ac2f0115efd Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 30 五月 2025 15:18:44 +0800
Subject: [PATCH] 2025-05-30
---
src/tabviews/zshare/mutilform/mkPopSelect/index.jsx | 4 ++--
src/tabviews/zshare/mutilform/index.jsx | 11 ++++++++++-
src/tabviews/zshare/mutilform/mkCheck/index.jsx | 4 ++--
src/tabviews/zshare/mutilform/mkSelect/index.jsx | 4 ++--
src/tabviews/zshare/mutilform/mkSwitch/index.jsx | 4 ++--
src/tabviews/zshare/mutilform/mkInput/index.jsx | 2 +-
src/tabviews/custom/components/form/simple-form/index.jsx | 6 +++---
src/tabviews/zshare/mutilform/mkVercode/index.jsx | 2 +-
src/tabviews/zshare/mutilform/mkNumberInput/index.jsx | 2 +-
src/tabviews/zshare/actionList/normalbutton/index.jsx | 6 +++++-
src/tabviews/zshare/mutilform/mkDatePicker/index.jsx | 2 +-
11 files changed, 30 insertions(+), 17 deletions(-)
diff --git a/src/tabviews/custom/components/form/simple-form/index.jsx b/src/tabviews/custom/components/form/simple-form/index.jsx
index c3edeff..fc9822d 100644
--- a/src/tabviews/custom/components/form/simple-form/index.jsx
+++ b/src/tabviews/custom/components/form/simple-form/index.jsx
@@ -403,12 +403,12 @@
}
}
- mkFormSubmit = (btnId, callback, formId) => {
+ mkFormSubmit = (btnId, callback, formId, errId) => {
const { group } = this.state
if (group.uuid !== btnId) return
- this.formRef.handleConfirm(formId).then(res => {
+ this.formRef.handleConfirm(formId, errId).then(res => {
MKEmitter.emit('triggerFormSubmit', {menuId: btnId, form: res})
}, () => {
callback && callback()
@@ -460,7 +460,7 @@
data={data}
action={group}
unload={config.setting.supModule && !BID}
- inputSubmit={(id) => this.mkFormSubmit(group.uuid, null, id)}
+ inputSubmit={(id, errId) => this.mkFormSubmit(group.uuid, null, id, errId)}
wrappedComponentRef={(inst) => this.formRef = inst}
/> : null}
{data ? <div className={'mk-form-action ' + (group.$button || '')}>
diff --git a/src/tabviews/zshare/actionList/normalbutton/index.jsx b/src/tabviews/zshare/actionList/normalbutton/index.jsx
index b415701..427f649 100644
--- a/src/tabviews/zshare/actionList/normalbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/normalbutton/index.jsx
@@ -3837,7 +3837,11 @@
loadingTotal: '',
})
- if (btnconfig && btnconfig.setting && btnconfig.setting.errFocus) {
+ if (window.CACHE.errFocusId && (btnconfig || btn.OpenType === 'formSubmit')) {
+ MKEmitter.emit('mkFC', 'focus', window.CACHE.errFocusId)
+
+ window.CACHE.errFocusId = ''
+ } else if (btnconfig && btnconfig.setting && btnconfig.setting.errFocus) {
MKEmitter.emit('mkFC', 'focus', btnconfig.setting.errFocus)
}
diff --git a/src/tabviews/zshare/mutilform/index.jsx b/src/tabviews/zshare/mutilform/index.jsx
index 37fb86b..b681516 100644
--- a/src/tabviews/zshare/mutilform/index.jsx
+++ b/src/tabviews/zshare/mutilform/index.jsx
@@ -696,6 +696,13 @@
if (item.enter === 'tab' || item.enter === 'sub') {
item.tabUuid = ''
+ if (item.enter === 'sub' && item.errTabField) {
+ if (item.errTabField === 'origin') {
+ item.errTabUuid = item.uuid
+ } else if (fieldMap.has(item.errTabField)) {
+ item.errTabUuid = fieldMap.get(item.errTabField).uuid
+ }
+ }
if (item.tabField && fieldMap.has(item.tabField)) {
item.tabUuid = fieldMap.get(item.tabField).uuid
} else if (item.enter === 'tab') {
@@ -1550,10 +1557,11 @@
return fields
}
- handleConfirm = (formId) => {
+ handleConfirm = (formId, errId) => {
const { action } = this.props
const { formlist, send_type, timestamp, n_id } = this.state
+ window.CACHE.errFocusId = ''
// 琛ㄥ崟鎻愪氦鏃舵鏌ヨ緭鍏ュ�兼槸鍚︽纭�
return new Promise((resolve, reject) => {
this.props.form.validateFieldsAndScroll((err, values) => {
@@ -1680,6 +1688,7 @@
})
this.submitId = formId || ''
+ window.CACHE.errFocusId = errId || ''
if (locals) {
sessionStorage.setItem('local_' + action.uuid, JSON.stringify(locals))
diff --git a/src/tabviews/zshare/mutilform/mkCheck/index.jsx b/src/tabviews/zshare/mutilform/mkCheck/index.jsx
index b6c3195..0079dd8 100644
--- a/src/tabviews/zshare/mutilform/mkCheck/index.jsx
+++ b/src/tabviews/zshare/mutilform/mkCheck/index.jsx
@@ -30,10 +30,10 @@
config.tabUuid && MKEmitter.emit('mkFC', 'focus', config.tabUuid)
if (config.linkFields || config.subFields || config.controlFields) {
setTimeout(() => {
- this.props.onSubmit(config.tabUuid)
+ this.props.onSubmit(config.tabUuid, config.errTabUuid)
}, 1000)
} else {
- this.props.onSubmit(config.tabUuid)
+ this.props.onSubmit(config.tabUuid, config.errTabUuid)
}
}
})
diff --git a/src/tabviews/zshare/mutilform/mkDatePicker/index.jsx b/src/tabviews/zshare/mutilform/mkDatePicker/index.jsx
index 48ababe..1f96b82 100644
--- a/src/tabviews/zshare/mutilform/mkDatePicker/index.jsx
+++ b/src/tabviews/zshare/mutilform/mkDatePicker/index.jsx
@@ -78,7 +78,7 @@
MKEmitter.emit('mkFC', 'focus', config.tabUuid)
} else if (config.enter === 'sub') {
config.tabUuid && MKEmitter.emit('mkFC', 'focus', config.tabUuid)
- this.props.onSubmit(config.tabUuid)
+ this.props.onSubmit(config.tabUuid, config.errTabUuid)
}
}, 50)
}
diff --git a/src/tabviews/zshare/mutilform/mkInput/index.jsx b/src/tabviews/zshare/mutilform/mkInput/index.jsx
index 9bdbbcf..0083264 100644
--- a/src/tabviews/zshare/mutilform/mkInput/index.jsx
+++ b/src/tabviews/zshare/mutilform/mkInput/index.jsx
@@ -125,7 +125,7 @@
MKEmitter.emit('mkFC', 'focus', config.tabUuid)
} else {
MKEmitter.emit('mkFC', 'focus', config.tabUuid)
- this.props.onSubmit(config.tabUuid)
+ this.props.onSubmit(config.tabUuid, config.errTabUuid)
}
}
diff --git a/src/tabviews/zshare/mutilform/mkNumberInput/index.jsx b/src/tabviews/zshare/mutilform/mkNumberInput/index.jsx
index aa4d070..b842510 100644
--- a/src/tabviews/zshare/mutilform/mkNumberInput/index.jsx
+++ b/src/tabviews/zshare/mutilform/mkNumberInput/index.jsx
@@ -71,7 +71,7 @@
MKEmitter.emit('mkFC', 'focus', config.tabUuid)
} else {
MKEmitter.emit('mkFC', 'focus', config.tabUuid)
- this.props.onSubmit(config.tabUuid)
+ this.props.onSubmit(config.tabUuid, config.errTabUuid)
}
}
diff --git a/src/tabviews/zshare/mutilform/mkPopSelect/index.jsx b/src/tabviews/zshare/mutilform/mkPopSelect/index.jsx
index bc9fe92..3aca1c8 100644
--- a/src/tabviews/zshare/mutilform/mkPopSelect/index.jsx
+++ b/src/tabviews/zshare/mutilform/mkPopSelect/index.jsx
@@ -360,10 +360,10 @@
config.tabUuid && MKEmitter.emit('mkFC', 'focus', config.tabUuid)
if (config.subFields) {
setTimeout(() => {
- this.props.onSubmit(config.tabUuid)
+ this.props.onSubmit(config.tabUuid, config.errTabUuid)
}, 1000)
} else {
- this.props.onSubmit(config.tabUuid)
+ this.props.onSubmit(config.tabUuid, config.errTabUuid)
}
}
})
diff --git a/src/tabviews/zshare/mutilform/mkSelect/index.jsx b/src/tabviews/zshare/mutilform/mkSelect/index.jsx
index ebc1a80..7371348 100644
--- a/src/tabviews/zshare/mutilform/mkSelect/index.jsx
+++ b/src/tabviews/zshare/mutilform/mkSelect/index.jsx
@@ -162,10 +162,10 @@
config.tabUuid && MKEmitter.emit('mkFC', 'focus', config.tabUuid)
if (config.linkFields || config.subFields || config.controlFields) {
setTimeout(() => {
- this.props.onSubmit(config.tabUuid)
+ this.props.onSubmit(config.tabUuid, config.errTabUuid)
}, 1000)
} else {
- this.props.onSubmit(config.tabUuid)
+ this.props.onSubmit(config.tabUuid, config.errTabUuid)
}
}
})
diff --git a/src/tabviews/zshare/mutilform/mkSwitch/index.jsx b/src/tabviews/zshare/mutilform/mkSwitch/index.jsx
index 7cea5b9..ad7c009 100644
--- a/src/tabviews/zshare/mutilform/mkSwitch/index.jsx
+++ b/src/tabviews/zshare/mutilform/mkSwitch/index.jsx
@@ -41,10 +41,10 @@
config.tabUuid && MKEmitter.emit('mkFC', 'focus', config.tabUuid)
if (config.linkFields || config.subFields || config.controlFields) {
setTimeout(() => {
- this.props.onSubmit(config.tabUuid)
+ this.props.onSubmit(config.tabUuid, config.errTabUuid)
}, 1000)
} else {
- this.props.onSubmit(config.tabUuid)
+ this.props.onSubmit(config.tabUuid, config.errTabUuid)
}
}
})
diff --git a/src/tabviews/zshare/mutilform/mkVercode/index.jsx b/src/tabviews/zshare/mutilform/mkVercode/index.jsx
index 7f6eff9..080584d 100644
--- a/src/tabviews/zshare/mutilform/mkVercode/index.jsx
+++ b/src/tabviews/zshare/mutilform/mkVercode/index.jsx
@@ -56,7 +56,7 @@
MKEmitter.emit('mkFC', 'focus', config.tabUuid)
} else {
config.tabUuid && MKEmitter.emit('mkFC', 'focus', config.tabUuid)
- this.props.onSubmit(config.tabUuid)
+ this.props.onSubmit(config.tabUuid, config.errTabUuid)
}
}
--
Gitblit v1.8.0