Quellcode durchsuchen

Merge branch 'master' into ee_dev

gaoshuaixing vor 2 Jahren
Ursprung
Commit
46ccf3f1a4

+ 1 - 1
README.md

@@ -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)    

+ 1 - 1
README.zh-CN.md

@@ -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)    

+ 7 - 1
electron/controller/example.js

@@ -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;
   }

+ 14 - 1
frontend/src/views/base/sqlitedb/Index.vue

@@ -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',

+ 2 - 2
package.json

@@ -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"

+ 1 - 0
public/dist/css/chunk-4c09bacb.5556c59f.css

@@ -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}

+ 0 - 1
public/dist/css/chunk-e319cd5c.1ec378ff.css

@@ -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}

Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
public/dist/index.html


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
public/dist/js/app.63b3794d.js


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
public/dist/js/app.63b3794d.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
public/dist/js/chunk-4c09bacb.5b30c54b.js


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
public/dist/js/chunk-4c09bacb.5b30c54b.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
public/dist/js/chunk-e319cd5c.55da3258.js


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
public/dist/js/chunk-e319cd5c.55da3258.js.map


+ 9 - 0
update.md

@@ -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. 增加插件的方式重写托盘、唤醒、升级、安全、扩展等功能

Einige Dateien werden nicht angezeigt, da zu viele Dateien in diesem Diff geändert wurden.