diff --git a/biz/src/main/java/cn/icanci/loopstack/bic/biz/service/UseCaseService.java b/biz/src/main/java/cn/icanci/loopstack/bic/biz/service/UseCaseService.java index 1135d0351b34b7223cc025b244dcf02b0e8c6c9e..af27b46adc9d4f432716c7571de7d4b463cc1c13 100644 --- a/biz/src/main/java/cn/icanci/loopstack/bic/biz/service/UseCaseService.java +++ b/biz/src/main/java/cn/icanci/loopstack/bic/biz/service/UseCaseService.java @@ -28,4 +28,6 @@ public interface UseCaseService extends BaseService { UseCaseVO queryBySystemUuidAndKey(String systemUuid, String key); List loadSelector(String systemUuid); + + List loadAllSelector(); } 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 5d8fdf610634e469718b648c7bb131c9b66caaf2..8f63099f5f5ebb84b7ed8cada817d6d152bec729 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 @@ -86,4 +86,21 @@ public class UseCaseServiceImpl implements UseCaseService { } return textValues; } + + @Override + public List loadAllSelector() { + List useCases = queryAll(); + List textValues = Lists.newArrayList(); + for (UseCaseVO useCaseVO : useCases) { + String label; + if (isDeleted(useCaseVO)) { + label = String.format(DELETED_FORMAT, useCaseVO.getUseCaseName()); + } else { + label = String.format(NOT_DELETED_FORMAT, useCaseVO.getUseCaseName()); + } + String value = useCaseVO.getUuid(); + textValues.add(new TextValue(label, value)); + } + return textValues; + } } diff --git a/views/src/main/resources/vueboot/src/api/loadSelectorApi.js b/views/src/main/resources/vueboot/src/api/loadSelectorApi.js index fe61dca461b6a23139df714848719bd80431b056..194cc8627bfb97a44b97047e84a6d8d908d2e699 100644 --- a/views/src/main/resources/vueboot/src/api/loadSelectorApi.js +++ b/views/src/main/resources/vueboot/src/api/loadSelectorApi.js @@ -68,6 +68,17 @@ export async function useCaseSelector(systemUuid) { return [] } +export async function allUseCaseSelector() { + let ret = await request({ + url: '/bicAdmin/useCase/loadAllSelector', + method: 'get' + }) + if (ret.ok) { + return ret.data.textValues; + } + return [] +} + export async function nodeSelector(systemUuid) { let ret = await request({ url: '/bicAdmin/node/loadSelector/' + systemUuid, diff --git a/views/src/main/resources/vueboot/src/api/unitView.js b/views/src/main/resources/vueboot/src/api/unitView.js index 05dcc5f2ea910f0f7e1bc2b43a3c93600e72b3a7..7441757dd6d3988681cc2bd75e928c1b504102f5 100644 --- a/views/src/main/resources/vueboot/src/api/unitView.js +++ b/views/src/main/resources/vueboot/src/api/unitView.js @@ -19,7 +19,7 @@ export async function unitViewSave(unitView) { }) } -export async function remoteValidateUnique(systemUuid, useCaseUuid) { +export async function remoteValidateUnitViewUnique(systemUuid, useCaseUuid) { return await request({ url: '/bicAdmin/unitView/validateUnique/' + systemUuid + '/' + useCaseUuid, method: 'get', 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/bic-edit.vue index 05b205c501822a54f56a36f18a37eedb38530ed2..21e82ca130db26c6d5505a4c017f8598c5101cd1 100644 --- a/views/src/main/resources/vueboot/src/views/bic-config/bic-edit.vue +++ b/views/src/main/resources/vueboot/src/views/bic-config/bic-edit.vue @@ -1,30 +1,229 @@ 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 new file mode 100644 index 0000000000000000000000000000000000000000..88692bdfa1d9d0f1f0e7b7d81a2cd6447fe726de --- /dev/null +++ b/views/src/main/resources/vueboot/src/views/bic-config/dialog/bic-edit-form.vue @@ -0,0 +1,192 @@ + + + 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 a1e495a9279ddd141a84397cfefda479c8d18a68..19cd6b184888884a89e2c3e0d6b2f163728856a9 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 @@ -239,6 +239,7 @@ export default { let vm = this if (vm.saveData.systemUuid === '') { vm.nodeOptions = [] + vm.saveData.nodeUuid = '' } else { vm.nodeOptions = await nodeSelector(vm.saveData.systemUuid) } diff --git a/web/src/main/java/cn/icanci/loopstack/bic/web/controller/UseCaseController.java b/web/src/main/java/cn/icanci/loopstack/bic/web/controller/UseCaseController.java index 48730e37a4986d281e9b4a78e50cc4fc7375c761..4d5295696dc0a7988c0189c5852b5f845c9991af 100644 --- a/web/src/main/java/cn/icanci/loopstack/bic/web/controller/UseCaseController.java +++ b/web/src/main/java/cn/icanci/loopstack/bic/web/controller/UseCaseController.java @@ -59,4 +59,10 @@ public class UseCaseController { List textValues = useCaseService.loadSelector(systemUuid); return R.builderOk().data("textValues", textValues).build(); } + + @GetMapping("loadAllSelector") + public R loadAllSelector() { + List textValues = useCaseService.loadAllSelector(); + return R.builderOk().data("textValues", textValues).build(); + } }