update：更新面板逻辑

@VIEW/@MACRO/VIEW_HEADER-BASE.vue.ftl

@@ -561,13 +561,13 @@ ${P.getCtrlCode('toolbar', 'CONTROL.vue').code}
      * @memberof ${srfclassname('${view.name}')}Base
      */
     public panelLogic(name: string): void {
-    <#--  <#list view.getPSViewLayoutPanel().getAllPSPanelItems() as panelItem>
-        <#if panelItem.getPSDEFDGroupLogic('ITEMBLANK')??>
-        <#assign ITEMBLANK = panelItem.getPSDEFDGroupLogic('ITEMBLANK')/>
-        if (Object.is(name, '')<#if ITEMBLANK.getRelatedDetailNames()??><#list ITEMBLANK.getRelatedDetailNames() as detailName> || Object.is(name, '${detailName}')</#list></#if>) {
+    <#list view.getPSViewLayoutPanel().getAllPSPanelItems() as panelItem>
+        <#if panelItem.getPSPanelItemGroupLogic('ITEMBLANK')??>
+        <#assign ITEMBLANK = panelItem.getPSPanelItemGroupLogic('ITEMBLANK')/>
+        if (Object.is(name, '')<#if ITEMBLANK.getRelatedItemNames()??><#list ITEMBLANK.getRelatedItemNames() as detailName> || Object.is(name, '${detailName}')</#list></#if>) {
             let ret = true;
-            <#if ITEMBLANK.getRelatedDetailNames()??>
-            <#list ITEMBLANK.getRelatedDetailNames() as detailName>
+            <#if ITEMBLANK.getRelatedItemNames()??>
+            <#list ITEMBLANK.getRelatedItemNames() as detailName>
             const _${detailName} = this.data.${detailName};
             </#list>
             </#if>
@@ -577,12 +577,12 @@ ${P.getCtrlCode('toolbar', 'CONTROL.vue').code}
             this.layoutModelDetails['${panelItem.name}'].required = ret;
         }
         </#if>
-        <#if panelItem.getPSDEFDGroupLogic('ITEMENABLE')??>
-        <#assign ITEMENABLE = panelItem.getPSDEFDGroupLogic('ITEMENABLE')/>
-        if (Object.is(name, '')<#if ITEMENABLE.getRelatedDetailNames()??><#list ITEMENABLE.getRelatedDetailNames() as detailName> || Object.is(name, '${detailName}')</#list></#if>) {
+        <#if panelItem.getPSPanelItemGroupLogic('ITEMENABLE')??>
+        <#assign ITEMENABLE = panelItem.getPSPanelItemGroupLogic('ITEMENABLE')/>
+        if (Object.is(name, '')<#if ITEMENABLE.getRelatedItemNames()??><#list ITEMENABLE.getRelatedItemNames() as detailName> || Object.is(name, '${detailName}')</#list></#if>) {
             let ret = false;
-            <#if ITEMENABLE.getRelatedDetailNames()??>
-            <#list ITEMENABLE.getRelatedDetailNames() as detailName>
+            <#if ITEMENABLE.getRelatedItemNames()??>
+            <#list ITEMENABLE.getRelatedItemNames() as detailName>
             const _${detailName} = this.data.${detailName};
             </#list>
             </#if>
@@ -592,12 +592,12 @@ ${P.getCtrlCode('toolbar', 'CONTROL.vue').code}
             this.layoutModelDetails['${panelItem.name}'].disabled = !ret;
         }
         </#if>
-        <#if panelItem.getPSDEFDGroupLogic('PANELVISIBLE')??>
-        <#assign PANELVISIBLE = panelItem.getPSDEFDGroupLogic('PANELVISIBLE')/>
-        if (Object.is(name, '')<#if PANELVISIBLE.getRelatedDetailNames()??><#list PANELVISIBLE.getRelatedDetailNames() as detailName> || Object.is(name, '${detailName}')</#list></#if>) {
+        <#if panelItem.getPSPanelItemGroupLogic('PANELVISIBLE')??>
+        <#assign PANELVISIBLE = panelItem.getPSPanelItemGroupLogic('PANELVISIBLE')/>
+        if (Object.is(name, '')<#if PANELVISIBLE.getRelatedItemNames()??><#list PANELVISIBLE.getRelatedItemNames() as detailName> || Object.is(name, '${detailName}')</#list></#if>) {
             let ret = false;
-            <#if PANELVISIBLE.getRelatedDetailNames()??>
-            <#list PANELVISIBLE.getRelatedDetailNames() as detailName>
+            <#if PANELVISIBLE.getRelatedItemNames()??>
+            <#list PANELVISIBLE.getRelatedItemNames() as detailName>
             const _${detailName} = this.data.${detailName};
             </#list>
             </#if>
@@ -607,7 +607,7 @@ ${P.getCtrlCode('toolbar', 'CONTROL.vue').code}
             this.layoutModelDetails['${panelItem.name}'].visible = ret;
         }
         </#if>
-    </#list>  -->
+    </#list>
     }
 
     /**

@VIEW/@MACRO/VIEW_LAYOUTPANEL/VIEW_LAYOUTPANEL_LOGIC.ftl

@@ -4,8 +4,8 @@
 <#if item.isNotMode()>
 !(
 </#if>
-<#if item.getPSDEFDLogics()??>
-<#list item.getPSDEFDLogics() as subLogic>
+<#if item.getPSPanelItemLogics()??>
+<#list item.getPSPanelItemLogics() as subLogic>
 <#if subLogic_index gt 0>
 <#if item.getGroupOP() == 'AND'> 
 &&
@@ -21,7 +21,7 @@
 )
 </#if>
 <#elseif item.getLogicType() == 'SINGLE'>
-this.$verify.testCond(_${item.getDEFDName()?lower_case}, "${item.getPSDBValueOPId()}", "${item.getValue()}");
+this.$verify.testCond(_${item.getDstModelField()?lower_case}, "${item.getCondOp()}", "${item.getValue()}");
 </#if>
 </@compress>
 </#macro>
\ No newline at end of file