Merge branch 'master' of github.com:gcpaas/DataRoom

DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/biz/component/service/impl/BizComponentServiceImpl.java

@@ -173,6 +173,8 @@ public class BizComponentServiceImpl extends ServiceImpl<DataRoomBizComponentDao
         return fileUrl;
     }
 
+    public static final String COPY_SUFFIX = "-副本";
+
     @Override
     public String copy(String code) {
         BizComponentEntity copyFrom = this.getInfoByCode(code);
@@ -181,9 +183,19 @@ public class BizComponentServiceImpl extends ServiceImpl<DataRoomBizComponentDao
         }
         String oldCode = copyFrom.getCode();
         copyFrom.setId(null);
-        copyFrom.setName(copyFrom.getName() + "_复制");
+        String oldName = copyFrom.getName();
+        // 检查是否有 -副本，有的话从-副本开始，后面全部去掉
+        if (oldName.contains(COPY_SUFFIX)) {
+            oldName = oldName.substring(0, oldName.indexOf(COPY_SUFFIX));
+            if (StringUtils.isBlank(oldName)) {
+                oldName = "组件";
+            }
+        }
+        copyFrom.setName(oldName + COPY_SUFFIX);
+        int i = 1;
         while(this.checkName(null, copyFrom.getName())) {
-            copyFrom.setName(copyFrom.getName() + "_复制");
+            copyFrom.setName(oldName + COPY_SUFFIX + i);
+            i++;
         }
         copyFrom.setCode(CodeGenerateUtils.generate("bizComponent"));
         boolean copy = this.copyCoverPicture(oldCode, copyFrom.getCode());

DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/manage/service/impl/DataRoomPageServiceImpl.java

@@ -296,6 +296,9 @@ public class DataRoomPageServiceImpl extends ServiceImpl<DataRoomPageDao, PageEn
         PAGE_ENTITY_CACHE.invalidate(bigScreenEntity.getCode());
     }
 
+
+    public static final String COPY_SUFFIX = "-副本";
+
     @Override
     public String copy(PageEntity screenEntity) {
         DataRoomPageDTO config = (DataRoomPageDTO) screenEntity.getConfig();
@@ -304,9 +307,18 @@ public class DataRoomPageServiceImpl extends ServiceImpl<DataRoomPageDao, PageEn
         screenEntity.setCode(CodeGenerateUtils.generate(screenEntity.getType()));
         int i = 1;
         String oldName = screenEntity.getName();
-        screenEntity.setName(oldName + "_复制");
+        // 检查是否有 -副本，有的话从-副本开始，后面全部去掉
+        if (oldName.contains(COPY_SUFFIX)) {
+            oldName = oldName.substring(0, oldName.indexOf(COPY_SUFFIX));
+            if (StringUtils.isBlank(oldName)) {
+                oldName = "大屏";
+            }
+        }
+        screenEntity.setName(oldName + COPY_SUFFIX);
         while (checkNameRepeat(screenEntity)) {
-            screenEntity.setName(oldName + "_复制" + i++);
+           // 如果重复，采取 -副本1，-副本2的方式
+            screenEntity.setName(oldName + COPY_SUFFIX + i);
+            i++;
         }
         config.setName(screenEntity.getName());
         config.setCode(screenEntity.getCode());

data-room-ui/packages/BigScreenDesign/PageDesignTop.vue

@@ -13,10 +13,12 @@
       <span style="margin-right:8px;font-size:12px">缩放</span>
       <el-input-number
         class="bs-el-input-number"
+        ref="zoomInput"
         style="margin-right:10px"
         :value="zoom"
         :min="1"
         label="描述文字"
+        :controls="true"
         @change="changeZoom"
       />
       <CusBtn
@@ -219,6 +221,12 @@ export default {
       )
     }
   },
+  mounted() {
+    this.$refs.zoomInput.$el.addEventListener('mousewheel', this.handleMouseWheel);
+  },
+  beforeDestroy() {
+    this.$refs.zoomInput.$el.removeEventListener('mousewheel', this.handleMouseWheel);
+  },
   methods: {
     ...mapActions({
       initLayout: 'bigScreen/initLayout'
@@ -230,6 +238,14 @@ export default {
       undoTimeLine: 'bigScreen/undoTimeLine',
       saveTimeLine: 'bigScreen/saveTimeLine'
     }),
+    handleMouseWheel() {
+      const delta = Math.sign(event.deltaY);
+      // 限制最小缩放比例为10
+      if (this.zoom <= 10 && delta > 0) return;
+      event.preventDefault();
+      let zoom1 = this.zoom - delta
+      this.$emit('changeZoom', zoom1)
+    },
     changeZoom (val) {
       this.$emit('changeZoom', val)
     },

data-room-ui/packages/BigScreenMag/SideMenu.vue

@@ -235,7 +235,7 @@ export default {
     },
     // 删除目录
     catalogDel (catalog) {
-      this.$confirm('确定删除该目录？', '提示', {
+      this.$confirm('分组删除后，分组下的大屏会被归纳至全部中，确定删除该分组？', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning',

data-room-ui/packages/ComponentList/CatalogEditForm.vue

@@ -246,7 +246,7 @@ export default {
     },
     // 删除目录
     catalogDel (catalog) {
-      this.$confirm('确定删除该分组？', '提示', {
+      this.$confirm('分组删除后，分组下的组件会被归纳至全部中，确定删除该分组?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning',

data-room-ui/packages/DataSetManagement/src/OriginalEditForm.vue

@@ -229,6 +229,7 @@
                 >
                   <el-radio-group
                     v-model="dataForm.repeatStatus"
+                    @change="repeatStatusChange"
                     class="bs-el-radio-group"
                     :disabled="!isEdit"
                   >
@@ -850,6 +851,9 @@ export default {
       if (!this.dataForm.tableName) return
       this.queryAllField()
     },
+    repeatStatusChange () {
+      this.getPreViewData()
+    },
     /**
      * 获取原始表字段列表
      */

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

@@ -39,58 +39,437 @@ const setting = [
     tabName: 'data'
   },
   {
-    label: '柱子顶部颜色',
-    type: 'colorPicker', // 设置组件类型
-    field: 'seriesCustom_barTopColor', // 字段
-    optionField: 'seriesCustom.barTopColor', // 对应options中的字段
-    value: '#2DB1EF',
+    label: '柱子宽度',
+    type: 'inputNumber', // 设置组件类型
+    field: 'seriesCustom_barWidth', // 字段
+    optionField: 'seriesCustom.barWidth', // 对应options中的字段
+    value: 20,
     tabName: 'custom',
     groupName: 'graph'
   },
+  // {
+  //   label: '柱子顶部颜色',
+  //   type: 'colorPicker', // 设置组件类型
+  //   field: 'seriesCustom_barTopColor', // 字段
+  //   optionField: 'seriesCustom.barTopColor', // 对应options中的字段
+  //   value: '#2DB1EF',
+  //   tabName: 'custom',
+  //   groupName: 'graph'
+  // },
+  // {
+  //   label: '柱子颜色1',
+  //   type: 'colorPicker', // 设置组件类型
+  //   field: 'seriesCustom_barColor1', // 字段
+  //   optionField: 'seriesCustom.barColor1', // 对应options中的字段
+  //   value: '#115ba6',
+  //   tabName: 'custom',
+  //   groupName: 'graph'
+  // },
+  // {
+  //   label: '柱子颜色2',
+  //   type: 'colorPicker', // 设置组件类型
+  //   field: 'seriesCustom_barColor2', // 字段
+  //   optionField: 'seriesCustom.barColor2', // 对应options中的字段
+  //   value: '#1db0dd',
+  //   tabName: 'custom',
+  //   groupName: 'graph'
+  // },
+  // {
+  //   label: '柱子底部颜色',
+  //   type: 'colorPicker', // 设置组件类型
+  //   field: 'seriesCustom_barBottomColor', // 字段
+  //   optionField: 'seriesCustom.barBottomColor', // 对应options中的字段
+  //   value: '#187dcb',
+  //   tabName: 'custom',
+  //   groupName: 'graph'
+  // },
+  // {
+  //   label: '柱子背景顶部颜色',
+  //   type: 'colorPicker', // 设置组件类型
+  //   field: 'seriesCustom_shadowTopColor', // 字段
+  //   optionField: 'seriesCustom.shadowTopColor', // 对应options中的字段
+  //   value: '#142f5a',
+  //   tabName: 'custom',
+  //   groupName: 'graph'
+  // },
+  // {
+  //   label: '柱子背景颜色',
+  //   type: 'colorPicker', // 设置组件类型
+  //   field: 'seriesCustom_shadowColor', // 字段
+  //   optionField: 'seriesCustom.shadowColor', // 对应options中的字段
+  //   value: '#041133',
+  //   tabName: 'custom',
+  //   groupName: 'graph'
+  // },
   {
-    label: '柱子颜色1',
-    type: 'colorPicker', // 设置组件类型
-    field: 'seriesCustom_barColor1', // 字段
-    optionField: 'seriesCustom.barColor1', // 对应options中的字段
-    value: '#115ba6',
+    label: '数据标签',
+    type: 'switch', // 设置组件类型
+    field: 'series_barColor_label_show', // 字段
+    optionField: 'series.barColor.label.show', // 对应options中的字段
+    value: 0,
+    active: 1,
+    inactive: 0,
     tabName: 'custom',
     groupName: 'graph'
   },
   {
-    label: '柱子颜色2',
-    type: 'colorPicker', // 设置组件类型
-    field: 'seriesCustom_barColor2', // 字段
-    optionField: 'seriesCustom.barColor2', // 对应options中的字段
-    value: '#1db0dd',
+    label: '数据标签位置',
+    type: 'select', // 设置组件类型
+    field: 'series_barColor_label_position', // 字段
+    optionField: 'series.barColor.label.position', // 对应options中的字段
+    // 是否多选
+    multiple: false,
+    value: 'inside',
     tabName: 'custom',
+    options: [
+      {
+        label: '顶部',
+        value: 'top'
+      },
+      {
+        label: '居中',
+        value: 'inside'
+      },
+      {
+        label: '底部',
+        value: 'bottom'
+      }
+    ],
     groupName: 'graph'
   },
   {
-    label: '柱子底部颜色',
+    label: '数据标签颜色',
     type: 'colorPicker', // 设置组件类型
-    field: 'seriesCustom_barBottomColor', // 字段
-    optionField: 'seriesCustom.barBottomColor', // 对应options中的字段
-    value: '#187dcb',
+    field: 'series_barColor_label_color', // 字段
+    optionField: 'series.barColor.label.color', // 对应options中的字段
+    value: '#ffffff',
     tabName: 'custom',
     groupName: 'graph'
   },
   {
-    label: '柱子背景顶部颜色',
-    type: 'colorPicker', // 设置组件类型
-    field: 'seriesCustom_shadowTopColor', // 字段
-    optionField: 'seriesCustom.shadowTopColor', // 对应options中的字段
-    value: '#142f5a',
+    label: '数据标签大小',
+    // 设置组件类型
+    type: 'inputNumber',
+    // 字段
+    field: 'series_barColor_label_fontSize',
+    // 对应options中的字段
+    optionField: 'series.barColor.label.fontSize',
+    value: 12,
     tabName: 'custom',
     groupName: 'graph'
   },
+  // 网格线
   {
-    label: '柱子背景颜色',
-    type: 'colorPicker', // 设置组件类型
-    field: 'seriesCustom_shadowColor', // 字段
-    optionField: 'seriesCustom.shadowColor', // 对应options中的字段
-    value: '#041133',
+    label: '分隔线',
+    type: 'switch',
+    field: 'yAxis_splitLine_show',
+    optionField: 'yAxis.splitLine.show',
+    value: 0,
+    active: 1,
+    inactive: 0,
     tabName: 'custom',
-    groupName: 'graph'
+    groupName: 'grid'
+  },
+  {
+    label: '宽度',
+    type: 'inputNumber',
+    field: 'yAxis_splitLine_lineStyle_width',
+    optionField: 'yAxis.splitLine.lineStyle.width',
+    value: 1,
+    tabName: 'custom',
+    groupName: 'grid'
+  },
+  {
+    label: '颜色',
+    type: 'colorPicker',
+    field: 'yAxis_splitLine_lineStyle_color',
+    optionField: 'yAxis.splitLine.lineStyle.color',
+    value: '#fff',
+    tabName: 'custom',
+    groupName: 'grid'
+  },
+  // x轴 xAxis
+  {
+    label: '显示',
+    type: 'switch',
+    field: 'xAxis_show',
+    optionField: 'xAxis.show',
+    value: 0,
+    active: 1,
+    inactive: 0,
+    tabName: 'custom',
+    groupName: 'xAxis'
+  },
+  {
+    label: '轴线显示',
+    type: 'switch',
+    field: 'xAxis_axisLine_show',
+    optionField: 'xAxis.axisLine.show',
+    value: 0,
+    active: 1,
+    inactive: 0,
+    tabName: 'custom',
+    groupName: 'xAxis'
+  },
+  {
+    label: '轴线颜色',
+    type: 'colorPicker',
+    field: 'xAxis_axisLine_lineStyle_color',
+    optionField: 'xAxis.axisLine.lineStyle.color',
+    // 是否多选
+    multiple: false,
+    value: '#333',
+    tabName: 'custom',
+    groupName: 'xAxis'
+  },
+  {
+    label: '标签显示',
+    type: 'switch',
+    field: 'xAxis_axisLabel_show',
+    optionField: 'xAxis.axisLabel.show',
+    value: 1,
+    active: 1,
+    inactive: 0,
+    tabName: 'custom',
+    groupName: 'xAxis'
+  },
+  {
+    label: '标签颜色',
+    type: 'colorPicker',
+    field: 'xAxis_axisLabel_textStyle_color',
+    optionField: 'xAxis.axisLabel.textStyle.color',
+    // 是否多选
+    multiple: false,
+    value: '#8C8C8C',
+    tabName: 'custom',
+    groupName: 'xAxis'
+  },
+  {
+    label: '标签大小',
+    type: 'inputNumber',
+    field: 'xAxis_axisLabel_textStyle_fontSize',
+    optionField: 'xAxis.axisLabel.textStyle.fontSize',
+    value: 14,
+    tabName: 'custom',
+    groupName: 'xAxis'
+  },
+  {
+    label: '标签距离',
+    type: 'inputNumber',
+    field: 'xAxis_axisLabel_margin',
+    optionField: 'xAxis.axisLabel.margin',
+    value: 30,
+    tabName: 'custom',
+    groupName: 'xAxis'
+  },
+  {
+    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',
+    tabName: 'custom',
+    groupName: 'xAxis'
+  },
+  {
+    label: '标题大小',
+    type: 'inputNumber',
+    field: 'xAxis_nameTextStyle_fontSize',
+    optionField: 'xAxis.nameTextStyle.fontSize',
+    value: 12,
+    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'
+  },
+  // 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,
+    tabName: 'custom',
+    groupName: 'yAxis'
+  },
+  {
+    label: '轴线颜色',
+    type: 'colorPicker',
+    field: 'yAxis_axisLine_lineStyle_color',
+    optionField: 'yAxis.axisLine.lineStyle.color',
+    // 是否多选
+    multiple: false,
+    value: '#333',
+    tabName: 'custom',
+    groupName: 'yAxis'
+  },
+  {
+    label: '刻度显示',
+    type: 'switch',
+    field: 'yAxis_axisTick_show',
+    optionField: 'yAxis.axisTick.show',
+    value: 1,
+    active: 1,
+    inactive: 0,
+    tabName: 'custom',
+    groupName: 'yAxis'
+  },
+  {
+    label: '刻度颜色',
+    type: 'colorPicker',
+    field: 'yAxis_axisTick_lineStyle_color',
+    optionField: 'yAxis.axisTick.lineStyle.color',
+    // 是否多选
+    multiple: false,
+    value: '#fff',
+    tabName: 'custom',
+    groupName: 'yAxis'
+  },
+  {
+    label: '刻度宽度',
+    type: 'inputNumber',
+    field: 'yAxis_axisTick_lineStyle_width',
+    optionField: 'yAxis.axisTick.lineStyle.width',
+    // 是否多选
+    multiple: false,
+    value: 1,
+    tabName: 'custom',
+    groupName: 'yAxis'
+  },
+  {
+    label: '标签显示',
+    type: 'switch',
+    field: 'yAxis_axisLabel_show',
+    optionField: 'yAxis.axisLabel.show',
+    value: 1,
+    active: 1,
+    inactive: 0,
+    tabName: 'custom',
+    groupName: 'yAxis'
+  },
+  {
+    label: '标签颜色',
+    type: 'colorPicker',
+    field: 'yAxis_axisLabel_textStyle_color',
+    optionField: 'yAxis.axisLabel.textStyle.color',
+    // 是否多选
+    multiple: false,
+    value: '#8C8C8C',
+    tabName: 'custom',
+    groupName: 'yAxis'
+  },
+  {
+    label: '标签大小',
+    type: 'inputNumber',
+    field: 'yAxis_axisLabel_textStyle_fontSize',
+    optionField: 'yAxis.axisLabel.textStyle.fontSize',
+    value: 14,
+    tabName: 'custom',
+    groupName: 'yAxis'
+  },
+  {
+    label: '标签距离',
+    type: 'inputNumber',
+    field: 'yAxis_axisLabel_margin',
+    optionField: 'yAxis.axisLabel.margin',
+    value: 10,
+    tabName: 'custom',
+    groupName: 'yAxis'
+  },
+  {
+    label: '标题',
+    type: 'input',
+    field: 'yAxis_name',
+    optionField: 'yAxis.name',
+    value: '',
+    tabName: 'custom',
+    groupName: 'yAxis'
+  },
+  {
+    label: '标题颜色',
+    type: 'colorPicker',
+    field: 'yAxis_nameTextStyle_color',
+    optionField: 'yAxis.nameTextStyle.color',
+    // 是否多选
+    multiple: false,
+    value: '#8C8C8C',
+    tabName: 'custom',
+    groupName: 'yAxis'
+  },
+  {
+    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',
+    tabName: 'custom',
+    options: [
+      {
+        label: '下',
+        value: 'start'
+      },
+      {
+        label: '中',
+        value: 'center'
+      },
+      {
+        label: '上',
+        value: 'end'
+      }],
+    groupName: 'yAxis'
   }
 ]
 
@@ -100,7 +479,6 @@ const optionHandler = ''
 // 数据处理脚本
 const dataHandler = ''
 
-// 图表配置 new Line('domName', option)
 const xData = ['本年话务总量', '本年人工话务量', '每万客户呼入量', '每万客户呼入量'
 ]
 const yData1 = [300, 1230, 425, 1200]
@@ -122,7 +500,7 @@ const option = {
   },
   graphic: {
     type: 'group',
-    bottom: '8%',
+    bottom: '5%',
     left: '10%',
     z: 100,
     children: [
@@ -131,7 +509,7 @@ const option = {
         left: 0,
         bottom: 0,
         shape: {
-          width: 400,
+          width: 418 * 0.9,
           height: 10
         },
         style: {
@@ -144,7 +522,7 @@ const option = {
         bottom: 10,
         shape: {
           // 左上、右上、右下、左下
-          points: [[40, -50], [360, -50], [400, 0], [0, 0]]
+          points: [[418 / 10, -320 / 6], [418 - 418 / 6, -320 / 6], [418 * 0.9, 0], [0, 0]]
         },
         style: {
           fill: '#303256'
@@ -154,23 +532,30 @@ const option = {
   },
   xAxis: [
     {
+      show: true,
+      name: '',
       type: 'category',
       data: xData,
-      // 坐标轴刻度设置:x轴数据展示
+      nameTextStyle: {
+        color: '',
+        fontSize: 12
+      },
+      nameLocation: '',
+      // 坐标轴刻度设置
       axisTick: {
-        show: true,
+        show: false,
         alignWithLabel: true
       },
-      // 横坐标颜色
-      nameTextStyle: {
-        color: '#82b0ec'
-      },
       // 是否显示坐标轴的轴线
       axisLine: {
-        show: false
+        show: false,
+        lineStyle: {
+          color: '#333'
+        }
       },
       // 坐标轴刻度标签
       axisLabel: {
+        show: true,
         textStyle: {
           fontSize: 10,
           color: 'rgb(40, 129, 170)'
@@ -179,6 +564,7 @@ const option = {
       }
     },
     {
+      show: false,
       type: 'category',
       axisLine: {
         show: false
@@ -198,36 +584,62 @@ const option = {
       data: xData
     }
   ],
-  yAxis: [
-    {
-      show: true, // y轴文本标签显示
-      type: 'value',
-      axisLabel: {
-        textStyle: {
-          color: 'rgb(40, 129, 170)'
-        }
-      },
-      // 分隔线
-      splitLine: {
-        show: false // yAxis.show配置为true时，该配置才有效
+  yAxis: {
+    name: '',
+    nameTextStyle: {
+      color: '',
+      fontSize: 12
+    },
+    nameLocation: 'end',
+    show: true,
+    type: 'value',
+    axisLabel: {
+      show: true,
+      textStyle: {
+        color: '#fff',
+        fontSize: 12
       },
-      // y轴轴线是否显示
-      axisLine: {
-        show: true
+      margin: 10
+    },
+    axisTick: {
+      show: true,
+      lineStyle: {
+        color: '#fff',
+        width: 1
+      }
+    },
+    // 分隔线
+    splitLine: {
+      show: false, // yAxis.show配置为true时，该配置才有效
+      lineStyle: {
+        color: '#fff',
+        width: 1
+      }
+    },
+    // y轴轴线是否显示
+    axisLine: {
+      show: true,
+      lineStyle: {
+        color: '#fff'
       }
     }
-  ],
+  },
   seriesCustom: {
-    barTopColor: '#2DB1EF',
-    barBottomColor: '#187dcb',
-    barColor1: '#115ba6',
-    barColor2: '#1db0dd',
-    shadowColor: '#041133',
-    shadowTopColor: '#142f5a'
+    barWidth: 30,
+    // 顶部菱形颜色
+    barTopColor: ['#2DB1EF'],
+    // 底部菱形颜色
+    barBottomColor: ['#187dcb'],
+    // 柱子颜色
+    barColor: ['#1db0dd'],
+    // 阴影柱子颜色
+    shadowColor: ['#041133'],
+    // 阴影柱子顶部颜色
+    shadowTopColor: ['#142f5a']
   },
   series: [
     {
-      name: 'y1柱子顶部',
+      id: 'barTopColor1',
       type: 'pictorialBar',
       tooltip: { show: false },
       symbol: 'diamond',
@@ -240,7 +652,7 @@ const option = {
       data: yData1
     },
     {
-      name: 'y2柱子顶部',
+      id: 'barTopColor2',
       type: 'pictorialBar',
       tooltip: { show: false },
       symbol: 'diamond',
@@ -253,10 +665,10 @@ const option = {
       data: yData2
     },
     {
-      name: 'y1',
+      id: ' barColor1',
       type: 'bar',
       barGap: '20%',
-      30: 30,
+      barWidth: 30,
       itemStyle: {
         normal: {
           color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
@@ -275,17 +687,19 @@ const option = {
         }
       },
       label: {
-        show: false
+        show: true,
+        position: 'inside',
+        color: '#fff'
       },
       zlevel: 2,
       z: 12,
       data: yData1
     },
     {
-      name: 'y2',
+      id: 'barColor2',
       type: 'bar',
       // barGap: '60%',
-      30: 30,
+      barWidth: 30,
       itemStyle: {
         normal: {
           color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
@@ -304,14 +718,16 @@ const option = {
         }
       },
       label: {
-        show: false
+        show: true,
+        position: 'inside',
+        color: '#fff'
       },
       zlevel: 2,
       z: 12,
       data: yData2
     },
     {
-      name: 'y1柱子底部',
+      id: 'barBottomColor1',
       type: 'pictorialBar',
       tooltip: { show: false },
       symbol: 'diamond',
@@ -323,7 +739,7 @@ const option = {
       data: yData1
     },
     {
-      name: 'y2柱子底部',
+      id: 'barBottomColor2',
       type: 'pictorialBar',
       tooltip: { show: false },
       symbol: 'diamond',
@@ -335,14 +751,14 @@ const option = {
       data: yData2
     },
     {
-      name: '背景柱子1',
+      id: 'shadowColor1',
       type: 'bar',
       tooltip: { show: false },
       xAxisIndex: 1,
       barGap: '20%',
       data: maxData1,
       zlevel: 1,
-      30: 30,
+      barWidth: 30,
       itemStyle: {
         normal: {
           color: 'rgba(9, 44, 76,.8)'
@@ -350,14 +766,14 @@ const option = {
       }
     },
     {
-      name: '背景柱子2',
+      id: 'shadowColor2',
       type: 'bar',
       tooltip: { show: false },
       xAxisIndex: 1,
       barGap: '20%',
       data: maxData2,
       zlevel: 1,
-      30: 30,
+      barWidth: 30,
       itemStyle: {
         normal: {
           color: 'rgba(16, 56, 70,.8)'
@@ -365,7 +781,7 @@ const option = {
       }
     },
     {
-      name: 'y1背景柱子顶部',
+      id: 'shadowTopColor1',
       type: 'pictorialBar',
       tooltip: { show: false },
       symbol: 'diamond',
@@ -378,7 +794,7 @@ const option = {
       data: maxData1
     },
     {
-      name: 'y2背景柱子顶部',
+      id: 'shadowTopColor2',
       type: 'pictorialBar',
       tooltip: { show: false },
       symbol: 'diamond',

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

@@ -86,7 +86,7 @@ const setting = [
     type: 'switch', // 设置组件类型
     field: 'series_barColor_label_show', // 字段
     optionField: 'series.barColor.label.show', // 对应options中的字段
-    value: 0,
+    value: 1,
     active: 1,
     inactive: 0,
     tabName: 'custom',

data-room-ui/packages/EchartsRender/index.vue

@@ -195,29 +195,39 @@ export default {
               }
             })
           } else if (optionField[0] === 'series') {
-            // 存储要修改的series对象
-            let changeObject = {}
-            // 存储改变后的series对象
-            let changedObject = {}
+            let changeObject = []
+            let beforeChange = []
+            // 如果要配置数据标签相关信息
             optionField.forEach((field, index) => {
               if (index === 0) {
                 option = option[field]
               } else if (index === 1) {
-                // 根据id找到对应的type
-                changeObject = option.find(obj => obj.id === field)
-                changedObject = changeObject
-                option = option.filter(obj => obj.id !== field)
+                // 筛选出需要修改的series对象
+                changeObject = option.filter(item => item.id.includes(field))
+                beforeChange = [...changeObject]
+                option = option.filter(item => !(item.id.includes(field)))
               } else if (index === optionField.length - 1) {
-                // 数据配置时，必须有值才更新
                 if ((set.tabName === type && type === 'data' && set.value) || (set.tabName === type && type === 'custom')) {
-                  changeObject[field] = set.value
+                  changeObject.map(item => {
+                    item[field] = set.value
+                  })
                 }
               } else {
-                changeObject = changeObject[field]
+                const changeResult = []
+                changeObject.forEach(item => {
+                  const result = { ...item[field] }
+                  changeResult.push(result)
+                })
+                changeObject = [...changeResult]
               }
             })
-            changeObject = { ...changeObject, ...changedObject }
-            option.push(changeObject)
+            // 合并修改后的series对象
+            changeObject.forEach(
+              (item, index) => {
+                beforeChange[index].label = _.cloneDeep(item)
+                option.push(beforeChange[index])
+              }
+            )
           } else {
             optionField.forEach((field, index) => {
               if (index === optionField.length - 1) {

data-room-ui/packages/SourceMag/SideMenu.vue

@@ -265,7 +265,7 @@ export default {
     },
     // 删除目录
     catalogDel (catalog) {
-      this.$confirm('确定删除该分组？', '提示', {
+      this.$confirm('分组删除后，分组下的资源会被归纳至全部中，确定删除该分组？', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning',