fix:修改右侧面的配置项的开关设置

data-room-ui/packages/BigScreenDesign/RightSetting/G2CustomSetting.vue

@@ -131,19 +131,21 @@
                 <el-switch
                   v-else-if="setting.type === 'switch'"
                   v-model="setting.value"
-                />
-                <el-switch
-                  v-else-if="setting.type === 'switchNumber'"
-                  v-model="setting.value"
-                  :active-value="1"
-                  :inactive-value="0"
-                />
-                <el-switch
-                  v-else-if="setting.type === 'switchCustom'"
-                  v-model="setting.value"
                   :active-value="setting.active"
                   :inactive-value="setting.inactive"
                 />
+<!--                <el-switch-->
+<!--                  v-else-if="setting.type === 'switchNumber'"-->
+<!--                  v-model="setting.value"-->
+<!--                  :active-value="1"-->
+<!--                  :inactive-value="0"-->
+<!--                />-->
+<!--                <el-switch-->
+<!--                  v-else-if="setting.type === 'switch,'"-->
+<!--                  v-model="setting.value"-->
+<!--                  :active-value="setting.active"-->
+<!--                  :inactive-value="setting.inactive"-->
+<!--                />-->
                 <el-slider
                   v-else-if="setting.type === 'slider'"
                   v-model="setting.value"

data-room-ui/packages/G2Plots/折线图/基础折线图.js

@@ -128,10 +128,12 @@ const setting = [
   },
   {
     label: '数据标签',
-    type: 'switchNumber', // 设置组件类型
+    type: 'switch', // 设置组件类型
     field: 'label_style_opacity', // 字段
     optionField: 'label.style.opacity', // 对应options中的字段
     value: 0,
+    active: 1,
+    inactive: 0,
     tabName: 'custom',
     groupName: 'graph'
   },
@@ -174,7 +176,7 @@ const setting = [
   // 网格线 grid
   {
     label: '虚线',
-    type: 'switchCustom',
+    type: 'switch,',
     field: 'yAxis_grid_line_style_lineDash',
     optionField: 'yAxis.grid.line.style.lineDash',
     value: 0,
@@ -320,6 +322,8 @@ const setting = [
     field: 'xAxis_label_autoRotate',
     optionField: 'xAxis.label.autoRotate',
     value: false,
+    active: true,
+    inactive: false,
     tabName: 'custom',
     groupName: 'xAxis'
   },
@@ -329,6 +333,8 @@ const setting = [
     field: 'xAxis_label_autoHide',
     optionField: 'xAxis.label.autoHide',
     value: false,
+    active: true,
+    inactive: false,
     tabName: 'custom',
     groupName: 'xAxis'
   },
@@ -338,6 +344,8 @@ const setting = [
     field: 'xAxis_label_autoEllipsis',
     optionField: 'xAxis.label.autoEllipsis',
     value: false,
+    active: true,
+    inactive: false,
     tabName: 'custom',
     groupName: 'xAxis'
   },
@@ -395,10 +403,12 @@ const setting = [
   },
   {
     label: '显示标签',
-    type: 'switchNumber',
+    type: 'switch',
     field: 'yAxis_label_style_opacity',
     optionField: 'yAxis.label.style.opacity',
     value: 1,
+    active: 1,
+    inactive: 0,
     tabName: 'custom',
     groupName: 'yAxis'
   },

data-room-ui/packages/G2Plots/折线图/基础折线点图.js

@@ -167,7 +167,7 @@ const setting = [
   // 网格线 grid
   {
     label: '虚线',
-    type: 'switchCustom',
+    type: 'switch,',
     field: 'yAxis_grid_line_style_lineDash',
     optionField: 'yAxis.grid.line.style.lineDash',
     value: 0,
@@ -313,6 +313,8 @@ const setting = [
     field: 'xAxis_label_autoRotate',
     optionField: 'xAxis.label.autoRotate',
     value: false,
+    active: true,
+    inactive: false,
     tabName: 'custom',
     groupName: 'xAxis'
   },
@@ -322,6 +324,8 @@ const setting = [
     field: 'xAxis_label_autoHide',
     optionField: 'xAxis.label.autoHide',
     value: false,
+    active: true,
+    inactive: false,
     tabName: 'custom',
     groupName: 'xAxis'
   },
@@ -331,6 +335,8 @@ const setting = [
     field: 'xAxis_label_autoEllipsis',
     optionField: 'xAxis.label.autoEllipsis',
     value: false,
+    active: true,
+    inactive: false,
     tabName: 'custom',
     groupName: 'xAxis'
   },
@@ -388,10 +394,12 @@ const setting = [
   },
   {
     label: '显示标签',
-    type: 'switchNumber',
+    type: 'switch',
     field: 'yAxis_label_style_opacity',
     optionField: 'yAxis.label.style.opacity',
     value: 1,
+    active: 1,
+    inactive: 0,
     tabName: 'custom',
     groupName: 'yAxis'
   },

data-room-ui/packages/G2Plots/折线图/基础曲线图.js

@@ -67,7 +67,7 @@ const setting = [
   // 网格线 grid
   {
     label: '虚线',
-    type: 'switchCustom',
+    type: 'switch,',
     field: 'yAxis_grid_line_style_lineDash',
     optionField: 'yAxis.grid.line.style.lineDash',
     value: 0,
@@ -213,6 +213,8 @@ const setting = [
     field: 'xAxis_label_autoRotate',
     optionField: 'xAxis.label.autoRotate',
     value: false,
+    active: true,
+    inactive: false,
     tabName: 'custom',
     groupName: 'xAxis'
   },
@@ -222,6 +224,8 @@ const setting = [
     field: 'xAxis_label_autoHide',
     optionField: 'xAxis.label.autoHide',
     value: false,
+    active: true,
+    inactive: false,
     tabName: 'custom',
     groupName: 'xAxis'
   },
@@ -231,6 +235,8 @@ const setting = [
     field: 'xAxis_label_autoEllipsis',
     optionField: 'xAxis.label.autoEllipsis',
     value: false,
+    active: true,
+    inactive: false,
     tabName: 'custom',
     groupName: 'xAxis'
   },
@@ -288,10 +294,12 @@ const setting = [
   },
   {
     label: '显示标签',
-    type: 'switchNumber',
+    type: 'switch',
     field: 'yAxis_label_style_opacity',
     optionField: 'yAxis.label.style.opacity',
     value: 1,
+    active: 1,
+    inactive: 0,
     tabName: 'custom',
     groupName: 'yAxis'
   },

data-room-ui/packages/G2Plots/折线图/多折线动画图.js

@@ -119,7 +119,7 @@ const setting = [
   // 网格线 grid
   {
     label: '虚线',
-    type: 'switchCustom',
+    type: 'switch,',
     field: 'yAxis_grid_line_style_lineDash',
     optionField: 'yAxis.grid.line.style.lineDash',
     value: 0,
@@ -153,6 +153,8 @@ const setting = [
     field: 'legendEnable', // 字段
     optionField: 'legendEnable', // 对应options中的字段
     value: false,
+    active: true,
+    inactive: false,
     tabName: 'custom',
     groupName: 'legend'
   },
@@ -337,6 +339,8 @@ const setting = [
     field: 'xAxis_label_autoHide',
     optionField: 'xAxis.label.autoHide',
     value: false,
+    active: true,
+    inactive: false,
     tabName: 'custom',
     groupName: 'xAxis'
   },
@@ -346,6 +350,8 @@ const setting = [
     field: 'xAxis_label_autoEllipsis',
     optionField: 'xAxis.label.autoEllipsis',
     value: false,
+    active: true,
+    inactive: false,
     tabName: 'custom',
     groupName: 'xAxis'
   },
@@ -403,10 +409,12 @@ const setting = [
   },
   {
     label: '显示标签',
-    type: 'switchNumber',
+    type: 'switch',
     field: 'yAxis_label_style_opacity',
     optionField: 'yAxis.label.style.opacity',
     value: 1,
+    active: 1,
+    inactive: 0,
     tabName: 'custom',
     groupName: 'yAxis'
   },

data-room-ui/packages/G2Plots/折线图/多折线图.js

@@ -83,7 +83,7 @@ const setting = [
   // 网格线 grid
   {
     label: '虚线',
-    type: 'switchCustom',
+    type: 'switch,',
     field: 'yAxis_grid_line_style_lineDash',
     optionField: 'yAxis.grid.line.style.lineDash',
     value: 0,
@@ -117,6 +117,8 @@ const setting = [
     field: 'legendEnable', // 字段
     optionField: 'legendEnable', // 对应options中的字段
     value: false,
+    active: true,
+    inactive: false,
     tabName: 'custom',
     groupName: 'legend'
   },
@@ -292,6 +294,8 @@ const setting = [
     field: 'xAxis_label_autoRotate',
     optionField: 'xAxis.label.autoRotate',
     value: false,
+    active: true,
+    inactive: false,
     tabName: 'custom',
     groupName: 'xAxis'
   },
@@ -367,10 +371,12 @@ const setting = [
   },
   {
     label: '显示标签',
-    type: 'switchNumber',
+    type: 'switch',
     field: 'yAxis_label_style_opacity',
     optionField: 'yAxis.label.style.opacity',
     value: 1,
+    active: 1,
+    inactive: 0,
     tabName: 'custom',
     groupName: 'yAxis'
   },

data-room-ui/packages/G2Plots/折线图/多阶梯折线图.js

@@ -79,7 +79,7 @@ const setting = [
   // 网格线 grid
   {
     label: '虚线',
-    type: 'switchCustom',
+    type: 'switch,',
     field: 'yAxis_grid_line_style_lineDash',
     optionField: 'yAxis.grid.line.style.lineDash',
     value: 0,
@@ -113,6 +113,8 @@ const setting = [
     field: 'legendEnable', // 字段
     optionField: 'legendEnable', // 对应options中的字段
     value: false,
+    active: true,
+    inactive: false,
     tabName: 'custom',
     groupName: 'legend'
   },
@@ -288,6 +290,8 @@ const setting = [
     field: 'xAxis_label_autoRotate',
     optionField: 'xAxis.label.autoRotate',
     value: false,
+    active: true,
+    inactive: false,
     tabName: 'custom',
     groupName: 'xAxis'
   },
@@ -363,10 +367,12 @@ const setting = [
   },
   {
     label: '显示标签',
-    type: 'switchNumber',
+    type: 'switch',
     field: 'yAxis_label_style_opacity',
     optionField: 'yAxis.label.style.opacity',
     value: 1,
+    active: 1,
+    inactive: 0,
     tabName: 'custom',
     groupName: 'yAxis'
   },

data-room-ui/packages/G2Plots/折线图/折线趋势填充图.js

@@ -135,7 +135,7 @@ const setting = [
   // 网格线 grid
   {
     label: '虚线',
-    type: 'switchCustom',
+    type: 'switch,',
     field: 'yAxis_grid_line_style_lineDash',
     optionField: 'yAxis.grid.line.style.lineDash',
     value: 0,
@@ -169,6 +169,8 @@ const setting = [
     field: 'legendEnable', // 字段
     optionField: 'legendEnable', // 对应options中的字段
     value: false,
+    active: true,
+    inactive: false,
     tabName: 'custom',
     groupName: 'legend'
   },
@@ -344,6 +346,8 @@ const setting = [
     field: 'xAxis_label_autoRotate',
     optionField: 'xAxis.label.autoRotate',
     value: false,
+    active: true,
+    inactive: false,
     tabName: 'custom',
     groupName: 'xAxis'
   },
@@ -419,10 +423,12 @@ const setting = [
   },
   {
     label: '显示标签',
-    type: 'switchNumber',
+    type: 'switch',
     field: 'yAxis_label_style_opacity',
     optionField: 'yAxis.label.style.opacity',
     value: 1,
+    active: 1,
+    inactive: 0,
     tabName: 'custom',
     groupName: 'yAxis'
   },

data-room-ui/packages/G2Plots/条形图/分组条形图.js

@@ -101,10 +101,12 @@ const setting = [
   },
   {
     label: '数据标签',
-    type: 'switchNumber', // 设置组件类型
+    type: 'switch', // 设置组件类型
     field: 'label_style_opacity', // 字段
     optionField: 'label.style.opacity', // 对应options中的字段
     value: 0,
+    active: 1,
+    inactive: 0,
     tabName: 'custom',
     groupName: 'graph'
   },
@@ -144,7 +146,7 @@ const setting = [
   // 网格线 grid
   {
     label: '虚线',
-    type: 'switchCustom',
+    type: 'switch,',
     field: 'yAxis_grid_line_style_lineDash',
     optionField: 'yAxis.grid.line.style.lineDash',
     value: 0,
@@ -178,6 +180,8 @@ const setting = [
     field: 'legendEnable', // 字段
     optionField: 'legendEnable', // 对应options中的字段
     value: false,
+    active: true,
+    inactive: false,
     tabName: 'custom',
     groupName: 'legend'
   },
@@ -381,10 +385,12 @@ const setting = [
   },
   {
     label: '显示标签',
-    type: 'switchNumber',
+    type: 'switch',
     field: 'yAxis_label_style_opacity',
     optionField: 'yAxis.label.style.opacity',
     value: 1,
+    active: 1,
+    inactive: 0,
     tabName: 'custom',
     groupName: 'yAxis'
   },
@@ -454,6 +460,8 @@ const setting = [
     field: 'yAxis_label_autoRotate',
     optionField: 'yAxis.label.autoRotate',
     value: false,
+    active: true,
+    inactive: false,
     tabName: 'custom',
     groupName: 'yAxis'
   },

data-room-ui/packages/G2Plots/条形图/基础条形图.js

@@ -89,10 +89,12 @@ const setting = [
   },
   {
     label: '数据标签',
-    type: 'switchNumber', // 设置组件类型
+    type: 'switch', // 设置组件类型
     field: 'label_style_opacity', // 字段
     optionField: 'label.style.opacity', // 对应options中的字段
     value: 0,
+    active: 1,
+    inactive: 0,
     tabName: 'custom',
     groupName: 'graph'
   },
@@ -132,7 +134,7 @@ const setting = [
   // 网格线 grid
   {
     label: '虚线',
-    type: 'switchCustom',
+    type: 'switch,',
     field: 'yAxis_grid_line_style_lineDash',
     optionField: 'yAxis.grid.line.style.lineDash',
     value: 0,
@@ -166,6 +168,8 @@ const setting = [
     field: 'legendEnable', // 字段
     optionField: 'legendEnable', // 对应options中的字段
     value: false,
+    active: true,
+    inactive: false,
     tabName: 'custom',
     groupName: 'legend'
   },
@@ -369,10 +373,12 @@ const setting = [
   },
   {
     label: '显示标签',
-    type: 'switchNumber',
+    type: 'switch',
     field: 'yAxis_label_style_opacity',
     optionField: 'yAxis.label.style.opacity',
     value: 1,
+    active: 1,
+    inactive: 0,
     tabName: 'custom',
     groupName: 'yAxis'
   },

data-room-ui/packages/G2Plots/柱状图/分组柱状图.js

@@ -51,10 +51,12 @@ const setting = [
   // 图表 graph
   {
     label: '数据标签',
-    type: 'switchNumber', // 设置组件类型
+    type: 'switch', // 设置组件类型
     field: 'label_style_opacity', // 字段
     optionField: 'label.style.opacity', // 对应options中的字段
     value: 0,
+    active: 1,
+    inactive: 0,
     tabName: 'custom',
     groupName: 'graph'
   },
@@ -119,7 +121,7 @@ const setting = [
   // 网格线 grid
   {
     label: '虚线',
-    type: 'switchCustom',
+    type: 'switch,',
     field: 'yAxis_grid_line_style_lineDash',
     optionField: 'yAxis.grid.line.style.lineDash',
     value: 0,
@@ -153,6 +155,8 @@ const setting = [
     field: 'legendEnable', // 字段
     optionField: 'legendEnable', // 对应options中的字段
     value: false,
+    active: true,
+    inactive: false,
     tabName: 'custom',
     groupName: 'legend'
   },
@@ -328,6 +332,8 @@ const setting = [
     field: 'xAxis_label_autoRotate',
     optionField: 'xAxis.label.autoRotate',
     value: false,
+    active: true,
+    inactive: false,
     tabName: 'custom',
     groupName: 'xAxis'
   },
@@ -403,10 +409,12 @@ const setting = [
   },
   {
     label: '显示标签',
-    type: 'switchNumber',
+    type: 'switch',
     field: 'yAxis_label_style_opacity',
     optionField: 'yAxis.label.style.opacity',
     value: 1,
+    active: 1,
+    inactive: 0,
     tabName: 'custom',
     groupName: 'yAxis'
   },

data-room-ui/packages/G2Plots/柱状图/圆角柱状图.js

@@ -51,10 +51,12 @@ const setting = [
   // 图表 graph
   {
     label: '数据标签',
-    type: 'switchNumber', // 设置组件类型
+    type: 'switch', // 设置组件类型
     field: 'label_style_opacity', // 字段
     optionField: 'label.style.opacity', // 对应options中的字段
     value: 0,
+    active: 1,
+    inactive: 0,
     tabName: 'custom',
     groupName: 'graph'
   },
@@ -119,7 +121,7 @@ const setting = [
   // 网格线 grid
   {
     label: '虚线',
-    type: 'switchCustom',
+    type: 'switch,',
     field: 'yAxis_grid_line_style_lineDash',
     optionField: 'yAxis.grid.line.style.lineDash',
     value: 0,
@@ -153,6 +155,8 @@ const setting = [
     field: 'legendEnable', // 字段
     optionField: 'legendEnable', // 对应options中的字段
     value: false,
+    active: true,
+    inactive: false,
     tabName: 'custom',
     groupName: 'legend'
   },
@@ -328,6 +332,8 @@ const setting = [
     field: 'xAxis_label_autoRotate',
     optionField: 'xAxis.label.autoRotate',
     value: false,
+    active: true,
+    inactive: false,
     tabName: 'custom',
     groupName: 'xAxis'
   },
@@ -403,10 +409,12 @@ const setting = [
   },
   {
     label: '显示标签',
-    type: 'switchNumber',
+    type: 'switch',
     field: 'yAxis_label_style_opacity',
     optionField: 'yAxis.label.style.opacity',
     value: 1,
+    active: 1,
+    inactive: 0,
     tabName: 'custom',
     groupName: 'yAxis'
   },

data-room-ui/packages/G2Plots/柱状图/基础柱状图.js

@@ -50,10 +50,12 @@ const setting = [
   },
   {
     label: '数据标签',
-    type: 'switchNumber', // 设置组件类型
+    type: 'switch', // 设置组件类型
     field: 'label_style_opacity', // 字段
     optionField: 'label.style.opacity', // 对应options中的字段
     value: 0,
+    active: 1,
+    inactive: 0,
     tabName: 'custom',
     groupName: 'graph'
   },
@@ -106,7 +108,7 @@ const setting = [
   // 网格线 grid
   {
     label: '虚线',
-    type: 'switchCustom',
+    type: 'switch,',
     field: 'yAxis_grid_line_style_lineDash',
     optionField: 'yAxis.grid.line.style.lineDash',
     value: 0,
@@ -251,6 +253,8 @@ const setting = [
     field: 'xAxis_label_autoRotate',
     optionField: 'xAxis.label.autoRotate',
     value: false,
+    active: true,
+    inactive: false,
     tabName: 'custom',
     groupName: 'xAxis'
   },
@@ -326,10 +330,12 @@ const setting = [
   },
   {
     label: '显示标签',
-    type: 'switchNumber',
+    type: 'switch',
     field: 'yAxis_label_style_opacity',
     optionField: 'yAxis.label.style.opacity',
     value: 1,
+    active: 1,
+    inactive: 0,
     tabName: 'custom',
     groupName: 'yAxis'
   },

data-room-ui/packages/G2Plots/柱状图/堆叠柱状图.js

@@ -51,10 +51,12 @@ const setting = [
   // 图表 graph
   {
     label: '数据标签',
-    type: 'switchNumber', // 设置组件类型
+    type: 'switch', // 设置组件类型
     field: 'label_style_opacity', // 字段
     optionField: 'label.style.opacity', // 对应options中的字段
     value: 0,
+    active: 1,
+    inactive: 0,
     tabName: 'custom',
     groupName: 'graph'
   },
@@ -119,7 +121,7 @@ const setting = [
   // 网格线 grid
   {
     label: '虚线',
-    type: 'switchCustom',
+    type: 'switch,',
     field: 'yAxis_grid_line_style_lineDash',
     optionField: 'yAxis.grid.line.style.lineDash',
     value: 0,
@@ -153,6 +155,8 @@ const setting = [
     field: 'legendEnable', // 字段
     optionField: 'legendEnable', // 对应options中的字段
     value: false,
+    active: true,
+    inactive: false,
     tabName: 'custom',
     groupName: 'legend'
   },
@@ -328,6 +332,8 @@ const setting = [
     field: 'xAxis_label_autoRotate',
     optionField: 'xAxis.label.autoRotate',
     value: false,
+    active: true,
+    inactive: false,
     tabName: 'custom',
     groupName: 'xAxis'
   },
@@ -403,10 +409,12 @@ const setting = [
   },
   {
     label: '显示标签',
-    type: 'switchNumber',
+    type: 'switch',
     field: 'yAxis_label_style_opacity',
     optionField: 'yAxis.label.style.opacity',
     value: 1,
+    active: 1,
+    inactive: 0,
     tabName: 'custom',
     groupName: 'yAxis'
   },

data-room-ui/packages/G2Plots/漏斗图/分面漏斗图.js

@@ -60,6 +60,8 @@ const setting = [
     field: 'isTransposed', // 字段
     optionField: 'isTransposed', // 对应options中的字段
     value: false,
+    active: true,
+    inactive: false,
     tabName: 'custom',
     options: [
       {
@@ -147,6 +149,8 @@ const setting = [
     field: 'legendEnable', // 字段
     optionField: 'legendEnable', // 对应options中的字段
     value: false,
+    active: true,
+    inactive: false,
     tabName: 'custom',
     groupName: 'legend'
   },

data-room-ui/packages/G2Plots/漏斗图/基础漏斗图.js

@@ -65,6 +65,8 @@ const setting = [
     field: 'dynamicHeight', // 字段
     optionField: 'dynamicHeight', // 对应options中的字段
     value: false,
+    active: true,
+    inactive: false,
     tabName: 'custom',
     groupName: 'graph'
   },
@@ -74,6 +76,8 @@ const setting = [
     field: 'isTransposed', // 字段
     optionField: 'isTransposed', // 对应options中的字段
     value: false,
+    active: true,
+    inactive: false,
     tabName: 'custom',
     options: [
       {
@@ -149,6 +153,8 @@ const setting = [
     field: 'legendEnable', // 字段
     optionField: 'legendEnable', // 对应options中的字段
     value: false,
+    active: true,
+    inactive: false,
     tabName: 'custom',
     groupName: 'legend'
   },

data-room-ui/packages/G2Plots/漏斗图/对比漏斗图.js

@@ -60,6 +60,8 @@ const setting = [
     field: 'isTransposed', // 字段
     optionField: 'isTransposed', // 对应options中的字段
     value: false,
+    active: true,
+    inactive: false,
     tabName: 'custom',
     options: [
       {
@@ -147,6 +149,8 @@ const setting = [
     field: 'legendEnable', // 字段
     optionField: 'legendEnable', // 对应options中的字段
     value: false,
+    active: true,
+    inactive: false,
     tabName: 'custom',
     groupName: 'legend'
   },

data-room-ui/packages/G2Plots/矩形树图/基础矩形树图.js

@@ -84,6 +84,8 @@ const setting = [
     field: 'legendEnable', // 字段
     optionField: 'legendEnable', // 对应options中的字段
     value: false,
+    active: true,
+    inactive: false,
     tabName: 'custom',
     groupName: 'legend'
   },

data-room-ui/packages/G2Plots/进度图/水波图.js

@@ -29,10 +29,12 @@ const setting = [
   // 图表 graph
   {
     label: '贴图',
-    type: 'switchNumber', // 设置组件类型
+    type: 'switch', // 设置组件类型
     field: 'pattern_cfg_fillOpacity', // 字段
     optionField: 'pattern.cfg.fillOpacity', // 对应options中的字段
     value: 0,
+    active: 1,
+    inactive: 0,
     tabName: 'custom',
     groupName: 'graph'
   },

data-room-ui/packages/G2Plots/进度图/矩形水波图.js

@@ -29,10 +29,12 @@ const setting = [
   // 图表 graph
   {
     label: '贴图',
-    type: 'switchNumber', // 设置组件类型
+    type: 'switch', // 设置组件类型
     field: 'pattern_cfg_fillOpacity', // 字段
     optionField: 'pattern.cfg.fillOpacity', // 对应options中的字段
     value: 0,
+    active: 1,
+    inactive: 0,
     tabName: 'custom',
     groupName: 'graph'
   },

data-room-ui/packages/G2Plots/进度图/钻石水波图.js

@@ -29,10 +29,12 @@ const setting = [
   // 图表 graph
   {
     label: '贴图',
-    type: 'switchNumber', // 设置组件类型
+    type: 'switch', // 设置组件类型
     field: 'pattern_cfg_fillOpacity', // 字段
     optionField: 'pattern.cfg.fillOpacity', // 对应options中的字段
     value: 0,
+    active: 1,
+    inactive: 0,
     tabName: 'custom',
     groupName: 'graph'
   },

data-room-ui/packages/G2Plots/雷达图/分组雷达图.js

@@ -69,6 +69,8 @@ const setting = [
     field: 'smooth', // 字段
     optionField: 'smooth', // 对应options中的字段
     value: false,
+    active: true,
+    inactive: false,
     tabName: 'custom',
     groupName: 'graph'
   },
@@ -170,6 +172,8 @@ const setting = [
     field: 'legendEnable', // 字段
     optionField: 'legendEnable', // 对应options中的字段
     value: false,
+    active: true,
+    inactive: false,
     tabName: 'custom',
     groupName: 'legend'
   },

data-room-ui/packages/G2Plots/雷达图/基础雷达图.js

@@ -52,10 +52,12 @@ const setting = [
   },
   {
     label: '面积填充',
-    type: 'switchNumber', // 设置组件类型
+    type: 'switch', // 设置组件类型
     field: 'area', // 字段
     optionField: 'area', // 对应options中的字段
     value: 1,
+    active: 1,
+    inactive: 0,
     tabName: 'custom',
     groupName: 'graph'
   },
@@ -65,6 +67,8 @@ const setting = [
     field: 'smooth', // 字段
     optionField: 'smooth', // 对应options中的字段
     value: false,
+    active: true,
+    inactive: false,
     tabName: 'custom',
     groupName: 'graph'
   },

data-room-ui/packages/G2Plots/面积图/基础面积图.js

@@ -48,7 +48,7 @@ const setting = [
   // 图表 graph
   {
     label: '折线点',
-    type: 'switchCustom',
+    type: 'switch,',
     field: 'point_size',
     optionField: 'point.size',
     value: 0,
@@ -63,6 +63,8 @@ const setting = [
     field: 'smooth', // 字段
     optionField: 'smooth', // 对应options中的字段
     value: false,
+    active: true,
+    inactive: false,
     tabName: 'custom',
     groupName: 'graph'
   },
@@ -191,7 +193,7 @@ const setting = [
   // 网格线 grid
   {
     label: '虚线',
-    type: 'switchCustom',
+    type: 'switch,',
     field: 'yAxis_grid_line_style_lineDash',
     optionField: 'yAxis.grid.line.style.lineDash',
     value: 0,
@@ -337,6 +339,8 @@ const setting = [
     field: 'xAxis_label_autoRotate',
     optionField: 'xAxis.label.autoRotate',
     value: false,
+    active: true,
+    inactive: false,
     tabName: 'custom',
     groupName: 'xAxis'
   },
@@ -412,10 +416,12 @@ const setting = [
   },
   {
     label: '显示标签',
-    type: 'switchNumber',
+    type: 'switch',
     field: 'yAxis_label_style_opacity',
     optionField: 'yAxis.label.style.opacity',
     value: 1,
+    active: 1,
+    inactive: 0,
     tabName: 'custom',
     groupName: 'yAxis'
   },

data-room-ui/packages/G2Plots/面积图/堆叠面积图.js

@@ -66,6 +66,8 @@ const setting = [
     field: 'smooth', // 字段
     optionField: 'smooth', // 对应options中的字段
     value: false,
+    active: true,
+    inactive: false,
     tabName: 'custom',
     groupName: 'graph'
   },
@@ -84,7 +86,7 @@ const setting = [
   // 网格线 grid
   {
     label: '虚线',
-    type: 'switchCustom',
+    type: 'switch,',
     field: 'yAxis_grid_line_style_lineDash',
     optionField: 'yAxis.grid.line.style.lineDash',
     value: 0,
@@ -118,6 +120,8 @@ const setting = [
     field: 'legendEnable', // 字段
     optionField: 'legendEnable', // 对应options中的字段
     value: false,
+    active: true,
+    inactive: false,
     tabName: 'custom',
     groupName: 'legend'
   },
@@ -293,6 +297,8 @@ const setting = [
     field: 'xAxis_label_autoRotate',
     optionField: 'xAxis.label.autoRotate',
     value: false,
+    active: true,
+    inactive: false,
     tabName: 'custom',
     groupName: 'xAxis'
   },
@@ -368,10 +374,12 @@ const setting = [
   },
   {
     label: '显示标签',
-    type: 'switchNumber',
+    type: 'switch',
     field: 'yAxis_label_style_opacity',
     optionField: 'yAxis.label.style.opacity',
     value: 1,
+    active: 1,
+    inactive: 0,
     tabName: 'custom',
     groupName: 'yAxis'
   },

data-room-ui/packages/G2Plots/面积图/渐变色面积图.js

@@ -52,6 +52,8 @@ const setting = [
     field: 'smooth', // 字段
     optionField: 'smooth', // 对应options中的字段
     value: false,
+    active: true,
+    inactive: false,
     tabName: 'custom',
     groupName: 'graph'
   },
@@ -95,7 +97,7 @@ const setting = [
   // 网格线 grid
   {
     label: '虚线',
-    type: 'switchCustom',
+    type: 'switch,',
     field: 'yAxis_grid_line_style_lineDash',
     optionField: 'yAxis.grid.line.style.lineDash',
     value: 0,
@@ -241,6 +243,8 @@ const setting = [
     field: 'xAxis_label_autoRotate',
     optionField: 'xAxis.label.autoRotate',
     value: false,
+    active: true,
+    inactive: false,
     tabName: 'custom',
     groupName: 'xAxis'
   },
@@ -316,10 +320,12 @@ const setting = [
   },
   {
     label: '显示标签',
-    type: 'switchNumber',
+    type: 'switch',
     field: 'yAxis_label_style_opacity',
     optionField: 'yAxis.label.style.opacity',
     value: 1,
+    active: 1,
+    inactive: 0,
     tabName: 'custom',
     groupName: 'yAxis'
   },

data-room-ui/packages/G2Plots/饼图/基础环图.js

@@ -230,6 +230,8 @@ const setting = [
     field: 'legendEnable', // 字段
     optionField: 'legendEnable', // 对应options中的字段
     value: false,
+    active: true,
+    inactive: false,
     tabName: 'custom',
     groupName: 'legend'
   },

data-room-ui/packages/G2Plots/饼图/基础饼图.js

@@ -135,6 +135,8 @@ const setting = [
     field: 'legendEnable', // 字段
     optionField: 'legendEnable', // 对应options中的字段
     value: false,
+    active: true,
+    inactive: false,
     tabName: 'custom',
     groupName: 'legend'
   },

data-room-ui/packages/G2Plots/饼图/玫瑰图.js

@@ -96,6 +96,8 @@ const setting = [
     field: 'legendEnable', // 字段
     optionField: 'legendEnable', // 对应options中的字段
     value: false,
+    active: true,
+    inactive: false,
     tabName: 'custom',
     groupName: 'legend'
   },