From d590eab5f1392777773f0b2d4a1a5738e699d253 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 13 七月 2023 18:18:01 +0800
Subject: [PATCH] erge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
---
Source/UBCS-WEB/src/const/omd/enum.js | 10 +++--
Source/UBCS-WEB/src/views/modeling/BusinessAdd.vue | 37 +++++++++++-------
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/LinkTypeServiceImpl.java | 7 +++
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/LinkTypeWrapper.java | 2
Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue | 4 +
Source/UBCS-WEB/src/views/modeling/Business.vue | 13 ++++--
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/BtmTreeVO.java | 2 +
Source/UBCS/ubcs-service/ubcs-omd/src/main/resources/mapper/LinkTypeMapper.xml | 4 +-
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/BtmTypeServiceImpl.java | 7 +++
9 files changed, 56 insertions(+), 30 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue b/Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue
index 2d6fc7b..87bf1ca 100644
--- a/Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue
+++ b/Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue
@@ -122,6 +122,7 @@
simOid:"",
btmName:"",
btmOid:"",
+ btmId:"",
masterInput:'',
MasterSearchSelects:"",
masterData:[],
@@ -536,7 +537,7 @@
this.BtmdialogVisible=false;
this.btmSelectList=[]
this.$set(this.loneTreeNewForm,'btmTypeName',this.btmName ||this.btmOid)
- this.$set(this.loneTreeNewForm,'btmTypeid',this.btmOid)
+ this.$set(this.loneTreeNewForm,'btmTypeId',this.btmId)
this.$emit('MasterHandler',this.loneTreeNewForm)
}
},
@@ -563,6 +564,7 @@
this.btmSelectList=row;
this.btmName=row[0].name;
this.btmOid=row[0].oid;
+ this.btmId=row[0].id;
},
//涓氬姟绫诲瀷鎺ュ彛
btmdefaultRend(masterParameter){
diff --git a/Source/UBCS-WEB/src/const/omd/enum.js b/Source/UBCS-WEB/src/const/omd/enum.js
index 43d3b69..20d2e6b 100644
--- a/Source/UBCS-WEB/src/const/omd/enum.js
+++ b/Source/UBCS-WEB/src/const/omd/enum.js
@@ -17,7 +17,7 @@
prop: "name",
search: true,
slot: true,
- span: 24,
+ span: 16,
rules: [
{
required: true,
@@ -30,7 +30,8 @@
label: "鍚嶇О",
prop: "label",
search: true,
- align: "center",
+ // align: "center",
+ span: 16,
rules: [
{
required: true,
@@ -82,8 +83,9 @@
// },
{
label: "鎻忚堪",
- width: 150,
- align: "center",
+ span: 16,
+ // width: 150,
+ // align: "center",
prop: "remark",
// hide: true
}
diff --git a/Source/UBCS-WEB/src/views/modeling/Business.vue b/Source/UBCS-WEB/src/views/modeling/Business.vue
index 12bf821..6dd1b28 100644
--- a/Source/UBCS-WEB/src/views/modeling/Business.vue
+++ b/Source/UBCS-WEB/src/views/modeling/Business.vue
@@ -15,7 +15,7 @@
<avue-tree id="basic" :data="treeData" :option="treeOption" @node-click="nodeClick" class="businessTree">
<span class="el-tree-node__label" slot-scope="{ node, data }">
<span>
- <i class="el-icon-star-on"></i>
+ <i :class="(node || {}).level === 2 ? 'el-icon-star-off' : 'el-icon-folder-opened'"></i>
{{ (node || {}).label }}
</span>
</span>
@@ -82,7 +82,7 @@
<i :class="icons.revisionRule"></i>
鐗堟湰瑙勫垯
</template>
- {{ obj.revisionRuleName + '(' + obj.revisionRuleId + ')' }}
+ {{ obj.revisionRuleName ? obj.revisionRuleName+ '(' + obj.revisionRuleId + ')' : ''}}
</el-descriptions-item>
<el-descriptions-item :labelStyle="descriptionOption.labelStyle"
:contentStyle="descriptionOption.contentStyle">
@@ -90,7 +90,7 @@
<i :class="icons.lifeCycle"></i>
鐢熷懡鍛ㄦ湡
</template>
- {{ obj.lifeCycleName + '(' + obj.lifeCycleId + ')' }}
+ {{ obj.lifeCycleName ? obj.lifeCycleName + '(' + obj.lifeCycleId + ')' : ''}}
</el-descriptions-item>
<el-descriptions-item :labelStyle="descriptionOption.labelStyle"
:contentStyle="descriptionOption.contentStyle">
@@ -176,6 +176,7 @@
defaultExpandAll: true,
title: '涓氬姟绫诲瀷鏍�',
addBtn: false,
+ menu:false,
props: {
labelText: '',
label: 'label',
@@ -237,7 +238,8 @@
revisionRule: 'el-icon-s-check',
lifeCycle: 'el-icon-refresh-right',
view: 'el-icon-view',
- desc: 'el-icon-chat-line-square'
+ desc: 'el-icon-chat-line-square',
+ referType: 'el-icon-search'
},
ref: {
// 浠庤〃涓�夋嫨dialog鐘舵��
@@ -278,7 +280,7 @@
this.initDomainOption();
},
methods: {
- nodeClick(data) {
+ nodeClick(data,node,leaf) {
if (data.oid) {
getDetail(data.oid).then(res => {
this.obj = res.data.data;
@@ -347,6 +349,7 @@
},
businessAdd() {
this.$refs.btmAdd.showSubmitDialog = true;
+ this.$refs.btmAdd.btmType = {};
this.ifRefreshBtmAddRefresh();
},
businessEdit() {
diff --git a/Source/UBCS-WEB/src/views/modeling/BusinessAdd.vue b/Source/UBCS-WEB/src/views/modeling/BusinessAdd.vue
index 6c390a7..651e7cc 100644
--- a/Source/UBCS-WEB/src/views/modeling/BusinessAdd.vue
+++ b/Source/UBCS-WEB/src/views/modeling/BusinessAdd.vue
@@ -19,21 +19,32 @@
<el-input v-model="btmType.tableName" :prefix-icon="icons.tableName"></el-input>
</el-form-item>
<el-form-item label="鎵�灞為鍩�" label-width="100px" prop="domain" class="domainSelect">
- <el-select v-model="btmType.bizDomain" :prefix-icon="icons.domain">
+ <el-select placeholder="璇烽�夋嫨棰嗗煙" v-model="btmType.bizDomain" :prefix-icon="icons.domain">
<el-option v-for="item in domainOption"
:label="item.label" :value="item.value" :key="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="鐗堟湰瑙勫垯" label-width="100px">
- <el-input v-model="btmType.revisionRuleName" :prefix-icon="icons.revisionRule" class="revisionRule"
- @focus="openRevision" clearable @clear="clearRevision">
- <i slot="suffix" class="el-input__icon el-icon-search"></i>
+ <el-input v-model="btmType.revisionRuleName"
+ :prefix-icon="icons.revisionRule"
+ class="revisionRule"
+ @focus="openRevision"
+ clearable
+ @clear="clearRevision"
+ :suffix-icon="icons.referType"
+ placeholder="璇烽�夋嫨锛岀暀绌哄垯涓嶈繘琛岀鐞�">
</el-input>
</el-form-item>
<el-form-item label="鐢熷懡鍛ㄦ湡" label-width="100px">
- <el-input v-model="btmType.lifeCycleName" :prefix-icon="icons.lifeCycle" class="lifeCycle" @focus="openLifeCycle" clearable @clear="clearLifeCycle">
- <i slot="suffix" class="el-input__icon el-icon-search"></i>
+ <el-input v-model="btmType.lifeCycleName"
+ :prefix-icon="icons.lifeCycle"
+ class="lifeCycle"
+ @focus="openLifeCycle"
+ clearable
+ @clear="clearLifeCycle"
+ :suffix-icon="icons.referType"
+ placeholder="璇烽�夋嫨锛岀暀绌哄垯涓嶈繘琛岀鐞�">
</el-input>
</el-form-item>
<div>
@@ -787,26 +798,22 @@
}
.btmTypeForm > .el-form-item > .el-form-item__content > .el-input > .el-input__inner {
- width: 200px;
+ width: 260px;
}
.domainSelect > .el-form-item__content > .el-select > .el-input > .el-input__inner {
- width: 200px;
+ width: 260px;
}
.viewFlag {
- width: 305px;
+ width: 360px;
}
.viewInput > .el-form-item__content > .el-input > .el-input__inner {
- width: 200px;
+ width: 630px;
}
.descClass > .el-input__inner {
- width: 57vw
-}
-
-#descId {
- width: 57vw;
+ width: 1000px;
}
</style>
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/BtmTreeVO.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/BtmTreeVO.java
index ec137bf..cd2b427 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/BtmTreeVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/BtmTreeVO.java
@@ -29,5 +29,7 @@
private String type;
+ private Integer level;
+
private List<BtmTreeVO> childList;
}
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/BtmTypeServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/BtmTypeServiceImpl.java
index bac65bb..23d8bde 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/BtmTypeServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/BtmTypeServiceImpl.java
@@ -659,7 +659,10 @@
try {
Map<String, String> domain = Optional.ofNullable(DomainRepeater.getDomain()).orElseGet(ArrayList::new).stream().collect(Collectors.toMap(DomainVO::getValue, DomainVO::getLabel));
List<BtmTypeVO> vos = BtmTypeWrapper.build().listEntityVO(baseMapper.selectAll());
- Map<String, List<BtmTypeVO>> domainMap = vos.stream().sorted(Comparator.comparing(BtmTypeVO::getId)).collect(Collectors.groupingBy(BtmTypeVO::getBizDomain));
+ if (CollectionUtils.isEmpty(vos)){
+ return new ArrayList<>();
+ }
+ Map<String, List<BtmTypeVO>> domainMap = Optional.ofNullable(vos).orElseGet(ArrayList::new).stream().sorted(Comparator.comparing(BtmTypeVO::getId)).collect(Collectors.groupingBy(BtmTypeVO::getBizDomain));
List<BtmTreeVO> treeList = new ArrayList<>();
domainMap.forEach((k,v)-> {
if (domain.containsKey(k)){
@@ -668,11 +671,13 @@
parent.setName(label);
parent.setLabel(label);
parent.setId(k);
+ parent.setLevel(1);
parent.setChildList(v.stream().map(s -> {
BtmTreeVO child = new BtmTreeVO();
child.setOid(s.getOid());
child.setName(s.getName());
child.setId(s.getId());
+ child.setLevel(2);
child.setLabel(s.getId() + (s.getName() == null ? "" : "(" + s.getName() + ")"));
return child;
}).collect(Collectors.toList()));
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/LinkTypeServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/LinkTypeServiceImpl.java
index e2aa9f1..77ee224 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/LinkTypeServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/LinkTypeServiceImpl.java
@@ -877,7 +877,10 @@
try {
Map<String, String> domain = Optional.ofNullable(DomainRepeater.getDomain()).orElseGet(ArrayList::new).stream().collect(Collectors.toMap(DomainVO::getValue, DomainVO::getLabel));
List<LinkTypeVO> vos = LinkTypeWrapper.build().listEntityVO(baseMapper.selectAll(), null);
- Map<String, List<LinkTypeVO>> domainMap = vos.stream().collect(Collectors.groupingBy(LinkTypeVO::getBizDomain));
+ if (CollectionUtils.isEmpty(vos)){
+ return new ArrayList<>();
+ }
+ Map<String, List<LinkTypeVO>> domainMap = Optional.ofNullable(vos).orElseGet(ArrayList::new).stream().collect(Collectors.groupingBy(LinkTypeVO::getBizDomain));
List<BtmTreeVO> treeList = new ArrayList<>();
domainMap.forEach((k,v)-> {
if (domain.containsKey(k)){
@@ -885,6 +888,7 @@
BtmTreeVO parent = new BtmTreeVO();
parent.setName(label);
parent.setId(k);
+ parent.setLevel(1);
parent.setLabel(label);
parent.setChildList(v.stream().map(s -> {
BtmTreeVO child = new BtmTreeVO();
@@ -892,6 +896,7 @@
child.setLabel(s.getId() + (s.getName() == null ? "" : "(" + s.getName() + ")"));
child.setId(s.getId());
child.setName(s.getName());
+ child.setLevel(2);
return child;
}).collect(Collectors.toList()));
treeList.add(parent);
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/LinkTypeWrapper.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/LinkTypeWrapper.java
index 1acd514..efef233 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/LinkTypeWrapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/LinkTypeWrapper.java
@@ -49,7 +49,7 @@
});
vo.setFromBtmTypes(fromBtm);
vo.setToBtmTypes(toBtm);
- vo.setTableName(vo.getTableName().toUpperCase(Locale.ROOT));
+ vo.setTableName(Optional.ofNullable(vo.getTableName()).orElseGet(String::new).toUpperCase(Locale.ROOT));
// 鏋氫妇澶勭悊
vo.setDomainText(NewAppConstantEnum.getTextByName(vo.getBizDomain()));
return vo;
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/resources/mapper/LinkTypeMapper.xml b/Source/UBCS/ubcs-service/ubcs-omd/src/main/resources/mapper/LinkTypeMapper.xml
index 5dd7cba..661da9b 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/resources/mapper/LinkTypeMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/resources/mapper/LinkTypeMapper.xml
@@ -19,13 +19,13 @@
<result column="last_modifier" jdbcType="VARCHAR" property="lastModifier" />
<result column="last_modify_time" jdbcType="TIMESTAMP" property="lastModifyTime" />
<result column="ts" jdbcType="TIMESTAMP" property="ts" />
- <result column="biz-domain" jdbcType="VARCHAR" property="bizDomain" />
+ <result column="biz_domain" jdbcType="VARCHAR" property="bizDomain" />
</resultMap>
<sql id="base_query_column">
oid, id, name, description, shape, impl_class, from_btm_type, from_btm_type_name,
to_btm_type, to_btm_type_name, btm_name, owner, creator, create_time, last_modifier, last_modify_time,
- ts, biz-domain
+ ts, biz_domain
</sql>
<sql id="tableName">
--
Gitblit v1.9.3