From e893d03bea66987d8fce3f2eb0706be3dffcb636 Mon Sep 17 00:00:00 2001
From: chenxt <10125295+chen-xintao97@user.noreply.gitee.com>
Date: Thu, 25 Dec 2025 11:30:21 +0800
Subject: [PATCH] 选择版材弹窗空白问题修复

---
 src/components/Common/CommonHooks/useCommonBase.js | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/components/Common/CommonHooks/useCommonBase.js b/src/components/Common/CommonHooks/useCommonBase.js
index aaeb70a..e2fab9f 100644
--- a/src/components/Common/CommonHooks/useCommonBase.js
+++ b/src/components/Common/CommonHooks/useCommonBase.js
@@ -56,8 +56,8 @@ const useCommonBase = props => {
       return;
     }
     const { sModelsId, app } = state;
+    const isChoosePlate = sModelsId !== '12710101117087374661080'
     const formData = await handleGetModelConfig({ sModelsId });
-
     const addState = {};
     let pageRoute = props.sModelType;
     // 如果是弹窗且没有pageLayout，则认为是commonBill
@@ -67,7 +67,7 @@ const useCommonBase = props => {
 
     if (formData.length && !props.currentContent && ['/indexPage/commonList', '/indexPage/commonBill'].includes(pageRoute) && !formData[0].gdsconfigformslave.some(item => item.sControlName === 'pageLayout')) {
       if (pageRoute === '/indexPage/commonList') {
-        formData[0].sGrd = 'slave';
+        formData[0].sGrd = isChoosePlate ? 'slave' : formData[0].sGrd;
         formData[0].gdsconfigformslave.push({
           sId: commonUtils.createSid(),
           sControlName: 'pageLayout',
@@ -78,12 +78,12 @@ const useCommonBase = props => {
         const [tableList, tabConfig] = [[], []];
         formData.forEach((item, index) => {
           if (index === 0) {
-            item.sGrd = 'master';
+            item.sGrd = isChoosePlate ? 'master' : item.sGrd;
             tableList.push('master');
             tabConfig.push({ "configList": [{ "sName": "master", "showType": "form", "bHideTitle": true, "defaultEnabled": true }], "mode": "advanced", "height": "auto", "width": "100%" });
           } else {
             const tablename = `slave${index - 2 < 0 ? '' : index - 2}`;
-            item.sGrd = tablename;
+            item.sGrd = isChoosePlate ? tablename : item.sGrd;
             tableList.push(tablename);
             if (!tabConfig[1]) {
               tabConfig.push({ "configList": [], "mode": "advanced" });
@@ -118,7 +118,6 @@ const useCommonBase = props => {
    * @param {Function} callback - 回调函数
    */
   const handleSaveState = (values, callback) => {
-    console.log("🚀 ~ handleSaveState ~ values:", values)
     if (commonUtils.isNotEmptyObject(values.masterConfig) && values.masterConfig.bMerged) {
       delete values.masterConfig;
     }
@@ -1675,7 +1674,6 @@ const useCommonBase = props => {
           ) {
             const sRulesObjArr = JSON.parse(sRulesJson);
             if (commonUtils.isNotEmptyArr(sRulesObjArr)) {
-              console.log("sRulesObjArr:", sRulesObjArr);
               sRulesObjArr.forEach(sRulesObj => {
                 const {
                   showColumn,
@@ -1684,7 +1682,6 @@ const useCommonBase = props => {
                   tbName,
                   sConfigName
                 } = sRulesObj;
-                console.log("tbName:", tbName,);
                 /* 主表单表字段根据条件控制 其他字段的显示与隐藏 */
                 if (commonUtils.isEmptyObject(tbName)) {
                   if (commonUtils.isNotEmptyArr(condition)) {
@@ -3318,7 +3315,6 @@ const useCommonBase = props => {
         const newCopyTo = {};
         newCopyTo.master = masterData;
         const sName = selectConfig.sKeyUpFilter; /* 将后台配置筛选字段作为 列字段 */
-        console.log("🚀 ~ handleSelectCommonPopupNew ~ sName:", sName)
         let sValue = '';
         if (iIndex > -1) {
           newCopyTo.slave = tableData[iIndex];
@@ -3477,7 +3473,6 @@ const useCommonBase = props => {
   };
   /**   toolbar审核(消审)   */
   const handleAudit = async (flag) => {
-    console.log("🚀 ~ handleAudit ~ flag:", flag)
     /*   待用数据声明   */
     let bResult = true;
     const { masterData, gdsformconst } = props;
@@ -3501,7 +3496,6 @@ const useCommonBase = props => {
   };
   /**   数据审核   */
   const dataAudit = async (flag, tmpCheck, isWait) => {
-    console.log("🚀 ~ dataAudit ~ flag:", flag)
     message.destroy();
     /*   待用数据声明   */
     const {
--
libgit2 0.22.2