From 13d746094822b401e9d977f81edb9214cab0fba7 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期一, 14 八月 2023 15:11:31 +0800
Subject: [PATCH] 主题库保存验证bug
---
Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue | 18 ++++++++++--------
Source/UBCS-WEB/src/views/system/user.vue | 4 +---
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue b/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
index ed0186c..1d329d1 100644
--- a/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
+++ b/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
@@ -325,7 +325,7 @@
align="center"
>
<template slot-scope="{ row }">
- <el-input v-if="editingRows === row && editShows== item.prop && item.prop != 'codeDateFormat' && (item.edit == 'text' ||item.edit == 'refer' )"
+ <el-input v-if="editingRows === row && editShows== item.prop && item.prop != 'codeDateFormat' && (item.edit == 'text' ||item.edit == 'refer' ) && this.AddCellFlag"
ref="inputRef"
v-model="row[item.prop]"
autofocus @blur="saveRows"></el-input>
@@ -481,6 +481,8 @@
},
data() {
return {
+ // 淇濆瓨鍗曞厓鏍肩姸鎬�
+ AddCellFlag:false,
//鍏ㄥ睆缂栬緫楂樺害鐘舵��
editStyleFlag: false,
loading: false,
@@ -1740,7 +1742,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 + ")蹇呰緭鐨勫睘鎬т笉鑳芥槸鍙");
@@ -1836,7 +1838,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 +2028,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 +2103,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, ''))
}
diff --git a/Source/UBCS-WEB/src/views/system/user.vue b/Source/UBCS-WEB/src/views/system/user.vue
index 4547c5f..10fa0a1 100644
--- a/Source/UBCS-WEB/src/views/system/user.vue
+++ b/Source/UBCS-WEB/src/views/system/user.vue
@@ -372,7 +372,7 @@
trigger: "click"
}],
span: 24,
- value:'986926'
+ // value:'986926'
},
{
label: "鐧诲綍璐﹀彿",
@@ -769,8 +769,6 @@
}else {
this.passVisible=true;
}
- //console.log("selectionList",this.selectionList)
- //console.log(this.UserPwdstrategyVO)
},
// 璁剧疆瀵嗙爜绛栫暐锛屼紶閫掍笅鎷夋鐨刬d鍜屽閫夋鐨刬d
passhandle(){
--
Gitblit v1.9.3