From d5e75c51b00c1480903f8fe36174f90d32f2b142 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期五, 04 八月 2023 17:21:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue b/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
index b18084c..3eecc2d 100644
--- a/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
+++ b/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
@@ -388,6 +388,11 @@
}
}
},
+ crudArrayFlag:{
+ handler(newval,olaval){
+ console.log('crudArrayFlag',newval)
+ }
+ },
crudArray:{
handler(newval,oldval){
if(newval != undefined){
@@ -1619,7 +1624,10 @@
this.addVisible = true;
this.busineSelectList = []
this.busineAddList = [];
- this.BuineAttrByBtm()
+ this.BuineAttrByBtm();
+ this.$nextTick(() => {
+ this.$refs.AddOriginPlace.doLayout();
+ })
},
//涓氬姟绫诲瀷鏁版嵁
BuineAttrByBtm(masterParameter){
@@ -1701,22 +1709,29 @@
if(item.componentRule){
//缁勫悎瑙勫垯
num++
+ console.log('componentRule',num)
}
if(item.enumString || item.enumId){
//鏋氫妇
num++
+ console.log('enumString',num)
}
if(item.referConfig || item.referBtmId){
//鍙傜収
num++
+ console.log('referConfig',num)
}
if(item.codeDateFormat){
//鏃堕棿鏍煎紡
num++
+ console.log('codeDateFormat',num)
}
- if(item.classifyInvokeLevel){
+ //濡傛灉绌哄悗鍙拌繑鍥瀗one
+ if(item.classifyInvokeLevel && item.classifyInvokeLevel != 'none'){
//鍒嗙被娉ㄥ叆
num++
+ console.log('classifyInvokeLevel',num)
+ console.log(item.classifyInvokeLevel)
}
if(num>1 && ischeck){
this.$message({
--
Gitblit v1.10.0