ETA_1.9.0 菱形标记

src/lang/modules/systemManage/ChartSet.js

@@ -44,7 +44,8 @@ export const ChartSetEn = {
 
     square:'Square',
     circle:'Circle',
-    rhomboid:'Rhomboid',
+    // diamond-砖石 highcharts里面菱形标记的值，所以这边用diamond
+    diamond:'Rhomboid',
     triangle:'Triangle',
     triangle_down:'Inverted Triangle',
 
@@ -100,7 +101,8 @@ export const ChartSetZh = {
 
     square:'正方形',
     circle:'圆形',
-    rhomboid:'菱形',
+    // diamond-砖石 highcharts里面菱形标记的值，所以这边用diamond
+    diamond:'菱形',
     triangle:'三角形',
     triangle_down:'倒三角形',
 

src/views/system_manage/chartTheme/common/config.js

@@ -90,7 +90,7 @@ export const markTypesOpts = [
   { value: 'circle',svg:`<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
     <circle cx="10" cy="10" r="10" fill="#D9D9D9"/>
     </svg>` },
-  { value: 'rhomboid',svg:`<svg width="20" height="21" viewBox="0 0 20 21" fill="none" xmlns="http://www.w3.org/2000/svg">
+  { value: 'diamond',svg:`<svg width="20" height="21" viewBox="0 0 20 21" fill="none" xmlns="http://www.w3.org/2000/svg">
     <rect y="10.1421" width="14" height="14" transform="rotate(-45 0 10.1421)" fill="#D9D9D9"/>
     </svg>` },
   { value: 'triangle',svg:`<svg width="20" height="17" viewBox="0 0 20 17" fill="none" xmlns="http://www.w3.org/2000/svg">