修正后端分页选页后报找不到对象属性的问题

NoneDay · Dec 27, 2023 · 2284c26 · 2284c26
1 parent 850d271
commit 2284c26
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -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');