Merge branch 'ft' into 'main_dev'

perf(external/Composes): 修复组合下的所有颜色可以恢复默认颜色 See merge request yunteng/thingskit-view!46

Merge branch 'ft' into 'main_dev'
perf(external/Composes): 修复组合下的所有颜色可以恢复默认颜色 See merge request yunteng/thingskit-view!46
xp.Huang
2 parents 87855499 01deb39e
Showing 7 changed files with 54 additions and 39 deletions
src/packages/components/external/Composes/HeadCombinations/LeftCenterRightHead/config.vue
src/packages/components/external/Composes/HeadCombinations/LeftCenterRightHeadAnimat/config.vue
src/packages/components/external/Composes/Mores/Title1/config.ts
src/packages/components/external/Composes/Mores/Title1/config.vue
src/packages/components/external/Composes/Mores/Title1/index.vue
src/packages/components/external/Composes/Mores/Title2/config.vue
src/packages/components/external/Composes/Mores/Title3/config.vue
--- a/src/packages/components/external/Composes/HeadCombinations/LeftCenterRightHead/config.vue
View file @cda6a18
+++ b/src/packages/components/external/Composes/HeadCombinations/LeftCenterRightHead/config.vue
View file @cda6a18
@@ -59,6 +59,11 @@
         <n-color-picker size="small" :modes="['hex']" v-model:value="optionData.textColor"></n-color-picker>
       </setting-item>
     </setting-item-box>
+    <setting-item-box name="颜色">
+      <SettingItem>
+        <n-button size="small" @click="optionData.textColor = '#00f6ff'"> 恢复默认 </n-button>
+      </SettingItem>
+    </setting-item-box>
     <setting-item-box name="位置x轴">
       <setting-item name="字体位置x轴">
         <n-input-number v-model:value="optionData.x" size="small" placeholder="字体位置"></n-input-number>
@@ -96,6 +101,11 @@
         <n-color-picker size="small" :modes="['hex']" v-model:value="optionData.textRightSizeColor"></n-color-picker>
       </setting-item>
     </setting-item-box>
+    <setting-item-box name="颜色">
+      <SettingItem>
+        <n-button size="small" @click="optionData.textRightSizeColor = '#ffffff'"> 恢复默认 </n-button>
+      </SettingItem>
+    </setting-item-box>
   </collapse-item>
 </template>
--- a/src/packages/components/external/Composes/HeadCombinations/LeftCenterRightHeadAnimat/config.vue
View file @cda6a18
+++ b/src/packages/components/external/Composes/HeadCombinations/LeftCenterRightHeadAnimat/config.vue
View file @cda6a18
@@ -5,7 +5,7 @@
         <n-color-picker size="small" :modes="['hex']" v-model:value="optionData.animat.colors[index]"></n-color-picker>
       </SettingItem>
       <SettingItem>
-        <n-button size="small" @click="optionData.animat.colors[index] = optionData.animat.colors[index]">
+        <n-button size="small" @click="optionData.animat.colors[index] = option.animat.colors[index]">
           恢复默认
         </n-button>
       </SettingItem>
@@ -47,6 +47,12 @@
       <setting-item name="结束值">
         <n-color-picker size="small" :modes="['hex']" v-model:value="optionData.animat.gradient.to"></n-color-picker>
       </setting-item>
+      <SettingItem>
+        <n-button size="small" @click="optionData.animat.gradient.from = '#0000FFFF'"> 恢复默认1 </n-button>
+      </SettingItem>
+      <SettingItem>
+        <n-button size="small" @click="optionData.animat.gradient.to = '#00FF00FF'"> 恢复默认2 </n-button>
+      </SettingItem>
       <setting-item name="偏移角度">
         <n-input-number
           v-model:value="optionData.animat.gradient.deg"
--- a/src/packages/components/external/Composes/Mores/Title1/config.ts
View file @cda6a18
+++ b/src/packages/components/external/Composes/Mores/Title1/config.ts
View file @cda6a18
@@ -7,13 +7,14 @@ import { chartInitConfig } from '@/settings/designSetting'
 export const option = {
   dataset: '我是标题',
   attribute: {
-    linearColors: ['#0559A3', '#0654A3', '#2AFFFF', '#2AFFFF','#2affff',' #2affff','#16d9d9'],
+    linearColors: ['#0559A3', '#0654A3', '#2AFFFF', '#2AFFFF', '#2affff', ' #2affff', '#16d9d9'],
     fontSize: 20,
     fontPos: {
       x: 0,
       y: 20
     },
-    fontColor: '#2AFFFF'
+    fontColor: '#2AFFFF',
+    lineColor: '#2AFFFF'
   }
 }
--- a/src/packages/components/external/Composes/Mores/Title1/config.vue
View file @cda6a18
+++ b/src/packages/components/external/Composes/Mores/Title1/config.vue
View file @cda6a18
@@ -7,15 +7,18 @@
       <SettingItem name="大小">
         <n-input-number v-model:value="optionData.attribute.fontSize" />
       </SettingItem>
-      <SettingItem name="颜色">
-        <n-color-picker size="small" :modes="['hex']" v-model:value="optionData.attribute.fontColor"></n-color-picker>
-      </SettingItem>
       <SettingItem name="x轴位置">
         <n-input-number v-model:value="optionData.attribute.fontPos.x" />
       </SettingItem>
       <SettingItem name="y轴位置">
         <n-input-number v-model:value="optionData.attribute.fontPos.y" />
       </SettingItem>
+      <SettingItem name="颜色">
+        <n-color-picker size="small" :modes="['hex']" v-model:value="optionData.attribute.fontColor"></n-color-picker>
+      </SettingItem>
+      <SettingItem>
+        <n-button size="small" @click="optionData.attribute.fontColor = '#2AFFFF'"> 恢复默认 </n-button>
+      </SettingItem>
     </SettingItemBox>
     <SettingItemBox
       :name="`装饰颜色-${index + 1}`"
@@ -30,14 +33,19 @@
         ></n-color-picker>
       </SettingItem>
       <SettingItem>
-        <n-button
-          size="small"
-          @click="optionData.attribute.linearColors[index] = option.attribute.linearColors[index]"
-        >
+        <n-button size="small" @click="optionData.attribute.linearColors[index] = option.attribute.linearColors[index]">
           恢复默认
         </n-button>
       </SettingItem>
     </SettingItemBox>
+    <SettingItemBox :name="`装饰颜色8`">
+      <SettingItem name="颜色">
+        <n-color-picker size="small" :modes="['hex']" v-model:value="optionData.attribute.lineColor"></n-color-picker>
+      </SettingItem>
+      <SettingItem>
+        <n-button size="small" @click="optionData.attribute.lineColor = '#2AFFFF'"> 恢复默认 </n-button>
+      </SettingItem>
+    </SettingItemBox>
   </CollapseItem>
 </template>
@@ -46,7 +54,6 @@ import { PropType } from 'vue'
 import { option } from './config'
 import { CollapseItem, SettingItemBox, SettingItem } from '@/components/Pages/ChartItemSetting'
-
 defineProps({
   optionData: {
     type: Object as PropType<typeof option>,
--- a/src/packages/components/external/Composes/Mores/Title1/index.vue
View file @cda6a18
+++ b/src/packages/components/external/Composes/Mores/Title1/index.vue
View file @cda6a18
@@ -26,11 +26,7 @@
           opacity="1"
           :d="`M0,${h} L${w},${h} L${w},0 L0,0 L0,${h} Z`"
         />
-        <g
-          opacity="1"
-          :transform="`translate(34 ${(h/2)-26/2
-          })  rotate(0 46 13)`"
-        >
+        <g opacity="1" :transform="`translate(34 ${h / 2 - 26 / 2})  rotate(0 46 13)`">
           <text>
             <tspan
               :x="attribute.fontPos.x"
@@ -49,15 +45,12 @@
         <path
           id="矩形 21"
           fill-rule="evenodd"
-          style="fill: #2affff"
+          :style="{ fill: attribute.lineColor }"
           transform="translate(0 0)  rotate(0 0.5 15)"
           opacity="1"
-          :d="`M0,${h}L1,${h }L1,0L0,0L0,${h}Z`"
+          :d="`M0,${h}L1,${h}L1,0L0,0L0,${h}Z`"
         />
-        <g
-          opacity="1"
-          :transform="`translate(14 ${(h/2)-8/2})  rotate(0 6.5 7)`"
-        >
+        <g opacity="1" :transform="`translate(14 ${h / 2 - 8 / 2})  rotate(0 6.5 7)`">
           <path
             id="矩形 22"
             fill-rule="evenodd"
@@ -83,7 +76,7 @@
             :d="`M6,0L0,7L5,7L11,0L6,0Z `"
           />
         </g>
-        <g opacity="1" :transform="`translate(396 ${(h/2)-2/2})  rotate(0 46.5 13.5)`">
+        <g opacity="1" :transform="`translate(396 ${h / 2 - 2 / 2})  rotate(0 46.5 13.5)`">
           <path
             id="并集"
             fill-rule="evenodd"
--- a/src/packages/components/external/Composes/Mores/Title2/config.vue
View file @cda6a18
+++ b/src/packages/components/external/Composes/Mores/Title2/config.vue
View file @cda6a18
@@ -7,15 +7,18 @@
       <SettingItem name="大小">
         <n-input-number v-model:value="optionData.attribute.fontSize" />
       </SettingItem>
-      <SettingItem name="颜色">
-        <n-color-picker size="small" :modes="['hex']" v-model:value="optionData.attribute.fontColor"></n-color-picker>
-      </SettingItem>
       <SettingItem name="x轴位置">
         <n-input-number v-model:value="optionData.attribute.fontPos.x" />
       </SettingItem>
       <SettingItem name="y轴位置">
         <n-input-number v-model:value="optionData.attribute.fontPos.y" />
       </SettingItem>
+      <SettingItem name="颜色">
+        <n-color-picker size="small" :modes="['hex']" v-model:value="optionData.attribute.fontColor"></n-color-picker>
+      </SettingItem>
+      <SettingItem>
+        <n-button size="small" @click="optionData.attribute.fontColor = '#2AFFFF'"> 恢复默认 </n-button>
+      </SettingItem>
     </SettingItemBox>
     <SettingItemBox
       :name="`装饰颜色-${index + 1}`"
@@ -30,10 +33,7 @@
         ></n-color-picker>
       </SettingItem>
       <SettingItem>
-        <n-button
-          size="small"
-          @click="optionData.attribute.linearColors[index] = option.attribute.linearColors[index]"
-        >
+        <n-button size="small" @click="optionData.attribute.linearColors[index] = option.attribute.linearColors[index]">
           恢复默认
         </n-button>
       </SettingItem>
@@ -46,7 +46,6 @@ import { PropType } from 'vue'
 import { option } from './config'
 import { CollapseItem, SettingItemBox, SettingItem } from '@/components/Pages/ChartItemSetting'
-
 defineProps({
   optionData: {
     type: Object as PropType<typeof option>,
--- a/src/packages/components/external/Composes/Mores/Title3/config.vue
View file @cda6a18
+++ b/src/packages/components/external/Composes/Mores/Title3/config.vue
View file @cda6a18
@@ -7,15 +7,18 @@
       <SettingItem name="大小">
         <n-input-number v-model:value="optionData.attribute.fontSize" />
       </SettingItem>
-      <SettingItem name="颜色">
-        <n-color-picker size="small" :modes="['hex']" v-model:value="optionData.attribute.fontColor"></n-color-picker>
-      </SettingItem>
       <SettingItem name="x轴位置">
         <n-input-number v-model:value="optionData.attribute.fontPos.x" />
       </SettingItem>
       <SettingItem name="y轴位置">
         <n-input-number v-model:value="optionData.attribute.fontPos.y" />
       </SettingItem>
+      <SettingItem name="颜色">
+        <n-color-picker size="small" :modes="['hex']" v-model:value="optionData.attribute.fontColor"></n-color-picker>
+      </SettingItem>
+      <SettingItem name="颜色">
+        <n-button size="small" @click="optionData.attribute.fontColor = '#2AFFFF'"> 恢复默认 </n-button>
+      </SettingItem>
     </SettingItemBox>
     <SettingItemBox
       :name="`装饰颜色-${index + 1}`"
@@ -30,10 +33,7 @@
         ></n-color-picker>
       </SettingItem>
       <SettingItem>
-        <n-button
-          size="small"
-          @click="optionData.attribute.linearColors[index] = option.attribute.linearColors[index]"
-        >
+        <n-button size="small" @click="optionData.attribute.linearColors[index] = option.attribute.linearColors[index]">
           恢复默认
         </n-button>
       </SettingItem>
@@ -46,7 +46,6 @@ import { PropType } from 'vue'
 import { option } from './config'
 import { CollapseItem, SettingItemBox, SettingItem } from '@/components/Pages/ChartItemSetting'
-
 defineProps({
   optionData: {
     type: Object as PropType<typeof option>,