@lcap/nasl 3.8.2-beta.7 → 3.8.2-beta.9

package/coverage/src/templator/genGetBlock.ts.html

@@ -23,30 +23,30 @@
         <div class='clearfix'>
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">27.77% </span>
+                <span class="strong">23.52% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>10/36</span>
+                <span class='fraction'>8/34</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">45.45% </span>
+                <span class="strong">0% </span>
                 <span class="quiet">Branches</span>
-                <span class='fraction'>5/11</span>
+                <span class='fraction'>0/6</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">12.5% </span>
+                <span class="strong">0% </span>
                 <span class="quiet">Functions</span>
-                <span class='fraction'>1/8</span>
+                <span class='fraction'>0/7</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">26.47% </span>
+                <span class="strong">24.24% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>9/34</span>
+                <span class='fraction'>8/33</span>
             </div>
         
             
@@ -185,7 +185,7 @@
 <a name='L120'></a><a href='#L120'>120</a>
 <a name='L121'></a><a href='#L121'>121</a>
 <a name='L122'></a><a href='#L122'>122</a>
-<a name='L123'></a><a href='#L123'>123</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">123x</span>
+<a name='L123'></a><a href='#L123'>123</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">1x</span>
@@ -210,7 +210,7 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">1x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
@@ -313,14 +313,14 @@ import { Entity, Logic, View, ViewElement } from '../concepts';
 import { NaslCoreTypeAnnotation, NaslTypeAnnotation, NaslLogicItem, NaslNode } from './utils';
 import { NameGroup, filterProperty, genLogicParam } from '.';
 &nbsp;
-export function <span class="fstat-no" title="function not covered" >genGetTemplate(e</span>ntity: Entity, nameGroup: NameGroup) {
+export function <span class="fstat-no" title="function not covered" >genGetTemplate(</span>entity: Entity, nameGroup: NameGroup) {
   const properties = <span class="cstat-no" title="statement not covered" >entity.properties.filter(filterProperty('inDetail'));</span>
 &nbsp;
 <span class="cstat-no" title="statement not covered" >  return `&lt;u-info-list&gt;</span>
     &lt;u-info-list-group&gt;
     &lt;template #title&gt;&lt;u-text text="基本信息"&gt;&lt;/u-text&gt;&lt;/template&gt;
     ${properties
-      .map((<span class="fstat-no" title="function not covered" >property) =&gt; {</span>
+      .map(<span class="fstat-no" title="function not covered" >(p</span>roperty) =&gt; {
         const valueExpression = <span class="cstat-no" title="statement not covered" >`${nameGroup.viewVariableEntity}.${property.name}`;</span>
         let formItem = <span class="cstat-no" title="statement not covered" >`            &lt;u-info-list-item&gt;&lt;template #label&gt;&lt;u-text text="${property.label || property.name}"&gt;&lt;/u-text&gt;&lt;/template&gt;`;</span>
 <span class="cstat-no" title="statement not covered" >        formItem += `&lt;u-text :text="${valueExpression}"&gt;&lt;/u-text&gt;`;</span>
@@ -332,7 +332,7 @@ export function <span class="fstat-no" title="function not covered" >genGetTempl
 &lt;/u-info-list&gt;`;
 }
 &nbsp;
-function <span class="fstat-no" title="function not covered" >genLoadLogic(g</span>etLogic: Logic, nameGroup: NameGroup) {
+function <span class="fstat-no" title="function not covered" >genLoadLogic(</span>getLogic: Logic, nameGroup: NameGroup) {
   const params = <span class="cstat-no" title="statement not covered" >[genLogicParam(`${getLogic.params[0].name}`, nameGroup.viewParamId)];</span>
 &nbsp;
 <span class="cstat-no" title="statement not covered" >  return NaslNode.Logic({</span>
@@ -358,12 +358,12 @@ function <span class="fstat-no" title="function not covered" >genLoadLogic(g</sp
   });
 }
 &nbsp;
-export function <span class="fstat-no" title="function not covered" >genH5GetTemplate(e</span>ntity: Entity, nameGroup: NameGroup) {
+export function <span class="fstat-no" title="function not covered" >genH5GetTemplate(</span>entity: Entity, nameGroup: NameGroup) {
   const properties = <span class="cstat-no" title="statement not covered" >entity.properties.filter(filterProperty('inDetail'));</span>
 &nbsp;
 <span class="cstat-no" title="statement not covered" >  return `&lt;van-cell-group&gt;</span>
     ${properties
-      .map((<span class="fstat-no" title="function not covered" >property) =&gt; {</span>
+      .map(<span class="fstat-no" title="function not covered" >(p</span>roperty) =&gt; {
         const temptitle = <span class="cstat-no" title="statement not covered" >property.label || property.name;</span>
         let formItem = <span class="cstat-no" title="statement not covered" >`            &lt;van-cell isLink`;</span>
 &nbsp;
@@ -376,10 +376,10 @@ export function <span class="fstat-no" title="function not covered" >genH5GetTem
 &lt;/van-cell-group&gt;`;
 }
 &nbsp;
-export function <span class="fstat-no" title="function not covered" >genGetBlock(e</span>ntity: Entity, oldNode: ViewElement) {
+export function <span class="fstat-no" title="function not covered" >genGetBlock(</span>entity: Entity, oldNode: ViewElement) {
   const { view } = <span class="cstat-no" title="statement not covered" >oldNode;</span>
   const { ns } = <span class="cstat-no" title="statement not covered" >entity;</span>
-  const getLogic = <span class="cstat-no" title="statement not covered" >ns?.logics?.find((<span class="fstat-no" title="function not covered" >logic) =&gt; <span class="cstat-no" title="statement not covered" >l</span>ogic.name === `get`)</span>;</span>
+  const getLogic = <span class="cstat-no" title="statement not covered" >ns?.logics?.find(<span class="fstat-no" title="function not covered" >(l</span>ogic) =&gt; <span class="cstat-no" title="statement not covered" >logic.name === `get`)</span>;</span>
 &nbsp;
   const nameGroup: NameGroup = <span class="cstat-no" title="statement not covered" >{};</span>
 <span class="cstat-no" title="statement not covered" >  nameGroup.viewParamId = view.getParamUniqueName('id');</span>
@@ -436,7 +436,7 @@ export default genGetBlock;
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at 2023-12-07T14:08:08.581Z
+                at 2023-10-18T11:36:07.885Z
             </div>
         <script src="../../prettify.js"></script>
         <script>

package/coverage/src/templator/genGridViewBlock.ts.html

@@ -23,23 +23,23 @@
         <div class='clearfix'>
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">10.21% </span>
+                <span class="strong">9.55% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>14/137</span>
+                <span class='fraction'>13/136</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">8.19% </span>
+                <span class="strong">0% </span>
                 <span class="quiet">Branches</span>
-                <span class='fraction'>5/61</span>
+                <span class='fraction'>0/56</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">5.55% </span>
+                <span class="strong">0% </span>
                 <span class="quiet">Functions</span>
-                <span class='fraction'>1/18</span>
+                <span class='fraction'>0/17</span>
             </div>
         
             
@@ -406,9 +406,10 @@
 <a name='L341'></a><a href='#L341'>341</a>
 <a name='L342'></a><a href='#L342'>342</a>
 <a name='L343'></a><a href='#L343'>343</a>
-<a name='L344'></a><a href='#L344'>344</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">142x</span>
+<a name='L344'></a><a href='#L344'>344</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -419,7 +420,6 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">1x</span>
-<span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -768,7 +768,7 @@ import { NaslUITypeAnnotation, NaslLogicItem, NaslNode } from './utils';
  * 根据实体属性生成表格列模板
  * @param property 实体属性
  */
-export function <span class="fstat-no" title="function not covered" >genGridViewCardTemplate(p</span>roperty: EntityProperty, nameGroup: NameGroup) {
+export function <span class="fstat-no" title="function not covered" >genGridViewCardTemplate(</span>property: EntityProperty, nameGroup: NameGroup) {
   const { entity } = <span class="cstat-no" title="statement not covered" >property;</span>
   const dataSource = <span class="cstat-no" title="statement not covered" >entity.parentNode as DataSource;</span>
   const lowerEntityName = <span class="cstat-no" title="statement not covered" >utils.firstLowerCase(entity.name);</span>
@@ -780,7 +780,7 @@ export function <span class="fstat-no" title="function not covered" >genGridView
     // 有外键关联
     const relationEntity = <span class="cstat-no" title="statement not covered" >dataSource?.findEntityByName(property.relationEntity);</span>
 <span class="cstat-no" title="statement not covered" >    if (relationEntity) {</span>
-      const <span class="cstat-no" title="statement not covered" >displayedProperty = getFirstDisplayedProperty(relationEntity);</span>
+      const displayedProperty = <span class="cstat-no" title="statement not covered" >getFirstDisplayedProperty(relationEntity);</span>
 <span class="cstat-no" title="statement not covered" >      if (displayedProperty) {</span>
         const relationLowerEntityName = <span class="cstat-no" title="statement not covered" >utils.firstLowerCase(relationEntity.name);</span>
 <span class="cstat-no" title="statement not covered" >        valueExpression = `${currentName}.item.${relationLowerEntityName}.${displayedProperty.name}`;</span>
@@ -789,7 +789,7 @@ export function <span class="fstat-no" title="function not covered" >genGridView
   } else {
 <span class="cstat-no" title="statement not covered" >    valueExpression = `${currentName}.item.${lowerEntityName}.${property.name}`;</span>
   }
-  const getText = <span class="cstat-no" title="statement not covered" >(<span class="fstat-no" title="function not covered" >p</span>roperty: EntityProperty) =&gt; {</span>
+  const getText = <span class="cstat-no" title="statement not covered" ><span class="fstat-no" title="function not covered" >(p</span>roperty: EntityProperty) =&gt; {</span>
     const propertyTypeName = <span class="cstat-no" title="statement not covered" >property.typeAnnotation.typeName;</span>
 <span class="cstat-no" title="statement not covered" >    if (propertyTypeName === 'Boolean') {</span>
 <span class="cstat-no" title="statement not covered" >      return `</span>
@@ -805,7 +805,7 @@ export function <span class="fstat-no" title="function not covered" >genGridView
             &lt;/u-linear-layout&gt;`;
 }
 &nbsp;
-export function <span class="fstat-no" title="function not covered" >genH5GridViewCardTemplate(p</span>roperty: EntityProperty, nameGroup?: NameGroup) {
+export function <span class="fstat-no" title="function not covered" >genH5GridViewCardTemplate(</span>property: EntityProperty, nameGroup?: NameGroup) {
   const { entity } = <span class="cstat-no" title="statement not covered" >property;</span>
   const dataSource = <span class="cstat-no" title="statement not covered" >entity.parentNode as DataSource;</span>
   const lowerEntityName = <span class="cstat-no" title="statement not covered" >utils.firstLowerCase(entity.name);</span>
@@ -817,7 +817,7 @@ export function <span class="fstat-no" title="function not covered" >genH5GridVi
     // 有外键关联
     const relationEntity = <span class="cstat-no" title="statement not covered" >dataSource?.findEntityByName(property.relationEntity);</span>
 <span class="cstat-no" title="statement not covered" >    if (relationEntity) {</span>
-      const <span class="cstat-no" title="statement not covered" >displayedProperty = getFirstDisplayedProperty(relationEntity);</span>
+      const displayedProperty = <span class="cstat-no" title="statement not covered" >getFirstDisplayedProperty(relationEntity);</span>
 <span class="cstat-no" title="statement not covered" >      if (displayedProperty) {</span>
         const relationLowerEntityName = <span class="cstat-no" title="statement not covered" >utils.firstLowerCase(relationEntity.name);</span>
 <span class="cstat-no" title="statement not covered" >        valueExpression = `${currentName}.item.${relationLowerEntityName}.${displayedProperty.name}`;</span>
@@ -826,7 +826,7 @@ export function <span class="fstat-no" title="function not covered" >genH5GridVi
   } else {
 <span class="cstat-no" title="statement not covered" >    valueExpression = `${currentName}.item.${lowerEntityName}.${property.name}`;</span>
   }
-  const getText = <span class="cstat-no" title="statement not covered" >(<span class="fstat-no" title="function not covered" >p</span>roperty: EntityProperty) =&gt; {</span>
+  const getText = <span class="cstat-no" title="statement not covered" ><span class="fstat-no" title="function not covered" >(p</span>roperty: EntityProperty) =&gt; {</span>
     const propertyTypeName = <span class="cstat-no" title="statement not covered" >property.typeAnnotation.typeName;</span>
 <span class="cstat-no" title="statement not covered" >    if (propertyTypeName === 'Boolean') {</span>
 <span class="cstat-no" title="statement not covered" >      return `</span>
@@ -844,7 +844,7 @@ export function <span class="fstat-no" title="function not covered" >genH5GridVi
  * @param entity 实体
  * @param nameGroup 命名组
  */
-export function <span class="fstat-no" title="function not covered" >genGridViewTemplate(e</span>ntity: Entity, nameGroup: NameGroup, newLogic: any, modifyable?: boolean, entryFromCall?: string) {
+export function <span class="fstat-no" title="function not covered" >genGridViewTemplate(</span>entity: Entity, nameGroup: NameGroup, newLogic: any, modifyable?: boolean, entryFromCall?: string) {
   const currentName = <span class="cstat-no" title="statement not covered" >nameGroup.currentName || 'current';</span>
   const properties = <span class="cstat-no" title="statement not covered" >entity.properties.filter(filterProperty('inTable'));</span>
   let dataSourceValue = <span class="cstat-no" title="statement not covered" >`(params) =&gt; ${newLogic.name}(elements.$ce.page, elements.$ce.size,elements.$ce.sort,elements.$ce.order)`;</span>
@@ -866,7 +866,7 @@ export function <span class="fstat-no" title="function not covered" >genGridView
         &lt;template #item="current"&gt;
             &lt;u-card title=""&gt;
                 &lt;u-linear-layout direction="vertical" gap="small"&gt;
-                    ${properties.map((<span class="fstat-no" title="function not covered" >property) =&gt; <span class="cstat-no" title="statement not covered" >`</span>${genGridViewCardTemplate(property, nameGroup)}\n`)</span>.join('')}
+                    ${properties.map(<span class="fstat-no" title="function not covered" >(p</span>roperty) =&gt; <span class="cstat-no" title="statement not covered" >`${genGridViewCardTemplate(property, nameGroup)}\n`)</span>.join('')}
                     &lt;u-linear-layout gap="small"&gt;
                         &lt;u-link ${modifyable ? `@click="${nameGroup.viewLogicModify || 'modify'}"` : ''}&gt;修改&lt;/u-link&gt;
                         &lt;u-link @click="${nameGroup.viewLogicRemove}"&gt;删除&lt;/u-link&gt;
@@ -878,7 +878,7 @@ export function <span class="fstat-no" title="function not covered" >genGridView
 `;
 }
 &nbsp;
-export function <span class="fstat-no" title="function not covered" >genH5GridViewTemplate(e</span>ntity: Entity, nameGroup: NameGroup, newLogic: any, modifyable?: boolean, entryFromCall?: string) {
+export function <span class="fstat-no" title="function not covered" >genH5GridViewTemplate(</span>entity: Entity, nameGroup: NameGroup, newLogic: any, modifyable?: boolean, entryFromCall?: string) {
     const currentName = <span class="cstat-no" title="statement not covered" >nameGroup.currentName || 'current';</span>
     const properties = <span class="cstat-no" title="statement not covered" >entity.properties.filter(filterProperty('inTable'));</span>
     let dataSourceValue = <span class="cstat-no" title="statement not covered" >`(params) =&gt; ${newLogic.name}(elements.$ce.page, elements.$ce.size,elements.$ce.sort,elements.$ce.order)`;</span>
@@ -894,7 +894,7 @@ export function <span class="fstat-no" title="function not covered" >genH5GridVi
     :iffall="false"&gt;
     &lt;template #item="current"&gt;
         &lt;van-cardu no-title&gt;
-            ${properties.map((<span class="fstat-no" title="function not covered" >property) =&gt; <span class="cstat-no" title="statement not covered" >`</span>${genH5GridViewCardTemplate(property, nameGroup)}\n`)</span>.join('')}
+            ${properties.map(<span class="fstat-no" title="function not covered" >(p</span>roperty) =&gt; <span class="cstat-no" title="statement not covered" >`${genH5GridViewCardTemplate(property, nameGroup)}\n`)</span>.join('')}
         &lt;/van-cardu&gt;
     &lt;/template&gt;
 &lt;/van-grid-view&gt;
@@ -905,7 +905,7 @@ export function <span class="fstat-no" title="function not covered" >genH5GridVi
  * 生成表格 load 逻辑
  * @param entity 实体
  */
-export function <span class="fstat-no" title="function not covered" >genGridViewLoadLogic(e</span>ntity: Entity, nameGroup: NameGroup, newLogic: any, supportFilter: boolean) {
+export function <span class="fstat-no" title="function not covered" >genGridViewLoadLogic(</span>entity: Entity, nameGroup: NameGroup, newLogic: any, supportFilter: boolean) {
   const moduleNode = <span class="cstat-no" title="statement not covered" >entity.app;</span>
   const moduleNamespace = <span class="cstat-no" title="statement not covered" >moduleNode?.getNamespace();</span>
   const params = <span class="cstat-no" title="statement not covered" >[</span>
@@ -953,11 +953,11 @@ export function <span class="fstat-no" title="function not covered" >genGridView
  * 生成表格 remove 逻辑
  * @param entity 实体
  */
-export function <span class="fstat-no" title="function not covered" >genGridViewRemoveLogic(e</span>ntity: Entity, nameGroup: NameGroup) {
+export function <span class="fstat-no" title="function not covered" >genGridViewRemoveLogic(</span>entity: Entity, nameGroup: NameGroup) {
   const lowerEntityName = <span class="cstat-no" title="statement not covered" >utils.firstLowerCase(entity.name);</span>
   const { ns } = <span class="cstat-no" title="statement not covered" >entity;</span>
-  const deleteLogic = <span class="cstat-no" title="statement not covered" >ns?.logics?.find((<span class="fstat-no" title="function not covered" >logic) =&gt; <span class="cstat-no" title="statement not covered" >l</span>ogic.name === `delete`)</span>;</span>
-  const idPropertys = <span class="cstat-no" title="statement not covered" >entity.properties.filter((<span class="fstat-no" title="function not covered" >property) =&gt; <span class="cstat-no" title="statement not covered" >p</span>roperty.primaryKey || property.name === 'id')</span>;</span>
+  const deleteLogic = <span class="cstat-no" title="statement not covered" >ns?.logics?.find(<span class="fstat-no" title="function not covered" >(l</span>ogic) =&gt; <span class="cstat-no" title="statement not covered" >logic.name === `delete`)</span>;</span>
+  const idPropertys = <span class="cstat-no" title="statement not covered" >entity.properties.filter(<span class="fstat-no" title="function not covered" >(p</span>roperty) =&gt; <span class="cstat-no" title="statement not covered" >property.primaryKey || property.name === 'id')</span>;</span>
   const currentName = <span class="cstat-no" title="statement not covered" >nameGroup.currentName || 'current';</span>
 &nbsp;
 <span class="cstat-no" title="statement not covered" >  return NaslNode.Logic({</span>
@@ -970,8 +970,8 @@ export function <span class="fstat-no" title="function not covered" >genGridView
       NaslLogicItem.CallLogic({
         calleeNamespace: deleteLogic.getNamespace(),
         calleeName: deleteLogic.name,
-        arguments: idPropertys.map((<span class="fstat-no" title="function not covered" >idProperty) =&gt; {</span>
-          let <span class="cstat-no" title="statement not covered" >paramFromLogic = getParamFromLogic(deleteLogic, idProperty.name);</span>
+        arguments: idPropertys.map(<span class="fstat-no" title="function not covered" >(i</span>dProperty) =&gt; {
+          let paramFromLogic = <span class="cstat-no" title="statement not covered" >getParamFromLogic(deleteLogic, idProperty.name);</span>
           // 如果旧逻辑，但是新导入表中，id的name 不是id 的话，就直接使用名称叫id的
 <span class="cstat-no" title="statement not covered" >          if (!paramFromLogic) {</span>
 <span class="cstat-no" title="statement not covered" >            paramFromLogic = getParamFromLogic(deleteLogic, 'id');</span>
@@ -995,13 +995,13 @@ export function <span class="fstat-no" title="function not covered" >genGridView
  *        load_select_student -&gt; load_someView_select_student
  */
 // 数据网格（简）
-export function <span class="fstat-no" title="function not covered" >genGridViewBlock(e</span>ntity: Entity, oldNode: ViewElement) {
+export function <span class="fstat-no" title="function not covered" >genGridViewBlock(</span>entity: Entity, oldNode: ViewElement) {
   const { view } = <span class="cstat-no" title="statement not covered" >oldNode;</span>
   const dataSource = <span class="cstat-no" title="statement not covered" >entity.parentNode as DataSource;</span>
   const module = <span class="cstat-no" title="statement not covered" >dataSource.app;</span>
 &nbsp;
   const viewElementMainView = <span class="cstat-no" title="statement not covered" >view.getViewElementUniqueName('gridView');</span>
-  const <span class="cstat-no" title="statement not covered" >nameGroup = genUniqueQueryNameGroup(module, view, viewElementMainView);</span>
+  const nameGroup = <span class="cstat-no" title="statement not covered" >genUniqueQueryNameGroup(module, view, viewElementMainView);</span>
 <span class="cstat-no" title="statement not covered" >  nameGroup.viewElementMainView = viewElementMainView;</span>
 <span class="cstat-no" title="statement not covered" >  nameGroup.viewVariableEntity = view.getVariableUniqueName(utils.firstLowerCase(entity.name));</span>
 <span class="cstat-no" title="statement not covered" >  nameGroup.viewLogicRemove = view.getLogicUniqueName('remove');</span>
@@ -1013,18 +1013,18 @@ export function <span class="fstat-no" title="function not covered" >genGridView
   const entitySet: Set&lt;Entity&gt; = <span class="cstat-no" title="statement not covered" >new Set();</span>
 <span class="cstat-no" title="statement not covered" >  entitySet.add(entity);</span>
   const newLogics: any[] = <span class="cstat-no" title="statement not covered" >[];</span>
-<span class="cstat-no" title="statement not covered" >  entity.properties.forEach((<span class="fstat-no" title="function not covered" >property) =&gt; {</span></span>
+<span class="cstat-no" title="statement not covered" >  entity.properties.forEach(<span class="fstat-no" title="function not covered" >(p</span>roperty) =&gt; {</span>
 <span class="cstat-no" title="statement not covered" >    if (property.relationEntity) {</span>
       // 有外键关联
       const relationEntity = <span class="cstat-no" title="statement not covered" >dataSource?.findEntityByName(property.relationEntity);</span>
 <span class="cstat-no" title="statement not covered" >      if (relationEntity) {</span>
-        const <span class="cstat-no" title="statement not covered" >displayedProperty = getFirstDisplayedProperty(relationEntity);</span>
+        const displayedProperty = <span class="cstat-no" title="statement not covered" >getFirstDisplayedProperty(relationEntity);</span>
 <span class="cstat-no" title="statement not covered" >        if (displayedProperty) <span class="cstat-no" title="statement not covered" >entitySet.add(relationEntity);</span></span>
       }
     }
   });
   const allEntities = <span class="cstat-no" title="statement not covered" >[...entitySet];</span>
-  const <span class="cstat-no" title="statement not covered" >entityLogic = genQueryLogic(allEntities, nameGroup, false, true, module);</span>
+  const entityLogic = <span class="cstat-no" title="statement not covered" >genQueryLogic(allEntities, nameGroup, false, true, module);</span>
 <span class="cstat-no" title="statement not covered" >  newLogics.push(entityLogic);</span>
 &nbsp;
 <span class="cstat-no" title="statement not covered" >  return `</span>
@@ -1044,14 +1044,14 @@ export function <span class="fstat-no" title="function not covered" >genGridView
 `;
 }
 &nbsp;
-export function <span class="fstat-no" title="function not covered" >genGridViewCardBlock(p</span>roperty: EntityProperty, oldNode: ViewElement) {
+export function <span class="fstat-no" title="function not covered" >genGridViewCardBlock(</span>property: EntityProperty, oldNode: ViewElement) {
   const { view } = <span class="cstat-no" title="statement not covered" >oldNode;</span>
   const { entity } = <span class="cstat-no" title="statement not covered" >property;</span>
   const dataSource = <span class="cstat-no" title="statement not covered" >entity.parentNode as DataSource;</span>
   const module = <span class="cstat-no" title="statement not covered" >dataSource.app;</span>
 &nbsp;
   const viewElementMainView = <span class="cstat-no" title="statement not covered" >view.getViewElementUniqueName('gridView');</span>
-  const <span class="cstat-no" title="statement not covered" >nameGroup = genUniqueQueryNameGroup(module, view, viewElementMainView);</span>
+  const nameGroup = <span class="cstat-no" title="statement not covered" >genUniqueQueryNameGroup(module, view, viewElementMainView);</span>
 <span class="cstat-no" title="statement not covered" >  nameGroup.viewElementMainView = viewElementMainView;</span>
 <span class="cstat-no" title="statement not covered" >  nameGroup.viewVariableEntity = view.getVariableUniqueName(utils.firstLowerCase(entity.name));</span>
 <span class="cstat-no" title="statement not covered" >  nameGroup.viewLogicRemove = view.getLogicUniqueName('remove');</span>
@@ -1061,18 +1061,18 @@ export function <span class="fstat-no" title="function not covered" >genGridView
   const entitySet: Set&lt;Entity&gt; = <span class="cstat-no" title="statement not covered" >new Set();</span>
 <span class="cstat-no" title="statement not covered" >  entitySet.add(entity);</span>
   const newLogics: any[] = <span class="cstat-no" title="statement not covered" >[];</span>
-<span class="cstat-no" title="statement not covered" >  entity.properties.forEach((<span class="fstat-no" title="function not covered" >property) =&gt; {</span></span>
+<span class="cstat-no" title="statement not covered" >  entity.properties.forEach(<span class="fstat-no" title="function not covered" >(p</span>roperty) =&gt; {</span>
 <span class="cstat-no" title="statement not covered" >    if (property.relationEntity) {</span>
       // 有外键关联
       const relationEntity = <span class="cstat-no" title="statement not covered" >dataSource?.findEntityByName(property.relationEntity);</span>
 <span class="cstat-no" title="statement not covered" >      if (relationEntity) {</span>
-        const <span class="cstat-no" title="statement not covered" >displayedProperty = getFirstDisplayedProperty(relationEntity);</span>
+        const displayedProperty = <span class="cstat-no" title="statement not covered" >getFirstDisplayedProperty(relationEntity);</span>
 <span class="cstat-no" title="statement not covered" >        if (displayedProperty) <span class="cstat-no" title="statement not covered" >entitySet.add(relationEntity);</span></span>
       }
     }
   });
   const allEntities = <span class="cstat-no" title="statement not covered" >[...entitySet];</span>
-  const <span class="cstat-no" title="statement not covered" >entityLogic = genQueryLogic(allEntities, nameGroup, true, true, module);</span>
+  const entityLogic = <span class="cstat-no" title="statement not covered" >genQueryLogic(allEntities, nameGroup, true, true, module);</span>
 <span class="cstat-no" title="statement not covered" >  newLogics.push(entityLogic);</span>
 &nbsp;
 <span class="cstat-no" title="statement not covered" >  return `</span>
@@ -1099,7 +1099,7 @@ export default genGridViewBlock;
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at 2023-12-07T14:08:08.581Z
+                at 2023-10-18T11:36:07.885Z
             </div>
         <script src="../../prettify.js"></script>
         <script>

package/coverage/src/templator/genListViewBlock.ts.html

@@ -23,23 +23,23 @@
         <div class='clearfix'>
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">24.39% </span>
+                <span class="strong">22.5% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>10/41</span>
+                <span class='fraction'>9/40</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">38.46% </span>
+                <span class="strong">0% </span>
                 <span class="quiet">Branches</span>
-                <span class='fraction'>5/13</span>
+                <span class='fraction'>0/8</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">20% </span>
+                <span class="strong">0% </span>
                 <span class="quiet">Functions</span>
-                <span class='fraction'>1/5</span>
+                <span class='fraction'>0/4</span>
             </div>
         
             
@@ -193,7 +193,7 @@
 <a name='L128'></a><a href='#L128'>128</a>
 <a name='L129'></a><a href='#L129'>129</a>
 <a name='L130'></a><a href='#L130'>130</a>
-<a name='L131'></a><a href='#L131'>131</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">126x</span>
+<a name='L131'></a><a href='#L131'>131</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">1x</span>
@@ -329,7 +329,7 @@ import { App, Module, Namespace, Entity, EntityProperty, DataSource, ViewElement
 import { genUniqueQueryNameGroup, getFirstDisplayedProperty, genQueryLogic, genLogicParam } from '.';
 import { NameGroup, NaslUITypeAnnotation, NaslLogicItem, NaslNode } from './utils';
 &nbsp;
-export function <span class="fstat-no" title="function not covered" >genListViewTemplate(p</span>roperty: EntityProperty, nameGroup: NameGroup, newLogic: any) {
+export function <span class="fstat-no" title="function not covered" >genListViewTemplate(</span>property: EntityProperty, nameGroup: NameGroup, newLogic: any) {
   const { entity } = <span class="cstat-no" title="statement not covered" >property;</span>
   const lowerEntityName = <span class="cstat-no" title="statement not covered" >utils.firstLowerCase(entity.name);</span>
   const currentName = <span class="cstat-no" title="statement not covered" >nameGroup.currentName || 'current';</span>
@@ -348,7 +348,7 @@ export function <span class="fstat-no" title="function not covered" >genListView
 &lt;/u-list-view&gt;`;
 }
 &nbsp;
-export function <span class="fstat-no" title="function not covered" >genH5ListViewTemplate(p</span>roperty: EntityProperty, nameGroup: NameGroup, newLogic: any) {
+export function <span class="fstat-no" title="function not covered" >genH5ListViewTemplate(</span>property: EntityProperty, nameGroup: NameGroup, newLogic: any) {
   const { entity } = <span class="cstat-no" title="statement not covered" >property;</span>
   const lowerEntityName = <span class="cstat-no" title="statement not covered" >utils.firstLowerCase(entity.name);</span>
   const currentName = <span class="cstat-no" title="statement not covered" >nameGroup.currentName || 'current';</span>
@@ -373,14 +373,14 @@ export function <span class="fstat-no" title="function not covered" >genH5ListVi
 &lt;/van-list-view&gt;`;
 }
 &nbsp;
-export function <span class="fstat-no" title="function not covered" >genLoadListViewLogic(e</span>ntity: Entity, nameGroup: NameGroup, newLogics: Array&lt;any&gt;) {
+export function <span class="fstat-no" title="function not covered" >genLoadListViewLogic(</span>entity: Entity, nameGroup: NameGroup, newLogics: Array&lt;any&gt;) {
   const parentNode = <span class="cstat-no" title="statement not covered" >entity.parentNode as App | Module | Namespace;</span>
 &nbsp;
   const moduleNode = <span class="cstat-no" title="statement not covered" >entity.app;</span>
   const moduleNamespace = <span class="cstat-no" title="statement not covered" >moduleNode?.getNamespace();</span>
 &nbsp;
   // Select 和 table 不一样，直接在内部产生了
-  const <span class="cstat-no" title="statement not covered" >entityLogic = genQueryLogic([entity], nameGroup, false, false, parentNode);</span>
+  const entityLogic = <span class="cstat-no" title="statement not covered" >genQueryLogic([entity], nameGroup, false, false, parentNode);</span>
 <span class="cstat-no" title="statement not covered" >  newLogics.push(entityLogic);</span>
 &nbsp;
 <span class="cstat-no" title="statement not covered" >  return NaslNode.Logic({</span>
@@ -418,13 +418,13 @@ export function <span class="fstat-no" title="function not covered" >genLoadList
 /**
  * 生成实体选择框区块
  */
-export function <span class="fstat-no" title="function not covered" >genListViewBlock(e</span>ntity: Entity, oldNode: ViewElement, property: EntityProperty) {
+export function <span class="fstat-no" title="function not covered" >genListViewBlock(</span>entity: Entity, oldNode: ViewElement, property: EntityProperty) {
   const { view } = <span class="cstat-no" title="statement not covered" >oldNode;</span>
   const dataSource = <span class="cstat-no" title="statement not covered" >entity.parentNode as DataSource;</span>
   const module = <span class="cstat-no" title="statement not covered" >dataSource.app;</span>
 &nbsp;
   const viewElementMainView = <span class="cstat-no" title="statement not covered" >view.getViewElementUniqueName('listView');</span>
-  const <span class="cstat-no" title="statement not covered" >nameGroup = genUniqueQueryNameGroup(module, view, viewElementMainView, false);</span>
+  const nameGroup = <span class="cstat-no" title="statement not covered" >genUniqueQueryNameGroup(module, view, viewElementMainView, false);</span>
 <span class="cstat-no" title="statement not covered" >  nameGroup.viewElementMainView = viewElementMainView;</span>
 <span class="cstat-no" title="statement not covered" >  nameGroup.viewVariableEntity = view.getVariableUniqueName(utils.firstLowerCase(entity.name));</span>
   // 当前节点的currentName
@@ -434,7 +434,7 @@ export function <span class="fstat-no" title="function not covered" >genListView
   const newLogics: Array&lt;any&gt; = <span class="cstat-no" title="statement not covered" >[];</span>
 &nbsp;
   const parentNode = <span class="cstat-no" title="statement not covered" >entity.parentNode as App | Module | Namespace;</span>
-  const <span class="cstat-no" title="statement not covered" >entityLogic = genQueryLogic([entity], nameGroup, false, false, parentNode);</span>
+  const entityLogic = <span class="cstat-no" title="statement not covered" >genQueryLogic([entity], nameGroup, false, false, parentNode);</span>
 &nbsp;
 <span class="cstat-no" title="statement not covered" >  return `&lt;template&gt;</span>
     ${config.scope === 'h5' ? genH5ListViewTemplate(displayedProperty, nameGroup, entityLogic) : genListViewTemplate(displayedProperty, nameGroup, entityLogic)}
@@ -460,7 +460,7 @@ export default genListViewBlock;
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at 2023-12-07T14:08:08.581Z
+                at 2023-10-18T11:36:07.885Z
             </div>
         <script src="../../prettify.js"></script>
         <script>