diff --git a/biz/src/main/java/cn/icanci/loopstack/bic/biz/mapper/UnitViewTreeMapper.java b/biz/src/main/java/cn/icanci/loopstack/bic/biz/mapper/UnitViewTreeMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..0397d3f2c55e00d982c9179a41c429cd59b079c1 --- /dev/null +++ b/biz/src/main/java/cn/icanci/loopstack/bic/biz/mapper/UnitViewTreeMapper.java @@ -0,0 +1,17 @@ +package cn.icanci.loopstack.bic.biz.mapper; + +import org.mapstruct.Mapper; +import org.mapstruct.NullValueMappingStrategy; + +import cn.icanci.loopstack.bic.biz.mapper.convertor.NodeDataModeEnumConverter; +import cn.icanci.loopstack.bic.biz.mapper.convertor.NodeTypeEnumConverter; +import cn.icanci.loopstack.bic.common.model.graph.UnitViewTreeVO; +import cn.icanci.loopstack.bic.dal.mongo.dateobject.UnitViewTreeDO; + +/** + * @author icanci + * @since 1.0 Created in 2023/09/17 15:46 + */ +@Mapper(componentModel = "spring", uses = { NodeDataModeEnumConverter.class, NodeTypeEnumConverter.class }, nullValueMappingStrategy = NullValueMappingStrategy.RETURN_NULL) +public interface UnitViewTreeMapper extends BaseMapper { +} diff --git a/biz/src/main/java/cn/icanci/loopstack/bic/biz/service/UnitViewTreeService.java b/biz/src/main/java/cn/icanci/loopstack/bic/biz/service/UnitViewTreeService.java new file mode 100644 index 0000000000000000000000000000000000000000..565b62adf2ac6822a4335abe2da5967ab76de975 --- /dev/null +++ b/biz/src/main/java/cn/icanci/loopstack/bic/biz/service/UnitViewTreeService.java @@ -0,0 +1,26 @@ +package cn.icanci.loopstack.bic.biz.service; + +import java.util.List; + +import cn.icanci.loopstack.bic.common.model.graph.UnitViewTreeVO; +import cn.icanci.loopstack.bic.dal.mongo.common.PageList; + +/** + * @author icanci + * @since 1.0 Created in 2023/09/17 15:45 + */ +public interface UnitViewTreeService extends BaseService { + @Override + List queryAll(); + + @Override + void save(UnitViewTreeVO unitViewTreeVO); + + @Override + UnitViewTreeVO queryById(String id); + + @Override + PageList queryPage(UnitViewTreeVO unitViewTreeVO, int pageNum, int pageSize); + + UnitViewTreeVO queryBySystemUuidAndUseCaseUuid(String systemUuid, String useCaseUuid); +} diff --git a/biz/src/main/java/cn/icanci/loopstack/bic/biz/service/impl/NodeServiceImpl.java b/biz/src/main/java/cn/icanci/loopstack/bic/biz/service/impl/NodeServiceImpl.java index 4edbff78ace1c541e21bfee60a87bf5414ee1d60..f698958235d3feb3dd575377a0dbbdac7125c2b0 100644 --- a/biz/src/main/java/cn/icanci/loopstack/bic/biz/service/impl/NodeServiceImpl.java +++ b/biz/src/main/java/cn/icanci/loopstack/bic/biz/service/impl/NodeServiceImpl.java @@ -6,7 +6,6 @@ import javax.annotation.Resource; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import com.google.common.collect.Lists; @@ -35,7 +34,7 @@ public class NodeServiceImpl implements NodeService { } @Override - @Transactional(rollbackFor = Exception.class) +// @Transactional(rollbackFor = Exception.class) public void save(NodeVO nodeVO) { // TODO 日志记录 // TODO 事务插入 测试 diff --git a/biz/src/main/java/cn/icanci/loopstack/bic/biz/service/impl/UnitViewTreeServiceImpl.java b/biz/src/main/java/cn/icanci/loopstack/bic/biz/service/impl/UnitViewTreeServiceImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..22db240b4671875bd5da9e46d0c972baf7a29ef6 --- /dev/null +++ b/biz/src/main/java/cn/icanci/loopstack/bic/biz/service/impl/UnitViewTreeServiceImpl.java @@ -0,0 +1,59 @@ +package cn.icanci.loopstack.bic.biz.service.impl; + +import java.util.List; + +import javax.annotation.Resource; + +import org.springframework.stereotype.Service; + +import cn.icanci.loopstack.bic.biz.mapper.UnitViewTreeMapper; +import cn.icanci.loopstack.bic.biz.service.UnitViewTreeService; +import cn.icanci.loopstack.bic.common.model.graph.UnitViewTreeVO; +import cn.icanci.loopstack.bic.dal.mongo.common.PageList; +import cn.icanci.loopstack.bic.dal.mongo.daointerface.UnitViewTreeDAO; +import cn.icanci.loopstack.bic.dal.mongo.dateobject.UnitViewTreeDO; + +/** + * @author icanci + * @since 1.0 Created in 2023/09/17 15:45 + */ +@Service +public class UnitViewTreeServiceImpl implements UnitViewTreeService { + + @Resource + private UnitViewTreeDAO unitViewTreeDAO; + @Resource + private UnitViewTreeMapper unitViewTreeMapper; + + @Override + public List queryAll() { + return unitViewTreeMapper.dos2vos(unitViewTreeDAO.queryAll()); + } + + @Override + public void save(UnitViewTreeVO unitViewTreeVO) { + // TODO 日志记录 + if (doInsert(unitViewTreeVO)) { + UnitViewTreeDO insert = unitViewTreeMapper.vo2do(unitViewTreeVO); + unitViewTreeDAO.insert(insert); + } else { + unitViewTreeDAO.update(unitViewTreeMapper.vo2do(unitViewTreeVO)); + } + } + + @Override + public UnitViewTreeVO queryById(String id) { + return unitViewTreeMapper.do2vo(unitViewTreeDAO.queryOneById(id)); + } + + @Override + public PageList queryPage(UnitViewTreeVO unitViewTreeVO, int pageNum, int pageSize) { + PageList pageQuery = unitViewTreeDAO.pageQuery(unitViewTreeMapper.vo2do(unitViewTreeVO), pageNum, pageSize); + return new PageList<>(unitViewTreeMapper.dos2vos(pageQuery.getData()), pageQuery.getPaginator()); + } + + @Override + public UnitViewTreeVO queryBySystemUuidAndUseCaseUuid(String systemUuid, String useCaseUuid) { + return unitViewTreeMapper.do2vo(unitViewTreeDAO.queryBySystemUuidAndUseCaseUuid(systemUuid, useCaseUuid)); + } +} diff --git a/biz/src/main/java/cn/icanci/loopstack/bic/biz/service/impl/UseCaseServiceImpl.java b/biz/src/main/java/cn/icanci/loopstack/bic/biz/service/impl/UseCaseServiceImpl.java index 8f63099f5f5ebb84b7ed8cada817d6d152bec729..f02a7a2ea39be6e53ac2973bf453cc1dcb3ca2b6 100644 --- a/biz/src/main/java/cn/icanci/loopstack/bic/biz/service/impl/UseCaseServiceImpl.java +++ b/biz/src/main/java/cn/icanci/loopstack/bic/biz/service/impl/UseCaseServiceImpl.java @@ -5,6 +5,7 @@ import java.util.List; import javax.annotation.Resource; import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; import com.google.common.collect.Lists; @@ -20,6 +21,7 @@ import cn.icanci.loopstack.bic.dal.mongo.dateobject.UseCaseDO; * @author icanci * @since 1.0 Created in 2023/09/10 20:10 */ +@Service public class UseCaseServiceImpl implements UseCaseService { @Resource diff --git a/common/src/main/java/cn/icanci/loopstack/bic/common/model/graph/UnitViewTreeRelationVO.java b/common/src/main/java/cn/icanci/loopstack/bic/common/model/graph/UnitViewTreeRelationVO.java new file mode 100644 index 0000000000000000000000000000000000000000..81163aedace4ed066e0ec40c603d460db42ff8b2 --- /dev/null +++ b/common/src/main/java/cn/icanci/loopstack/bic/common/model/graph/UnitViewTreeRelationVO.java @@ -0,0 +1,46 @@ +package cn.icanci.loopstack.bic.common.model.graph; + +import cn.icanci.loopstack.bic.common.enums.NodeDataModeEnum; +import lombok.Data; + +import java.util.List; + +/** + * @author icanci + * @since 1.0 Created in 2023/09/17 15:42 + */ +@Data +public class UnitViewTreeRelationVO { + // ====================== 起始节点配置 ====================== + /** 起始节点 */ + private String sourceNodeUuid; + /** 起始节点样式 */ + private String sourceStyleUuid; + /** 起始节点唯一Key */ + private String sourceNodeDataKey; + /** 起始节点匹配模式 */ + private NodeDataModeEnum sourceNodeDataMode; + + // ====================== 结束节点配置 ====================== + + /** 结束节点 */ + private String targetNodeUuid; + /** 结束节点样式 */ + private String targetStyleUuid; + /** 结束节点唯一Key */ + private String targetNodeDataKey; + /** 结束节点匹配模式 */ + private NodeDataModeEnum targetNodeDataMode; + + // ====================== 边样式 ====================== + + /** 边样式 */ + private String edgeStyleUuid; + /** 边HOVER */ + private String hoverName; + + // ====================== 孩子节点 ====================== + + /** 孩子节点 */ + private List children; +} diff --git a/common/src/main/java/cn/icanci/loopstack/bic/common/model/graph/UnitViewTreeVO.java b/common/src/main/java/cn/icanci/loopstack/bic/common/model/graph/UnitViewTreeVO.java new file mode 100644 index 0000000000000000000000000000000000000000..96e255349b1288161beb2305f3a04c42606ce3ce --- /dev/null +++ b/common/src/main/java/cn/icanci/loopstack/bic/common/model/graph/UnitViewTreeVO.java @@ -0,0 +1,20 @@ +package cn.icanci.loopstack.bic.common.model.graph; + +import cn.icanci.loopstack.bic.common.model.BaseVO; +import lombok.Data; + +import java.util.List; + +/** + * @author icanci + * @since 1.0 Created in 2023/09/17 15:41 + */ +@Data +public class UnitViewTreeVO extends BaseVO { + /** 系统唯一标识 */ + private String systemUuid; + /** 用例唯一标识 */ + private String useCaseUuid; + /** 图配置数据 */ + private List relationModel; +} diff --git a/dal/src/main/java/cn/icanci/loopstack/bic/dal/mongo/daointerface/UnitViewTreeDAO.java b/dal/src/main/java/cn/icanci/loopstack/bic/dal/mongo/daointerface/UnitViewTreeDAO.java new file mode 100644 index 0000000000000000000000000000000000000000..f661d4be06ba4806219fee4e29774d22e7dab2d2 --- /dev/null +++ b/dal/src/main/java/cn/icanci/loopstack/bic/dal/mongo/daointerface/UnitViewTreeDAO.java @@ -0,0 +1,23 @@ +package cn.icanci.loopstack.bic.dal.mongo.daointerface; + +import cn.icanci.loopstack.bic.dal.mongo.dateobject.UnitViewTreeDO; + +/** + * @author icanci + * @since 1.0 Created in 2023/09/17 15:48 + */ +public interface UnitViewTreeDAO extends BaseDAO { + /** 文档对应的名字 */ + String COLLECTION_NAME = BASE_COLLECTION_NAME + "unit-view-tree"; + /** 文档对应的Class */ + Class COLLECTION_CLASS = UnitViewTreeDO.class; + + UnitViewTreeDO queryBySystemUuidAndUseCaseUuid(String systemUuid, String useCaseUuid); + + /** 列 */ + interface UnitViewTreeColumn extends BaseColumn { + String SYSTEM_UUID = "systemUuid"; + String USE_CASE_UUID = "useCaseUuid"; + } + +} diff --git a/dal/src/main/java/cn/icanci/loopstack/bic/dal/mongo/dateobject/UnitViewTreeDO.java b/dal/src/main/java/cn/icanci/loopstack/bic/dal/mongo/dateobject/UnitViewTreeDO.java new file mode 100644 index 0000000000000000000000000000000000000000..98ca35e64f417384b94e42678fbb908485c159eb --- /dev/null +++ b/dal/src/main/java/cn/icanci/loopstack/bic/dal/mongo/dateobject/UnitViewTreeDO.java @@ -0,0 +1,19 @@ +package cn.icanci.loopstack.bic.dal.mongo.dateobject; + +import java.util.List; + +import lombok.Data; + +/** + * @author icanci + * @since 1.0 Created in 2023/09/17 15:47 + */ +@Data +public class UnitViewTreeDO extends BaseDO { + /** 系统唯一标识 */ + private String systemUuid; + /** 用例唯一标识 */ + private String useCaseUuid; + /** 图配置数据 */ + private List relationModel; +} diff --git a/dal/src/main/java/cn/icanci/loopstack/bic/dal/mongo/dateobject/UnitViewTreeRelationDO.java b/dal/src/main/java/cn/icanci/loopstack/bic/dal/mongo/dateobject/UnitViewTreeRelationDO.java new file mode 100644 index 0000000000000000000000000000000000000000..38bd0435f2b1d033de41fe7b2b021ca0ee360d33 --- /dev/null +++ b/dal/src/main/java/cn/icanci/loopstack/bic/dal/mongo/dateobject/UnitViewTreeRelationDO.java @@ -0,0 +1,46 @@ +package cn.icanci.loopstack.bic.dal.mongo.dateobject; + +import cn.icanci.loopstack.bic.common.model.graph.UnitViewTreeRelationVO; +import lombok.Data; + +import java.util.List; + +/** + * @author icanci + * @since 1.0 Created in 2023/09/17 15:47 + */ +@Data +public class UnitViewTreeRelationDO { + // ====================== 起始节点配置 ====================== + /** 起始节点 */ + private String sourceNodeUuid; + /** 起始节点样式 */ + private String sourceStyleUuid; + /** 起始节点唯一Key */ + private String sourceNodeDataKey; + /** 起始节点匹配模式 */ + private String sourceNodeDataMode; + + // ====================== 结束节点配置 ====================== + + /** 结束节点 */ + private String targetNodeUuid; + /** 结束节点样式 */ + private String targetStyleUuid; + /** 结束节点唯一Key */ + private String targetNodeDataKey; + /** 结束节点匹配模式 */ + private String targetNodeDataMode; + + // ====================== 边样式 ====================== + + /** 边样式 */ + private String edgeStyleUuid; + /** 边HOVER */ + private String hoverName; + + // ====================== 孩子节点 ====================== + + /** 孩子节点 */ + private List children; +} diff --git a/dal/src/main/java/cn/icanci/loopstack/bic/dal/mongo/mongo/MongoUnitViewTreeDAO.java b/dal/src/main/java/cn/icanci/loopstack/bic/dal/mongo/mongo/MongoUnitViewTreeDAO.java new file mode 100644 index 0000000000000000000000000000000000000000..e1529a334d6874f39f18f125e3a29bf99e9949ba --- /dev/null +++ b/dal/src/main/java/cn/icanci/loopstack/bic/dal/mongo/mongo/MongoUnitViewTreeDAO.java @@ -0,0 +1,75 @@ +package cn.icanci.loopstack.bic.dal.mongo.mongo; + +import java.util.List; + +import org.apache.commons.lang3.StringUtils; +import org.springframework.data.domain.Sort; +import org.springframework.data.mongodb.core.query.Criteria; +import org.springframework.data.mongodb.core.query.Query; +import org.springframework.stereotype.Service; + +import cn.icanci.loopstack.bic.dal.mongo.common.PageList; +import cn.icanci.loopstack.bic.dal.mongo.daointerface.UnitViewTreeDAO; +import cn.icanci.loopstack.bic.dal.mongo.dateobject.UnitViewTreeDO; + +/** + * @author icanci + * @since 1.0 Created in 2023/09/17 15:49 + */ +@Service("unitViewDAO") +public class MongoUnitViewTreeDAO extends AbstractBaseDAO implements UnitViewTreeDAO { + @Override + public void insert(UnitViewTreeDO unitViewTreeDO) { + super.insert(unitViewTreeDO); + mongoTemplate.insert(unitViewTreeDO, COLLECTION_NAME); + } + + @Override + public void update(UnitViewTreeDO unitViewTreeDO) { + super.update(unitViewTreeDO); + mongoTemplate.save(unitViewTreeDO, COLLECTION_NAME); + } + + @Override + public List queryAll() { + Criteria criteria = Criteria.where(UnitViewTreeColumn.ENV).is(DEFAULT_ENV); + Query query = new Query(criteria); + return mongoTemplate.find(query, COLLECTION_CLASS, COLLECTION_NAME); + } + + @Override + public PageList pageQuery(UnitViewTreeDO unitViewTreeDO, int pageNum, int pageSize) { + Criteria criteria = Criteria.where(UnitViewTreeColumn.ENV).is(DEFAULT_ENV); + if (StringUtils.isNotBlank(unitViewTreeDO.getSystemUuid())) { + criteria.and(UnitViewTreeColumn.SYSTEM_UUID).is(unitViewTreeDO.getSystemUuid()); + } + if (StringUtils.isNotBlank(unitViewTreeDO.getUseCaseUuid())) { + criteria.and(UnitViewTreeColumn.USE_CASE_UUID).is(unitViewTreeDO.getUseCaseUuid()); + } + Query query = new Query(criteria); + query.with(Sort.by(Sort.Direction.DESC, UnitViewTreeColumn.CREATE_TIME)); + return pageQuery(query, COLLECTION_CLASS, pageSize, pageNum, COLLECTION_NAME); + } + + @Override + public UnitViewTreeDO queryOneById(String _id) { + Criteria criteria = Criteria.where(UnitViewTreeColumn._ID).is(_id); + criteria.and(UnitViewTreeColumn.ENV).is(DEFAULT_ENV); + Query query = new Query(criteria); + return mongoTemplate.findOne(query, COLLECTION_CLASS, COLLECTION_NAME); + } + + @Override + public Class getBaseColumn() { + return UnitViewTreeColumn.class; + } + + @Override + public UnitViewTreeDO queryBySystemUuidAndUseCaseUuid(String systemUuid, String useCaseUuid) { + Criteria criteria = Criteria.where(UnitViewTreeColumn.USE_CASE_UUID).is(useCaseUuid); + criteria.and(UnitViewTreeColumn.ENV).is(DEFAULT_ENV); + criteria.and(UnitViewTreeColumn.SYSTEM_UUID).is(systemUuid); + Query query = new Query(criteria); + return mongoTemplate.findOne(query, COLLECTION_CLASS, COLLECTION_NAME); + } +} diff --git a/views/src/main/java/cn/icanci/loopstack/bic/views/BicApplication.java b/views/src/main/java/cn/icanci/loopstack/bic/views/BicApplication.java index 5119d166213d8ca111c42e866994f1149add36a6..e5731339ca40093d3b270d81d24021a29fc48749 100644 --- a/views/src/main/java/cn/icanci/loopstack/bic/views/BicApplication.java +++ b/views/src/main/java/cn/icanci/loopstack/bic/views/BicApplication.java @@ -3,12 +3,14 @@ package cn.icanci.loopstack.bic.views; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.annotation.ComponentScan; +import org.springframework.transaction.annotation.EnableTransactionManagement; /** * @author icanci * @since 1.0 Created in 2023/08/19 09:42 */ @ComponentScan(basePackages = { "cn.icanci.loopstack.bic" }) +@EnableTransactionManagement @SpringBootApplication public class BicApplication { public static void main(String[] args) { diff --git a/views/src/main/resources/vueboot/src/api/loadSelectorApi.js b/views/src/main/resources/vueboot/src/api/loadSelectorApi.js index 194cc8627bfb97a44b97047e84a6d8d908d2e699..c25e9803edcb05c89d22cd198e0b126f84287e81 100644 --- a/views/src/main/resources/vueboot/src/api/loadSelectorApi.js +++ b/views/src/main/resources/vueboot/src/api/loadSelectorApi.js @@ -5,7 +5,6 @@ export async function loadFuncTypes() { url: '/bicAdmin/common/funcType', method: 'get' }) - console.log(ret) if (ret.ok) { return ret.data.textValues; } @@ -17,7 +16,6 @@ export async function nodeDataModes() { url: '/bicAdmin/common/nodeDataMode', method: 'get' }) - console.log(ret) if (ret.ok) { return ret.data.textValues; } diff --git a/views/src/main/resources/vueboot/src/api/unitViewTree.js b/views/src/main/resources/vueboot/src/api/unitViewTree.js new file mode 100644 index 0000000000000000000000000000000000000000..f921f03f4267d2258611821dcc8639509c0139db --- /dev/null +++ b/views/src/main/resources/vueboot/src/api/unitViewTree.js @@ -0,0 +1,27 @@ +import request from '@/utils/request' + +export async function unitViewTreePageQuery(unitViewTree, paginator) { + return await request({ + url: '/bicAdmin/unitViewTree/query', + method: 'post', + data: { + 'unitViewTree': unitViewTree, + 'paginator': paginator + } + }) +} + +export async function unitViewTreeSave(unitViewTree) { + return await request({ + url: '/bicAdmin/unitViewTree/save', + method: 'post', + data: unitViewTree + }) +} + +export async function remoteValidateUnitViewTreeUnique(systemUuid, useCaseUuid) { + return await request({ + url: '/bicAdmin/unitViewTree/validateUnique/' + systemUuid + '/' + useCaseUuid, + method: 'get', + }) +} diff --git a/views/src/main/resources/vueboot/src/router/index.js b/views/src/main/resources/vueboot/src/router/index.js index 2a5ef7fba6b01dc439cbfcc30bc3cfe3b451fcb3..901ac069af4ce43e4b0be8df131bb91eade9ea6d 100644 --- a/views/src/main/resources/vueboot/src/router/index.js +++ b/views/src/main/resources/vueboot/src/router/index.js @@ -167,9 +167,9 @@ export const constantRoutes = [ // meta: {title: '边函数配置'} // }, { - path: 'bic-edit', - component: () => import('@/views/bic-config/bic-edit'), - name: 'bicEdit', + path: 'unit-view-tree', + component: () => import('@/views/bic-config/unit-view-tree'), + name: 'unitViewTree', meta: {title: '编辑纠察图'} }, ] diff --git a/views/src/main/resources/vueboot/src/views/bic-config/components/ruleTreeList.vue b/views/src/main/resources/vueboot/src/views/bic-config/components/ruleTreeList.vue new file mode 100644 index 0000000000000000000000000000000000000000..7e0536f8dd52b9e3c81951ba02725d547a1ac6ed --- /dev/null +++ b/views/src/main/resources/vueboot/src/views/bic-config/components/ruleTreeList.vue @@ -0,0 +1,116 @@ + + + diff --git a/views/src/main/resources/vueboot/src/views/bic-config/components/ruleTreeNode.vue b/views/src/main/resources/vueboot/src/views/bic-config/components/ruleTreeNode.vue new file mode 100644 index 0000000000000000000000000000000000000000..902f499d0fe9f9d73880f70f124e359c2c095847 --- /dev/null +++ b/views/src/main/resources/vueboot/src/views/bic-config/components/ruleTreeNode.vue @@ -0,0 +1,317 @@ + + + diff --git a/views/src/main/resources/vueboot/src/views/bic-config/dialog/bic-edit-form.vue b/views/src/main/resources/vueboot/src/views/bic-config/dialog/bic-edit-form.vue deleted file mode 100644 index 88692bdfa1d9d0f1f0e7b7d81a2cd6447fe726de..0000000000000000000000000000000000000000 --- a/views/src/main/resources/vueboot/src/views/bic-config/dialog/bic-edit-form.vue +++ /dev/null @@ -1,192 +0,0 @@ - - - diff --git a/views/src/main/resources/vueboot/src/views/bic-config/dialog/node-vue-form.vue b/views/src/main/resources/vueboot/src/views/bic-config/dialog/node-vue-form.vue index 19cd6b184888884a89e2c3e0d6b2f163728856a9..1e2588f877d12646927cd51cea101ef8a65dc83c 100644 --- a/views/src/main/resources/vueboot/src/views/bic-config/dialog/node-vue-form.vue +++ b/views/src/main/resources/vueboot/src/views/bic-config/dialog/node-vue-form.vue @@ -237,10 +237,9 @@ export default { }, async refreshNodeOptions() { let vm = this - if (vm.saveData.systemUuid === '') { - vm.nodeOptions = [] - vm.saveData.nodeUuid = '' - } else { + vm.saveData.nodeUuid = '' + vm.nodeOptions = [] + if (vm.saveData.systemUuid !== '') { vm.nodeOptions = await nodeSelector(vm.saveData.systemUuid) } } diff --git a/views/src/main/resources/vueboot/src/views/bic-config/dialog/unit-view-tree-form.vue b/views/src/main/resources/vueboot/src/views/bic-config/dialog/unit-view-tree-form.vue new file mode 100644 index 0000000000000000000000000000000000000000..02729e6a07dc7e461cee2bf5b0dbe70ebe47f810 --- /dev/null +++ b/views/src/main/resources/vueboot/src/views/bic-config/dialog/unit-view-tree-form.vue @@ -0,0 +1,371 @@ + + + diff --git a/views/src/main/resources/vueboot/src/views/bic-config/bic-edit.vue b/views/src/main/resources/vueboot/src/views/bic-config/unit-view-tree.vue similarity index 93% rename from views/src/main/resources/vueboot/src/views/bic-config/bic-edit.vue rename to views/src/main/resources/vueboot/src/views/bic-config/unit-view-tree.vue index 21e82ca130db26c6d5505a4c017f8598c5101cd1..a6964b3916b58ff7e69d37a0a75a110d58b6d8a4 100644 --- a/views/src/main/resources/vueboot/src/views/bic-config/bic-edit.vue +++ b/views/src/main/resources/vueboot/src/views/bic-config/unit-view-tree.vue @@ -111,21 +111,21 @@ - +