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/menu/components/table/edit-table/options.jsx | 52 +++++++++++++-------------
src/assets/css/viewstyle.scss | 2
src/tabviews/custom/components/table/edit-table/normalTable/index.jsx | 20 +++------
3 files changed, 34 insertions(+), 40 deletions(-)
diff --git a/src/assets/css/viewstyle.scss b/src/assets/css/viewstyle.scss
index 94f61a3..14d73b8 100644
--- a/src/assets/css/viewstyle.scss
+++ b/src/assets/css/viewstyle.scss
@@ -219,7 +219,7 @@
}
.ant-pagination-options {
> div:not(:first-child) {
- z-index: 1;
+ z-index: 3;
}
}
}
diff --git a/src/menu/components/table/edit-table/options.jsx b/src/menu/components/table/edit-table/options.jsx
index 33616a8..2c88ad3 100644
--- a/src/menu/components/table/edit-table/options.jsx
+++ b/src/menu/components/table/edit-table/options.jsx
@@ -78,18 +78,18 @@
{value: 'multi', label: '鏁翠綋'},
]
},
- {
- type: 'radio',
- field: 'cache',
- label: '缂撳瓨',
- initval: wrap.cache || 'true',
- tooltip: '瀵逛簬浣跨敤鏁版嵁婧愮殑涓嬫媺鑿滃崟锛屼笅鎷夐�夐」鏄惁缂撳瓨鍒版湰鍦般��',
- required: false,
- options: [
- {value: 'true', label: '浣跨敤'},
- {value: 'false', label: '涓嶄娇鐢�'},
- ]
- },
+ // {
+ // type: 'radio',
+ // field: 'cache',
+ // label: '缂撳瓨',
+ // initval: wrap.cache || 'true',
+ // tooltip: '瀵逛簬浣跨敤鏁版嵁婧愮殑涓嬫媺鑿滃崟锛屼笅鎷夐�夐」鏄惁缂撳瓨鍒版湰鍦般��',
+ // required: false,
+ // options: [
+ // {value: 'true', label: '浣跨敤'},
+ // {value: 'false', label: '涓嶄娇鐢�'},
+ // ]
+ // },
{
type: 'radio',
field: 'tableType',
@@ -100,6 +100,20 @@
{value: '', label: '涓嶅彲閫�'},
{value: 'radio', label: '鍗曢��'},
{value: 'checkbox', label: '澶氶��'},
+ ]
+ },
+ {
+ type: 'radio',
+ field: 'size',
+ label: '琛ㄦ牸澶у皬',
+ initval: wrap.size || 'middle',
+ tooltip: '琛ㄦ牸鐨勫唴杈硅窛锛屼粠澶у埌灏忎緷娆￠�掑噺銆�',
+ required: false,
+ options: [
+ {value: 'default', label: '澶�'},
+ {value: 'middle', label: '涓�'},
+ {value: 'small', label: '灏�'},
+ {value: 'mini', label: '杩蜂綘'},
]
},
{
@@ -122,20 +136,6 @@
options: [
{value: 'show', label: '鏄剧ず'},
{value: 'hidden', label: '闅愯棌'},
- ]
- },
- {
- type: 'radio',
- field: 'size',
- label: '琛ㄦ牸澶у皬',
- initval: wrap.size || 'middle',
- tooltip: '琛ㄦ牸鐨勫唴杈硅窛锛屼粠澶у埌灏忎緷娆￠�掑噺銆�',
- required: false,
- options: [
- {value: 'default', label: '澶�'},
- {value: 'middle', label: '涓�'},
- {value: 'small', label: '灏�'},
- {value: 'mini', label: '杩蜂綘'},
]
},
{
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