diff --git a/components/layout/AiDvPanel/AiDvPanel.vue b/components/layout/AiDvPanel/AiDvPanel.vue index 31be5078..70476fc6 100644 --- a/components/layout/AiDvPanel/AiDvPanel.vue +++ b/components/layout/AiDvPanel/AiDvPanel.vue @@ -20,10 +20,15 @@ import Border5 from "./borders/border5"; import border6 from "./borders/border6"; import border7 from "./borders/border7"; import border8 from "./borders/border8"; +import border9 from "./borders/border9"; +import border10 from "./borders/border10"; +import border11 from "./borders/border11"; +import border12 from "./borders/border12"; +import border13 from "./borders/border13"; export default { name: "AiDvPanel", - components: { Border0, Border1, Border2, Border3, Border4, Border5, border6, border7, border8 }, + components: { Border0, Border1, Border2, Border3, Border4, Border5, border6, border7, border8, border9, border10, border11, border12, border13 }, props: { title: {default: "请传入标题"}, border: {default: "border0"}, diff --git a/components/layout/AiDvPanel/asset/border10.png b/components/layout/AiDvPanel/asset/border10.png new file mode 100644 index 00000000..0c42089a Binary files /dev/null and b/components/layout/AiDvPanel/asset/border10.png differ diff --git a/components/layout/AiDvPanel/asset/border11.png b/components/layout/AiDvPanel/asset/border11.png new file mode 100644 index 00000000..55d779c0 Binary files /dev/null and b/components/layout/AiDvPanel/asset/border11.png differ diff --git a/components/layout/AiDvPanel/asset/border12.png b/components/layout/AiDvPanel/asset/border12.png new file mode 100644 index 00000000..991fb8a1 Binary files /dev/null and b/components/layout/AiDvPanel/asset/border12.png differ diff --git a/components/layout/AiDvPanel/asset/border13.png b/components/layout/AiDvPanel/asset/border13.png new file mode 100644 index 00000000..d79b6386 Binary files /dev/null and b/components/layout/AiDvPanel/asset/border13.png differ diff --git a/components/layout/AiDvPanel/asset/border9.png b/components/layout/AiDvPanel/asset/border9.png new file mode 100644 index 00000000..be28e063 Binary files /dev/null and b/components/layout/AiDvPanel/asset/border9.png differ diff --git a/components/layout/AiDvPanel/borders/border10.vue b/components/layout/AiDvPanel/borders/border10.vue new file mode 100644 index 00000000..7ff3d49f --- /dev/null +++ b/components/layout/AiDvPanel/borders/border10.vue @@ -0,0 +1,63 @@ + + + + + diff --git a/components/layout/AiDvPanel/borders/border11.vue b/components/layout/AiDvPanel/borders/border11.vue new file mode 100644 index 00000000..b487a0b8 --- /dev/null +++ b/components/layout/AiDvPanel/borders/border11.vue @@ -0,0 +1,64 @@ + + + + + diff --git a/components/layout/AiDvPanel/borders/border12.vue b/components/layout/AiDvPanel/borders/border12.vue new file mode 100644 index 00000000..5d5a1158 --- /dev/null +++ b/components/layout/AiDvPanel/borders/border12.vue @@ -0,0 +1,64 @@ + + + + + diff --git a/components/layout/AiDvPanel/borders/border13.vue b/components/layout/AiDvPanel/borders/border13.vue new file mode 100644 index 00000000..6e7e9740 --- /dev/null +++ b/components/layout/AiDvPanel/borders/border13.vue @@ -0,0 +1,63 @@ + + + + + diff --git a/components/layout/AiDvPanel/borders/border9.vue b/components/layout/AiDvPanel/borders/border9.vue new file mode 100644 index 00000000..e2ba4294 --- /dev/null +++ b/components/layout/AiDvPanel/borders/border9.vue @@ -0,0 +1,63 @@ + + + + + diff --git a/packages/bigscreen/designer/components/form/componentConfig.vue b/packages/bigscreen/designer/components/form/componentConfig.vue index 34fad0f4..58033659 100644 --- a/packages/bigscreen/designer/components/form/componentConfig.vue +++ b/packages/bigscreen/designer/components/form/componentConfig.vue @@ -214,7 +214,8 @@ export default { data() { return { - borderList: ['border0', 'border1', 'border2', 'border3', 'border4', 'border5', 'border6', 'border7', 'border8'],//边框待选项 + borderList: ['border0', 'border1', 'border2', 'border3', 'border4', 'border5', 'border6', 'border7', 'border8', 'border9', 'border10', + 'border11', 'border12', 'border13'],//边框待选项 summaryList: ['summary0', 'summary1', 'summary2', 'summary3', 'summary4', 'summary6', 'summary5', 'summary7', 'summary8', 'summary9', 'summary10', 'summary11', 'summary12', 'summary13', 'summary14', 'summary15', 'summary16', 'summary17', 'summary18'],//汇总待选项