From ad58a16c9d452c2e4d534e081ea3f84001a4595a Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期二, 15 八月 2023 09:26:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue b/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
index ed0186c..df97fda 100644
--- a/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
+++ b/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
@@ -327,6 +327,7 @@
<template slot-scope="{ row }">
<el-input v-if="editingRows === row && editShows== item.prop && item.prop != 'codeDateFormat' && (item.edit == 'text' ||item.edit == 'refer' )"
ref="inputRef"
+ v-show="!AddCellFlag"
v-model="row[item.prop]"
autofocus @blur="saveRows"></el-input>
<el-input-number v-if="editingRows === row && editShows== item.prop && item.edit == 'number'" v-model="row[item.prop]"
@@ -481,6 +482,8 @@
},
data() {
return {
+ // 淇濆瓨鍗曞厓鏍肩姸鎬�
+ AddCellFlag:false,
//鍏ㄥ睆缂栬緫楂樺害鐘舵��
editStyleFlag: false,
loading: false,
@@ -1740,7 +1743,7 @@
addsHandler(event) {
this.$refs.referAttrCrud.sort("orderNum");
var ischeck = true;
- console.log(this.ProData)
+ console.log('ProData',this.ProData)
this.ProData.forEach((item, index) => {
if ((item.requireFlag && item.requireFlag.toString() == 'true') && (item.readOnlyFlag && item.readOnlyFlag.toString() == 'true')) {
this.$message.warning(item.name + "(" + item.id + ")蹇呰緭鐨勫睘鎬т笉鑳芥槸鍙");
@@ -1796,6 +1799,7 @@
this.editOpenFlag = false;
// 璋冪敤鐖剁粍浠朵慨鏀规寜閽姸鎬�
this.$emit('editCloseChildren')
+ this.AddCellFlag=true;
}).catch(() => {
this.$message.warning('淇濆瓨澶辫触锛岃鏌ョ湅鎺у埗鍙拌緭鍑猴紒')
});
@@ -1836,7 +1840,7 @@
}
} else if (column.property == 'componentRule') {
if (this.CurrentCell) {
- this.CurrentCell.componentRule = this.componentRuleText;
+ // this.CurrentCell.componentRule = this.componentRuleText;
}
this.isShowformulaEdit = true;
} else if (column.property == 'enumString') {
@@ -2026,12 +2030,11 @@
},
//鍒嗙被娉ㄥ叆娓呯┖
injectHandleReset() {
- // this.injectOption.classifyInvokeAttrName = "鍒嗙被鍚嶇О";
- // this.injectOption.classifyInvokeAttr = "name";
- // this.injectOption.classifyInvokeLevel = "min";
- // this.injectOption.classifyInvokeEditFlag = "true";
- // this.injectOption.classifyNumber = "0";
this.$set(this.CurrentCell, 'classifyInvokeText', '')
+ this.$set(this.CurrentCell, 'classifyInvokeAttr:', '')
+ this.$set(this.CurrentCell, 'classitwInvokeAttrName', '')
+ this.$set(this.CurrentCell, 'classifyInvokeEditFlag', 'false')
+ this.$set(this.CurrentCell, 'classifyInvokeLevel', 'none')
this.injectVisible = false;
},
// 鍒嗙被娉ㄥ叆鍙栨秷
@@ -2102,6 +2105,7 @@
updataFormlaContent(val) {
if (this.CurrentCell) {
this.$set(this.CurrentCell, 'componentRule', val.replace(/"/g, ''))
+ this.componentRuleText= this.CurrentCell.componentRule
} else {
this.$set(this.attrRow, 'componentRule', val.replace(/"/g, ''))
}
@@ -2123,6 +2127,7 @@
//寮�鍚紪杈�
editOpen() {
this.editOpenFlag = true;
+ this.AddCellFlag=false;
},
//瀹氫箟涓�涓叧闂紪杈戠殑鏂规硶渚涘瓙缁勪欢浣跨敤
editClose() {
--
Gitblit v1.9.3