diff --git a/node/checkRepeat.cjs b/node/checkRepeat.cjs index 7c56cb8b..5e380f2f 100644 --- a/node/checkRepeat.cjs +++ b/node/checkRepeat.cjs @@ -1,19 +1,19 @@ let path = require("path"); let fs = require("fs"); -const str = fs.readFileSync("../public/dicts/en/zh-CN/translate/translate.json", "utf8"); +const str = fs.readFileSync("../public/dicts/en/common/translate/en2zh_CN.json", "utf8"); let translateDict = JSON.parse(str); let ts = [] console.log(translateDict.length) -let pathName = "../public/dicts/en/zh-CN"; +let pathName = "../public/dicts/en/common"; // let pathName = "./d"; //判断是不是目录 const dirs = fs.readdirSync(pathName) dirs.forEach(dictName => { - if (!dictName.includes('translate.json') || !dictName.includes('ts.json')) { + if (!dictName.includes('en2zh_CN.json') || !dictName.includes('ts.json')) { let dictPath = path.join(pathName, dictName) // console.log('d', dictPath) formatDict(dictPath) @@ -21,7 +21,7 @@ dirs.forEach(dictName => { }) fs.writeFileSync( - "../public/dicts/en/zh-CN/translate/ts.json", + "../public/dicts/en/common/translate/ts.json", JSON.stringify(ts, null, 2) ); console.log(ts.length) diff --git a/node/formatDictSimple.cjs b/node/formatDictSimple.cjs index b72027a2..fcba6815 100644 --- a/node/formatDictSimple.cjs +++ b/node/formatDictSimple.cjs @@ -1,16 +1,16 @@ let path = require("path"); let fs = require("fs"); -const str = fs.readFileSync("../public/dicts/en/zh-CN/translate/translate.json", "utf8"); +const str = fs.readFileSync("../public/dicts/en/common/translate/en2zh_CN.json", "utf8"); let translateDict = JSON.parse(str); -let pathName = "../public/dicts/en/zh-CN"; +let pathName = "../public/dicts/en/common"; // let pathName = "./d"; const dirs = fs.readdirSync(pathName) dirs.forEach(dictName => { - if (!dictName.includes('translate.json') || !dictName.includes('ts.json')) { + if (!dictName.includes('en2zh_CN.json') || !dictName.includes('ts.json')) { let dictPath = path.join(pathName, dictName) // console.log('d', dictPath) formatDict(dictPath) diff --git a/public/dicts/en/article/NCE_2-test.json b/public/dicts/en/article/common/NCE_2-test.json similarity index 100% rename from public/dicts/en/article/NCE_2-test.json rename to public/dicts/en/article/common/NCE_2-test.json diff --git a/public/dicts/en/article/NCE_2.json b/public/dicts/en/article/common/NCE_2.json similarity index 100% rename from public/dicts/en/article/NCE_2.json rename to public/dicts/en/article/common/NCE_2.json diff --git a/public/dicts/en/word/zh-CN/2024HongBao_T1.json b/public/dicts/en/word/common/2024HongBao_T1.json similarity index 100% rename from public/dicts/en/word/zh-CN/2024HongBao_T1.json rename to public/dicts/en/word/common/2024HongBao_T1.json diff --git a/public/dicts/en/word/zh-CN/2024HongBao_T2.json b/public/dicts/en/word/common/2024HongBao_T2.json similarity index 100% rename from public/dicts/en/word/zh-CN/2024HongBao_T2.json rename to public/dicts/en/word/common/2024HongBao_T2.json diff --git a/public/dicts/en/word/zh-CN/BEC_2_T.json b/public/dicts/en/word/common/BEC_2_T.json similarity index 100% rename from public/dicts/en/word/zh-CN/BEC_2_T.json rename to public/dicts/en/word/common/BEC_2_T.json diff --git a/public/dicts/en/word/zh-CN/BEC_3_T.json b/public/dicts/en/word/common/BEC_3_T.json similarity index 100% rename from public/dicts/en/word/zh-CN/BEC_3_T.json rename to public/dicts/en/word/common/BEC_3_T.json diff --git a/public/dicts/en/word/zh-CN/BeiShiGaoZhong_10_T.json b/public/dicts/en/word/common/BeiShiGaoZhong_10_T.json similarity index 100% rename from public/dicts/en/word/zh-CN/BeiShiGaoZhong_10_T.json rename to public/dicts/en/word/common/BeiShiGaoZhong_10_T.json diff --git a/public/dicts/en/word/zh-CN/BeiShiGaoZhong_11_T.json b/public/dicts/en/word/common/BeiShiGaoZhong_11_T.json similarity index 100% rename from public/dicts/en/word/zh-CN/BeiShiGaoZhong_11_T.json rename to public/dicts/en/word/common/BeiShiGaoZhong_11_T.json diff --git a/public/dicts/en/word/zh-CN/BeiShiGaoZhong_1_T.json b/public/dicts/en/word/common/BeiShiGaoZhong_1_T.json similarity index 100% rename from public/dicts/en/word/zh-CN/BeiShiGaoZhong_1_T.json rename to public/dicts/en/word/common/BeiShiGaoZhong_1_T.json diff --git a/public/dicts/en/word/zh-CN/BeiShiGaoZhong_2_T.json b/public/dicts/en/word/common/BeiShiGaoZhong_2_T.json similarity index 100% rename from public/dicts/en/word/zh-CN/BeiShiGaoZhong_2_T.json rename to public/dicts/en/word/common/BeiShiGaoZhong_2_T.json diff --git a/public/dicts/en/word/zh-CN/BeiShiGaoZhong_3_T.json b/public/dicts/en/word/common/BeiShiGaoZhong_3_T.json similarity index 100% rename from public/dicts/en/word/zh-CN/BeiShiGaoZhong_3_T.json rename to public/dicts/en/word/common/BeiShiGaoZhong_3_T.json diff --git a/public/dicts/en/word/zh-CN/BeiShiGaoZhong_4_T.json b/public/dicts/en/word/common/BeiShiGaoZhong_4_T.json similarity index 100% rename from public/dicts/en/word/zh-CN/BeiShiGaoZhong_4_T.json rename to public/dicts/en/word/common/BeiShiGaoZhong_4_T.json diff --git a/public/dicts/en/word/zh-CN/BeiShiGaoZhong_5_T.json b/public/dicts/en/word/common/BeiShiGaoZhong_5_T.json similarity index 100% rename from public/dicts/en/word/zh-CN/BeiShiGaoZhong_5_T.json rename to public/dicts/en/word/common/BeiShiGaoZhong_5_T.json diff --git a/public/dicts/en/word/zh-CN/BeiShiGaoZhong_6_T.json b/public/dicts/en/word/common/BeiShiGaoZhong_6_T.json similarity index 100% rename from public/dicts/en/word/zh-CN/BeiShiGaoZhong_6_T.json rename to public/dicts/en/word/common/BeiShiGaoZhong_6_T.json diff --git a/public/dicts/en/word/zh-CN/BeiShiGaoZhong_7_T.json b/public/dicts/en/word/common/BeiShiGaoZhong_7_T.json similarity index 100% rename from public/dicts/en/word/zh-CN/BeiShiGaoZhong_7_T.json rename to public/dicts/en/word/common/BeiShiGaoZhong_7_T.json diff --git a/public/dicts/en/word/zh-CN/BeiShiGaoZhong_8_T.json b/public/dicts/en/word/common/BeiShiGaoZhong_8_T.json similarity index 100% rename from public/dicts/en/word/zh-CN/BeiShiGaoZhong_8_T.json rename to public/dicts/en/word/common/BeiShiGaoZhong_8_T.json diff --git a/public/dicts/en/word/zh-CN/BeiShiGaoZhong_9_T.json b/public/dicts/en/word/common/BeiShiGaoZhong_9_T.json similarity index 100% rename from public/dicts/en/word/zh-CN/BeiShiGaoZhong_9_T.json rename to public/dicts/en/word/common/BeiShiGaoZhong_9_T.json diff --git a/public/dicts/en/word/zh-CN/CET4_T.json b/public/dicts/en/word/common/CET4_T.json similarity index 100% rename from public/dicts/en/word/zh-CN/CET4_T.json rename to public/dicts/en/word/common/CET4_T.json diff --git a/public/dicts/en/word/zh-CN/CET6_T.json b/public/dicts/en/word/common/CET6_T.json similarity index 100% rename from public/dicts/en/word/zh-CN/CET6_T.json rename to public/dicts/en/word/common/CET6_T.json diff --git a/public/dicts/en/word/zh-CN/DanCiDeJianFa_4.json b/public/dicts/en/word/common/DanCiDeJianFa_4.json similarity index 100% rename from public/dicts/en/word/zh-CN/DanCiDeJianFa_4.json rename to public/dicts/en/word/common/DanCiDeJianFa_4.json diff --git a/public/dicts/en/word/zh-CN/DanCiDeJianFa_6.json b/public/dicts/en/word/common/DanCiDeJianFa_6.json similarity index 100% rename from public/dicts/en/word/zh-CN/DanCiDeJianFa_6.json rename to public/dicts/en/word/common/DanCiDeJianFa_6.json diff --git a/public/dicts/en/word/zh-CN/DanCiDeMimi_1.json b/public/dicts/en/word/common/DanCiDeMimi_1.json similarity index 100% rename from public/dicts/en/word/zh-CN/DanCiDeMimi_1.json rename to public/dicts/en/word/common/DanCiDeMimi_1.json diff --git a/public/dicts/en/word/zh-CN/DanCiDeMimi_2.json b/public/dicts/en/word/common/DanCiDeMimi_2.json similarity index 100% rename from public/dicts/en/word/zh-CN/DanCiDeMimi_2.json rename to public/dicts/en/word/common/DanCiDeMimi_2.json diff --git a/public/dicts/en/word/zh-CN/DuckCircle_IELTS.json b/public/dicts/en/word/common/DuckCircle_IELTS.json similarity index 100% rename from public/dicts/en/word/zh-CN/DuckCircle_IELTS.json rename to public/dicts/en/word/common/DuckCircle_IELTS.json diff --git a/public/dicts/en/word/zh-CN/EF_LEVEL_1.json b/public/dicts/en/word/common/EF_LEVEL_1.json similarity index 100% rename from public/dicts/en/word/zh-CN/EF_LEVEL_1.json rename to public/dicts/en/word/common/EF_LEVEL_1.json diff --git a/public/dicts/en/word/zh-CN/EF_LEVEL_10.json b/public/dicts/en/word/common/EF_LEVEL_10.json similarity index 100% rename from public/dicts/en/word/zh-CN/EF_LEVEL_10.json rename to public/dicts/en/word/common/EF_LEVEL_10.json diff --git a/public/dicts/en/word/zh-CN/EF_LEVEL_11.json b/public/dicts/en/word/common/EF_LEVEL_11.json similarity index 100% rename from public/dicts/en/word/zh-CN/EF_LEVEL_11.json rename to public/dicts/en/word/common/EF_LEVEL_11.json diff --git a/public/dicts/en/word/zh-CN/EF_LEVEL_12.json b/public/dicts/en/word/common/EF_LEVEL_12.json similarity index 100% rename from public/dicts/en/word/zh-CN/EF_LEVEL_12.json rename to public/dicts/en/word/common/EF_LEVEL_12.json diff --git a/public/dicts/en/word/zh-CN/EF_LEVEL_13.json b/public/dicts/en/word/common/EF_LEVEL_13.json similarity index 100% rename from public/dicts/en/word/zh-CN/EF_LEVEL_13.json rename to public/dicts/en/word/common/EF_LEVEL_13.json diff --git a/public/dicts/en/word/zh-CN/EF_LEVEL_14.json b/public/dicts/en/word/common/EF_LEVEL_14.json similarity index 100% rename from public/dicts/en/word/zh-CN/EF_LEVEL_14.json rename to public/dicts/en/word/common/EF_LEVEL_14.json diff --git a/public/dicts/en/word/zh-CN/EF_LEVEL_15.json b/public/dicts/en/word/common/EF_LEVEL_15.json similarity index 100% rename from public/dicts/en/word/zh-CN/EF_LEVEL_15.json rename to public/dicts/en/word/common/EF_LEVEL_15.json diff --git a/public/dicts/en/word/zh-CN/EF_LEVEL_16.json b/public/dicts/en/word/common/EF_LEVEL_16.json similarity index 100% rename from public/dicts/en/word/zh-CN/EF_LEVEL_16.json rename to public/dicts/en/word/common/EF_LEVEL_16.json diff --git a/public/dicts/en/word/zh-CN/EF_LEVEL_2.json b/public/dicts/en/word/common/EF_LEVEL_2.json similarity index 100% rename from public/dicts/en/word/zh-CN/EF_LEVEL_2.json rename to public/dicts/en/word/common/EF_LEVEL_2.json diff --git a/public/dicts/en/word/zh-CN/EF_LEVEL_3.json b/public/dicts/en/word/common/EF_LEVEL_3.json similarity index 100% rename from public/dicts/en/word/zh-CN/EF_LEVEL_3.json rename to public/dicts/en/word/common/EF_LEVEL_3.json diff --git a/public/dicts/en/word/zh-CN/EF_LEVEL_4.json b/public/dicts/en/word/common/EF_LEVEL_4.json similarity index 100% rename from public/dicts/en/word/zh-CN/EF_LEVEL_4.json rename to public/dicts/en/word/common/EF_LEVEL_4.json diff --git a/public/dicts/en/word/zh-CN/EF_LEVEL_5.json b/public/dicts/en/word/common/EF_LEVEL_5.json similarity index 100% rename from public/dicts/en/word/zh-CN/EF_LEVEL_5.json rename to public/dicts/en/word/common/EF_LEVEL_5.json diff --git a/public/dicts/en/word/zh-CN/EF_LEVEL_6.json b/public/dicts/en/word/common/EF_LEVEL_6.json similarity index 100% rename from public/dicts/en/word/zh-CN/EF_LEVEL_6.json rename to public/dicts/en/word/common/EF_LEVEL_6.json diff --git a/public/dicts/en/word/zh-CN/EF_LEVEL_7.json b/public/dicts/en/word/common/EF_LEVEL_7.json similarity index 100% rename from public/dicts/en/word/zh-CN/EF_LEVEL_7.json rename to public/dicts/en/word/common/EF_LEVEL_7.json diff --git a/public/dicts/en/word/zh-CN/EF_LEVEL_8.json b/public/dicts/en/word/common/EF_LEVEL_8.json similarity index 100% rename from public/dicts/en/word/zh-CN/EF_LEVEL_8.json rename to public/dicts/en/word/common/EF_LEVEL_8.json diff --git a/public/dicts/en/word/zh-CN/EF_LEVEL_9.json b/public/dicts/en/word/common/EF_LEVEL_9.json similarity index 100% rename from public/dicts/en/word/zh-CN/EF_LEVEL_9.json rename to public/dicts/en/word/common/EF_LEVEL_9.json diff --git a/public/dicts/en/word/zh-CN/English_II.json b/public/dicts/en/word/common/English_II.json similarity index 100% rename from public/dicts/en/word/zh-CN/English_II.json rename to public/dicts/en/word/common/English_II.json diff --git a/public/dicts/en/word/zh-CN/GMAT_3_T.json b/public/dicts/en/word/common/GMAT_3_T.json similarity index 100% rename from public/dicts/en/word/zh-CN/GMAT_3_T.json rename to public/dicts/en/word/common/GMAT_3_T.json diff --git a/public/dicts/en/word/zh-CN/GRE3000_3_T.json b/public/dicts/en/word/common/GRE3000_3_T.json similarity index 100% rename from public/dicts/en/word/zh-CN/GRE3000_3_T.json rename to public/dicts/en/word/common/GRE3000_3_T.json diff --git a/public/dicts/en/word/zh-CN/GRE_3_T.json b/public/dicts/en/word/common/GRE_3_T.json similarity index 100% rename from public/dicts/en/word/zh-CN/GRE_3_T.json rename to public/dicts/en/word/common/GRE_3_T.json diff --git a/public/dicts/en/word/zh-CN/GaoKaoZhenTiHeXinGaoPin.json b/public/dicts/en/word/common/GaoKaoZhenTiHeXinGaoPin.json similarity index 100% rename from public/dicts/en/word/zh-CN/GaoKaoZhenTiHeXinGaoPin.json rename to public/dicts/en/word/common/GaoKaoZhenTiHeXinGaoPin.json diff --git a/public/dicts/en/word/zh-CN/GaoKao_3500.json b/public/dicts/en/word/common/GaoKao_3500.json similarity index 100% rename from public/dicts/en/word/zh-CN/GaoKao_3500.json rename to public/dicts/en/word/common/GaoKao_3500.json diff --git a/public/dicts/en/word/zh-CN/IELTSVocabularyBible.json b/public/dicts/en/word/common/IELTSVocabularyBible.json similarity index 100% rename from public/dicts/en/word/zh-CN/IELTSVocabularyBible.json rename to public/dicts/en/word/common/IELTSVocabularyBible.json diff --git a/public/dicts/en/word/zh-CN/IELTS_3_T.json b/public/dicts/en/word/common/IELTS_3_T.json similarity index 100% rename from public/dicts/en/word/zh-CN/IELTS_3_T.json rename to public/dicts/en/word/common/IELTS_3_T.json diff --git a/public/dicts/en/word/zh-CN/IELTS_WANG_11.json b/public/dicts/en/word/common/IELTS_WANG_11.json similarity index 100% rename from public/dicts/en/word/zh-CN/IELTS_WANG_11.json rename to public/dicts/en/word/common/IELTS_WANG_11.json diff --git a/public/dicts/en/word/zh-CN/IELTS_WANG_3.json b/public/dicts/en/word/common/IELTS_WANG_3.json similarity index 100% rename from public/dicts/en/word/zh-CN/IELTS_WANG_3.json rename to public/dicts/en/word/common/IELTS_WANG_3.json diff --git a/public/dicts/en/word/zh-CN/IELTS_WANG_4.json b/public/dicts/en/word/common/IELTS_WANG_4.json similarity index 100% rename from public/dicts/en/word/zh-CN/IELTS_WANG_4.json rename to public/dicts/en/word/common/IELTS_WANG_4.json diff --git a/public/dicts/en/word/zh-CN/IELTS_WANG_5.json b/public/dicts/en/word/common/IELTS_WANG_5.json similarity index 100% rename from public/dicts/en/word/zh-CN/IELTS_WANG_5.json rename to public/dicts/en/word/common/IELTS_WANG_5.json diff --git a/public/dicts/en/word/zh-CN/IELTS_disorder.json b/public/dicts/en/word/common/IELTS_disorder.json similarity index 100% rename from public/dicts/en/word/zh-CN/IELTS_disorder.json rename to public/dicts/en/word/common/IELTS_disorder.json diff --git a/public/dicts/en/word/zh-CN/IELTS_order.json b/public/dicts/en/word/common/IELTS_order.json similarity index 100% rename from public/dicts/en/word/zh-CN/IELTS_order.json rename to public/dicts/en/word/common/IELTS_order.json diff --git a/public/dicts/en/word/zh-CN/IELTS_tinglichangjing.json b/public/dicts/en/word/common/IELTS_tinglichangjing.json similarity index 100% rename from public/dicts/en/word/zh-CN/IELTS_tinglichangjing.json rename to public/dicts/en/word/common/IELTS_tinglichangjing.json diff --git a/public/dicts/en/word/zh-CN/KaoYanShanGuo_2023.json b/public/dicts/en/word/common/KaoYanShanGuo_2023.json similarity index 100% rename from public/dicts/en/word/zh-CN/KaoYanShanGuo_2023.json rename to public/dicts/en/word/common/KaoYanShanGuo_2023.json diff --git a/public/dicts/en/word/zh-CN/KaoYan_2024.json b/public/dicts/en/word/common/KaoYan_2024.json similarity index 100% rename from public/dicts/en/word/zh-CN/KaoYan_2024.json rename to public/dicts/en/word/common/KaoYan_2024.json diff --git a/public/dicts/en/word/zh-CN/KaoYan_3_T.json b/public/dicts/en/word/common/KaoYan_3_T.json similarity index 100% rename from public/dicts/en/word/zh-CN/KaoYan_3_T.json rename to public/dicts/en/word/common/KaoYan_3_T.json diff --git a/public/dicts/en/word/zh-CN/Level4luan_2_T.json b/public/dicts/en/word/common/Level4luan_2_T.json similarity index 100% rename from public/dicts/en/word/zh-CN/Level4luan_2_T.json rename to public/dicts/en/word/common/Level4luan_2_T.json diff --git a/public/dicts/en/word/zh-CN/Level8luan_2_T.json b/public/dicts/en/word/common/Level8luan_2_T.json similarity index 100% rename from public/dicts/en/word/zh-CN/Level8luan_2_T.json rename to public/dicts/en/word/common/Level8luan_2_T.json diff --git a/public/dicts/en/word/zh-CN/Longman_Communication_3000.json b/public/dicts/en/word/common/Longman_Communication_3000.json similarity index 100% rename from public/dicts/en/word/zh-CN/Longman_Communication_3000.json rename to public/dicts/en/word/common/Longman_Communication_3000.json diff --git a/public/dicts/en/word/zh-CN/Macmillan7000.json b/public/dicts/en/word/common/Macmillan7000.json similarity index 100% rename from public/dicts/en/word/zh-CN/Macmillan7000.json rename to public/dicts/en/word/common/Macmillan7000.json diff --git a/public/dicts/en/word/zh-CN/Merriam_Webster_sVocabularyBuilder.json b/public/dicts/en/word/common/Merriam_Webster_sVocabularyBuilder.json similarity index 100% rename from public/dicts/en/word/zh-CN/Merriam_Webster_sVocabularyBuilder.json rename to public/dicts/en/word/common/Merriam_Webster_sVocabularyBuilder.json diff --git a/public/dicts/en/word/zh-CN/Oxford3000.json b/public/dicts/en/word/common/Oxford3000.json similarity index 100% rename from public/dicts/en/word/zh-CN/Oxford3000.json rename to public/dicts/en/word/common/Oxford3000.json diff --git a/public/dicts/en/word/zh-CN/Oxford5000.json b/public/dicts/en/word/common/Oxford5000.json similarity index 100% rename from public/dicts/en/word/zh-CN/Oxford5000.json rename to public/dicts/en/word/common/Oxford5000.json diff --git a/public/dicts/en/word/zh-CN/OxfordVocabulary_juniorMiddleSH.json b/public/dicts/en/word/common/OxfordVocabulary_juniorMiddleSH.json similarity index 100% rename from public/dicts/en/word/zh-CN/OxfordVocabulary_juniorMiddleSH.json rename to public/dicts/en/word/common/OxfordVocabulary_juniorMiddleSH.json diff --git a/public/dicts/en/word/zh-CN/PEPChuZhong7_1_T.json b/public/dicts/en/word/common/PEPChuZhong7_1_T.json similarity index 100% rename from public/dicts/en/word/zh-CN/PEPChuZhong7_1_T.json rename to public/dicts/en/word/common/PEPChuZhong7_1_T.json diff --git a/public/dicts/en/word/zh-CN/PEPChuZhong7_2_T.json b/public/dicts/en/word/common/PEPChuZhong7_2_T.json similarity index 100% rename from public/dicts/en/word/zh-CN/PEPChuZhong7_2_T.json rename to public/dicts/en/word/common/PEPChuZhong7_2_T.json diff --git a/public/dicts/en/word/zh-CN/PEPChuZhong8_1_T.json b/public/dicts/en/word/common/PEPChuZhong8_1_T.json similarity index 100% rename from public/dicts/en/word/zh-CN/PEPChuZhong8_1_T.json rename to public/dicts/en/word/common/PEPChuZhong8_1_T.json diff --git a/public/dicts/en/word/zh-CN/PEPChuZhong8_2_T.json b/public/dicts/en/word/common/PEPChuZhong8_2_T.json similarity index 100% rename from public/dicts/en/word/zh-CN/PEPChuZhong8_2_T.json rename to public/dicts/en/word/common/PEPChuZhong8_2_T.json diff --git a/public/dicts/en/word/zh-CN/PEPChuZhong9_1_T.json b/public/dicts/en/word/common/PEPChuZhong9_1_T.json similarity index 100% rename from public/dicts/en/word/zh-CN/PEPChuZhong9_1_T.json rename to public/dicts/en/word/common/PEPChuZhong9_1_T.json diff --git a/public/dicts/en/word/zh-CN/PEPGaoZhong_10_T.json b/public/dicts/en/word/common/PEPGaoZhong_10_T.json similarity index 100% rename from public/dicts/en/word/zh-CN/PEPGaoZhong_10_T.json rename to public/dicts/en/word/common/PEPGaoZhong_10_T.json diff --git a/public/dicts/en/word/zh-CN/PEPGaoZhong_11_T.json b/public/dicts/en/word/common/PEPGaoZhong_11_T.json similarity index 100% rename from public/dicts/en/word/zh-CN/PEPGaoZhong_11_T.json rename to public/dicts/en/word/common/PEPGaoZhong_11_T.json diff --git a/public/dicts/en/word/zh-CN/PEPGaoZhong_1_T.json b/public/dicts/en/word/common/PEPGaoZhong_1_T.json similarity index 100% rename from public/dicts/en/word/zh-CN/PEPGaoZhong_1_T.json rename to public/dicts/en/word/common/PEPGaoZhong_1_T.json diff --git a/public/dicts/en/word/zh-CN/PEPGaoZhong_2_T.json b/public/dicts/en/word/common/PEPGaoZhong_2_T.json similarity index 100% rename from public/dicts/en/word/zh-CN/PEPGaoZhong_2_T.json rename to public/dicts/en/word/common/PEPGaoZhong_2_T.json diff --git a/public/dicts/en/word/zh-CN/PEPGaoZhong_3_T.json b/public/dicts/en/word/common/PEPGaoZhong_3_T.json similarity index 100% rename from public/dicts/en/word/zh-CN/PEPGaoZhong_3_T.json rename to public/dicts/en/word/common/PEPGaoZhong_3_T.json diff --git a/public/dicts/en/word/zh-CN/PEPGaoZhong_4_T.json b/public/dicts/en/word/common/PEPGaoZhong_4_T.json similarity index 100% rename from public/dicts/en/word/zh-CN/PEPGaoZhong_4_T.json rename to public/dicts/en/word/common/PEPGaoZhong_4_T.json diff --git a/public/dicts/en/word/zh-CN/PEPGaoZhong_5_T.json b/public/dicts/en/word/common/PEPGaoZhong_5_T.json similarity index 100% rename from public/dicts/en/word/zh-CN/PEPGaoZhong_5_T.json rename to public/dicts/en/word/common/PEPGaoZhong_5_T.json diff --git a/public/dicts/en/word/zh-CN/PEPGaoZhong_6_T.json b/public/dicts/en/word/common/PEPGaoZhong_6_T.json similarity index 100% rename from public/dicts/en/word/zh-CN/PEPGaoZhong_6_T.json rename to public/dicts/en/word/common/PEPGaoZhong_6_T.json diff --git a/public/dicts/en/word/zh-CN/PEPGaoZhong_7_T.json b/public/dicts/en/word/common/PEPGaoZhong_7_T.json similarity index 100% rename from public/dicts/en/word/zh-CN/PEPGaoZhong_7_T.json rename to public/dicts/en/word/common/PEPGaoZhong_7_T.json diff --git a/public/dicts/en/word/zh-CN/PEPGaoZhong_8_T.json b/public/dicts/en/word/common/PEPGaoZhong_8_T.json similarity index 100% rename from public/dicts/en/word/zh-CN/PEPGaoZhong_8_T.json rename to public/dicts/en/word/common/PEPGaoZhong_8_T.json diff --git a/public/dicts/en/word/zh-CN/PEPGaoZhong_9_T.json b/public/dicts/en/word/common/PEPGaoZhong_9_T.json similarity index 100% rename from public/dicts/en/word/zh-CN/PEPGaoZhong_9_T.json rename to public/dicts/en/word/common/PEPGaoZhong_9_T.json diff --git a/public/dicts/en/word/zh-CN/PEPXiaoXue3_1_T.json b/public/dicts/en/word/common/PEPXiaoXue3_1_T.json similarity index 100% rename from public/dicts/en/word/zh-CN/PEPXiaoXue3_1_T.json rename to public/dicts/en/word/common/PEPXiaoXue3_1_T.json diff --git a/public/dicts/en/word/zh-CN/PEPXiaoXue3_2_T.json b/public/dicts/en/word/common/PEPXiaoXue3_2_T.json similarity index 100% rename from public/dicts/en/word/zh-CN/PEPXiaoXue3_2_T.json rename to public/dicts/en/word/common/PEPXiaoXue3_2_T.json diff --git a/public/dicts/en/word/zh-CN/PEPXiaoXue4_1_T.json b/public/dicts/en/word/common/PEPXiaoXue4_1_T.json similarity index 100% rename from public/dicts/en/word/zh-CN/PEPXiaoXue4_1_T.json rename to public/dicts/en/word/common/PEPXiaoXue4_1_T.json diff --git a/public/dicts/en/word/zh-CN/PEPXiaoXue4_2_T.json b/public/dicts/en/word/common/PEPXiaoXue4_2_T.json similarity index 100% rename from public/dicts/en/word/zh-CN/PEPXiaoXue4_2_T.json rename to public/dicts/en/word/common/PEPXiaoXue4_2_T.json diff --git a/public/dicts/en/word/zh-CN/PEPXiaoXue5_1_T.json b/public/dicts/en/word/common/PEPXiaoXue5_1_T.json similarity index 100% rename from public/dicts/en/word/zh-CN/PEPXiaoXue5_1_T.json rename to public/dicts/en/word/common/PEPXiaoXue5_1_T.json diff --git a/public/dicts/en/word/zh-CN/PEPXiaoXue5_2_T.json b/public/dicts/en/word/common/PEPXiaoXue5_2_T.json similarity index 100% rename from public/dicts/en/word/zh-CN/PEPXiaoXue5_2_T.json rename to public/dicts/en/word/common/PEPXiaoXue5_2_T.json diff --git a/public/dicts/en/word/zh-CN/PEPXiaoXue6_1_T.json b/public/dicts/en/word/common/PEPXiaoXue6_1_T.json similarity index 100% rename from public/dicts/en/word/zh-CN/PEPXiaoXue6_1_T.json rename to public/dicts/en/word/common/PEPXiaoXue6_1_T.json diff --git a/public/dicts/en/word/zh-CN/PEPXiaoXue6_2_T.json b/public/dicts/en/word/common/PEPXiaoXue6_2_T.json similarity index 100% rename from public/dicts/en/word/zh-CN/PEPXiaoXue6_2_T.json rename to public/dicts/en/word/common/PEPXiaoXue6_2_T.json diff --git a/public/dicts/en/word/zh-CN/PETS3-2023.json b/public/dicts/en/word/common/PETS3-2023.json similarity index 100% rename from public/dicts/en/word/zh-CN/PETS3-2023.json rename to public/dicts/en/word/common/PETS3-2023.json diff --git a/public/dicts/en/word/zh-CN/PETS_3.json b/public/dicts/en/word/common/PETS_3.json similarity index 100% rename from public/dicts/en/word/zh-CN/PETS_3.json rename to public/dicts/en/word/common/PETS_3.json diff --git a/public/dicts/en/word/zh-CN/PTE_Advanced_apeuni.json b/public/dicts/en/word/common/PTE_Advanced_apeuni.json similarity index 100% rename from public/dicts/en/word/zh-CN/PTE_Advanced_apeuni.json rename to public/dicts/en/word/common/PTE_Advanced_apeuni.json diff --git a/public/dicts/en/word/zh-CN/PTE_Basic_apeuni.json b/public/dicts/en/word/common/PTE_Basic_apeuni.json similarity index 100% rename from public/dicts/en/word/zh-CN/PTE_Basic_apeuni.json rename to public/dicts/en/word/common/PTE_Basic_apeuni.json diff --git a/public/dicts/en/word/zh-CN/PTE_FIB_L.json b/public/dicts/en/word/common/PTE_FIB_L.json similarity index 100% rename from public/dicts/en/word/zh-CN/PTE_FIB_L.json rename to public/dicts/en/word/common/PTE_FIB_L.json diff --git a/public/dicts/en/word/zh-CN/PTE_FIB_R_junior.json b/public/dicts/en/word/common/PTE_FIB_R_junior.json similarity index 100% rename from public/dicts/en/word/zh-CN/PTE_FIB_R_junior.json rename to public/dicts/en/word/common/PTE_FIB_R_junior.json diff --git a/public/dicts/en/word/zh-CN/PTE_FIB_R_senior.json b/public/dicts/en/word/common/PTE_FIB_R_senior.json similarity index 100% rename from public/dicts/en/word/zh-CN/PTE_FIB_R_senior.json rename to public/dicts/en/word/common/PTE_FIB_R_senior.json diff --git a/public/dicts/en/word/zh-CN/PTE_Listening_apeuni.json b/public/dicts/en/word/common/PTE_Listening_apeuni.json similarity index 100% rename from public/dicts/en/word/zh-CN/PTE_Listening_apeuni.json rename to public/dicts/en/word/common/PTE_Listening_apeuni.json diff --git a/public/dicts/en/word/zh-CN/PTE_Read_apeuni.json b/public/dicts/en/word/common/PTE_Read_apeuni.json similarity index 100% rename from public/dicts/en/word/zh-CN/PTE_Read_apeuni.json rename to public/dicts/en/word/common/PTE_Read_apeuni.json diff --git a/public/dicts/en/word/zh-CN/PTE_WFD.json b/public/dicts/en/word/common/PTE_WFD.json similarity index 100% rename from public/dicts/en/word/zh-CN/PTE_WFD.json rename to public/dicts/en/word/common/PTE_WFD.json diff --git a/public/dicts/en/word/zh-CN/PTE_junior.json b/public/dicts/en/word/common/PTE_junior.json similarity index 100% rename from public/dicts/en/word/zh-CN/PTE_junior.json rename to public/dicts/en/word/common/PTE_junior.json diff --git a/public/dicts/en/word/zh-CN/PTE_senior.json b/public/dicts/en/word/common/PTE_senior.json similarity index 100% rename from public/dicts/en/word/zh-CN/PTE_senior.json rename to public/dicts/en/word/common/PTE_senior.json diff --git a/public/dicts/en/word/zh-CN/ReadingExplorer3.json b/public/dicts/en/word/common/ReadingExplorer3.json similarity index 100% rename from public/dicts/en/word/zh-CN/ReadingExplorer3.json rename to public/dicts/en/word/common/ReadingExplorer3.json diff --git a/public/dicts/en/word/zh-CN/SAT_3_T.json b/public/dicts/en/word/common/SAT_3_T.json similarity index 100% rename from public/dicts/en/word/zh-CN/SAT_3_T.json rename to public/dicts/en/word/common/SAT_3_T.json diff --git a/public/dicts/en/word/zh-CN/TOEFL_3_T.json b/public/dicts/en/word/common/TOEFL_3_T.json similarity index 100% rename from public/dicts/en/word/zh-CN/TOEFL_3_T.json rename to public/dicts/en/word/common/TOEFL_3_T.json diff --git a/public/dicts/en/word/zh-CN/TOEFL_ZhangHongYan.json b/public/dicts/en/word/common/TOEFL_ZhangHongYan.json similarity index 100% rename from public/dicts/en/word/zh-CN/TOEFL_ZhangHongYan.json rename to public/dicts/en/word/common/TOEFL_ZhangHongYan.json diff --git a/public/dicts/en/word/zh-CN/TOEIC.json b/public/dicts/en/word/common/TOEIC.json similarity index 100% rename from public/dicts/en/word/zh-CN/TOEIC.json rename to public/dicts/en/word/common/TOEIC.json diff --git a/public/dicts/en/word/zh-CN/WaiYanSheChuZhong_1_T.json b/public/dicts/en/word/common/WaiYanSheChuZhong_1_T.json similarity index 100% rename from public/dicts/en/word/zh-CN/WaiYanSheChuZhong_1_T.json rename to public/dicts/en/word/common/WaiYanSheChuZhong_1_T.json diff --git a/public/dicts/en/word/zh-CN/WaiYanSheChuZhong_2_T.json b/public/dicts/en/word/common/WaiYanSheChuZhong_2_T.json similarity index 100% rename from public/dicts/en/word/zh-CN/WaiYanSheChuZhong_2_T.json rename to public/dicts/en/word/common/WaiYanSheChuZhong_2_T.json diff --git a/public/dicts/en/word/zh-CN/WaiYanSheChuZhong_3_T.json b/public/dicts/en/word/common/WaiYanSheChuZhong_3_T.json similarity index 100% rename from public/dicts/en/word/zh-CN/WaiYanSheChuZhong_3_T.json rename to public/dicts/en/word/common/WaiYanSheChuZhong_3_T.json diff --git a/public/dicts/en/word/zh-CN/WaiYanSheChuZhong_4_T.json b/public/dicts/en/word/common/WaiYanSheChuZhong_4_T.json similarity index 100% rename from public/dicts/en/word/zh-CN/WaiYanSheChuZhong_4_T.json rename to public/dicts/en/word/common/WaiYanSheChuZhong_4_T.json diff --git a/public/dicts/en/word/zh-CN/WaiYanSheChuZhong_5_T.json b/public/dicts/en/word/common/WaiYanSheChuZhong_5_T.json similarity index 100% rename from public/dicts/en/word/zh-CN/WaiYanSheChuZhong_5_T.json rename to public/dicts/en/word/common/WaiYanSheChuZhong_5_T.json diff --git a/public/dicts/en/word/zh-CN/WaiYanSheChuZhong_6_T.json b/public/dicts/en/word/common/WaiYanSheChuZhong_6_T.json similarity index 100% rename from public/dicts/en/word/zh-CN/WaiYanSheChuZhong_6_T.json rename to public/dicts/en/word/common/WaiYanSheChuZhong_6_T.json diff --git a/public/dicts/en/word/zh-CN/WaiYanSheGaoZhong_1_T.json b/public/dicts/en/word/common/WaiYanSheGaoZhong_1_T.json similarity index 100% rename from public/dicts/en/word/zh-CN/WaiYanSheGaoZhong_1_T.json rename to public/dicts/en/word/common/WaiYanSheGaoZhong_1_T.json diff --git a/public/dicts/en/word/zh-CN/WaiYanSheGaoZhong_2_T.json b/public/dicts/en/word/common/WaiYanSheGaoZhong_2_T.json similarity index 100% rename from public/dicts/en/word/zh-CN/WaiYanSheGaoZhong_2_T.json rename to public/dicts/en/word/common/WaiYanSheGaoZhong_2_T.json diff --git a/public/dicts/en/word/zh-CN/YiLin_1.json b/public/dicts/en/word/common/YiLin_1.json similarity index 100% rename from public/dicts/en/word/zh-CN/YiLin_1.json rename to public/dicts/en/word/common/YiLin_1.json diff --git a/public/dicts/en/word/zh-CN/YiLin_2.json b/public/dicts/en/word/common/YiLin_2.json similarity index 100% rename from public/dicts/en/word/zh-CN/YiLin_2.json rename to public/dicts/en/word/common/YiLin_2.json diff --git a/public/dicts/en/word/zh-CN/YiLin_3.json b/public/dicts/en/word/common/YiLin_3.json similarity index 100% rename from public/dicts/en/word/zh-CN/YiLin_3.json rename to public/dicts/en/word/common/YiLin_3.json diff --git a/public/dicts/en/word/zh-CN/ZhongKaoHeXin.json b/public/dicts/en/word/common/ZhongKaoHeXin.json similarity index 100% rename from public/dicts/en/word/zh-CN/ZhongKaoHeXin.json rename to public/dicts/en/word/common/ZhongKaoHeXin.json diff --git a/public/dicts/en/word/zh-CN/adult-self-study-examination.json b/public/dicts/en/word/common/adult-self-study-examination.json similarity index 100% rename from public/dicts/en/word/zh-CN/adult-self-study-examination.json rename to public/dicts/en/word/common/adult-self-study-examination.json diff --git a/public/dicts/en/word/zh-CN/archVocabulary.json b/public/dicts/en/word/common/archVocabulary.json similarity index 100% rename from public/dicts/en/word/zh-CN/archVocabulary.json rename to public/dicts/en/word/common/archVocabulary.json diff --git a/public/dicts/en/word/zh-CN/coca20000.json b/public/dicts/en/word/common/coca20000.json similarity index 100% rename from public/dicts/en/word/zh-CN/coca20000.json rename to public/dicts/en/word/common/coca20000.json diff --git a/public/dicts/en/word/zh-CN/itVocabulary.json b/public/dicts/en/word/common/itVocabulary.json similarity index 100% rename from public/dicts/en/word/zh-CN/itVocabulary.json rename to public/dicts/en/word/common/itVocabulary.json diff --git a/public/dicts/en/word/zh-CN/nce-new-1.json b/public/dicts/en/word/common/nce-new-1.json similarity index 100% rename from public/dicts/en/word/zh-CN/nce-new-1.json rename to public/dicts/en/word/common/nce-new-1.json diff --git a/public/dicts/en/word/zh-CN/nce-new-2.json b/public/dicts/en/word/common/nce-new-2.json similarity index 100% rename from public/dicts/en/word/zh-CN/nce-new-2.json rename to public/dicts/en/word/common/nce-new-2.json diff --git a/public/dicts/en/word/zh-CN/nce-new-3.json b/public/dicts/en/word/common/nce-new-3.json similarity index 100% rename from public/dicts/en/word/zh-CN/nce-new-3.json rename to public/dicts/en/word/common/nce-new-3.json diff --git a/public/dicts/en/word/zh-CN/nce-new-4.json b/public/dicts/en/word/common/nce-new-4.json similarity index 100% rename from public/dicts/en/word/zh-CN/nce-new-4.json rename to public/dicts/en/word/common/nce-new-4.json diff --git a/public/dicts/en/word/zh-CN/self-study_English1.json b/public/dicts/en/word/common/self-study_English1.json similarity index 100% rename from public/dicts/en/word/zh-CN/self-study_English1.json rename to public/dicts/en/word/common/self-study_English1.json diff --git a/public/dicts/en/word/zh-CN/self-study_English2.json b/public/dicts/en/word/common/self-study_English2.json similarity index 100% rename from public/dicts/en/word/zh-CN/self-study_English2.json rename to public/dicts/en/word/common/self-study_English2.json diff --git a/public/dicts/en/word/zh-CN/self-study_English3.json b/public/dicts/en/word/common/self-study_English3.json similarity index 100% rename from public/dicts/en/word/zh-CN/self-study_English3.json rename to public/dicts/en/word/common/self-study_English3.json diff --git a/public/dicts/en/word/zh-CN/xinghuoqiaoji_4.json b/public/dicts/en/word/common/xinghuoqiaoji_4.json similarity index 100% rename from public/dicts/en/word/zh-CN/xinghuoqiaoji_4.json rename to public/dicts/en/word/common/xinghuoqiaoji_4.json diff --git a/public/dicts/en/word/zh-CN/xinghuoqiaoji_6.json b/public/dicts/en/word/common/xinghuoqiaoji_6.json similarity index 100% rename from public/dicts/en/word/zh-CN/xinghuoqiaoji_6.json rename to public/dicts/en/word/common/xinghuoqiaoji_6.json diff --git a/public/dicts/en/word/zh-CN/translate/ts.json b/public/dicts/en/word/zh-CN/translate/ts.json deleted file mode 100644 index e69de29b..00000000 diff --git a/public/dicts/en/word/zh-CN/translate/translate.json b/public/translate/en2zh_CN.json similarity index 100% rename from public/dicts/en/word/zh-CN/translate/translate.json rename to public/translate/en2zh_CN.json diff --git a/src/App.vue b/src/App.vue index f252c333..f4f67294 100644 --- a/src/App.vue +++ b/src/App.vue @@ -2,11 +2,14 @@ import {onMounted, watch} from "vue"; import {useBaseStore} from "@/stores/base.ts"; -import {SaveDictKey} from "@/types.ts" +import {DictResource, SaveDictKey} from "@/types.ts" import Practice from "@/components/Practice/Practice.vue" import {useEventListener, useStartKeyboardEventListener} from "@/hooks/event.ts"; import {useRuntimeStore} from "@/stores/runtime.ts"; import {useSettingStore} from "@/stores/setting.ts"; +import {dictionaryResources} from "@/assets/dictionary.ts"; +import {groupBy} from "lodash-es"; +import {$ref} from "vue/macros"; const store = useBaseStore() const runtimeStore = useRuntimeStore() @@ -43,12 +46,16 @@ useEventListener('keyup', (e: KeyboardEvent) => { lastItem && lastItem.close() } }) + + +onMounted(() => { +})