@lcap/nasl 2.14.0 → 2.15.1

package/src/templator/genCurdEditMultipleKeyBlock.ts

@@ -38,7 +38,7 @@ function genFilterTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroup
         .map((property) => {
             const vModel = `${nameGroup.viewVariableFilter}.${property.name}`;
             const label = property.label || property.name;
-            let formItem = `<u-form-item label="${label}">`;
+            let formItem = `<u-form-item><template #label><u-text text="${label}"></u-text></template>`;
 
             const { typeAnnotation } = property || {};
             const { typeName: propertyTypeName, typeNamespace: propertyTypeNamespace } = typeAnnotation || {};
@@ -65,8 +65,8 @@ function genFilterTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroup
             } else if (propertyTypeName === 'Boolean') {
                 formItem += `
                         <u-select clearable v-model="${vModel}" placeholder="请输入${label}">
-                            <u-select-item :value="true" text="是">是</u-select-item>
-                            <u-select-item :value="false" text="否">否</u-select-item>
+                            <u-select-item :value="true" text="是"><u-text text="是"></u-text></u-select-item>
+                            <u-select-item :value="false" text="否"><u-text text="否"></u-text></u-select-item>
                         </u-select>
                     `;
             } else if (propertyTypeName === 'Integer' || propertyTypeName === 'Long') {
@@ -134,10 +134,9 @@ function genSaveModalTemplate(entity: Entity, nameGroup: NameGroup, selectNameGr
             const rulesStr = rules.join(' | ');
 
             let formItem = `<u-form-item
-                                    label="${label}"
                                     ${required ? 'required' : ''}
                                     ${rulesStr.length ? `rules="${rulesStr}"` : ''}
-                                >`;
+                                ><template #label><u-text text="${label}"></u-text></template>`;
 
             const { typeAnnotation } = property || {};
             const { typeName: propertyTypeName, typeNamespace: propertyTypeNamespace } = typeAnnotation || {};
@@ -264,8 +263,6 @@ function genCreateLogic(nameGroup: NameGroup) {
     });
 }
 
-
-
 export function genCurdEditMultipleKeyBlock(entity: Entity, oldNode: ViewElement) {
     const view = oldNode.view;
     const dataSource = entity.parentNode as DataSource;

package/src/templator/genCurdMultipleKeyBlock.ts

@@ -28,7 +28,7 @@ function genFilterTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroup
         .map((property) => {
             const vModel = `${nameGroup.viewVariableFilter}.${property.name}`;
             const label = property.label || property.name;
-            let formItem = `<u-form-item label="${label}">`;
+            let formItem = `<u-form-item><template #label><u-text text="${label}"></u-text></template>`;
 
             const { typeAnnotation } = property || {};
             const {
@@ -126,7 +126,7 @@ function genSaveModalTemplate(entity: Entity, nameGroup: NameGroup, selectNameGr
             if (required)
                 rules.push('required');
             const rulesStr = rules.join(' | ');
-            let formItem = `<u-form-item label="${label}" ${required ? 'required' : ''}  ${rulesStr.length ? `rules="${rulesStr}"` : ''}>`;
+            let formItem = `<u-form-item ${required ? 'required' : ''}  ${rulesStr.length ? `rules="${rulesStr}"` : ''}><template #label><u-text text="${label}"></u-text></template>`;
 
             const { typeAnnotation } = property || {};
             const {
@@ -162,8 +162,8 @@ function genSaveModalTemplate(entity: Entity, nameGroup: NameGroup, selectNameGr
             } else if (propertyTypeName === 'Boolean') {
                 formItem += `
                         <u-select clearable v-model="${vModel}" placeholder="请输入${label}" ${property.primaryKey ? `:disabled="${nameGroup.viewVariableIsUpdate}"` : ''}>
-                            <u-select-item :value="true" text="是">是</u-select-item>
-                            <u-select-item :value="false" text="否">否</u-select-item>
+                            <u-select-item :value="true" text="是"><u-text text="是"></u-text></u-select-item>
+                            <u-select-item :value="false" text="否"><u-text text="否"></u-text></u-select-item>
                         </u-select>`;
             } else if (propertyTypeName === 'Integer' || propertyTypeName === 'Long') {
                 formItem += `<u-number-input v-model="${vModel}" placeholder="请输入${label}" ${property.primaryKey ? `:disabled="${nameGroup.viewVariableIsUpdate}"` : ''}></u-number-input>`;

package/src/templator/genEditTableBlock.ts

@@ -98,7 +98,8 @@ export function genEditTableColumnTemplate(entity: Entity, property: EntityPrope
         </template>`;
     };
 
-    return `<u-table-view-column title="${title}" field="${utils.firstLowerCase(entity.name)}.${property.name}" ${canEditable(property) ? 'type="editable"' : ''}>
+    return `<u-table-view-column field="${utils.firstLowerCase(entity.name)}.${property.name}" ${canEditable(property) ? 'type="editable"' : ''}>
+    <template #title><u-text text="${title}"></u-text></template>
     <template #cell="scope">
         <u-linear-layout gap="small">
             ${getText(property)}
@@ -119,11 +120,12 @@ export function genEditTableTemplate(entity: Entity, nameGroup: NameGroup, selec
     return `<u-table-view ref="${nameGroup.viewElementMainView}" :data-source="${nameGroup.viewLogicLoad}" data-schema="${nameGroup.structure}"
         value-field="${nameGroup.viewVariableEntity}.id"
         :pageable="true" :remote-paging="true" :show-sizer="true" :default-column-width="300" editable>
-    <u-table-view-column type="index" width="60" title="序号"></u-table-view-column>
+    <u-table-view-column type="index" width="60"><template #title><u-text text="序号"></u-text></template></u-table-view-column>
 
     ${properties.map((property) => genEditTableColumnTemplate(entity, property, nameGroup, selectNameGroupMap) + '\n').join('')}
 
-    <u-table-view-column title="操作">
+    <u-table-view-column>
+    <template #title><u-text text="操作"></u-text></template>
         <template #cell="scope">
             <u-linear-layout gap="small">
                 <u-link @click="${nameGroup.viewLogicRemove}">删除</u-link>

package/src/templator/genGetBlock.ts

@@ -8,10 +8,11 @@ export function genGetTemplate(entity: Entity, nameGroup: NameGroup) {
     const properties = entity.properties.filter(filterProperty('inDetail'));
 
     return `<u-info-list>
-    <u-info-list-group title="基本信息">
+    <u-info-list-group>
+    <template #title><u-text text="基本信息"></u-text></template>
     ${properties
         .map((property) => {
-            let formItem = `            <u-info-list-item label="${property.label || property.name}">`;
+            let formItem = `            <u-info-list-item><template #label><u-text text="${property.label || property.name}"></u-text></template>`;
 
             formItem += '<u-text :text="' + getExpression(property, `${nameGroup.viewVariableEntity}.${property.name}`) + '"></u-text>';
 

package/src/templator/genTableBlock.ts

@@ -48,7 +48,8 @@ export function genTableColumnTemplate(property: EntityProperty, scope?: string)
         }
     };
 
-    return `<u-table-view-column title="${title}" field="${lowerEntityName}.${property.name}">
+    return `<u-table-view-column field="${lowerEntityName}.${property.name}">
+    <template #title><u-text text="${title}"></u-text></template>
     <template #cell="${scopeName}">
         <u-linear-layout gap="small">
             ${getText(property)}
@@ -69,11 +70,12 @@ export function genTableTemplate(entity: Entity, nameGroup: NameGroup, modifyabl
     return `<u-table-view ref="${nameGroup.viewElementMainView}" :data-source="${nameGroup.viewLogicLoad}" data-schema="${nameGroup.structure}"
         value-field="${nameGroup.viewVariableEntity}.id"
         :pageable="true" :remote-paging="true" :show-sizer="true">
-    <u-table-view-column type="index" width="60" title="序号"></u-table-view-column>
+    <u-table-view-column type="index" width="60"><template #title><u-text text="序号"></u-text></template></u-table-view-column>
 
     ${properties.map((property) => genTableColumnTemplate(property, scopeName) + '\n').join('')}
 
     <u-table-view-column title="操作">
+        <template #title><u-text text="操作"></u-text></template>
         <template #cell="${scopeName}">
             <u-linear-layout gap="small">
                 <u-link ${modifyable ? `@click="${nameGroup.viewLogicModify || 'modify'}"` : ''}>修改</u-link>

package/src/templator/genUpdateBlock.ts

@@ -34,7 +34,7 @@ export function genUpdateFormTemplate(entity: Entity, nameGroup: NameGroup, sele
                 rules.push('required');
             const rulesStr = rules.join(' | ');
 
-            let formItem = `            <u-form-item label="${label}"${required ? ' required' : ''}${rulesStr.length ? ` rules="${rulesStr}"` : ''}>\n`;
+            let formItem = `            <u-form-item ${required ? ' required' : ''}${rulesStr.length ? ` rules="${rulesStr}"` : ''}><template #label><u-text text="${label}"></u-text></template>\n`;
 
             const { typeAnnotation } = property || {};
             const { typeName: propertyTypeName, typeNamespace: propertyTypeNamespace } = typeAnnotation || {};