diff --git a/magic-api-plugin-component/src/console/src/i18n/en.js b/magic-api-plugin-component/src/console/src/i18n/en.js
index e5c0292..245baba 100644
--- a/magic-api-plugin-component/src/console/src/i18n/en.js
+++ b/magic-api-plugin-component/src/console/src/i18n/en.js
@@ -3,10 +3,12 @@ export default {
title: 'Component Info',
name: 'Component',
form: {
- componentName: 'Component Name',
+ name: 'Component Name',
+ path: 'Component Path',
description: 'Component Description',
placeholder: {
- componentName: 'Please Enter Component Name',
+ name: 'Please Enter Component Name',
+ path: 'Please Enter Component Path',
description: 'Please Enter Component Description'
}
}
diff --git a/magic-api-plugin-component/src/console/src/i18n/zh-cn.js b/magic-api-plugin-component/src/console/src/i18n/zh-cn.js
index f2114f5..07b6f9f 100644
--- a/magic-api-plugin-component/src/console/src/i18n/zh-cn.js
+++ b/magic-api-plugin-component/src/console/src/i18n/zh-cn.js
@@ -3,10 +3,12 @@ export default {
title: '组件信息',
name: '组件',
form: {
- componentName: '组件名称',
+ name: '组件名称',
+ path: '组件路径',
description: '组件描述',
placeholder: {
- componentName: '请输入组件名称',
+ name: '请输入组件名称',
+ path: '请输入组件路径',
description: '请输入组件描述'
}
}
diff --git a/magic-api-plugin-component/src/console/src/service/magic-component.js b/magic-api-plugin-component/src/console/src/service/magic-component.js
index 87cc2bc..c0bd5b7 100644
--- a/magic-api-plugin-component/src/console/src/service/magic-component.js
+++ b/magic-api-plugin-component/src/console/src/service/magic-component.js
@@ -19,7 +19,7 @@ export default function (bus, constants, $i, Message, request) {
// 是否允许执行测试
runnable: false,
// 是否需要填写路径
- requirePath: false,
+ requirePath: true,
// 合并
merge: item => item
}
diff --git a/magic-api-plugin-component/src/main/java/org/ssssssss/magicapi/component/service/ComponentInfoMagicResourceStorage.java b/magic-api-plugin-component/src/main/java/org/ssssssss/magicapi/component/service/ComponentInfoMagicResourceStorage.java
index 16066eb..cd00802 100644
--- a/magic-api-plugin-component/src/main/java/org/ssssssss/magicapi/component/service/ComponentInfoMagicResourceStorage.java
+++ b/magic-api-plugin-component/src/main/java/org/ssssssss/magicapi/component/service/ComponentInfoMagicResourceStorage.java
@@ -1,17 +1,10 @@
package org.ssssssss.magicapi.component.service;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
import org.ssssssss.magicapi.component.model.ComponentInfo;
import org.ssssssss.magicapi.core.exception.InvalidArgumentException;
-import org.ssssssss.magicapi.core.model.Group;
import org.ssssssss.magicapi.core.model.JsonCode;
-import org.ssssssss.magicapi.core.model.MagicEntity;
-import org.ssssssss.magicapi.core.model.TreeNode;
import org.ssssssss.magicapi.core.service.AbstractPathMagicResourceStorage;
-import org.ssssssss.magicapi.core.service.MagicResourceService;
-import java.util.List;
import java.util.UUID;
public class ComponentInfoMagicResourceStorage extends AbstractPathMagicResourceStorage
{
@@ -26,49 +19,8 @@ public class ComponentInfoMagicResourceStorage extends AbstractPathMagicResource
return ComponentInfo.class;
}
- private boolean strIsEnglish(String word) {
- boolean sign = true;
- for (int i = 0; i < word.length(); i++) {
- if (!(word.charAt(i) >= 'A' && word.charAt(i) <= 'Z')
- && !(word.charAt(i) >= 'a' && word.charAt(i) <= 'z')) {
- return false;
- }
- }
- return true;
- }
-
- public void isNameRepeat(List> groupChildren, String name, String id){
- groupChildren.stream().forEach(it -> {
- Group node = it.getNode();
- List> chi = it.getChildren();
- magicResourceService.listFiles(node.getId()).forEach(file -> {
- if(null != id){
- if(!file.getId().equals(id) && file.getName().equals(name)){
- throw new InvalidArgumentException(new JsonCode(9004, "组件名称已存在"));
- }
- }else{
- if(file.getName().equals(name)){
- throw new InvalidArgumentException(new JsonCode(9004, "组件名称已存在"));
- }
- }
- });
- if(chi.size() > 0){
- isNameRepeat(chi, name, id);
- }
- });
- }
-
@Override
public void validate(ComponentInfo entity) {
- if(null == entity.getPath() || entity.getPath().equals("")){
- entity.setPath(UUID.randomUUID().toString().replace("-", ""));
- }
- isNameRepeat(magicResourceService.tree("component").getChildren(), entity.getName(), entity.getId());
- notBlank(entity.getName(), new JsonCode(9001, "组件名称不能为空"));
- if(!strIsEnglish(entity.getName())){
- throw new InvalidArgumentException(new JsonCode(9002, "组件名称必须是英文"));
- }
- notBlank(entity.getDescription(), new JsonCode(9003, "组件描述不能为空"));
}
@Override
diff --git a/magic-boot-ui/src/scripts/dynamicComponent.js b/magic-boot-ui/src/scripts/dynamicComponent.js
index 0746a14..584144b 100644
--- a/magic-boot-ui/src/scripts/dynamicComponent.js
+++ b/magic-boot-ui/src/scripts/dynamicComponent.js
@@ -28,7 +28,7 @@ function appComponent(app, item){
const install = (app) => {
app.config.globalProperties.$post('/component/list', { size: 999999 }).then((res) => {
- res.data.list.forEach(it => {
+ res.data.forEach(it => {
appComponent(app, it)
})
})
diff --git a/magic-boot-ui/src/views/lowcode/component-list.vue b/magic-boot-ui/src/views/lowcode/component-list.vue
deleted file mode 100644
index 86dbb8d..0000000
--- a/magic-boot-ui/src/views/lowcode/component-list.vue
+++ /dev/null
@@ -1,161 +0,0 @@
-
-
-
-
-
-
-
- 添加
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-