From dc96cf65ccb1a40007231d88e1ad4f9bc25e0be5 Mon Sep 17 00:00:00 2001
From: vdpAdmin <vdpadmin@163.com>
Date: Fri, 11 Mar 2022 11:45:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8D=A1=E7=89=87=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6card=E6=93=8D=E4=BD=9C=E5=9B=BE=E6=A0=87=E4=B8=8D?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/extension/extension-loader.js          |  8 ++++++--
 src/extension/samples/card/card-item.vue   | 13 +++++++++++--
 src/extension/samples/card/card-widget.vue | 14 +++++++++++---
 src/utils/el-icons.js                      |  7 ++++++-
 4 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/src/extension/extension-loader.js b/src/extension/extension-loader.js
index 54055ab..76e0abc 100644
--- a/src/extension/extension-loader.js
+++ b/src/extension/extension-loader.js
@@ -76,9 +76,13 @@ export const loadExtension = function (app) {
     {label: 'info', value: 'info'},
     {label: 'error', value: 'error'},
   ]
-  PERegister.registerCPEditor(app, 'alert-type', 'alert-type-editor',
+  // PERegister.registerCPEditor(app, 'alert-type', 'alert-type-editor',
+  //     PEFactory.createSelectEditor('type', 'extension.setting.alertType',
+  //         {optionItems: typeOptions}))
+  /* type属性映射已存在，无须再注册，故只需注册属性编辑器即可！！ */
+  app.component('alert-type-editor',
       PEFactory.createSelectEditor('type', 'extension.setting.alertType',
-          {optionItems: typeOptions}))
+      {optionItems: typeOptions}))
 
   PERegister.registerCPEditor(app, 'alert-description', 'alert-description-editor',
       PEFactory.createInputTextEditor('description', 'extension.setting.description'))
diff --git a/src/extension/samples/card/card-item.vue b/src/extension/samples/card/card-item.vue
index c4eedc4..71414e8 100644
--- a/src/extension/samples/card/card-item.vue
+++ b/src/extension/samples/card/card-item.vue
@@ -6,8 +6,14 @@
       <template #header>
         <div class="clear-fix">
           <span>{{widget.options.label}}</span>
-          <i v-if="widget.options.showFold" class="float-right"
-             :class="[!widget.options.folded ? 'el-icon-arrow-down' : 'el-icon-arrow-up']" @click="toggleCard"></i>
+          <i v-if="widget.options.showFold" class="float-right"  @click="toggleCard">
+            <template v-if="!widget.options.folded">
+              <el-icon><ArrowDown /></el-icon>
+            </template>
+            <template v-else>
+              <el-icon><ArrowUp /></el-icon>
+            </template>
+          </i>
         </div>
       </template>
       <template v-if="!!widget.widgetList && (widget.widgetList.length > 0)">
@@ -43,6 +49,7 @@
   import ContainerItemWrapper from '@/components/form-render/container-item/container-item-wrapper'
   import containerItemMixin from "@/components/form-render/container-item/containerItemMixin"
   import FieldComponents from '@/components/form-designer/form-widget/field-widget/index'
+  import { ArrowDown, ArrowUp } from '@element-plus/icons-vue'
 
   export default {
     name: "card-item",
@@ -51,6 +58,8 @@
     components: {
       ContainerItemWrapper,
       ...FieldComponents,
+      ArrowDown,
+      ArrowUp
     },
     props: {
       widget: Object,
diff --git a/src/extension/samples/card/card-widget.vue b/src/extension/samples/card/card-widget.vue
index 07babd6..b771d89 100644
--- a/src/extension/samples/card/card-widget.vue
+++ b/src/extension/samples/card/card-widget.vue
@@ -7,9 +7,14 @@
       <template #header>
         <div class="clear-fix">
           <span>{{widget.options.label}}</span>
-          <i v-if="widget.options.showFold" class="float-right"
-             :class="[!widget.options.folded ? 'el-icon-arrow-down' : 'el-icon-arrow-up']"
-             @click="toggleCard"></i>
+          <i v-if="widget.options.showFold" class="float-right" @click="toggleCard">
+            <template v-if="!widget.options.folded">
+              <el-icon><ArrowDown /></el-icon>
+            </template>
+            <template v-else>
+              <el-icon><ArrowUp /></el-icon>
+            </template>
+          </i>
         </div>
       </template>
       <draggable :list="widget.widgetList" item-key="id" v-bind="{group:'dragGroup', ghostClass: 'ghost',animation: 200}"
@@ -39,6 +44,7 @@
   //import Draggable from 'vuedraggable'
   import ContainerWrapper from "@/components/form-designer/form-widget/container-widget/container-wrapper"
   import FieldComponents from '@/components/form-designer/form-widget/field-widget/index'
+  import { ArrowDown, ArrowUp } from '@element-plus/icons-vue'
 
   export default {
     name: "card-widget",
@@ -48,6 +54,8 @@
       //Draggable,
       ContainerWrapper,
       ...FieldComponents,
+      ArrowDown,
+      ArrowUp
     },
     props: {
       widget: Object,
diff --git a/src/utils/el-icons.js b/src/utils/el-icons.js
index 72c0459..c2a6cc2 100644
--- a/src/utils/el-icons.js
+++ b/src/utils/el-icons.js
@@ -1,4 +1,7 @@
-import {Edit, Minus, Plus, InfoFilled, Search, CirclePlus, Delete} from '@element-plus/icons-vue'
+import {
+  Edit, Minus, Plus, InfoFilled, Search, CirclePlus, Delete,
+  ArrowDown, ArrowUp
+} from '@element-plus/icons-vue'
 
 export function registerIcon(app) {
   app.component('el-icon-edit', Edit)
@@ -8,4 +11,6 @@ export function registerIcon(app) {
   app.component('el-icon-search', Search)
   app.component('el-icon-circle-plus-outline', CirclePlus)
   app.component('el-icon-delete', Delete)
+  app.component('el-icon-arrow-down', ArrowDown)
+  app.component('el-icon-arrow-up', ArrowUp)
 }