From f48261add4593c693d2ebb911587e5698addeccc Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 30 十一月 2022 21:40:43 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/mob/components/sharecode/options.jsx | 1 -
src/tabviews/zshare/actionList/normalbutton/index.jsx | 8 ++++----
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/mob/components/sharecode/options.jsx b/src/mob/components/sharecode/options.jsx
index 4efeeed..560efa3 100644
--- a/src/mob/components/sharecode/options.jsx
+++ b/src/mob/components/sharecode/options.jsx
@@ -48,7 +48,6 @@
field: 'color',
label: '棰滆壊',
initval: wrap.color || '#000000',
- tooltip: '灏忕▼搴忎腑鏃犳晥銆�',
isHex: true,
required: true
},
diff --git a/src/tabviews/zshare/actionList/normalbutton/index.jsx b/src/tabviews/zshare/actionList/normalbutton/index.jsx
index c0f8e7d..489b48e 100644
--- a/src/tabviews/zshare/actionList/normalbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/normalbutton/index.jsx
@@ -1021,7 +1021,7 @@
}
if (params[0].$unCheckParam) {
- this.checkLoopRequest(params, btn, _resolve)
+ this.checkLoopRequest(params, _resolve)
} else if (params.length <= 20) {
let deffers = params.map((param, i) => {
return new Promise(resolve => {
@@ -1569,7 +1569,7 @@
/**
* @description 鏁版嵁妫�楠屽惊鐜墽琛�
*/
- checkLoopRequest = (params, btn, _resolve) => {
+ checkLoopRequest = (params, _resolve) => {
let param = params.shift()
let unCheckParam = param.$unCheckParam
@@ -1587,7 +1587,7 @@
this.execSuccess(res)
_resolve()
} else {
- this.checkLoopRequest(params, btn, _resolve)
+ this.checkLoopRequest(params, _resolve)
}
} else if (res.ErrCode === 'C') {
const _this = this
@@ -1604,7 +1604,7 @@
_this.execSuccess(result)
_resolve()
} else {
- _this.checkLoopRequest(params, btn, _resolve)
+ _this.checkLoopRequest(params, _resolve)
}
} else {
_this.execError(result)
--
Gitblit v1.8.0