@lcap/nasl 3.4.0-beta.9 → 3.4.1-beta.1

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

@@ -23,9 +23,9 @@
         <div class='clearfix'>
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">3.72% </span>
+                <span class="strong">3.75% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>8/215</span>
+                <span class='fraction'>8/213</span>
             </div>
         
             
@@ -44,9 +44,9 @@
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">3.82% </span>
+                <span class="strong">3.86% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>8/209</span>
+                <span class='fraction'>8/207</span>
             </div>
         
             
@@ -780,7 +780,13 @@
 <a name='L715'></a><a href='#L715'>715</a>
 <a name='L716'></a><a href='#L716'>716</a>
 <a name='L717'></a><a href='#L717'>717</a>
-<a name='L718'></a><a href='#L718'>718</a></td><td class="line-coverage quiet"><span class="cline-any cline-neutral">&nbsp;</span>
+<a name='L718'></a><a href='#L718'>718</a>
+<a name='L719'></a><a href='#L719'>719</a>
+<a name='L720'></a><a href='#L720'>720</a>
+<a name='L721'></a><a href='#L721'>721</a>
+<a name='L722'></a><a href='#L722'>722</a>
+<a name='L723'></a><a href='#L723'>723</a>
+<a name='L724'></a><a href='#L724'>724</a></td><td class="line-coverage quiet"><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-neutral">&nbsp;</span>
@@ -821,7 +827,6 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&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>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -896,7 +901,6 @@
 <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-neutral">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -922,7 +926,7 @@
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</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>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -963,28 +967,36 @@
 <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-neutral">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</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>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
@@ -996,10 +1008,10 @@
 <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-no">&nbsp;</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>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -1505,7 +1517,7 @@
  */
 import * as utils from '../utils';
 import { App, Module, Namespace, Entity, View, Enum, DataSource, ViewElement } from '../concepts';
-import { NaslCoreTypeAnnotation, NaslUITypeAnnotation, NaslTypeAnnotation, NaslLogicItem, NaslNode, getDecimalInfo, transEntityMetadataTypes } from './utils';
+import { NaslCoreTypeAnnotation, NaslUITypeAnnotation, NaslTypeAnnotation, NaslLogicItem, NaslNode } from './utils';
 import {
   filterProperty,
   NameGroup,
@@ -1528,7 +1540,7 @@ function <span class="fstat-no" title="function not covered" >genFilterTemplate(
   const dataSource = <span class="cstat-no" title="statement not covered" >entity.parentNode as DataSource;</span>
   const properties = <span class="cstat-no" title="statement not covered" >entity.properties.filter(filterProperty('inFilter'));</span>
 <span class="cstat-no" title="statement not covered" >  return `</span>
-&lt;u-linear-layout&gt;
+&lt;u-linear-layout justify="space-between"&gt;
     &lt;u-form layout="inline"&gt;
     ${properties
       .map(<span class="fstat-no" title="function not covered" >(p</span>roperty) =&gt; {
@@ -1537,8 +1549,7 @@ function <span class="fstat-no" title="function not covered" >genFilterTemplate(
         let formItem = <span class="cstat-no" title="statement not covered" >`&lt;u-form-item layout="center"&gt;&lt;template #label&gt;&lt;u-text text="${label}"&gt;&lt;/u-text&gt;&lt;/template&gt;`;</span>
 &nbsp;
         const { typeAnnotation } = <span class="cstat-no" title="statement not covered" >property || {};</span>
-        const { typeNamespace: propertyTypeNamespace } = <span class="cstat-no" title="statement not covered" >typeAnnotation || {};</span>
-        const propertyTypeName = <span class="cstat-no" title="statement not covered" >transEntityMetadataTypes(typeAnnotation, dataSource.app);</span>
+        const { typeName: propertyTypeName, typeNamespace: propertyTypeNamespace } = <span class="cstat-no" title="statement not covered" >typeAnnotation || {};</span>
         const propertyTypeMaxLength: number =
 <span class="cstat-no" title="statement not covered" >          Number(</span>
             property.rules
@@ -1590,7 +1601,7 @@ function <span class="fstat-no" title="function not covered" >genFilterTemplate(
           const namespaceArr = <span class="cstat-no" title="statement not covered" >propertyTypeNamespace.split('.');</span>
           const type = <span class="cstat-no" title="statement not covered" >namespaceArr.pop();</span>
 <span class="cstat-no" title="statement not covered" >          if (type === 'enums') {</span>
-            const Enum = <span class="cstat-no" title="statement not covered" >dataSource.app.findNodeByCompleteName(propertyTypeNamespace + '.' + propertyTypeName) as Enum;</span>
+            const Enum = <span class="cstat-no" title="statement not covered" >dataSource.app.findNodeByCompleteName(`${propertyTypeNamespace}.${propertyTypeName}`) as Enum;</span>
 <span class="cstat-no" title="statement not covered" >            formItem += genEnumSelectBlock(Enum, `${vModel}`, '', `请选择${label}`, true);</span>
           } else {
 <span class="cstat-no" title="statement not covered" >            formItem += `&lt;u-input v-model="${vModel}" placeholder="请输入${label}"&gt;&lt;/u-input&gt;`;</span>
@@ -1606,13 +1617,12 @@ function <span class="fstat-no" title="function not covered" >genFilterTemplate(
             &lt;u-button color="primary" @click="${nameGroup.viewLogicReload}"&gt;查 询&lt;/u-button&gt;
         &lt;/u-form-item&gt;
     &lt;/u-form&gt;
-    &lt;/u-linear-layout&gt;
 &nbsp;
-    &lt;u-linear-layout mode="flex" alignment="start" justify="end"&gt;&lt;u-button color="primary" @click="${nameGroup.viewLogicCreate}"&gt;创 建&lt;/u-button&gt;&lt;/u-linear-layout&gt;
+    &lt;u-linear-layout&gt;&lt;u-button color="primary" @click="${nameGroup.viewLogicCreate}"&gt;创 建&lt;/u-button&gt;&lt;/u-linear-layout&gt;
+&lt;/u-linear-layout&gt;
     `;
 }
 &nbsp;
-&nbsp;
 function <span class="fstat-no" title="function not covered" >genSaveModalTemplate(</span>entity: Entity, nameGroup: NameGroup, selectNameGroupMap: Map&lt;string, NameGroup&gt;) {
   const dataSource = <span class="cstat-no" title="statement not covered" >entity.parentNode as DataSource;</span>
   const properties = <span class="cstat-no" title="statement not covered" >entity.properties.filter(filterProperty('inForm'));</span>
@@ -1636,12 +1646,12 @@ function <span class="fstat-no" title="function not covered" >genSaveModalTempla
         }
 <span class="cstat-no" title="statement not covered" >        if (required) <span class="cstat-no" title="statement not covered" >rules.push('required');</span></span>
         const rulesStr = <span class="cstat-no" title="statement not covered" >rules.join(' | ');</span>
-        let formItem = <span class="cstat-no" title="statement not covered" >`&lt;u-form-item ${required ? 'required' : ''}  ${rulesStr.length ? `rules="${rulesStr}"` : ''</span>
-          } layout="center"&gt;&lt;template #label&gt;&lt;u-text text="${label}"&gt;&lt;/u-text&gt;&lt;/template&gt;`;
+        let formItem = <span class="cstat-no" title="statement not covered" >`&lt;u-form-item ${required ? 'required' : ''}  ${</span>
+          rulesStr.length ? `rules="${rulesStr}"` : ''
+        } layout="center"&gt;&lt;template #label&gt;&lt;u-text text="${label}"&gt;&lt;/u-text&gt;&lt;/template&gt;`;
 &nbsp;
         const { typeAnnotation } = <span class="cstat-no" title="statement not covered" >property || {};</span>
-        const { typeNamespace: propertyTypeNamespace } = <span class="cstat-no" title="statement not covered" >typeAnnotation || {};</span>
-        const propertyTypeName = <span class="cstat-no" title="statement not covered" >transEntityMetadataTypes(typeAnnotation, dataSource.app);</span>
+        const { typeName: propertyTypeName, typeNamespace: propertyTypeNamespace } = <span class="cstat-no" title="statement not covered" >typeAnnotation || {};</span>
         const propertyTypeMaxLength: number =
 <span class="cstat-no" title="statement not covered" >          Number(</span>
             property.rules
@@ -1675,32 +1685,40 @@ function <span class="fstat-no" title="function not covered" >genSaveModalTempla
           } else <span class="cstat-no" title="statement not covered" >return '';</span>
         } else <span class="cstat-no" title="statement not covered" >if (propertyTypeName === 'Boolean') {</span>
 <span class="cstat-no" title="statement not covered" >          formItem += `</span>
-                        &lt;u-select clearable v-model="${vModel}" placeholder="请输入${label}" ${property.primaryKey ? `:disabled="${nameGroup.viewVariableIsUpdate}"` : ''
-            }&gt;
+                        &lt;u-select clearable v-model="${vModel}" placeholder="请输入${label}" ${
+                          property.primaryKey ? `:disabled="${nameGroup.viewVariableIsUpdate}"` : ''
+                        }&gt;
                             &lt;u-select-item :value="true" text="是"&gt;&lt;u-text text="是"&gt;&lt;/u-text&gt;&lt;/u-select-item&gt;
                             &lt;u-select-item :value="false" text="否"&gt;&lt;u-text text="否"&gt;&lt;/u-text&gt;&lt;/u-select-item&gt;
                         &lt;/u-select&gt;`;
         } else <span class="cstat-no" title="statement not covered" >if (propertyTypeName === 'Integer' || propertyTypeName === 'Long') {</span>
-<span class="cstat-no" title="statement not covered" >          formItem += `&lt;u-number-input v-model="${vModel}" placeholder="请输入${label}" ${property.primaryKey ? `:disabled="${nameGroup.viewVariableIsUpdate}"` : ''</span>
-            }&gt;&lt;/u-number-input&gt;`;
+<span class="cstat-no" title="statement not covered" >          formItem += `&lt;u-number-input v-model="${vModel}" placeholder="请输入${label}" ${</span>
+            property.primaryKey ? `:disabled="${nameGroup.viewVariableIsUpdate}"` : ''
+          }&gt;&lt;/u-number-input&gt;`;
         } else <span class="cstat-no" title="statement not covered" >if (propertyTypeName === 'Double') {</span>
-<span class="cstat-no" title="statement not covered" >          formItem += `&lt;u-number-input v-model="${vModel}" :precision="0" :step="0" placeholder="请输入${label}" ${property.primaryKey ? `:disabled="${nameGroup.viewVariableIsUpdate}"` : ''</span>
-            }&gt;&lt;/u-number-input&gt;`;
+<span class="cstat-no" title="statement not covered" >          formItem += `&lt;u-number-input v-model="${vModel}" :precision="0" :step="0" placeholder="请输入${label}" ${</span>
+            property.primaryKey ? `:disabled="${nameGroup.viewVariableIsUpdate}"` : ''
+          }&gt;&lt;/u-number-input&gt;`;
         } else <span class="cstat-no" title="statement not covered" >if (propertyTypeName === 'Decimal') {</span>
-<span class="cstat-no" title="statement not covered" >          formItem += `&lt;u-number-input v-model="${vModel}" :precision="0" :step="0" placeholder="请输入${label}" ${property.primaryKey ? `:disabled="${nameGroup.viewVariableIsUpdate}"` : ''</span>
-            }&gt;&lt;/u-number-input&gt;`;
+<span class="cstat-no" title="statement not covered" >          formItem += `&lt;u-number-input v-model="${vModel}" :precision="0" :step="0" placeholder="请输入${label}" ${</span>
+            property.primaryKey ? `:disabled="${nameGroup.viewVariableIsUpdate}"` : ''
+          }&gt;&lt;/u-number-input&gt;`;
         } else <span class="cstat-no" title="statement not covered" >if (propertyTypeName === 'String' &amp;&amp; propertyTypeMaxLength &gt; 256) {</span>
-<span class="cstat-no" title="statement not covered" >          formItem += `&lt;u-textarea v-model="${vModel}" placeholder="请输入${label}" ${property.primaryKey ? `:disabled="${nameGroup.viewVariableIsUpdate}"` : ''</span>
-            }&gt;&lt;/u-textarea&gt;`;
+<span class="cstat-no" title="statement not covered" >          formItem += `&lt;u-textarea v-model="${vModel}" placeholder="请输入${label}" ${</span>
+            property.primaryKey ? `:disabled="${nameGroup.viewVariableIsUpdate}"` : ''
+          }&gt;&lt;/u-textarea&gt;`;
         } else <span class="cstat-no" title="statement not covered" >if (propertyTypeName === 'Date') {</span>
-<span class="cstat-no" title="statement not covered" >          formItem += `&lt;u-date-picker clearable :value.sync="${vModel}" placeholder="请输入${label}" ${property.primaryKey ? `:disabled="${nameGroup.viewVariableIsUpdate}"` : ''</span>
-            }&gt;&lt;/u-date-picker&gt;`;
+<span class="cstat-no" title="statement not covered" >          formItem += `&lt;u-date-picker clearable :value.sync="${vModel}" placeholder="请输入${label}" ${</span>
+            property.primaryKey ? `:disabled="${nameGroup.viewVariableIsUpdate}"` : ''
+          }&gt;&lt;/u-date-picker&gt;`;
         } else <span class="cstat-no" title="statement not covered" >if (propertyTypeName === 'Time') {</span>
-<span class="cstat-no" title="statement not covered" >          formItem += `&lt;u-time-picker :value.sync="${vModel}" placeholder="请输入${label}" ${property.primaryKey ? `:disabled="${nameGroup.viewVariableIsUpdate}"` : ''</span>
-            }&gt;&lt;/u-time-picker&gt;`;
+<span class="cstat-no" title="statement not covered" >          formItem += `&lt;u-time-picker :value.sync="${vModel}" placeholder="请输入${label}" ${</span>
+            property.primaryKey ? `:disabled="${nameGroup.viewVariableIsUpdate}"` : ''
+          }&gt;&lt;/u-time-picker&gt;`;
         } else <span class="cstat-no" title="statement not covered" >if (propertyTypeName === 'DateTime') {</span>
-<span class="cstat-no" title="statement not covered" >          formItem += `&lt;u-date-time-picker clearable :value.sync="${vModel}" placeholder="请输入${label}" ${property.primaryKey ? `:disabled="${nameGroup.viewVariableIsUpdate}"` : ''</span>
-            }&gt;&lt;/u-date-time-picker&gt;`;
+<span class="cstat-no" title="statement not covered" >          formItem += `&lt;u-date-time-picker clearable :value.sync="${vModel}" placeholder="请输入${label}" ${</span>
+            property.primaryKey ? `:disabled="${nameGroup.viewVariableIsUpdate}"` : ''
+          }&gt;&lt;/u-date-time-picker&gt;`;
         } else {
           const namespaceArr = <span class="cstat-no" title="statement not covered" >propertyTypeNamespace.split('.');</span>
           const type = <span class="cstat-no" title="statement not covered" >namespaceArr.pop();</span>
@@ -1708,8 +1726,9 @@ function <span class="fstat-no" title="function not covered" >genSaveModalTempla
             const Enum = <span class="cstat-no" title="statement not covered" >dataSource.app.findNodeByCompleteName(`${propertyTypeNamespace}.${propertyTypeName}`) as Enum;</span>
 <span class="cstat-no" title="statement not covered" >            formItem += genEnumSelectBlock(Enum, `${vModel}`, '', `请选择${label}`, true);</span>
           } else {
-<span class="cstat-no" title="statement not covered" >            formItem += `&lt;u-input v-model="${vModel}" placeholder="请输入${label}" ${property.primaryKey ? `:disabled="${nameGroup.viewVariableIsUpdate}"` : ''</span>
-              }&gt;&lt;/u-input&gt;`;
+<span class="cstat-no" title="statement not covered" >            formItem += `&lt;u-input v-model="${vModel}" placeholder="请输入${label}" ${</span>
+              property.primaryKey ? `:disabled="${nameGroup.viewVariableIsUpdate}"` : ''
+            }&gt;&lt;/u-input&gt;`;
           }
         }
 &nbsp;
@@ -1729,7 +1748,6 @@ function <span class="fstat-no" title="function not covered" >genSaveModalTempla
     &lt;/u-modal&gt;`;
 }
 &nbsp;
-&nbsp;
 function <span class="fstat-no" title="function not covered" >genInitLogic(</span>nameGroup: NameGroup) {
 <span class="cstat-no" title="statement not covered" >  return NaslNode.Logic({</span>
     name: nameGroup.viewLogicInit,
@@ -2013,31 +2031,31 @@ export function <span class="fstat-no" title="function not covered" >genCurdMult
             "concept": "Variable",
             "name": "${nameGroup.viewVariableEntity}",
             "typeAnnotation": ${JSON.stringify(
-    NaslTypeAnnotation.Reference({
-      typeNamespace: entity.getNamespace(),
-      typeName: entity.name,
-    })
-  )}
+              NaslTypeAnnotation.Reference({
+                typeNamespace: entity.getNamespace(),
+                typeName: entity.name,
+              })
+            )}
         },
         {
             "concept": "Variable",
             "name": "${nameGroup.viewVariableInput}",
             "typeAnnotation": ${JSON.stringify(
-    NaslTypeAnnotation.Reference({
-      typeNamespace: entity.getNamespace(),
-      typeName: entity.name,
-    })
-  )}
+              NaslTypeAnnotation.Reference({
+                typeNamespace: entity.getNamespace(),
+                typeName: entity.name,
+              })
+            )}
         },
         {
             "concept": "Variable",
             "name": "${nameGroup.viewVariableFilter}",
             "typeAnnotation": ${JSON.stringify(
-    NaslTypeAnnotation.Reference({
-      typeNamespace: entity.getNamespace(),
-      typeName: entity.name,
-    })
-  )}
+              NaslTypeAnnotation.Reference({
+                typeNamespace: entity.getNamespace(),
+                typeName: entity.name,
+              })
+            )}
         },
         {
             "concept": "Variable",
@@ -2141,31 +2159,31 @@ export function <span class="fstat-no" title="function not covered" >genGridView
             "concept": "Variable",
             "name": "${nameGroup.viewVariableEntity}",
             "typeAnnotation": ${JSON.stringify(
-    NaslTypeAnnotation.Reference({
-      typeNamespace: entity.getNamespace(),
-      typeName: entity.name,
-    })
-  )}
+              NaslTypeAnnotation.Reference({
+                typeNamespace: entity.getNamespace(),
+                typeName: entity.name,
+              })
+            )}
         },
         {
             "concept": "Variable",
             "name": "${nameGroup.viewVariableInput}",
             "typeAnnotation": ${JSON.stringify(
-    NaslTypeAnnotation.Reference({
-      typeNamespace: entity.getNamespace(),
-      typeName: entity.name,
-    })
-  )}
+              NaslTypeAnnotation.Reference({
+                typeNamespace: entity.getNamespace(),
+                typeName: entity.name,
+              })
+            )}
         },
         {
             "concept": "Variable",
             "name": "${nameGroup.viewVariableFilter}",
             "typeAnnotation": ${JSON.stringify(
-    NaslTypeAnnotation.Reference({
-      typeNamespace: entity.getNamespace(),
-      typeName: entity.name,
-    })
-  )}
+              NaslTypeAnnotation.Reference({
+                typeNamespace: entity.getNamespace(),
+                typeName: entity.name,
+              })
+            )}
         },
         {
             "concept": "Variable",
@@ -2221,7 +2239,7 @@ export function <span class="fstat-no" title="function not covered" >genReloadLo
             <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-14T04:42:19.254Z
+                at 2023-10-18T11:36:07.885Z
             </div>
         <script src="../../prettify.js"></script>
         <script>

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

@@ -23,9 +23,9 @@
         <div class='clearfix'>
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">7.92% </span>
+                <span class="strong">7.84% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>8/101</span>
+                <span class='fraction'>8/102</span>
             </div>
         
             
@@ -44,9 +44,9 @@
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">8.51% </span>
+                <span class="strong">8.42% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>8/94</span>
+                <span class='fraction'>8/95</span>
             </div>
         
             
@@ -353,28 +353,7 @@
 <a name='L288'></a><a href='#L288'>288</a>
 <a name='L289'></a><a href='#L289'>289</a>
 <a name='L290'></a><a href='#L290'>290</a>
-<a name='L291'></a><a href='#L291'>291</a>
-<a name='L292'></a><a href='#L292'>292</a>
-<a name='L293'></a><a href='#L293'>293</a>
-<a name='L294'></a><a href='#L294'>294</a>
-<a name='L295'></a><a href='#L295'>295</a>
-<a name='L296'></a><a href='#L296'>296</a>
-<a name='L297'></a><a href='#L297'>297</a>
-<a name='L298'></a><a href='#L298'>298</a>
-<a name='L299'></a><a href='#L299'>299</a>
-<a name='L300'></a><a href='#L300'>300</a>
-<a name='L301'></a><a href='#L301'>301</a>
-<a name='L302'></a><a href='#L302'>302</a>
-<a name='L303'></a><a href='#L303'>303</a>
-<a name='L304'></a><a href='#L304'>304</a>
-<a name='L305'></a><a href='#L305'>305</a>
-<a name='L306'></a><a href='#L306'>306</a>
-<a name='L307'></a><a href='#L307'>307</a>
-<a name='L308'></a><a href='#L308'>308</a>
-<a name='L309'></a><a href='#L309'>309</a>
-<a name='L310'></a><a href='#L310'>310</a>
-<a name='L311'></a><a href='#L311'>311</a>
-<a name='L312'></a><a href='#L312'>312</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">1x</span>
+<a name='L291'></a><a href='#L291'>291</a></td><td class="line-coverage quiet"><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>
@@ -441,6 +420,7 @@
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</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>
@@ -512,12 +492,6 @@
 <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-neutral">&nbsp;</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>
-<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-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
@@ -529,16 +503,6 @@
 <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-neutral">&nbsp;</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>
-<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-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</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-neutral">&nbsp;</span>
@@ -557,12 +521,6 @@
 <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-neutral">&nbsp;</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>
-<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-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
@@ -697,7 +655,7 @@ import {
   genLogicParam,
   genEnumSelectBlock,
 } from '.';
-import { NaslUITypeAnnotation, NaslLogicItem, NaslNode, getDecimalInfo, transEntityMetadataTypes } from './utils';
+import { NaslUITypeAnnotation, NaslLogicItem, NaslNode } from './utils';
 &nbsp;
 /**
  * 根据实体属性生成表格列模板
@@ -730,8 +688,8 @@ export function <span class="fstat-no" title="function not covered" >genEditTabl
     const label = <span class="cstat-no" title="statement not covered" >property.label || property.name;</span>
     let formItem = <span class="cstat-no" title="statement not covered" >'';</span>
 &nbsp;
+    const propertyTypeName = <span class="cstat-no" title="statement not covered" >property.typeAnnotation.typeName;</span>
     const propertyTypeNamespace = <span class="cstat-no" title="statement not covered" >property.typeAnnotation.typeNamespace;</span>
-    const propertyTypeName = <span class="cstat-no" title="statement not covered" >transEntityMetadataTypes(property.typeAnnotation, dataSource.app);</span>
     const propertyTypeMaxLength: number =
 <span class="cstat-no" title="statement not covered" >      Number(</span>
         property.rules
@@ -751,6 +709,7 @@ export function <span class="fstat-no" title="function not covered" >genEditTabl
           const key = <span class="cstat-no" title="statement not covered" >[property.name, relationEntity.name].join('-');</span>
           const selectNameGroup = <span class="cstat-no" title="statement not covered" >selectNameGroupMap.get(key);</span>
           let dataSourceValue = <span class="cstat-no" title="statement not covered" >`(params) =&gt; ${selectNameGroup.logic}(elements.$ce.page, elements.$ce.size)`</span>
+<span class="cstat-no" title="statement not covered" >          debugger</span>
 <span class="cstat-no" title="statement not covered" >          formItem += `</span>
                         &lt;u-select clearable placeholder="请选择${label}" :data-source="${dataSourceValue}" :page-size="50"
                             :autofocus="true" :opened="true" append-to="body" @blur="${nameGroup.viewLogicBlurUpdate}" @select="${nameGroup.viewLogicBlurUpdate}"
@@ -814,12 +773,6 @@ export function <span class="fstat-no" title="function not covered" >genEditTabl
             ${getText(property)}
         &lt;/u-linear-layout&gt;
     &lt;/template&gt;
-    &lt;template #expander="current"&gt;
-        &lt;u-table-view-expander
-            :item="current.item"
-            @toggle="current.toggle"&gt;
-        &lt;/u-table-view-expander&gt;
-    &lt;/template&gt;
     ${genEditComponent(property)}
 &lt;/u-table-view-column&gt;`;
 }
@@ -829,7 +782,7 @@ export function <span class="fstat-no" title="function not covered" >genEditTabl
  * @param entity 实体
  * @param nameGroup 命名组
  */
-export function <span class="fstat-no" title="function not covered" >genEditTableTemplate(</span>entity: Entity, nameGroup: NameGroup, newLogic: any, selectNameGroupMap?: Map&lt;string, NameGroup&gt;, entryFromCall?: string) {
+export function <span class="fstat-no" title="function not covered" >genEditTableTemplate(</span>entity: Entity, nameGroup: NameGroup, newLogic: any, selectNameGroupMap?: Map&lt;string, NameGroup&gt;, entryFromCall?:string) {
   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>
 <span class="cstat-no" title="statement not covered" >  if (['genCurdEditMultipleKeyBlock'].includes(entryFromCall)) {</span>
@@ -838,33 +791,17 @@ export function <span class="fstat-no" title="function not covered" >genEditTabl
 <span class="cstat-no" title="statement not covered" >  return `&lt;u-table-view ref="${nameGroup.viewElementMainView}" :data-source="${dataSourceValue}" data-schema="${nameGroup.structure}"</span>
         value-field="${nameGroup.viewVariableEntity}.id"
         :pagination="true" :show-sizer="true" :page-size="20" :page-number="1" :default-column-width="300" editable&gt;
-    &lt;u-table-view-column type="index" width="60"&gt;
-        &lt;template #title&gt;&lt;u-text text="序号"&gt;&lt;/u-text&gt;&lt;/template&gt;
-        &lt;template #cell="current"&gt;&lt;/template&gt;
-        &lt;template #expander="current"&gt;
-            &lt;u-table-view-expander
-                :item="current.item"
-                @toggle="current.toggle"&gt;
-            &lt;/u-table-view-expander&gt;
-        &lt;/template&gt;
-    &lt;/u-table-view-column&gt;
-&nbsp;
+    &lt;u-table-view-column type="index" width="60"&gt;&lt;template #title&gt;&lt;u-text text="序号"&gt;&lt;/u-text&gt;&lt;/template&gt;&lt;template #cell="current"&gt;&lt;/template&gt;&lt;/u-table-view-column&gt;
 &nbsp;
     ${properties.map(<span class="fstat-no" title="function not covered" >(p</span>roperty) =&gt; <span class="cstat-no" title="statement not covered" >`${genEditTableColumnTemplate(entity, property, nameGroup, selectNameGroupMap)}\n`)</span>.join('')}
 &nbsp;
     &lt;u-table-view-column&gt;
-        &lt;template #title&gt;&lt;u-text text="操作"&gt;&lt;/u-text&gt;&lt;/template&gt;
+    &lt;template #title&gt;&lt;u-text text="操作"&gt;&lt;/u-text&gt;&lt;/template&gt;
         &lt;template #cell="current"&gt;
             &lt;u-linear-layout gap="small"&gt;
                 &lt;u-link @click="${nameGroup.viewLogicRemove}"&gt;删除&lt;/u-link&gt;
             &lt;/u-linear-layout&gt;
         &lt;/template&gt;
-        &lt;template #expander="current"&gt;
-            &lt;u-table-view-expander
-                :item="current.item"
-                @toggle="current.toggle"&gt;
-            &lt;/u-table-view-expander&gt;
-        &lt;/template&gt;
     &lt;/u-table-view-column&gt;
 &lt;/u-table-view&gt;
 `;
@@ -1003,7 +940,7 @@ export function <span class="fstat-no" title="function not covered" >genBlurUpda
             <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-14T04:42:19.254Z
+                at 2023-10-18T11:36:07.885Z
             </div>
         <script src="../../prettify.js"></script>
         <script>

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

@@ -163,7 +163,7 @@ export default genEnumSelectBlock;
             <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-14T04:42:19.254Z
+                at 2023-10-18T11:36:07.885Z
             </div>
         <script src="../../prettify.js"></script>
         <script>

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

@@ -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-14T04:42:19.254Z
+                at 2023-10-18T11:36:07.885Z
             </div>
         <script src="../../prettify.js"></script>
         <script>

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

@@ -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-14T04:42:19.254Z
+                at 2023-10-18T11:36:07.885Z
             </div>
         <script src="../../prettify.js"></script>
         <script>

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

@@ -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-14T04:42:19.254Z
+                at 2023-10-18T11:36:07.885Z
             </div>
         <script src="../../prettify.js"></script>
         <script>

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

@@ -1192,7 +1192,7 @@ export function <span class="fstat-no" title="function not covered" >genEditQuer
             <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-14T04:42:19.254Z
+                at 2023-10-18T11:36:07.885Z
             </div>
         <script src="../../prettify.js"></script>
         <script>