From 31674fc70ecdf068aa6e09a581574f28509d4be3 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 16 七月 2023 12:20:42 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/components/form/formaction/formconfig.jsx | 8 ++++++++
src/menu/components/share/actioncomponent/actionform/index.jsx | 2 +-
src/tabviews/basetable/index.jsx | 4 ----
src/tabviews/custom/index.jsx | 4 ----
src/menu/components/share/actioncomponent/formconfig.jsx | 16 ++++++++++++++++
src/menu/components/form/formaction/actionform/index.jsx | 2 +-
src/tabviews/zshare/actionList/normalbutton/index.jsx | 6 ++++++
7 files changed, 32 insertions(+), 10 deletions(-)
diff --git a/src/menu/components/form/formaction/actionform/index.jsx b/src/menu/components/form/formaction/actionform/index.jsx
index 85144b8..0bc7907 100644
--- a/src/menu/components/form/formaction/actionform/index.jsx
+++ b/src/menu/components/form/formaction/actionform/index.jsx
@@ -61,7 +61,7 @@
if (this.record.intertype === 'custom') {
shows.pop()
- shows.push('procMode', 'interface', 'callbackType', 'proInterface', 'method', 'cross', 'stringify')
+ shows.push('procMode', 'interface', 'callbackType', 'proInterface', 'method', 'cross', 'stringify', 'ContentType')
if (this.record.procMode === 'system') {
shows.push('sql', 'sqlType')
} else if (this.record.procMode === 'inner') {
diff --git a/src/menu/components/form/formaction/formconfig.jsx b/src/menu/components/form/formaction/formconfig.jsx
index 65448fa..0642615 100644
--- a/src/menu/components/form/formaction/formconfig.jsx
+++ b/src/menu/components/form/formaction/formconfig.jsx
@@ -302,6 +302,14 @@
}]
},
{
+ type: 'text',
+ key: 'ContentType',
+ label: 'Content-Type',
+ initVal: card.ContentType || '',
+ tooltip: '榛樿鍊硷細application/x-www-form-urlencoded;charset=UTF-8',
+ required: false
+ },
+ {
type: 'radio',
key: 'Ot',
label: '琛岃缃�',
diff --git a/src/menu/components/share/actioncomponent/actionform/index.jsx b/src/menu/components/share/actioncomponent/actionform/index.jsx
index 608130d..9d066d2 100644
--- a/src/menu/components/share/actioncomponent/actionform/index.jsx
+++ b/src/menu/components/share/actioncomponent/actionform/index.jsx
@@ -166,7 +166,7 @@
reOptions.intertype = this.state.interTypeOptions
if (intertype === 'custom') {
- shows.push('procMode', 'interface', 'callbackType', 'proInterface', 'method', 'cross', 'stringify')
+ shows.push('procMode', 'interface', 'callbackType', 'proInterface', 'method', 'cross', 'stringify', 'ContentType')
if (this.record.procMode === 'system') {
shows.push('sql', 'sqlType')
} else if (this.record.procMode === 'inner') {
diff --git a/src/menu/components/share/actioncomponent/formconfig.jsx b/src/menu/components/share/actioncomponent/formconfig.jsx
index 652dc34..2c40947 100644
--- a/src/menu/components/share/actioncomponent/formconfig.jsx
+++ b/src/menu/components/share/actioncomponent/formconfig.jsx
@@ -577,6 +577,14 @@
}]
},
{
+ type: 'text',
+ key: 'ContentType',
+ label: 'Content-Type',
+ initVal: card.ContentType || '',
+ tooltip: '榛樿鍊硷細application/x-www-form-urlencoded;charset=UTF-8',
+ required: false
+ },
+ {
type: 'select',
key: 'Ot',
label: '琛岃缃�',
@@ -1658,6 +1666,14 @@
}]
},
{
+ type: 'text',
+ key: 'ContentType',
+ label: 'Content-Type',
+ initVal: card.ContentType || '',
+ tooltip: '榛樿鍊硷細application/x-www-form-urlencoded;charset=UTF-8',
+ required: false
+ },
+ {
type: 'select',
key: 'Ot',
label: '琛岃缃�',
diff --git a/src/tabviews/basetable/index.jsx b/src/tabviews/basetable/index.jsx
index ccc4b1c..2b93477 100644
--- a/src/tabviews/basetable/index.jsx
+++ b/src/tabviews/basetable/index.jsx
@@ -56,10 +56,6 @@
func: 'sPC_Get_LongParam',
MenuID: MenuID
}
-
- if (window.GLOB.mkHS) {
- _param.appkey = '20191106103859640976D6E924E464D029CF0'
- }
let result = await Api.getCacheConfig(_param)
diff --git a/src/tabviews/custom/index.jsx b/src/tabviews/custom/index.jsx
index 5357f75..f0d2148 100644
--- a/src/tabviews/custom/index.jsx
+++ b/src/tabviews/custom/index.jsx
@@ -88,10 +88,6 @@
MenuID: MenuID
}
- if (window.GLOB.mkHS) {
- _param.appkey = '20191106103859640976D6E924E464D029CF0'
- }
-
let result = await Api.getCacheConfig(_param)
if (result.status) {
diff --git a/src/tabviews/zshare/actionList/normalbutton/index.jsx b/src/tabviews/zshare/actionList/normalbutton/index.jsx
index ea562ed..cef2d8d 100644
--- a/src/tabviews/zshare/actionList/normalbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/normalbutton/index.jsx
@@ -1316,6 +1316,12 @@
_params.method = 'post'
}
+ if (btn.ContentType) {
+ _params.headers = {
+ 'Content-Type': btn.ContentType
+ }
+ }
+
Api.directRequest(_params).then(res => {
if (typeof(res) !== 'object') {
let error = '鏈煡鐨勮繑鍥炵粨鏋滐紒'
--
Gitblit v1.8.0