style: 基础组件根据修改意见调整默认样式

DataRoom/dataroom-core/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.gccloud</groupId>
         <artifactId>dataroom</artifactId>
-        <version>2.0.1.2023102701.Alpha</version>
+        <version>2.0.1.2023111401.Alpha</version>
     </parent>
 
     <artifactId>dataroom-core</artifactId>

DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenBorderChart.java

@@ -53,7 +53,7 @@ public class ScreenBorderChart extends Chart {
         private String gradientDirection;
 
         @ApiModelProperty(notes = "透明度")
-        private Integer opacity;
+        private Float opacity;
 
         @ApiModelProperty(notes = "字体大小")
         private Integer fontSize;

DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenDigitalFlopChart.java

@@ -67,6 +67,8 @@ public class ScreenDigitalFlopChart extends Chart {
         @ApiModelProperty(notes = "边框宽度")
         private Integer borderWidth;
 
+        @ApiModelProperty("字体")
+        private String fontFamily;
 
 
 

DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenNumbersChart.java

@@ -44,5 +44,8 @@ public class ScreenNumbersChart extends Chart {
         @ApiModelProperty(notes = "文字间距")
         private Integer letterSpacing;
 
+        @ApiModelProperty(notes = "千分位")
+        private Boolean thousands;
+
     }
 }

DataRoom/dataroom-server/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.gccloud</groupId>
         <artifactId>dataroom</artifactId>
-        <version>2.0.1.2023102701.Alpha</version>
+        <version>2.0.1.2023111401.Alpha</version>
     </parent>
 
     <artifactId>dataroom-server</artifactId>

DataRoom/pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>com.gccloud</groupId>
     <artifactId>dataroom</artifactId>
-    <version>2.0.1.2023102701.Alpha</version>
+    <version>2.0.1.2023111401.Alpha</version>
 
     <packaging>pom</packaging>
     <name>dataroom</name>

data-room-ui/packages/BasicComponents/DigitalFlop/index.vue

@@ -9,6 +9,7 @@
         :key="index"
         class="content_item"
         :style="{
+          'font-family': option.fontFamily,
           'border-color': option.borderColor,
           'border-width': option.borderWidth + 'px',
           'background-color': option.bgColor,

data-room-ui/packages/BasicComponents/DigitalFlop/setting.vue

@@ -68,6 +68,23 @@
                 :predefine="predefineThemeColors"
               />
             </el-form-item>
+            <el-form-item
+              label="字体类型"
+              label-width="100px"
+            >
+              <el-select
+                v-model="config.customize.fontFamily"
+                popper-class="bs-el-select"
+                class="bs-el-select"
+              >
+                <el-option
+                  v-for="item in fontFamilyList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
             <el-form-item label="卡片宽度">
               <el-input-number
                 v-model="config.customize.width"
@@ -106,7 +123,7 @@
                 :step="1"
               />
             </el-form-item>
-            <el-form-item label="卡片边框">
+            <el-form-item label="边框宽度">
               <el-input-number
                 v-model="config.customize.borderWidth"
                 class="bs-el-input-number"
@@ -168,6 +185,7 @@ import BorderSetting from 'data-room-ui/BigScreenDesign/RightSetting/BorderSetti
 import PosWhSetting from 'data-room-ui/BigScreenDesign/RightSetting/PosWhSetting.vue'
 import RotateSetting from 'data-room-ui/BigScreenDesign/RightSetting/RotateSetting.vue'
 import { predefineColors } from 'data-room-ui/js/utils/colorList'
+import fontList from 'data-room-ui/js/utils/fontList'
 export default {
   name: 'BarSetting',
   components: {
@@ -179,6 +197,7 @@ export default {
   },
   data () {
     return {
+      fontFamilyList: fontList,
       // 预设主题色
       predefineThemeColors: predefineColors
     }

data-room-ui/packages/BasicComponents/DigitalFlop/settingConfig.js

@@ -58,7 +58,8 @@ const customConfig = {
     marginRight: 20,
     numberDigits: 5,
     placeHolder: '0',
-    height: 125
+    height: 125,
+    fontFamily: ''
   }
 }
 export const dataConfig = {

data-room-ui/packages/BasicComponents/Map/setting.vue

@@ -422,7 +422,7 @@
               @click="addColor"
             />
             <span
-              v-if="colors.length"
+              v-if="colors.length > 2"
               class="el-icon-remove-outline"
               style="color: #ea0b30; font-size: 20px"
               @click="delColor"
@@ -456,6 +456,7 @@ export default {
   props: {},
   data () {
     return {
+      colors: [],
       mapList: [],
       predefineThemeColors: predefineColors,
       mapTree: [],
@@ -504,6 +505,7 @@ export default {
   watch: {},
   mounted () {
     this.getMapTree()
+    this.colors = this.config.customize.rangeColor
   },
   methods: {
     getMapTree() {
@@ -526,11 +528,12 @@ export default {
       this.getMapTree()
     },
     delColor () {
-      this.colors = []
-      this.config.customize.rangeColor = []
+      if (this.colors.length <= 2) return
+      this.colors.pop()
+      this.config.customize.rangeColor.pop()
     },
     addColor () {
-      this.colors.push('')
+      this.colors.push('#fff')
     },
     updateColorScheme (colors) {
       this.colors = [...colors]

data-room-ui/packages/BasicComponents/Numbers/index.vue

@@ -37,6 +37,10 @@ export default {
     this.chartInit()
   },
   methods: {
+    changeStyle (config) {
+      config.customize.title = config.customize.thousands ? config.customize?.title?.toString()?.replace(/\B(?=(\d{3})+(?!\d))/g, ',') : config.customize.title
+      this.changeChartConfig(config)
+    },
     // 通过表达式计算得来的值
     getDataByExpression (config) {
       const result = new Function('dataset', 'computedDatas', this.config.expression)

data-room-ui/packages/BasicComponents/Numbers/setting.vue

@@ -120,6 +120,18 @@
             />
           </el-select>
         </el-form-item>
+        <!-- 是否开启语音播报 -->
+        <el-form-item
+          label="千分位分隔"
+          label-width="100px"
+        >
+          <el-switch
+            v-model="config.customize.thousands"
+            :active-value="true"
+            :inactive-value="false"
+            class="bs-el-switch"
+          />
+        </el-form-item>
         <TextGradient
           v-model="config.customize.color"
           label="数字"

data-room-ui/packages/BasicComponents/Numbers/settingConfig.js

@@ -38,7 +38,7 @@ export const settingConfig = {
 const customConfig = {
   type: 'numbers',
   root: {
-    version: '2023101401',
+    version: '2023111401',
     url: 'https://www.runoob.com/',
     expression: 'return ',
     expressionCodes: [],
@@ -59,7 +59,7 @@ const customConfig = {
     fontWeight: 700,
     fontFamily: 'ds-digitalbold', // 字体类型
     color: 'left,#ffffff,#ffffff',
-    // thousands: false, // 千分位分隔
+    thousands: false, // 千分位分隔
     align: 'center', // 文字对齐方式
     letterSpacing: 1// 文字间距
   }

data-room-ui/packages/BasicComponents/ScreenScrollBoard/index.vue

@@ -1,8 +1,5 @@
 <template>
   <div
-    v-loading="config.loading"
-    element-loading-text="数据加载中"
-    :element-loading-background="loadingBackground"
     style="width: 100%;height: 100%"
     class="bs-design-wrap"
   >

data-room-ui/packages/BasicComponents/ScreenScrollRanking/index.vue

@@ -1,8 +1,5 @@
 <template>
   <div
-    v-loading="config.loading"
-    element-loading-text="数据加载中"
-    :element-loading-background="loadingBackground"
     style="width: 100%;height: 100%"
     class="bs-design-wrap"
   >

data-room-ui/packages/BasicComponents/Tables/index.vue

@@ -1,8 +1,5 @@
 <template>
   <div
-    v-loading="config.loading"
-    element-loading-text="数据加载中"
-    :element-loading-background="loadingBackground"
     style="width: 100%;height: 100%"
     class="bs-design-wrap "
   >

data-room-ui/packages/BasicComponents/Texts/settingConfig.js

@@ -38,7 +38,7 @@ export const settingConfig = {
 const customConfig = {
   type: 'texts',
   root: {
-    version: '2023101401',
+    version: '2023111401',
     url: 'https://www.runoob.com/',
     expression: 'return ',
     expressionCodes: [],

data-room-ui/packages/BigScreenDesign/ComponentDialog/index.vue

@@ -670,7 +670,7 @@ export default {
           .left-bigscreen-title {
             font-size: 14px;
             overflow: hidden;
-            width: 120px;
+            width: 100%;
             white-space: nowrap;
             text-overflow: ellipsis;
           }

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

@@ -30,7 +30,7 @@
                 v-model="config.dataSource.source"
                 class="bs-el-select"
                 popper-class="bs-el-select"
-                placeholder="自适应模式"
+                placeholder="请选择数据来源"
                 clearable
                 @change="sourceChange"
               >
@@ -109,7 +109,7 @@
           </div>
         </div>
         <div
-          v-if="!['tree','multipleNumberChart','carousel'].includes(config.type) && config.option.displayOption.dataSourceType.enable && config.dataSource.source !== 'expression'"
+          v-if="!['tree','multipleNumberChart','carousel'].includes(config.type) && config.option.displayOption.dataSourceType.enable && (!['expression','static'].includes(config.dataSource.source))"
           class="data-setting-data-box"
         >
           <div class="lc-field-head">
@@ -402,7 +402,7 @@
                     content="色块模式下可用，地图将根据该属性值寻找对应的区域，并按照值字段进行色块渲染"
                     placement="top"
                   >
-                    <i class="el-icon-question"></i>
+                    <i class="el-icon-question" />
                   </el-tooltip>
                 </span>
               </template>
@@ -443,7 +443,7 @@
                     content="打点模式下可用，地图将经纬度寻找指定坐标，并进行打点显示"
                     placement="top"
                   >
-                    <i class="el-icon-question"></i>
+                    <i class="el-icon-question" />
                   </el-tooltip>
                 </span>
               </template>
@@ -484,7 +484,7 @@
                     content="打点模式下可用，地图将经纬度寻找指定坐标，并进行打点显示"
                     placement="top"
                   >
-                    <i class="el-icon-question"></i>
+                    <i class="el-icon-question" />
                   </el-tooltip>
                 </span>
               </template>
@@ -718,7 +718,7 @@
           </div>
         </div>
         <div
-          v-if="config.option.displayOption.params.enable && config.dataSource.source !== 'expression'"
+          v-if="config.option.displayOption.params.enable &&(!['expression','static'].includes(config.dataSource.source))"
           class="data-setting-data-box"
         >
           <div class="lc-field-head">
@@ -1026,10 +1026,10 @@ export default {
           // 终点纬度
           toLat: '',
           // 轨迹数据
-          value: '',
+          value: ''
         }
       }
-}
+    }
   },
   methods: {
     // 切换数据源的时候将文字和数字组件的相关配置清空

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

@@ -4,7 +4,6 @@
     title="表达式"
     width="60%"
     :visible.sync="formVisible"
-    :append-to-body="false"
     class="bs-dialog-wrap bs-el-dialog"
   >
     <div class="main-box">

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

@@ -52,8 +52,8 @@
               :key="settingIndex+1"
             >
               <el-form-item
-                :label="setting.type=== 'padding' ? '' : setting.label"
-                :label-width="setting.type=== 'padding' ? '0px' :'120px'"
+                :label="['padding','appendPadding'].includes(setting.type)? '' : setting.label"
+                :label-width="['padding','appendPadding'].includes(setting.type)? '0px' :'120px'"
               >
                 <el-input
                   v-if="setting.type === 'input'"
@@ -160,7 +160,7 @@
                   :step="0.01"
                 />
                 <PaddingSetting
-                  v-else-if="setting.type === 'padding'"
+                  v-else-if="setting.type === 'appendPadding'"
                   v-model="setting.value"
                 />
               </el-form-item>
@@ -211,6 +211,7 @@ export default {
         xAxis: 'X轴',
         yAxis: 'Y轴',
         padding: '边距',
+        appendPadding: '内边距',
         other: '其他'
 
       }

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

@@ -63,18 +63,28 @@ export default {
   },
   data () {
     return {
+      count: 0,
+      right: 0
     }
   },
   watch: {
     rightVisiable (value) {
+      const leftElement = document.querySelector('.bs-left-panel')
+      const contentElement = document.querySelector('.grid-wrap-box')
+      // const rightElement = document.querySelector('.bs-right-panel-wrap')
+      const mapElement = document.querySelector('.minimap')
       if (value) {
-        const leftElement = document.querySelector('.bs-left-panel')
-        const contentElement = document.querySelector('.grid-wrap-box')
-        // const rightElement = document.querySelector('.bs-right-panel-wrap')
-        const mapElement = document.querySelector('.minimap')
         if (parseInt(window.getComputedStyle(mapElement).right) > parseInt(window.getComputedStyle(leftElement).width) + parseInt(window.getComputedStyle(contentElement).width) - 320 - parseInt(window.getComputedStyle(mapElement).width)) {
+          // 此时距离超出可视范围
+          this.count = 1
+          this.right = window.getComputedStyle(mapElement).right
           mapElement.style.right = parseInt(window.getComputedStyle(leftElement).width) + parseInt(window.getComputedStyle(contentElement).width) - 320 - parseInt(window.getComputedStyle(mapElement).width) + 'px'
         }
+      } else {
+        if (this.count === 1) {
+          mapElement.style.right = this.right
+          this.count--
+        }
       }
     }
   },
@@ -121,6 +131,7 @@ export default {
 
 <style lang="scss" scoped>
 .bs-right-panel-wrap {
+  //z-index: 1000;
   display: flex;
   flex-direction: column;
   background-color: var(--bs-background-1);

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

@@ -506,7 +506,7 @@ export default {
           .left-bigscreen-title {
             font-size: 14px;
             overflow: hidden;
-            width: 120px;
+            width: 100%;
             white-space: nowrap;
             text-overflow: ellipsis;
           }

data-room-ui/packages/BizComponent/config/defaultEchartsConfig.js

@@ -193,6 +193,8 @@ const data = [
 const option = {
   // 数据将要放入到哪个字段中
   dataKey: 'data',
+  // 图表内边距
+  appendPadding: [0, 0, 0, 0],
   data,
   //柱状图颜色
   color: '#007aff',

data-room-ui/packages/BizComponent/config/defaultG2Config.js

@@ -395,7 +395,16 @@ const setting = [
     tabName: 'custom',
     groupName: 'yAxis'
   },
-  // 边距 padding
+  // 内边距 appendPadding
+  {
+    label: '',
+    type: 'appendPadding',
+    field: 'appendPadding',
+    optionField: 'appendPadding',
+    value: [0, 0, 0, 0],
+    tabName: 'custom',
+    groupName: 'appendPadding'
+  }
     {
     label: '图表边距',
     type: 'padding',
@@ -424,6 +433,8 @@ const data = [
 const option = {
   // 数据将要放入到哪个字段中
   dataKey: 'data',
+  // 图表内边距
+  appendPadding: [0, 0, 0, 0],
   data,
   color: '',
   appendPadding: [16, 16, 16, 16], // 设置图标的边距

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

@@ -312,7 +312,7 @@ export default {
           .left-bigscreen-title {
             font-size: 14px;
             overflow: hidden;
-            width: 120px;
+            width: 100%;
             white-space: nowrap;
             text-overflow: ellipsis;
           }

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

@@ -631,7 +631,7 @@ export default {
           .left-bigscreen-title {
             font-size: 14px;
             overflow: hidden;
-            width: 120px;
+            width: 100%;
             white-space: nowrap;
             text-overflow: ellipsis;
           }

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

@@ -1,8 +1,5 @@
 <template>
   <div
-    v-loading="config.loading"
-    element-loading-text="图表加载中"
-    :element-loading-background="loadingBackground"
     style="width: 100%;height: 100%"
     class="bs-design-wrap bs-custom-component"
     :class="{'light-theme':customTheme === 'light','auto-theme':customTheme !=='light'}"

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

@@ -4,7 +4,7 @@
  * @Author: xing.heng
  */
 // 配置版本号
-const version = '2023092201'
+const version = '2023111501'
 // 分类
 const category = 'Line'
 // 标题
@@ -317,10 +317,10 @@ const setting = [
     groupName: 'xAxis'
   },
   {
-    label: '标签过多时旋转',
+    label: '标签过多时隐藏',
     type: 'switch',
-    field: 'xAxis_label_autoRotate',
-    optionField: 'xAxis.label.autoRotate',
+    field: 'xAxis_label_autoHide',
+    optionField: 'xAxis.label.autoHideEnable',
     value: true,
     active: true,
     inactive: false,
@@ -328,10 +328,19 @@ const setting = [
     groupName: 'xAxis'
   },
   {
-    label: '标签过多时隐藏',
+    label: '标签隐藏判定间隔',
+    type: 'inputNumber',
+    field: 'xAxis_label_autoHide_minGap',
+    optionField: 'xAxis.label.autoHideMinGap',
+    value: 0,
+    tabName: 'custom',
+    groupName: 'xAxis'
+  },
+  {
+    label: '标签过多时旋转',
     type: 'switch',
-    field: 'xAxis_label_autoHide',
-    optionField: 'xAxis.label.autoHide',
+    field: 'xAxis_label_autoRotate',
+    optionField: 'xAxis.label.autoRotate',
     value: true,
     active: true,
     inactive: false,
@@ -463,25 +472,45 @@ const setting = [
     tabName: 'custom',
     groupName: 'yAxis'
   },
-  // 边距 padding
+  // 内边距 appendPadding
+  {
+    label: '',
+    type: 'appendPadding',
+    field: 'appendPadding',
+    optionField: 'appendPadding',
+    value: [0, 0, 0, 0],
+    tabName: 'custom',
+    groupName: 'appendPadding'
+  }
 ]
 
 // 模拟数据
 const data = [
-  { Date: '2010-01', scales: 1998 },
-  { Date: '2010-02', scales: 1850 },
-  { Date: '2010-03', scales: 1720 },
-  { Date: '2010-04', scales: 1818 },
-  { Date: '2010-05', scales: 1920 },
-  { Date: '2010-06', scales: 1802 },
-  { Date: '2010-07', scales: 1945 },
-  { Date: '2010-08', scales: 1856 },
-  { Date: '2010-09', scales: 2107 },
-  { Date: '2010-10', scales: 2140 }
+  { date: '2016年', value: 100 },
+  { date: '2017年', value: 200 },
+  { date: '2018年', value: 300 },
+  { date: '2019年', value: 200 },
+  { date: '2020年', value: 100 },
+  { date: '2021年', value: 200 },
+  { date: '2022年', value: 300 },
+  { date: '2023年', value: 400 }
 ]
 
 // 配置处理脚本
-const optionHandler = 'option.yAxis.grid.line.style.lineDash = [4,setting.find(settingItem=>settingItem.field === \'yAxis_grid_line_style_lineDash\').value]'
+const optionHandler =
+  `
+option.yAxis.grid.line.style.lineDash = [4,setting.find(settingItem=>settingItem.field === 'yAxis_grid_line_style_lineDash').value]
+let autoHide = setting.find(settingItem=>settingItem.field === 'xAxis_label_autoHide').value
+if(autoHide){
+  let minGap = option.xAxis.label.autoHideMinGap
+  option.xAxis.label.autoHide = {
+    type: 'equidistance',
+    cfg: { minGap: minGap }
+  }
+} else {
+  option.xAxis.label.autoHide = false
+}
+  `
 
 // 数据处理脚本
 const dataHandler = ''
@@ -490,10 +519,12 @@ const dataHandler = ''
 const option = {
   // 数据将要放入到哪个字段中
   dataKey: 'data',
+  // 图表内边距
+  appendPadding: [0, 0, 0, 0],
   data,
   color: '',
-  xField: 'Date',
-  yField: 'scales',
+  xField: 'date',
+  yField: 'value',
   smooth: false,
   lineStyle: {
     lineWidth: 2,
@@ -535,9 +566,13 @@ const option = {
       }
     },
     label: {
+      // 可使用函数 (isVertical: boolean, labelGroup: IGroup, limitLength?: number) => boolean;
       autoRotate: false,
       autoHide: false,
       autoEllipsis: true,
+      // autoHide的类型详见@antv/component/src/axis/overlap/auto-hide.ts
+      autoHideEnable: true,
+      autoHideMinGap: 2,
       style: {
         fill: '#8C8C8C',
         fontSize: 12

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

@@ -5,7 +5,7 @@
  */
 
 // 配置版本号
-const version = '2023092201'
+const version = '2023111501'
 // 分类
 const category = 'Line'
 // 标题
@@ -308,10 +308,10 @@ const setting = [
     groupName: 'xAxis'
   },
   {
-    label: '标签过多时旋转',
+    label: '标签过多时隐藏',
     type: 'switch',
-    field: 'xAxis_label_autoRotate',
-    optionField: 'xAxis.label.autoRotate',
+    field: 'xAxis_label_autoHide',
+    optionField: 'xAxis.label.autoHideEnable',
     value: true,
     active: true,
     inactive: false,
@@ -319,10 +319,19 @@ const setting = [
     groupName: 'xAxis'
   },
   {
-    label: '标签过多时隐藏',
+    label: '标签隐藏判定间隔',
+    type: 'inputNumber',
+    field: 'xAxis_label_autoHide_minGap',
+    optionField: 'xAxis.label.autoHideMinGap',
+    value: 0,
+    tabName: 'custom',
+    groupName: 'xAxis'
+  },
+  {
+    label: '标签过多时旋转',
     type: 'switch',
-    field: 'xAxis_label_autoHide',
-    optionField: 'xAxis.label.autoHide',
+    field: 'xAxis_label_autoRotate',
+    optionField: 'xAxis.label.autoRotate',
     value: true,
     active: true,
     inactive: false,
@@ -454,23 +463,45 @@ const setting = [
     tabName: 'custom',
     groupName: 'yAxis'
   },
-  // 边距 padding
+  // 内边距 appendPadding
+  {
+    label: '',
+    type: 'appendPadding',
+    field: 'appendPadding',
+    optionField: 'appendPadding',
+    value: [0, 0, 0, 0],
+    tabName: 'custom',
+    groupName: 'appendPadding'
+  }
 ]
 
 // 模拟数据
 const data = [
-  { year: '1991', value: 3 },
-  { year: '1992', value: 4 },
-  { year: '1993', value: 3.5 },
-  { year: '1994', value: 5 },
-  { year: '1995', value: 4.9 },
-  { year: '1996', value: 6 },
-  { year: '1997', value: 7 },
-  { year: '1998', value: 9 },
-  { year: '1999', value: 13 }
+  { date: '2016年', value: 100 },
+  { date: '2017年', value: 200 },
+  { date: '2018年', value: 300 },
+  { date: '2019年', value: 200 },
+  { date: '2020年', value: 100 },
+  { date: '2021年', value: 200 },
+  { date: '2022年', value: 300 },
+  { date: '2023年', value: 400 }
 ]
 // 配置处理脚本
-const optionHandler = 'option.yAxis.grid.line.style.lineDash = [4,setting.find(settingItem=>settingItem.field === \'yAxis_grid_line_style_lineDash\').value]'
+const optionHandler =
+  `
+option.yAxis.grid.line.style.lineDash = [4,setting.find(settingItem=>settingItem.field === 'yAxis_grid_line_style_lineDash').value]
+let autoHide = setting.find(settingItem=>settingItem.field === 'xAxis_label_autoHide').value
+if(autoHide){
+  let minGap = option.xAxis.label.autoHideMinGap
+  option.xAxis.label.autoHide = {
+    type: 'equidistance',
+    cfg: { minGap: minGap }
+  }
+} else {
+  option.xAxis.label.autoHide = false
+}
+  `
+
 
 // 数据处理脚本
 const dataHandler = ''
@@ -479,8 +510,10 @@ const dataHandler = ''
 const option = {
   // 数据将要放入到哪个字段中
   dataKey: 'data',
+  // 图表内边距
+  appendPadding: [0, 0, 0, 0],
   data,
-  xField: 'year',
+  xField: 'date',
   yField: 'value',
   label: {
     style: {
@@ -524,6 +557,8 @@ const option = {
       autoRotate: false,
       autoHide: false,
       autoEllipsis: true,
+      autoHideEnable: true,
+      autoHideMinGap: 2,
       style: {
         fill: '#8C8C8C',
         fontSize: 12

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

@@ -5,7 +5,7 @@
  */
 
 // 配置版本号
-const version = '2023092201'
+const version = '2023111501'
 // 分类
 const category = 'Line'
 // 标题
@@ -208,10 +208,10 @@ const setting = [
     groupName: 'xAxis'
   },
   {
-    label: '标签过多时旋转',
+    label: '标签过多时隐藏',
     type: 'switch',
-    field: 'xAxis_label_autoRotate',
-    optionField: 'xAxis.label.autoRotate',
+    field: 'xAxis_label_autoHide',
+    optionField: 'xAxis.label.autoHideEnable',
     value: true,
     active: true,
     inactive: false,
@@ -219,10 +219,19 @@ const setting = [
     groupName: 'xAxis'
   },
   {
-    label: '标签过多时隐藏',
+    label: '标签隐藏判定间隔',
+    type: 'inputNumber',
+    field: 'xAxis_label_autoHide_minGap',
+    optionField: 'xAxis.label.autoHideMinGap',
+    value: 0,
+    tabName: 'custom',
+    groupName: 'xAxis'
+  },
+  {
+    label: '标签过多时旋转',
     type: 'switch',
-    field: 'xAxis_label_autoHide',
-    optionField: 'xAxis.label.autoHide',
+    field: 'xAxis_label_autoRotate',
+    optionField: 'xAxis.label.autoRotate',
     value: true,
     active: true,
     inactive: false,
@@ -354,24 +363,45 @@ const setting = [
     tabName: 'custom',
     groupName: 'yAxis'
   },
+  // 内边距 appendPadding
+  {
+    label: '',
+    type: 'appendPadding',
+    field: 'appendPadding',
+    optionField: 'appendPadding',
+    value: [0, 0, 0, 0],
+    tabName: 'custom',
+    groupName: 'appendPadding'
+  }
 ]
 
 // 模拟数据
 const data = [
-  { Date: '2010-01', scales: 1998 },
-  { Date: '2010-02', scales: 1850 },
-  { Date: '2010-03', scales: 1720 },
-  { Date: '2010-04', scales: 1818 },
-  { Date: '2010-05', scales: 1920 },
-  { Date: '2010-06', scales: 1802 },
-  { Date: '2010-07', scales: 1945 },
-  { Date: '2010-08', scales: 1856 },
-  { Date: '2010-09', scales: 2107 },
-  { Date: '2010-10', scales: 2140 }
+  { date: '2016年', value: 100 },
+  { date: '2017年', value: 200 },
+  { date: '2018年', value: 300 },
+  { date: '2019年', value: 200 },
+  { date: '2020年', value: 100 },
+  { date: '2021年', value: 200 },
+  { date: '2022年', value: 300 },
+  { date: '2023年', value: 400 }
 ]
 
 // 配置处理脚本
-const optionHandler = 'option.yAxis.grid.line.style.lineDash = [4,setting.find(settingItem=>settingItem.field === \'yAxis_grid_line_style_lineDash\').value]'
+const optionHandler =
+  `
+option.yAxis.grid.line.style.lineDash = [4,setting.find(settingItem=>settingItem.field === 'yAxis_grid_line_style_lineDash').value]
+let autoHide = setting.find(settingItem=>settingItem.field === 'xAxis_label_autoHide').value
+if(autoHide){
+  let minGap = option.xAxis.label.autoHideMinGap
+  option.xAxis.label.autoHide = {
+    type: 'equidistance',
+    cfg: { minGap: minGap }
+  }
+} else {
+  option.xAxis.label.autoHide = false
+}
+  `
 
 // 数据处理脚本
 const dataHandler = ''
@@ -380,10 +410,12 @@ const dataHandler = ''
 const option = {
   // 数据将要放入到哪个字段中
   dataKey: 'data',
+  // 图表内边距
+  appendPadding: [0, 0, 0, 0],
   data,
   color: '',
-  xField: 'Date',
-  yField: 'scales',
+  xField: 'date',
+  yField: 'value',
   smooth: true,
   lineStyle: {
     lineWidth: 2,
@@ -402,6 +434,8 @@ const option = {
       autoRotate: false,
       autoHide: false,
       autoEllipsis: true,
+      autoHideEnable: true,
+      autoHideMinGap: 2,
       style: {
         fill: '#8C8C8C',
         fontSize: 12

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

@@ -5,7 +5,7 @@
  */
 
 // 配置版本号
-const version = '2023111101'
+const version = '2023111501'
 // 分类
 const category = 'Line'
 // 标题
@@ -334,22 +334,31 @@ const setting = [
     groupName: 'xAxis'
   },
   {
-    label: '标签过多时旋转',
+    label: '标签过多时隐藏',
     type: 'switch',
-    field: 'xAxis_label_autoRotate',
-    optionField: 'xAxis.label.autoRotate',
+    field: 'xAxis_label_autoHide',
+    optionField: 'xAxis.label.autoHideEnable',
     value: true,
+    active: true,
+    inactive: false,
     tabName: 'custom',
     groupName: 'xAxis'
   },
   {
-    label: '标签过多时隐藏',
+    label: '标签隐藏判定间隔',
+    type: 'inputNumber',
+    field: 'xAxis_label_autoHide_minGap',
+    optionField: 'xAxis.label.autoHideMinGap',
+    value: 0,
+    tabName: 'custom',
+    groupName: 'xAxis'
+  },
+  {
+    label: '标签过多时旋转',
     type: 'switch',
-    field: 'xAxis_label_autoHide',
-    optionField: 'xAxis.label.autoHide',
+    field: 'xAxis_label_autoRotate',
+    optionField: 'xAxis.label.autoRotate',
     value: true,
-    active: true,
-    inactive: false,
     tabName: 'custom',
     groupName: 'xAxis'
   },
@@ -478,98 +487,57 @@ const setting = [
     tabName: 'custom',
     groupName: 'yAxis'
   },
+  // 内边距 appendPadding
+  {
+    label: '',
+    type: 'appendPadding',
+    field: 'appendPadding',
+    optionField: 'appendPadding',
+    value: [0, 0, 0, 0],
+    tabName: 'custom',
+    groupName: 'appendPadding'
+  }
 ]
 
 // 模拟数据
 const data = [
-  {
-    year:'1',
-    value:100,
-    type:'今年'
-  },
-  {
-    year:'2',
-    value:200,
-    type:'今年'
-  },
-  {
-    year:'3',
-    value:300,
-    type:'今年'
-  },
-  {
-    year:'4',
-    value:200,
-    type:'今年'
-  },
-  {
-    year:'5',
-    value:100,
-    type:'今年'
-  },
-  {
-    year:'6',
-    value:200,
-    type:'今年'
-  },
-  {
-    year:'7',
-    value:300,
-    type:'今年'
-  },
-  {
-    year:'8',
-    value:400,
-    type:'今年'
-  },
-  {
-    year:'1',
-    value:400,
-    type:'去年'
-  },
-  {
-    year:'2',
-    value:100,
-    type:'去年'
-  },
-  {
-    year:'3',
-    value:200,
-    type:'去年'
-  },
-  {
-    year:'4',
-    value:300,
-    type:'去年'
-  },
-  {
-    year:'5',
-    value:200,
-    type:'去年'
-  },
-  {
-    year:'6',
-    value:100,
-    type:'去年'
-  },
-  {
-    year:'7',
-    value:200,
-    type:'去年'
-  },
-  {
-    year:'8',
-    value:300,
-    type:'去年'
-  }
+  { date: '2016年', value: 100, type: '已处理' },
+  { date: '2017年', value: 200, type: '已处理' },
+  { date: '2018年', value: 300, type: '已处理' },
+  { date: '2019年', value: 200, type: '已处理' },
+  { date: '2020年', value: 100, type: '已处理' },
+  { date: '2021年', value: 200, type: '已处理' },
+  { date: '2022年', value: 300, type: '已处理' },
+  { date: '2023年', value: 400, type: '已处理' },
+  { date: '2016年', value: 400, type: '未处理' },
+  { date: '2017年', value: 100, type: '未处理' },
+  { date: '2018年', value: 200, type: '未处理' },
+  { date: '2019年', value: 300, type: '未处理' },
+  { date: '2020年', value: 200, type: '未处理' },
+  { date: '2021年', value: 100, type: '未处理' },
+  { date: '2022年', value: 200, type: '未处理' },
+  { date: '2023年', value: 300, type: '未处理' }
 ]
 
 // 配置处理脚本
-const optionHandler = 'option.legend = option.legendEnable ? {position: setting.find(settingItem=>settingItem.field === \'legendPosition\').value} : false;' +
-  '\n  if (option.legendEnable) {\n' +
-  '    option.legend.itemName = option.legendItemName\n' +
-  '  };' +
-  'option.yAxis.grid.line.style.lineDash = [4,setting.find(settingItem=>settingItem.field === \'yAxis_grid_line_style_lineDash\').value]'
+const optionHandler =
+  `
+option.legend = option.legendEnable ? {position: setting.find(settingItem=>settingItem.field === 'legendPosition').value} : false;
+if (option.legendEnable) {
+  option.legend.itemName = option.legendItemName
+}
+option.yAxis.grid.line.style.lineDash = [4,setting.find(settingItem=>settingItem.field === 'yAxis_grid_line_style_lineDash').value]
+let autoHide = setting.find(settingItem=>settingItem.field === 'xAxis_label_autoHide').value
+if(autoHide){
+  let minGap = option.xAxis.label.autoHideMinGap
+  option.xAxis.label.autoHide = {
+    type: 'equidistance',
+    cfg: { minGap: minGap }
+  }
+} else {
+  option.xAxis.label.autoHide = false
+}
+  `
 
 // 数据处理脚本
 const dataHandler = ''
@@ -578,10 +546,12 @@ const dataHandler = ''
 const option = {
   // 数据将要放入到哪个字段中
   dataKey: 'data',
+  // 图表内边距
+  appendPadding: [0, 0, 0, 0],
   renderer: 'canvas',
   data,
   color: ['#6b74e4', '#4391f4', '#38bbe5', '#69d6fd', '#36c6a0'],
-  xField: 'year',
+  xField: 'date',
   yField: 'value',
   seriesField: 'type',
   xAxis: {
@@ -597,6 +567,8 @@ const option = {
       autoRotate: true,
       autoHide: false,
       autoEllipsis: true,
+      autoHideEnable: true,
+      autoHideMinGap: 2,
       style: {
         fill: '#8C8C8C',
         fontSize: 12

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

@@ -5,7 +5,7 @@
  */
 
 // 配置版本号
-const version = '2023111101'
+const version = '2023111501'
 // 分类
 const category = 'Line'
 // 标题
@@ -397,10 +397,10 @@ const setting = [
     groupName: 'xAxis'
   },
   {
-    label: '标签过多时旋转',
+    label: '标签过多时隐藏',
     type: 'switch',
-    field: 'xAxis_label_autoRotate',
-    optionField: 'xAxis.label.autoRotate',
+    field: 'xAxis_label_autoHide',
+    optionField: 'xAxis.label.autoHideEnable',
     value: true,
     active: true,
     inactive: false,
@@ -408,11 +408,22 @@ const setting = [
     groupName: 'xAxis'
   },
   {
-    label: '标签过多时隐藏',
+    label: '标签隐藏判定间隔',
+    type: 'inputNumber',
+    field: 'xAxis_label_autoHide_minGap',
+    optionField: 'xAxis.label.autoHideMinGap',
+    value: 0,
+    tabName: 'custom',
+    groupName: 'xAxis'
+  },
+  {
+    label: '标签过多时旋转',
     type: 'switch',
-    field: 'xAxis_label_autoHide',
-    optionField: 'xAxis.label.autoHide',
+    field: 'xAxis_label_autoRotate',
+    optionField: 'xAxis.label.autoRotate',
     value: true,
+    active: true,
+    inactive: false,
     tabName: 'custom',
     groupName: 'xAxis'
   },
@@ -539,90 +550,36 @@ const setting = [
     tabName: 'custom',
     groupName: 'yAxis'
   },
+  // 内边距 appendPadding
+  {
+    label: '',
+    type: 'appendPadding',
+    field: 'appendPadding',
+    optionField: 'appendPadding',
+    value: [0, 0, 0, 0],
+    tabName: 'custom',
+    groupName: 'appendPadding'
+  }
 ]
 
 // 模拟数据
 const data = [
-  {
-    year:'1',
-    value:100,
-    type:'今年'
-  },
-  {
-    year:'2',
-    value:200,
-    type:'今年'
-  },
-  {
-    year:'3',
-    value:300,
-    type:'今年'
-  },
-  {
-    year:'4',
-    value:200,
-    type:'今年'
-  },
-  {
-    year:'5',
-    value:100,
-    type:'今年'
-  },
-  {
-    year:'6',
-    value:200,
-    type:'今年'
-  },
-  {
-    year:'7',
-    value:300,
-    type:'今年'
-  },
-  {
-    year:'8',
-    value:400,
-    type:'今年'
-  },
-  {
-    year:'1',
-    value:400,
-    type:'去年'
-  },
-  {
-    year:'2',
-    value:100,
-    type:'去年'
-  },
-  {
-    year:'3',
-    value:200,
-    type:'去年'
-  },
-  {
-    year:'4',
-    value:300,
-    type:'去年'
-  },
-  {
-    year:'5',
-    value:200,
-    type:'去年'
-  },
-  {
-    year:'6',
-    value:100,
-    type:'去年'
-  },
-  {
-    year:'7',
-    value:200,
-    type:'去年'
-  },
-  {
-    year:'8',
-    value:300,
-    type:'去年'
-  }
+  { date: '2016年', value: 100, type: '已处理' },
+  { date: '2017年', value: 200, type: '已处理' },
+  { date: '2018年', value: 300, type: '已处理' },
+  { date: '2019年', value: 200, type: '已处理' },
+  { date: '2020年', value: 100, type: '已处理' },
+  { date: '2021年', value: 200, type: '已处理' },
+  { date: '2022年', value: 300, type: '已处理' },
+  { date: '2023年', value: 400, type: '已处理' },
+  { date: '2016年', value: 400, type: '未处理' },
+  { date: '2017年', value: 100, type: '未处理' },
+  { date: '2018年', value: 200, type: '未处理' },
+  { date: '2019年', value: 300, type: '未处理' },
+  { date: '2020年', value: 200, type: '未处理' },
+  { date: '2021年', value: 100, type: '未处理' },
+  { date: '2022年', value: 200, type: '未处理' },
+  { date: '2023年', value: 300, type: '未处理' }
 ]
 
 // 配置处理脚本
@@ -632,7 +589,17 @@ if (option.legendEnable) {
   option.legend.itemName = option.legendItemName
 }
 option.yAxis.grid.line.style.lineDash = [4,setting.find(settingItem=>settingItem.field === 'yAxis_grid_line_style_lineDash').value]
-`
+let autoHide = setting.find(settingItem=>settingItem.field === 'xAxis_label_autoHide').value
+if(autoHide){
+  let minGap = option.xAxis.label.autoHideMinGap
+  option.xAxis.label.autoHide = {
+    type: 'equidistance',
+    cfg: { minGap: minGap }
+  }
+} else {
+  option.xAxis.label.autoHide = false
+}
+  `
 
 // 数据处理脚本
 const dataHandler = ''
@@ -641,10 +608,12 @@ const dataHandler = ''
 const option = {
   // 数据将要放入到哪个字段中
   dataKey: 'data',
+  // 图表内边距
+  appendPadding: [0, 0, 0, 0],
   renderer: 'canvas',
   smooth: true,
   data,
-  xField: 'year',
+  xField: 'date',
   yField: 'value',
   seriesField: 'type',
   legendEnable: false,
@@ -687,6 +656,8 @@ const option = {
       autoRotate: false,
       autoHide: true,
       autoEllipsis: true,
+      autoHideEnable: true,
+      autoHideMinGap: 0,
       style: {
         fill: '#8C8C8C',
         fontSize: 12

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

@@ -1,6 +1,6 @@
 
 // 配置版本号
-const version = '2023092501'
+const version = '2023111501'
 // 分类
 const category = 'Line'
 // 标题
@@ -285,10 +285,10 @@ const setting = [
     groupName: 'xAxis'
   },
   {
-    label: '标签过多时旋转',
+    label: '标签过多时隐藏',
     type: 'switch',
-    field: 'xAxis_label_autoRotate',
-    optionField: 'xAxis.label.autoRotate',
+    field: 'xAxis_label_autoHide',
+    optionField: 'xAxis.label.autoHideEnable',
     value: true,
     active: true,
     inactive: false,
@@ -296,11 +296,22 @@ const setting = [
     groupName: 'xAxis'
   },
   {
-    label: '标签过多时隐藏',
+    label: '标签隐藏判定间隔',
+    type: 'inputNumber',
+    field: 'xAxis_label_autoHide_minGap',
+    optionField: 'xAxis.label.autoHideMinGap',
+    value: 0,
+    tabName: 'custom',
+    groupName: 'xAxis'
+  },
+  {
+    label: '标签过多时旋转',
     type: 'switch',
-    field: 'xAxis_label_autoHide',
-    optionField: 'xAxis.label.autoHide',
+    field: 'xAxis_label_autoRotate',
+    optionField: 'xAxis.label.autoRotate',
     value: true,
+    active: true,
+    inactive: false,
     tabName: 'custom',
     groupName: 'xAxis'
   },
@@ -427,98 +438,58 @@ const setting = [
     tabName: 'custom',
     groupName: 'yAxis'
   },
+  // 内边距 appendPadding
+  {
+    label: '',
+    type: 'appendPadding',
+    field: 'appendPadding',
+    optionField: 'appendPadding',
+    value: [0, 0, 0, 0],
+    tabName: 'custom',
+    groupName: 'appendPadding'
+  }
 ]
 
 // 模拟数据
 const data = [
-  {
-    year:'1',
-    value:100,
-    type:'今年'
-  },
-  {
-    year:'2',
-    value:200,
-    type:'今年'
-  },
-  {
-    year:'3',
-    value:300,
-    type:'今年'
-  },
-  {
-    year:'4',
-    value:200,
-    type:'今年'
-  },
-  {
-    year:'5',
-    value:100,
-    type:'今年'
-  },
-  {
-    year:'6',
-    value:200,
-    type:'今年'
-  },
-  {
-    year:'7',
-    value:300,
-    type:'今年'
-  },
-  {
-    year:'8',
-    value:400,
-    type:'今年'
-  },
-  {
-    year:'1',
-    value:400,
-    type:'去年'
-  },
-  {
-    year:'2',
-    value:100,
-    type:'去年'
-  },
-  {
-    year:'3',
-    value:200,
-    type:'去年'
-  },
-  {
-    year:'4',
-    value:300,
-    type:'去年'
-  },
-  {
-    year:'5',
-    value:200,
-    type:'去年'
-  },
-  {
-    year:'6',
-    value:100,
-    type:'去年'
-  },
-  {
-    year:'7',
-    value:200,
-    type:'去年'
-  },
-  {
-    year:'8',
-    value:300,
-    type:'去年'
-  }
+  { date: '2016年', value: 100, type: '已处理' },
+  { date: '2017年', value: 200, type: '已处理' },
+  { date: '2018年', value: 300, type: '已处理' },
+  { date: '2019年', value: 200, type: '已处理' },
+  { date: '2020年', value: 100, type: '已处理' },
+  { date: '2021年', value: 200, type: '已处理' },
+  { date: '2022年', value: 300, type: '已处理' },
+  { date: '2023年', value: 400, type: '已处理' },
+  { date: '2016年', value: 400, type: '未处理' },
+  { date: '2017年', value: 100, type: '未处理' },
+  { date: '2018年', value: 200, type: '未处理' },
+  { date: '2019年', value: 300, type: '未处理' },
+  { date: '2020年', value: 200, type: '未处理' },
+  { date: '2021年', value: 100, type: '未处理' },
+  { date: '2022年', value: 200, type: '未处理' },
+  { date: '2023年', value: 300, type: '未处理' }
 ]
 
 // 配置处理脚本
-const optionHandler = 'option.legend = option.legendEnable ? {position: setting.find(settingItem=>settingItem.field === \'legendPosition\').value} : false;' +
-  '\n  if (option.legendEnable) {\n' +
-  '    option.legend.itemName = option.legendItemName\n' +
-  '  };' +
-  'option.yAxis.grid.line.style.lineDash = [4,setting.find(settingItem=>settingItem.field === \'yAxis_grid_line_style_lineDash\').value]'
+const optionHandler =
+  `
+option.legend = option.legendEnable ? {position: setting.find(settingItem=>settingItem.field === 'legendPosition').value} : false;
+if (option.legendEnable) {
+  option.legend.itemName = option.legendItemName
+};
+option.yAxis.grid.line.style.lineDash = [4,setting.find(settingItem=>settingItem.field === 'yAxis_grid_line_style_lineDash').value]
+let autoHide = setting.find(settingItem=>settingItem.field === 'xAxis_label_autoHide').value
+if(autoHide){
+  let minGap = option.xAxis.label.autoHideMinGap
+  option.xAxis.label.autoHide = {
+    type: 'equidistance',
+    cfg: { minGap: minGap }
+  }
+} else {
+  option.xAxis.label.autoHide = false
+}
+  `
+
 
 // 数据处理脚本
 const dataHandler = ''
@@ -527,9 +498,11 @@ const dataHandler = ''
 const option = {
   // 数据将要放入到哪个字段中
   dataKey: 'data',
+  // 图表内边距
+  appendPadding: [0, 0, 0, 0],
   renderer: 'canvas',
   data,
-  xField: 'year',
+  xField: 'date',
   yField: 'value',
   seriesField: 'type',
   legendEnable: false,
@@ -558,6 +531,8 @@ const option = {
       autoRotate: false,
       autoHide: true,
       autoEllipsis: true,
+      autoHideEnable: true,
+      autoHideMinGap: 0,
       style: {
         fill: '#8C8C8C',
         fontSize: 12

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

@@ -5,7 +5,7 @@
  */
 
 // 配置版本号
-const version = '2023111101'
+const version = '2023111501'
 // 分类
 const category = 'Line'
 // 标题
@@ -350,10 +350,10 @@ const setting = [
     groupName: 'xAxis'
   },
   {
-    label: '标签过多时旋转',
+    label: '标签过多时隐藏',
     type: 'switch',
-    field: 'xAxis_label_autoRotate',
-    optionField: 'xAxis.label.autoRotate',
+    field: 'xAxis_label_autoHide',
+    optionField: 'xAxis.label.autoHideEnable',
     value: true,
     active: true,
     inactive: false,
@@ -361,11 +361,22 @@ const setting = [
     groupName: 'xAxis'
   },
   {
-    label: '标签过多时隐藏',
+    label: '标签隐藏判定间隔',
+    type: 'inputNumber',
+    field: 'xAxis_label_autoHide_minGap',
+    optionField: 'xAxis.label.autoHideMinGap',
+    value: 0,
+    tabName: 'custom',
+    groupName: 'xAxis'
+  },
+  {
+    label: '标签过多时旋转',
     type: 'switch',
-    field: 'xAxis_label_autoHide',
-    optionField: 'xAxis.label.autoHide',
+    field: 'xAxis_label_autoRotate',
+    optionField: 'xAxis.label.autoRotate',
     value: true,
+    active: true,
+    inactive: false,
     tabName: 'custom',
     groupName: 'xAxis'
   },
@@ -492,98 +503,58 @@ const setting = [
     tabName: 'custom',
     groupName: 'yAxis'
   },
+  // 内边距 appendPadding
+  {
+    label: '',
+    type: 'appendPadding',
+    field: 'appendPadding',
+    optionField: 'appendPadding',
+    value: [0, 0, 0, 0],
+    tabName: 'custom',
+    groupName: 'appendPadding'
+  }
 ]
 
 // 模拟数据
 const data = [
-  {
-    year:'1',
-    value:100,
-    type:'今年'
-  },
-  {
-    year:'2',
-    value:200,
-    type:'今年'
-  },
-  {
-    year:'3',
-    value:300,
-    type:'今年'
-  },
-  {
-    year:'4',
-    value:200,
-    type:'今年'
-  },
-  {
-    year:'5',
-    value:100,
-    type:'今年'
-  },
-  {
-    year:'6',
-    value:200,
-    type:'今年'
-  },
-  {
-    year:'7',
-    value:300,
-    type:'今年'
-  },
-  {
-    year:'8',
-    value:400,
-    type:'今年'
-  },
-  {
-    year:'1',
-    value:400,
-    type:'去年'
-  },
-  {
-    year:'2',
-    value:100,
-    type:'去年'
-  },
-  {
-    year:'3',
-    value:200,
-    type:'去年'
-  },
-  {
-    year:'4',
-    value:300,
-    type:'去年'
-  },
-  {
-    year:'5',
-    value:200,
-    type:'去年'
-  },
-  {
-    year:'6',
-    value:100,
-    type:'去年'
-  },
-  {
-    year:'7',
-    value:200,
-    type:'去年'
-  },
-  {
-    year:'8',
-    value:300,
-    type:'去年'
-  }
+  { date: '2016年', value: 100, type: '已处理' },
+  { date: '2017年', value: 200, type: '已处理' },
+  { date: '2018年', value: 300, type: '已处理' },
+  { date: '2019年', value: 200, type: '已处理' },
+  { date: '2020年', value: 100, type: '已处理' },
+  { date: '2021年', value: 200, type: '已处理' },
+  { date: '2022年', value: 300, type: '已处理' },
+  { date: '2023年', value: 400, type: '已处理' },
+  { date: '2016年', value: 400, type: '未处理' },
+  { date: '2017年', value: 100, type: '未处理' },
+  { date: '2018年', value: 200, type: '未处理' },
+  { date: '2019年', value: 300, type: '未处理' },
+  { date: '2020年', value: 200, type: '未处理' },
+  { date: '2021年', value: 100, type: '未处理' },
+  { date: '2022年', value: 200, type: '未处理' },
+  { date: '2023年', value: 300, type: '未处理' }
 ]
 
 // 配置处理脚本
-const optionHandler = 'option.legend = option.legendEnable ? {position: setting.find(settingItem=>settingItem.field === \'legendPosition\').value} : false;' +
-  '\n  if (option.legendEnable) {\n' +
-  '    option.legend.itemName = option.legendItemName\n' +
-  '  };' +
-  'option.yAxis.grid.line.style.lineDash = [4,setting.find(settingItem=>settingItem.field === \'yAxis_grid_line_style_lineDash\').value]'
+const optionHandler =
+  `
+option.legend = option.legendEnable ? {position: setting.find(settingItem=>settingItem.field === 'legendPosition').value} : false;
+if (option.legendEnable) {
+  option.legend.itemName = option.legendItemName
+};
+option.yAxis.grid.line.style.lineDash = [4,setting.find(settingItem=>settingItem.field === 'yAxis_grid_line_style_lineDash').value]
+let autoHide = setting.find(settingItem=>settingItem.field === 'xAxis_label_autoHide').value
+if(autoHide){
+  let minGap = option.xAxis.label.autoHideMinGap
+  option.xAxis.label.autoHide = {
+    type: 'equidistance',
+    cfg: { minGap: minGap }
+  }
+} else {
+  option.xAxis.label.autoHide = false
+}
+  `
+
 
 // 数据处理脚本
 const dataHandler = ''
@@ -592,10 +563,12 @@ const dataHandler = ''
 const option = {
   // 数据将要放入到哪个字段中
   dataKey: 'data',
+  // 图表内边距
+  appendPadding: [0, 0, 0, 0],
   renderer: 'canvas',
   data,
   color: ['#6b74e4', '#4391f4', '#38bbe5', '#69d6fd', '#36c6a0'],
-  xField: 'year',
+  xField: 'date',
   yField: 'value',
   seriesField: 'type',
   xAxis: {
@@ -611,6 +584,8 @@ const option = {
       autoRotate: false,
       autoHide: true,
       autoEllipsis: true,
+      autoHideEnable: true,
+      autoHideMinGap: 0,
       style: {
         fill: '#8C8C8C',
         fontSize: 12

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

@@ -5,7 +5,7 @@
  */
 
 // 配置版本号
-const version = '2023092201'
+const version = '2023111401'
 // 分类
 const category = 'TinyLine'
 // 标题
@@ -74,7 +74,16 @@ const setting = [
     tabName: 'custom',
     groupName: 'graph'
   },
-  // 边距 padding
+  // 内边距 appendPadding
+  {
+    label: '',
+    type: 'appendPadding',
+    field: 'appendPadding',
+    optionField: 'appendPadding',
+    value: [0, 0, 0, 0],
+    tabName: 'custom',
+    groupName: 'appendPadding'
+  }
 ]
 
 // 数据处理脚本,取出所有指标的值
@@ -82,9 +91,11 @@ const dataHandler = '// 取出所有指标的值 \ndata = data.map(item => item[
 
 // 图表配置 new Line('domName', option)
 const option = {
+  // 图表内边距
+  appendPadding: [0, 0, 0, 0],
   xField:'',
   yField:'',
-  data: [16, 95, 35, 27, 50, 36, 78, 99, 60, 62, 37],
+  data: [100, 200, 300, 200, 100, 200, 300, 400],
   height: 60,
   autoFit: true,
   smooth: true,

data-room-ui/packages/G2Plots/折线图/迷你面积图.js

@@ -5,7 +5,7 @@
  */
 
 // 配置版本号
-const version = '2023092201'
+const version = '2023111401'
 // 分类
 const category = 'TinyArea'
 // 标题
@@ -90,11 +90,20 @@ const setting = [
     value: 0.3,
     tabName: 'custom',
     groupName: 'graph',
-    step:0.01,
-    max:1,
-    min:0
+    step: 0.01,
+    max: 1,
+    min: 0
   },
-  // 边距 padding
+  // 内边距 appendPadding
+  {
+    label: '',
+    type: 'appendPadding',
+    field: 'appendPadding',
+    optionField: 'appendPadding',
+    value: [0, 0, 0, 0],
+    tabName: 'custom',
+    groupName: 'appendPadding'
+  }
 ]
 
 // 配置处理脚本
@@ -105,9 +114,11 @@ const dataHandler = '// 取出所有指标的值 \ndata = data.map(item => item[
 
 // 图表配置 new Line('domName', option)
 const option = {
-  data: [16, 95, 35, 27, 50, 36, 78, 99, 60, 62, 37],
-  xField:'',
-  yField:'',
+  data: [100, 200, 300, 200, 100, 200, 300, 400],
+  // 图表内边距
+  appendPadding: [0, 0, 0, 0],
+  xField: '',
+  yField: '',
   height: 60,
   autoFit: true,
   smooth: true,

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

@@ -5,7 +5,7 @@
  */
 
 // 配置版本号
-const version = '2023092501'
+const version = '2023111401'
 // 分类
 const category = 'Bar'
 // 标题
@@ -495,61 +495,30 @@ const setting = [
     tabName: 'custom',
     groupName: 'yAxis'
   },
-  // 边距 padding
+  // 内边距 appendPadding
+  {
+    label: '',
+    type: 'appendPadding',
+    field: 'appendPadding',
+    optionField: 'appendPadding',
+    value: [0, 0, 0, 0],
+    tabName: 'custom',
+    groupName: 'appendPadding'
+  }
 ]
 
 // 模拟数据
 const data = [
-  {
-    label: 'Mon.',
-    type: 'series1',
-    value: 2800
-  },
-  {
-    label: 'Mon.',
-    type: 'series2',
-    value: 2260
-  },
-  {
-    label: 'Tues.',
-    type: 'series1',
-    value: 1800
-  },
-  {
-    label: 'Tues.',
-    type: 'series2',
-    value: 1300
-  },
-  {
-    label: 'Wed.',
-    type: 'series1',
-    value: 950
-  },
-  {
-    label: 'Wed.',
-    type: 'series2',
-    value: 900
-  },
-  {
-    label: 'Thur.',
-    type: 'series1',
-    value: 500
-  },
-  {
-    label: 'Thur.',
-    type: 'series2',
-    value: 390
-  },
-  {
-    label: 'Fri.',
-    type: 'series1',
-    value: 170
-  },
-  {
-    label: 'Fri.',
-    type: 'series2',
-    value: 100
-  }
+  { date: '2019年', value: 200, type: '已处理' },
+  { date: '2020年', value: 100, type: '已处理' },
+  { date: '2021年', value: 200, type: '已处理' },
+  { date: '2022年', value: 300, type: '已处理' },
+  { date: '2023年', value: 400, type: '已处理' },
+  { date: '2019年', value: 300, type: '未处理' },
+  { date: '2020年', value: 200, type: '未处理' },
+  { date: '2021年', value: 100, type: '未处理' },
+  { date: '2022年', value: 200, type: '未处理' },
+  { date: '2023年', value: 300, type: '未处理' }
 ]
 
 // 配置处理脚本
@@ -564,12 +533,14 @@ const dataHandler = ''
 const option = {
   // 数据将要放入到哪个字段中
   dataKey: 'data',
+  // 图表内边距
+  appendPadding: [0, 0, 0, 0],
   renderer: 'canvas',
   data,
   isGroup: true,
   // shape: ' ',
   xField: 'value',
-  yField: 'label',
+  yField: 'date',
   legendEnable: false,
   legendLayout: 'vertical',
   legendPosition: 'top',

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

@@ -5,7 +5,7 @@
  */
 
 // 配置版本号
-const version = '2023092501'
+const version = '2023111401'
 // 分类
 const category = 'Bar'
 // 标题
@@ -547,16 +547,26 @@ const setting = [
     value: true,
     tabName: 'custom',
     groupName: 'yAxis'
+  },
+  // 内边距 appendPadding
+  {
+    label: '',
+    type: 'appendPadding',
+    field: 'appendPadding',
+    optionField: 'appendPadding',
+    value: [0, 0, 0, 0],
+    tabName: 'custom',
+    groupName: 'appendPadding'
   }
 ]
 
 // 模拟数据
 const data = [
-  { year: '1951 年', value: 38 },
-  { year: '1952 年', value: 52 },
-  { year: '1956 年', value: 61 },
-  { year: '1957 年', value: 145 },
-  { year: '1958 年', value: 48 }
+  { date: '2019年', value: 38 },
+  { date: '2020年', value: 52 },
+  { date: '2021年', value: 61 },
+  { date: '2022年', value: 145 },
+  { date: '2023年', value: 48 }
 ]
 
 // 配置处理脚本
@@ -578,14 +588,16 @@ const dataHandler = ``
 const option = {
   // 数据将要放入到哪个字段中
   dataKey: 'data',
+  // 图表内边距
+  appendPadding: [0, 0, 0, 0],
   renderer: 'canvas',
   data,
   xField: 'value',
-  yField: 'year',
+  yField: 'date',
   minBarWidth: 0,
   maxBarWidth: 100,
   // shape: 'default', // 条形图形状
-  seriesField: 'year',
+  seriesField: 'date',
   color: ['#6b74e4', '#4391f4', '#38bbe5', '#69d6fd', '#36c6a0'],
   legendEnable: true,
   legendLayout: 'vertical',

data-room-ui/packages/G2Plots/条形图/堆叠条形图.js

@@ -5,7 +5,7 @@
  */
 
 // 配置版本号
-const version = '20231107'
+const version = '2023111401'
 // 分类
 const category = 'Bar'
 // 标题
@@ -498,61 +498,30 @@ const setting = [
     tabName: 'custom',
     groupName: 'yAxis'
   },
-  // 边距 padding
+  // 内边距 appendPadding
+  {
+    label: '',
+    type: 'appendPadding',
+    field: 'appendPadding',
+    optionField: 'appendPadding',
+    value: [0, 0, 0, 0],
+    tabName: 'custom',
+    groupName: 'appendPadding'
+  }
 ]
 
 // 模拟数据
 const data = [
-  {
-    label: 'Mon.',
-    type: 'series1',
-    value: 2800
-  },
-  {
-    label: 'Mon.',
-    type: 'series2',
-    value: 2260
-  },
-  {
-    label: 'Tues.',
-    type: 'series1',
-    value: 1800
-  },
-  {
-    label: 'Tues.',
-    type: 'series2',
-    value: 1300
-  },
-  {
-    label: 'Wed.',
-    type: 'series1',
-    value: 950
-  },
-  {
-    label: 'Wed.',
-    type: 'series2',
-    value: 900
-  },
-  {
-    label: 'Thur.',
-    type: 'series1',
-    value: 500
-  },
-  {
-    label: 'Thur.',
-    type: 'series2',
-    value: 390
-  },
-  {
-    label: 'Fri.',
-    type: 'series1',
-    value: 170
-  },
-  {
-    label: 'Fri.',
-    type: 'series2',
-    value: 100
-  }
+  { date: '2019年', value: 200, type: '已处理' },
+  { date: '2020年', value: 100, type: '已处理' },
+  { date: '2021年', value: 200, type: '已处理' },
+  { date: '2022年', value: 300, type: '已处理' },
+  { date: '2023年', value: 400, type: '已处理' },
+  { date: '2019年', value: 300, type: '未处理' },
+  { date: '2020年', value: 200, type: '未处理' },
+  { date: '2021年', value: 100, type: '未处理' },
+  { date: '2022年', value: 200, type: '未处理' },
+  { date: '2023年', value: 300, type: '未处理' }
 ]
 
 // 配置处理脚本
@@ -567,12 +536,14 @@ const dataHandler = ''
 const option = {
   // 数据将要放入到哪个字段中
   dataKey: 'data',
+  // 图表内边距
+  appendPadding: [0, 0, 0, 0],
   renderer: 'canvas',
   data,
   isStack: true,
   // shape: ' ',
   xField: 'value',
-  yField: 'label',
+  yField: 'date',
   seriesField: 'type',
   legendEnable: false,
   legendLayout: 'vertical',

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

@@ -5,7 +5,7 @@
  */
 
 // 配置版本号
-const version = '2023092201'
+const version = '2023111501'
 // 分类
 const category = 'Column'
 // 标题
@@ -327,10 +327,10 @@ const setting = [
     groupName: 'xAxis'
   },
   {
-    label: '标签过多时旋转',
+    label: '标签过多时隐藏',
     type: 'switch',
-    field: 'xAxis_label_autoRotate',
-    optionField: 'xAxis.label.autoRotate',
+    field: 'xAxis_label_autoHide',
+    optionField: 'xAxis.label.autoHideEnable',
     value: true,
     active: true,
     inactive: false,
@@ -338,11 +338,22 @@ const setting = [
     groupName: 'xAxis'
   },
   {
-    label: '标签过多时隐藏',
+    label: '标签隐藏判定间隔',
+    type: 'inputNumber',
+    field: 'xAxis_label_autoHide_minGap',
+    optionField: 'xAxis.label.autoHideMinGap',
+    value: 0,
+    tabName: 'custom',
+    groupName: 'xAxis'
+  },
+  {
+    label: '标签过多时旋转',
     type: 'switch',
-    field: 'xAxis_label_autoHide',
-    optionField: 'xAxis.label.autoHide',
+    field: 'xAxis_label_autoRotate',
+    optionField: 'xAxis.label.autoRotate',
     value: true,
+    active: true,
+    inactive: false,
     tabName: 'custom',
     groupName: 'xAxis'
   },
@@ -468,99 +479,54 @@ const setting = [
     value: '#d0d0d0',
     tabName: 'custom',
     groupName: 'yAxis'
+  },
+  // 内边距 appendPadding
+  {
+    label: '',
+    type: 'appendPadding',
+    field: 'appendPadding',
+    optionField: 'appendPadding',
+    value: [0, 0, 0, 0],
+    tabName: 'custom',
+    groupName: 'appendPadding'
   }
 ]
 
 // 模拟数据
 const data = [
-  {
-    year: '1',
-    value: 100,
-    type: '今年'
-  },
-  {
-    year: '2',
-    value: 200,
-    type: '今年'
-  },
-  {
-    year: '3',
-    value: 300,
-    type: '今年'
-  },
-  {
-    year: '4',
-    value: 200,
-    type: '今年'
-  },
-  {
-    year: '5',
-    value: 100,
-    type: '今年'
-  },
-  {
-    year: '6',
-    value: 200,
-    type: '今年'
-  },
-  {
-    year: '7',
-    value: 300,
-    type: '今年'
-  },
-  {
-    year: '8',
-    value: 400,
-    type: '今年'
-  },
-  {
-    year: '1',
-    value: 400,
-    type: '去年'
-  },
-  {
-    year: '2',
-    value: 100,
-    type: '去年'
-  },
-  {
-    year: '3',
-    value: 200,
-    type: '去年'
-  },
-  {
-    year: '4',
-    value: 300,
-    type: '去年'
-  },
-  {
-    year: '5',
-    value: 200,
-    type: '去年'
-  },
-  {
-    year: '6',
-    value: 100,
-    type: '去年'
-  },
-  {
-    year: '7',
-    value: 200,
-    type: '去年'
-  },
-  {
-    year: '8',
-    value: 300,
-    type: '去年'
-  }
+  { date: '2018年', value: 300, type: '已处理' },
+  { date: '2019年', value: 200, type: '已处理' },
+  { date: '2020年', value: 100, type: '已处理' },
+  { date: '2021年', value: 200, type: '已处理' },
+  { date: '2022年', value: 300, type: '已处理' },
+  { date: '2023年', value: 400, type: '已处理' },
+  { date: '2018年', value: 200, type: '未处理' },
+  { date: '2019年', value: 300, type: '未处理' },
+  { date: '2020年', value: 200, type: '未处理' },
+  { date: '2021年', value: 100, type: '未处理' },
+  { date: '2022年', value: 200, type: '未处理' },
+  { date: '2023年', value: 300, type: '未处理' }
 ]
 
 // 配置处理脚本
-const optionHandler = '  option.legend = option.legendEnable ? {position: setting.find(settingItem=>settingItem.field === \'legendPosition\').value} : false;\n' +
-  '  if (option.legendEnable) {\n' +
-  '    option.legend.itemName = option.legendItemName\n' +
-  '  };' +
-  'option.yAxis.grid.line.style.lineDash = [4,setting.find(settingItem=>settingItem.field === \'yAxis_grid_line_style_lineDash\').value]'
+const optionHandler =
+  `
+option.legend = option.legendEnable ? {position: setting.find(settingItem=>settingItem.field === 'legendPosition').value} : false;
+if (option.legendEnable) {
+  option.legend.itemName = option.legendItemName
+};
+option.yAxis.grid.line.style.lineDash = [4,setting.find(settingItem=>settingItem.field === 'yAxis_grid_line_style_lineDash').value]
+let autoHide = setting.find(settingItem=>settingItem.field === 'xAxis_label_autoHide').value
+if(autoHide){
+  let minGap = option.xAxis.label.autoHideMinGap
+  option.xAxis.label.autoHide = {
+    type: 'equidistance',
+    cfg: { minGap: minGap }
+  }
+} else {
+  option.xAxis.label.autoHide = false
+}
+  `
 
 // 数据处理脚本
 const dataHandler = ''
@@ -569,6 +535,8 @@ const dataHandler = ''
 const option = {
   // 数据将要放入到哪个字段中
   dataKey: 'data',
+  // 图表内边距
+  appendPadding: [0, 0, 0, 0],
   renderer: 'canvas',
   data,
   legendEnable: false,
@@ -584,7 +552,7 @@ const option = {
   legend: false,
   color: ['#6b74e4', '#4391f4', '#38bbe5', '#69d6fd', '#36c6a0'],
   isGroup: true,
-  xField: 'year',
+  xField: 'date',
   yField: 'value',
   seriesField: 'type',
   /** 设置颜色 */
@@ -607,6 +575,8 @@ const option = {
       autoRotate: false,
       autoHide: true,
       autoEllipsis: true,
+      autoHideEnable: true,
+      autoHideMinGap: 2,
       style: {
         fill: '#8C8C8C',
         fontSize: 12

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

@@ -5,7 +5,7 @@
  */
 
 // 配置版本号
-const version = '2023092201'
+const version = '2023111501'
 // 分类
 const category = 'Column'
 // 标题
@@ -327,10 +327,10 @@ const setting = [
     groupName: 'xAxis'
   },
   {
-    label: '标签过多时旋转',
+    label: '标签过多时隐藏',
     type: 'switch',
-    field: 'xAxis_label_autoRotate',
-    optionField: 'xAxis.label.autoRotate',
+    field: 'xAxis_label_autoHide',
+    optionField: 'xAxis.label.autoHideEnable',
     value: true,
     active: true,
     inactive: false,
@@ -338,11 +338,22 @@ const setting = [
     groupName: 'xAxis'
   },
   {
-    label: '标签过多时隐藏',
+    label: '标签隐藏判定间隔',
+    type: 'inputNumber',
+    field: 'xAxis_label_autoHide_minGap',
+    optionField: 'xAxis.label.autoHideMinGap',
+    value: 0,
+    tabName: 'custom',
+    groupName: 'xAxis'
+  },
+  {
+    label: '标签过多时旋转',
     type: 'switch',
-    field: 'xAxis_label_autoHide',
-    optionField: 'xAxis.label.autoHide',
+    field: 'xAxis_label_autoRotate',
+    optionField: 'xAxis.label.autoRotate',
     value: true,
+    active: true,
+    inactive: false,
     tabName: 'custom',
     groupName: 'xAxis'
   },
@@ -469,98 +480,53 @@ const setting = [
     tabName: 'custom',
     groupName: 'yAxis'
   },
+  // 内边距 appendPadding
+  {
+    label: '',
+    type: 'appendPadding',
+    field: 'appendPadding',
+    optionField: 'appendPadding',
+    value: [0, 0, 0, 0],
+    tabName: 'custom',
+    groupName: 'appendPadding'
+  }
 ]
 
 // 模拟数据
 const data = [
-  {
-    year:'1',
-    value:100,
-    type:'今年'
-  },
-  {
-    year:'2',
-    value:200,
-    type:'今年'
-  },
-  {
-    year:'3',
-    value:300,
-    type:'今年'
-  },
-  {
-    year:'4',
-    value:200,
-    type:'今年'
-  },
-  {
-    year:'5',
-    value:100,
-    type:'今年'
-  },
-  {
-    year:'6',
-    value:200,
-    type:'今年'
-  },
-  {
-    year:'7',
-    value:300,
-    type:'今年'
-  },
-  {
-    year:'8',
-    value:400,
-    type:'今年'
-  },
-  {
-    year:'1',
-    value:400,
-    type:'去年'
-  },
-  {
-    year:'2',
-    value:100,
-    type:'去年'
-  },
-  {
-    year:'3',
-    value:200,
-    type:'去年'
-  },
-  {
-    year:'4',
-    value:300,
-    type:'去年'
-  },
-  {
-    year:'5',
-    value:200,
-    type:'去年'
-  },
-  {
-    year:'6',
-    value:100,
-    type:'去年'
-  },
-  {
-    year:'7',
-    value:200,
-    type:'去年'
-  },
-  {
-    year:'8',
-    value:300,
-    type:'去年'
-  }
+  { date: '2018年', value: 300, type: '已处理' },
+  { date: '2019年', value: 200, type: '已处理' },
+  { date: '2020年', value: 100, type: '已处理' },
+  { date: '2021年', value: 200, type: '已处理' },
+  { date: '2022年', value: 300, type: '已处理' },
+  { date: '2023年', value: 400, type: '已处理' },
+  { date: '2018年', value: 200, type: '未处理' },
+  { date: '2019年', value: 300, type: '未处理' },
+  { date: '2020年', value: 200, type: '未处理' },
+  { date: '2021年', value: 100, type: '未处理' },
+  { date: '2022年', value: 200, type: '未处理' },
+  { date: '2023年', value: 300, type: '未处理' }
 ]
 
 // 配置处理脚本
-const optionHandler = 'option.legend = option.legendEnable ? {position: setting.find(settingItem=>settingItem.field === \'legendPosition\').value} : false;' +
-  '  if (option.legendEnable) {\n' +
-  '    option.legend.itemName = option.legendItemName\n' +
-  '  };' +
-  'option.yAxis.grid.line.style.lineDash = [4,setting.find(settingItem=>settingItem.field === \'yAxis_grid_line_style_lineDash\').value]'
+const optionHandler =
+  `
+option.legend = option.legendEnable ? {position: setting.find(settingItem=>settingItem.field === 'legendPosition').value} : false;
+if (option.legendEnable) {
+  option.legend.itemName = option.legendItemName
+};
+option.yAxis.grid.line.style.lineDash = [4,setting.find(settingItem=>settingItem.field === 'yAxis_grid_line_style_lineDash').value]
+let autoHide = setting.find(settingItem=>settingItem.field === 'xAxis_label_autoHide').value
+if(autoHide){
+  let minGap = option.xAxis.label.autoHideMinGap
+  option.xAxis.label.autoHide = {
+    type: 'equidistance',
+    cfg: { minGap: minGap }
+  }
+} else {
+  option.xAxis.label.autoHide = false
+}
+  `
 
 // 数据处理脚本
 const dataHandler = ''
@@ -569,9 +535,11 @@ const dataHandler = ''
 const option = {
   // 数据将要放入到哪个字段中
   dataKey: 'data',
+  // 图表内边距
+  appendPadding: [0, 0, 0, 0],
   renderer: 'canvas',
   data,
-  xField: 'year',
+  xField: 'date',
   yField: 'value',
   seriesField: 'type',
   isGroup: 'true',
@@ -617,6 +585,8 @@ const option = {
       autoRotate: false,
       autoHide: true,
       autoEllipsis: true,
+      autoHideEnable: true,
+      autoHideMinGap: 2,
       style: {
         fill: '#8C8C8C',
         fontSize: 12

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

@@ -5,7 +5,7 @@
  */
 
 // 配置版本号
-const version = '2023092201'
+const version = '2023111501'
 // 分类
 const category = 'Column'
 // 标题
@@ -281,10 +281,10 @@ const setting = [
     groupName: 'xAxis'
   },
   {
-    label: '标签过多时旋转',
+    label: '标签过多时隐藏',
     type: 'switch',
-    field: 'xAxis_label_autoRotate',
-    optionField: 'xAxis.label.autoRotate',
+    field: 'xAxis_label_autoHide',
+    optionField: 'xAxis.label.autoHideEnable',
     value: true,
     active: true,
     inactive: false,
@@ -292,11 +292,22 @@ const setting = [
     groupName: 'xAxis'
   },
   {
-    label: '标签过多时隐藏',
+    label: '标签隐藏判定间隔',
+    type: 'inputNumber',
+    field: 'xAxis_label_autoHide_minGap',
+    optionField: 'xAxis.label.autoHideMinGap',
+    value: 0,
+    tabName: 'custom',
+    groupName: 'xAxis'
+  },
+  {
+    label: '标签过多时旋转',
     type: 'switch',
-    field: 'xAxis_label_autoHide',
-    optionField: 'xAxis.label.autoHide',
+    field: 'xAxis_label_autoRotate',
+    optionField: 'xAxis.label.autoRotate',
     value: true,
+    active: true,
+    inactive: false,
     tabName: 'custom',
     groupName: 'xAxis'
   },
@@ -422,47 +433,43 @@ const setting = [
     value: '#d0d0d0',
     tabName: 'custom',
     groupName: 'yAxis'
+  },
+  // 内边距 appendPadding
+  {
+    label: '',
+    type: 'appendPadding',
+    field: 'appendPadding',
+    optionField: 'appendPadding',
+    value: [0, 0, 0, 0],
+    tabName: 'custom',
+    groupName: 'appendPadding'
   }
-  // 边距 padding
 ]
 
 // 模拟数据
 const data = [
-  {
-    type: '家具家电',
-    sales: 38
-  },
-  {
-    type: '粮油副食',
-    sales: 52
-  },
-  {
-    type: '生鲜水果',
-    sales: 61
-  },
-  {
-    type: '美容洗护',
-    sales: 145
-  },
-  {
-    type: '母婴用品',
-    sales: 48
-  },
-  {
-    type: '进口食品',
-    sales: 38
-  },
-  {
-    type: '食品饮料',
-    sales: 38
-  },
-  {
-    type: '家庭清洁',
-    sales: 38
-  }
+  { date: '2018年', value: 300 },
+  { date: '2019年', value: 200 },
+  { date: '2020年', value: 100 },
+  { date: '2021年', value: 200 },
+  { date: '2022年', value: 300 },
+  { date: '2023年', value: 400 }
 ]
 // 配置处理脚本
-const optionHandler = 'option.yAxis.grid.line.style.lineDash = [4,setting.find(settingItem=>settingItem.field === \'yAxis_grid_line_style_lineDash\').value]'
+const optionHandler =
+  `
+option.yAxis.grid.line.style.lineDash = [4,setting.find(settingItem=>settingItem.field === 'yAxis_grid_line_style_lineDash').value]
+let autoHide = setting.find(settingItem=>settingItem.field === 'xAxis_label_autoHide').value
+if(autoHide){
+  let minGap = option.xAxis.label.autoHideMinGap
+  option.xAxis.label.autoHide = {
+    type: 'equidistance',
+    cfg: { minGap: minGap }
+  }
+} else {
+  option.xAxis.label.autoHide = false
+}
+  `
 
 // 数据处理脚本
 const dataHandler = ''
@@ -471,9 +478,11 @@ const dataHandler = ''
 const option = {
   // 数据将要放入到哪个字段中
   dataKey: 'data',
+  // 图表内边距
+  appendPadding: [0, 0, 0, 0],
   data,
-  xField: 'type',
-  yField: 'sales',
+  xField: 'date',
+  yField: 'value',
   color: '',
   columnStyle: { // 设置柱子渐变色
     fill: 'l(90) 0:#5AA6AB 1:#217AB1'
@@ -502,6 +511,8 @@ const option = {
       autoRotate: false,
       autoHide: true,
       autoEllipsis: true,
+      autoHideEnable: true,
+      autoHideMinGap: 2,
       style: {
         fill: '#8C8C8C',
         fontSize: 12

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

@@ -5,7 +5,7 @@
  */
 
 // 配置版本号
-const version = '2023092201'
+const version = '2023111501'
 // 分类
 const category = 'Column'
 // 标题
@@ -327,10 +327,10 @@ const setting = [
     groupName: 'xAxis'
   },
   {
-    label: '标签过多时旋转',
+    label: '标签过多时隐藏',
     type: 'switch',
-    field: 'xAxis_label_autoRotate',
-    optionField: 'xAxis.label.autoRotate',
+    field: 'xAxis_label_autoHide',
+    optionField: 'xAxis.label.autoHideEnable',
     value: true,
     active: true,
     inactive: false,
@@ -338,11 +338,22 @@ const setting = [
     groupName: 'xAxis'
   },
   {
-    label: '标签过多时隐藏',
+    label: '标签隐藏判定间隔',
+    type: 'inputNumber',
+    field: 'xAxis_label_autoHide_minGap',
+    optionField: 'xAxis.label.autoHideMinGap',
+    value: 0,
+    tabName: 'custom',
+    groupName: 'xAxis'
+  },
+  {
+    label: '标签过多时旋转',
     type: 'switch',
-    field: 'xAxis_label_autoHide',
-    optionField: 'xAxis.label.autoHide',
+    field: 'xAxis_label_autoRotate',
+    optionField: 'xAxis.label.autoRotate',
     value: true,
+    active: true,
+    inactive: false,
     tabName: 'custom',
     groupName: 'xAxis'
   },
@@ -469,36 +480,53 @@ const setting = [
     tabName: 'custom',
     groupName: 'yAxis'
   },
+  // 内边距 appendPadding
+  {
+    label: '',
+    type: 'appendPadding',
+    field: 'appendPadding',
+    optionField: 'appendPadding',
+    value: [0, 0, 0, 0],
+    tabName: 'custom',
+    groupName: 'appendPadding'
+  }
 ]
 
 // 模拟数据
 const data = [
-  { year: '1991', value: 3, type: 'Lon' },
-  { year: '1992', value: 4, type: 'Lon' },
-  { year: '1993', value: 3.5, type: 'Lon' },
-  { year: '1994', value: 5, type: 'Lon' },
-  { year: '1995', value: 4.9, type: 'Lon' },
-  { year: '1996', value: 6, type: 'Lon' },
-  { year: '1997', value: 7, type: 'Lon' },
-  { year: '1998', value: 9, type: 'Lon' },
-  { year: '1999', value: 13, type: 'Lon' },
-  { year: '1991', value: 3, type: 'Bor' },
-  { year: '1992', value: 4, type: 'Bor' },
-  { year: '1993', value: 3.5, type: 'Bor' },
-  { year: '1994', value: 5, type: 'Bor' },
-  { year: '1995', value: 4.9, type: 'Bor' },
-  { year: '1996', value: 6, type: 'Bor' },
-  { year: '1997', value: 7, type: 'Bor' },
-  { year: '1998', value: 9, type: 'Bor' },
-  { year: '1999', value: 13, type: 'Bor' }
+  { date: '2018年', value: 300, type: '已处理' },
+  { date: '2019年', value: 200, type: '已处理' },
+  { date: '2020年', value: 100, type: '已处理' },
+  { date: '2021年', value: 200, type: '已处理' },
+  { date: '2022年', value: 300, type: '已处理' },
+  { date: '2023年', value: 400, type: '已处理' },
+  { date: '2018年', value: 200, type: '未处理' },
+  { date: '2019年', value: 300, type: '未处理' },
+  { date: '2020年', value: 200, type: '未处理' },
+  { date: '2021年', value: 100, type: '未处理' },
+  { date: '2022年', value: 200, type: '未处理' },
+  { date: '2023年', value: 300, type: '未处理' }
 ]
 
 // 配置处理脚本
-const optionHandler = 'option.legend = option.legendEnable ? {position: setting.find(settingItem=>settingItem.field === \'legendPosition\').value} : false;' +
-  '  if (option.legendEnable) {\n' +
-  '    option.legend.itemName = option.legendItemName\n' +
-  '  };' +
-  'option.yAxis.grid.line.style.lineDash = [4,setting.find(settingItem=>settingItem.field === \'yAxis_grid_line_style_lineDash\').value]'
+const optionHandler =
+  `
+option.legend = option.legendEnable ? {position: setting.find(settingItem=>settingItem.field === 'legendPosition').value} : false;
+if (option.legendEnable) {
+  option.legend.itemName = option.legendItemName
+};
+option.yAxis.grid.line.style.lineDash = [4,setting.find(settingItem=>settingItem.field === 'yAxis_grid_line_style_lineDash').value]
+let autoHide = setting.find(settingItem=>settingItem.field === 'xAxis_label_autoHide').value
+if(autoHide){
+  let minGap = option.xAxis.label.autoHideMinGap
+  option.xAxis.label.autoHide = {
+    type: 'equidistance',
+    cfg: { minGap: minGap }
+  }
+} else {
+  option.xAxis.label.autoHide = false
+}
+  `
 
 // 数据处理脚本
 const dataHandler = ''
@@ -507,10 +535,12 @@ const dataHandler = ''
 const option = {
   // 数据将要放入到哪个字段中
   dataKey: 'data',
+  // 图表内边距
+  appendPadding: [0, 0, 0, 0],
   renderer: 'canvas',
   data,
   isStack: true,
-  xField: 'year',
+  xField: 'date',
   yField: 'value',
   seriesField: 'type',
   legendEnable: false,
@@ -551,6 +581,8 @@ const option = {
       autoRotate: false,
       autoHide: true,
       autoEllipsis: true,
+      autoHideEnable: true,
+      autoHideMinGap: 2,
       style: {
         fill: '#8C8C8C',
         fontSize: 12

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

@@ -1,6 +1,6 @@
 
 // 配置版本号
-const version = '2023092501'
+const version = '2023111401'
 // 分类
 const category = 'Funnel'
 // 标题
@@ -208,7 +208,16 @@ const setting = [
     tabName: 'custom',
     groupName: 'legend'
   },
-  // 边距 padding
+  // 内边距 appendPadding
+  {
+    label: '',
+    type: 'appendPadding',
+    field: 'appendPadding',
+    optionField: 'appendPadding',
+    value: [0, 0, 0, 0],
+    tabName: 'custom',
+    groupName: 'appendPadding'
+  }
 ]
 
 // 模拟数据
@@ -244,6 +253,8 @@ const dataHandler = 'data = data.sort((a, b) => b[option.yField] - a[option.yFie
 const option = {
   // 数据将要放入到哪个字段中
   dataKey: 'data',
+  // 图表内边距
+  appendPadding: [0, 0, 0, 0],
   renderer: 'canvas',
   data,
   color: ['#6b74e4', '#4391f4', '#38bbe5', '#69d6fd', '#36c6a0'],

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

@@ -1,7 +1,7 @@
 import { Funnel } from '@antv/g2plot'
 
 // 配置版本号
-const version = '2023071002'
+const version = '2023111401'
 // 分类
 const category = 'Funnel'
 // 标题
@@ -212,8 +212,17 @@ const setting = [
     value: '#595959',
     tabName: 'custom',
     groupName: 'legend'
+  },
+  // 内边距 appendPadding
+  {
+    label: '',
+    type: 'appendPadding',
+    field: 'appendPadding',
+    optionField: 'appendPadding',
+    value: [0, 0, 0, 0],
+    tabName: 'custom',
+    groupName: 'appendPadding'
   }
-  // 边距 padding
 ]
 
 // 模拟数据
@@ -242,6 +251,8 @@ const dataHandler = 'data = data.sort((a, b) => b[option.yField] - a[option.yFie
 const option = {
   // 数据将要放入到哪个字段中
   dataKey: 'data',
+  // 图表内边距
+  appendPadding: [0, 0, 0, 0],
   renderer: 'canvas',
   data,
   color: ['#6b74e4', '#4391f4', '#38bbe5', '#69d6fd', '#36c6a0'],

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

@@ -1,6 +1,6 @@
 
 // 配置版本号
-const version = '2023092501'
+const version = '2023111401'
 // 分类
 const category = 'Funnel'
 // 标题
@@ -208,7 +208,16 @@ const setting = [
     tabName: 'custom',
     groupName: 'legend'
   },
-  // 边距 padding
+  // 内边距 appendPadding
+  {
+    label: '',
+    type: 'appendPadding',
+    field: 'appendPadding',
+    optionField: 'appendPadding',
+    value: [0, 0, 0, 0],
+    tabName: 'custom',
+    groupName: 'appendPadding'
+  }
 ]
 
 // 模拟数据
@@ -244,6 +253,8 @@ const dataHandler = 'data = data.sort((a, b) => b[option.yField] - a[option.yFie
 const option = {
   // 数据将要放入到哪个字段中
   dataKey: 'data',
+  // 图表内边距
+  appendPadding: [0, 0, 0, 0],
   renderer: 'canvas',
   data,
   color: ['#6b74e4', '#4391f4', '#38bbe5', '#69d6fd', '#36c6a0'],

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

@@ -1,5 +1,5 @@
 
-const version = '20231107'
+const version = '2023111401'
 // 分类
 const category = 'RadialBar'
 // 标题
@@ -148,19 +148,27 @@ const setting = [
     tabName: 'custom',
     groupName: 'xAxis'
 
+  },
+  // 内边距 appendPadding
+  {
+    label: '',
+    type: 'appendPadding',
+    field: 'appendPadding',
+    optionField: 'appendPadding',
+    value: [0, 0, 0, 0],
+    tabName: 'custom',
+    groupName: 'appendPadding'
   }
 ]
 
 // 模拟数据
 const data = [
-  { name: 'X6', star: 297 },
-  { name: 'G', star: 506 },
-  { name: 'AVA', star: 805 },
-  { name: 'G2Plot', star: 1478 },
-  { name: 'L7', star: 2029 },
-  { name: 'G6', star: 7100 },
-  { name: 'F2', star: 7346 },
-  { name: 'G2', star: 10178 },
+  { type: '分类一', value: 27 },
+  { type: '分类二', value: 25 },
+  { type: '分类三', value: 18 },
+  { type: '分类四', value: 15 },
+  { type: '分类五', value: 10 },
+  { type: '其他', value: 5 }
 ]
 
 const optionHandler = `
@@ -177,14 +185,16 @@ const dataHandler = ``
 const option = {
   // 数据将要放入到哪个字段中
   dataKey: 'data',
+  // 图表内边距
+  appendPadding: [0, 0, 0, 0],
   data,
-  xField: 'name',
-  yField: 'star',
+  xField: 'type',
+  yField: 'value',
   startAngle:  - Math.PI / 2, // 起始角度
   maxAngle: 270, //最大旋转角度,
   radius: 0.8,
   color: [],
-  colorField: 'name',
+  colorField: 'type',
   innerRadius: 0.2,
   barStyle: {
     lineCap: 'round', // 可选项：round 和 square

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

@@ -1,6 +1,6 @@
 
 // 配置版本号
-const version = '2023092501'
+const version = '2023111401'
 // 分类
 const category = 'Treemap'
 // 标题
@@ -143,6 +143,16 @@ const setting = [
     tabName: 'custom',
     groupName: 'legend'
   },
+  // 内边距 appendPadding
+  {
+    label: '',
+    type: 'appendPadding',
+    field: 'appendPadding',
+    optionField: 'appendPadding',
+    value: [0, 0, 0, 0],
+    tabName: 'custom',
+    groupName: 'appendPadding'
+  }
 ]
 
 // 模拟数据
@@ -193,6 +203,8 @@ const dataHandler = '// 转换数据格式\n' +
 const option = {
   // 数据将要放入到哪个字段中
   dataKey: 'data',
+  // 图表内边距
+  appendPadding: [0, 0, 0, 0],
   renderer: 'canvas',
   data,
   color: ['#6b74e4', '#4391f4', '#38bbe5', '#69d6fd', '#36c6a0'],

data-room-ui/packages/G2Plots/词云图/词云图.js

@@ -1,6 +1,6 @@
 
 // 配置版本号
-const version = '2023101001'
+const version = '2023111501'
 // 分类
 const category = 'WordCloud'
 // 标题
@@ -70,7 +70,7 @@ const setting = [
     type: 'inputNumber',
     field: 'fontSizeMin',
     optionField: 'fontSizeMin',
-    value: 24,
+    value: 18,
     tabName: 'custom',
     groupName: 'graph'
   },
@@ -79,534 +79,81 @@ const setting = [
     type: 'inputNumber',
     field: 'fontSizeMax',
     optionField: 'fontSizeMax',
-    value: 80,
+    value: 60,
     tabName: 'custom',
     groupName: 'graph'
+  },
+  // 图例 legend,
+  // 内边距 appendPadding
+  {
+    label: '',
+    type: 'appendPadding',
+    field: 'appendPadding',
+    optionField: 'appendPadding',
+    value: [0, 0, 0, 0],
+    tabName: 'custom',
+    groupName: 'appendPadding'
   }
-  // 图例 legend
-  // 边距 padding
 ]
 
-// 模拟数据
 const data = [
-  {
-    x: 'China',
-    value: 1383220000,
-    category: 'asia'
-  },
-  {
-    x: 'India',
-    value: 1316000000,
-    category: 'asia'
-  },
-  {
-    x: 'United States',
-    value: 324982000,
-    category: 'america'
-  },
-  {
-    x: 'Indonesia',
-    value: 263510000,
-    category: 'asia'
-  },
-  {
-    x: 'Brazil',
-    value: 207505000,
-    category: 'america'
-  },
-  {
-    x: 'Pakistan',
-    value: 196459000,
-    category: 'asia'
-  },
-  {
-    x: 'Nigeria',
-    value: 191836000,
-    category: 'africa'
-  },
-  {
-    x: 'Bangladesh',
-    value: 162459000,
-    category: 'asia'
-  },
-  {
-    x: 'Russia',
-    value: 146804372,
-    category: 'europe'
-  },
-  {
-    x: 'Japan',
-    value: 126790000,
-    category: 'asia'
-  },
-  {
-    x: 'Mexico',
-    value: 123518000,
-    category: 'america'
-  },
-  {
-    x: 'Ethiopia',
-    value: 104345000,
-    category: 'africa'
-  },
-  {
-    x: 'Philippines',
-    value: 104037000,
-    category: 'asia'
-  },
-  {
-    x: 'Egypt',
-    value: 93013300,
-    category: 'africa'
-  },
-  {
-    x: 'Vietnam',
-    value: 92700000,
-    category: 'asia'
-  },
-  {
-    x: 'Germany',
-    value: 82800000,
-    category: 'europe'
-  },
-  {
-    x: 'Democratic Republic of the Congo',
-    value: 82243000,
-    category: 'africa'
-  },
-  {
-    x: 'Iran',
-    value: 80135400,
-    category: 'asia'
-  },
-  {
-    x: 'Turkey',
-    value: 79814871,
-    category: 'asia'
-  },
-  {
-    x: 'Thailand',
-    value: 68298000,
-    category: 'asia'
-  },
-  {
-    x: 'France',
-    value: 67013000,
-    category: 'europe'
-  },
-  {
-    x: 'United Kingdom',
-    value: 65110000,
-    category: 'europe'
-  },
-  {
-    x: 'Italy',
-    value: 60599936,
-    category: 'europe'
-  },
-  {
-    x: 'Tanzania',
-    value: 56878000,
-    category: 'africa'
-  },
-  {
-    x: 'South Africa',
-    value: 55908000,
-    category: 'africa'
-  },
-  {
-    x: 'Myanmar',
-    value: 54836000,
-    category: 'asia'
-  },
-  {
-    x: 'South Korea',
-    value: 51446201,
-    category: 'asia'
-  },
-  {
-    x: 'Colombia',
-    value: 49224700,
-    category: 'america'
-  },
-  {
-    x: 'Kenya',
-    value: 48467000,
-    category: 'africa'
-  },
-  {
-    x: 'Spain',
-    value: 46812000,
-    category: 'europe'
-  },
-  {
-    x: 'Argentina',
-    value: 43850000,
-    category: 'america'
-  },
-  {
-    x: 'Ukraine',
-    value: 42541633,
-    category: 'europe'
-  },
-  {
-    x: 'Sudan',
-    value: 42176000,
-    category: 'africa'
-  },
-  {
-    x: 'Uganda',
-    value: 41653000,
-    category: 'africa'
-  },
-  {
-    x: 'Algeria',
-    value: 41064000,
-    category: 'africa'
-  },
-  {
-    x: 'Poland',
-    value: 38424000,
-    category: 'europe'
-  },
-  {
-    x: 'Iraq',
-    value: 37883543,
-    category: 'asia'
-  },
-  {
-    x: 'Canada',
-    value: 36541000,
-    category: 'america'
-  },
-  {
-    x: 'Morocco',
-    value: 34317500,
-    category: 'africa'
-  },
-  {
-    x: 'Saudi Arabia',
-    value: 33710021,
-    category: 'asia'
-  },
-  {
-    x: 'Uzbekistan',
-    value: 32121000,
-    category: 'asia'
-  },
-  {
-    x: 'Malaysia',
-    value: 32063200,
-    category: 'asia'
-  },
-  {
-    x: 'Peru',
-    value: 31826018,
-    category: 'america'
-  },
-  {
-    x: 'Venezuela',
-    value: 31431164,
-    category: 'america'
-  },
-  {
-    x: 'Nepal',
-    value: 28825709,
-    category: 'asia'
-  },
-  {
-    x: 'Angola',
-    value: 28359634,
-    category: 'africa'
-  },
-  {
-    x: 'Ghana',
-    value: 28308301,
-    category: 'africa'
-  },
-  {
-    x: 'Yemen',
-    value: 28120000,
-    category: 'asia'
-  },
-  {
-    x: 'Afghanistan',
-    value: 27657145,
-    category: 'asia'
-  },
-  {
-    x: 'Mozambique',
-    value: 27128530,
-    category: 'africa'
-  },
-  {
-    x: 'Australia',
-    value: 24460900,
-    category: 'australia'
-  },
-  {
-    x: 'North Korea',
-    value: 24213510,
-    category: 'asia'
-  },
-  {
-    x: 'Cameroon',
-    value: 23248044,
-    category: 'africa'
-  },
-  {
-    x: 'Ivory Coast',
-    value: 22671331,
-    category: 'africa'
-  },
-  {
-    x: 'Madagascar',
-    value: 22434363,
-    category: 'africa'
-  },
-  {
-    x: 'Niger',
-    value: 21564000,
-    category: 'africa'
-  },
-  {
-    x: 'Sri Lanka',
-    value: 21203000,
-    category: 'asia'
-  },
-  {
-    x: 'Romania',
-    value: 19760000,
-    category: 'europe'
-  },
-  {
-    x: 'Burkina Faso',
-    value: 19632147,
-    category: 'africa'
-  },
-  {
-    x: 'Syria',
-    value: 18907000,
-    category: 'asia'
-  },
-  {
-    x: 'Mali',
-    value: 18875000,
-    category: 'africa'
-  },
-  {
-    x: 'Malawi',
-    value: 18299000,
-    category: 'africa'
-  },
-  {
-    x: 'Chile',
-    value: 18191900,
-    category: 'america'
-  },
-  {
-    x: 'Kazakhstan',
-    value: 17975800,
-    category: 'asia'
-  },
-  {
-    x: 'Netherlands',
-    value: 17121900,
-    category: 'europe'
-  },
-  {
-    x: 'Ecuador',
-    value: 16737700,
-    category: 'america'
-  },
-  {
-    x: 'Guatemala',
-    value: 16176133,
-    category: 'america'
-  },
-  {
-    x: 'Zambia',
-    value: 15933883,
-    category: 'africa'
-  },
-  {
-    x: 'Cambodia',
-    value: 15626444,
-    category: 'asia'
-  },
-  {
-    x: 'Senegal',
-    value: 15256346,
-    category: 'africa'
-  },
-  {
-    x: 'Chad',
-    value: 14965000,
-    category: 'africa'
-  },
-  {
-    x: 'Zimbabwe',
-    value: 14542235,
-    category: 'africa'
-  },
-  {
-    x: 'Guinea',
-    value: 13291000,
-    category: 'africa'
-  },
-  {
-    x: 'South Sudan',
-    value: 12131000,
-    category: 'africa'
-  },
-  {
-    x: 'Rwanda',
-    value: 11553188,
-    category: 'africa'
-  },
-  {
-    x: 'Belgium',
-    value: 11356191,
-    category: 'europe'
-  },
-  {
-    x: 'Tunisia',
-    value: 11299400,
-    category: 'africa'
-  },
-  {
-    x: 'Cuba',
-    value: 11239004,
-    category: 'america'
-  },
-  {
-    x: 'Bolivia',
-    value: 11145770,
-    category: 'america'
-  },
-  {
-    x: 'Somalia',
-    value: 11079000,
-    category: 'africa'
-  },
-  {
-    x: 'Haiti',
-    value: 11078033,
-    category: 'america'
-  },
-  {
-    x: 'Greece',
-    value: 10783748,
-    category: 'europe'
-  },
-  {
-    x: 'Benin',
-    value: 10653654,
-    category: 'africa'
-  },
-  {
-    x: 'Czech Republic',
-    value: 10578820,
-    category: 'europe'
-  },
-  {
-    x: 'Portugal',
-    value: 10341330,
-    category: 'europe'
-  },
-  {
-    x: 'Burundi',
-    value: 10114505,
-    category: 'africa'
-  },
-  {
-    x: 'Dominican Republic',
-    value: 10075045,
-    category: 'america'
-  },
-  {
-    x: 'Sweden',
-    value: 10054100,
-    category: 'europe'
-  },
-  {
-    x: 'United Arab Emirates',
-    value: 10003223,
-    category: 'asia'
-  },
-  {
-    x: 'Jordan',
-    value: 9889270,
-    category: 'asia'
-  },
-  {
-    x: 'Azerbaijan',
-    value: 9823667,
-    category: 'asia'
-  },
-  {
-    x: 'Hungary',
-    value: 9799000,
-    category: 'europe'
-  },
-  {
-    x: 'Belarus',
-    value: 9498600,
-    category: 'europe'
-  },
-  {
-    x: 'Honduras',
-    value: 8866351,
-    category: 'america'
-  },
-  {
-    x: 'Austria',
-    value: 8773686,
-    category: 'europe'
-  },
-  {
-    x: 'Tajikistan',
-    value: 8742000,
-    category: 'asia'
-  },
-  {
-    x: 'Israel',
-    value: 8690220,
-    category: 'asia'
-  },
-  {
-    x: 'Switzerland',
-    value: 8417700,
-    category: 'europe'
-  },
-  {
-    x: 'Papua New Guinea',
-    value: 8151300,
-    category: 'australia'
-  }
+  { name: '大屏设计器', value: 9900 },
+  { name: '折线图', value: 6181 },
+  { name: '柱状图', value: 4386 },
+  { name: '饼图', value: 4055 },
+  { name: '散点图', value: 2467 },
+  { name: '雷达图', value: 2244 },
+  { name: '树图', value: 1898 },
+  { name: '面积图', value: 1484 },
+  { name: '地图', value: 1112 },
+  { name: '热力图', value: 965 },
+  { name: '仪表盘', value: 847 },
+  { name: '漏斗图', value: 582 },
+  { name: '进度条', value: 555 },
+  { name: '环图', value: 550 },
+  { name: '玉珏图', value: 462 },
+  { name: '词云', value: 366 },
+  { name: '3D组件', value: 360 },
+  { name: '边框', value: 282 },
+  { name: '装饰', value: 273 },
+  { name: '自定义组件', value: 1265 },
+  { name: '文本', value: 6181 },
+  { name: '数字', value: 4386 },
+  { name: '超链接', value: 1222 },
+  { name: '图片', value: 2438 },
+  { name: '视频', value: 1361 },
+  { name: '表格', value: 9876 },
+  { name: '排名', value: 1112 },
+  { name: '轮播', value: 965 },
+  { name: '时间', value: 2847 },
+  { name: '跑马灯', value: 582 },
+  { name: '指标卡', value: 555 }
 ]
 
 // 配置处理脚本
-const optionHandler = 'option.wordStyle.fontSize = [option.fontSizeMin, option.fontSizeMax]'
-
-// 数据处理脚本
-const dataHandler = 'let wordFieldValue = setting.find(settingItem=>settingItem.field === \'wordField\').value\n' +
+const optionHandler = 'option.wordStyle.fontSize = [option.fontSizeMin, option.fontSizeMax]\n' +
+  'let wordFieldValue = setting.find(settingItem=>settingItem.field === \'wordField\').value\n' +
   'if (wordFieldValue) {\n' +
   '  option.colorField = wordFieldValue\n' +
   '}'
 
+// 数据处理脚本
+const dataHandler = ''
+
 // 图表配置 new Line('domName', option)
 const option = {
   // 数据将要放入到哪个字段中
   dataKey: 'data',
+  // 图表内边距
+  appendPadding: [0, 0, 0, 0],
   data,
-  wordField: 'x',
+  wordField: 'name',
   weightField: 'value',
-  colorField: 'category',
+  colorField: 'name',
   color: ['#6b74e4', '#4391f4', '#38bbe5', '#69d6fd', '#36c6a0'],
   wordStyle: {
     fontFamily: 'Verdana',
-    fontSize: [24, 80]
+    fontSize: [12, 60]
   },
   fontSizeMin: 24,
   fontSizeMax: 80,

data-room-ui/packages/G2Plots/进度图/仪表盘.js

@@ -1,6 +1,6 @@
 import fontList from 'data-room-ui/js/utils/fontList'
 // 配置版本号
-const version = '2023101403'
+const version = '2023111401'
 // 分类
 const category = 'Gauge'
 // 标题
@@ -171,7 +171,7 @@ const setting = [
     // 对应options中的字段
     optionField: 'statistic.content.offsetY',
     value: -30,
-    min:-100,
+    min: -100,
     tabName: 'custom',
     groupName: 'graph'
   },
@@ -184,12 +184,21 @@ const setting = [
     // 对应options中的字段
     optionField: 'statistic.title.offsetY',
     value: 0,
-    min:-100,
+    min: -100,
     tabName: 'custom',
     groupName: 'graph'
+  },
+  // 图例 legend,
+  // 内边距 appendPadding
+  {
+    label: '',
+    type: 'appendPadding',
+    field: 'appendPadding',
+    optionField: 'appendPadding',
+    value: [0, 0, 0, 0],
+    tabName: 'custom',
+    groupName: 'appendPadding'
   }
-  // 图例 legend
-  // 边距 padding
 ]
 const data = [
   {
@@ -197,12 +206,10 @@ const data = [
   }
 ]
 // 配置处理脚本
-const optionHandler ='option.range.color = [option.color1, option.color2]\n' +
+const optionHandler = 'option.range.color = [option.color1, option.color2]\n' +
   '  let fix = option.statisticFixed\n' +
   '  option.statistic.title.formatter = ({ percent }) => `${(percent * 100).toFixed(fix)}%`'
 
-
-
 // 数据处理脚本
 const dataHandler = '// 取返回数据列表的第一项指标值\noption.percent = data[0][setting.filter(settingItem=>settingItem.field === \'percent\')[0].value]'
 
@@ -210,12 +217,14 @@ const dataHandler = '// 取返回数据列表的第一项指标值\noption.perce
 const option = {
   // 数据将要放入到哪个字段中
   dataKey: 'percent',
+  // 图表内边距
+  appendPadding: [0, 0, 0, 0],
   data,
   percent: 0.75,
   color1: 'l(0) 0:#6b74e4 1:#4391f4',
   color2: '#d0d0d0',
   range: {
-    color: ['l(0) 0:#6b74e4 1:#4391f4','#d0d0d0']
+    color: ['l(0) 0:#6b74e4 1:#4391f4', '#d0d0d0']
   },
   indicator: {
     pointer: {

data-room-ui/packages/G2Plots/进度图/圆角进度条.js

@@ -1,6 +1,6 @@
 
 // 配置版本号
-const version = '2023101401'
+const version = '2023111401'
 // 分类
 const category = 'Progress'
 // 标题
@@ -63,7 +63,16 @@ const setting = [
     tabName: 'custom',
     groupName: 'graph'
   },
-  // 边距 padding
+  // 内边距 appendPadding
+  {
+    label: '',
+    type: 'appendPadding',
+    field: 'appendPadding',
+    optionField: 'appendPadding',
+    value: [0, 0, 0, 0],
+    tabName: 'custom',
+    groupName: 'appendPadding'
+  }
 ]
 
 const data = [
@@ -82,6 +91,8 @@ const dataHandler = '// 取返回数据列表的第一项指标值\noption.perce
 const option = {
   // 数据将要放入到哪个字段中
   dataKey: 'data',
+  // 图表内边距
+  appendPadding: [0, 0, 0, 0],
   data,
   height: 50,
   width: 400,

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

@@ -1,6 +1,6 @@
 import fontList from 'data-room-ui/js/utils/fontList'
 // 配置版本号
-const version = '2023101401'
+const version = '2023111401'
 // 分类
 const category = 'Liquid'
 // 标题
@@ -151,6 +151,16 @@ const setting = [
     value: '#598BF2',
     tabName: 'custom',
     groupName: 'graph'
+  },
+  // 内边距 appendPadding
+  {
+    label: '',
+    type: 'appendPadding',
+    field: 'appendPadding',
+    optionField: 'appendPadding',
+    value: [0, 0, 0, 0],
+    tabName: 'custom',
+    groupName: 'appendPadding'
   }
 ]
 
@@ -167,6 +177,8 @@ const dataHandler = '// 取返回数据列表的第一项指标值\noption.perce
 const option = {
   // 数据将要放入到哪个字段中
   dataKey: 'data',
+  // 图表内边距
+  appendPadding: [0, 0, 0, 0],
   data,
   color: '#598BF2',
   renderer: 'canvas',

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

@@ -1,6 +1,6 @@
 import fontList from 'data-room-ui/js/utils/fontList'
 // 配置版本号
-const version = '2023101401'
+const version = '2023111401'
 // 分类
 const category = 'Liquid'
 // 标题
@@ -152,7 +152,16 @@ const setting = [
     tabName: 'custom',
     groupName: 'graph'
   },
-  // 边距 padding
+  // 内边距 appendPadding
+  {
+    label: '',
+    type: 'appendPadding',
+    field: 'appendPadding',
+    optionField: 'appendPadding',
+    value: [0, 0, 0, 0],
+    tabName: 'custom',
+    groupName: 'appendPadding'
+  }
 ]
 const data = [
   {
@@ -166,6 +175,8 @@ const dataHandler = '// 取返回数据列表的第一项指标值\noption.perce
 const option = {
   // 数据将要放入到哪个字段中
   dataKey: 'percent',
+  // 图表内边距
+  appendPadding: [0, 0, 0, 0],
   data,
   renderer: 'canvas',
   color: '#598BF2',

data-room-ui/packages/G2Plots/进度图/进度仪表盘.js

@@ -1,6 +1,6 @@
 import fontList from 'data-room-ui/js/utils/fontList'
 // 配置版本号
-const version = '2023101403'
+const version = '2023111401'
 // 分类
 const category = 'Gauge'
 // 标题
@@ -163,8 +163,17 @@ const setting = [
     min:-100,
     tabName: 'custom',
     groupName: 'graph'
+  },
+  // 内边距 appendPadding
+  {
+    label: '',
+    type: 'appendPadding',
+    field: 'appendPadding',
+    optionField: 'appendPadding',
+    value: [0, 0, 0, 0],
+    tabName: 'custom',
+    groupName: 'appendPadding'
   }
-  // 边距 padding
 ]
 const data = [
   {
@@ -182,6 +191,8 @@ const dataHandler = '// 取返回数据列表的第一项指标值\noption.perce
 const option = {
   // 数据将要放入到哪个字段中
   dataKey: 'percent',
+  // 图表内边距
+  appendPadding: [0, 0, 0, 0],
   data,
   percent: 0.75,
   color1: 'l(0) 0:#6b74e4 1:#4391f4',

data-room-ui/packages/G2Plots/进度图/进度指标环图.js

@@ -1,6 +1,6 @@
 import fontList from 'data-room-ui/js/utils/fontList'
 // 配置版本号
-const version = '2023101401'
+const version = '2023111401'
 // 分类
 const category = 'RingProgress'
 // 标题
@@ -151,8 +151,17 @@ const setting = [
     min: -100,
     tabName: 'custom',
     groupName: 'graph'
+  },
+  // 内边距 appendPadding
+  {
+    label: '',
+    type: 'appendPadding',
+    field: 'appendPadding',
+    optionField: 'appendPadding',
+    value: [0, 0, 0, 0],
+    tabName: 'custom',
+    groupName: 'appendPadding'
   }
-  // 边距 padding
 ]
 
 // 配置处理脚本
@@ -170,6 +179,8 @@ const dataHandler =
 const option = {
   // 数据将要放入到哪个字段中
   dataKey: 'percent',
+  // 图表内边距
+  appendPadding: [0, 0, 0, 0],
   data,
   color1: 'l(0) 0:#6B74E3 1:#38BBE5',
   color2: '#d0d0d0',

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

@@ -1,6 +1,6 @@
 
 // 配置版本号
-const version = '2023101401'
+const version = '2023111401'
 // 分类
 const category = 'Progress'
 // 标题
@@ -63,7 +63,16 @@ const setting = [
     tabName: 'custom',
     groupName: 'graph'
   },
-  // 边距 padding
+  // 内边距 appendPadding
+  {
+    label: '',
+    type: 'appendPadding',
+    field: 'appendPadding',
+    optionField: 'appendPadding',
+    value: [0, 0, 0, 0],
+    tabName: 'custom',
+    groupName: 'appendPadding'
+  }
 ]
 const data = [
   {
@@ -80,6 +89,8 @@ const dataHandler = '// 取返回数据列表的第一项指标值\noption.perce
 const option = {
   // 数据将要放入到哪个字段中
   dataKey: 'percent',
+  // 图表内边距
+  appendPadding: [0, 0, 0, 0],
   data,
   height: 50,
   width: 400,

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

@@ -1,6 +1,6 @@
 import fontList from 'data-room-ui/js/utils/fontList'
 // 配置版本号
-const version = '2023101402'
+const version = '2023111401'
 // 分类
 const category = 'RingProgress'
 // 标题
@@ -165,8 +165,17 @@ const setting = [
     tabName: 'custom',
     groupName: 'graph'
   }
-
-  // 边距 padding
+,
+  // 内边距 appendPadding
+  {
+    label: '',
+    type: 'appendPadding',
+    field: 'appendPadding',
+    optionField: 'appendPadding',
+    value: [0, 0, 0, 0],
+    tabName: 'custom',
+    groupName: 'appendPadding'
+  }
 ]
 
 // 配置处理脚本
@@ -184,6 +193,8 @@ const dataHandler =
 const option = {
   // 数据将要放入到哪个字段中
   dataKey: 'percent',
+  // 图表内边距
+  appendPadding: [0, 0, 0, 0],
   data,
   color1: 'l(0) 0:#6B74E3 1:#38BBE5',
   color2: '#d0d0d0',

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

@@ -1,6 +1,6 @@
 import fontList from 'data-room-ui/js/utils/fontList'
 // 配置版本号
-const version = '2023101401'
+const version = '2023111401'
 // 分类
 const category = 'Liquid'
 // 标题
@@ -152,7 +152,16 @@ const setting = [
     tabName: 'custom',
     groupName: 'graph'
   },
-  // 边距 padding
+  // 内边距 appendPadding
+  {
+    label: '',
+    type: 'appendPadding',
+    field: 'appendPadding',
+    optionField: 'appendPadding',
+    value: [0, 0, 0, 0],
+    tabName: 'custom',
+    groupName: 'appendPadding'
+  }
 ]
 const data = [
   {
@@ -165,6 +174,8 @@ const dataHandler = '// 取返回数据列表的第一项指标值\noption.perce
 // 图表配置 new Liquid('domName', option)
 const option = {
   renderer: 'canvas',
+  // 图表内边距
+  appendPadding: [0, 0, 0, 0],
   color: '#598BF2',
   percent: 0.25,
   data,

data-room-ui/packages/G2Plots/配置说明.md

@@ -137,6 +137,8 @@ const dataHandler = ``
 const option = {
   // 数据将要放入到哪个字段中
   dataKey: 'data',
+  // 图表内边距
+  appendPadding: [0, 0, 0, 0],
   data,
   xField: 'year',
   yField: 'value',

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

@@ -1,6 +1,6 @@
 
 // 配置版本号
-const version = '2023092501'
+const version = '2023111501'
 // 分类
 const category = 'Radar'
 // 标题
@@ -231,33 +231,40 @@ const setting = [
     tabName: 'custom',
     groupName: 'legend'
   },
-  // 边距 padding
+  {
+    label: 'y轴最小值',
+    type: 'inputNumber',
+    field: 'yAxis_min',
+    optionField: 'yAxis.min',
+    value: 0,
+    tabName: 'custom',
+    groupName: 'yAxis'
+  },
+  // 内边距 appendPadding
+  {
+    label: '',
+    type: 'appendPadding',
+    field: 'appendPadding',
+    optionField: 'appendPadding',
+    value: [0, 0, 0, 0],
+    tabName: 'custom',
+    groupName: 'appendPadding'
+  }
 ]
 
 // 模拟数据
 const data = [
-  { item: 'Design', user: 'a', score: 70 },
-  { item: 'Design', user: 'b', score: 30 },
-  { item: 'Development', user: 'a', score: 60 },
-  { item: 'Development', user: 'b', score: 70 },
-  { item: 'Marketing', user: 'a', score: 50 },
-  { item: 'Marketing', user: 'b', score: 60 },
-  { item: 'Users', user: 'a', score: 40 },
-  { item: 'Users', user: 'b', score: 50 },
-  { item: 'Test', user: 'a', score: 60 },
-  { item: 'Test', user: 'b', score: 70 },
-  { item: 'Language', user: 'a', score: 70 },
-  { item: 'Language', user: 'b', score: 50 },
-  { item: 'Technology', user: 'a', score: 50 },
-  { item: 'Technology', user: 'b', score: 40 },
-  { item: 'Support', user: 'a', score: 30 },
-  { item: 'Support', user: 'b', score: 40 },
-  { item: 'Sales', user: 'a', score: 60 },
-  { item: 'Sales', user: 'b', score: 40 },
-  { item: 'UX', user: 'a', score: 50 },
-  { item: 'UX', user: 'b', score: 60 }
+  { name: '支撑及时性', star: 300, type: '当前得分' },
+  { name: '基本能力', star: 450, type: '当前得分' },
+  { name: '支撑规范性', star: 200, type: '当前得分' },
+  { name: '满意度', star: 420, type: '当前得分' },
+  { name: '工作质量', star: 380, type: '当前得分' },
+  { name: '支撑及时性', star: 380, type: '平均得分' },
+  { name: '基本能力', star: 420, type: '平均得分' },
+  { name: '支撑规范性', star: 300, type: '平均得分' },
+  { name: '满意度', star: 350, type: '平均得分' },
+  { name: '工作质量', star: 400, type: '平均得分' }
 ]
-
 // 配置处理脚本
 const optionHandler = 'option.legend = option.legendEnable ? {position: setting.find(settingItem=>settingItem.field === \'legendPosition\').value} : false;' +
   '\n  if (option.legendEnable) {\n' +
@@ -271,11 +278,13 @@ const dataHandler = ''
 const option = {
   // 数据将要放入到哪个字段中
   dataKey: 'data',
+  // 图表内边距
+  appendPadding: [0, 0, 0, 0],
   renderer: 'canvas',
   data,
-  xField: 'item',
-  yField: 'score',
-  seriesField: 'user',
+  xField: 'name',
+  yField: 'star',
+  seriesField: 'type',
   legendEnable: false,
   legendLayout: 'vertical',
   legendPosition: 'top',
@@ -314,6 +323,7 @@ const option = {
     size: 2
   },
   yAxis: {
+    min: 0,
     label: false,
     grid: {
       alternateColor: 'rgba(0, 0, 0, 0.04)'

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

@@ -1,6 +1,6 @@
 
 // 配置版本号
-const version = '2023092202'
+const version = '2023111501'
 // 分类
 const category = 'Radar'
 // 标题
@@ -214,17 +214,34 @@ const setting = [
     tabName: 'custom',
     groupName: 'grid'
   },
+  {
+    label: 'y轴最小值',
+    type: 'inputNumber',
+    field: 'yAxis_min',
+    optionField: 'yAxis.min',
+    value: 0,
+    tabName: 'custom',
+    groupName: 'yAxis'
+  },
+  // 内边距 appendPadding
+  {
+    label: '',
+    type: 'appendPadding',
+    field: 'appendPadding',
+    optionField: 'appendPadding',
+    value: [0, 0, 0, 0],
+    tabName: 'custom',
+    groupName: 'appendPadding'
+  }
 ]
 
 // 模拟数据
 const data = [
-  { name: 'G2', star: 10371 },
-  { name: 'G6', star: 7380 },
-  { name: 'F2', star: 7414 },
-  { name: 'L7', star: 2140 },
-  { name: 'X6', star: 660 },
-  { name: 'AVA', star: 885 },
-  { name: 'G2Plot', star: 1626 }
+  { name: '支撑及时性', star: 300 },
+  { name: '基本能力', star: 450 },
+  { name: '支撑规范性', star: 200 },
+  { name: '满意度', star: 420 },
+  { name: '工作质量', star: 380 },
 ]
 
 // 配置处理脚本
@@ -245,6 +262,8 @@ const dataHandler = ''
 const option = {
   // 数据将要放入到哪个字段中
   dataKey: 'data',
+  // 图表内边距
+  appendPadding: [0, 0, 0, 0],
   data,
   xField: 'name',
   yField: 'star',
@@ -278,6 +297,7 @@ const option = {
   yAxis: {
     // line: null,
     tickLine: null,
+    min: 0,
     label: false,
     grid: {
       line: {

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

@@ -5,7 +5,7 @@
  */
 
 // 配置版本号
-const version = '2023092201'
+const version = '2023111501'
 // 分类
 const category = 'Area'
 // 标题
@@ -104,6 +104,21 @@ const setting = [
     tabName: 'custom',
     groupName: 'graph'
   },
+  {
+    label: '面积透明度',
+    // 设置组件类型
+    type: 'inputNumber',
+    // 字段
+    field: 'areaStyle_fillOpacity',
+    // 对应options中的字段
+    optionField: 'areaStyle.fillOpacity',
+    value: 0.15,
+    tabName: 'custom',
+    groupName: 'graph',
+    step: 0.01,
+    max: 1,
+    min: 0
+  },
   {
     label: '折线点颜色',
     type: 'colorPicker', // 设置组件类型
@@ -334,10 +349,10 @@ const setting = [
     groupName: 'xAxis'
   },
   {
-    label: '标签过多时旋转',
+    label: '标签过多时隐藏',
     type: 'switch',
-    field: 'xAxis_label_autoRotate',
-    optionField: 'xAxis.label.autoRotate',
+    field: 'xAxis_label_autoHide',
+    optionField: 'xAxis.label.autoHideEnable',
     value: true,
     active: true,
     inactive: false,
@@ -345,11 +360,22 @@ const setting = [
     groupName: 'xAxis'
   },
   {
-    label: '标签过多时隐藏',
+    label: '标签隐藏判定间隔',
+    type: 'inputNumber',
+    field: 'xAxis_label_autoHide_minGap',
+    optionField: 'xAxis.label.autoHideMinGap',
+    value: 0,
+    tabName: 'custom',
+    groupName: 'xAxis'
+  },
+  {
+    label: '标签过多时旋转',
     type: 'switch',
-    field: 'xAxis_label_autoHide',
-    optionField: 'xAxis.label.autoHide',
+    field: 'xAxis_label_autoRotate',
+    optionField: 'xAxis.label.autoRotate',
     value: true,
+    active: true,
+    inactive: false,
     tabName: 'custom',
     groupName: 'xAxis'
   },
@@ -475,35 +501,55 @@ const setting = [
     value: '#d0d0d0',
     tabName: 'custom',
     groupName: 'yAxis'
+  },
+  // 内边距 appendPadding
+  {
+    label: '',
+    type: 'appendPadding',
+    field: 'appendPadding',
+    optionField: 'appendPadding',
+    value: [0, 0, 0, 0],
+    tabName: 'custom',
+    groupName: 'appendPadding'
   }
-  // 边距 padding
 ]
 
 // 模拟数据
 const data = [
-  { Date: '2010-01', scales: 1998 },
-  { Date: '2010-02', scales: 1850 },
-  { Date: '2010-03', scales: 1720 },
-  { Date: '2010-04', scales: 1818 },
-  { Date: '2010-05', scales: 1920 },
-  { Date: '2010-06', scales: 1802 },
-  { Date: '2010-07', scales: 1945 },
-  { Date: '2010-08', scales: 1856 },
-  { Date: '2010-09', scales: 2107 },
-  { Date: '2010-10', scales: 2140 }
+  { date: '2016年', value: 100 },
+  { date: '2017年', value: 200 },
+  { date: '2018年', value: 300 },
+  { date: '2019年', value: 200 },
+  { date: '2020年', value: 100 },
+  { date: '2021年', value: 200 },
+  { date: '2022年', value: 300 },
+  { date: '2023年', value: 400 }
 ]
 
 // 配置处理脚本
-const optionHandler = '  let pointEnable = setting.find(settingItem=>settingItem.field === \'point_shape\').value\n' +
-  '  if (pointEnable === false) {\n' +
-  '    option.point = false\n' +
-  '  } else {\n' +
-  '    option.point = {shape: pointEnable}\n' +
-  '    let pointColor = setting.find(settingItem=>settingItem.field === \'point_color\').value\n' +
-  '    option.point.color = pointColor\n' +
-  '  option.point.size =  setting.find(settingItem=>settingItem.field === \'point_size\').value\n' +
-  '};' +
-  'option.yAxis.grid.line.style.lineDash = [4,setting.find(settingItem=>settingItem.field === \'yAxis_grid_line_style_lineDash\').value]'
+const optionHandler =
+  `
+let pointEnable = setting.find(settingItem=>settingItem.field === \'point_shape\').value
+if (pointEnable === false) {
+  option.point = false
+} else {
+  option.point = {shape: pointEnable}
+  let pointColor = setting.find(settingItem=>settingItem.field === 'point_color').value
+  option.point.color = pointColor
+  option.point.size =  setting.find(settingItem=>settingItem.field === 'point_size').value
+};
+option.yAxis.grid.line.style.lineDash = [4,setting.find(settingItem=>settingItem.field === 'yAxis_grid_line_style_lineDash').value]
+let autoHide = setting.find(settingItem=>settingItem.field === 'xAxis_label_autoHide').value
+if(autoHide){
+  let minGap = option.xAxis.label.autoHideMinGap
+  option.xAxis.label.autoHide = {
+    type: 'equidistance',
+    cfg: { minGap: minGap }
+  }
+} else {
+  option.xAxis.label.autoHide = false
+}
+  `
 
 // 数据处理脚本
 const dataHandler = ''
@@ -512,13 +558,16 @@ const dataHandler = ''
 const option = {
   // 数据将要放入到哪个字段中
   dataKey: 'data',
+  // 图表内边距
+  appendPadding: [0, 0, 0, 0],
   data,
-  xField: 'Date',
-  yField: 'scales',
+  xField: 'date',
+  yField: 'value',
   smooth: false,
   startOnZero: true,
   isStack: false,
   areaStyle: {
+    fillOpacity: 0.15,
     fill: 'l(0) 0:#3e5bdb 1:#3e5bdb'
   },
   label: {
@@ -549,6 +598,8 @@ const option = {
       autoRotate: false,
       autoHide: true,
       autoEllipsis: true,
+      autoHideEnable: true,
+      autoHideMinGap: 2,
       style: {
         fill: '#8C8C8C',
         fontSize: 12

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

@@ -5,7 +5,7 @@
  */
 
 // 配置版本号
-const version = '2023092501'
+const version = '2023111501'
 // 分类
 const category = 'Area'
 // 标题
@@ -83,6 +83,21 @@ const setting = [
     tabName: 'custom',
     groupName: 'graph'
   },
+  {
+    label: '面积透明度',
+    // 设置组件类型
+    type: 'inputNumber',
+    // 字段
+    field: 'areaStyle_fillOpacity',
+    // 对应options中的字段
+    optionField: 'areaStyle.fillOpacity',
+    value: 0.15,
+    tabName: 'custom',
+    groupName: 'graph',
+    step: 0.01,
+    max: 1,
+    min: 0
+  },
   {
     label: '折线点样式',
     type: 'select',
@@ -380,10 +395,10 @@ const setting = [
     groupName: 'xAxis'
   },
   {
-    label: '标签过多时旋转',
+    label: '标签过多时隐藏',
     type: 'switch',
-    field: 'xAxis_label_autoRotate',
-    optionField: 'xAxis.label.autoRotate',
+    field: 'xAxis_label_autoHide',
+    optionField: 'xAxis.label.autoHideEnable',
     value: true,
     active: true,
     inactive: false,
@@ -391,11 +406,22 @@ const setting = [
     groupName: 'xAxis'
   },
   {
-    label: '标签过多时隐藏',
+    label: '标签隐藏判定间隔',
+    type: 'inputNumber',
+    field: 'xAxis_label_autoHide_minGap',
+    optionField: 'xAxis.label.autoHideMinGap',
+    value: 0,
+    tabName: 'custom',
+    groupName: 'xAxis'
+  },
+  {
+    label: '标签过多时旋转',
     type: 'switch',
-    field: 'xAxis_label_autoHide',
-    optionField: 'xAxis.label.autoHide',
+    field: 'xAxis_label_autoRotate',
+    optionField: 'xAxis.label.autoRotate',
     value: true,
+    active: true,
+    inactive: false,
     tabName: 'custom',
     groupName: 'xAxis'
   },
@@ -522,167 +548,57 @@ const setting = [
     tabName: 'custom',
     groupName: 'yAxis'
   },
+  // 内边距 appendPadding
+  {
+    label: '',
+    type: 'appendPadding',
+    field: 'appendPadding',
+    optionField: 'appendPadding',
+    value: [0, 0, 0, 0],
+    tabName: 'custom',
+    groupName: 'appendPadding'
+  }
 ]
 
 // 模拟数据
 const data = [
-  {
-    country: '北美',
-    date: 1965,
-    value: 1390.5
-  },
-  {
-    country: '北美',
-    date: 1966,
-    value: 1469.5
-  },
-  {
-    country: '北美',
-    date: 1967,
-    value: 1521.7
-  },
-  {
-    country: '北美',
-    date: 1968,
-    value: 1615.9
-  },
-  {
-    country: '北美',
-    date: 1969,
-    value: 1703.7
-  },
-  {
-    country: '中南美',
-    date: 1965,
-    value: 109.2
-  },
-  {
-    country: '中南美',
-    date: 1966,
-    value: 115.7
-  },
-  {
-    country: '中南美',
-    date: 1967,
-    value: 120.5
-  },
-  {
-    country: '中南美',
-    date: 1968,
-    value: 128
-  },
-  {
-    country: '中南美',
-    date: 1969,
-    value: 134.4
-  },
-  {
-    country: '欧洲',
-    date: 1965,
-    value: 1058.1
-  },
-  {
-    country: '欧洲',
-    date: 1966,
-    value: 1089.7
-  },
-  {
-    country: '欧洲',
-    date: 1967,
-    value: 1121.7
-  },
-  {
-    country: '欧洲',
-    date: 1968,
-    value: 1196.6
-  },
-  {
-    country: '欧洲',
-    date: 1969,
-    value: 1285.5
-  },
-  {
-    country: 'CIS 地区',
-    date: 1965,
-    value: 593.3
-  },
-  {
-    country: 'CIS 地区',
-    date: 1966,
-    value: 630.9
-  },
-  {
-    country: 'CIS 地区',
-    date: 1967,
-    value: 663.2
-  },
-  {
-    country: 'CIS 地区',
-    date: 1968,
-    value: 687.8
-  },
-  {
-    country: 'CIS 地区',
-    date: 1969,
-    value: 719
-  }, {
-    country: '中东',
-    date: 1965,
-    value: 48.3
-  },
-  {
-    country: '中东',
-    date: 1966,
-    value: 50.4
-  },
-  {
-    country: '中东',
-    date: 1967,
-    value: 52.7
-  },
-  {
-    country: '中东',
-    date: 1968,
-    value: 55.6
-  },
-  {
-    country: '中东',
-    date: 1969,
-    value: 58.5
-  },
-  {
-    country: '非洲',
-    date: 1965,
-    value: 60.6
-  },
-  {
-    country: '非洲',
-    date: 1966,
-    value: 63.3
-  },
-  {
-    country: '非洲',
-    date: 1967,
-    value: 64
-  },
-  {
-    country: '非洲',
-    date: 1968,
-    value: 67.4
-  },
-  {
-    country: '非洲',
-    date: 1969,
-    value: 68.9
-  }
+  { date: '2016年', value: 100, type: '已处理' },
+  { date: '2017年', value: 200, type: '已处理' },
+  { date: '2018年', value: 300, type: '已处理' },
+  { date: '2019年', value: 200, type: '已处理' },
+  { date: '2020年', value: 100, type: '已处理' },
+  { date: '2021年', value: 200, type: '已处理' },
+  { date: '2022年', value: 300, type: '已处理' },
+  { date: '2023年', value: 400, type: '已处理' },
+  { date: '2016年', value: 400, type: '未处理' },
+  { date: '2017年', value: 100, type: '未处理' },
+  { date: '2018年', value: 200, type: '未处理' },
+  { date: '2019年', value: 300, type: '未处理' },
+  { date: '2020年', value: 200, type: '未处理' },
+  { date: '2021年', value: 100, type: '未处理' },
+  { date: '2022年', value: 200, type: '未处理' },
+  { date: '2023年', value: 300, type: '未处理' }
 ]
 
 // 配置处理脚本
-const optionHandler = 'option.legend = option.legendEnable ? {position: setting.find(settingItem=>settingItem.field === \'legendPosition\').value} : false;' +
-  '\n  if (option.legendEnable) {\n' +
-  '    option.legend.itemName = option.legendItemName\n' +
-  '  };' +
-  'option.yAxis.grid.line.style.lineDash = [4,setting.find(settingItem=>settingItem.field === \'yAxis_grid_line_style_lineDash\').value]'
+const optionHandler =
+  `
+option.legend = option.legendEnable ? {position: setting.find(settingItem=>settingItem.field === 'legendPosition').value} : false;
+if (option.legendEnable) {
+  option.legend.itemName = option.legendItemName
+};
+option.yAxis.grid.line.style.lineDash = [4,setting.find(settingItem=>settingItem.field === 'yAxis_grid_line_style_lineDash').value]
+let autoHide = setting.find(settingItem=>settingItem.field === 'xAxis_label_autoHide').value
+if(autoHide){
+  let minGap = option.xAxis.label.autoHideMinGap
+  option.xAxis.label.autoHide = {
+    type: 'equidistance',
+    cfg: { minGap: minGap }
+  }
+} else {
+  option.xAxis.label.autoHide = false
+}
+  `
 
 // 数据处理脚本
 const dataHandler = ''
@@ -691,12 +607,14 @@ const dataHandler = ''
 const option = {
   // 数据将要放入到哪个字段中
   dataKey: 'data',
+  // 图表内边距
+  appendPadding: [0, 0, 0, 0],
   renderer: 'canvas',
   data,
   xField: 'date',
   yField: 'value',
   color: ['#6b74e4', '#4391f4', '#38bbe5', '#69d6fd', '#36c6a0'],
-  seriesField: 'country',
+  seriesField: 'type',
   smooth: false,
   legendEnable: false,
   legendLayout: 'vertical',
@@ -733,6 +651,8 @@ const option = {
       autoRotate: false,
       autoHide: true,
       autoEllipsis: true,
+      autoHideEnable: true,
+      autoHideMinGap: 2,
       style: {
         fill: '#8C8C8C',
         fontSize: 12
@@ -785,10 +705,10 @@ const option = {
         lineWidth: 0
       }
     }
+  },
+  areaStyle: {
+    fillOpacity: 0.15
   }
-  // areaStyle: {
-  //   fill: "#94c6ff"
-  // },
   // line: {
   //   color: ''
   // },

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

@@ -5,7 +5,7 @@
  */
 
 // 配置版本号
-const version = '2023092201'
+const version = '2023111501'
 // 分类
 const category = 'Area'
 // 标题
@@ -93,6 +93,21 @@ const setting = [
     tabName: 'custom',
     groupName: 'graph'
   },
+  {
+    label: '面积透明度',
+    // 设置组件类型
+    type: 'inputNumber',
+    // 字段
+    field: 'areaStyle_fillOpacity',
+    // 对应options中的字段
+    optionField: 'areaStyle.fillOpacity',
+    value: 0.15,
+    tabName: 'custom',
+    groupName: 'graph',
+    step: 0.01,
+    max: 1,
+    min: 0
+  },
   {
     label: '折线点大小',
     type: 'inputNumber',
@@ -333,10 +348,10 @@ const setting = [
     groupName: 'xAxis'
   },
   {
-    label: '标签过多时旋转',
+    label: '标签过多时隐藏',
     type: 'switch',
-    field: 'xAxis_label_autoRotate',
-    optionField: 'xAxis.label.autoRotate',
+    field: 'xAxis_label_autoHide',
+    optionField: 'xAxis.label.autoHideEnable',
     value: true,
     active: true,
     inactive: false,
@@ -344,11 +359,22 @@ const setting = [
     groupName: 'xAxis'
   },
   {
-    label: '标签过多时隐藏',
+    label: '标签隐藏判定间隔',
+    type: 'inputNumber',
+    field: 'xAxis_label_autoHide_minGap',
+    optionField: 'xAxis.label.autoHideMinGap',
+    value: 0,
+    tabName: 'custom',
+    groupName: 'xAxis'
+  },
+  {
+    label: '标签过多时旋转',
     type: 'switch',
-    field: 'xAxis_label_autoHide',
-    optionField: 'xAxis.label.autoHide',
+    field: 'xAxis_label_autoRotate',
+    optionField: 'xAxis.label.autoRotate',
     value: true,
+    active: true,
+    inactive: false,
     tabName: 'custom',
     groupName: 'xAxis'
   },
@@ -475,98 +501,43 @@ const setting = [
     tabName: 'custom',
     groupName: 'yAxis'
   },
+  // 内边距 appendPadding
+  {
+    label: '',
+    type: 'appendPadding',
+    field: 'appendPadding',
+    optionField: 'appendPadding',
+    value: [0, 0, 0, 0],
+    tabName: 'custom',
+    groupName: 'appendPadding'
+  }
 ]
 
 // 模拟数据
 const data = [
-  { Date: '2010-01', scales: 1998 },
-  { Date: '2010-02', scales: 1850 },
-  { Date: '2010-03', scales: 1720 },
-  { Date: '2010-04', scales: 1818 },
-  { Date: '2010-05', scales: 1920 },
-  { Date: '2010-06', scales: 1802 },
-  { Date: '2010-07', scales: 1945 },
-  { Date: '2010-08', scales: 1856 },
-  { Date: '2010-09', scales: 2107 },
-  { Date: '2010-10', scales: 2140 },
-  { Date: '2010-11', scales: 2311 },
-  { Date: '2010-12', scales: 1972 },
-  { Date: '2011-01', scales: 1760 },
-  { Date: '2011-02', scales: 1824 },
-  { Date: '2011-03', scales: 1801 },
-  { Date: '2011-04', scales: 2001 },
-  { Date: '2011-05', scales: 1640 },
-  { Date: '2011-06', scales: 1502 },
-  { Date: '2011-07', scales: 1621 },
-  { Date: '2011-08', scales: 1480 },
-  { Date: '2011-09', scales: 1549 },
-  { Date: '2011-10', scales: 1390 },
-  { Date: '2011-11', scales: 1325 },
-  { Date: '2011-12', scales: 1250 },
-  { Date: '2012-01', scales: 1394 },
-  { Date: '2012-02', scales: 1406 },
-  { Date: '2012-03', scales: 1578 },
-  { Date: '2012-04', scales: 1465 },
-  { Date: '2012-05', scales: 1689 },
-  { Date: '2012-06', scales: 1755 },
-  { Date: '2012-07', scales: 1495 },
-  { Date: '2012-08', scales: 1508 },
-  { Date: '2012-09', scales: 1433 },
-  { Date: '2012-10', scales: 1344 },
-  { Date: '2012-11', scales: 1201 },
-  { Date: '2012-12', scales: 1065 },
-  { Date: '2013-01', scales: 1255 },
-  { Date: '2013-02', scales: 1429 },
-  { Date: '2013-03', scales: 1398 },
-  { Date: '2013-04', scales: 1678 },
-  { Date: '2013-05', scales: 1524 },
-  { Date: '2013-06', scales: 1688 },
-  { Date: '2013-07', scales: 1500 },
-  { Date: '2013-08', scales: 1670 },
-  { Date: '2013-09', scales: 1734 },
-  { Date: '2013-10', scales: 1699 },
-  { Date: '2013-11', scales: 1508 },
-  { Date: '2013-12', scales: 1680 },
-  { Date: '2014-01', scales: 1750 },
-  { Date: '2014-02', scales: 1602 },
-  { Date: '2014-03', scales: 1834 },
-  { Date: '2014-04', scales: 1722 },
-  { Date: '2014-05', scales: 1430 },
-  { Date: '2014-06', scales: 1280 },
-  { Date: '2014-07', scales: 1367 },
-  { Date: '2014-08', scales: 1155 },
-  { Date: '2014-09', scales: 1289 },
-  { Date: '2014-10', scales: 1104 },
-  { Date: '2014-11', scales: 1246 },
-  { Date: '2014-12', scales: 1098 },
-  { Date: '2015-01', scales: 1189 },
-  { Date: '2015-02', scales: 1276 },
-  { Date: '2015-03', scales: 1033 },
-  { Date: '2015-04', scales: 956 },
-  { Date: '2015-05', scales: 845 },
-  { Date: '2015-06', scales: 1089 },
-  { Date: '2015-07', scales: 944 },
-  { Date: '2015-08', scales: 1043 },
-  { Date: '2015-09', scales: 893 },
-  { Date: '2015-10', scales: 840 },
-  { Date: '2015-11', scales: 934 },
-  { Date: '2015-12', scales: 810 },
-  { Date: '2016-01', scales: 782 },
-  { Date: '2016-02', scales: 1089 },
-  { Date: '2016-03', scales: 745 },
-  { Date: '2016-04', scales: 680 },
-  { Date: '2016-05', scales: 802 },
-  { Date: '2016-06', scales: 697 },
-  { Date: '2016-07', scales: 583 },
-  { Date: '2016-08', scales: 456 },
-  { Date: '2016-09', scales: 524 },
-  { Date: '2016-10', scales: 398 },
-  { Date: '2016-11', scales: 278 },
-  { Date: '2016-12', scales: 195 },
-  { Date: '2017-01', scales: 145 },
-  { Date: '2017-02', scales: 207 }
+  { date: '2016年', value: 100 },
+  { date: '2017年', value: 200 },
+  { date: '2018年', value: 300 },
+  { date: '2019年', value: 200 },
+  { date: '2020年', value: 100 },
+  { date: '2021年', value: 200 },
+  { date: '2022年', value: 300 },
+  { date: '2023年', value: 400 }
 ]
-const optionHandler = 'option.yAxis.grid.line.style.lineDash = [4,setting.find(settingItem=>settingItem.field === \'yAxis_grid_line_style_lineDash\').value]'
+const optionHandler =
+  `
+option.yAxis.grid.line.style.lineDash = [4,setting.find(settingItem=>settingItem.field === 'yAxis_grid_line_style_lineDash').value]
+let autoHide = setting.find(settingItem=>settingItem.field === 'xAxis_label_autoHide').value
+if(autoHide){
+  let minGap = option.xAxis.label.autoHideMinGap
+  option.xAxis.label.autoHide = {
+    type: 'equidistance',
+    cfg: { minGap: minGap }
+  }
+} else {
+  option.xAxis.label.autoHide = false
+}
+  `
 // 数据处理脚本
 const dataHandler = ''
 
@@ -574,13 +545,16 @@ const dataHandler = ''
 const option = {
   // 数据将要放入到哪个字段中
   dataKey: 'data',
+  // 图表内边距
+  appendPadding: [0, 0, 0, 0],
   data,
-  xField: 'Date',
-  yField: 'scales',
+  xField: 'date',
+  yField: 'value',
   smooth: false,
   startOnZero: true,
   isStack: false,
   areaStyle: {
+    fillOpacity: 0.15,
     fill: 'l(270) 0:#ffffff 1:#1890ff'
   },
   line: {
@@ -611,6 +585,8 @@ const option = {
       autoRotate: false,
       autoHide: true,
       autoEllipsis: true,
+      autoHideEnable: true,
+      autoHideMinGap: 2,
       style: {
         fill: '#8C8C8C',
         fontSize: 12

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

@@ -1,6 +1,6 @@
 import fontList from 'data-room-ui/js/utils/fontList'
 // 配置版本号
-const version = '2023101402'
+const version = '2023111401'
 // 分类
 const category = 'Pie'
 // 标题
@@ -405,6 +405,8 @@ const dataHandler = ''
 const option = {
   // 数据将要放入到哪个字段中
   dataKey: 'data',
+  // 图表内边距
+  appendPadding: [0, 0, 0, 0],
   renderer: 'canvas',
   data,
   angleField: 'value',

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

@@ -1,6 +1,6 @@
 
 // 配置版本号
-const version = '2023092501'
+const version = '2023111401'
 // 分类
 const category = 'Pie'
 // 标题
@@ -250,6 +250,8 @@ const dataHandler = ''
 const option = {
   // 数据将要放入到哪个字段中
   dataKey: 'data',
+  // 图表内边距
+  appendPadding: [0, 0, 0, 0],
   renderer: 'canvas',
   data,
   legendEnable: false,
@@ -268,6 +270,10 @@ const option = {
     }
   },
   color: ['#6b74e4', '#4391f4', '#38bbe5', '#69d6fd', '#36c6a0'],
+  pieStyle: {
+    stroke: '#000000',
+    lineWidth: 0
+  },
   label: {
     autoRotate: true,
     type: 'inner',

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

@@ -1,6 +1,6 @@
 
 // 配置版本号
-const version = '2023092501'
+const version = '2023111401'
 // 分类
 const category = 'Rose'
 // 标题
@@ -155,7 +155,16 @@ const setting = [
     tabName: 'custom',
     groupName: 'legend'
   },
-  // 边距 padding
+  // 内边距 appendPadding
+  {
+    label: '',
+    type: 'appendPadding',
+    field: 'appendPadding',
+    optionField: 'appendPadding',
+    value: [0, 0, 0, 0],
+    tabName: 'custom',
+    groupName: 'appendPadding'
+  }
 ]
 
 // 模拟数据
@@ -182,6 +191,8 @@ const dataHandler = ''
 const option = {
   // 数据将要放入到哪个字段中
   dataKey: 'data',
+  // 图表内边距
+  appendPadding: [0, 0, 0, 0],
   renderer: 'canvas',
   data,
   xField: 'type',

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

@@ -1,8 +1,5 @@
 <template>
   <div
-    v-loading="config.loading"
-    element-loading-text="图表加载中"
-    :element-loading-background="loadingBackground"
     style="width: 100%;height: 100%"
     class="bs-design-wrap bs-custom-component"
     :class="{'light-theme':customTheme === 'light','auto-theme':customTheme !=='light'}"

data-room-ui/packages/js/mixins/chartContextMenu.js

@@ -36,7 +36,8 @@ export default {
       'changeLocked',
       'saveTimeLine',
       'copyCharts',
-      'pasteCharts'
+      'pasteCharts',
+      'clearActiveCodes'
     ]),
     // 改变hover的组件
     changeHover (code) {
@@ -117,6 +118,7 @@ export default {
         this.saveTimeLine('组合图表')
       } else {
         // 取消组合
+        this.clearActiveCodes()
         // 找到和本组件group相同的组件 取消group
         this.chartList.forEach(_chart => {
           if (_chart.group === chart.group) {

data-room-ui/packages/js/mixins/commonMixins.js

@@ -94,10 +94,6 @@ export default {
       })
       return newDataset
     },
-    // 组件数据加载时的背景颜色
-    loadingBackground () {
-      return this.customTheme === 'light' ? '#ffffff' : '#151A26'
-    },
     isPreview () {
       return (this.$route.path === window?.BS_CONFIG?.routers?.previewUrl) || (this.$route.path === '/big-screen/preview')
     }

data-room-ui/packages/js/store/actions.js

@@ -18,8 +18,13 @@ export default {
         const pageInfo = handleResData(data)
         // 兼容边框配置
         pageInfo.chartList.forEach((chart) => {
-          if (chart.dataSource) {
-            chart.dataSource.source = chart.dataSource?.source || 'dataset'
+          // 对数据源的方式进行兼容
+          if (chart.dataSource && ['texts', 'numbers'].includes(chart.type)) {
+            if (chart.dataSource.source === 'dataset' && (!chart.dataSource.businessKey)) {
+              chart.dataSource.source = 'static'
+            }
+          } else if (!chart.dataSource.source) {
+            chart.dataSource.source = 'dataset'
           }
 
           if (!chart.border) {
@@ -28,7 +33,7 @@ export default {
           if (!chart.border.padding) {
             chart.border.padding = [0, 0, 0, 0]
           }
-          let plotSettingsIterator = false
+          const plotSettingsIterator = false
           if (chart.type == 'customComponent') {
             // 为本地G2组件配置添加迭代器
             if (!plotSettingsIterator) {

data-room-ui/packages/js/store/mutations.js

@@ -77,6 +77,10 @@ export default {
       })
     }
   },
+  // 情况页面选中的组件
+  clearActiveCodes (state) {
+    state.activeCodes = []
+  },
   // 改变当前hover组件id
   changeHoverCode (state, code) {
     state.hoverCode = code
@@ -206,11 +210,11 @@ export default {
   // 改变锁定状态
   changeLocked (state, config) {
     // 如果是多选，则改变框选中的所有组件的锁定状态
-    if (state.activeCodes && state.activeCodes.length) {
+    if (state.activeCodes && state.activeCodes.length > 1) {
       state.pageInfo.chartList = state.pageInfo.chartList?.map(chart => {
         return {
           ...chart,
-          locked: state.activeCodes.includes(chart.code) ? !config.locked : config.locked
+          locked: state.activeCodes.includes(chart.code) ? !config.locked : chart.locked
         }
       })
       saveTimeLineFunc(state, config.locked ? '解锁选中组件' : '锁定选中组件')