fix:修改3D基础柱状图和分组柱状图配置项顺序

data-room-ui/packages/Echarts/3D图/3D分组柱状图.js

@@ -217,6 +217,57 @@ const setting = [
     tabName: 'custom',
     groupName: 'xAxis'
   },
+  {
+    label: '名称',
+    type: 'input',
+    field: 'xAxis_name',
+    optionField: 'xAxis.name',
+    value: '',
+    tabName: 'custom',
+    groupName: 'xAxis'
+  },
+  {
+    label: '名称位置',
+    type: 'select',
+    field: 'xAxis_nameLocation',
+    optionField: 'xAxis.nameLocation',
+    value: 'start',
+    tabName: 'custom',
+    options: [
+      {
+        label: '左',
+        value: 'start'
+      },
+      {
+        label: '中',
+        value: 'center'
+      },
+      {
+        label: '右',
+        value: 'end'
+      }],
+    groupName: 'xAxis'
+  },
+  {
+    label: '名称字体大小',
+    type: 'inputNumber',
+    field: 'xAxis_nameTextStyle_fontSize',
+    optionField: 'xAxis.nameTextStyle.fontSize',
+    value: 12,
+    tabName: 'custom',
+    groupName: 'xAxis'
+  },
+  {
+    label: '名称颜色',
+    type: 'colorPicker',
+    field: 'xAxis_nameTextStyle_color',
+    optionField: 'xAxis.nameTextStyle.color',
+    // 是否多选
+    multiple: false,
+    value: '#8C8C8C',
+    tabName: 'custom',
+    groupName: 'xAxis'
+  },
   {
     label: '轴线显示',
     type: 'switch',
@@ -239,6 +290,15 @@ const setting = [
     tabName: 'custom',
     groupName: 'xAxis'
   },
+  {
+    label: '轴线宽度',
+    type: 'inputNumber',
+    field: 'xAxis_axisLine_lineStyle_width',
+    optionField: 'xAxis.axisLine.lineStyle.width',
+    value: 1,
+    tabName: 'custom',
+    groupName: 'xAxis'
+  },
   {
     label: '标签显示',
     type: 'switch',
@@ -279,45 +339,37 @@ const setting = [
     tabName: 'custom',
     groupName: 'xAxis'
   },
+  // Y轴 yAxis
   {
-    label: '标题',
-    type: 'input',
-    field: 'xAxis_name',
-    optionField: 'xAxis.name',
-    value: '',
-    tabName: 'custom',
-    groupName: 'xAxis'
-  },
-  {
-    label: '标题颜色',
-    type: 'colorPicker',
-    field: 'xAxis_nameTextStyle_color',
-    optionField: 'xAxis.nameTextStyle.color',
-    // 是否多选
-    multiple: false,
-    value: '#8C8C8C',
+    label: '显示',
+    type: 'switch',
+    field: 'yAxis_show',
+    optionField: 'yAxis.show',
+    value: 1,
+    active: 1,
+    inactive: 0,
     tabName: 'custom',
-    groupName: 'xAxis'
+    groupName: 'yAxis'
   },
   {
-    label: '标题大小',
-    type: 'inputNumber',
-    field: 'xAxis_nameTextStyle_fontSize',
-    optionField: 'xAxis.nameTextStyle.fontSize',
-    value: 12,
+    label: '名称',
+    type: 'input',
+    field: 'yAxis_name',
+    optionField: 'yAxis.name',
+    value: '',
     tabName: 'custom',
-    groupName: 'xAxis'
+    groupName: 'yAxis'
   },
   {
-    label: '标题位置',
+    label: '名称位置',
     type: 'select',
-    field: 'xAxis_nameLocation',
-    optionField: 'xAxis.nameLocation',
-    value: 'start',
+    field: 'yAxis_nameLocation',
+    optionField: 'yAxis.nameLocation',
+    value: 'end',
     tabName: 'custom',
     options: [
       {
-        label: '左',
+        label: '下',
         value: 'start'
       },
       {
@@ -325,50 +377,36 @@ const setting = [
         value: 'center'
       },
       {
-        label: '右',
+        label: '上',
         value: 'end'
       }],
-    groupName: 'xAxis'
-  },
-  // Y轴 yAxis
-  {
-    label: '显示',
-    type: 'switch',
-    field: 'yAxis_show',
-    optionField: 'yAxis.show',
-    value: 1,
-    active: 1,
-    inactive: 0,
-    tabName: 'custom',
     groupName: 'yAxis'
   },
   {
-    label: '轴线显示',
-    type: 'switch',
-    field: 'yAxis_axisLine_show',
-    optionField: 'yAxis.axisLine.show',
-    value: 1,
-    active: 1,
-    inactive: 0,
+    label: '名称字体大小',
+    type: 'inputNumber',
+    field: 'yAxis_nameTextStyle_fontSize',
+    optionField: 'yAxis.nameTextStyle.fontSize',
+    value: 12,
     tabName: 'custom',
     groupName: 'yAxis'
   },
   {
-    label: '轴线颜色',
+    label: '名称颜色',
     type: 'colorPicker',
-    field: 'yAxis_axisLine_lineStyle_color',
-    optionField: 'yAxis.axisLine.lineStyle.color',
+    field: 'yAxis_nameTextStyle_color',
+    optionField: 'yAxis.nameTextStyle.color',
     // 是否多选
     multiple: false,
-    value: '#333',
+    value: '#8C8C8C',
     tabName: 'custom',
     groupName: 'yAxis'
   },
   {
-    label: '刻度显示',
+    label: '轴线显示',
     type: 'switch',
-    field: 'yAxis_axisTick_show',
-    optionField: 'yAxis.axisTick.show',
+    field: 'yAxis_axisLine_show',
+    optionField: 'yAxis.axisLine.show',
     value: 1,
     active: 1,
     inactive: 0,
@@ -376,23 +414,21 @@ const setting = [
     groupName: 'yAxis'
   },
   {
-    label: '刻度颜色',
+    label: '轴线颜色',
     type: 'colorPicker',
-    field: 'yAxis_axisTick_lineStyle_color',
-    optionField: 'yAxis.axisTick.lineStyle.color',
+    field: 'yAxis_axisLine_lineStyle_color',
+    optionField: 'yAxis.axisLine.lineStyle.color',
     // 是否多选
     multiple: false,
-    value: '#fff',
+    value: '#333',
     tabName: 'custom',
     groupName: 'yAxis'
   },
   {
-    label: '刻度宽度',
+    label: '轴线宽度',
     type: 'inputNumber',
-    field: 'yAxis_axisTick_lineStyle_width',
-    optionField: 'yAxis.axisTick.lineStyle.width',
-    // 是否多选
-    multiple: false,
+    field: 'yAxis_axisLine_lineStyle_width',
+    optionField: 'yAxis.axisLine.lineStyle.width',
     value: 1,
     tabName: 'custom',
     groupName: 'yAxis'
@@ -438,54 +474,36 @@ const setting = [
     groupName: 'yAxis'
   },
   {
-    label: '标题',
-    type: 'input',
-    field: 'yAxis_name',
-    optionField: 'yAxis.name',
-    value: '',
+    label: '刻度显示',
+    type: 'switch',
+    field: 'yAxis_axisTick_show',
+    optionField: 'yAxis.axisTick.show',
+    value: 1,
+    active: 1,
+    inactive: 0,
     tabName: 'custom',
     groupName: 'yAxis'
   },
   {
-    label: '标题颜色',
+    label: '刻度颜色',
     type: 'colorPicker',
-    field: 'yAxis_nameTextStyle_color',
-    optionField: 'yAxis.nameTextStyle.color',
+    field: 'yAxis_axisTick_lineStyle_color',
+    optionField: 'yAxis.axisTick.lineStyle.color',
     // 是否多选
     multiple: false,
-    value: '#8C8C8C',
+    value: '#fff',
     tabName: 'custom',
     groupName: 'yAxis'
   },
   {
-    label: '标题大小',
+    label: '刻度长度',
     type: 'inputNumber',
-    field: 'yAxis_nameTextStyle_fontSize',
-    optionField: 'yAxis.nameTextStyle.fontSize',
-    value: 12,
-    tabName: 'custom',
-    groupName: 'yAxis'
-  },
-  {
-    label: '标题位置',
-    type: 'select',
-    field: 'yAxis_nameLocation',
-    optionField: 'yAxis.nameLocation',
-    value: 'end',
+    field: 'yAxis_axisTick_length',
+    optionField: 'yAxis.axisTick.length',
+    // 是否多选
+    multiple: false,
+    value: 1,
     tabName: 'custom',
-    options: [
-      {
-        label: '下',
-        value: 'start'
-      },
-      {
-        label: '中',
-        value: 'center'
-      },
-      {
-        label: '上',
-        value: 'end'
-      }],
     groupName: 'yAxis'
   }
 ]

data-room-ui/packages/Echarts/3D图/3D基础柱状图.js

@@ -192,6 +192,57 @@ const setting = [
     tabName: 'custom',
     groupName: 'xAxis'
   },
+  {
+    label: '名称',
+    type: 'input',
+    field: 'xAxis_name',
+    optionField: 'xAxis.name',
+    value: '',
+    tabName: 'custom',
+    groupName: 'xAxis'
+  },
+  {
+    label: '名称位置',
+    type: 'select',
+    field: 'xAxis_nameLocation',
+    optionField: 'xAxis.nameLocation',
+    value: 'start',
+    tabName: 'custom',
+    options: [
+      {
+        label: '左',
+        value: 'start'
+      },
+      {
+        label: '中',
+        value: 'center'
+      },
+      {
+        label: '右',
+        value: 'end'
+      }],
+    groupName: 'xAxis'
+  },
+  {
+    label: '名称字体大小',
+    type: 'inputNumber',
+    field: 'xAxis_nameTextStyle_fontSize',
+    optionField: 'xAxis.nameTextStyle.fontSize',
+    value: 12,
+    tabName: 'custom',
+    groupName: 'xAxis'
+  },
+  {
+    label: '名称颜色',
+    type: 'colorPicker',
+    field: 'xAxis_nameTextStyle_color',
+    optionField: 'xAxis.nameTextStyle.color',
+    // 是否多选
+    multiple: false,
+    value: '#8C8C8C',
+    tabName: 'custom',
+    groupName: 'xAxis'
+  },
   {
     label: '轴线显示',
     type: 'switch',
@@ -214,6 +265,15 @@ const setting = [
     tabName: 'custom',
     groupName: 'xAxis'
   },
+  {
+    label: '轴线宽度',
+    type: 'inputNumber',
+    field: 'xAxis_axisLine_lineStyle_width',
+    optionField: 'xAxis.axisLine.lineStyle.width',
+    value: 1,
+    tabName: 'custom',
+    groupName: 'xAxis'
+  },
   {
     label: '标签显示',
     type: 'switch',
@@ -254,45 +314,37 @@ const setting = [
     tabName: 'custom',
     groupName: 'xAxis'
   },
+  // Y轴 yAxis
   {
-    label: '标题',
-    type: 'input',
-    field: 'xAxis_name',
-    optionField: 'xAxis.name',
-    value: '',
-    tabName: 'custom',
-    groupName: 'xAxis'
-  },
-  {
-    label: '标题颜色',
-    type: 'colorPicker',
-    field: 'xAxis_nameTextStyle_color',
-    optionField: 'xAxis.nameTextStyle.color',
-    // 是否多选
-    multiple: false,
-    value: '#8C8C8C',
+    label: '显示',
+    type: 'switch',
+    field: 'yAxis_show',
+    optionField: 'yAxis.show',
+    value: 1,
+    active: 1,
+    inactive: 0,
     tabName: 'custom',
-    groupName: 'xAxis'
+    groupName: 'yAxis'
   },
   {
-    label: '标题大小',
-    type: 'inputNumber',
-    field: 'xAxis_nameTextStyle_fontSize',
-    optionField: 'xAxis.nameTextStyle.fontSize',
-    value: 12,
+    label: '名称',
+    type: 'input',
+    field: 'yAxis_name',
+    optionField: 'yAxis.name',
+    value: '',
     tabName: 'custom',
-    groupName: 'xAxis'
+    groupName: 'yAxis'
   },
   {
-    label: '标题位置',
+    label: '名称位置',
     type: 'select',
-    field: 'xAxis_nameLocation',
-    optionField: 'xAxis.nameLocation',
-    value: 'start',
+    field: 'yAxis_nameLocation',
+    optionField: 'yAxis.nameLocation',
+    value: 'end',
     tabName: 'custom',
     options: [
       {
-        label: '左',
+        label: '下',
         value: 'start'
       },
       {
@@ -300,50 +352,36 @@ const setting = [
         value: 'center'
       },
       {
-        label: '右',
+        label: '上',
         value: 'end'
       }],
-    groupName: 'xAxis'
-  },
-  // Y轴 yAxis
-  {
-    label: '显示',
-    type: 'switch',
-    field: 'yAxis_show',
-    optionField: 'yAxis.show',
-    value: 1,
-    active: 1,
-    inactive: 0,
-    tabName: 'custom',
     groupName: 'yAxis'
   },
   {
-    label: '轴线显示',
-    type: 'switch',
-    field: 'yAxis_axisLine_show',
-    optionField: 'yAxis.axisLine.show',
-    value: 1,
-    active: 1,
-    inactive: 0,
+    label: '名称字体大小',
+    type: 'inputNumber',
+    field: 'yAxis_nameTextStyle_fontSize',
+    optionField: 'yAxis.nameTextStyle.fontSize',
+    value: 12,
     tabName: 'custom',
     groupName: 'yAxis'
   },
   {
-    label: '轴线颜色',
+    label: '名称颜色',
     type: 'colorPicker',
-    field: 'yAxis_axisLine_lineStyle_color',
-    optionField: 'yAxis.axisLine.lineStyle.color',
+    field: 'yAxis_nameTextStyle_color',
+    optionField: 'yAxis.nameTextStyle.color',
     // 是否多选
     multiple: false,
-    value: '#333',
+    value: '#8C8C8C',
     tabName: 'custom',
     groupName: 'yAxis'
   },
   {
-    label: '刻度显示',
+    label: '轴线显示',
     type: 'switch',
-    field: 'yAxis_axisTick_show',
-    optionField: 'yAxis.axisTick.show',
+    field: 'yAxis_axisLine_show',
+    optionField: 'yAxis.axisLine.show',
     value: 1,
     active: 1,
     inactive: 0,
@@ -351,23 +389,21 @@ const setting = [
     groupName: 'yAxis'
   },
   {
-    label: '刻度颜色',
+    label: '轴线颜色',
     type: 'colorPicker',
-    field: 'yAxis_axisTick_lineStyle_color',
-    optionField: 'yAxis.axisTick.lineStyle.color',
+    field: 'yAxis_axisLine_lineStyle_color',
+    optionField: 'yAxis.axisLine.lineStyle.color',
     // 是否多选
     multiple: false,
-    value: '#fff',
+    value: '#333',
     tabName: 'custom',
     groupName: 'yAxis'
   },
   {
-    label: '刻度宽度',
+    label: '轴线宽度',
     type: 'inputNumber',
-    field: 'yAxis_axisTick_lineStyle_width',
-    optionField: 'yAxis.axisTick.lineStyle.width',
-    // 是否多选
-    multiple: false,
+    field: 'yAxis_axisLine_lineStyle_width',
+    optionField: 'yAxis.axisLine.lineStyle.width',
     value: 1,
     tabName: 'custom',
     groupName: 'yAxis'
@@ -413,54 +449,36 @@ const setting = [
     groupName: 'yAxis'
   },
   {
-    label: '标题',
-    type: 'input',
-    field: 'yAxis_name',
-    optionField: 'yAxis.name',
-    value: '',
+    label: '刻度显示',
+    type: 'switch',
+    field: 'yAxis_axisTick_show',
+    optionField: 'yAxis.axisTick.show',
+    value: 1,
+    active: 1,
+    inactive: 0,
     tabName: 'custom',
     groupName: 'yAxis'
   },
   {
-    label: '标题颜色',
+    label: '刻度颜色',
     type: 'colorPicker',
-    field: 'yAxis_nameTextStyle_color',
-    optionField: 'yAxis.nameTextStyle.color',
+    field: 'yAxis_axisTick_lineStyle_color',
+    optionField: 'yAxis.axisTick.lineStyle.color',
     // 是否多选
     multiple: false,
-    value: '#8C8C8C',
+    value: '#fff',
     tabName: 'custom',
     groupName: 'yAxis'
   },
   {
-    label: '标题大小',
+    label: '刻度长度',
     type: 'inputNumber',
-    field: 'yAxis_nameTextStyle_fontSize',
-    optionField: 'yAxis.nameTextStyle.fontSize',
-    value: 12,
-    tabName: 'custom',
-    groupName: 'yAxis'
-  },
-  {
-    label: '标题位置',
-    type: 'select',
-    field: 'yAxis_nameLocation',
-    optionField: 'yAxis.nameLocation',
-    value: 'end',
+    field: 'yAxis_axisTick_length',
+    optionField: 'yAxis.axisTick.length',
+    // 是否多选
+    multiple: false,
+    value: 1,
     tabName: 'custom',
-    options: [
-      {
-        label: '下',
-        value: 'start'
-      },
-      {
-        label: '中',
-        value: 'center'
-      },
-      {
-        label: '上',
-        value: 'end'
-      }],
     groupName: 'yAxis'
   }
 ]
@@ -534,13 +552,18 @@ const option = {
       // 坐标轴刻度设置
       axisTick: {
         show: false,
-        alignWithLabel: true
+        alignWithLabel: true,
+        lineStyle: {
+          width: 1,
+          color: '#333'
+        }
       },
       // 是否显示坐标轴的轴线
       axisLine: {
         show: false,
         lineStyle: {
-          color: '#333'
+          color: '#333',
+          width: 1
         }
       },
       // 坐标轴刻度标签
@@ -593,6 +616,7 @@ const option = {
     },
     axisTick: {
       show: true,
+      length: 1,
       lineStyle: {
         color: '#fff',
         width: 1
@@ -610,7 +634,8 @@ const option = {
     axisLine: {
       show: true,
       lineStyle: {
-        color: '#333'
+        color: '#333',
+        width: 1
       }
 
     }