From d1af439bb8702cf5099324d6fba8cac952fa5d64 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 12 九月 2024 22:00:44 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/utils/utils-datamanage.js | 4 +++-
src/tabviews/zshare/actionList/funcbutton/index.jsx | 3 ++-
src/views/pcdesign/index.jsx | 2 ++
src/tabviews/custom/components/table/edit-table/normalTable/mkPopSelect/index.jsx | 3 ++-
src/tabviews/zshare/topSearch/index.jsx | 2 ++
src/tabviews/custom/components/table/edit-table/normalTable/index.jsx | 7 +++++--
src/tabviews/zshare/actionList/excelInbutton/index.jsx | 3 ++-
src/tabviews/zshare/mutilform/mkPopSelect/index.jsx | 3 ++-
src/tabviews/zshare/mutilform/index.jsx | 4 +++-
src/api/index.js | 14 +++++++++++++-
src/tabviews/zshare/actionList/newpagebutton/index.jsx | 3 ++-
src/views/billprint/index.jsx | 1 +
src/tabviews/zshare/actionList/normalbutton/index.jsx | 4 +++-
src/views/mobdesign/index.jsx | 2 ++
14 files changed, 44 insertions(+), 11 deletions(-)
diff --git a/src/api/index.js b/src/api/index.js
index fa691dd..23bfa19 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -733,6 +733,12 @@
}
}
+ if (param.$type) {
+ url += '/' + param.$type
+ }
+
+ delete param.$type
+
param = this.encryptParam(param)
return new Promise((resolve) => {
@@ -751,7 +757,7 @@
res.ErrCode = '-2'
MKEmitter.emit('reloadTabs')
}
- if (res.status) {
+ if (res.status && id) {
window.GLOB.CacheMap.set(id, res)
}
resolve(res)
@@ -1038,6 +1044,12 @@
}
}
+ if (param.$type) {
+ url += '/' + param.$type
+ }
+
+ delete param.$type
+
param.username = sessionStorage.getItem('User_Name') || ''
param.fullname = sessionStorage.getItem('Full_Name') || ''
param.s_debug = window.GLOB.debugger ? 'Y' : ''
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 d5c4720..5108d1c 100644
--- a/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
+++ b/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
@@ -2062,8 +2062,8 @@
let cell = {
id: ex.id,
- exps: exps,
menuname: item.label + '锛堣〃鍗曪級',
+ exps: exps,
md5_id: ''
}
@@ -2077,6 +2077,7 @@
if (localItems.length) {
deffers.push({
$backend: true,
+ $type: 's_Get_SelectedList',
data: localItems
})
}
@@ -2084,6 +2085,7 @@
if (mainItems.length) {
deffers.push({
$backend: true,
+ $type: 's_Get_SelectedList',
data: mainItems,
rduri: window.GLOB.mainSystemApi
})
@@ -2632,10 +2634,11 @@
return {
$backend: true,
+ $type: 's_TableData_InUpDe',
data: [{
id: ex.id,
- exps: exps,
menuname: btn.logLabel || '',
+ exps: exps,
md5_id: md5_id
}]
}
diff --git a/src/tabviews/custom/components/table/edit-table/normalTable/mkPopSelect/index.jsx b/src/tabviews/custom/components/table/edit-table/normalTable/mkPopSelect/index.jsx
index 7c1cc56..df74eed 100644
--- a/src/tabviews/custom/components/table/edit-table/normalTable/mkPopSelect/index.jsx
+++ b/src/tabviews/custom/components/table/edit-table/normalTable/mkPopSelect/index.jsx
@@ -98,10 +98,11 @@
param = {
$backend: true,
+ $type: 's_Get_TableData',
data: [{
id: ex.id,
+ menuname: config.label || '',
exps: exps,
- menuname: '',
md5_id: ''
}]
}
diff --git a/src/tabviews/zshare/actionList/excelInbutton/index.jsx b/src/tabviews/zshare/actionList/excelInbutton/index.jsx
index a875b0a..fde146a 100644
--- a/src/tabviews/zshare/actionList/excelInbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/excelInbutton/index.jsx
@@ -860,10 +860,11 @@
return {
$backend: true,
+ $type: 's_TableData_InUpDe',
data: [{
id: ex.id,
- exps: exps,
menuname: btn.logLabel || '',
+ exps: exps,
md5_id: md5_id
}]
}
diff --git a/src/tabviews/zshare/actionList/funcbutton/index.jsx b/src/tabviews/zshare/actionList/funcbutton/index.jsx
index c83ac11..43430ed 100644
--- a/src/tabviews/zshare/actionList/funcbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/funcbutton/index.jsx
@@ -317,10 +317,11 @@
return {
$backend: true,
+ $type: 's_TableData_InUpDe',
data: [{
id: ex.id,
- exps: exps,
menuname: btn.logLabel || '',
+ exps: exps,
md5_id: md5_id
}]
}
diff --git a/src/tabviews/zshare/actionList/newpagebutton/index.jsx b/src/tabviews/zshare/actionList/newpagebutton/index.jsx
index 2a61fb0..206d758 100644
--- a/src/tabviews/zshare/actionList/newpagebutton/index.jsx
+++ b/src/tabviews/zshare/actionList/newpagebutton/index.jsx
@@ -519,10 +519,11 @@
return {
$backend: true,
+ $type: 's_TableData_InUpDe',
data: [{
id: ex.id,
- exps: exps,
menuname: btn.logLabel || '',
+ exps: exps,
md5_id: md5_id
}]
}
diff --git a/src/tabviews/zshare/actionList/normalbutton/index.jsx b/src/tabviews/zshare/actionList/normalbutton/index.jsx
index 158e42d..6918303 100644
--- a/src/tabviews/zshare/actionList/normalbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/normalbutton/index.jsx
@@ -1156,10 +1156,11 @@
return {
$backend: true,
+ $type: 's_TableData_InUpDe',
data: [{
id: ex.id,
- exps: exps,
menuname: btn.logLabel || '',
+ exps: exps,
md5_id: md5_id
}]
}
@@ -1585,6 +1586,7 @@
if (window.backend && params[0].$backend && (!btn.verify || (btn.verify.printEnable !== 'true' && !btn.output))) {
params = [{
$backend: true,
+ $type: 's_TableData_InUpDe',
data: params.map(item => item.data[0])
}]
}
diff --git a/src/tabviews/zshare/mutilform/index.jsx b/src/tabviews/zshare/mutilform/index.jsx
index 8bcb9b5..15d2493 100644
--- a/src/tabviews/zshare/mutilform/index.jsx
+++ b/src/tabviews/zshare/mutilform/index.jsx
@@ -906,8 +906,8 @@
let cell = {
id: ex.id,
- exps: exps,
menuname: item.label + '锛堣〃鍗曪級',
+ exps: exps,
md5_id: ''
}
@@ -921,6 +921,7 @@
if (localItems.length) {
deffers.push({
$backend: true,
+ $type: 's_Get_SelectedList',
data: localItems
})
}
@@ -928,6 +929,7 @@
if (mainItems.length) {
deffers.push({
$backend: true,
+ $type: 's_Get_SelectedList',
data: mainItems,
rduri: window.GLOB.mainSystemApi
})
diff --git a/src/tabviews/zshare/mutilform/mkPopSelect/index.jsx b/src/tabviews/zshare/mutilform/mkPopSelect/index.jsx
index 055a9b0..4b967e2 100644
--- a/src/tabviews/zshare/mutilform/mkPopSelect/index.jsx
+++ b/src/tabviews/zshare/mutilform/mkPopSelect/index.jsx
@@ -178,10 +178,11 @@
param = {
$backend: true,
+ $type: 's_Get_TableData',
data: [{
id: ex.id,
+ menuname: config.label || '',
exps: exps,
- menuname: '',
md5_id: ''
}]
}
diff --git a/src/tabviews/zshare/topSearch/index.jsx b/src/tabviews/zshare/topSearch/index.jsx
index 3f19a86..8d6fe6d 100644
--- a/src/tabviews/zshare/topSearch/index.jsx
+++ b/src/tabviews/zshare/topSearch/index.jsx
@@ -620,6 +620,7 @@
if (localItems.length) {
deffers.push({
$backend: true,
+ $type: 's_Get_SelectedList',
data: localItems
})
}
@@ -627,6 +628,7 @@
if (mainItems.length) {
deffers.push({
$backend: true,
+ $type: 's_Get_SelectedList',
data: mainItems,
rduri: window.GLOB.mainSystemApi
})
diff --git a/src/utils/utils-datamanage.js b/src/utils/utils-datamanage.js
index 84c388f..900a62c 100644
--- a/src/utils/utils-datamanage.js
+++ b/src/utils/utils-datamanage.js
@@ -109,8 +109,8 @@
let cell = {
id: item.id,
- exps: exps,
menuname: setting.$name || '',
+ exps: exps,
md5_id: md5_id
}
@@ -122,6 +122,7 @@
let param = {
$backend: true,
+ $type: 's_Get_TableData',
data: [cell]
}
@@ -712,6 +713,7 @@
if (window.backend && params[0].exps) {
let param = {
$backend: true,
+ $type: 's_Get_TableData',
data: params.map(item => {
let cell = {...item}
diff --git a/src/views/billprint/index.jsx b/src/views/billprint/index.jsx
index 0ea001b..5b7ea20 100644
--- a/src/views/billprint/index.jsx
+++ b/src/views/billprint/index.jsx
@@ -598,6 +598,7 @@
if (data.length > 0) {
params.push({
$backend: true,
+ $type: 's_Get_TableData',
componentId: '',
data
})
diff --git a/src/views/mobdesign/index.jsx b/src/views/mobdesign/index.jsx
index 19aa1c2..4bf2cf7 100644
--- a/src/views/mobdesign/index.jsx
+++ b/src/views/mobdesign/index.jsx
@@ -1455,6 +1455,8 @@
} else if (this.checklog()) {
if ((sessionStorage.getItem('applangList') && !config.trans) || (adapters.includes('wxmini') && !config.hasOwnProperty('miniStyle'))) {
+ } else if (window.backend && config.enabled && !config.allSqls) {
+
} else {
notification.success({
top: 92,
diff --git a/src/views/pcdesign/index.jsx b/src/views/pcdesign/index.jsx
index 6162466..a74edea 100644
--- a/src/views/pcdesign/index.jsx
+++ b/src/views/pcdesign/index.jsx
@@ -1181,6 +1181,8 @@
} else if (this.checklog()) {
if (sessionStorage.getItem('applangList') && !config.trans) {
+ } else if (window.backend && config.enabled && !config.allSqls) {
+
} else {
notification.success({
top: 92,
--
Gitblit v1.8.0