Merge branch 'master' of https://gitlab-pro.ezijing.com/ezijing-web/saas-dml

src/modules/label/components/LabelType.vue

@@ -41,10 +41,15 @@ function handleRemove(row: LabelType) {
   </div>
   <ul>
     <li class="label-type-item" v-for="item in typeList" :key="item.id">
-      <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 512" width="16" height="16" :fill="item.url">
+      <svg
+        xmlns="http://www.w3.org/2000/svg"
+        :fill="item.url"
+        width="16.67333984375"
+        height="16.669540405273438"
+        viewBox="0 0 16.67333984375 16.669540405273438">
         <g>
           <path
-            d="M497.941 225.941L286.059 14.059A48 48 0 0 0 252.118 0H48C21.49 0 0 21.49 0 48v204.118a48 48 0 0 0 14.059 33.941l211.882 211.882c18.744 18.745 49.136 18.746 67.882 0l204.118-204.118c18.745-18.745 18.745-49.137 0-67.882zM112 160c-26.51 0-48-21.49-48-48s21.49-48 48-48 48 21.49 48 48-21.49 48-48 48zm513.941 133.823L421.823 497.941c-18.745 18.745-49.137 18.745-67.882 0l-.36-.36L527.64 323.522c16.999-16.999 26.36-39.6 26.36-63.64s-9.362-46.641-26.36-63.64L331.397 0h48.721a48 48 0 0 1 33.941 14.059l211.882 211.882c18.745 18.745 18.745 49.137 0 67.882z"></path>
+            d="M16.6733,8.79462Q16.6733,7.76343,15.9463,7.03212L15.9442,7.03002L9.20711,0.292893C9.01957,0.105357,8.76522,0,8.5,0L1,0C0.447715,0,0,0.447715,0,1L0,8.5C0,8.76541,0.10551,9.01993,0.293287,9.2075L7.02965,15.9364Q7.76207,16.6695,8.79838,16.6695Q9.83479,16.6695,10.5667,15.9367L15.9463,10.5571Q16.6733,9.82582,16.6733,8.79462ZM6.41683,5.37499C6.41683,5.95029,5.95045,6.41666,5.37516,6.41666C4.79987,6.41666,4.3335,5.95029,4.3335,5.37499C4.3335,4.7997,4.79987,4.33333,5.37516,4.33333C5.95045,4.33333,6.41683,4.7997,6.41683,5.37499Z" />
         </g>
       </svg>
       <p>{{ item.name }}</p>

src/modules/label/components/LabelTypeFormDialog.vue

@@ -28,28 +28,7 @@ const rules = ref<FormRules>({
   url: [{ required: true, message: '请选择标签类型图标' }]
 })
 
-const iconColorList = $ref([
-  '#FF0000',
-  '#FF6600',
-  '#FFBF00',
-  '#FFD700',
-  '#66FF00',
-  '#00FFFF',
-  '#30D5C8',
-  '#6495ED',
-  '#003399',
-  '#003153',
-  '#003366',
-  '#2A52BE',
-  '#0047AB',
-  '#1E90FF',
-  '#002FA7',
-  '#000080',
-  '#5E86C1',
-  '#8000FF',
-  '#E32636',
-  '#FF00FF'
-])
+const iconColorList = $ref(['#AA593B', '#CD9A23', '#20AE6C', '#196D42', '#614BE8', '#6D4E8B', '#A01578', '#BD2547'])
 function handleChangeIcon(color: string) {
   form.url = color
 }
@@ -90,10 +69,15 @@ function handleUpdate() {
             :class="{ 'is-active': color === form.url }"
             :key="color"
             @click="handleChangeIcon(color)">
-            <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 512" width="16" height="16" :fill="color">
+            <svg
+              xmlns="http://www.w3.org/2000/svg"
+              :fill="color"
+              width="16.67333984375"
+              height="16.669540405273438"
+              viewBox="0 0 16.67333984375 16.669540405273438">
               <g>
                 <path
-                  d="M497.941 225.941L286.059 14.059A48 48 0 0 0 252.118 0H48C21.49 0 0 21.49 0 48v204.118a48 48 0 0 0 14.059 33.941l211.882 211.882c18.744 18.745 49.136 18.746 67.882 0l204.118-204.118c18.745-18.745 18.745-49.137 0-67.882zM112 160c-26.51 0-48-21.49-48-48s21.49-48 48-48 48 21.49 48 48-21.49 48-48 48zm513.941 133.823L421.823 497.941c-18.745 18.745-49.137 18.745-67.882 0l-.36-.36L527.64 323.522c16.999-16.999 26.36-39.6 26.36-63.64s-9.362-46.641-26.36-63.64L331.397 0h48.721a48 48 0 0 1 33.941 14.059l211.882 211.882c18.745 18.745 18.745 49.137 0 67.882z"></path>
+                  d="M16.6733,8.79462Q16.6733,7.76343,15.9463,7.03212L15.9442,7.03002L9.20711,0.292893C9.01957,0.105357,8.76522,0,8.5,0L1,0C0.447715,0,0,0.447715,0,1L0,8.5C0,8.76541,0.10551,9.01993,0.293287,9.2075L7.02965,15.9364Q7.76207,16.6695,8.79838,16.6695Q9.83479,16.6695,10.5667,15.9367L15.9463,10.5571Q16.6733,9.82582,16.6733,8.79462ZM6.41683,5.37499C6.41683,5.95029,5.95045,6.41666,5.37516,6.41666C4.79987,6.41666,4.3335,5.95029,4.3335,5.37499C4.3335,4.7997,4.79987,4.33333,5.37516,4.33333C5.95045,4.33333,6.41683,4.7997,6.41683,5.37499Z" />
               </g>
             </svg>
           </div>