2.1.6

electron/controller/example.js

@@ -81,7 +81,7 @@ class ExampleController extends Controller {
   }
 
   /**
-   * sqlite数据库操作 (测试功能，不要使用)
+   * sqlite数据库操作
    */   
   async sqlitedbOperation(args) {
     const { service } = this;
@@ -108,7 +108,7 @@ class ExampleController extends Controller {
         break;
     }
 
-    //data.all_list = await service.storage.getAllTestDataSqlite();
+    data.all_list = await service.storage.getAllTestDataSqlite();
 
     return data;
   }

electron/service/storage.js

@@ -15,7 +15,10 @@ class StorageService extends Service {
 
     // lowdb数据库
     this.systemDB = Storage.JsonDB.connection('system');
-    this.demoDB = Storage.JsonDB.connection('demo');  
+    let lowdbOptions = {
+      driver: 'lowdb'
+    }
+    this.demoDB = Storage.JsonDB.connection('demo', lowdbOptions);  
     this.systemDBKey = {
       cache: 'cache'
     };
@@ -25,7 +28,14 @@ class StorageService extends Service {
     };
 
     // sqlite数据库
-    this.demoSqliteDB = Storage.JsonDB.connection('demo.db', 'sqlite');
+    let sqliteOptions = {
+      driver: 'sqlite',
+      default: {
+        timeout: 6000,
+        verbose: console.log // 打印sql语法
+      }
+    }
+    this.demoSqliteDB = Storage.JsonDB.connection('sqlite-demo.db', sqliteOptions);
   }
 
   /*
@@ -116,38 +126,105 @@ class StorageService extends Service {
   }
 
   /*
+   * 检查并创建表 (sqlite)
+   */
+  async checkAndCreateTableSqlite(tableName = '') {
+    if (_.isEmpty(tableName)) {
+      throw new Error(`table name is required`);
+    }
+    // 检查表是否存在
+    const userTable = this.demoSqliteDB.db.prepare('SELECT * FROM sqlite_master WHERE type=? AND name = ?');
+    const result = userTable.get('table', tableName);
+    //console.log('result:', result);
+    if (result) {
+      return;
+    }
+
+    // 创建表
+    const create_table_user =
+    `CREATE TABLE ${tableName}
+     (
+        id INTEGER PRIMARY KEY AUTOINCREMENT,
+        name CHAR(50) NOT NULL,
+        age INT
+     );`
+    this.demoSqliteDB.db.exec(create_table_user);
+
+  }
+
+  /*
    * 增 Test data (sqlite)
    */
-  async addTestDataSqlite(user) {
-    console.log("user:", user);
+  async addTestDataSqlite(data) {
+    //console.log("add data:", data);
+
+    let table = 'user';
+    await this.checkAndCreateTableSqlite(table);
+
+    const insert = this.demoSqliteDB.db.prepare(`INSERT INTO ${table} (name, age) VALUES (@name, @age)`);
+    insert.run(data);
+
+    return true;
   }
 
   /*
    * 删 Test data (sqlite)
    */
   async delTestDataSqlite(name = '') {
-  
+    //console.log("delete name:", name);
+
+    let table = 'user';
+    await this.checkAndCreateTableSqlite(table);
+
+    const delUser = this.demoSqliteDB.db.prepare(`DELETE FROM ${table} WHERE name = ?`);
+    delUser.run(name);
+
+    return true;
   }
 
   /*
    * 改 Test data (sqlite)
    */
   async updateTestDataSqlite(name= '', age = 0) {
+    //console.log("update :", {name, age});
+
+    let table = 'user';
+    await this.checkAndCreateTableSqlite(table);
+
+    const updateUser = this.demoSqliteDB.db.prepare(`UPDATE ${table} SET age = ? WHERE name = ?`);
+    updateUser.run(age, name);
 
+    return true;
   }  
 
   /*
    * 查 Test data (sqlite)
    */
   async getTestDataSqlite(age = 0) {
+    //console.log("select :", {age});
 
+    let table = 'user';
+    await this.checkAndCreateTableSqlite(table);
+
+    const selectUser = this.demoSqliteDB.db.prepare(`SELECT * FROM ${table} WHERE age = @age`);
+    const users = selectUser.all({age: age});
+    //console.log("select users:", users);
+    return users;
   }  
   
   /*
    * all Test data (sqlite)
    */
   async getAllTestDataSqlite() {
+    //console.log("select all user");
+
+    let table = 'user';
+    await this.checkAndCreateTableSqlite(table);
 
+    const selectAllUser = this.demoSqliteDB.db.prepare(`SELECT * FROM ${table} `);
+    const allUser =  selectAllUser.all();
+    //console.log("select allUser:", allUser);
+    return allUser;
   }  
 }
 

frontend/src/config/router.config.js

@@ -31,11 +31,11 @@ export const constantRouterMap = [
             name: 'BaseDBIndex',
             component: () => import('@/views/base/db/Index')
           },
-          // {
-          //   path: '/base/sqlitedb/index',
-          //   name: 'BaseSqliteDBIndex',
-          //   component: () => import('@/views/base/sqlitedb/Index')
-          // },
+          {
+            path: '/base/sqlitedb/index',
+            name: 'BaseSqliteDBIndex',
+            component: () => import('@/views/base/sqlitedb/Index')
+          },
           {
             path: '/base/windowview/index',
             name: 'BaseWindowViewIndex',

frontend/src/config/subMenu.js

@@ -29,7 +29,7 @@ export default {
 		},    
 		'menu_310' : {
 			icon: 'profile',
-			title: '数据库',
+			title: 'json数据库',
 			pageName: 'BaseDBIndex',
 			params: {}
 		},

frontend/src/views/base/db/Index.vue

@@ -2,19 +2,19 @@
   <div id="app-base-db">
     <div class="one-block-1">
       <span>
-        1. 本地数据库
+        1. LowDB本地数据库
       </span>
     </div>  
     <div class="one-block-2">
       <a-row>
         <a-col :span="8">
-          • LowDB本地JSON数据库
+          • 小数据量: 0~100M(单库)
         </a-col>
         <a-col :span="8">
-          • 可使用lodash语法
+          • json数据库
         </a-col>
         <a-col :span="8">
-          
+          • 兼容lodash语法
         </a-col>
       </a-row>
     </div>

frontend/src/views/base/sqlitedb/Index.vue

@@ -2,13 +2,13 @@
   <div id="app-base-db">
     <div class="one-block-1">
       <span>
-        1. sqlite本地数据库 （测试功能，无法使用）
+        1. sqlite本地数据库
       </span>
     </div>  
     <div class="one-block-2">
       <a-row>
         <a-col :span="8">
-          • 大数据量存储
+          • 大数据量: 0-1024GB(单库)
         </a-col>
         <a-col :span="8">
           • 高性能
@@ -90,7 +90,7 @@
     <div class="one-block-2">
       <a-row>
         <a-col :span="6">
-          <a-input v-model="update_name" :value="update_name" addon-before="姓名" />
+          <a-input v-model="update_name" :value="update_name" addon-before="姓名(条件)" />
         </a-col>
         <a-col :span="3">
         </a-col>
@@ -123,7 +123,7 @@
         <a-col :span="3">
         </a-col>
         <a-col :span="6">
-          <a-button @click="dbOperation('del')">
+          <a-button @click="sqlitedbOperation('del')">
             删除
           </a-button>
         </a-col>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ee",
-  "version": "2.1.5",
+  "version": "2.1.6",
   "description": "A fast, desktop software development framework",
   "main": "main.js",
   "scripts": {
@@ -106,16 +106,17 @@
   "devDependencies": {
     "debug": "^4.3.3",
     "electron": "^13.6.9",
-    "electron-builder": "^23.0.3",
-    "electron-rebuild": "^3.2.7",
+    "electron-builder": "^23.1.0",
+    "electron-rebuild": "^3.2.8",
     "eslint": "^5.13.0",
     "eslint-config-egg": "^7.1.0",
     "eslint-plugin-prettier": "^3.0.1",
     "nodemon": "^2.0.16"
   },
   "dependencies": {
+    "better-sqlite3": "^7.6.0",
     "dayjs": "^1.10.7",
-    "ee-core": "^1.2.7",
+    "ee-core": "^1.2.8-beta.3",
     "electron-is": "^3.0.0",
     "lodash": "^4.17.21"
   }

public/dist/css/chunk-06e8a5da.87d5fe76.css

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

public/dist/css/chunk-14d8bf83.1ec378ff.css

@@ -0,0 +1 @@
+#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}

public/dist/css/chunk-9d6d2b58.8536a744.css

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

public/dist/js/chunk-3ce23730.c97b7cb7.js → public/dist/js/chunk-3ce23730.0b34d0d3.js

@@ -1,2 +1,2 @@
 (window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-3ce23730"],{1768:function(t,n,e){"use strict";e.r(n);var c=function(){var t=this,n=t.$createElement;t._self._c;return t._m(0)},s=[function(){var t=this,n=t.$createElement,e=t._self._c||n;return e("div",{attrs:{id:"app-other"}},[e("div",{staticClass:"one-block-1"},[e("span",[t._v(" 待开发... ")])]),e("div",{staticClass:"one-block-2"})])}],i={data:function(){return{}},methods:{test:function(){}}},a=i,o=(e("fbed"),e("2877")),r=Object(o["a"])(a,c,s,!1,null,"7114d282",null);n["default"]=r.exports},f291:function(t,n,e){},fbed:function(t,n,e){"use strict";e("f291")}}]);
-//# sourceMappingURL=chunk-3ce23730.c97b7cb7.js.map
+//# sourceMappingURL=chunk-3ce23730.0b34d0d3.js.map

update.md

@@ -1,3 +1,10 @@
+## 2.1.6
+1. 增加sqlite数据库
+2. 增加sqlite增删改查demo
+3. 增加http服务body，支持表单、文件等
+4. 修复热重启bug
+5. 升级ee-core到1.2.8
+
 ## 2.1.5
 1. 增加ee-core命令