From f3d4db769ba9b51b799d981511a710fd443d0e08 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 21 四月 2025 12:18:03 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/tablenodes/index.jsx | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/menu/tablenodes/index.jsx b/src/menu/tablenodes/index.jsx
index 7fe455e..4174e4d 100644
--- a/src/menu/tablenodes/index.jsx
+++ b/src/menu/tablenodes/index.jsx
@@ -485,9 +485,12 @@
if (m.debug_url) {
let _param = JSON.parse(window.decodeURIComponent(window.atob(m.debug_url)))
let label = _param.MenuName
+ _param.lang = _param.lang || 'zh-CN'
if (_param && _param.type === 'app') {
- label += ` (${_param.kei_no} | ${_param.typename}${param.lang !== 'zh-CN' ? ' | ' + param.lang : ''})`
+ label += ` (${_param.kei_no} | ${_param.typename}${_param.lang !== 'zh-CN' ? ' | ' + _param.lang : ''})`
+ } else if (_param && _param.lang && _param.lang !== 'zh-CN') {
+ label += ` (${_param.lang})`
}
cell.children.push({
@@ -534,7 +537,7 @@
}, 50)
} else if (menu.param) {
if (menu.param.type === 'admin') {
- if (menu.param.MenuType === 'custom') {
+ if (['custom', 'home', 'billPrint'].includes(menu.param.MenuType)) {
let _param = {...menu.param}
delete _param.type
_param = window.btoa(window.encodeURIComponent(JSON.stringify(_param)))
@@ -800,7 +803,7 @@
const { visible, loading, empty } = this.state
return (
- <div style={{display: 'inline-block'}}>
+ <>
<Button style={{borderColor: '#8E44AD', color: '#8E44AD'}} onClick={this.trigger}><ForkOutlined /> 琛ㄥ叧绯诲浘</Button>
<Modal
title=""
@@ -824,7 +827,7 @@
<span className="tip">娉細鐐瑰嚮琛ㄥ悕锛堝彸渚э級鍙睍寮�/鏀惰捣鑿滃崟锛屽乏渚ф鑹叉爣娉ㄤ负鎺ュ彛鎴栧嚱鏁板悕銆�</span>
</div>
</Modal>
- </div>
+ </>
)
}
}
--
Gitblit v1.8.0