@lcap/nasl 3.3.0-alpha.2 → 3.3.0-alpha.3

package/src/templator/genSelectBlock.ts

@@ -10,10 +10,11 @@ import { NaslUITypeAnnotation, NaslCollectionTypeAnnotation, NaslLogicItem, Nasl
  * @param nameGroup
  * @returns
  */
-export function genSelectTemplate(property: EntityProperty, nameGroup: NameGroup) {
-  return `<u-select clearable placeholder="请选择" ref="${nameGroup.viewElementMainView}" :data-source="${nameGroup.viewLogicLoad}" data-schema="${nameGroup.structure}"
+export function genSelectTemplate(property: EntityProperty, nameGroup: NameGroup, newLogic: any) {
+  let dataSourceValue = `(params) => ${newLogic.name}(elements.$ce.page, elements.$ce.size)`
+  return `<u-select clearable placeholder="请选择" ref="${nameGroup.viewElementMainView}" :data-source="${dataSourceValue}" :page-size="50" data-schema="${nameGroup.structure}"
     text-field="${nameGroup.lowerEntity}.${property.name}"
-    value-field="${nameGroup.lowerEntity}.id" :pageable="true" :remote-paging="true">
+    value-field="${nameGroup.lowerEntity}.id" :pagination="true">
 </u-select>`;
 }
 
@@ -23,9 +24,10 @@ export function genSelectTemplate(property: EntityProperty, nameGroup: NameGroup
  * @param nameGroup
  * @returns
  */
-export function genH5SelectTemplate(property: EntityProperty, nameGroup: NameGroup) {
+export function genH5SelectTemplate(property: EntityProperty, nameGroup: NameGroup, newLogic: any) {
   const label = property.label || property.name;
-  return `<van-pickerson type="list" :show-toolbar="true" title="请选择" placeholder="请选择" ref="${nameGroup.viewElementMainView}" :data-source="${nameGroup.viewLogicLoad}" data-schema="${nameGroup.structure}"
+  let dataSourceValue = `(params) => ${newLogic.name}(elements.$ce.page, elements.$ce.size)`
+  return `<van-pickerson type="list" :show-toolbar="true" title="请选择" placeholder="请选择" ref="${nameGroup.viewElementMainView}" :data-source="${dataSourceValue}" :page-size="50" data-schema="${nameGroup.structure}"
     text-field="${nameGroup.lowerEntity}.${property.name}"
     value-field="${nameGroup.lowerEntity}.id" :pageable="true" :remote-paging="true">
     <template #title>${label}</template>
@@ -92,7 +94,7 @@ export function genSelectBlock(entity: Entity, oldNode: ViewElement) {
   const newLogics: Array<any> = [newLogic];
 
   return `<template>
-    ${config.scope === 'h5' ? genH5SelectTemplate(displayedProperty, nameGroup) : genSelectTemplate(displayedProperty, nameGroup)}
+    ${config.scope === 'h5' ? genH5SelectTemplate(displayedProperty, nameGroup, newLogic) : genSelectTemplate(displayedProperty, nameGroup, newLogic)}
 </template>
 
 <definition>

package/src/templator/genTableBlock.ts

@@ -56,13 +56,16 @@ export function genTableColumnTemplate(property: EntityProperty, currentName: st
  * @param entity 实体
  * @param nameGroup 命名组
  */
-export function genTableTemplate(entity: Entity, nameGroup: NameGroup, modifyable?: boolean) {
+export function genTableTemplate(entity: Entity, nameGroup: NameGroup,newLogic: any, modifyable?: boolean, entryFromCall?: string) {
   const currentName = nameGroup.currentName || 'current';
   const properties = entity.properties.filter(filterProperty('inTable'));
-
-  return `<u-table-view ref="${nameGroup.viewElementMainView}" :data-source="${nameGroup.viewLogicLoad}" data-schema="${nameGroup.structure}"
+  let dataSourceValue = `(params) => ${newLogic.name}(elements.$ce.page, elements.$ce.size,elements.$ce.sort,elements.$ce.order)`;
+  if (['genCurdMultipleKeyBlock'].includes(entryFromCall)) {
+    dataSourceValue = `(params) => ${newLogic.name}(elements.$ce.page, elements.$ce.size,elements.$ce.sort,elements.$ce.order,${nameGroup.viewVariableFilter})`;
+  }
+  return `<u-table-view ref="${nameGroup.viewElementMainView}" :data-source="${dataSourceValue}" data-schema="${nameGroup.structure}"
         value-field="${nameGroup.viewVariableEntity}.id"
-        :pagination="true" :show-sizer="true">
+        :pagination="true" :show-sizer="true" :page-size="20" :page-number="1">
     <u-table-view-column type="index" width="60"><template #title><u-text text="序号"></u-text></template><template #cell="current"></template></u-table-view-column>
 
     ${properties.map((property) => `${genTableColumnTemplate(property, currentName)}\n`).join('')}
@@ -205,7 +208,7 @@ export function genTableBlock(entity: Entity, oldNode: ViewElement) {
 
   return `
 <template>
-    ${genTableTemplate(entity, nameGroup)}
+    ${genTableTemplate(entity, nameGroup, entityLogic)}
 </template>
 <definition>
 {
@@ -250,12 +253,10 @@ export function genTableColumnBlock(property: EntityProperty, oldNode: ViewEleme
   const allEntities = [...entitySet];
   const entityLogic = genQueryLogic(allEntities, nameGroup, false, true, module);
   newLogics.push(entityLogic);
-
+  let dataSourceValue = `(params) => ${entityLogic.name}(elements.$ce.page, elements.$ce.size,elements.$ce.sort,elements.$ce.order)`;
   return `
 <template>
-    <u-table-view ref="${nameGroup.viewElementMainView}" :data-source="${
-      nameGroup.viewLogicLoad
-    }" :pagination="true" :show-sizer="true" data-schema="${nameGroup.structure}">
+    <u-table-view ref="${nameGroup.viewElementMainView}" :data-source="${dataSourceValue}" :pagination="true" :page-size="20" :page-number="1" :show-sizer="true" data-schema="${nameGroup.structure}">
         ${properties.map((property) => `${genTableColumnTemplate(property)}\n`).join('')}
     </u-table-view>
 </template>

package/src/templator/genUpdateBlock.ts

@@ -55,9 +55,10 @@ export function genUpdateFormTemplate(entity: Entity, nameGroup: NameGroup, sele
               // 存在多个属性关联同一个实体的情况，因此加上属性名用以唯一标识
               const key = [property.name, relationEntity.name].join('-');
               const selectNameGroup = selectNameGroupMap.get(key);
+              let dataSourceValue = `(params) => ${selectNameGroup.logic}(elements.$ce.page, elements.$ce.size)`
               formItem += `
-                        <u-select clearable placeholder="请选择${label}" :data-source="${selectNameGroup.viewLogicLoad}"
-                            text-field="${lowerEntityName}.${displayedProperty.name}" value-field="${lowerEntityName}.${relationProperty.name}" :pageable="true" :remote-paging="true" v-model="${vModel}">
+                        <u-select clearable placeholder="请选择${label}" :data-source="${dataSourceValue}" :page-size="50"
+                            text-field="${lowerEntityName}.${displayedProperty.name}" value-field="${lowerEntityName}.${relationProperty.name}" :pagination="true" v-model="${vModel}">
                         </u-select>
                     `;
             } else return '';
@@ -137,9 +138,10 @@ export function genH5UpdateFormTemplate(entity: Entity, nameGroup: NameGroup, se
               // 存在多个属性关联同一个实体的情况，因此加上属性名用以唯一标识
               const key = [property.name, relationEntity.name].join('-');
               const selectNameGroup = selectNameGroupMap.get(key);
+              let dataSourceValue = `(params) => ${selectNameGroup.logic}(elements.$ce.page, elements.$ce.size)`
               formItem += `
                         <template #input><van-linear-layout style="width:100%;" direction="horizontal"><van-pickerson type="list" :show-toolbar="true" title="请选择${label}" placeholder="请选择${label}"
-                            v-model="${vModel}" :data-source="${selectNameGroup.viewLogicLoad}"
+                            v-model="${vModel}" :data-source="${dataSourceValue}" :page-size="50"
                             text-field="${lowerEntityName}.${displayedProperty.name}" value-field="${lowerEntityName}.${relationProperty.name}"
                             :notitleblock="true"
                             :pageable="true" input-align="left" :remote-paging="true"></van-pickerson></van-linear-layout></template>

package/test/concepts/validation-rule/__snapshots__/toEmbeddedTS.spec.ts.snap

@@ -1,5 +1,16 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`validation-rule:toEmbeddedTS argument-without-keyword 1`] = `
+"__IDENTIFIER__;
+nasl.validation.max(new nasl.core.Long(10));
+"
+`;
+
+exports[`validation-rule:toEmbeddedTS empty-rule 1`] = `
+"__ValidationRule__;
+"
+`;
+
 exports[`validation-rule:toEmbeddedTS with-param-with-target 1`] = `
 "filter.id;
 nasl.validation.max(new nasl.core.Long(10));

package/test/concepts/validation-rule/__snapshots__/toJS.spec.ts.snap

@@ -1,5 +1,15 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`validation-rule:toJS argument-without-keyword 1`] = `
+"({ validate: \\"max\\", args: [10], trigger: \\"input+blur\\", message: undefined });
+"
+`;
+
+exports[`validation-rule:toJS empty-rule 1`] = `
+"({ validate: \\"undefined\\", trigger: \\"input+blur\\", message: undefined });
+"
+`;
+
 exports[`validation-rule:toJS with-param-with-target 1`] = `
 "({ validate: \\"max\\", args: [10], trigger: \\"input+blur\\", message: undefined });
 "

package/test/concepts/validation-rule/fixtures/argument-without-keyword.json

@@ -0,0 +1,34 @@
+{
+    "concept": "ValidationRule",
+    "changedTime": 1691065082931,
+    "name": "",
+    "label": "验证规则",
+    "folded": false,
+    "calleeNamespace": "nasl.validation",
+    "calleeName": "max",
+    "arguments": [
+        {
+            "concept": "Argument",
+            "name": "",
+            "folded": false,
+            "keyword": "",
+            "expression": {
+                "concept": "NumericLiteral",
+                "name": "",
+                "folded": false,
+                "value": "10",
+                "typeAnnotation": {
+                    "concept": "TypeAnnotation",
+                    "name": "",
+                    "typeKind": "primitive",
+                    "typeNamespace": "nasl.core",
+                    "typeName": "Long",
+                    "typeArguments": null,
+                    "returnType": null,
+                    "properties": null
+                }
+            }
+        }
+    ],
+    "enableServerValidation": true
+}

package/test/concepts/validation-rule/fixtures/empty-rule.json

@@ -0,0 +1,9 @@
+{
+    "concept": "ValidationRule",
+    "changedTime": 1693486586612,
+    "name": "",
+    "label": "验证规则",
+    "folded": false,
+    "arguments": [],
+    "enableServerValidation": true
+}

package/test/concepts/validation-rule/validation-rule.spec.ts

@@ -0,0 +1,15 @@
+import { expect } from 'chai';
+import type { ValidationRule } from '../../../out';
+import { readFixture, getNodeByData } from '../utils';
+import { ConceptName } from './constant';
+
+describe(ConceptName, () => {
+    it('The missing "keyword" props in the validation function argument should be filled after generating the ts file.', () => {
+        const data = readFixture(ConceptName, 'argument-without-keyword');
+        const node = getNodeByData<ValidationRule>(data);
+        expect(node.arguments.length).to.eq(1);
+        expect(Boolean(node.arguments[0].keyword)).to.false;
+        node.toEmbeddedTS();
+        expect(node.arguments[0].keyword).to.eq('max');
+    });
+});