diff --git a/README.md b/README.md
index 20335f8489aa2ee15c4d3fdc50d1da5e04546b91..a04d0e4d348c95ff6b675ae5d049652ae2e2e1e1 100644
--- a/README.md
+++ b/README.md
@@ -75,3 +75,8 @@ npm run build -adapter=[chrome|edge|utools|firefox|web]
| ARM/HEX | `互转` |×|
| Bcrypt | `加密`,`验证` |√|
| IP网络计算器 | `子网掩码各个进制表示换算,IP地址进制表示换算` |√|
+
+## 功能列表-yeahmao
+| 功能 | 说明 |离线使用|
+|--------------|-------------------------------------------------------------------------------------------------------------------------------|---|
+| 字节转码 | `16进制字节流`, `美化后`, `字符串格式`, `字节数组格式`,`` |√|
\ No newline at end of file
diff --git a/src/config.js b/src/config.js
index 495cb5d602587a7fac899d823eb628e3468169f1..864dcd2525eef60a26bcdece58cc9931c1aa062f 100644
--- a/src/config.js
+++ b/src/config.js
@@ -21,6 +21,7 @@ const category = [
{'name': 'check'},
{'name': 'generate'},
{'name': 'other'},
+ {'name': 'yeahmao'},
]
const tool = [
@@ -64,6 +65,9 @@ const tool = [
{'name': 'armConverter', 'cat': ['conversion']},
{'name': 'bcrypt', 'cat': ['encryption','check']},
{'name': 'ipcalc', 'cat': ['generate']},
+
+ // yeahmao
+ {'name': 'hexConvert', 'cat': ['yeahmao']},
]
// 工具类功能配置
diff --git a/src/i18n/locales/en/hexString.i18n.json5 b/src/i18n/locales/en/hexString.i18n.json5
index 693c48b9a4a515710229f15c37abdd1e832ff238..b456be9e2c446b200113899a55c8f013172e63c6 100644
--- a/src/i18n/locales/en/hexString.i18n.json5
+++ b/src/i18n/locales/en/hexString.i18n.json5
@@ -1,5 +1,5 @@
{
- "input": "Input",
+ "input": "assemble",
"output": "Output",
"uppercase": "Uppercase",
}
diff --git a/src/i18n/locales/en/main.i18n.json5 b/src/i18n/locales/en/main.i18n.json5
index ca07ec802f905860c8972f0826d559af328d19f4..ae68cf3ce93b4d969595c26709494dae636518ec 100644
--- a/src/i18n/locales/en/main.i18n.json5
+++ b/src/i18n/locales/en/main.i18n.json5
@@ -39,6 +39,7 @@
"category_check": "Validator",
"category_generate": "Generate",
"category_other": "Other",
+ "category_yeahmao": "yeahmao",
// tool
"tool_hash": "Hash",
"tool_encrypt": "Encrypt & Decrypt",
@@ -73,6 +74,7 @@
"tool_armConverter": "ARM/HEX",
"tool_bcrypt": "Bcrypt",
"tool_ipcalc": "Ipcalc",
+ "tool_hexConvert": "hexConvert",
// other
"css_main_category_item_style": "padding: 0 10px",
"editor_line_wrapping": "Line Wrapping",
diff --git a/src/i18n/locales/zh_CN/main.i18n.json5 b/src/i18n/locales/zh_CN/main.i18n.json5
index 8aa2293644ece15810c91f7f72af65b7c440546d..d66b5a4f8ca375cd86c24e72597ab53fdf00047e 100644
--- a/src/i18n/locales/zh_CN/main.i18n.json5
+++ b/src/i18n/locales/zh_CN/main.i18n.json5
@@ -39,6 +39,7 @@
"category_check": "校验",
"category_generate": "生成",
"category_other": "其他",
+ "category_yeahmao": "夜猫逐梦",
// 工具
"tool_hash": "哈希(hash)",
"tool_encrypt": "加密/解密",
@@ -73,6 +74,7 @@
"tool_armConverter": "ARM/HEX",
"tool_bcrypt": "Bcrypt",
"tool_ipcalc": "IP网络计算器",
+ "tool_hexConvert": "字节转换",
// 其他
"css_main_category_item_style": "padding: 0 20px",
"editor_line_wrapping": "自动换行",
diff --git a/src/tool.router.js b/src/tool.router.js
index e6e05fc4b385d37bdb54a2d0c34da70826517abb..5d02f996bce3949a10f59dc53187fa8974e3f57a 100644
--- a/src/tool.router.js
+++ b/src/tool.router.js
@@ -161,6 +161,10 @@ const routes = [
{
path: '/tool/ipcalc',
component: r => require(['./views/tool/ipcalc.vue'], r)
+ },
+ {
+ path: '/yeahmao/hexConvert',
+ component: r => require(['./views/yeahmao/hexConvert.vue'], r)
}
]
diff --git a/src/tool.vue b/src/tool.vue
index bd2a94cfc944b4a9f740f64a9e3970550928622e..c7c928a07651a6fd4d0ddf4aa1ded1f96fe28316 100644
--- a/src/tool.vue
+++ b/src/tool.vue
@@ -57,7 +57,11 @@ export default {
watch: {
currentTool(name) {
model.setCurrentTool(name)
- this.$router.push('/tool/' + name)
+ if (name == 'hexConvert') {
+ this.$router.push('/yeahmao/' + name)
+ } else {
+ this.$router.push('/tool/' + name)
+ }
},
},
created() {
diff --git a/src/views/yeahmao/hexConvert.vue b/src/views/yeahmao/hexConvert.vue
new file mode 100644
index 0000000000000000000000000000000000000000..690552b8282788d1d805163a9823a40e03d55fc8
--- /dev/null
+++ b/src/views/yeahmao/hexConvert.vue
@@ -0,0 +1,106 @@
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t('hexString_uppercase') }}
+
+
+ 美化的内容 :
+
+ 字符串格式 :
+
+ 字节数组格式:
+
+
+
+
+
+
\ No newline at end of file