From f32ba3be80016cda0915728de9742e1f6e762053 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Mon, 8 Nov 2021 19:03:09 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E4=BB=AA=E8=A1=A8=E6=9D=BF=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E8=A7=86=E9=A2=91=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../authModel/VAuthModelController.java | 19 ++ .../dataease/dto/authModel/VAuthModelDTO.java | 12 + .../src/main/resources/generatorConfig.xml | 8 +- frontend/package.json | 1 + .../components/Editor/ComponentWrapper.vue | 24 ++ .../canvas/components/Editor/VideoLinks.vue | 125 ++++++++++ .../canvas/components/Editor/index.vue | 15 +- .../components/canvas/components/TextAttr.vue | 13 +- .../canvas/custom-component/DeVideo.vue | 161 +++++++++++++ .../canvas/custom-component/component-list.js | 39 ++++ .../canvas/custom-component/index.js | 2 + frontend/src/custom-theme.css | 180 +++++++++++++++ frontend/src/main.js | 6 + frontend/src/store/index.js | 5 +- frontend/src/styles/deicon/demo_index.html | 213 +++++++++++++++--- frontend/src/styles/deicon/iconfont.css | 18 +- frontend/src/styles/deicon/iconfont.js | 2 +- frontend/src/styles/deicon/iconfont.json | 21 ++ frontend/src/styles/deicon/iconfont.ttf | Bin 18284 -> 19504 bytes frontend/src/styles/deicon/iconfont.woff | Bin 11108 -> 11916 bytes frontend/src/styles/deicon/iconfont.woff2 | Bin 9352 -> 10096 bytes .../src/views/panel/AssistComponent/index.vue | 2 +- frontend/src/views/panel/edit/index.vue | 14 +- frontend/src/views/panel/video/index.vue | 24 ++ 24 files changed, 841 insertions(+), 63 deletions(-) create mode 100644 backend/src/main/java/io/dataease/controller/authModel/VAuthModelController.java create mode 100644 backend/src/main/java/io/dataease/dto/authModel/VAuthModelDTO.java create mode 100644 frontend/src/components/canvas/components/Editor/VideoLinks.vue create mode 100644 frontend/src/components/canvas/custom-component/DeVideo.vue create mode 100755 frontend/src/custom-theme.css create mode 100644 frontend/src/views/panel/video/index.vue diff --git a/backend/src/main/java/io/dataease/controller/authModel/VAuthModelController.java b/backend/src/main/java/io/dataease/controller/authModel/VAuthModelController.java new file mode 100644 index 0000000000..b6352ffa18 --- /dev/null +++ b/backend/src/main/java/io/dataease/controller/authModel/VAuthModelController.java @@ -0,0 +1,19 @@ +package io.dataease.controller.authModel; + +import com.github.xiaoymin.knife4j.annotations.ApiSupport; +import io.swagger.annotations.Api; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * Author: wangjiahao + * Date: 2021/11/5 + * Description: + */ +@Api(tags = "授权树:授权树模型") +@ApiSupport(order = 80) +@RestController +@RequestMapping("authModel") +public class VAuthModelController { + +} diff --git a/backend/src/main/java/io/dataease/dto/authModel/VAuthModelDTO.java b/backend/src/main/java/io/dataease/dto/authModel/VAuthModelDTO.java new file mode 100644 index 0000000000..703649a885 --- /dev/null +++ b/backend/src/main/java/io/dataease/dto/authModel/VAuthModelDTO.java @@ -0,0 +1,12 @@ +package io.dataease.dto.authModel; + +import io.dataease.base.domain.VAuthModel; + +/** + * Author: wangjiahao + * Date: 2021/11/5 + * Description: + */ +public class VAuthModelDTO extends VAuthModel { + +} diff --git a/backend/src/main/resources/generatorConfig.xml b/backend/src/main/resources/generatorConfig.xml index 4bcf3af04a..9cbceb1e76 100644 --- a/backend/src/main/resources/generatorConfig.xml +++ b/backend/src/main/resources/generatorConfig.xml @@ -65,10 +65,10 @@ -
@font-face {
font-family: 'iconfont';
- src: url('iconfont.woff2?t=1634191971474') format('woff2'),
- url('iconfont.woff?t=1634191971474') format('woff'),
- url('iconfont.ttf?t=1634191971474') format('truetype');
+ src: url('iconfont.woff2?t=1636358286475') format('woff2'),
+ url('iconfont.woff?t=1636358286475') format('woff'),
+ url('iconfont.ttf?t=1636358286475') format('truetype');
}