From 9fef877d122559ba7e90a1fc14a662ecc130d9aa Mon Sep 17 00:00:00 2001 From: mgw <1392924357@qq.com> Date: Mon, 27 Nov 2023 22:40:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=AD=A6=E5=91=8A=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Many2OneRadioField/many2one_radio_field.js | 13 ++++++------- sf_machine_connect/models/ftp_client.py | 2 +- sf_warehouse/static/src/js/cust_char.js | 3 --- sf_warehouse/static/src/js/custom_many2one.js | 1 - 4 files changed, 7 insertions(+), 12 deletions(-) diff --git a/jikimo_frontend/static/src/fields/Many2OneRadioField/many2one_radio_field.js b/jikimo_frontend/static/src/fields/Many2OneRadioField/many2one_radio_field.js index 2be3365c..8c2be97f 100644 --- a/jikimo_frontend/static/src/fields/Many2OneRadioField/many2one_radio_field.js +++ b/jikimo_frontend/static/src/fields/Many2OneRadioField/many2one_radio_field.js @@ -15,19 +15,18 @@ export class Many2OneRadioField extends RadioField { // 放大图片逻辑 // 获取图片元素 const img = event.target; - const close = img.nextSibling - + const close = img.nextSibling; // 实现放大图片逻辑 // 比如使用 CSS 放大 img.parentElement.classList.add('zoomed'); - close.classList.add('img_close') + close.classList.add('img_close'); } onCloseClick(event) { const close = event.target; - const img = close.previousSibling - img.parentElement.classList.remove('zoomed') - close.classList.remove('img_close') + const img = close.previousSibling; + img.parentElement.classList.remove('zoomed'); + close.classList.remove('img_close'); } get items() { @@ -48,7 +47,7 @@ export class Many2OneRadioField extends RadioField { } } -Many2OneRadioField.template = "jikimo_frontend.Many2OneRadioField" +Many2OneRadioField.template = "jikimo_frontend.Many2OneRadioField"; // MyCustomWidget.supportedTypes = ['many2many']; registry.category("fields").add("many2one_radio", Many2OneRadioField); diff --git a/sf_machine_connect/models/ftp_client.py b/sf_machine_connect/models/ftp_client.py index 10894d3a..92ccc4d5 100644 --- a/sf_machine_connect/models/ftp_client.py +++ b/sf_machine_connect/models/ftp_client.py @@ -537,7 +537,7 @@ class WorkCenterBarcode(models.Model): action1 = json.dumps(action) return action1 else: - return False + return None def cnc_file_download(self): """ diff --git a/sf_warehouse/static/src/js/cust_char.js b/sf_warehouse/static/src/js/cust_char.js index 9a529d42..d67f2d7a 100644 --- a/sf_warehouse/static/src/js/cust_char.js +++ b/sf_warehouse/static/src/js/cust_char.js @@ -73,10 +73,7 @@ class CustomChar extends CharField { // this.$input.on('focus', function () { // $(this).select(); // }); - - // 当光标聚焦于输入框时,选中输入框内容 - } registry.category("fields").add("custom_char", CustomChar); diff --git a/sf_warehouse/static/src/js/custom_many2one.js b/sf_warehouse/static/src/js/custom_many2one.js index 592d910b..2e0e70bf 100644 --- a/sf_warehouse/static/src/js/custom_many2one.js +++ b/sf_warehouse/static/src/js/custom_many2one.js @@ -24,7 +24,6 @@ class CustomMany2One extends Many2OneField { this.select(); }); } - } registry.category("fields").add("custom_many2one", CustomMany2One);