From 2284c2699abfe1f0ae50f3d258a29331e5d8d9b9 Mon Sep 17 00:00:00 2001
From: Noneday <59395983@qq.com>
Date: Wed, 27 Dec 2023 10:02:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=90=8E=E7=AB=AF=E5=88=86?=
 =?UTF-8?q?=E9=A1=B5=E9=80=89=E9=A1=B5=E5=90=8E=E6=8A=A5=E6=89=BE=E4=B8=8D?=
 =?UTF-8?q?=E5=88=B0=E5=AF=B9=E8=B1=A1=E5=B1=9E=E6=80=A7=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/views/rpt_design/api/report_api.js           | 6 +++---
 front/src/views/rpt_design/element/luckySheetProxy.vue | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/front/src/views/rpt_design/api/report_api.js b/front/src/views/rpt_design/api/report_api.js
index b782da1..bcbae08 100644
--- a/front/src/views/rpt_design/api/report_api.js
+++ b/front/src/views/rpt_design/api/report_api.js
@@ -402,7 +402,7 @@ export function run_one(_this,reportFilePath,_param_name_=null,loading_conf=null
         }
         if(response_data.zb_var) //兼容老写法
             response_data._zb_var_=response_data.zb_var
-        if(response_data._zb_var_?.watermark){
+        if(response_data._zb_var_ && response_data._zb_var_.watermark){
             $(".mask_div").remove()
             _this.watermark(response_data._zb_var_.watermark);
         }
@@ -423,10 +423,10 @@ export function run_one(_this,reportFilePath,_param_name_=null,loading_conf=null
             return
         }
         else if(_fresh_ds){
-            Object.keys(response_data.dataSet).forEach(x=>{
+            Object.keys(response_data.dataSet??{}).forEach(x=>{
                 _this.result.dataSet[x]=response_data.dataSet[x]
             })
-            Object.keys(response_data.data).forEach(x=>{
+            Object.keys(response_data.data??{}).forEach(x=>{
                 _this.result.data[x]=response_data.data[x]
             })
             //Object.assign(_this.result.dataSet,response_data.dataSet)
diff --git a/front/src/views/rpt_design/element/luckySheetProxy.vue b/front/src/views/rpt_design/element/luckySheetProxy.vue
index 8b7df99..71d746a 100644
--- a/front/src/views/rpt_design/element/luckySheetProxy.vue
+++ b/front/src/views/rpt_design/element/luckySheetProxy.vue
@@ -373,9 +373,9 @@ export default {
                   _this.$set(_this.context.clickedEle,_this.self.gridName,{data:ret,cell:ret[cur_col],column:cur_col,self:_this.self})
                   _this.click_fresh(_this.context.clickedEle[_this.self.gridName])
 
-                  if(window[`cr_click_${_this.gridName}`]){
-                    window[`cr_click_${_this.gridName}`]({data:ret,cell:ret[cur_col],column:cur_col},_this)
-                  }
+                  //if(window[`cr_click_${_this.gridName}`]){
+                  //  window[`cr_click_${_this.gridName}`]({data:ret,cell:ret[cur_col],column:cur_col},_this)
+                  //}
 
                   // 点击后的活动行
                   //$(this).siblings('tr').removeClass('active-row');