From 76c4adc98ef8e7a3ea0f44d608363e3c0ddacf9b Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 03 七月 2024 18:01:35 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/tabviews/custom/components/table/edit-table/index.jsx | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/tabviews/custom/components/table/edit-table/index.jsx b/src/tabviews/custom/components/table/edit-table/index.jsx
index ffd5efc..2b3560d 100644
--- a/src/tabviews/custom/components/table/edit-table/index.jsx
+++ b/src/tabviews/custom/components/table/edit-table/index.jsx
@@ -251,6 +251,7 @@
config.dataSource = config.dataSource.replace(/@SessionUid@/ig, `'${localStorage.getItem('SessionUid') || ''}'`)
config.dataSource = config.dataSource.replace(/@UserID@/ig, `'${sessionStorage.getItem('UserID') || ''}'`)
config.dataSource = config.dataSource.replace(/@Appkey@/ig, `'${window.GLOB.appkey || ''}'`)
+ config.dataSource = config.dataSource.replace(/@lang@/ig, `'${sessionStorage.getItem('lang')}'`)
if (/\s/.test(config.dataSource)) { // 鎷兼帴鍒悕
config.dataSource = '(' + config.dataSource + ') tb'
@@ -748,7 +749,7 @@
if (config.uuid !== menuId) return
if (position === 'line' || position === 'line_grid') {
- if (lines && lines.length === 1) {
+ if (lines && lines.length === 1 && !config.forbidLine) {
this.loadLinedata(lines[0].$$uuid, position)
} else {
this.reloadtable(btn)
--
Gitblit v1.8.0