From a0174c77e49a940343a1c3659e0766ccdbebfa4f Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Thu, 22 Jul 2021 14:05:41 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E4=BB=AA=E8=A1=A8=E6=9D=BF=E7=9F=A9?= =?UTF-8?q?=E5=BD=A2=E7=BB=84=E4=BB=B6=E5=A2=9E=E5=8A=A0=E8=BE=B9=E6=A1=86?= =?UTF-8?q?=E5=BC=A7=E5=BA=A6=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../canvas/components/RectangleAttr.vue | 12 +++- .../canvas/custom-component/component-list.js | 3 +- frontend/src/styles/deicon/demo_index.html | 52 +++++++++++++++++- frontend/src/styles/deicon/iconfont.css | 14 ++++- frontend/src/styles/deicon/iconfont.js | 2 +- frontend/src/styles/deicon/iconfont.json | 14 +++++ frontend/src/styles/deicon/iconfont.ttf | Bin 11112 -> 11600 bytes frontend/src/styles/deicon/iconfont.woff | Bin 6860 -> 7100 bytes frontend/src/styles/deicon/iconfont.woff2 | Bin 5708 -> 5936 bytes 9 files changed, 87 insertions(+), 10 deletions(-) diff --git a/frontend/src/components/canvas/components/RectangleAttr.vue b/frontend/src/components/canvas/components/RectangleAttr.vue index 8a81315021..ad64cbef2b 100644 --- a/frontend/src/components/canvas/components/RectangleAttr.vue +++ b/frontend/src/components/canvas/components/RectangleAttr.vue @@ -32,6 +32,14 @@ + + + + +
+ +
+ @@ -194,8 +202,8 @@ export default { } .el-card-main { height: 34px; - z-index: 1000000000; - width: 300px; + z-index: 10; + width: 400px; position: absolute; } diff --git a/frontend/src/components/canvas/custom-component/component-list.js b/frontend/src/components/canvas/custom-component/component-list.js index a0faccdad4..0e1d8d6a0b 100644 --- a/frontend/src/components/canvas/custom-component/component-list.js +++ b/frontend/src/components/canvas/custom-component/component-list.js @@ -122,7 +122,8 @@ const list = [ borderStyle: 'solid', borderWidth: 1, borderColor: '#000000', - backgroundColor: '#ffffff' + backgroundColor: '#ffffff', + borderRadius: 0 } }, { diff --git a/frontend/src/styles/deicon/demo_index.html b/frontend/src/styles/deicon/demo_index.html index f6b2332ee2..cb7ad72f2f 100644 --- a/frontend/src/styles/deicon/demo_index.html +++ b/frontend/src/styles/deicon/demo_index.html @@ -54,6 +54,18 @@
    +
  • + +
    弧形框
    +
    &#xe603;
    +
  • + +
  • + +
    弧形框
    +
    &#xe602;
    +
  • +
  • 透明
    @@ -294,9 +306,9 @@
    @font-face {
       font-family: 'iconfont';
    -  src: url('iconfont.woff2?t=1626919869905') format('woff2'),
    -       url('iconfont.woff?t=1626919869905') format('woff'),
    -       url('iconfont.ttf?t=1626919869905') format('truetype');
    +  src: url('iconfont.woff2?t=1626927148990') format('woff2'),
    +       url('iconfont.woff?t=1626927148990') format('woff'),
    +       url('iconfont.ttf?t=1626927148990') format('truetype');
     }
     

    第二步:定义使用 iconfont 的样式

    @@ -322,6 +334,24 @@
      +
    • + +
      + 弧形框 +
      +
      .icon-weibiaoti-1 +
      +
    • + +
    • + +
      + 弧形框 +
      +
      .icon-weibiaoti- +
      +
    • +
    • @@ -682,6 +712,22 @@
        +
      • + +
        弧形框
        +
        #icon-weibiaoti-1
        +
      • + +
      • + +
        弧形框
        +
        #icon-weibiaoti-
        +
      • +
        • UY}l44p&#I0|NkMof89d)uag-;8O%9v!$JuD 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 diff --git a/frontend/src/styles/deicon/iconfont.woff2 b/frontend/src/styles/deicon/iconfont.woff2 index 4294e8cf83e017e85afbdc09c5ffafad145cd541..2aae8d166b5cdb39d10822bb5abe288227c6f137 100644 GIT binary patch literal 5936 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 SrfT$2pov$UX?ztN3;+O*jgEN$ literal 5708 zcmV-S7PIMhPew8T0RR9102WLD3jhEB04rz!02TfK0RR9100000000000000000000 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