From 701e3bc1412990a83bb186a282d4d4ff48a4610b Mon Sep 17 00:00:00 2001 From: lyd <1419499670@qq.com> Date: Sat, 29 Oct 2022 10:58:15 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java index 401b1a415..8e64c3995 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java @@ -79,7 +79,7 @@ public class PointServiceImpl implements PointService { String[] types = split[j].split("-"); typeArr.put(types[0], types[1]); } - object.put("point_status_name", typeArr.getString(point_type)); + object.put("point_type_name", typeArr.getString(point_type)); } res.add(object); } From 3102a3f0f1aa72a63114bb0a056ed1ced81738df Mon Sep 17 00:00:00 2001 From: ldj_willow Date: Sat, 29 Oct 2022 11:03:01 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lms/nladmin-ui/package.json | 1 - lms/nladmin-ui/src/main.js | 3 --- 2 files changed, 4 deletions(-) diff --git a/lms/nladmin-ui/package.json b/lms/nladmin-ui/package.json index a92d06891..81ea67be7 100644 --- a/lms/nladmin-ui/package.json +++ b/lms/nladmin-ui/package.json @@ -64,7 +64,6 @@ "screenfull": "4.2.0", "sortablejs": "1.8.4", "throttle-debounce": "^5.0.0", - "v-fit-columns": "^0.2.0", "vue": "2.6.10", "vue-color": "^2.8.1", "vue-count-to": "1.0.13", diff --git a/lms/nladmin-ui/src/main.js b/lms/nladmin-ui/src/main.js index ee1942d8d..1fe4089b3 100644 --- a/lms/nladmin-ui/src/main.js +++ b/lms/nladmin-ui/src/main.js @@ -61,9 +61,6 @@ Vue.prototype.handleTree = handleTree Vue.prototype.getValueByCode = getValueByCode Vue.prototype.flexWidth = flexWidth -import Plugin from 'v-fit-columns' -Vue.use(Plugin) - Vue.use(scroll) Vue.use(VueHighlightJS) From 3574a6896bc1a38b2647947e05ced02b7f55791e Mon Sep 17 00:00:00 2001 From: lyd <1419499670@qq.com> Date: Mon, 31 Oct 2022 10:35:42 +0800 Subject: [PATCH 3/4] =?UTF-8?q?crud.js=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- acs/nladmin-ui/src/components/Crud/crud.js | 23 +++++++++++++++------- lms/nladmin-ui/src/components/Crud/crud.js | 23 +++++++++++++++------- 2 files changed, 32 insertions(+), 14 deletions(-) diff --git a/acs/nladmin-ui/src/components/Crud/crud.js b/acs/nladmin-ui/src/components/Crud/crud.js index 74d4f802f..523fd1881 100644 --- a/acs/nladmin-ui/src/components/Crud/crud.js +++ b/acs/nladmin-ui/src/components/Crud/crud.js @@ -268,7 +268,11 @@ function CRUD(options) { /** * 取消新增/编辑 */ - cancelCU() { + cancelCU(formName) { + if (formName instanceof PointerEvent) { + formName = 'form' + } + const addStatus = crud.status.add const editStatus = crud.status.edit const viewStatus = crud.status.view @@ -296,18 +300,21 @@ function CRUD(options) { callVmHook(crud, CRUD.HOOK.afterEditCancel, crud.form) } // 清除表单验证 - if (crud.findVM('form').$refs['form']) { - crud.findVM('form').$refs['form'].clearValidate() + if (crud.findVM('form').$refs[formName]) { + crud.findVM('form').$refs[formName].clearValidate() } }, /** * 提交新增/编辑 */ - submitCU(form) { + submitCU(formName) { + if (formName instanceof PointerEvent) { + formName = 'form' + } if (!callVmHook(crud, CRUD.HOOK.beforeValidateCU)) { return } - crud.findVM('form').$refs['form'].validate(valid => { + crud.findVM('form').$refs[formName].validate(valid => { if (!valid) { return } @@ -493,8 +500,10 @@ function CRUD(options) { } } // add by ghl 2020-10-04 页面重复添加信息时，下拉框的校验会存在，需要找工取消 - if (crud.findVM('form').$refs['form']) { - crud.findVM('form').$refs['form'].clearValidate() + let form_ref = 'form' + if (crudFrom.form_ref) form_ref = crudFrom.form_ref + if (crud.findVM('form').$refs[form_ref]) { + crud.findVM('form').$refs[form_ref].clearValidate() } }, /** diff --git a/lms/nladmin-ui/src/components/Crud/crud.js b/lms/nladmin-ui/src/components/Crud/crud.js index 74d4f802f..523fd1881 100644 --- a/lms/nladmin-ui/src/components/Crud/crud.js +++ b/lms/nladmin-ui/src/components/Crud/crud.js @@ -268,7 +268,11 @@ function CRUD(options) { /** * 取消新增/编辑 */ - cancelCU() { + cancelCU(formName) { + if (formName instanceof PointerEvent) { + formName = 'form' + } + const addStatus = crud.status.add const editStatus = crud.status.edit const viewStatus = crud.status.view @@ -296,18 +300,21 @@ function CRUD(options) { callVmHook(crud, CRUD.HOOK.afterEditCancel, crud.form) } // 清除表单验证 - if (crud.findVM('form').$refs['form']) { - crud.findVM('form').$refs['form'].clearValidate() + if (crud.findVM('form').$refs[formName]) { + crud.findVM('form').$refs[formName].clearValidate() } }, /** * 提交新增/编辑 */ - submitCU(form) { + submitCU(formName) { + if (formName instanceof PointerEvent) { + formName = 'form' + } if (!callVmHook(crud, CRUD.HOOK.beforeValidateCU)) { return } - crud.findVM('form').$refs['form'].validate(valid => { + crud.findVM('form').$refs[formName].validate(valid => { if (!valid) { return } @@ -493,8 +500,10 @@ function CRUD(options) { } } // add by ghl 2020-10-04 页面重复添加信息时，下拉框的校验会存在，需要找工取消 - if (crud.findVM('form').$refs['form']) { - crud.findVM('form').$refs['form'].clearValidate() + let form_ref = 'form' + if (crudFrom.form_ref) form_ref = crudFrom.form_ref + if (crud.findVM('form').$refs[form_ref]) { + crud.findVM('form').$refs[form_ref].clearValidate() } }, /** From 3044a8654d00b45eb4fc4ea884931c7648f0b318 Mon Sep 17 00:00:00 2001 From: ldj_willow Date: Mon, 31 Oct 2022 11:08:09 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lms/nladmin-ui/src/assets/styles/eladmin.scss | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/lms/nladmin-ui/src/assets/styles/eladmin.scss b/lms/nladmin-ui/src/assets/styles/eladmin.scss index 89b347ea4..57a62e5db 100644 --- a/lms/nladmin-ui/src/assets/styles/eladmin.scss +++ b/lms/nladmin-ui/src/assets/styles/eladmin.scss @@ -167,6 +167,7 @@ input[type="number"]::-webkit-outer-spin-button { } //去除编辑文本框为数字时的上下箭头end + //设置计数器文字居左 .el-input-number--mini .el-input__inner { text-align: left; @@ -192,10 +193,12 @@ input[type="number"]::-webkit-outer-spin-button { height: 35px; font-size: 13px; } - td{ - color: #f8f8f9; + + td { + color: #f8f8f9; } } + .el-table__body-wrapper { .el-button [class*="el-icon-"] + span { margin-left: 1px; @@ -203,3 +206,13 @@ input[type="number"]::-webkit-outer-spin-button { } } +//表格固定列最后一行显示不全(https://mp.weixin.qq.com/s/HpoykJNtsynsW4UMHitZbQ) +.el-table__fixed-right { + height: 100% !important; +} + +//表头与内容错位 +.el-table--scrollable-y .el-table__body-wrapper { + overflow-y: overlay !important; +} +