From 3e168c2a5149f1a56e41cacf4eda95d10b497210 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 29 八月 2023 17:17:01 +0800
Subject: [PATCH] 2023-08-29
---
src/index.js | 12 ++-
src/views/sso/index.jsx | 10 +-
src/tabviews/zshare/actionList/funczip/index.jsx | 8 +-
src/views/printTemplate/index.jsx | 8 +-
src/tabviews/zshare/topSearch/index.jsx | 87 +++++++++++++++------
src/tabviews/zshare/actionList/funcMegvii/index.jsx | 16 ++--
src/templates/sharecomponent/searchcomponent/dragsearch/card.jsx | 14 +++
src/tabviews/custom/components/table/edit-table/normalTable/index.jsx | 12 +-
src/tabviews/zshare/actionList/excelInbutton/index.jsx | 3
src/tabviews/zshare/actionList/printbutton/index.jsx | 4
src/api/index.js | 6
src/tabviews/zshare/actionList/normalbutton/index.jsx | 4
src/views/login/index.jsx | 10 +-
13 files changed, 127 insertions(+), 67 deletions(-)
diff --git a/src/api/index.js b/src/api/index.js
index e01aca6..ff77975 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -631,7 +631,7 @@
if (window.GLOB.CacheMap.has(_param)) {
return Promise.resolve(window.GLOB.CacheMap.get(_param))
} else {
- return Promise.resolve({ErrCode: 'S', ErrMesg: '', LongParam: '', message: '', status: false})
+ return Promise.resolve({ErrCode: 'S', LongParam: '', message: '', status: false})
}
}
@@ -735,7 +735,7 @@
token = JSON.parse(window.decodeURIComponent(window.atob(token)))
} catch (e) {
token = null
- _resolve({status: false, ErrCode: 'E', message: '鎺ュ彛淇℃伅瑙ｆ瀽澶辫触锛�', ErrMesg: 'token_error'})
+ _resolve({status: false, ErrCode: 'token_error', message: '鎺ュ彛淇℃伅瑙ｆ瀽澶辫触锛�'})
}
if (!token) return
@@ -838,7 +838,7 @@
param.appkey = window.GLOB.appkey || ''
if (param.$token === '') {
- return Promise.resolve({status: false, ErrCode: 'E', message: '鎺ュ彛鍦板潃灏氭湭璁剧疆锛�', ErrMesg: 'token_error'})
+ return Promise.resolve({status: false, ErrCode: 'token_error', message: '鎺ュ彛鍦板潃灏氭湭璁剧疆锛�'})
} else if (param.$token) {
return new Promise(resolve => this.visitOuterSystem(param, resolve))
}
diff --git a/src/index.js b/src/index.js
index f7cb503..be1891c 100644
--- a/src/index.js
+++ b/src/index.js
@@ -265,10 +265,14 @@
value: GLOB.cloudServiceApi || ''
})
- Object.defineProperty(GLOB, 'memberLevel', {
- writable: false,
- value: GLOB.memberLevel || 0
- })
+ if (GLOB.memberLevel) {
+ Object.defineProperty(GLOB, 'memberLevel', {
+ writable: false,
+ value: GLOB.memberLevel
+ })
+ } else {
+ GLOB.memberLevel = 0
+ }
if (GLOB.sysType === 'cloud') {
Object.defineProperty(GLOB, 'debugger', {
diff --git a/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx b/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
index 10f41bf..71db29c 100644
--- a/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
+++ b/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
@@ -1727,12 +1727,12 @@
if (res && res.ErrCode === 'S') { // 鎵ц鎴愬姛
notification.success({
top: 92,
- message: res.ErrMesg || '鎵ц鎴愬姛',
+ message: res.message || '鎵ц鎴愬姛',
duration: submit.stime ? submit.stime : 2
})
} else if (res && res.ErrCode === 'Y') { // 鎵ц鎴愬姛
Modal.success({
- title: res.ErrMesg || '鎵ц鎴愬姛'
+ title: res.message || '鎵ц鎴愬姛'
})
} else if (res && res.ErrCode === '-1') { // 瀹屾垚鍚庝笉鎻愮ず
@@ -1768,23 +1768,23 @@
if (res.ErrCode === 'E') {
Modal.error({
- title: res.message || res.ErrMesg,
+ title: res.message || '鎵ц澶辫触锛�',
})
} else if (res.ErrCode === 'N') {
notification.error({
top: 92,
- message: res.message || res.ErrMesg,
+ message: res.message || '鎵ц澶辫触锛�',
duration: submit.ntime ? submit.ntime : 10
})
} else if (res.ErrCode === 'F') {
notification.error({
className: 'notification-custom-error',
top: 92,
- message: res.message || res.ErrMesg,
+ message: res.message || '鎵ц澶辫触锛�',
duration: submit.ftime ? submit.ftime : 10
})
} else if (res.ErrCode === 'NM') {
- message.error(res.message || res.ErrMesg)
+ message.error(res.message || '鎵ц澶辫触锛�')
}
this.setState({
diff --git a/src/tabviews/zshare/actionList/excelInbutton/index.jsx b/src/tabviews/zshare/actionList/excelInbutton/index.jsx
index 2a9e4a7..6764de0 100644
--- a/src/tabviews/zshare/actionList/excelInbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/excelInbutton/index.jsx
@@ -526,7 +526,8 @@
}).then(response => {
if (!response || response.ErrCode === 'LoginError') return
// 鍥炶皟璇锋眰
- if (ver_token && response.ErrMesg === 'token_error') {
+ if (ver_token && response.ErrCode === 'token_error') {
+ response.ErrCode = 'E'
this.execError(response)
} else if (btn.callbackFunc ) {
// 瀛樺湪鍥炶皟鍑芥暟鏃讹紝璋冪敤
diff --git a/src/tabviews/zshare/actionList/funcMegvii/index.jsx b/src/tabviews/zshare/actionList/funcMegvii/index.jsx
index 6da5dc4..c1df199 100644
--- a/src/tabviews/zshare/actionList/funcMegvii/index.jsx
+++ b/src/tabviews/zshare/actionList/funcMegvii/index.jsx
@@ -292,7 +292,7 @@
}
if (error) {
- this.execError({ErrCode: 'E', ErrMesg: error})
+ this.execError({ErrCode: 'E', message: error})
return
}
@@ -312,7 +312,7 @@
if (datas.length > 0) {
this.addUser(ip, datas, sessionId)
} else {
- this.execSuccess({ErrCode: 'S', ErrMesg: '鎵ц鎴愬姛銆�'})
+ this.execSuccess({ErrCode: 'S', message: '鎵ц鎴愬姛銆�'})
}
}, (err) => {
this.execPreError(err, data)
@@ -333,12 +333,12 @@
if (res && (res.ErrCode === 'S' || !res.ErrCode)) { // 鎵ц鎴愬姛
notification.success({
top: 92,
- message: res.ErrMesg || '鎵ц鎴愬姛',
+ message: res.message || '鎵ц鎴愬姛',
duration: btn.verify && btn.verify.stime ? btn.verify.stime : 2
})
} else if (res && res.ErrCode === 'Y') { // 鎵ц鎴愬姛
Modal.success({
- title: res.ErrMesg || '鎵ц鎴愬姛'
+ title: res.message || '鎵ц鎴愬姛'
})
} else if (res && res.ErrCode === '-1') { // 瀹屾垚鍚庝笉鎻愮ず
@@ -409,23 +409,23 @@
if (res.ErrCode === 'E') {
Modal.error({
- title: res.message || res.ErrMesg,
+ title: res.message || '鎵ц澶辫触锛�',
})
} else if (res.ErrCode === 'N') {
notification.error({
top: 92,
- message: res.message || res.ErrMesg,
+ message: res.message || '鎵ц澶辫触锛�',
duration: btn.verify && btn.verify.ntime ? btn.verify.ntime : 10
})
} else if (res.ErrCode === 'F') {
notification.error({
className: 'notification-custom-error',
top: 92,
- message: res.message || res.ErrMesg,
+ message: res.message || '鎵ц澶辫触锛�',
duration: btn.verify && btn.verify.ftime ? btn.verify.ftime : 10
})
} else if (res.ErrCode === 'NM') {
- message.error(res.message || res.ErrMesg)
+ message.error(res.message || '鎵ц澶辫触锛�')
}
this.setState({
diff --git a/src/tabviews/zshare/actionList/funczip/index.jsx b/src/tabviews/zshare/actionList/funczip/index.jsx
index 28d6ed2..cf511b5 100644
--- a/src/tabviews/zshare/actionList/funczip/index.jsx
+++ b/src/tabviews/zshare/actionList/funczip/index.jsx
@@ -381,23 +381,23 @@
return
} else if (res.ErrCode === 'E') {
Modal.error({
- title: res.message || res.ErrMesg,
+ title: res.message || '鎵ц澶辫触锛�',
})
} else if (res.ErrCode === 'N') {
notification.error({
top: 92,
- message: res.message || res.ErrMesg,
+ message: res.message || '鎵ц澶辫触锛�',
duration: 10
})
} else if (res.ErrCode === 'F') {
notification.error({
className: 'notification-custom-error',
top: 92,
- message: res.message || res.ErrMesg,
+ message: res.message || '鎵ц澶辫触锛�',
duration: 10
})
} else if (res.ErrCode === 'NM') {
- message.error(res.message || res.ErrMesg)
+ message.error(res.message || '鎵ц澶辫触锛�')
}
if (btn.execError !== 'never') {
diff --git a/src/tabviews/zshare/actionList/normalbutton/index.jsx b/src/tabviews/zshare/actionList/normalbutton/index.jsx
index a5c366c..2a39aab 100644
--- a/src/tabviews/zshare/actionList/normalbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/normalbutton/index.jsx
@@ -1438,7 +1438,6 @@
result.status = false
result.message = result.$ErrMesg
result.ErrCode = 'E'
- result.ErrMesg = result.$ErrMesg
} else {
result.status = result.status !== false
result.ErrCode = result.ErrCode || '-1'
@@ -1890,7 +1889,8 @@
Api.genericInterface(result).then(res => {
if (!res) return // LoginError鏃朵腑鏂姹�
- if (ver_token && res.ErrMesg === 'token_error') {
+ if (ver_token && res.ErrCode === 'token_error') {
+ res.ErrCode = 'E'
this.execError(res)
return
}
diff --git a/src/tabviews/zshare/actionList/printbutton/index.jsx b/src/tabviews/zshare/actionList/printbutton/index.jsx
index db4fd6a..bf0fe1b 100644
--- a/src/tabviews/zshare/actionList/printbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/printbutton/index.jsx
@@ -405,7 +405,6 @@
errorMsg = {
ErrCode: 'N',
message: _temp.error,
- ErrMesg: _temp.error,
status: false
}
} else {
@@ -1264,7 +1263,8 @@
}).then(response => {
if (!response || response.ErrCode === 'LoginError') return
- if (ver_token && response.ErrMesg === 'token_error') {
+ if (ver_token && response.ErrCode === 'token_error') {
+ response.ErrCode = 'E'
this.execError(response)
_resolve({next: false, list: []})
} else if (btn.callbackFunc) {
diff --git a/src/tabviews/zshare/topSearch/index.jsx b/src/tabviews/zshare/topSearch/index.jsx
index 11d86ec..9c97e94 100644
--- a/src/tabviews/zshare/topSearch/index.jsx
+++ b/src/tabviews/zshare/topSearch/index.jsx
@@ -114,22 +114,11 @@
if (item.advanced && !forbid) {
_setting.showAdv = true
+ if (!['group', 'check', 'switch'].includes(item.type)) {
+ item.signValue = true
+ }
} else {
item.advanced = false
- }
-
- if (item.advanced && item.initval) {
- let val = item.initval
- if (item.precision === 'hour') {
- if (/,/ig.test(val)) {
- val = val.split(',').map(m => m + ':00').join(',')
- } else {
- val = val + ':00'
- }
- }
- if (['text', 'date', 'datemonth', 'dateweek', 'daterange'].includes(item.type)) {
- advanceValues.push({field: item.field, type: item.type, label: item.label, value: val})
- }
}
if (item.type === 'group') {
@@ -179,6 +168,29 @@
if (item.type === 'checkcard' && item.multiple === 'dropdown' && item.resourceType === '0') {
this.resetCheckcard(item)
}
+ }
+
+ if (item.signValue && item.initval) {
+ let val = item.initval
+ if (item.precision === 'hour') {
+ if (/,/ig.test(val)) {
+ val = val.split(',').map(m => m + ':00').join(',')
+ } else {
+ val = val + ':00'
+ }
+ }
+
+ let text = val
+
+ if (item.type === 'select' || item.type === 'link' || item.type === 'radio') {
+ item.oriOptions.forEach(cell => {
+ if (cell.Value === val) {
+ text = cell.Text
+ }
+ })
+ }
+
+ advanceValues.push({field: item.field, type: item.type, label: item.label, value: val, text})
}
fieldMap.set(item.field, item)
@@ -621,7 +633,7 @@
if (visible) {
let advanceValues = []
this.state.searchlist.forEach(item => {
- if (!item.advanced) return
+ if (!item.signValue) return
let val = this.record[item.field]
if (val || val === 0) {
@@ -632,9 +644,18 @@
val = val + ':00'
}
}
- if (['text', 'date', 'datemonth', 'dateweek', 'daterange'].includes(item.type)) {
- advanceValues.push({field: item.field, type: item.type, label: item.label, value: val})
+
+ let text = val
+
+ if (item.type === 'select' || item.type === 'link' || item.type === 'radio') {
+ item.oriOptions.forEach(cell => {
+ if (cell.Value === val) {
+ text = cell.Text
+ }
+ })
}
+
+ advanceValues.push({field: item.field, type: item.type, label: item.label, value: val, text})
}
})
this.setState({advanceValues})
@@ -720,7 +741,7 @@
} else {
record[item.field] = item.initval
}
- if (item.advanced && item.initval) {
+ if (item.signValue && item.initval) {
let val = item.initval
if (item.precision === 'hour') {
if (/,/ig.test(val)) {
@@ -729,9 +750,18 @@
val = val + ':00'
}
}
- if (['text', 'date', 'datemonth', 'dateweek', 'daterange'].includes(item.type)) {
- advanceValues.push({field: item.field, type: item.type, label: item.label, value: val})
+
+ let text = val
+
+ if (item.type === 'select' || item.type === 'link' || item.type === 'radio') {
+ item.oriOptions.forEach(cell => {
+ if (cell.Value === val) {
+ text = cell.Text
+ }
+ })
}
+
+ advanceValues.push({field: item.field, type: item.type, label: item.label, value: val, text})
}
return item
@@ -835,7 +865,7 @@
let advanceValues = []
this.state.searchlist.forEach(item => {
- if (!item.advanced) return
+ if (!item.signValue) return
let val = this.record[item.field]
if (val || val === 0) {
@@ -846,9 +876,18 @@
val = val + ':00'
}
}
- if (['text', 'date', 'datemonth', 'dateweek', 'daterange'].includes(item.type)) {
- advanceValues.push({field: item.field, type: item.type, label: item.label, value: val})
+
+ let text = val
+
+ if (item.type === 'select' || item.type === 'link' || item.type === 'radio') {
+ item.oriOptions.forEach(cell => {
+ if (cell.Value === val) {
+ text = cell.Text
+ }
+ })
}
+
+ advanceValues.push({field: item.field, type: item.type, label: item.label, value: val, text})
}
})
@@ -886,7 +925,7 @@
return (
<div key={index}>
<span>{item.label}: </span>
- <span className="advance-value">{item.value}</span>
+ <span className="advance-value">{item.text}</span>
<CloseOutlined onClick={() => this.closeAdvanceForm(item)} />
</div>)
})}
diff --git a/src/templates/sharecomponent/searchcomponent/dragsearch/card.jsx b/src/templates/sharecomponent/searchcomponent/dragsearch/card.jsx
index b5bd01f..081c790 100644
--- a/src/templates/sharecomponent/searchcomponent/dragsearch/card.jsx
+++ b/src/templates/sharecomponent/searchcomponent/dragsearch/card.jsx
@@ -1,6 +1,6 @@
import React from 'react'
import { useDrag, useDrop } from 'react-dnd'
-import { Select, DatePicker, Input, Popover, Form } from 'antd'
+import { Select, DatePicker, Input, Popover, Form, Switch, Radio, Checkbox } from 'antd'
import { EditOutlined, CopyOutlined, CloseOutlined } from '@ant-design/icons'
import moment from 'moment'
@@ -113,6 +113,18 @@
} else if (card.type === 'checkcard') {
type = 'checkcard'
formItem = <CheckCard config={card} />
+ } else if (card.type === 'switch') {
+ formItem = (<Switch checkedChildren={card.openText || ''} unCheckedChildren={card.closeText || ''} checked={card.initval === card.openVal}/>)
+ } else if (card.type === 'radio') {
+ let options = card.options
+ if (options.length === 0) {
+ options = [{Value: '1', Text: '閫夐」1'}, {Value: '2', Text: '閫夐」2'}]
+ }
+ formItem = (<Radio.Group value={card.initval} style={{lineHeight: '36px'}}>
+ {options.map((item, i) => (<Radio key={i} value={item.Value}> {item.Text} </Radio>))}
+ </Radio.Group>)
+ } else if (card.type === 'check') {
+ formItem = <Checkbox style={{lineHeight: '36px'}} checked={card.initval === card.openVal}>{card.checkTip || ''}</Checkbox>
}
let labelwidth = card.labelwidth || 33.3
diff --git a/src/views/login/index.jsx b/src/views/login/index.jsx
index 2d56961..7b61e91 100644
--- a/src/views/login/index.jsx
+++ b/src/views/login/index.jsx
@@ -619,10 +619,12 @@
if ([10, 20, 30, 40, 50, 60, 70, 80, 90, 100].includes(res.member_level)) {
systemMsg.Member_Level = md5('mksoft' + window.GLOB.appkey + res.member_level)
- Object.defineProperty(window.GLOB, 'memberLevel', {
- writable: false,
- value: res.member_level
- })
+ if (!window.GLOB.memberLevel) {
+ Object.defineProperty(window.GLOB, 'memberLevel', {
+ writable: false,
+ value: res.member_level
+ })
+ }
}
let level = res.pwd_level || ''
diff --git a/src/views/printTemplate/index.jsx b/src/views/printTemplate/index.jsx
index 3375efd..39c625f 100644
--- a/src/views/printTemplate/index.jsx
+++ b/src/views/printTemplate/index.jsx
@@ -413,7 +413,7 @@
} else {
notification.warning({
top: 92,
- message: result.ErrMesg,
+ message: result.message,
duration: 5
})
}
@@ -489,7 +489,7 @@
if (error) {
notification.warning({
top: 92,
- message: error.ErrMesg,
+ message: error.message,
duration: 5
})
return
@@ -787,7 +787,7 @@
} else {
notification.warning({
top: 92,
- message: result.ErrMesg,
+ message: result.message,
duration: 5
})
this.setState({
@@ -814,7 +814,7 @@
} else {
notification.warning({
top: 92,
- message: res.ErrMesg,
+ message: res.message,
duration: 5
})
}
diff --git a/src/views/sso/index.jsx b/src/views/sso/index.jsx
index f11234f..48b2474 100644
--- a/src/views/sso/index.jsx
+++ b/src/views/sso/index.jsx
@@ -88,10 +88,12 @@
if ([10, 20, 30, 40, 50, 60, 70, 80, 90, 100].includes(res.member_level)) {
systemMsg.Member_Level = md5('mksoft' + window.GLOB.appkey + res.member_level)
- Object.defineProperty(window.GLOB, 'memberLevel', {
- writable: false,
- value: res.member_level
- })
+ if (!window.GLOB.memberLevel) {
+ Object.defineProperty(window.GLOB, 'memberLevel', {
+ writable: false,
+ value: res.member_level
+ })
+ }
}
let level = res.pwd_level || ''
--
Gitblit v1.8.0