From 3e7c759622be08a792d8d1f78470e2b9a87386c4 Mon Sep 17 00:00:00 2001
From: hxt1218 <3070904872@qq.com>
Date: Thu, 10 Oct 2024 19:34:10 +0800
Subject: [PATCH] jzzh

---
 修改/jzzh.html | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)
diff --git a/修改/jzzh.html b/修改/jzzh.html
index 8f77fdb..ff238ec 100644
--- a/修改/jzzh.html
+++ b/修改/jzzh.html
@@ -17,6 +17,9 @@
             display: block;
             margin-bottom: 10px;
         }
+        #result {
+            font-weight: bold;
+        }
     </style>
 </head>
 <body>
@@ -25,7 +28,7 @@
     <input type="number" id="fromBase" min="2" max="16" required>
 
     <label for="number">输入数字:</label>
-    <input type="text" id="number" required>
+    <input type="text" id="number" placeholder="例如：1010" required>
 
     <label for="toBase">转换为进制 (2-16):</label>
     <input type="number" id="toBase" min="2" max="16" required>
@@ -36,20 +39,29 @@
     <div id="result"></div>
 
     <script>
-        document.getElementById('convertButton').addEventListener('click', function() {
+        document.getElementById('convertButton').addEventListener('click', () => {
             const fromBase = parseInt(document.getElementById('fromBase').value);
-            const number = document.getElementById('number').value;
+            const number = document.getElementById('number').value.trim();
             const toBase = parseInt(document.getElementById('toBase').value);
 
-            // 先将输入的任意进制数转换为十进制
-            const decimalValue = parseInt(number, fromBase);
+            // 验证输入的数字是否合法
+            if (!/^[0-9A-Fa-f]+$/.test(number) || !isValidForBase(number, fromBase)) {
+                document.getElementById('result').textContent = '输入的数字不符合指定的进制规则！';
+                return;
+            }
 
-            // 将十进制数转换为目标进制
+            // 转换为十进制
+            const decimalValue = parseInt(number, fromBase);
             const convertedValue = decimalValue.toString(toBase).toUpperCase();
 
             // 显示结果
             document.getElementById('result').textContent = convertedValue;
         });
+
+        function isValidForBase(numStr, base) {
+            const validChars = '0123456789ABCDEF'.slice(0, base);
+            return [...numStr].every(char => validChars.includes(char.toUpperCase()));
+        }
     </script>
 </body>
-</html>
\ No newline at end of file
+</html>
