From eaf119a885719fdc172037510fd2f263ec3d5471 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 21 六月 2024 16:43:11 +0800
Subject: [PATCH] 2024-06-21
---
src/tabviews/zshare/mutilform/index.jsx | 4 ++--
src/tabviews/zshare/actionList/normalbutton/mkcounter/index.jsx | 14 +++++++-------
src/views/login/index.jsx | 4 ++--
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/tabviews/zshare/actionList/normalbutton/mkcounter/index.jsx b/src/tabviews/zshare/actionList/normalbutton/mkcounter/index.jsx
index 05fb8a7..f3e36e6 100644
--- a/src/tabviews/zshare/actionList/normalbutton/mkcounter/index.jsx
+++ b/src/tabviews/zshare/actionList/normalbutton/mkcounter/index.jsx
@@ -35,10 +35,10 @@
let val = count - 1
if (btn.min !== '' && val < btn.min) {
- message.warning(`涓嶅彲灏忎簬${btn.min}!`)
+ message.warning(`${window.GLOB.dict['less_limit'] || '涓嶅彲灏忎簬'}${btn.min}!`)
return
} else if (btn.max !== '' && val > btn.max) {
- message.warning(`涓嶅彲澶т簬${btn.max}!`)
+ message.warning(`${window.GLOB.dict['max_limit'] || '涓嶅彲澶т簬'}${btn.max}!`)
return
}
@@ -58,10 +58,10 @@
let val = count + 1
if (btn.min !== '' && val < btn.min) {
- message.warning(`涓嶅彲灏忎簬${btn.min}!`)
+ message.warning(`${window.GLOB.dict['less_limit'] || '涓嶅彲灏忎簬'}${btn.min}!`)
return
} else if (btn.max !== '' && val > btn.max) {
- message.warning(`涓嶅彲澶т簬${btn.max}!`)
+ message.warning(`${window.GLOB.dict['max_limit'] || '涓嶅彲澶т簬'}${btn.max}!`)
return
}
@@ -79,14 +79,14 @@
const { count, orival } = this.state
if (count === '') {
- message.warning(`涓嶅彲涓虹┖!`)
+ message.warning(window.GLOB.dict['not_empty'] || '涓嶅彲涓虹┖锛�')
this.setState({count: 0})
return
} else if (btn.min !== '' && count < btn.min) {
- message.warning(`涓嶅彲灏忎簬${btn.min}!`)
+ message.warning(`${window.GLOB.dict['less_limit'] || '涓嶅彲灏忎簬'}${btn.min}!`)
return
} else if (btn.max !== '' && count > btn.max) {
- message.warning(`涓嶅彲澶т簬${btn.max}!`)
+ message.warning(`${window.GLOB.dict['max_limit'] || '涓嶅彲澶т簬'}${btn.max}!`)
return
}
diff --git a/src/tabviews/zshare/mutilform/index.jsx b/src/tabviews/zshare/mutilform/index.jsx
index 3b6fcc1..fb189b9 100644
--- a/src/tabviews/zshare/mutilform/index.jsx
+++ b/src/tabviews/zshare/mutilform/index.jsx
@@ -402,7 +402,7 @@
} else if (item.notZero === 'true' && value === 0) {
callback(item.label + (dict['not_zero'] || '涓嶅彲涓�0'))
} else if (typeof(item.min) === 'number' && value < item.min) {
- if (item.min < 1e-6) {
+ if (item.min > 0 && item.min < 1e-6) {
if (item.min === 1e-6) {
callback(item.label + '鏈�灏忓�间负 0.000001')
} else if (item.min === 1e-7) {
@@ -416,7 +416,7 @@
} else if (item.min === 1e-11) {
callback(item.label + '鏈�灏忓�间负 0.00000000001')
} else {
- callback(item.label + '鏈�灏忓�间负 ' + item.min)
+ callback(item.label + (dict['less_limit'] || '鏈�灏忓�间负 ') + item.min)
}
} else {
callback(item.label + (dict['less_limit'] || '鏈�灏忓�间负 ') + item.min)
diff --git a/src/views/login/index.jsx b/src/views/login/index.jsx
index 3361a92..362d15f 100644
--- a/src/views/login/index.jsx
+++ b/src/views/login/index.jsx
@@ -654,10 +654,10 @@
if (res.lang_translation_js && res.lang_data && res.lang_data[0] && (res.lang_data.length > 1 || res.lang_data[0].Lang !== 'zh-CN')) {
let lang = sessionStorage.getItem('lang')
let js_trans = res.lang_translation_js.map(item => {
- if (['not_empty', 'not_zero', 'max_limit', 'less_limit']) {
+ if (['not_empty', 'not_zero', 'max_limit', 'less_limit'].includes(item.msn_code)) {
item.translation = ' ' + item.translation
}
- if (['input_tip', 'select_tip', 'max_limit', 'less_limit']) {
+ if (['input_tip', 'select_tip', 'max_limit', 'less_limit'].includes(item.msn_code)) {
item.translation = item.translation + ' '
}
if (lang === item.lang) {
--
Gitblit v1.8.0