From 7a49d45da7e1d8d1b9aca8bbfcd22b622bc3e6ac Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期五, 28 七月 2023 16:02:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Tree/attrCrud.vue b/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
similarity index 99%
rename from Source/UBCS-WEB/src/components/Tree/attrCrud.vue
rename to Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
index 8f655e7..cd1c2d8 100644
--- a/Source/UBCS-WEB/src/components/Tree/attrCrud.vue
+++ b/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
@@ -1782,8 +1782,10 @@
// noinspection JSCheckFunctionSignatures
if(this.CurrentCell){
//濡傛灉鏄寚瀹氬眰璧嬪�间负鏁板瓧
- if(this.CurrentCell.classifyInvokeLevel!== 'min'){
+ if(this.injectOption.classifyInvokeLevel!== 'min'){
this.CurrentCell.classifyInvokeLevel=this.injectOption.classifyNumber
+ }else {
+ this.CurrentCell.classifyInvokeLevel='min'
}
//鍏朵綑姝ｅ父璧嬪��
this.CurrentCell.classifyInvokeAttr=this.injectOption.classifyInvokeAttr,
@@ -1799,6 +1801,8 @@
//濡傛灉鏄寚瀹氬眰璧嬪�间负鏁板瓧
if(this.injectOption.classifyInvokeLevel !== 'min'){
this.attrSelectList[0].classifyInvokeLevel=this.injectOption.classifyNumber
+ }else {
+ this.attrSelectList[0].classifyInvokeLevel='min'
}
this.$set(this.attrSelectList[0],'classifyInvokeText',data)
}
--
Gitblit v1.9.3