+
### 翻译界面
-
+
### 设置界面
-
-
+
diff --git a/frontend/src/assets/docs/license.md b/frontend/src/assets/docs/license.md
index 695f52d2..a916d34c 100644
--- a/frontend/src/assets/docs/license.md
+++ b/frontend/src/assets/docs/license.md
@@ -1,11 +1,679 @@
# 软件开源协议信息
```
-Copyright 2019-2021 terasum (Chen Quan)
+ GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ Copyright (C) 2007 Free Software Foundation, Inc. 
+
3. 在弹出框中填写词典信息
4. 选择词典文件
-
+
**注意:** mdx文件所在的文件夹中的js/css/font文件均会被拷贝到缓存文件夹中，请把一个独立词典放在一个独立的文件夹中，并将相关资源放在一起。
@@ -22,11 +22,12 @@
1. 选择词典并输入目标词（模糊）
-
+
+
2. 在左边栏选择你想要查的具体词汇, 如果该词汇和其他词汇同一个意思（即@@Link==） 则直接展示该同意义词汇
-
+
diff --git a/frontend/src/assets/docs/terms_and_service.md b/frontend/src/assets/docs/terms_and_service.md
index c55fb4f8..c6373748 100644
--- a/frontend/src/assets/docs/terms_and_service.md
+++ b/frontend/src/assets/docs/terms_and_service.md
@@ -10,4 +10,4 @@
4. Medict 软件尊重并保护所有用户的个人隐私权，不会窃取任何用户计算机中的信息, 亦不会将用户文件上载至互联网服务器。
-5. Medict 以 MIT 协议发布, 软件著作权属软件作者所有。
\ No newline at end of file
+5. Medict 以 GPLv3 协议发布, 软件著作权属软件作者所有。
\ No newline at end of file
diff --git a/frontend/src/assets/docs/youdao_traslate_config.md b/frontend/src/assets/docs/youdao_traslate_config.md
deleted file mode 100644
index 9ab21acc..00000000
--- a/frontend/src/assets/docs/youdao_traslate_config.md
+++ /dev/null
@@ -1 +0,0 @@
-# 有道翻译 API申请与配置
\ No newline at end of file
diff --git a/frontend/src/assets/images/docs/index.png b/frontend/src/assets/images/docs/index.png
new file mode 100644
index 00000000..62f137df
Binary files /dev/null and b/frontend/src/assets/images/docs/index.png differ
diff --git a/frontend/src/components/layout/AppFooter.vue b/frontend/src/components/layout/AppFooter.vue
new file mode 100644
index 00000000..5e1fe585
--- /dev/null
+++ b/frontend/src/components/layout/AppFooter.vue
@@ -0,0 +1,127 @@
+
+
+
+
+
+
+
+
+
diff --git a/frontend/src/components/layout/AppFunctions.vue b/frontend/src/components/layout/AppFunctions.vue
new file mode 100644
index 00000000..ff2b5219
--- /dev/null
+++ b/frontend/src/components/layout/AppFunctions.vue
@@ -0,0 +1,143 @@
+
+
+
+
+
+
+
diff --git a/frontend/src/view/settings/DictSettings.vue b/frontend/src/components/layout/AppMainContent.vue
similarity index 64%
rename from frontend/src/view/settings/DictSettings.vue
rename to frontend/src/components/layout/AppMainContent.vue
index aac6055b..36d71edb 100644
--- a/frontend/src/view/settings/DictSettings.vue
+++ b/frontend/src/components/layout/AppMainContent.vue
@@ -16,30 +16,29 @@
along with this program. If not, see
+
+
+
+
+
+
+
+
+ 搜索
+
+
+
+
+ 词典
+
+
+
+
+ 设置
+
+
-
-
-
-
-
-
+
+ settings
-
+
+
+
+
diff --git a/frontend/src/components/layout/AppRightToolbar.vue b/frontend/src/components/layout/AppRightToolbar.vue
new file mode 100644
index 00000000..2e471758
--- /dev/null
+++ b/frontend/src/components/layout/AppRightToolbar.vue
@@ -0,0 +1,54 @@
+
+
+
+
+
+
+
+
diff --git a/frontend/src/view/main/AppSidebar.vue b/frontend/src/components/layout/AppSidebar.vue
similarity index 77%
rename from frontend/src/view/main/AppSidebar.vue
rename to frontend/src/components/layout/AppSidebar.vue
index 0f4cf5ba..e5d81ed6 100644
--- a/frontend/src/view/main/AppSidebar.vue
+++ b/frontend/src/components/layout/AppSidebar.vue
@@ -32,10 +32,13 @@
-ms-user-select: none;
cursor:default;
+
+
.sidebar-top {
display: flex;
padding: 0 10px;
background-color: $theme-top-header-background-color;
+ border-bottom: 1px solid #dcdcdc;
.logo {
display: flex;
@@ -43,7 +46,7 @@
align-items: center;
justify-content: center;
width: 100%;
- height: $layout-sidebar-logo-height;
+ height: calc($layout-sidebar-logo-height - 1px);
img {
width: 100%;
}
@@ -55,10 +58,11 @@
}
.sidebar-content{
- padding: 4px 2px;
- margin: 10px 0 0 0;
+ border-right: 1px solid #dcdcdc;
+ padding: 0;
+ margin: 0;
user-select: none;
- height: calc(100% - $layout-sidebar-logo-height - $layout-footer-height);
+ height: calc(100% - $layout-sidebar-logo-height);
ul{
height: 100%;
overflow-y: scroll;
@@ -97,24 +101,11 @@
diff --git a/frontend/src/components/setting/SettingItem.vue b/frontend/src/components/setting/SettingItem.vue
new file mode 100644
index 00000000..d54b9540
--- /dev/null
+++ b/frontend/src/components/setting/SettingItem.vue
@@ -0,0 +1,63 @@
+
+
+
+
+
+
+
+
diff --git a/frontend/src/maininfra/3dparty/baidu_translate.ts b/frontend/src/maininfra/3dparty/baidu_translate.ts
deleted file mode 100644
index dd76b6ed..00000000
--- a/frontend/src/maininfra/3dparty/baidu_translate.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- *
- * Copyright (C) 2023 Quan Chen
+
+
+
+ {{ title }}
+ {{ value }}
+
+
+
-
-
-
-
-
-
diff --git a/frontend/src/view/Preference/DebugView.vue b/frontend/src/view/Preference/DebugView.vue
deleted file mode 100644
index 3a2c4d6f..00000000
--- a/frontend/src/view/Preference/DebugView.vue
+++ /dev/null
@@ -1,222 +0,0 @@
-
-
-
-
-
- 偏好设置
-
-
-
-
-
-
-
- 主题颜色
-
-
-
-
-
-
-
- 调整APP搜索栏部分颜色(暂不支持)
-
-
-
-
-
-
-
-
-
-
diff --git a/frontend/src/view/Preference/DictionarySettingsView.vue b/frontend/src/view/Preference/DictionarySettingsView.vue
deleted file mode 100644
index 4cbfae79..00000000
--- a/frontend/src/view/Preference/DictionarySettingsView.vue
+++ /dev/null
@@ -1,377 +0,0 @@
-
-
-
-
diff --git a/frontend/src/view/Preference/NewDictionary.vue b/frontend/src/view/Preference/NewDictionary.vue
deleted file mode 100644
index 07f96525..00000000
--- a/frontend/src/view/Preference/NewDictionary.vue
+++ /dev/null
@@ -1,261 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/frontend/src/view/Preference/PreferenceWindow.vue b/frontend/src/view/Preference/PreferenceWindow.vue
deleted file mode 100644
index 012c99e4..00000000
--- a/frontend/src/view/Preference/PreferenceWindow.vue
+++ /dev/null
@@ -1,195 +0,0 @@
-
-
-
-
-
- 开发者选项
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 软件日志
-
-
-
-
-
-
-
- 软件主进程日志，记录运行在后台的任务日志
-运行日志路径为: {{ loggerPath() }}
-
- 打开运行日志
-
-
-
- 开发者工具
-
-
-
-
-
-
-
- 可以通过以下按钮打开 chrome-dev-tool 面板(用于调试渲染进程)
-
- 打开调试窗口
-
-
-
- 词典缓存
-
-
-
-
-
-
-
- 词典资源路径为: {{ resourcePath() }}
-
- 打开资源目录
-
-
-
-
-
-
-
-
-
diff --git a/frontend/src/view/Preference/TranslateSettingView.vue b/frontend/src/view/Preference/TranslateSettingView.vue
deleted file mode 100644
index c2400417..00000000
--- a/frontend/src/view/Preference/TranslateSettingView.vue
+++ /dev/null
@@ -1,263 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/frontend/src/view/about/AboutView.vue b/frontend/src/view/about/AboutView.vue
index 9f53e4f8..c9338cb0 100644
--- a/frontend/src/view/about/AboutView.vue
+++ b/frontend/src/view/about/AboutView.vue
@@ -19,12 +19,12 @@
-
- 翻译设置
-
-
-
-
-
-
-
-
-
-
-
- 百度翻译
-
-
-
-
-
-
- 在baidu 开放平台申请的 APPKID
-
-
-
-
-
-
-
-
- 在baidu 开放平台申请的 APPKEY
-
-
-
- 有道翻译
-
-
-
-
-
-
- 有道智云申请的 APPKID
-
-
-
-
-
-
-
-
- 在有道智云申请的 APPKEY
-
-
-
-
-
-
-
APP 信息
+About
-
+
+
@@ -53,7 +53,7 @@
@@ -98,17 +95,9 @@ import { BrowserOpenURL } from '../../../wailsjs/runtime/runtime';
import {Code, PeopleCarry} from "@vicons/fa";
import { NIcon } from 'naive-ui';
-import {useRouter} from "vue-router"
-
-const router = useRouter();
-
function openExternal(url: string) {
BrowserOpenURL(url);
}
-
-function close() {
- router.replace({ path: "/" });
-}
@@ -117,22 +106,10 @@ function close() {
.container{
height: 100%;
overflow-y: auto;
- padding: 10px 40px;
- background-color: #fafafa;
}
.about-title {
padding: 10px 0 10px 12px;
- h3 {
- line-height: 20px;
- font-size: 20px;
- font-weight: 700px;
- color: #505050;
- padding: 0;
- margin:0;
- margin-bottom: 20px;
- margin-top: 10px;
- }
}
@@ -146,10 +123,11 @@ function close() {
padding: 2px 4px;
margin: 0;
font-size: 16px;
- h4{
- margin: 4px 0;
+ h2{
+ font-size: 21px;
+ margin: 14px 0;
+ padding: 6px 0;
border-bottom: 1px solid #c1c1c3;
- color: rgb(18, 78, 169);
}
}
@@ -165,12 +143,10 @@ function close() {
margin: 10px 0;
.input-info {
label {
- font-size: 14px;
font-style: bold;
}
p {
- font-size: 12px;
color: #333;
font-style: italic;
margin: 0;
@@ -197,12 +173,7 @@ function close() {
.about-body {
min-height: 260px;
}
-.about-footer {
- display: flex;
- flex-direction: row-reverse;
- padding-right: 30px;
- margin-top: 10px;
-}
+
.btn {
background-color: rgb(252, 252, 252);
background-image: linear-gradient(to bottom, #fcfcfc 0, #f1f1f1 100%);
diff --git a/frontend/src/view/dict/index.vue b/frontend/src/view/dict/index.vue
new file mode 100644
index 00000000..9812a854
--- /dev/null
+++ b/frontend/src/view/dict/index.vue
@@ -0,0 +1,269 @@
+
+
+
+
-
+
+
@@ -87,9 +87,6 @@
-
+
+
+
+
+
+
diff --git a/frontend/src/view/docs/DocsWindow.vue b/frontend/src/view/docs/DocsWindow.vue
deleted file mode 100644
index a3e2e384..00000000
--- a/frontend/src/view/docs/DocsWindow.vue
+++ /dev/null
@@ -1,429 +0,0 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ | 词典名称 | +标题（内置） | +词典类型 | + +引擎版本 | +创建时间 | +id | +所在目录 | +
|---|---|---|---|---|---|---|
| {{ item.name }} | +{{ item.title }} | +{{ item.dict_type }} | + +{{ item.generateEngineVersion }} | +{{ item.createDate }} | +{{ item.id }} | +{{ item.base_dir }} | +
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/frontend/src/view/docs/index.vue b/frontend/src/view/docs/index.vue
new file mode 100644
index 00000000..4739613b
--- /dev/null
+++ b/frontend/src/view/docs/index.vue
@@ -0,0 +1,378 @@
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/frontend/src/view/main/AppFooter.vue b/frontend/src/view/main/AppFooter.vue
deleted file mode 100644
index cf130e83..00000000
--- a/frontend/src/view/main/AppFooter.vue
+++ /dev/null
@@ -1,191 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/frontend/src/view/main/AppRightToolbar.vue b/frontend/src/view/main/AppRightToolbar.vue
deleted file mode 100644
index cfe727c5..00000000
--- a/frontend/src/view/main/AppRightToolbar.vue
+++ /dev/null
@@ -1,165 +0,0 @@
-
-
-
-
-
-
-
diff --git a/frontend/src/view/main/AppMainContent.vue b/frontend/src/view/main/MainContentFrame.vue
similarity index 94%
rename from frontend/src/view/main/AppMainContent.vue
rename to frontend/src/view/main/MainContentFrame.vue
index 7676c7b7..7485f63e 100644
--- a/frontend/src/view/main/AppMainContent.vue
+++ b/frontend/src/view/main/MainContentFrame.vue
@@ -19,11 +19,6 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
diff --git a/frontend/src/view/main/AppMainFunctions.vue b/frontend/src/view/main/MainFunctions.vue
similarity index 81%
rename from frontend/src/view/main/AppMainFunctions.vue
rename to frontend/src/view/main/MainFunctions.vue
index e5606b5b..cfa53919 100644
--- a/frontend/src/view/main/AppMainFunctions.vue
+++ b/frontend/src/view/main/MainFunctions.vue
@@ -102,7 +102,7 @@
width: 52px;
height: 44px;
margin-top: -6px;
- padding-top: 4px;
+ padding-top: 6px;
cursor: pointer;
border-radius: 4px;
margin-left: 2px;
@@ -124,6 +124,7 @@
margin-right: auto;
}
.fn-box-text {
+ margin-top: 2px;
margin-left: auto;
margin-right: auto;
text-align: center;
@@ -133,6 +134,11 @@
user-select: none;
}
}
+
+ .active {
+ background-color: $theme-function-box-hover-bg-color;
+ color: $theme-function-box-hover-font-color;
+ }
}
}
}
@@ -172,23 +178,21 @@
-
-
+
搜索
-
+
+
词典
-
+
export default Component
-}
\ No newline at end of file
+}
diff --git a/frontend/vite.config.js b/frontend/vite.config.js
index 33d10263..6c8861ef 100644
--- a/frontend/vite.config.js
+++ b/frontend/vite.config.js
@@ -1,6 +1,9 @@
import { defineConfig } from 'vite';
import vue from '@vitejs/plugin-vue';
import alias from '@rollup/plugin-alias';
+
+import markdown from 'vite-plugin-md';
+import Inspect from 'vite-plugin-inspect';
import { resolve } from 'path';
const root = resolve(__dirname);
@@ -10,12 +13,18 @@ export default defineConfig({
publicDir: 'assets',
plugins: [
alias(),
- vue()
+ vue({
+ include: [/\.vue$/, /\.md$/], // <--
+
+ }),
+ markdown(),
+ Inspect()
],
resolve: {
alias: {
"@": resolve(root, "src"),
"$": resolve(root, "wailsjs"),
+ 'vue': 'vue/dist/vue.esm-bundler.js'
},
},
server: {
diff --git a/frontend/wailsjs/go/main/App.d.ts b/frontend/wailsjs/go/main/App.d.ts
index bd647af9..4a7e3365 100755
--- a/frontend/wailsjs/go/main/App.d.ts
+++ b/frontend/wailsjs/go/main/App.d.ts
@@ -2,6 +2,10 @@
// This file is automatically generated. DO NOT EDIT
import {model} from '../models';
+export function BaseDictDir():Promise;
+
export function Dispatch(arg1:string,arg2:{[key: string]: any}):Promise;
+export function OpenFinder(arg1:string):Promise;
+
export function ResourceServerAddr():Promise;
diff --git a/frontend/wailsjs/go/main/App.js b/frontend/wailsjs/go/main/App.js
index c0d953c9..6b47899e 100755
--- a/frontend/wailsjs/go/main/App.js
+++ b/frontend/wailsjs/go/main/App.js
@@ -2,10 +2,18 @@
// Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
// This file is automatically generated. DO NOT EDIT
+export function BaseDictDir() {
+ return window['go']['main']['App']['BaseDictDir']();
+}
+
export function Dispatch(arg1, arg2) {
return window['go']['main']['App']['Dispatch'](arg1, arg2);
}
+export function OpenFinder(arg1) {
+ return window['go']['main']['App']['OpenFinder'](arg1);
+}
+
export function ResourceServerAddr() {
return window['go']['main']['App']['ResourceServerAddr']();
}
diff --git a/go.mod b/go.mod
index 85d07bc7..8098487f 100644
--- a/go.mod
+++ b/go.mod
@@ -14,7 +14,9 @@ require (
github.com/kirsle/configdir v0.0.0-20170128060238-e45d2f54772f
github.com/op/go-logging v0.0.0-20160315200505-970db520ece7
github.com/rasky/go-lzo v0.0.0-20200203143853-96a758eda86e
+ github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966
github.com/spf13/viper v1.10.1
+ go.etcd.io/etcd/client/pkg/v3 v3.5.1
golang.org/x/text v0.9.0
)
@@ -67,6 +69,9 @@ require (
github.com/valyala/bytebufferpool v1.0.0 // indirect
github.com/valyala/fasttemplate v1.2.2 // indirect
github.com/wailsapp/mimetype v1.4.1 // indirect
+ go.uber.org/atomic v1.7.0 // indirect
+ go.uber.org/multierr v1.6.0 // indirect
+ go.uber.org/zap v1.17.0 // indirect
golang.org/x/arch v0.3.0 // indirect
golang.org/x/crypto v0.9.0 // indirect
golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 // indirect
diff --git a/go.sum b/go.sum
index c43f3ee1..9320e56a 100644
--- a/go.sum
+++ b/go.sum
@@ -10,6 +10,7 @@ github.com/c0mm4nd/go-ripemd v0.0.0-20200326052756-bd1759ad7d10/go.mod h1:mYPR+a
github.com/chenzhuoyu/base64x v0.0.0-20211019084208-fb5309c8db06/go.mod h1:DH46F32mSOjUmXrMHnKwZdA8wcEefY7UVqBKYGjpdQY=
github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 h1:qSGYFH7+jGhDF8vLC+iwCD4WpbV1EBDSzWkJODFLams=
github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311/go.mod h1:b583jCggY9gE99b6G5LEC39OIiVsWj+R97kbl5odCEk=
+github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
github.com/creasty/go-levenshtein v0.0.0-20161128082938-38ce641d5030 h1:YhxjIVClCJVUsbgICBmYNhT/SAAZVe3FkrC8sdQQEjA=
github.com/creasty/go-levenshtein v0.0.0-20161128082938-38ce641d5030/go.mod h1:lOCZAIOJdOr4nhnfYZxyv6nN4NNG848ubmh4SpwFyI8=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -34,6 +35,7 @@ github.com/go-playground/validator/v10 v10.14.0 h1:vgvQWe3XCz3gIeFDm/HnTIbj6UGmg
github.com/go-playground/validator/v10 v10.14.0/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU=
github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=
github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
+github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg=
@@ -113,6 +115,8 @@ github.com/rogpeppe/go-internal v1.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBO
github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
github.com/samber/lo v1.38.1 h1:j2XEAqXKb09Am4ebOg31SpvzUTTs6EN3VfgeLUhPdXM=
github.com/samber/lo v1.38.1/go.mod h1:+m/ZKRl6ClXCE2Lgf3MsQlWfh4bn1bz6CXEOxnEXnEA=
+github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966 h1:JIAuq3EEf9cgbU6AtGPK4CTG3Zf6CKMNqf0MHTggAUA=
+github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966/go.mod h1:sUM3LWHvSMaG192sy56D9F7CNvL7jUJVXoqM1QKLnog=
github.com/spf13/afero v1.6.0 h1:xoax2sJ2DT8S8xA2paPFjDCScCNeWsg75VG0DLRreiY=
github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I=
github.com/spf13/cast v1.4.1 h1:s0hze+J0196ZfEMTs80N7UlFt0BDuQ7Q+JDnHiMWKdA=
@@ -153,6 +157,14 @@ github.com/wailsapp/mimetype v1.4.1 h1:pQN9ycO7uo4vsUUuPeHEYoUkLVkaRntMnHJxVwYhw
github.com/wailsapp/mimetype v1.4.1/go.mod h1:9aV5k31bBOv5z6u+QP8TltzvNGJPmNJD4XlAL3U+j3o=
github.com/wailsapp/wails/v2 v2.5.1 h1:mfG+2kWqQXYOwdgI43HEILjOZDXbk5woPYI3jP2b+js=
github.com/wailsapp/wails/v2 v2.5.1/go.mod h1:jbOZbcr/zm79PxXxAjP8UoVlDd9wLW3uDs+isIthDfs=
+go.etcd.io/etcd/client/pkg/v3 v3.5.1 h1:XIQcHCFSG53bJETYeRJtIxdLv2EWRGxcfzR8lSnTH4E=
+go.etcd.io/etcd/client/pkg/v3 v3.5.1/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g=
+go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw=
+go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
+go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4=
+go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
+go.uber.org/zap v1.17.0 h1:MTjgFu6ZLKvY6Pvaqk97GlxNBuMpV4Hy/3P6tRGlI2U=
+go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo=
golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
golang.org/x/arch v0.3.0 h1:02VY4/ZcO/gBOH6PUaoiptASxtXU10jazRCP865E97k=
golang.org/x/arch v0.3.0/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
@@ -171,6 +183,7 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200810151505-1b9f1253b3ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210616045830-e2b7044e8c71/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -200,6 +213,7 @@ gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
gopkg.in/ini.v1 v1.66.2 h1:XfR1dOYubytKy4Shzc2LHrrGhU0lDCfDGG1yLPmpgsI=
gopkg.in/ini.v1 v1.66.2/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/internal/utils/pathhome_darwin.go b/internal/utils/pathhome_darwin.go
index 278d4aa4..f0224ba5 100644
--- a/internal/utils/pathhome_darwin.go
+++ b/internal/utils/pathhome_darwin.go
@@ -34,11 +34,15 @@ func HomeDir() (string, error) {
return "", fmt.Errorf("base home dir mkall failed, %s", err.Error())
}
- //configPath := configdir.LocalConfig("medict")
- //fmt.Printf("medict app: HomeDir %s\n", configPath)
- //err := configdir.MakePath(configPath) // Ensure it exists.
- //if err != nil {
- // return "", fmt.Errorf("base home dir mkall failed, %s", err.Error())
- //}
+ return configPath, nil
+}
+
+func AppConfigDir() (string, error) {
+ configPath := configdir.LocalConfig("medict")
+ fmt.Printf("medict app: AppConfigDir %s\n", configPath)
+ err := configdir.MakePath(configPath) // Ensure it exists.
+ if err != nil {
+ return "", fmt.Errorf("app config dir mkall failed, %s", err.Error())
+ }
return configPath, nil
}
diff --git a/internal/utils/pathhome_linux.go b/internal/utils/pathhome_linux.go
index 80b11dd7..ebf320b3 100644
--- a/internal/utils/pathhome_linux.go
+++ b/internal/utils/pathhome_linux.go
@@ -27,3 +27,7 @@ func HomeDir() (string, error) {
}
return configPath, nil
}
+
+func AppConfigDir() (string, error) {
+ return HomeDir()
+}
diff --git a/internal/utils/pathhome_windows.go b/internal/utils/pathhome_windows.go
index d925757d..b76ef01c 100644
--- a/internal/utils/pathhome_windows.go
+++ b/internal/utils/pathhome_windows.go
@@ -28,3 +28,7 @@ func HomeDir() (string, error) {
}
return configPath, nil
}
+
+func AppConfigDir() (string, error) {
+ return HomeDir()
+}
diff --git a/pkg/service/mdict.go b/pkg/service/mdict.go
index 9ddeb61b..284e37e4 100644
--- a/pkg/service/mdict.go
+++ b/pkg/service/mdict.go
@@ -3,11 +3,11 @@ package service
import (
"errors"
"fmt"
+ "path/filepath"
"strings"
"sync"
"github.com/terasum/medict/internal/gomdict"
- "github.com/terasum/medict/internal/utils"
"github.com/terasum/medict/pkg/model"
)
@@ -54,7 +54,12 @@ func NewMdict(dirItem *model.DirItem) (model.GeneralDictionary, error) {
}
func (md *Mdict) Name() string {
- return strings.TrimRight(utils.FileName(md.mdxFilePath), ".mdx")
+ _, rawpath := filepath.Split(md.mdxFilePath)
+ rawpath = strings.TrimRight(rawpath, ".mdx")
+ if len(rawpath) > 0 {
+ return rawpath
+ }
+ return md.mdxFilePath
}
func (md *Mdict) Description() *model.PlainDictionaryInfo {
diff --git a/pkg/service/mdict_test.go b/pkg/service/mdict_test.go
new file mode 100644
index 00000000..efa51e73
--- /dev/null
+++ b/pkg/service/mdict_test.go
@@ -0,0 +1,19 @@
+package service
+
+import (
+ "github.com/stretchr/testify/assert"
+ "testing"
+)
+
+func TestMdict_Name(t *testing.T) {
+ mdict := &Mdict{
+ mdxFilePath: "/User/yourname/test/dict/test.mdx",
+ mddFilePaths: nil,
+ mdxins: nil,
+ mddinss: nil,
+ hasBuildIndex: false,
+ buildingIndexLock: nil,
+ }
+ t.Logf("name is %s", mdict.Name())
+ assert.Equal(t, "test", mdict.Name())
+}
@@ -206,16 +210,39 @@ import { Settings48Filled } from '@vicons/fluent';
import { NIcon } from 'naive-ui';
import { useDictQueryStore } from '@/store/dict';
+import { useUIStore } from '@/store/ui';
+import { useRouter } from "vue-router";
+
const dictQueryStore = useDictQueryStore();
+const uiStore = useUIStore();
+const router = useRouter();
let inputWord = ref('');
+let inputActive = ref(false);
///----------------------------
// event listener function
///----------------------------
+const tabRouters = {
+ search: '/',
+ dict: '/dict',
+ setting: '/setting',
+};
+
+function changeTab(tabName) {
+ if (uiStore.currentTab != tabName && tabRouters[tabName]) {
+ router.replace({ path: tabRouters[tabName] });
+ }
+ uiStore.updateCurrentTab(tabName);
+}
+
function handleChange(v) {
- console.info("[event keydown enter]" + inputWord.value)
+ console.info('[event keydown enter]' + inputWord.value);
+ if(!uiStore.isSearchInputActive()){
+ console.log("input disabled, skipped")
+ return;
+ }
dictQueryStore.updateInputSearchWord(inputWord.value.trim());
}
-
\ No newline at end of file
+
diff --git a/frontend/src/view/main/MainRightToolbar.vue b/frontend/src/view/main/MainRightToolbar.vue
new file mode 100644
index 00000000..21345f90
--- /dev/null
+++ b/frontend/src/view/main/MainRightToolbar.vue
@@ -0,0 +1,151 @@
+
+
+
+
+
+
+
+
diff --git a/frontend/src/view/main/MainSidebar.vue b/frontend/src/view/main/MainSidebar.vue
new file mode 100644
index 00000000..dc2ba756
--- /dev/null
+++ b/frontend/src/view/main/MainSidebar.vue
@@ -0,0 +1,82 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/frontend/src/view/main/MainWindow.vue b/frontend/src/view/main/index.vue
similarity index 63%
rename from frontend/src/view/main/MainWindow.vue
rename to frontend/src/view/main/index.vue
index 4175372b..00ab2816 100644
--- a/frontend/src/view/main/MainWindow.vue
+++ b/frontend/src/view/main/index.vue
@@ -21,31 +21,41 @@
diff --git a/frontend/src/view/setting/SettingPlugin.vue b/frontend/src/view/setting/SettingPlugin.vue
new file mode 100644
index 00000000..28b904a6
--- /dev/null
+++ b/frontend/src/view/setting/SettingPlugin.vue
@@ -0,0 +1,45 @@
+
+
+
+
+
+
+
+
+
+
+
+ {{
+ item.description && item.description.title
+ ? item.description.title
+ : item.name
+ }}
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/frontend/src/view/setting/SettingSoftware.vue b/frontend/src/view/setting/SettingSoftware.vue
new file mode 100644
index 00000000..67db4433
--- /dev/null
+++ b/frontend/src/view/setting/SettingSoftware.vue
@@ -0,0 +1,53 @@
+
+
+
+
+ 插件设置
+
+
+
+
+
+
+
+
+
+
diff --git a/frontend/src/view/setting/SettingTheme.vue b/frontend/src/view/setting/SettingTheme.vue
new file mode 100644
index 00000000..08a66a95
--- /dev/null
+++ b/frontend/src/view/setting/SettingTheme.vue
@@ -0,0 +1,45 @@
+
+
+
+
+ 软件设置
+
+
+
+ 用于进行全文搜索的内置引擎
+
+
+ 全文搜索的内置引擎建立索引的超时时间
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/frontend/src/view/setting/index.vue b/frontend/src/view/setting/index.vue
new file mode 100644
index 00000000..0e13a5b3
--- /dev/null
+++ b/frontend/src/view/setting/index.vue
@@ -0,0 +1,382 @@
+
+
+
+
+
+
+
+ 主题设置
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/frontend/src/vue-shim.d.ts b/frontend/src/vue-shim.d.ts
index a09f3e89..aea493c3 100644
--- a/frontend/src/vue-shim.d.ts
+++ b/frontend/src/vue-shim.d.ts
@@ -22,4 +22,4 @@ declare module '*.md' {
import type { ComponentOptions } from 'vue'
const Component: ComponentOptions
+
+
+
+
+
+
+
+
+
+
+