From 273e0071547f266d1f8aae2c060c320adf005380 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 03 十一月 2023 11:14:37 +0800
Subject: [PATCH] 2023-11-03
---
src/tabviews/custom/components/table/edit-table/normalTable/index.jsx | 20 +++++++-------------
1 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx b/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
index ed634a0..4c039a7 100644
--- a/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
+++ b/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
@@ -1389,7 +1389,7 @@
if (item.resourceType === '1') {
let _option = Utils.getSelectQueryOptions(item)
- if (/@BID@/ig.test(_option.sql)) {
+ if (/@BID@/ig.test(_option.sql) && setting.supModule) {
hasBid = true
}
@@ -1490,14 +1490,11 @@
pageOptions,
columns: _columns,
tableId: setting.tableId,
- orderfields
+ orderfields,
+ deForms: hasBid ? deForms : null
}, () => {
- if (deForms.length > 0) {
- if (hasBid && setting.supModule && !BID) {
- this.setState({ deForms })
- } else {
- this.improveActionForm(deForms, BID)
- }
+ if (deForms.length > 0 && (!hasBid || BID)) {
+ this.improveActionForm(deForms, BID)
}
})
}
@@ -1793,12 +1790,9 @@
}
improveActionForm = (deForms, BID) => {
- const { setting } = this.props
-
let deffers = []
let mainItems = [] // 浜戠鎴栧崟鐐规暟鎹�
let localItems = [] // 鏈湴鏁版嵁
- let cache = setting.cache !== 'false'
let debug = window.GLOB.debugger === true
let _sql = `Declare @mk_departmentcode nvarchar(512),@mk_organization nvarchar(512),@mk_user_type nvarchar(20) select @mk_departmentcode='${sessionStorage.getItem('departmentcode') || ''}',@mk_organization='${sessionStorage.getItem('organization') || ''}',@mk_user_type='${sessionStorage.getItem('mk_user_type') || ''}'\n`
let _sso = _sql
@@ -1850,7 +1844,7 @@
deffers.push(
new Promise(resolve => {
- Api.getSystemCacheConfig(param, cache).then(res => {
+ Api.getSystemCacheConfig(param, false).then(res => {
if (!res.status) {
notification.warning({
top: 92,
@@ -1885,7 +1879,7 @@
deffers.push(
new Promise(resolve => {
- Api.getSystemCacheConfig(mainparam, cache).then(res => {
+ Api.getSystemCacheConfig(mainparam, false).then(res => {
if (!res.status) {
notification.warning({
top: 92,
--
Gitblit v1.8.0