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 |   85 ++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 80 insertions(+), 5 deletions(-)

diff --git a/src/menu/tablenodes/index.jsx b/src/menu/tablenodes/index.jsx
index fcbfdd9..4174e4d 100644
--- a/src/menu/tablenodes/index.jsx
+++ b/src/menu/tablenodes/index.jsx
@@ -153,6 +153,42 @@
             direction: 'left'
           })
         }
+        if (cell.exInterface) {
+          let url = ''
+
+          try {
+            url = JSON.parse(cell.exInterface).url
+          } catch(e) {
+            url = ''
+          }
+
+          if (url) {
+            tbs.push({
+              label: url + ' (' + cell.label + ')',
+              color: 'orange',
+              id: Utils.getuuid(),
+              direction: 'left'
+            })
+          }
+        }
+        if (cell.exProInterface) {
+          let url = ''
+
+          try {
+            url = JSON.parse(cell.exProInterface).url
+          } catch(e) {
+            url = ''
+          }
+
+          if (url) {
+            tbs.push({
+              label: url + ' (' + cell.label + ')',
+              color: 'orange',
+              id: Utils.getuuid(),
+              direction: 'left'
+            })
+          }
+        }
         if (cell.callbackFunc) {
           tbs.push({
             label: cell.callbackFunc + ' (' + cell.label + ')',
@@ -197,6 +233,42 @@
             id: Utils.getuuid(),
             direction: 'left'
           })
+        }
+        if (item.setting.exInterface) {
+          let url = ''
+
+          try {
+            url = JSON.parse(item.setting.exInterface).url
+          } catch(e) {
+            url = ''
+          }
+
+          if (url) {
+            tbs.push({
+              label: url + ' (鏁版嵁婧�)',
+              color: 'orange',
+              id: Utils.getuuid(),
+              direction: 'left'
+            })
+          }
+        }
+        if (item.setting.exProInterface) {
+          let url = ''
+
+          try {
+            url = JSON.parse(item.setting.exProInterface).url
+          } catch(e) {
+            url = ''
+          }
+
+          if (url) {
+            tbs.push({
+              label: url + ' (鏁版嵁婧�)',
+              color: 'orange',
+              id: Utils.getuuid(),
+              direction: 'left'
+            })
+          }
         }
       }
     }
@@ -413,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({
@@ -462,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)))
@@ -728,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=""
@@ -749,10 +824,10 @@
           </div>
           <div className="footer">
             <Button key="cancel" onClick={() => { this.setState({ visible: false })}}>鍏抽棴</Button>
-            <span className="tip">娉細鐐瑰嚮琛ㄥ悕鍙睍寮�/鏀惰捣鑿滃崟</span>
+            <span className="tip">娉細鐐瑰嚮琛ㄥ悕锛堝彸渚э級鍙睍寮�/鏀惰捣鑿滃崟锛屽乏渚ф鑹叉爣娉ㄤ负鎺ュ彛鎴栧嚱鏁板悕銆�</span>
           </div>
         </Modal>
-      </div>
+      </>
     )
   }
 }

--
Gitblit v1.8.0