Merge branch 'master' into ee_dev

This commit is contained in:
gaoshuaixing
2023-01-31 14:06:16 +08:00
15 changed files with 42 additions and 14 deletions

View File

@@ -16,7 +16,7 @@
- 🍩 **Why?** desktop software ( office direction , personal tools ), still Yes PC in the next ten years one of the requirements is to improve work efficiency
- 🍉 **Simple** just understand JavaScript
- 🍑 **Vision** all developers can learn how to develop desktop software
- 🍰 **Gitee** https://gitee.com/dromara/electron-egg **2400+**
- 🍰 **Gitee** https://gitee.com/dromara/electron-egg **2700+**
- 🍨 **Github** https://github.com/dromara/electron-egg **600+**
- 🏆 most valuable open source project
![](https://wallace5303.gitee.io/ee/images/electron-egg/ee-zs.png)

View File

@@ -16,7 +16,7 @@
- 🍩 **为什么使用?** 桌面软件(办公方向、 个人工具仍然是未来十几年PC端需求之一提高工作效率
- 🍉 **简单:** 只需懂 JavaScript
- 🍑 **愿景:** 所有开发者都能学会桌面软件研发
- 🍰 **gitee** https://gitee.com/dromara/electron-egg **2400+**
- 🍰 **gitee** https://gitee.com/dromara/electron-egg **2700+**
- 🍨 **github** https://github.com/dromara/electron-egg **600+**
- 🏆 码云最有价值开源项目
![](https://wallace5303.gitee.io/ee/images/electron-egg/ee-zs.png)

View File

@@ -174,7 +174,13 @@ class ExampleController extends Controller {
if (!args.id) {
return false;
}
const dir = electronApp.getPath(args.id);
let dir = '';
if (path.isAbsolute(args.id)) {
dir = args.id;
} else {
dir = electronApp.getPath(args.id);
}
shell.openPath(dir);
return true;
}

View File

@@ -28,11 +28,18 @@
<a-col :span="12">
<a-input v-model="data_dir" :value="data_dir" addon-before="数据目录" />
</a-col>
<a-col :span="12">
<a-col :span="2">
</a-col>
<a-col :span="5">
<a-button @click="selectDir">
修改目录
</a-button>
</a-col>
<a-col :span="5">
<a-button @click="openDir">
打开目录
</a-button>
</a-col>
</a-row>
</div>
<div class="one-block-1">
@@ -197,6 +204,12 @@ export default {
this.modifyDataDir(r);
})
},
openDir() {
console.log('dd:', this.data_dir);
this.$ipcInvoke(ipcApiRoute.openDirectory, {id: this.data_dir}).then(res => {
//
})
},
modifyDataDir(dir) {
const params = {
action: 'setDataDir',

View File

@@ -1,6 +1,6 @@
{
"name": "ee",
"version": "2.4.0",
"version": "2.5.0",
"description": "A fast, desktop software development framework",
"main": "main.js",
"scripts": {
@@ -111,7 +111,7 @@
"dependencies": {
"better-sqlite3": "^7.6.0",
"dayjs": "^1.10.7",
"ee-core": "^1.4.1",
"ee-core": "^1.5.0",
"electron-is": "^3.0.0",
"electron-updater": "^5.3.0",
"lodash": "^4.17.21"

View File

@@ -0,0 +1 @@
#app-base-db[data-v-5e07180b]{padding:0 10px;text-align:left;width:100%}#app-base-db .one-block-1[data-v-5e07180b]{font-size:16px;padding-top:10px}#app-base-db .one-block-2[data-v-5e07180b]{padding-top:10px}

View File

@@ -1 +0,0 @@
#app-base-db[data-v-e8ac4bca]{padding:0 10px;text-align:left;width:100%}#app-base-db .one-block-1[data-v-e8ac4bca]{font-size:16px;padding-top:10px}#app-base-db .one-block-2[data-v-e8ac4bca]{padding-top:10px}

View File

@@ -4,4 +4,4 @@
::-webkit-scrollbar-track{background:0 0}
::-webkit-scrollbar-thumb{background:#E6FFEE;-webkit-transition:.3s;transition:.3s}
::-webkit-scrollbar-thumb:hover{background-color:#07C160}
::-webkit-scrollbar-thumb:active{background-color:#07C160}</style><link href="/css/chunk-1af754fa.e1e0247d.css" rel="prefetch"><link href="/css/chunk-3264b806.ab0373ec.css" rel="prefetch"><link href="/css/chunk-340486ec.d07903e2.css" rel="prefetch"><link href="/css/chunk-3e5d8082.9bb68a1d.css" rel="prefetch"><link href="/css/chunk-4becffd5.38774961.css" rel="prefetch"><link href="/css/chunk-4fd6d7f0.83845a9b.css" rel="prefetch"><link href="/css/chunk-57324832.80096fc0.css" rel="prefetch"><link href="/css/chunk-5d990344.6bcfc99c.css" rel="prefetch"><link href="/css/chunk-6cddf9c4.2f12db76.css" rel="prefetch"><link href="/css/chunk-7e1f652a.286494f0.css" rel="prefetch"><link href="/css/chunk-842aee10.0c43dff1.css" rel="prefetch"><link href="/css/chunk-8583df3c.87d5fe76.css" rel="prefetch"><link href="/css/chunk-98f99a2c.e8a7c696.css" rel="prefetch"><link href="/css/chunk-a9fbadf0.baa718b4.css" rel="prefetch"><link href="/css/chunk-b4234658.6a07402f.css" rel="prefetch"><link href="/css/chunk-d7b56b58.d635b2f3.css" rel="prefetch"><link href="/css/chunk-d82e415e.e6ab9c20.css" rel="prefetch"><link href="/css/chunk-e2c4ac18.5cf6519b.css" rel="prefetch"><link href="/css/chunk-e319cd5c.1ec378ff.css" rel="prefetch"><link href="/js/chunk-1af754fa.55a34e0c.js" rel="prefetch"><link href="/js/chunk-3264b806.44cd983f.js" rel="prefetch"><link href="/js/chunk-340486ec.b471409f.js" rel="prefetch"><link href="/js/chunk-3e5d8082.cc03b6c8.js" rel="prefetch"><link href="/js/chunk-4becffd5.06d63bca.js" rel="prefetch"><link href="/js/chunk-4db20436.34f9cd3c.js" rel="prefetch"><link href="/js/chunk-4fd6d7f0.8df2e44b.js" rel="prefetch"><link href="/js/chunk-57324832.145f7aff.js" rel="prefetch"><link href="/js/chunk-5d990344.8f1d8dd0.js" rel="prefetch"><link href="/js/chunk-6cddf9c4.d61e8a4d.js" rel="prefetch"><link href="/js/chunk-7e1f652a.c277dff9.js" rel="prefetch"><link href="/js/chunk-842aee10.a4890172.js" rel="prefetch"><link href="/js/chunk-8583df3c.6a847b20.js" rel="prefetch"><link href="/js/chunk-98f99a2c.37a706b7.js" rel="prefetch"><link href="/js/chunk-a9fbadf0.09c9e937.js" rel="prefetch"><link href="/js/chunk-b4234658.1403c33c.js" rel="prefetch"><link href="/js/chunk-d7b56b58.a77a91d0.js" rel="prefetch"><link href="/js/chunk-d82e415e.538c7348.js" rel="prefetch"><link href="/js/chunk-e2c4ac18.ddf06e8b.js" rel="prefetch"><link href="/js/chunk-e319cd5c.55da3258.js" rel="prefetch"><link href="/css/app.72b6f813.css" rel="preload" as="style"><link href="/css/chunk-vendors.f4913a35.css" rel="preload" as="style"><link href="/js/app.f34af124.js" rel="preload" as="script"><link href="/js/chunk-vendors.a6afeffe.js" rel="preload" as="script"><link href="/css/chunk-vendors.f4913a35.css" rel="stylesheet"><link href="/css/app.72b6f813.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but it doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="/js/chunk-vendors.a6afeffe.js"></script><script src="/js/app.f34af124.js"></script></body></html>
::-webkit-scrollbar-thumb:active{background-color:#07C160}</style><link href="/css/chunk-1af754fa.e1e0247d.css" rel="prefetch"><link href="/css/chunk-3264b806.ab0373ec.css" rel="prefetch"><link href="/css/chunk-340486ec.d07903e2.css" rel="prefetch"><link href="/css/chunk-3e5d8082.9bb68a1d.css" rel="prefetch"><link href="/css/chunk-4becffd5.38774961.css" rel="prefetch"><link href="/css/chunk-4c09bacb.5556c59f.css" rel="prefetch"><link href="/css/chunk-4fd6d7f0.83845a9b.css" rel="prefetch"><link href="/css/chunk-57324832.80096fc0.css" rel="prefetch"><link href="/css/chunk-5d990344.6bcfc99c.css" rel="prefetch"><link href="/css/chunk-6cddf9c4.2f12db76.css" rel="prefetch"><link href="/css/chunk-7e1f652a.286494f0.css" rel="prefetch"><link href="/css/chunk-842aee10.0c43dff1.css" rel="prefetch"><link href="/css/chunk-8583df3c.87d5fe76.css" rel="prefetch"><link href="/css/chunk-98f99a2c.e8a7c696.css" rel="prefetch"><link href="/css/chunk-a9fbadf0.baa718b4.css" rel="prefetch"><link href="/css/chunk-b4234658.6a07402f.css" rel="prefetch"><link href="/css/chunk-d7b56b58.d635b2f3.css" rel="prefetch"><link href="/css/chunk-d82e415e.e6ab9c20.css" rel="prefetch"><link href="/css/chunk-e2c4ac18.5cf6519b.css" rel="prefetch"><link href="/js/chunk-1af754fa.55a34e0c.js" rel="prefetch"><link href="/js/chunk-3264b806.44cd983f.js" rel="prefetch"><link href="/js/chunk-340486ec.b471409f.js" rel="prefetch"><link href="/js/chunk-3e5d8082.cc03b6c8.js" rel="prefetch"><link href="/js/chunk-4becffd5.06d63bca.js" rel="prefetch"><link href="/js/chunk-4c09bacb.5b30c54b.js" rel="prefetch"><link href="/js/chunk-4db20436.34f9cd3c.js" rel="prefetch"><link href="/js/chunk-4fd6d7f0.8df2e44b.js" rel="prefetch"><link href="/js/chunk-57324832.145f7aff.js" rel="prefetch"><link href="/js/chunk-5d990344.8f1d8dd0.js" rel="prefetch"><link href="/js/chunk-6cddf9c4.d61e8a4d.js" rel="prefetch"><link href="/js/chunk-7e1f652a.c277dff9.js" rel="prefetch"><link href="/js/chunk-842aee10.a4890172.js" rel="prefetch"><link href="/js/chunk-8583df3c.6a847b20.js" rel="prefetch"><link href="/js/chunk-98f99a2c.37a706b7.js" rel="prefetch"><link href="/js/chunk-a9fbadf0.09c9e937.js" rel="prefetch"><link href="/js/chunk-b4234658.1403c33c.js" rel="prefetch"><link href="/js/chunk-d7b56b58.a77a91d0.js" rel="prefetch"><link href="/js/chunk-d82e415e.538c7348.js" rel="prefetch"><link href="/js/chunk-e2c4ac18.ddf06e8b.js" rel="prefetch"><link href="/css/app.72b6f813.css" rel="preload" as="style"><link href="/css/chunk-vendors.f4913a35.css" rel="preload" as="style"><link href="/js/app.63b3794d.js" rel="preload" as="script"><link href="/js/chunk-vendors.a6afeffe.js" rel="preload" as="script"><link href="/css/chunk-vendors.f4913a35.css" rel="stylesheet"><link href="/css/app.72b6f813.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but it doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="/js/chunk-vendors.a6afeffe.js"></script><script src="/js/app.63b3794d.js"></script></body></html>

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -1,3 +1,12 @@
## 2.5.0
1. 增加开发模式自定义协议头
2. 增加sqlite数据库db文件自定义目录
3. 增加sqlite数据库动态切库demo
4. 增加远程web使用教程及demo
5. 删除loading文件、ci/cd配置文件
6. 删除ee-core中无用的constant
7. 升级ee-core到1.5.0
## 2.4.0
1. 增加混淆/bytecode加密配置opt,提升安全性
2. 增加插件的方式重写托盘、唤醒、升级、安全、扩展等功能