Przeglądaj źródła

feat:新增箭头图标&fix:t-select label问题

ananzhusen 1 miesiąc temu
rodzic
commit
fca0dbf6e2

+ 2 - 0
src/services/defaults.ts

@@ -23,6 +23,7 @@ export const fromArrows = [
   { icon: '#l-from-diamondSolid', value: 'diamondSolid' },
   { icon: '#l-from-circleSolid', value: 'circleSolid' },
   { icon: '#l-from-line', value: 'line' },
+  { icon: '#l-danbianjiantou', value: 'reTriangleSolid' },
 ];
 
 export const toArrows = [
@@ -36,6 +37,7 @@ export const toArrows = [
   { icon: '#l-to-diamondSolid', value: 'diamondSolid' },
   { icon: '#l-to-circleSolid', value: 'circleSolid' },
   { icon: '#l-to-line', value: 'line' },
+  { icon: '#l-a-danbianjiantou2', value: 'reTriangleSolid' },
 ];
 
 export const lineDashObj = [

+ 9 - 9
src/views/components/PenProps.vue

@@ -168,8 +168,8 @@
               <div class="form-item px-16" style="margin-top: -12px">
                 <label>{{$t('状态')}}</label>
                 <t-select v-model="data.pen.showChild" @change="changeValue('showChild')" style="width: 150px" :placeholder="$t('状态')">
-                  <t-option v-for="(a, index) in data.pen.children" :key="index" :value="index">
-{{$t('                    状态')}}{{ index + 1 }}</t-option>
+                  <t-option v-for="(a, index) in data.pen.children" :key="index" :value="index" :label="$t('状态')+(index + 1)">
+                  {{$t('状态')}}{{ index + 1 }}</t-option>
                 </t-select>
               </div>
               <div v-if="data.childPen.image" class="px-16 py-8">
@@ -247,7 +247,7 @@
                         </g>
                       </svg>
                     </template>
-                    <t-option :key="-1" :value="-1">
+                    <t-option :key="-1" :value="-1" label="A">
                       <div class="flex" style=" align-items:center;">
                         <svg class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" width="12" height="12">
                           <path d="M113.777778 0h796.444444a113.777778 113.777778 0 0 1 113.777778 113.777778v796.444444a113.777778 113.777778 0 0 1-113.777778 113.777778H113.777778a113.777778 113.777778 0 0 1-113.777778-113.777778V113.777778a113.777778 113.777778 0 0 1 113.777778-113.777778z m0 85.333333a28.444444 28.444444 0 0 0-28.444445 28.444445v796.444444a28.444444 28.444444 0 0 0 28.444445 28.444445h796.444444a28.444444 28.444444 0 0 0 28.444445-28.444445V113.777778a28.444444 28.444444 0 0 0-28.444445-28.444445H113.777778z" fill="#e3e8f4" p-id="37532"></path>
@@ -256,7 +256,7 @@
                         <p style="margin-left:8px;">{{$t('无')}}</p>
                       </div>
                     </t-option>
-                    <t-option :key="0" :value="0">
+                    <t-option :key="0" :value="0" label="B">
                       <svg
                         xmlns="http://www.w3.org/2000/svg"
                         version="1.1"
@@ -267,7 +267,7 @@
                         </g>
                       </svg>
                     </t-option>
-                    <t-option :key="1" :value="1">
+                    <t-option :key="1" :value="1" label="C">
                       <svg
                         xmlns="http://www.w3.org/2000/svg"
                         version="1.1"
@@ -278,7 +278,7 @@
                         </g>
                       </svg>
                     </t-option>
-                    <t-option :key="2" :value="2">
+                    <t-option :key="2" :value="2" label="D">
                       <svg
                         xmlns="http://www.w3.org/2000/svg"
                         version="1.1"
@@ -289,7 +289,7 @@
                         </g>
                       </svg>
                     </t-option>
-                    <t-option :key="3" :value="3">
+                    <t-option :key="3" :value="3" label="E">
                       <svg
                         xmlns="http://www.w3.org/2000/svg"
                         version="1.1"
@@ -389,7 +389,7 @@
                         <use :xlink:href="fromArrows.find(item=>item.value===value).icon"></use>
                       </svg>
                     </template>
-                    <t-option v-for="item in fromArrows" :key="item.value" :value="item.value">
+                    <t-option v-for="item in fromArrows" :key="item.value" :label="item.icon"  :value="item.value">
                       <svg class="l-icon" aria-hidden="true">
                         <use :xlink:href="item.icon"></use>
                       </svg>
@@ -402,7 +402,7 @@
                         <use :xlink:href="toArrows.find(item=>item.value===value).icon"></use>
                       </svg>
                     </template>
-                    <t-option v-for="item in toArrows" :key="item.value" :value="item.value">
+                    <t-option v-for="item in toArrows" :key="item.value" :label="item.icon" :value="item.value">
                       <svg class="l-icon" aria-hidden="true">
                         <use :xlink:href="item.icon"></use>
                       </svg>

+ 4 - 4
src/views/components/PensProps.vue

@@ -219,7 +219,7 @@
                         </g>
                       </svg>
                     </template>
-                    <t-option :key="0" :value="0">
+                    <t-option :key="0" :value="0" label="A">
                       <svg
                         xmlns="http://www.w3.org/2000/svg"
                         version="1.1"
@@ -230,7 +230,7 @@
                         </g>
                       </svg>
                     </t-option>
-                    <t-option :key="1" :value="1">
+                    <t-option :key="1" :value="1" label="B">
                       <svg
                         xmlns="http://www.w3.org/2000/svg"
                         version="1.1"
@@ -241,7 +241,7 @@
                         </g>
                       </svg>
                     </t-option>
-                    <t-option :key="2" :value="2">
+                    <t-option :key="2" :value="2" label="C">
                       <svg
                         xmlns="http://www.w3.org/2000/svg"
                         version="1.1"
@@ -252,7 +252,7 @@
                         </g>
                       </svg>
                     </t-option>
-                    <t-option :key="3" :value="3">
+                    <t-option :key="3" :value="3" label="D">
                       <svg
                         xmlns="http://www.w3.org/2000/svg"
                         version="1.1"