优化颜色

src/views/Editor/Toolbar/ElementTemplateData.vue

@@ -281,6 +281,11 @@
         {Type: 2,Name: '私有',}
     ])
 
+    const ParentObj = reactive({
+      DictKey: 'Trip_Template_Color',
+      Name: ''
+    })
+
     watch(() => datas.DataSource.pageType, (n,o) => {
         
     })
@@ -469,7 +474,7 @@
         }
     }
     const getColor = async (type:Number) => {
-        if(type==1&&!queryColor.value.Code) {
+        if(type==1&&(!queryColor.value.Code||queryColor.value.Code=='')) {
             queryObj.value.ColorName = ''
             queryObj.value.ColorStr = ''
             let Colors = ColorList.value.filter(x=>x.ID==queryColor.value.Code)
@@ -479,14 +484,33 @@
         if (response.data.resultCode == 1) {
             if(type==0) {
                 ColorList.value = response.data.data
-                let Colors = ColorList.value.filter(x=>x.Content==queryColor.value.SubColor)
-                if(Colors&&Colors.length>0) queryColor.value.Code = Colors[0].ID
+                if(!queryColor.value.SubColor){
+                    ParentObj.Name = queryObj.value.ColorStr
+                    await querySearchHandler()
+                }else{
+                    let Colors = ColorList.value.filter(x=>x.Content==queryColor.value.SubColor)
+                    if(Colors&&Colors.length>0) queryColor.value.Code = Colors[0].ID
+                }
                 if(!queryColor.value.Code) datas.ColorList = response.data.data
             }
             else datas.ColorList = response.data.data;
-            
         }
+        
     }
+
+    // 根据子颜色获取父级code
+    const querySearchHandler = async () => {
+      try {
+          let response = await ConfigService.GetTemplateQueryAsync(ParentObj)
+          if (response.data.resultCode == 1&&response.data.data.ColorList.length>0) {
+            queryColor.value.Code = response.data.data.ColorList[0].ID
+            queryColor.value.SubColor = response.data.data.ColorList[0].ColorValue
+            getColor(1)
+          }
+      } catch (error) {
+      }
+  }
+
     const GetTemplateColors = async () => {
         let pageRes = await LineService.GetTemplateConfigDataList(queryColors.value);
         let colorArr = pageRes.data.data

src/views/TemplateCenter/colour.vue

@@ -68,7 +68,7 @@
             effect="dark" class="q-mr-md">
              
             </el-tag>
-            <div v-html="queryObj.Name!=''&&scope.row.ColorValue?(scope.row.ColorValue.replaceAll(queryObj.Name,`<span class='text-waring'>${queryObj.Name}</span>`)):scope.row.ColorValue"></div>
+            <span v-html="queryObj.Name!=''&&scope.row.ColorValue?(scope.row.ColorValue.replaceAll(queryObj.Name,`<span class='text-waring'>${queryObj.Name}</span>`)):scope.row.ColorValue"></span>
           <!-- {{scope.row.ColorValue}} -->
         </template>
       </el-table-column>