From 1d0c946f8ec4365d04508ada6fb7b7ef5c2ffa5f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 03 一月 2024 23:06:28 +0800
Subject: [PATCH] 2024-01-03
---
src/menu/components/form/simple-form/index.jsx | 14 +++++++
src/menu/components/form/step-form/index.jsx | 14 +++++++
src/menu/components/form/tab-form/index.jsx | 14 +++++++
src/utils/utils-custom.js | 8 ++++
src/tabviews/zshare/actionList/exportPdf/index.jsx | 29 --------------
5 files changed, 50 insertions(+), 29 deletions(-)
diff --git a/src/menu/components/form/simple-form/index.jsx b/src/menu/components/form/simple-form/index.jsx
index b5e6fb1..3a0bf93 100644
--- a/src/menu/components/form/simple-form/index.jsx
+++ b/src/menu/components/form/simple-form/index.jsx
@@ -140,6 +140,13 @@
if (item.subButton.intertype === 'system' && !item.subButton.sqlType) {
card.errors.push({ level: 0, detail: `${item.subButton.label} 鎸夐挳璇疯缃搷浣滅被鍨媊})
}
+ if (item.subButton.verify && !item.subButton.output) {
+ if (item.subButton.verify.noteEnable === 'true') {
+ card.errors.push({ level: 0, detail: `${item.subButton.label} 鎸夐挳鏈缃繑鍥炲�肩煭淇″彂閫佹棤鏁堬紒`})
+ } else if (item.subButton.verify.emailEnable === 'true') {
+ card.errors.push({ level: 0, detail: `${item.subButton.label} 鎸夐挳鏈缃繑鍥炲�奸偖浠跺彂閫佹棤鏁堬紒`})
+ }
+ }
item.fields.forEach(m => {
if (m.dataSource && /@ID@/ig.test(m.dataSource)) {
idCtrl = true
@@ -161,6 +168,13 @@
if (item.subButton.intertype === 'system' && !item.subButton.sqlType) {
card.errors.push({ level: 0, detail: `${item.subButton.label} 鎸夐挳璇疯缃搷浣滅被鍨媊})
}
+ if (item.subButton.verify && !item.subButton.output) {
+ if (item.subButton.verify.noteEnable === 'true') {
+ card.errors.push({ level: 0, detail: `${item.subButton.label} 鎸夐挳鏈缃繑鍥炲�肩煭淇″彂閫佹棤鏁堬紒`})
+ } else if (item.subButton.verify.emailEnable === 'true') {
+ card.errors.push({ level: 0, detail: `${item.subButton.label} 鎸夐挳鏈缃繑鍥炲�奸偖浠跺彂閫佹棤鏁堬紒`})
+ }
+ }
item.fields.forEach(m => {
if (m.dataSource && /@ID@/ig.test(m.dataSource)) {
idCtrl = true
diff --git a/src/menu/components/form/step-form/index.jsx b/src/menu/components/form/step-form/index.jsx
index 47e1fb8..dd919dc 100644
--- a/src/menu/components/form/step-form/index.jsx
+++ b/src/menu/components/form/step-form/index.jsx
@@ -147,6 +147,13 @@
if (item.subButton.intertype === 'system' && !item.subButton.sqlType) {
card.errors.push({ level: 0, detail: `${item.subButton.label} 鎸夐挳璇疯缃搷浣滅被鍨媊})
}
+ if (item.subButton.verify && !item.subButton.output) {
+ if (item.subButton.verify.noteEnable === 'true') {
+ card.errors.push({ level: 0, detail: `${item.subButton.label} 鎸夐挳鏈缃繑鍥炲�肩煭淇″彂閫佹棤鏁堬紒`})
+ } else if (item.subButton.verify.emailEnable === 'true') {
+ card.errors.push({ level: 0, detail: `${item.subButton.label} 鎸夐挳鏈缃繑鍥炲�奸偖浠跺彂閫佹棤鏁堬紒`})
+ }
+ }
item.fields.forEach(m => {
if (m.dataSource && /@ID@/ig.test(m.dataSource)) {
idCtrl = true
@@ -168,6 +175,13 @@
if (item.subButton.intertype === 'system' && !item.subButton.sqlType) {
card.errors.push({ level: 0, detail: `${item.subButton.label} 鎸夐挳璇疯缃搷浣滅被鍨媊})
}
+ if (item.subButton.verify && !item.subButton.output) {
+ if (item.subButton.verify.noteEnable === 'true') {
+ card.errors.push({ level: 0, detail: `${item.subButton.label} 鎸夐挳鏈缃繑鍥炲�肩煭淇″彂閫佹棤鏁堬紒`})
+ } else if (item.subButton.verify.emailEnable === 'true') {
+ card.errors.push({ level: 0, detail: `${item.subButton.label} 鎸夐挳鏈缃繑鍥炲�奸偖浠跺彂閫佹棤鏁堬紒`})
+ }
+ }
item.fields.forEach(m => {
if (m.dataSource && /@ID@/ig.test(m.dataSource)) {
idCtrl = true
diff --git a/src/menu/components/form/tab-form/index.jsx b/src/menu/components/form/tab-form/index.jsx
index 9368450..66e8181 100644
--- a/src/menu/components/form/tab-form/index.jsx
+++ b/src/menu/components/form/tab-form/index.jsx
@@ -159,6 +159,13 @@
if (item.subButton.intertype === 'system' && !item.subButton.sqlType) {
card.errors.push({ level: 0, detail: `${item.subButton.label} 鎸夐挳璇疯缃搷浣滅被鍨媊})
}
+ if (item.subButton.verify && !item.subButton.output) {
+ if (item.subButton.verify.noteEnable === 'true') {
+ card.errors.push({ level: 0, detail: `${item.subButton.label} 鎸夐挳鏈缃繑鍥炲�肩煭淇″彂閫佹棤鏁堬紒`})
+ } else if (item.subButton.verify.emailEnable === 'true') {
+ card.errors.push({ level: 0, detail: `${item.subButton.label} 鎸夐挳鏈缃繑鍥炲�奸偖浠跺彂閫佹棤鏁堬紒`})
+ }
+ }
item.fields.forEach(m => {
if (m.dataSource && /@ID@/ig.test(m.dataSource)) {
idCtrl = true
@@ -180,6 +187,13 @@
if (item.subButton.intertype === 'system' && !item.subButton.sqlType) {
card.errors.push({ level: 0, detail: `${item.subButton.label} 鎸夐挳璇疯缃搷浣滅被鍨媊})
}
+ if (item.subButton.verify && !item.subButton.output) {
+ if (item.subButton.verify.noteEnable === 'true') {
+ card.errors.push({ level: 0, detail: `${item.subButton.label} 鎸夐挳鏈缃繑鍥炲�肩煭淇″彂閫佹棤鏁堬紒`})
+ } else if (item.subButton.verify.emailEnable === 'true') {
+ card.errors.push({ level: 0, detail: `${item.subButton.label} 鎸夐挳鏈缃繑鍥炲�奸偖浠跺彂閫佹棤鏁堬紒`})
+ }
+ }
item.fields.forEach(m => {
if (m.dataSource && /@ID@/ig.test(m.dataSource)) {
idCtrl = true
diff --git a/src/tabviews/zshare/actionList/exportPdf/index.jsx b/src/tabviews/zshare/actionList/exportPdf/index.jsx
index 3887535..8a8ad2e 100644
--- a/src/tabviews/zshare/actionList/exportPdf/index.jsx
+++ b/src/tabviews/zshare/actionList/exportPdf/index.jsx
@@ -6,7 +6,6 @@
import moment from 'moment'
import JsPDF from 'jspdf'
-import Api from '@/api'
import MKEmitter from '@/utils/events.js'
import MkIcon from '@/components/mk-icon'
@@ -103,34 +102,6 @@
this.setState({
loading: false
})
- })
- }
-
- getInnerData = (params) => {
- let param = params.shift()
-
- Api.genericInterface(param).then(res => {
- if (res.status) {
- this.downloadZipImage(res.data, this.props.btn.urlkey).then((res) => {
- if (params.length === 0) {
- if (res) {
- this.execError({ErrCode: res})
- } else {
- this.execSuccess()
- }
- } else {
- this.getInnerData(params)
- }
- }, (err) => {
- if (params.length === 0) {
- this.execError({ErrCode: err})
- } else {
- this.getInnerData(params)
- }
- })
- } else {
- this.execError(res)
- }
})
}
diff --git a/src/utils/utils-custom.js b/src/utils/utils-custom.js
index d08226b..b95c0eb 100644
--- a/src/utils/utils-custom.js
+++ b/src/utils/utils-custom.js
@@ -1648,6 +1648,14 @@
}
}
}
+
+ if (['pop', 'prompt', 'exec'].includes(cell.OpenType) && cell.verify && !cell.output) {
+ if (cell.verify.noteEnable === 'true') {
+ errors.push({ level: 0, detail: `鎸夐挳鈥�${cell.label}鈥濇湭璁剧疆杩斿洖鍊肩煭淇″彂閫佹棤鏁堬紒`})
+ } else if (cell.verify.emailEnable === 'true') {
+ errors.push({ level: 0, detail: `鎸夐挳鈥�${cell.label}鈥濇湭璁剧疆杩斿洖鍊奸偖浠跺彂閫佹棤鏁堬紒`})
+ }
+ }
}
if (card.$c_ac) {
--
Gitblit v1.8.0