vue2-client 1.9.193 → 1.9.195

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.9.193",
+  "version": "1.9.195",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",

package/src/base-client/components/common/XTable/XTable.vue

@@ -125,7 +125,7 @@
               </a-button>
             </a-tooltip>
             <a-tooltip title="重新查询" placement="bottom">
-              <a-button @click="refresh(true)" :disabled="loading">
+              <a-button @click="refresh(true)">
                 <a-icon :style="iconStyle" type="reload"/>
               </a-button>
             </a-tooltip>
@@ -310,9 +310,9 @@
             <div class="custom-chart-title" v-if="item.config.title">{{ item.config.title }}</div>
             <div class="custom-chart-desc" v-if="item.config.description">{{ item.config.description }}</div>
             <g2Charts
-              v-if="summaryDrawerVisible"
               :key="index"
-              :config="Object.assign(item.config,{ queryParams, queryParamsName })"
+              :is-dev="env === 'dev'"
+              :config="item.config"
               :requestParameters="requestParameters"/>
           </a-col>
         </a-row>
@@ -820,8 +820,15 @@ export default {
       this.eventState = eventState
       this.showRightTools = showRightTools
       this.printTemplate = printTemplate
-      this.chartsConfigArray = chartsConfigArray
       this.summaryDrawerWidth = summaryDrawerWidth
+      this.chartsConfigArray = chartsConfigArray
+      if (this.chartsConfigArray.length > 0) {
+        // 循环chartsConfigArray，将每个配置的数据请求参数赋值给requestParameters
+        this.chartsConfigArray.forEach(item => {
+          item.config.queryParams = JSON.parse(JSON.stringify(this.queryParams))
+          item.config.queryParamsName = this.queryParamsName
+        })
+      }
       if (this.localEditMode) {
         this.localEditModeDataSource = []
         if (this.formSubmitTypeInLocalEditMode === 'append') {

package/src/components/g2Charts/designer.vue

@@ -15,10 +15,6 @@ defineProps({
   height: {
     type: String,
     default: '500px'
-  },
-  isDev: {
-    type: Boolean,
-    default: false
   }
 })
 
@@ -173,7 +169,7 @@ defineExpose({ init, config, resetConfig })
         :body-style="{maxHeight:height,height:height}">
         <div class="custom-chart-title" v-if="config.title">{{ config.title }}</div>
         <div class="custom-chart-desc" v-if="config.description">{{ config.description }}</div>
-        <g2Charts ref="g2ChartsRef" :isDev="isDev"></g2Charts>
+        <g2Charts ref="g2ChartsRef"></g2Charts>
       </a-card>
     </a-col>
     <a-col :span="8">

package/src/components/g2Charts/index.vue

@@ -14,11 +14,11 @@ let plot = null
 const props = defineProps({
   config: {
     type: Object,
-    default: {}
+    default: () => {}
   },
   requestParameters: {
     type: Object,
-    default: {}
+    default: () => {}
   },
   isDev: {
     type: Boolean,
@@ -27,7 +27,6 @@ const props = defineProps({
 })
 // 添加验证函数
 const validateConfig = (config, requestParameters) => {
-  console.log(requestParameters, '===')
   const errors = []
   // 基础验证
   if (!config.type || !config.dataSource) {
@@ -105,7 +104,6 @@ const createPlot = (type, container, options) => {
 
 // 修改错误边界处理
 const handleError = (error) => {
-  console.error('Chart error:', error)
   errorMsg.value = Array.isArray(error) ? error : ['图表渲染失败']
   // 出错时销毁图表实例
   if (plot) {
@@ -132,8 +130,19 @@ const init = (config = {}, requestParameters = {}) => {
       return
     }
 
+    // 处理请求参数，移除循环引用
+    const sanitizedConfig = JSON.parse(JSON.stringify({
+      ...config,
+      chartsConfigArray: undefined // 移除可能导致循环引用的属性
+    }))
+
+    const sanitizedParams = JSON.parse(JSON.stringify({
+      ...requestParameters,
+      chartsConfigArray: undefined
+    }))
+
     // 验证通过后进行数据请求和图表渲染
-    queryChartsData({ config, requestParameters, preview: true }, config.serviceName, props.isDev)
+    queryChartsData({ config: sanitizedConfig, requestParameters: sanitizedParams, preview: true }, config.serviceName, props.isDev)
       .then((res) => {
         const xField =
           config.dataSource === 'curCrud'
@@ -242,6 +251,28 @@ const init = (config = {}, requestParameters = {}) => {
             colors10: config.colorIndex !== undefined ? colorItems[config.colorIndex].map(item => item.color) : undefined,
           },
         }
+        // 如果data 超过 50 增加缩略图
+        if (sortedData.length > 500) {
+          baseOptions.slider = {
+            start: 0,
+            end: 0.2,
+          }
+        } else if (sortedData.length > 200) {
+          baseOptions.slider = {
+            start: 0,
+            end: 0.4,
+          }
+        } else if (sortedData.length > 100) {
+          baseOptions.slider = {
+            start: 0,
+            end: 0.6,
+          }
+        } else if (sortedData.length > 50) {
+          baseOptions.slider = {
+            start: 0,
+            end: 0.8,
+          }
+        }
         if (config.type !== 'pie') {
           baseOptions.isGroup = true
         }