From 5a9b31f9dbd1ce22fe385f624a833228f01f319c Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期四, 17 八月 2023 16:03:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue | 29 +++++++++++++++++++----------
1 files changed, 19 insertions(+), 10 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue b/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
index 12f27cd..1c94c45 100644
--- a/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
+++ b/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
@@ -456,6 +456,16 @@
}
}
},
+ // editingRows:{
+ // handler(newval,oldval){
+ // if(newval){
+ // const inputElement = document.querySelector(`#inputRef${newval.oid}`);
+ // if (inputElement) {
+ // inputElement.focus();
+ // };
+ // }
+ // }
+ // },
ProData: {
handler(newval, oldval) {
if (newval) {
@@ -1809,12 +1819,10 @@
this.editShows = column.property;
this.rowOid = row.oid;
this.CurrentCell = row;
- if(this.editingRows){
- const inputElement = document.querySelector(`#inputRef${row.oid}`);
- if (inputElement) {
- inputElement.focus();
- };
- }
+ // const inputElement = document.querySelector(`#inputRef${row.oid}`);
+ // if (inputElement) {
+ // inputElement.focus();
+ // };
if (column.property == 'referConfig') {
this.referConfigVisble = true;
this.referConfigOption = {
@@ -1846,6 +1854,7 @@
this.isShowformulaEdit = true;
} else if (column.property == 'enumString') {
this.enumVisible = true;
+ this.tableData=[];
if (this.CurrentCell.enumString != "") {
this.tableData = JSON.parse(this.CurrentCell.enumString)
return
@@ -1873,10 +1882,10 @@
saveRows() {
this.editingRows = null;
this.editShows = null;
- const inputElement = document.querySelector(`#inputRef${this.CurrentCell.oid}`);
- if (inputElement) {
- inputElement.blur();
- }
+ // const inputElement = document.querySelector(`#inputRef${this.CurrentCell.oid}`);
+ // if (inputElement) {
+ // inputElement.blur();
+ // }
},
// 鏋氫妇娉ㄥ叆娣诲姞涓�琛岀┖鏁版嵁
addRow() {
--
Gitblit v1.9.3