From aebfe9b957afbf36f45108eebc127ec9e8fe1d0c Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 15 十月 2024 10:19:47 +0800
Subject: [PATCH] Merge branch 'positec' into dms
---
src/tabviews/zshare/actionList/exceloutbutton/index.jsx | 2
src/views/tabledesign/index.jsx | 2
src/views/appcheck/index.jsx | 17 +++++++-
src/views/pcdesign/index.jsx | 2
src/utils/utils-custom.js | 41 ++++++++++++++------
src/views/mobdesign/index.jsx | 2
src/views/menudesign/index.jsx | 4 +-
7 files changed, 49 insertions(+), 21 deletions(-)
diff --git a/src/tabviews/zshare/actionList/exceloutbutton/index.jsx b/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
index 3dddc9d..11e1f00 100644
--- a/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
@@ -934,7 +934,7 @@
_setting.laypage = pagination
_setting.arr_field = _setting.all_field || _setting.arr_field
- if (setting.sub_field) {
+ if (setting.sub_field || setting.laypage !== pagination) {
_setting.uuid = btn.uuid
}
diff --git a/src/utils/utils-custom.js b/src/utils/utils-custom.js
index 3a6e6de..f53084c 100644
--- a/src/utils/utils-custom.js
+++ b/src/utils/utils-custom.js
@@ -3101,7 +3101,7 @@
let msg = getDataSource(item, mainSearch)
- sqls.push({uuid: item.uuid, type: 'datasource', ...msg})
+ sqls.push({uuid: item.uuid, roleId: item.wrap && item.wrap.permission === 'false' ? '' : config.uuid, type: 'datasource', ...msg})
} else if (item.setting && item.setting.useMSearch === 'true') {
let searches = item.search || []
if (mainSearch.length > 0) {
@@ -3226,6 +3226,12 @@
let resetButton = (item, cell, isback) => {
cell.logLabel = item.$menuname + '-' + cell.label
+ let roleId = cell.uuid
+ if (item.wrap && item.wrap.permission === 'false') {
+ roleId = ''
+ } else if (cell.hidden === 'true' || cell.permission === 'false') {
+ roleId = ''
+ }
if (['exec', 'prompt', 'pop', 'form', 'formSubmit'].includes(cell.OpenType)) {
if (cell.intertype === 'system' || cell.procMode === 'system') { // 绯荤粺鎺ュ彛
@@ -3239,11 +3245,11 @@
let msg = getSysDefaultSql(cell, _item)
- sqls.push({uuid: cell.uuid, type: 'button', ...msg})
+ sqls.push({uuid: cell.uuid, roleId: roleId, type: 'button', ...msg})
} else {
let msg = getSysDefaultSql(cell, item)
- sqls.push({uuid: cell.uuid, type: 'button', ...msg})
+ sqls.push({uuid: cell.uuid, roleId: roleId, type: 'button', ...msg})
}
}
if (cell.callbackType === 'script' && cell.verify && cell.verify.cbScripts) {
@@ -3278,24 +3284,30 @@
if (cell.intertype === 'system') {
let msg = getExcelInSql(cell)
- sqls.push({uuid: cell.uuid, type: 'excelIn', ...msg})
+ sqls.push({uuid: cell.uuid, roleId: roleId, type: 'excelIn', ...msg})
}
} else if (cell.OpenType === 'excelOut') {
if (cell.intertype === 'system' && cell.verify && cell.verify.dataType === 'custom') {
let msg = getExcelOutSql(cell, item)
- sqls.push({uuid: cell.uuid, type: 'excelOut', ...msg})
- } else if (cell.intertype === 'system' && cell.verify && item.subtype === 'dualdatacard' && item.setting && item.setting.interType === 'system') {
- let msg = getDoubleExcelOutSql(cell, item)
-
- sqls.push({uuid: cell.uuid, type: 'excelOut', ...msg})
+ sqls.push({uuid: cell.uuid, roleId: roleId, type: 'excelOut', ...msg})
+ } else if (cell.intertype === 'system' && cell.verify && item.setting && item.setting.interType === 'system') {
+ if (appType === 'mob') {
+ cell.pagination = 'false'
+ }
+ if (item.subtype === 'dualdatacard' || item.setting.laypage !== cell.pagination) {
+ let msg = getDoubleExcelOutSql(cell, item)
+
+ sqls.push({uuid: cell.uuid, roleId: roleId, type: 'excelOut', ...msg})
+ }
}
+
} else if (cell.OpenType === 'funcbutton') {
if (cell.funcType === 'print') {
if (cell.intertype === 'system' && cell.verify && cell.verify.dataType === 'custom') {
let msg = getPrintSql(cell, item)
- sqls.push({uuid: cell.uuid, type: 'print', ...msg})
+ sqls.push({uuid: cell.uuid, roleId: roleId, type: 'print', ...msg})
}
if (cell.execMode === 'pop' && cell.modal && cell.modal.fields) {
cell.modal.fields.forEach(form => {
@@ -3314,13 +3326,13 @@
} else if ((cell.funcType === 'refund' || cell.funcType === 'pay') && cell.payMode === 'system') {
let msg = getPaySql(cell, item)
- sqls.push({uuid: cell.uuid, type: 'pay', ...msg})
+ sqls.push({uuid: cell.uuid, roleId: roleId, type: 'pay', ...msg})
}
} else if (cell.OpenType === 'innerpage' || cell.OpenType === 'outerpage') {
if (cell.pageTemplate === 'pay' && cell.payMode === 'system') {
let msg = getPaySql(cell, item)
- sqls.push({uuid: cell.uuid, type: 'pay', ...msg})
+ sqls.push({uuid: cell.uuid, roleId: roleId, type: 'pay', ...msg})
}
} else if (cell.OpenType === 'popview') {
if (cell.config && cell.config.components) {
@@ -5557,8 +5569,11 @@
let getDoubleExcelOutSql = (btn, component) => {
let item = fromJS(component).toJS()
item.search = item.$searches || []
+
+ if (item.subtype === 'dualdatacard') {
+ item.columns = [...item.columns, ...item.subColumns]
+ }
item.subtype = 'datacard'
- item.columns = [...item.columns, ...item.subColumns]
item.setting.laypage = btn.pagination
item.setting.$name = btn.logLabel || ''
diff --git a/src/views/appcheck/index.jsx b/src/views/appcheck/index.jsx
index 0351a5a..bb78f91 100644
--- a/src/views/appcheck/index.jsx
+++ b/src/views/appcheck/index.jsx
@@ -1,4 +1,5 @@
import React, {Component} from 'react'
+import { withRouter } from 'react-router-dom'
import { Spin, notification, Table, Typography, Row, Col, Tooltip } from 'antd'
import { QuestionCircleOutlined } from '@ant-design/icons'
@@ -42,7 +43,17 @@
UNSAFE_componentWillMount() {
document.body.className = ''
- this.getAppList()
+ if (sessionStorage.getItem('UserID')) {
+ this.getAppList()
+ return
+ }
+ }
+
+ componentDidMount() {
+ if (!sessionStorage.getItem('UserID')) {
+ this.props.history.replace('/login')
+ return
+ }
}
/**
@@ -138,6 +149,8 @@
render () {
const { loading, columns, applist, selectApp } = this.state
+
+ if (!sessionStorage.getItem('UserID')) return null
return (
<div className="mk-app-check">
@@ -258,4 +271,4 @@
}
}
-export default AppCheck
\ No newline at end of file
+export default withRouter(AppCheck)
\ No newline at end of file
diff --git a/src/views/menudesign/index.jsx b/src/views/menudesign/index.jsx
index 4b91a51..08d59ff 100644
--- a/src/views/menudesign/index.jsx
+++ b/src/views/menudesign/index.jsx
@@ -836,8 +836,8 @@
if (oriIds[item.uuid + item.md5]) {
v_id = oriIds[item.uuid + item.md5]
}
-
- long_data.push(`${md5(window.GLOB.appkey + v_id)},${item.uuid},${v_id},${window.btoa(window.encodeURIComponent(item.LText))}`)
+
+ long_data.push(`${md5(window.GLOB.appkey + v_id)},${item.uuid},${v_id},${window.btoa(window.encodeURIComponent(item.LText))},${config.permission === 'false' ? '' : item.roleId || ''}`)
return {
uuid: item.uuid,
diff --git a/src/views/mobdesign/index.jsx b/src/views/mobdesign/index.jsx
index a87df2d..24a0172 100644
--- a/src/views/mobdesign/index.jsx
+++ b/src/views/mobdesign/index.jsx
@@ -1512,7 +1512,7 @@
v_id = oriIds[item.uuid + item.md5]
}
- long_data.push(`${md5(window.GLOB.appkey + v_id)},${item.uuid},${v_id},${window.btoa(window.encodeURIComponent(item.LText))}`)
+ long_data.push(`${md5(window.GLOB.appkey + v_id)},${item.uuid},${v_id},${window.btoa(window.encodeURIComponent(item.LText))},${item.roleId || ''}`)
return {
uuid: item.uuid,
diff --git a/src/views/pcdesign/index.jsx b/src/views/pcdesign/index.jsx
index 0638e83..62c5c68 100644
--- a/src/views/pcdesign/index.jsx
+++ b/src/views/pcdesign/index.jsx
@@ -1238,7 +1238,7 @@
v_id = oriIds[item.uuid + item.md5]
}
- long_data.push(`${md5(window.GLOB.appkey + v_id)},${item.uuid},${v_id},${window.btoa(window.encodeURIComponent(item.LText))}`)
+ long_data.push(`${md5(window.GLOB.appkey + v_id)},${item.uuid},${v_id},${window.btoa(window.encodeURIComponent(item.LText))},${item.roleId || ''}`)
return {
uuid: item.uuid,
diff --git a/src/views/tabledesign/index.jsx b/src/views/tabledesign/index.jsx
index 80aa91e..547c843 100644
--- a/src/views/tabledesign/index.jsx
+++ b/src/views/tabledesign/index.jsx
@@ -597,7 +597,7 @@
v_id = oriIds[item.uuid + item.md5]
}
- long_data.push(`${md5(window.GLOB.appkey + v_id)},${item.uuid},${v_id},${window.btoa(window.encodeURIComponent(item.LText))}`)
+ long_data.push(`${md5(window.GLOB.appkey + v_id)},${item.uuid},${v_id},${window.btoa(window.encodeURIComponent(item.LText))},${item.roleId || ''}`)
return {
uuid: item.uuid,
--
Gitblit v1.8.0