Skip to content

Commit cd776eb

Browse files
committed
release beta verison source code
1 parent 6196c82 commit cd776eb

File tree

6 files changed

+65
-10
lines changed

6 files changed

+65
-10
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "openbom",
3-
"version": "0.1.0",
3+
"version": "0.2.0",
44
"private": true,
55
"scripts": {
66
"serve": "vue-cli-service serve",

src/components/bomTable.vue

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,7 @@
147147
:table="productValue"
148148
:edit="edit"
149149
@added="add2bomDone"
150+
@updated="update2bomDone"
150151
></jlc2Bom>
151152
</el-dialog>
152153
</div>
@@ -286,6 +287,7 @@ export default {
286287
editItem(index, val) {
287288
this.bomItem = val;
288289
this.edit = true;
290+
this.index = index;
289291
this.$nextTick(() => {
290292
this.showAddBom = true;
291293
});
@@ -320,6 +322,10 @@ export default {
320322
this.showAddBom = true;
321323
});
322324
},
325+
update2bomDone(val){
326+
this.showAddBom = false;
327+
this.$set(this.tableData,this.index,val.value)
328+
},
323329
handleCurrentChange(val) {
324330
this.loading = true;
325331
ipcRenderer.send("getData", {

src/components/dbConfig.vue

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,14 @@
5757
"
5858
></i>
5959
</h2>
60+
<el-alert
61+
v-if="!jlcConnect.status"
62+
:title="jlcConnect.msg"
63+
type="error"
64+
show-icon
65+
:closable="false"
66+
class="tip"
67+
></el-alert>
6068
<el-alert
6169
title="Can't change these parameters right now!"
6270
type="info"
@@ -106,8 +114,8 @@ export default {
106114
type: "mysql",
107115
host: "www.whyengineer.com",
108116
port: 3306,
109-
username: "jlc",
110-
password: "71451085a",
117+
username: "openbom-jlc",
118+
password: "openbom",
111119
database: "jlc",
112120
},
113121
bom: {

src/components/jlc2bom.vue

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -272,9 +272,25 @@ export default {
272272
});
273273
}
274274
});
275+
ipcRenderer.on("dbUpdateItemBomRet", (evt, data) => {
276+
if (data.status) {
277+
this.$notify({
278+
title: "Success",
279+
message: `Update ${data.value.value} to BOM ok!`,
280+
type: "success",
281+
});
282+
this.$emit("updated", data);
283+
} else {
284+
this.$notify.error({
285+
title: "Error",
286+
message: data.err,
287+
});
288+
}
289+
});
275290
},
276291
destroyed() {
277292
ipcRenderer.removeAllListeners("dbCreateItemBomRet");
293+
ipcRenderer.removeAllListeners("dbUpdateItemBomRet");
278294
},
279295
280296
props: {
@@ -314,11 +330,11 @@ export default {
314330
updateForm(formName) {
315331
this.$refs[formName].validate((valid) => {
316332
if (valid) {
317-
ipcRenderer.send("dbCreateItem", {
333+
ipcRenderer.send("dbUpdateItem", {
318334
db: "bom",
319-
column: "cap",
335+
column: this.table,
320336
value: this.convertForm(),
321-
event: "dbCreateItemBomRet",
337+
event: "dbUpdateItemBomRet",
322338
});
323339
}
324340
});

src/components/table.vue

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,7 @@ export default {
222222
ipcRenderer.send("dbGetCount", {
223223
event: "dbGetCountRet",
224224
db: this.db,
225+
buildSearch: true,
225226
column: this.table,
226227
option: `type_="${this.type}"`,
227228
type: this.type,
@@ -272,6 +273,7 @@ export default {
272273
this.loading = true;
273274
ipcRenderer.send("dbGetCount", {
274275
event: "dbGetCountRet",
276+
buildSearch: true,
275277
db: this.db,
276278
column: this.table,
277279
option: `type_="${this.type}"`,

src/db/db.js

Lines changed: 27 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,27 @@ export default class Db {
5252
}
5353
evt.reply(val.event, parseRet)
5454
})
55+
ipcMain.on('dbUpdateItem', (evt, db) => {
56+
if (this.connected[db.db]) {
57+
this.repo[db.db][db.column].update({pn:db.value.pn},db.value).then(() => {
58+
let ret = db
59+
ret.status = true
60+
evt.reply(db.event, ret)
61+
}).catch(err => {
62+
log.error(err)
63+
let ret = db
64+
ret.status = false
65+
ret.err = err.message
66+
evt.reply(db.event, ret)
67+
})
68+
} else {
69+
let ret = db
70+
ret.status = false
71+
ret.err = `${db.db} doesn't connect`
72+
evt.reply(db.event, ret)
73+
}
74+
75+
})
5576
ipcMain.on('dbDeleteItem', (evt, db) => {
5677
if (this.connected[db.db]) {
5778
this.repo[db.db][db.column].delete(db.value.id).then(() => {
@@ -222,6 +243,7 @@ export default class Db {
222243

223244

224245
}).catch(err => {
246+
log.error(err)
225247
this.lastErr.bom = err;
226248
this.connected.bom = false
227249
})
@@ -231,15 +253,15 @@ export default class Db {
231253
}
232254
}
233255
connectJlc(sync) {
234-
let jlcConParam = store.get('jlcConParam', {
256+
let jlcConParam = {
235257
name: "jlc",
236258
type: "mysql",
237259
host: "www.whyengineer.com",
238260
port: 3306,
239-
username: "jlc",
240-
password: "71451085a",
261+
username: "openbom-jlc",
262+
password: "openbom",
241263
database: "jlc",
242-
})
264+
}
243265
jlcConParam.logging = this.log
244266
jlcConParam.synchronize = sync
245267
jlcConParam.entities = [Cap, Res, Diode, Connector]
@@ -256,6 +278,7 @@ export default class Db {
256278

257279

258280
}).catch(err => {
281+
log.error(err)
259282
this.lastErr.jlc = err
260283
this.connected.jlc = false;
261284
})

0 commit comments

Comments
 (0)