Merge pull request #7327 from ulleo/dev

fix: 组合图设置渐变后修改主题色为深色渐变没有禁用

extensions/dataease-extensions-view/view-chartmix/build.sh

@@ -1,8 +1,8 @@
 #!/bin/sh
 mvn clean package
 
-cp view-chartmix-backend/target/view-chartmix-backend-1.18.13.jar .
+cp view-chartmix-backend/target/view-chartmix-backend-1.18.14.jar .
 
-zip -r chartmix.zip  ./view-chartmix-backend-1.18.13.jar ./plugin.json
+zip -r chartmix.zip  ./view-chartmix-backend-1.18.14.jar ./plugin.json
 
-rm -f ./view-chartmix-backend-1.18.13.jar
+rm -f ./view-chartmix-backend-1.18.14.jar

extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/components/selector/ColorSelector.vue

@@ -235,6 +235,9 @@ export default {
             this.customColor = this.colorForm.colors[0]
             this.colorIndex = 0
           }
+          if(this.colorForm.gradient === undefined){
+            this.colorForm.gradient = false
+          }
 
         }
       }