From 7dbf573b6678b32ab43cf8a7d2dcf0aba37f6de0 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 10 四月 2025 11:55:12 +0800
Subject: [PATCH] Merge branch 'positec' into dms
---
src/views/rolemanage/index.jsx | 7 ++++---
src/tabviews/custom/components/card/prop-card/index.jsx | 2 +-
src/views/tabledesign/index.jsx | 2 +-
src/views/design/sidemenu/index.jsx | 4 ++--
src/views/pcdesign/index.jsx | 3 ++-
src/tabviews/custom/components/card/double-data-card/index.jsx | 8 +++++++-
src/views/mobdesign/index.jsx | 3 ++-
src/views/menudesign/index.jsx | 4 ++--
src/tabviews/custom/components/card/data-card/index.jsx | 2 +-
9 files changed, 22 insertions(+), 13 deletions(-)
diff --git a/src/tabviews/custom/components/card/data-card/index.jsx b/src/tabviews/custom/components/card/data-card/index.jsx
index d8ad740..3f04f41 100644
--- a/src/tabviews/custom/components/card/data-card/index.jsx
+++ b/src/tabviews/custom/components/card/data-card/index.jsx
@@ -123,7 +123,7 @@
_config.wrap.selected = 'false'
}
- _config.wrap.selStyle = _config.wrap.selStyle || 'active'
+ _config.wrap.selStyle = _config.wrap.selStyle || 'none'
_config.wrap.pagestyle = _config.wrap.pagestyle || 'page'
_config.wrap.scale = _config.wrap.scale === 'true' ? 'scale' : ''
_config.wrap.layout = (_config.wrap.layout || 'grid') + '-layout float-' + (_config.wrap.cardFloat || 'left')
diff --git a/src/tabviews/custom/components/card/double-data-card/index.jsx b/src/tabviews/custom/components/card/double-data-card/index.jsx
index c7e972a..f95fca7 100644
--- a/src/tabviews/custom/components/card/double-data-card/index.jsx
+++ b/src/tabviews/custom/components/card/double-data-card/index.jsx
@@ -116,6 +116,12 @@
})
_config.subcards = null
+
+ if (!_config.wrap.cardType) {
+ _config.wrap.selStyle = 'none'
+ _config.wrap.selected = 'false'
+ _config.wrap.pickup = 'false'
+ }
let selected = 'false'
if (_config.wrap.selected === 'always' || _config.wrap.selected === 'init' || _config.wrap.selected === 'sign') {
@@ -124,7 +130,7 @@
_config.wrap.selected = 'false'
}
- _config.wrap.selStyle = _config.wrap.selStyle || 'active'
+ _config.wrap.selStyle = _config.wrap.selStyle || 'check'
_config.wrap.pagestyle = _config.wrap.pagestyle || 'page'
_config.wrap.wrapClass = `${_config.wrap.selStyle} ${_config.wrap.cardType || ''} ${config.wrap.empSign === 'hidden' ? 'mk-empty-hide' : ''}`
diff --git a/src/tabviews/custom/components/card/prop-card/index.jsx b/src/tabviews/custom/components/card/prop-card/index.jsx
index 5008784..f0bce0e 100644
--- a/src/tabviews/custom/components/card/prop-card/index.jsx
+++ b/src/tabviews/custom/components/card/prop-card/index.jsx
@@ -123,7 +123,7 @@
let selected = _config.wrap.selected || 'false'
- _config.wrap.selStyle = _config.wrap.selStyle || 'active'
+ _config.wrap.selStyle = _config.wrap.selStyle || 'none'
_config.wrap.priKeyType = _config.wrap.priKeyType || 'static'
_config.wrap.scale = _config.wrap.scale === 'true' ? 'scale' : ''
diff --git a/src/views/design/sidemenu/index.jsx b/src/views/design/sidemenu/index.jsx
index 293e3a3..f6a8a05 100644
--- a/src/views/design/sidemenu/index.jsx
+++ b/src/views/design/sidemenu/index.jsx
@@ -1,7 +1,7 @@
import React, {Component} from 'react'
import { is, fromJS } from 'immutable'
import { Menu, Popover, Modal, notification } from 'antd'
-import { EditOutlined, PlusOutlined, SettingOutlined, ApiOutlined, SoundOutlined, DatabaseOutlined } from '@ant-design/icons'
+import { EditOutlined, PlusOutlined, SettingOutlined, ApiOutlined, SoundOutlined, DatabaseOutlined, LockOutlined } from '@ant-design/icons'
import moment from 'moment'
import asyncComponent from '@/utils/asyncComponent'
@@ -330,7 +330,7 @@
{item.children.map(cell => {
return (
<Menu.Item key={cell.MenuID}>
- <span className={'editable-menu-item ' + (cell.up_action ? 'unupdate' : '') + (window.backend && window.GLOB.systemType !== 'production' && cell.PageParam.backend !== 'level1' ? ' unbackend' : '')} onDoubleClick={() => this.editmenu(cell)}>{cell.PageParam.interfaces === 'true' ? <ApiOutlined title="鑿滃崟涓娇鐢ㄤ簡澶栭儴鎺ュ彛" /> : null}{cell.PageParam.msg === 'true' ? <SoundOutlined title="鑿滃崟涓彂閫佷簡娑堟伅" /> : null}{cell.MenuName}{cell.PageParam.pds === 'true' ? <DatabaseOutlined style={{marginLeft: '5px', color: 'orange'}} title="鑿滃崟涓娇鐢ㄤ簡鍏叡鏁版嵁婧�" /> : null}</span>
+ <span className={'editable-menu-item ' + (cell.up_action ? 'unupdate' : '') + (window.backend && window.GLOB.systemType !== 'production' && cell.PageParam.backend !== 'level1' ? ' unbackend' : '')} onDoubleClick={() => this.editmenu(cell)}>{cell.PageParam.interfaces === 'true' ? <ApiOutlined title="鑿滃崟涓娇鐢ㄤ簡澶栭儴鎺ュ彛" /> : null}{cell.PageParam.msg === 'true' ? <SoundOutlined title="鑿滃崟涓彂閫佷簡娑堟伅" /> : null}{cell.MenuName}{cell.PageParam.pds === 'true' ? <DatabaseOutlined style={{marginLeft: '5px', color: 'orange'}} title="鑿滃崟涓娇鐢ㄤ簡鍏叡鏁版嵁婧�" /> : null}{cell.PageParam.enabled === false ? <LockOutlined style={{marginLeft: '5px', color: 'orange'}} title="鑿滃崟鏈惎鐢�" /> : null}</span>
</Menu.Item>
)
})}
diff --git a/src/views/menudesign/index.jsx b/src/views/menudesign/index.jsx
index 56d8e6c..f50902f 100644
--- a/src/views/menudesign/index.jsx
+++ b/src/views/menudesign/index.jsx
@@ -899,7 +899,7 @@
let urlFields = config.urlFields ? config.urlFields.join(',') : ''
let langSql = getLangTrans(config)
let pds = 'false'
- if (config.interfaces) {
+ if (config.interfaces && config.enabled) {
config.interfaces.forEach(item => {
if (item.status !== 'true') return
pds = 'true'
@@ -916,7 +916,7 @@
EasyCode: config.easyCode || '',
Template: 'CustomPage',
MenuName: config.MenuName || '',
- PageParam: JSON.stringify({Template: 'CustomPage', OpenType: config.OpenType || 'newtab', hidden: config.hidden || 'false', menuColor: config.menuColor || '', interfaces, msg, pds, backend: 'level1', urlFields}),
+ PageParam: JSON.stringify({Template: 'CustomPage', OpenType: config.OpenType || 'newtab', hidden: config.hidden || 'false', menuColor: config.menuColor || '', interfaces, msg, pds, backend: 'level1', enabled: config.enabled, urlFields}),
open_edition: config.open_edition,
long_data: long_data,
debug_md5: key,
diff --git a/src/views/mobdesign/index.jsx b/src/views/mobdesign/index.jsx
index f2d1763..e024273 100644
--- a/src/views/mobdesign/index.jsx
+++ b/src/views/mobdesign/index.jsx
@@ -1627,10 +1627,11 @@
roleParam.interfaces = interfaces
roleParam.msg = msg
roleParam.backend = 'level1'
+ roleParam.enabled = config.enabled
let langSql = getLangTrans(config)
roleParam.pds = 'false'
- if (config.interfaces) {
+ if (config.interfaces && config.enabled) {
config.interfaces.forEach(item => {
if (item.status !== 'true') return
roleParam.pds = 'true'
diff --git a/src/views/pcdesign/index.jsx b/src/views/pcdesign/index.jsx
index 681427f..2515dc9 100644
--- a/src/views/pcdesign/index.jsx
+++ b/src/views/pcdesign/index.jsx
@@ -1312,10 +1312,11 @@
roleParam.interfaces = interfaces
roleParam.msg = msg
roleParam.backend = 'level1'
+ roleParam.enabled = config.enabled
let langSql = getLangTrans(config)
roleParam.pds = 'false'
- if (config.interfaces) {
+ if (config.interfaces && config.enabled) {
config.interfaces.forEach(item => {
if (item.status !== 'true') return
roleParam.pds = 'true'
diff --git a/src/views/rolemanage/index.jsx b/src/views/rolemanage/index.jsx
index a63b474..2e930ee 100644
--- a/src/views/rolemanage/index.jsx
+++ b/src/views/rolemanage/index.jsx
@@ -3,7 +3,7 @@
import { Spin, notification, Button, Table, Modal, Tree, Input, Empty } from 'antd'
import moment from 'moment'
import md5 from 'md5'
-import { ApiOutlined, SoundOutlined, DatabaseOutlined } from '@ant-design/icons'
+import { ApiOutlined, SoundOutlined, DatabaseOutlined, LockOutlined } from '@ant-design/icons'
import Api from '@/api'
import Utils from '@/utils/utils.js'
@@ -32,8 +32,8 @@
let className = window.backend && record.backend !== 'level1' ? 'unbackend' : ''
if (record.extra || this.state.appKeys.includes(record.MenuID)) {
return <span className={className} style={{color: '#1890ff'}}>{text}</span>
- } else if (record.interfaces === 'true' || record.msg === 'true' || record.pds === 'true') {
- return <span className={className}>{record.interfaces === 'true' ? <ApiOutlined style={{color: 'orange', marginRight: '5px'}} title="鑿滃崟涓娇鐢ㄤ簡澶栭儴鎺ュ彛" /> : null}{record.msg === 'true' ? <SoundOutlined style={{color: 'orange', marginRight: '5px'}} title="鑿滃崟涓彂閫佷簡娑堟伅" /> : null}{text}{record.pds === 'true' ? <DatabaseOutlined style={{color: 'orange', marginLeft: '5px'}} title="鑿滃崟涓娇鐢ㄤ簡鍏叡鏁版嵁婧�" /> : null}</span>
+ } else if (record.interfaces === 'true' || record.msg === 'true' || record.pds === 'true' || record.enabled === false) {
+ return <span className={className}>{record.interfaces === 'true' ? <ApiOutlined style={{color: 'orange', marginRight: '5px'}} title="鑿滃崟涓娇鐢ㄤ簡澶栭儴鎺ュ彛" /> : null}{record.msg === 'true' ? <SoundOutlined style={{color: 'orange', marginRight: '5px'}} title="鑿滃崟涓彂閫佷簡娑堟伅" /> : null}{text}{record.pds === 'true' ? <DatabaseOutlined style={{color: 'orange', marginLeft: '5px'}} title="鑿滃崟涓娇鐢ㄤ簡鍏叡鏁版嵁婧�" /> : null}{record.enabled === false ? <LockOutlined style={{color: 'orange', marginLeft: '5px'}} title="鑿滃崟鏈惎鐢�" /> : null}</span>
}
return <span className={className}>{text}</span>
}
@@ -162,6 +162,7 @@
item.interfaces = pageParam.interfaces || 'false'
item.msg = pageParam.msg || 'false'
item.pds = pageParam.pds || 'false'
+ item.enabled = pageParam.enabled
item.backend = pageParam.backend || ''
if (pageParam.type) {
diff --git a/src/views/tabledesign/index.jsx b/src/views/tabledesign/index.jsx
index 722129a..a526f99 100644
--- a/src/views/tabledesign/index.jsx
+++ b/src/views/tabledesign/index.jsx
@@ -664,7 +664,7 @@
EasyCode: config.easyCode || '',
Template: 'BaseTable',
MenuName: config.MenuName || '',
- PageParam: JSON.stringify({Template: 'BaseTable', OpenType: config.OpenType || 'newtab', hidden: config.hidden || 'false', menuColor: config.menuColor || '', interfaces, msg, backend: 'level1', urlFields}),
+ PageParam: JSON.stringify({Template: 'BaseTable', OpenType: config.OpenType || 'newtab', hidden: config.hidden || 'false', menuColor: config.menuColor || '', interfaces, msg, backend: 'level1', enabled: config.enabled, urlFields}),
open_edition: config.open_edition,
long_data: long_data,
debug_md5: key,
--
Gitblit v1.8.0