From 630692369713818816c9fd1b6541b69b30640f10 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 30 八月 2023 17:04:55 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/templates/sharecomponent/actioncomponent/verifyprint/index.jsx | 3 ++-
src/utils/utils-datamanage.js | 1 -
src/tabviews/custom/components/table/base-table/index.jsx | 2 ++
src/templates/zshare/editTable/index.jsx | 2 +-
src/templates/sharecomponent/actioncomponent/verifyexcelin/columnform/index.jsx | 1 +
src/templates/zshare/verifycard/index.jsx | 4 ++--
src/tabviews/zshare/actionList/funcMegvii/index.jsx | 4 ++--
src/tabviews/zshare/actionList/printbutton/index.jsx | 2 +-
src/templates/sharecomponent/fieldscomponent/index.jsx | 2 +-
src/api/index.js | 1 -
src/tabviews/custom/index.jsx | 1 -
src/tabviews/custom/components/form/simple-form/index.jsx | 3 +--
src/tabviews/zshare/actionList/normalbutton/index.jsx | 4 ++--
src/templates/sharecomponent/actioncomponent/verifyexcelin/index.jsx | 1 +
src/menu/datasource/verifycard/columnform/index.jsx | 1 +
src/menu/datasource/verifycard/index.jsx | 1 +
src/utils/utils.js | 4 ++--
17 files changed, 20 insertions(+), 17 deletions(-)
diff --git a/src/api/index.js b/src/api/index.js
index ff77975..6440faf 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -82,7 +82,6 @@
/**
* @description 浣跨敤dostar鎺ュ彛锛岃烦杩囬獙璇�
- * @param {Object} param 鏌ヨ鍙婃彁浜ゅ弬鏁�
*/
dostarInterface (param) {
param.userid = param.userid || ''
diff --git a/src/menu/datasource/verifycard/columnform/index.jsx b/src/menu/datasource/verifycard/columnform/index.jsx
index f977564..e0fe5c8 100644
--- a/src/menu/datasource/verifycard/columnform/index.jsx
+++ b/src/menu/datasource/verifycard/columnform/index.jsx
@@ -91,6 +91,7 @@
<Select.Option value="Nvarchar(512)"> Nvarchar(512) </Select.Option>
<Select.Option value="Nvarchar(1024)"> Nvarchar(1024) </Select.Option>
<Select.Option value="Nvarchar(2048)"> Nvarchar(2048) </Select.Option>
+ <Select.Option value="Nvarchar(4000)"> Nvarchar(4000) </Select.Option>
<Select.Option value="Nvarchar(max)"> Nvarchar(max) </Select.Option>
<Select.Option value="Int"> Int </Select.Option>
<Select.Option value="Decimal(18,0)"> Decimal(18,0) </Select.Option>
diff --git a/src/menu/datasource/verifycard/index.jsx b/src/menu/datasource/verifycard/index.jsx
index 9d84902..f11fcde 100644
--- a/src/menu/datasource/verifycard/index.jsx
+++ b/src/menu/datasource/verifycard/index.jsx
@@ -86,6 +86,7 @@
{ value: 'Nvarchar(512)', text: 'Nvarchar(512)' },
{ value: 'Nvarchar(1024)', text: 'Nvarchar(1024)' },
{ value: 'Nvarchar(2048)', text: 'Nvarchar(2048)' },
+ { value: 'Nvarchar(4000)', text: 'Nvarchar(4000)' },
{ value: 'Nvarchar(max)', text: 'Nvarchar(max)' },
{ value: 'Int', text: 'Int' },
{ value: 'Decimal(18,0)', text: 'Decimal(18,0)' },
diff --git a/src/tabviews/custom/components/form/simple-form/index.jsx b/src/tabviews/custom/components/form/simple-form/index.jsx
index 60be28f..73ca3d9 100644
--- a/src/tabviews/custom/components/form/simple-form/index.jsx
+++ b/src/tabviews/custom/components/form/simple-form/index.jsx
@@ -25,8 +25,7 @@
loading: false,
data: null,
group: null,
- BData: '',
- step: 0
+ BData: ''
}
UNSAFE_componentWillMount () {
diff --git a/src/tabviews/custom/components/table/base-table/index.jsx b/src/tabviews/custom/components/table/base-table/index.jsx
index 4f1d0fd..91cbbff 100644
--- a/src/tabviews/custom/components/table/base-table/index.jsx
+++ b/src/tabviews/custom/components/table/base-table/index.jsx
@@ -385,6 +385,8 @@
getStatFieldsValue = () => {
const { setting, config, search, BID, orderBy } = this.state
+ if (!config.statFields) return
+
if (setting.supModule && !BID) { // BID 涓嶅瓨鍦ㄦ椂锛屼笉鍋氭煡璇�
this.setState({
statFValue: []
diff --git a/src/tabviews/custom/index.jsx b/src/tabviews/custom/index.jsx
index 80d4e93..2686241 100644
--- a/src/tabviews/custom/index.jsx
+++ b/src/tabviews/custom/index.jsx
@@ -62,7 +62,6 @@
viewlost: false, // 椤甸潰涓㈠け锛�1銆佹湭鑾峰彇鍒伴厤缃�-椤甸潰涓㈠け锛�2銆侀〉闈㈡湭鍚敤
lostmsg: '', // 椤甸潰涓㈠け鏃剁殑鎻愮ず淇℃伅
config: null, // 椤甸潰閰嶇疆淇℃伅锛屽寘鎷粍浠剁瓑
- userConfig: null, // 鐢ㄦ埛鑷畾涔夎缃�
loading: false, // 鍒楄〃鏁版嵁鍔犺浇涓�
visible: false, // 鏍囩椤垫帶鍒�
shortcuts: null, // 蹇嵎閿�
diff --git a/src/tabviews/zshare/actionList/funcMegvii/index.jsx b/src/tabviews/zshare/actionList/funcMegvii/index.jsx
index c1df199..e826bcf 100644
--- a/src/tabviews/zshare/actionList/funcMegvii/index.jsx
+++ b/src/tabviews/zshare/actionList/funcMegvii/index.jsx
@@ -327,10 +327,10 @@
* 4銆佹ā鎬佹鎵ц鎴愬姛鍚庢槸鍚﹀叧闂�
* 5銆侀�氱煡涓诲垪琛ㄥ埛鏂�
*/
- execSuccess = (res) => {
+ execSuccess = (res = {}) => {
const { btn } = this.props
- if (res && (res.ErrCode === 'S' || !res.ErrCode)) { // 鎵ц鎴愬姛
+ if (res.ErrCode === 'S' || !res.ErrCode) { // 鎵ц鎴愬姛
notification.success({
top: 92,
message: res.message || '鎵ц鎴愬姛',
diff --git a/src/tabviews/zshare/actionList/normalbutton/index.jsx b/src/tabviews/zshare/actionList/normalbutton/index.jsx
index 2a39aab..dcceb12 100644
--- a/src/tabviews/zshare/actionList/normalbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/normalbutton/index.jsx
@@ -876,7 +876,7 @@
if (!_vars.includes(_key)) {
_vars.push(_key)
- if (form.fieldlen && form.fieldlen > 2048) {
+ if (form.fieldlen && form.fieldlen > 4000) {
form.fieldlen = 'max'
}
@@ -930,7 +930,7 @@
if (col.datatype) {
_declarefields.push(`@${_key} ${col.datatype}`)
} else {
- if (col.fieldlength && col.fieldlength > 2048) {
+ if (col.fieldlength && col.fieldlength > 4000) {
col.fieldlength = 'max'
}
diff --git a/src/tabviews/zshare/actionList/printbutton/index.jsx b/src/tabviews/zshare/actionList/printbutton/index.jsx
index bf0fe1b..f861522 100644
--- a/src/tabviews/zshare/actionList/printbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/printbutton/index.jsx
@@ -1049,7 +1049,7 @@
_initvars.push(`@${_key}='${form.value}'`)
}
- if (form.fieldlen && form.fieldlen > 2048) {
+ if (form.fieldlen && form.fieldlen > 4000) {
form.fieldlen = 'max'
}
diff --git a/src/templates/sharecomponent/actioncomponent/verifyexcelin/columnform/index.jsx b/src/templates/sharecomponent/actioncomponent/verifyexcelin/columnform/index.jsx
index e3eda1e..b9e2756 100644
--- a/src/templates/sharecomponent/actioncomponent/verifyexcelin/columnform/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/verifyexcelin/columnform/index.jsx
@@ -110,6 +110,7 @@
<Select.Option value="Nvarchar(512)"> Nvarchar(512) </Select.Option>
<Select.Option value="Nvarchar(1024)"> Nvarchar(1024) </Select.Option>
<Select.Option value="Nvarchar(2048)"> Nvarchar(2048) </Select.Option>
+ <Select.Option value="Nvarchar(4000)"> Nvarchar(4000) </Select.Option>
<Select.Option value="Nvarchar(max)"> Nvarchar(max) </Select.Option>
<Select.Option value="Int"> Int </Select.Option>
<Select.Option value="Decimal(18,0)"> Decimal(18,0) </Select.Option>
diff --git a/src/templates/sharecomponent/actioncomponent/verifyexcelin/index.jsx b/src/templates/sharecomponent/actioncomponent/verifyexcelin/index.jsx
index 38fdf04..f22ea28 100644
--- a/src/templates/sharecomponent/actioncomponent/verifyexcelin/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/verifyexcelin/index.jsx
@@ -63,6 +63,7 @@
{ value: 'Nvarchar(512)', text: 'Nvarchar(512)' },
{ value: 'Nvarchar(1024)', text: 'Nvarchar(1024)' },
{ value: 'Nvarchar(2048)', text: 'Nvarchar(2048)' },
+ { value: 'Nvarchar(4000)', text: 'Nvarchar(4000)' },
{ value: 'Nvarchar(max)', text: 'Nvarchar(max)' },
{ value: 'Int', text: 'Int' },
{ value: 'Decimal(18,0)', text: 'Decimal(18,0)' },
diff --git a/src/templates/sharecomponent/actioncomponent/verifyprint/index.jsx b/src/templates/sharecomponent/actioncomponent/verifyprint/index.jsx
index 5a622de..3feecc6 100644
--- a/src/templates/sharecomponent/actioncomponent/verifyprint/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/verifyprint/index.jsx
@@ -144,6 +144,7 @@
{ value: 'Nvarchar(512)', text: 'Nvarchar(512)' },
{ value: 'Nvarchar(1024)', text: 'Nvarchar(1024)' },
{ value: 'Nvarchar(2048)', text: 'Nvarchar(2048)' },
+ { value: 'Nvarchar(4000)', text: 'Nvarchar(4000)' },
{ value: 'Nvarchar(max)', text: 'Nvarchar(max)' },
{ value: 'Int', text: 'Int' },
{ value: 'Decimal(18,0)', text: 'Decimal(18,0)' },
@@ -206,7 +207,7 @@
_fieldlen = _f.decimal ? _f.decimal : 0
}
- if (_fieldlen > 2048) {
+ if (_fieldlen > 4000) {
_fieldlen = 'max'
}
diff --git a/src/templates/sharecomponent/fieldscomponent/index.jsx b/src/templates/sharecomponent/fieldscomponent/index.jsx
index 5cc4bf4..1c09501 100644
--- a/src/templates/sharecomponent/fieldscomponent/index.jsx
+++ b/src/templates/sharecomponent/fieldscomponent/index.jsx
@@ -64,7 +64,7 @@
try { // 瀛樺湪max
_length = +_type.match(/\d+/)[0] || 50
} catch (e) {
- _length = 2048
+ _length = 4000
}
_type = 'text'
} else if (/^int/.test(_type)) {
diff --git a/src/templates/zshare/editTable/index.jsx b/src/templates/zshare/editTable/index.jsx
index 3f0e3fe..60dd750 100644
--- a/src/templates/zshare/editTable/index.jsx
+++ b/src/templates/zshare/editTable/index.jsx
@@ -389,7 +389,7 @@
} else {
let datatype = 'Nvarchar(50)'
let fieldlength = 50
- if (col.fieldlength && [10, 20, 50, 100, 256, 512, 1024, 2048].includes(col.fieldlength)) {
+ if (col.fieldlength && [10, 20, 50, 100, 256, 512, 1024, 2048, 4000].includes(col.fieldlength)) {
fieldlength = col.fieldlength
datatype = `Nvarchar(${fieldlength})`
}
diff --git a/src/templates/zshare/verifycard/index.jsx b/src/templates/zshare/verifycard/index.jsx
index cffd4a9..36a5450 100644
--- a/src/templates/zshare/verifycard/index.jsx
+++ b/src/templates/zshare/verifycard/index.jsx
@@ -721,7 +721,7 @@
_fieldlen = _f.decimal ? _f.decimal : 0
}
- if (_fieldlen > 2048) {
+ if (_fieldlen > 4000) {
_fieldlen = 'max'
}
@@ -786,7 +786,7 @@
let _fieldlen = _f.fieldlength || 50
- if (_fieldlen > 2048) {
+ if (_fieldlen > 4000) {
_fieldlen = 'max'
}
diff --git a/src/utils/utils-datamanage.js b/src/utils/utils-datamanage.js
index a5cb08d..36018cb 100644
--- a/src/utils/utils-datamanage.js
+++ b/src/utils/utils-datamanage.js
@@ -11,7 +11,6 @@
* @param {Number} pageIndex 椤电爜
* @param {Number} pageSize 姣忛〉鏁伴噺
* @param {String} BID 涓婄骇ID
- * @return {Object} param
*/
static getQueryDataParams (setting, search = [], orderBy = '', pageIndex = 1, pageSize = 10, BID, id, year) {
let param = null
diff --git a/src/utils/utils.js b/src/utils/utils.js
index 77e646d..0c250c8 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -1441,7 +1441,7 @@
if (!_vars.includes(_key)) {
_vars.push(_key)
- if (form.fieldlen && form.fieldlen > 2048) {
+ if (form.fieldlen && form.fieldlen > 4000) {
form.fieldlen = 'max'
}
@@ -1495,7 +1495,7 @@
if (col.datatype) {
_declarefields.push(`@${_key} ${col.datatype}`)
} else {
- if (col.fieldlength && col.fieldlength > 2048) {
+ if (col.fieldlength && col.fieldlength > 4000) {
col.fieldlength = 'max'
}
--
Gitblit v1.8.0