From afacdf457f6ad75f9810e7cb900ff0f52d79c71b Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期一, 31 七月 2023 11:30:07 +0800
Subject: [PATCH] 主题库切换分类默认数据
---
Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue | 18 +++++++++
Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue | 36 ++++++++++++++++-
Source/UBCS-WEB/vue.config.js | 4 +-
Source/UBCS-WEB/src/components/Theme/ThemeTemplatePro.vue | 4 +-
4 files changed, 55 insertions(+), 7 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue b/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
index cd1c2d8..2adc176 100644
--- a/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
+++ b/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
@@ -371,6 +371,24 @@
deep:true,
immediate:true
},
+ Formlist:{
+ handler(newval,oldval){
+ if(newval.length === 0){
+ this.crudArrayFlag=false
+ return
+ }
+ }
+ },
+ ProData:{
+ handler(newval,oldval){
+ if(newval){
+ this.loading=true;
+ setTimeout(() => {
+ this.loading=false
+ }, 1000);
+ }
+ }
+ },
'injectOption.classifyInvokeAttr': function(newVal) {
console.log('newVal',newVal)
if (newVal === "name") {
diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
index 1b5b779..cad2aeb 100644
--- a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
+++ b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
@@ -353,6 +353,7 @@
//瀵煎叆鐘舵�佹
ThemeImportVisible:false,
selectRow:'',
+ selectList:[],
//鏍戣妭鐐规樉绀洪殣钘�
TreeFlagCode:false,
//缂栫爜瑙勫垯
@@ -966,8 +967,7 @@
this.crudOid=row.oid;
this.crudLCStatus=row.lcStatus;
this.crudArray.push(row);
- console.log(row.$index)
- gridCodeClassifyTemplateAttr({'conditionMap[classifyTemplateOid]': row.oid}).then(res => {
+ gridCodeClassifyTemplateAttr({'conditionMap[classifyTemplateOid]': this.Formlist[this.selectRow].oid}).then(res => {
this.ProData = res.data.data;
//鍒嗙被娉ㄥ叆鏁版嵁鏍煎紡
this.ProData = res.data.data.map((item) => {
@@ -1203,7 +1203,6 @@
}
this.nodeClickList = data
- this.ProData=[];
this.selectRow=0;
try {
await TreeObjcet(data.oid).then(res => {
@@ -1219,6 +1218,37 @@
return item.codeclassifyoid == this.nodeClickList.oid
}
})
+ console.log('form',this.Formlist)
+ if(this.Formlist.length >= 1){
+ this.crudLCStatus=this.Formlist[0].lcStatus;
+ this.crudArray.push(this.Formlist[0]);
+ gridCodeClassifyTemplateAttr({'conditionMap[classifyTemplateOid]': this.Formlist[0].oid}).then(res => {
+ this.ProData = res.data.data;
+ console.log(this.ProData)
+ //鍒嗙被娉ㄥ叆鏁版嵁鏍煎紡
+ this.ProData = res.data.data.map((item) => {
+ //濡傛灉鍒嗙被娉ㄥ叆classifyInvokeAttr涓虹┖璇存槑鏄垵濮嬬姸鎬�
+ if(item.classifyInvokeAttr !== ''){
+ if (!item.hasOwnProperty('classifyInvokeText')) { // 妫�鏌lassifyInvokeText灞炴�ф槸鍚﹀瓨鍦�
+ item = {
+ ...item,
+ classifyInvokeText: {
+ "娉ㄥ叆绫诲瀷": item.classifyInvokeAttr,
+ "娉ㄥ叆绫诲瀷鍚嶇О": item.classifyInvokeAttrName,
+ "灞傜骇璁剧疆": item.classifyInvokeLevel,
+ "鏄惁鍙慨鏀�": item.classifyInvokeEditFlag
+ }
+ };
+ }
+ }
+ return item;
+ });
+ }).catch(res => {
+ this.$message.error(res)
+ })
+ }else {
+ this.ProData = [];
+ }
}).catch(res => {
this.$message.error(res)
})
diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeTemplatePro.vue b/Source/UBCS-WEB/src/components/Theme/ThemeTemplatePro.vue
index d17656e..bf86f96 100644
--- a/Source/UBCS-WEB/src/components/Theme/ThemeTemplatePro.vue
+++ b/Source/UBCS-WEB/src/components/Theme/ThemeTemplatePro.vue
@@ -2,7 +2,7 @@
<basic-container>
<avue-tabs :option="Taboption" @change="handleChange"></avue-tabs>
<span v-if="type.prop==='tab1'">
- <attrCrud :ProData="ProData" :editOpenFlag="editOpenFlag" :crudOid="crudOid" :checkStatus="checkStatus" :crudLCStatus="crudLCStatus" :crudArray="crudArray" :Formlist="Formlist" :codeClassifyOid="codeClassifyOid"></attrCrud>
+ <attrCrud :ProData="ProData" :editOpenFlag="editOpenFlag" :crudOid="crudOid" :checkStatus="checkStatus" :crudLCStatus="crudLCStatus" :crudArray="crudArray" :Formlist="Formlist" :codeClassifyOid="codeClassifyOid"></attrCrud>
</span>
<span v-else-if="type.prop==='tab2'">
<FlowPath :code="this.crudOid" :checkStatus="checkStatus" :crudLCStatus="crudLCStatus"></FlowPath>
@@ -18,7 +18,7 @@
<script>
export default {
name: "TemplatePro.vue",
- props: ['ProData','crudOid','crudLCStatus','crudArray','Formlist','codeClassifyOid','rowIndex'],
+ props: ['ProData','crudOid','crudLCStatus','crudArray','Formlist','codeClassifyOid','rowIndex','crudArrayFlag'],
data: function () {
return {
type: {},
diff --git a/Source/UBCS-WEB/vue.config.js b/Source/UBCS-WEB/vue.config.js
index 54a1f5d..433ecc0 100644
--- a/Source/UBCS-WEB/vue.config.js
+++ b/Source/UBCS-WEB/vue.config.js
@@ -26,9 +26,9 @@
proxy: {
'/api': {
//鏈湴鏈嶅姟鎺ュ彛鍦板潃
- target: 'http://localhost:37000',
+ // target: 'http://localhost:37000',
// target: 'http://192.168.1.51:37000',
- // target: 'http://dev.vci-tech.com:37000',
+ target: 'http://dev.vci-tech.com:37000',
// target: 'http://192.168.1.104:37000',
// target: 'http://192.168.1.63:37000',
// target: 'http://192.168.3.7:37000',
--
Gitblit v1.9.3