From 2806c1ba98bcb8d5917254728c41b58fde64f8c5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 07 十二月 2023 17:55:50 +0800
Subject: [PATCH] 2023-12-07
---
src/index.js | 3 ++-
src/menu/components/table/edit-table/options.jsx | 2 +-
src/tabviews/zshare/actionList/normalbutton/index.jsx | 7 +++++++
src/tabviews/zshare/actionList/printbutton/index.jsx | 2 ++
4 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/index.js b/src/index.js
index 155e3ac..b69ffe1 100644
--- a/src/index.js
+++ b/src/index.js
@@ -49,7 +49,6 @@
GLOB.watermark = config.watermark + '' !== 'false'
GLOB.transfer = config.transfer + '' === 'true'
GLOB.keepKey = config.keepPassword + '' !== 'false'
- GLOB.upStatus = config.updateStatus + '' !== 'false'
GLOB.nginx = config.nginx + '' === 'true'
GLOB.WXAppID = config.WXAppID || ''
GLOB.WXminiAppID = config.WXminiAppID || ''
@@ -58,6 +57,7 @@
GLOB.mkHS = false
GLOB.debugger = false
GLOB.dataFormat = false
+ GLOB.upStatus = false
GLOB.navBar = 'shutter' // 榛樿涓虹櫨鍙剁獥
GLOB.style = 'bg_black_style_blue'
@@ -95,6 +95,7 @@
GLOB.probation = true
GLOB.debugger = true
GLOB.systemType = ''
+ GLOB.upStatus = config.updateStatus + '' !== 'false'
// GLOB.mainSystemApi = 'https://cloud.positecgroup.com/webapi/dostars'
diff --git a/src/menu/components/table/edit-table/options.jsx b/src/menu/components/table/edit-table/options.jsx
index bd21bbb..bf3537a 100644
--- a/src/menu/components/table/edit-table/options.jsx
+++ b/src/menu/components/table/edit-table/options.jsx
@@ -58,7 +58,7 @@
field: 'commit',
label: '鏁版嵁鎻愪氦',
initval: wrap.commit || 'all',
- tooltip: '璁剧疆涓轰慨鏀归」鏃讹紝鍦ㄥけ鍘荤劍鐐逛笖涓嶅瓨鍦ㄥ繀濉」涓虹┖鏃惰Е鍙戞彁浜ゃ�傝缃负淇敼椤癸紙鍏級鏃讹紝鍦ㄧ偣鍑绘彁浜ゆ寜閽椂瑙﹀彂鎻愪氦銆�',
+ tooltip: '璁剧疆涓轰慨鏀归」鏃讹紝鍦ㄥけ鍘荤劍鐐逛笖涓嶅瓨鍦ㄥ繀濉」涓虹┖鏃惰Е鍙戞彁浜ゃ�傝缃负淇敼椤癸紙鍏級鏃讹紝鍦ㄧ偣鍑绘彁浜ゆ寜閽椂瑙﹀彂鎻愪氦銆傝缃负鍕鹃�夐」鏃讹紝鍙彁浜ら�変腑鐨勬暟鎹紝鏈�変腑鏁版嵁鏃朵笉鍙彁浜ゃ��',
required: false,
options: [
{value: 'all', label: '鍏ㄩ儴'},
diff --git a/src/tabviews/zshare/actionList/normalbutton/index.jsx b/src/tabviews/zshare/actionList/normalbutton/index.jsx
index 80b992e..fb4502b 100644
--- a/src/tabviews/zshare/actionList/normalbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/normalbutton/index.jsx
@@ -2899,6 +2899,13 @@
})
} else if (res.ErrCode === 'NM') {
message.error(res.message || '鎵ц澶辫触锛�')
+ } else if (res.ErrCode === '-2') {
+ this.setState({
+ loadingNumber: '',
+ loadingTotal: '',
+ loading: false
+ })
+ return
}
this.errorContinue(sign)
diff --git a/src/tabviews/zshare/actionList/printbutton/index.jsx b/src/tabviews/zshare/actionList/printbutton/index.jsx
index a6a037c..68bc347 100644
--- a/src/tabviews/zshare/actionList/printbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/printbutton/index.jsx
@@ -1968,6 +1968,8 @@
return
}
+ if (res.ErrCode === '-2') return
+
if (btnconfig && btnconfig.setting && btnconfig.setting.errFocus) {
MKEmitter.emit('mkFC', 'focus', btnconfig.setting.errFocus)
}
--
Gitblit v1.8.0