From a011fab46640c36c49a4cab3f62493907c17e6b2 Mon Sep 17 00:00:00 2001
From: pengm <674192343@qq.com>
Date: Fri, 24 Oct 2025 16:59:37 +0800
Subject: [PATCH] 1.处理界面加载时，因为主表从表查询异步的，导致从表无法拿到主表数据作数据传参

---
 src/components/Common/CommonNewTabBillEvent.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/components/Common/CommonNewTabBillEvent.js b/src/components/Common/CommonNewTabBillEvent.js
index 6cb032c..fd37fe7 100644
--- a/src/components/Common/CommonNewTabBillEvent.js
+++ b/src/components/Common/CommonNewTabBillEvent.js
@@ -713,18 +713,20 @@ export default (ChildComponent) => {
 
       const masterConfig = configArr[0][1];
       const conditonValues = this.handleGetSqlConditionValues(masterConfig)
-      await this.props.handleGetDataOne({
+      const masterDataReturn = await this.props.handleGetDataOne({
         name: 'master',
         configData: masterConfig,
         condition: { sSqlCondition: { ...conditonValues }, sId, pageSize: '', pageNum: '' },
         bEditClick,
+        isWait: true,
       });
-
+      const masterData= masterDataReturn?.masterData;
+      addState.masterData = masterData;
       for (let i = 1; i < configArr.length; i++) {
         const item = configArr[i];
         const [name, config] = item;
         if (commonUtils.isNotEmptyObject(config) && config.sSqlStr !== "noQuery") {
-          const conditonValues = this.handleGetSqlConditionValues(config);
+          const conditonValues = this.handleGetSqlConditionValues(config, masterData);
           let returnData = await this.props.handleGetDataSet({
             name,
             configData: config,
@@ -816,13 +818,13 @@ export default (ChildComponent) => {
 
 
     // 获取sqlCondition值
-    handleGetSqlConditionValues = (config) => {
+    handleGetSqlConditionValues = (config, record) => {
       let conditonValues = {};
       const { sSqlCondition } = config;
       if (commonUtils.isNotEmptyObject(sSqlCondition)) {
         const tableName = sSqlCondition.split('.')[0];
         if (tableName === 'master') {
-          conditonValues = this.props.getSqlCondition(config, 'master', this.props.masterData);
+          conditonValues = this.props.getSqlCondition(config, 'master', this.props.masterData || record);
         } else {
           let tableDataRow = {};
           const selectedRowKeys = this.props[`${tableName}SelectedRowKeys`];
--
libgit2 0.22.2