umbrella22

更新依赖版本号,win上测试无异常

...@@ -54,9 +54,9 @@ ...@@ -54,9 +54,9 @@
54 }, 54 },
55 "dependencies": { 55 "dependencies": {
56 "axios": "^0.18.0", 56 "axios": "^0.18.0",
57 - "element-ui": "^2.6.1", 57 + "element-ui": "^2.6.3",
58 "nedb": "^1.8.0", 58 "nedb": "^1.8.0",
59 - "vue": "^2.6.9", 59 + "vue": "^2.6.10",
60 "vue-electron": "^1.0.6", 60 "vue-electron": "^1.0.6",
61 "vue-router": "^3.0.2", 61 "vue-router": "^3.0.2",
62 "vuex": "^3.1.0", 62 "vuex": "^3.1.0",
...@@ -81,9 +81,9 @@ ...@@ -81,9 +81,9 @@
81 "css-loader": "^0.28.11", 81 "css-loader": "^0.28.11",
82 "del": "^3.0.0", 82 "del": "^3.0.0",
83 "devtron": "^1.4.0", 83 "devtron": "^1.4.0",
84 - "electron": "^2.0.4", 84 + "electron": "^4.1.1",
85 - "electron-builder": "^20.19.2", 85 + "electron-builder": "^20.39.0",
86 - "electron-debug": "^1.5.0", 86 + "electron-debug": "^2.1.0",
87 "electron-devtools-installer": "^2.2.4", 87 "electron-devtools-installer": "^2.2.4",
88 "eslint": "^4.19.1", 88 "eslint": "^4.19.1",
89 "eslint-config-standard": "^11.0.0", 89 "eslint-config-standard": "^11.0.0",
...@@ -118,7 +118,7 @@ ...@@ -118,7 +118,7 @@
118 "vue-html-loader": "^1.2.4", 118 "vue-html-loader": "^1.2.4",
119 "vue-loader": "^15.2.4", 119 "vue-loader": "^15.2.4",
120 "vue-style-loader": "^4.1.0", 120 "vue-style-loader": "^4.1.0",
121 - "vue-template-compiler": "^2.6.9", 121 + "vue-template-compiler": "^2.6.10",
122 "webpack": "^4.15.1", 122 "webpack": "^4.15.1",
123 "webpack-cli": "^3.3.0", 123 "webpack-cli": "^3.3.0",
124 "webpack-dev-server": "^3.1.4", 124 "webpack-dev-server": "^3.1.4",
......
1 import db from '../utils/db' 1 import db from '../utils/db'
2 2
3 export default { 3 export default {
4 - adddata (data) { 4 + adddata(data) {
5 return new Promise((resolve, reject) => { 5 return new Promise((resolve, reject) => {
6 db.insert(data, (err, newdoc) => { 6 db.insert(data, (err, newdoc) => {
7 if (err) { 7 if (err) {
...@@ -12,7 +12,7 @@ export default { ...@@ -12,7 +12,7 @@ export default {
12 }) 12 })
13 }) 13 })
14 }, 14 },
15 - finddata (query) { 15 + finddata(query) {
16 return new Promise((resolve, reject) => { 16 return new Promise((resolve, reject) => {
17 db.find(query, (err, res) => { 17 db.find(query, (err, res) => {
18 if (err) { 18 if (err) {
...@@ -23,7 +23,7 @@ export default { ...@@ -23,7 +23,7 @@ export default {
23 }) 23 })
24 }) 24 })
25 }, 25 },
26 - findone (query) { 26 + findone(query) {
27 return new Promise((resolve, reject) => { 27 return new Promise((resolve, reject) => {
28 db.findOne(query, (err, res) => { 28 db.findOne(query, (err, res) => {
29 if (err) { 29 if (err) {
...@@ -33,5 +33,29 @@ export default { ...@@ -33,5 +33,29 @@ export default {
33 resolve(res) 33 resolve(res)
34 }) 34 })
35 }) 35 })
36 + },
37 + deleone(query) {
38 + return new Promise((reslove, reject) => {
39 + db.remove(query, (err, number) => {
40 + if (err) {
41 + reject(err)
42 + return false
43 + }
44 + reslove(number)
45 + })
46 + })
47 + },
48 + deleall(query) {
49 + return new Promise((reslove, reject) => {
50 + db.remove(query, {
51 + multi: true
52 + }, (err, number) => {
53 + if (err) {
54 + reject(err)
55 + return false
56 + }
57 + reslove(number)
58 + })
59 + })
36 } 60 }
37 } 61 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -5,8 +5,15 @@ ...@@ -5,8 +5,15 @@
5 <div class="left-side"> 5 <div class="left-side">
6 <span class="title">Welcome to your new project!</span> 6 <span class="title">Welcome to your new project!</span>
7 <system-information></system-information> 7 <system-information></system-information>
8 + <div>
8 <span>{{text}}</span> 9 <span>{{text}}</span>
9 </div> 10 </div>
11 + <div v-for="(itme,index) in textarray" :key="index">
12 + <span>{{itme._id}}</span>
13 + <span>{{itme.name}}</span>
14 + <span>{{itme.age}}</span>
15 + </div>
16 + </div>
10 17
11 <div class="right-side"> 18 <div class="right-side">
12 <div class="doc"> 19 <div class="doc">
...@@ -14,6 +21,7 @@ ...@@ -14,6 +21,7 @@
14 <el-button type="primary" round @click="open()">控制台打印</el-button> 21 <el-button type="primary" round @click="open()">控制台打印</el-button>
15 <el-button type="primary" round @click="setdata">写入数据</el-button> 22 <el-button type="primary" round @click="setdata">写入数据</el-button>
16 <el-button type="primary" round @click="getdata">读取数据</el-button> 23 <el-button type="primary" round @click="getdata">读取数据</el-button>
24 + <el-button type="primary" round @click="deledata">清除数据</el-button>
17 </div> 25 </div>
18 </div> 26 </div>
19 </main> 27 </main>
...@@ -31,7 +39,8 @@ export default { ...@@ -31,7 +39,8 @@ export default {
31 newdata: { 39 newdata: {
32 name: "yyy", 40 name: "yyy",
33 age: "12" 41 age: "12"
34 - } 42 + },
43 + textarray: []
35 }), 44 }),
36 methods: { 45 methods: {
37 open(link) { 46 open(link) {
...@@ -46,8 +55,17 @@ export default { ...@@ -46,8 +55,17 @@ export default {
46 getdata() { 55 getdata() {
47 this.$db 56 this.$db
48 .finddata() 57 .finddata()
49 - .then(res => console.log(res)) 58 + .then(res => {
59 + console.log(res);
60 + this.textarray = res;
61 + console.log(this.textarray);
62 + })
50 .catch(err => console.log(err)); 63 .catch(err => console.log(err));
64 + },
65 + deledata(){
66 + this.$db.deleall().then(res=>{
67 +
68 + })
51 } 69 }
52 } 70 }
53 }; 71 };
......