From 16690ed1d19722278fe87fc12e2bd2067d64480f Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Sun, 18 Feb 2024 18:40:19 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F):?=
 =?UTF-8?q?=20=E5=9B=BE=E5=BD=A2=E7=BB=84=E4=BB=B6=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/ComponentConfig.ts                 | 12 ----
 .../src/custom-component/component-list.ts    |  8 +--
 .../custom-component/de-graphical/Attr.vue    | 55 -------------------
 .../de-graphical/Component.vue                | 12 +---
 4 files changed, 5 insertions(+), 82 deletions(-)

diff --git a/core/core-frontend/src/custom-component/common/ComponentConfig.ts b/core/core-frontend/src/custom-component/common/ComponentConfig.ts
index 36f712596b..ab15c2c185 100644
--- a/core/core-frontend/src/custom-component/common/ComponentConfig.ts
+++ b/core/core-frontend/src/custom-component/common/ComponentConfig.ts
@@ -70,18 +70,6 @@ export const CANVAS_MATERIAL = [
         type: 'graphical',
         title: '矩形',
         icon: 'graphical-rect'
-      },
-      {
-        value: 'triangle',
-        type: 'graphical',
-        title: '三角形',
-        icon: 'graphical-triangle'
-      },
-      {
-        value: 'circular',
-        type: 'graphical',
-        title: '圆形',
-        icon: 'graphical-circular'
       }
     ]
   },
diff --git a/core/core-frontend/src/custom-component/component-list.ts b/core/core-frontend/src/custom-component/component-list.ts
index f0e688753a..234f4c2305 100644
--- a/core/core-frontend/src/custom-component/component-list.ts
+++ b/core/core-frontend/src/custom-component/component-list.ts
@@ -195,10 +195,10 @@ const list = [
     sizeX: 15,
     sizeY: 15,
     style: {
-      width: 300,
-      height: 200,
-      color: '#000000',
-      board: 1
+      borderColor: '#000',
+      borderWidth: 1,
+      backgroundColor: '',
+      borderStyle: 'solid'
     }
   },
   {
diff --git a/core/core-frontend/src/custom-component/de-graphical/Attr.vue b/core/core-frontend/src/custom-component/de-graphical/Attr.vue
index ff1c824d1c..8205da1dca 100644
--- a/core/core-frontend/src/custom-component/de-graphical/Attr.vue
+++ b/core/core-frontend/src/custom-component/de-graphical/Attr.vue
@@ -95,67 +95,12 @@ onBeforeUnmount(() => {
 
 <template>
   <div class="attr-list de-collapse-style">
-    <input
-      id="input"
-      ref="files"
-      type="file"
-      accept=".jpeg,.jpg,.png,.gif"
-      hidden
-      @click="
-        e => {
-          e.target.value = ''
-        }
-      "
-      @change="reUpload"
-    />
     <CommonAttr
       :themes="themes"
       :element="curComponent"
       :background-color-picker-width="197"
       :background-border-select-width="197"
     >
-      <el-collapse-item :effect="themes" title="图片" name="picture">
-        <el-row class="img-area" :class="`img-area_${themes}`">
-          <el-col style="width: 130px !important">
-            <el-upload
-              :themes="themes"
-              action=""
-              accept=".jpeg,.jpg,.png,.gif,.svg"
-              class="avatar-uploader"
-              list-type="picture-card"
-              :class="{ disabled: uploadDisabled }"
-              :on-preview="handlePictureCardPreview"
-              :on-remove="handleRemove"
-              :before-upload="beforeUploadCheck"
-              :http-request="upload"
-              :file-list="fileList"
-            >
-              <el-icon><Plus /></el-icon>
-            </el-upload>
-            <img-view-dialog v-model="dialogVisible" :image-url="dialogImageUrl"></img-view-dialog>
-          </el-col>
-        </el-row>
-        <el-row style="margin-bottom: 16px">
-          <span
-            style="margin-top: 2px"
-            v-if="!curComponent.propValue.url"
-            class="image-hint"
-            :class="`image-hint_${themes}`"
-          >
-            支持JPG、PNG、GIF
-          </span>
-
-          <el-button
-            size="small"
-            style="margin: 8px 0 0 -4px"
-            v-if="curComponent.propValue.url"
-            text
-            @click="goFile"
-          >
-            重新上传
-          </el-button>
-        </el-row>
-      </el-collapse-item>
     </CommonAttr>
   </div>
 </template>
diff --git a/core/core-frontend/src/custom-component/de-graphical/Component.vue b/core/core-frontend/src/custom-component/de-graphical/Component.vue
index 956c32c325..2b998e8e91 100644
--- a/core/core-frontend/src/custom-component/de-graphical/Component.vue
+++ b/core/core-frontend/src/custom-component/de-graphical/Component.vue
@@ -1,15 +1,5 @@
 <template>
-  <div class="rect-main">
-    <svg width="100%" height="100%" xmlns="http://www.w3.org/2000/svg">
-      <rect
-        width="100%"
-        height="100%"
-        fill="transparent"
-        :stroke="style.color"
-        :stroke-width="style.fontSize"
-      />
-    </svg>
-  </div>
+  <div class="rect-main"></div>
 </template>
 
 <script setup lang="ts">