@lcap/nasl 3.7.0-alpha.1 → 3.7.0-beta.1

package/src/templator/genCreateBlock.ts

@@ -57,15 +57,15 @@ export function genCreateFormTemplate(entity: Entity, nameGroup: NameGroup, sele
               const selectNameGroup = selectNameGroupMap.get(key);
               let dataSourceValue = `(params) => ${selectNameGroup.logic}(elements.$ce.page, elements.$ce.size)`
               formItem += `
-                        <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 :clearable="true" placeholder="请选择${label}" :dataSource="${dataSourceValue}" :pageSize="50"
+                            textField="${lowerEntityName}.${displayedProperty.name}" valueField="${lowerEntityName}.${relationProperty.name}" :pagination="true" v-model="${vModel}">
                         </u-select>
                     `;
             } else return '';
           } else return '';
         } else if (propertyTypeName === 'Boolean') {
           formItem += `
-                <u-select clearable v-model="${vModel}" placeholder="请输入${label}">
+                <u-select :clearable="true" 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>
@@ -79,11 +79,11 @@ export function genCreateFormTemplate(entity: Entity, nameGroup: NameGroup, sele
         } else if (propertyTypeName === 'String' && propertyTypeMaxLength > 256) {
           formItem += `<u-textarea v-model="${vModel}" placeholder="请输入${label}"></u-textarea>`;
         } else if (propertyTypeName === 'Date') {
-          formItem += `<u-date-picker clearable :value.sync="${vModel}" placeholder="请输入${label}"></u-date-picker>`;
+          formItem += `<u-date-picker :clearable="true" :value.sync="${vModel}" placeholder="请输入${label}"></u-date-picker>`;
         } else if (propertyTypeName === 'Time') {
           formItem += `<u-time-picker :value.sync="${vModel}" placeholder="请输入${label}"></u-time-picker>`;
         } else if (propertyTypeName === 'DateTime') {
-          formItem += `<u-date-time-picker clearable :value.sync="${vModel}" placeholder="请输入${label}"></u-date-time-picker>`;
+          formItem += `<u-date-time-picker :clearable="true" :value.sync="${vModel}" placeholder="请输入${label}"></u-date-time-picker>`;
         } else {
           const namespaceArr = propertyTypeNamespace.split('.');
           const type = namespaceArr.pop();
@@ -138,22 +138,22 @@ export function genH5CreateFormTemplate(entity: Entity, nameGroup: NameGroup, se
               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="${dataSourceValue}" :page-size="50"
-                            text-field="${lowerEntityName}.${displayedProperty.name}" value-field="${lowerEntityName}.${relationProperty.name}"
+                        <template #input><van-linear-layout style="width:100%;" direction="horizontal"><van-pickerson type="list" :showToolbar="true" title="请选择${label}" placeholder="请选择${label}"
+                            v-model="${vModel}" :dataSource="${dataSourceValue}" :pageSize="50"
+                            textField="${lowerEntityName}.${displayedProperty.name}" valueField="${lowerEntityName}.${relationProperty.name}"
                             :notitleblock="true"
-                            :pageable="true" input-align="left" :remote-paging="true">
+                            :pageable="true" inputAlign="left" :remotePaging="true">
                             <template #pannel-title>
                             <van-text text="请选择${label}"></van-text>
                           </template>
                           <template #picker-top>
-                            <van-picker-action-slot target-method="cancel">
+                            <van-picker-action-slot targetMethod="cancel">
                               <van-iconv name="left-arrow" icotype="only"></van-iconv>
                             </van-picker-action-slot>
-                            <van-picker-action-slot target-method="confirm"></van-picker-action-slot>
+                            <van-picker-action-slot targetMethod="confirm"></van-picker-action-slot>
                           </template>
                           <template #picker-bottom>
-                            <van-picker-action-slot target-method="cancel">
+                            <van-picker-action-slot targetMethod="cancel">
                               <van-button
                                 type="info_secondary"
                                 size="normal"
@@ -161,7 +161,7 @@ export function genH5CreateFormTemplate(entity: Entity, nameGroup: NameGroup, se
                                 squareroud="round"
                               ></van-button>
                             </van-picker-action-slot>
-                            <van-picker-action-slot target-method="confirm">
+                            <van-picker-action-slot targetMethod="confirm">
                               <van-button
                                 type="info"
                                 size="normal"
@@ -188,13 +188,13 @@ export function genH5CreateFormTemplate(entity: Entity, nameGroup: NameGroup, se
           formItem += `<template #input><van-linear-layout style="width:100%;" direction="horizontal"><van-fieldtextarea v-model="${vModel}" placeholder="请输入${property.label || property.name
             }"></van-fieldtextarea></van-linear-layout></template>`;
         } else if (propertyTypeName === 'Date') {
-          formItem += `<template #input><van-linear-layout style="width:100%;" direction="horizontal"><van-calendar :value.sync="${vModel}" title="选择日期" input-align="left"></van-calendar></van-linear-layout></template>`;
+          formItem += `<template #input><van-linear-layout style="width:100%;" direction="horizontal"><van-calendar :value.sync="${vModel}" title="选择日期" inputAlign="left"></van-calendar></van-linear-layout></template>`;
         } else if (propertyTypeName === 'Time') {
           formItem += `<template #input><van-linear-layout style="width:100%;" direction="horizontal"><van-datetime-picker type="time" v-model="${vModel}" title="请选择${property.label || property.name
-            }" label-field="" input-align="left"></van-datetime-picker></van-linear-layout></template>`;
+            }" labelField="" inputAlign="left"></van-datetime-picker></van-linear-layout></template>`;
         } else if (propertyTypeName === 'DateTime') {
           formItem += `<template #input><van-linear-layout style="width:100%;" direction="horizontal"><van-datetime-picker type="datetime" v-model="${vModel}" title="请选择${property.label || property.name
-            }" label-field="" input-align="left"></van-datetime-picker></van-linear-layout></template>`;
+            }" labelField="" inputAlign="left"></van-datetime-picker></van-linear-layout></template>`;
         } else {
           const namespaceArr = propertyTypeNamespace.split('.');
           const type = namespaceArr.pop();

package/src/templator/genCurdEditMultipleKeyBlock.ts

@@ -60,15 +60,15 @@ function genFilterTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroup
               const selectNameGroup = selectNameGroupMap.get(key);
               let dataSourceValue = `(params) => ${selectNameGroup.logic}(elements.$ce.page, elements.$ce.size)`
               formItem += `
-                        <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 :clearable="true" placeholder="请选择${label}" :dataSource="${dataSourceValue}" :pageSize="50"
+                            textField="${lowerEntityName}.${displayedProperty.name}" valueField="${lowerEntityName}.${relationProperty.name}" :pagination="true" v-model="${vModel}">
                         </u-select>
                     `;
             } else return '';
           } else return '';
         } else if (propertyTypeName === 'Boolean') {
           formItem += `
-                        <u-select clearable v-model="${vModel}" placeholder="请输入${label}">
+                        <u-select :clearable="true" v-model="${vModel}" placeholder="请输入${label}">
                             <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>
@@ -82,11 +82,11 @@ function genFilterTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroup
         } else if (propertyTypeName === 'String' && propertyTypeMaxLength > 256) {
           formItem += `<u-textarea v-model="${vModel}" placeholder="请输入${label}"></u-textarea>`;
         } else if (propertyTypeName === 'Date') {
-          formItem += `<u-date-picker clearable :value.sync="${vModel}" placeholder="请输入${label}"></u-date-picker>`;
+          formItem += `<u-date-picker :clearable="true" :value.sync="${vModel}" placeholder="请输入${label}"></u-date-picker>`;
         } else if (propertyTypeName === 'Time') {
           formItem += `<u-time-picker :value.sync="${vModel}" placeholder="请输入${label}"></u-time-picker>`;
         } else if (propertyTypeName === 'DateTime') {
-          formItem += `<u-date-time-picker clearable :value.sync="${vModel}" placeholder="请输入${label}"></u-date-time-picker>`;
+          formItem += `<u-date-time-picker :clearable="true" :value.sync="${vModel}" placeholder="请输入${label}"></u-date-time-picker>`;
         } else {
           const namespaceArr = propertyTypeNamespace.split('.');
           const type = namespaceArr.pop();
@@ -164,15 +164,15 @@ function genSaveModalTemplate(entity: Entity, nameGroup: NameGroup, selectNameGr
               const selectNameGroup = selectNameGroupMap.get(key);
               let dataSourceValue = `(params) => ${selectNameGroup.logic}(elements.$ce.page, elements.$ce.size)`
               formItem += `
-                        <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 :clearable="true" placeholder="请选择${label}" :dataSource="${dataSourceValue}" :pageSize="50"
+                            textField="${lowerEntityName}.${displayedProperty.name}" valueField="${lowerEntityName}.${relationProperty.name}" :pagination="true" v-model="${vModel}">
                         </u-select>
                     `;
             } else return '';
           } else return '';
         } else if (propertyTypeName === 'Boolean') {
           formItem += `
-                        <u-select clearable v-model="${vModel}" placeholder="请输入${label}">
+                        <u-select :clearable="true" 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>`;
@@ -185,11 +185,11 @@ function genSaveModalTemplate(entity: Entity, nameGroup: NameGroup, selectNameGr
         } else if (propertyTypeName === 'String' && propertyTypeMaxLength > 256) {
           formItem += `<u-textarea v-model="${vModel}" placeholder="请输入${label}"></u-textarea>`;
         } else if (propertyTypeName === 'Date') {
-          formItem += `<u-date-picker clearable :value.sync="${vModel}" placeholder="请输入${label}"></u-date-picker>`;
+          formItem += `<u-date-picker :clearable="true" :value.sync="${vModel}" placeholder="请输入${label}"></u-date-picker>`;
         } else if (propertyTypeName === 'Time') {
           formItem += `<u-time-picker :value.sync="${vModel}" placeholder="请输入${label}"></u-time-picker>`;
         } else if (propertyTypeName === 'DateTime') {
-          formItem += `<u-date-time-picker clearable :value.sync="${vModel}" placeholder="请输入${label}"></u-date-time-picker>`;
+          formItem += `<u-date-time-picker :clearable="true" :value.sync="${vModel}" placeholder="请输入${label}"></u-date-time-picker>`;
         } else {
           const namespaceArr = propertyTypeNamespace.split('.');
           const type = namespaceArr.pop();
@@ -413,7 +413,7 @@ export function genEditTableColumnComponent(app: App, entity: Entity, property:
     const propertyTypeMaxLength: number =
       Number(
         property.rules
-          .find((item) => item.indexOf('max') > -1)
+          ?.find?.((item) => item.indexOf('max') > -1)
           ?.split('(')[1]
           .slice(0, -1)
       ) || 0;
@@ -440,16 +440,16 @@ export function genEditTableColumnComponent(app: App, entity: Entity, property:
             dataSourceValue = `(params) => ${selectNameGroup.viewLogicLoad}(elements.$ce.page, elements.$ce.size)`
           }
           formItem += `
-                        <u-select clearable placeholder="请选择${label}" :data-source="${dataSourceValue}" :page-size="50"
-                            :autofocus="true" :opened="true" append-to="body" @blur="${nameGroup.viewLogicBlurUpdate}" @select="${nameGroup.viewLogicBlurUpdate}"
-                            text-field="${lowerEntityName}.${displayedProperty.name}" value-field="${lowerEntityName}.${relationProperty.name}" :pagination="true" :value.sync="${valueExpression}">
+                        <u-select :clearable="true" placeholder="请选择${label}" :dataSource="${dataSourceValue}" :pageSize="50"
+                            :autofocus="true" :opened="true" appendTo="body" @blur="${nameGroup.viewLogicBlurUpdate}" @select="${nameGroup.viewLogicBlurUpdate}"
+                            textField="${lowerEntityName}.${displayedProperty.name}" valueField="${lowerEntityName}.${relationProperty.name}" :pagination="true" :value.sync="${valueExpression}">
                         </u-select>
                     `;
         } else return '';
       } else return '';
     } else if (propertyTypeName === 'Boolean') {
-      formItem += `<u-select clearable :value.sync="${valueExpression}" placeholder="请输入${label}"
-            :autofocus="true" :opened="true" append-to="body" @blur="${nameGroup.viewLogicBlurUpdate}" @select="${nameGroup.viewLogicBlurUpdate}">
+      formItem += `<u-select :clearable="true" :value.sync="${valueExpression}" placeholder="请输入${label}"
+            :autofocus="true" :opened="true" appendTo="body" @blur="${nameGroup.viewLogicBlurUpdate}" @select="${nameGroup.viewLogicBlurUpdate}">
                 <u-select-item :value="true" text="是">是</u-select-item>
                 <u-select-item :value="false" text="否">否</u-select-item>
             </u-select>`;
@@ -464,11 +464,11 @@ export function genEditTableColumnComponent(app: App, entity: Entity, property:
             <u-textarea :value.sync="${valueExpression}" placeholder="请输入${label}" :autofocus="true" size="full"></u-textarea>
             </u-validator>`;
     } else if (propertyTypeName === 'Date') {
-      formItem = `<u-date-picker clearable :value.sync="${valueExpression}" placeholder="请输入${label}" append-to="body" :autofocus="true" :opened="true" @blur="${nameGroup.viewLogicBlurUpdate}"></u-date-picker>`;
+      formItem = `<u-date-picker :clearable="true" :value.sync="${valueExpression}" placeholder="请输入${label}" appendTo="body" :autofocus="true" :opened="true" @blur="${nameGroup.viewLogicBlurUpdate}"></u-date-picker>`;
     } else if (propertyTypeName === 'Time') {
-      formItem = `<u-time-picker :value.sync="${valueExpression}" placeholder="请输入${label}" append-to="body" :autofocus="true" @blur="${nameGroup.viewLogicBlurUpdate}"></u-time-picker>`;
+      formItem = `<u-time-picker :value.sync="${valueExpression}" placeholder="请输入${label}" appendTo="body" :autofocus="true" @blur="${nameGroup.viewLogicBlurUpdate}"></u-time-picker>`;
     } else if (propertyTypeName === 'DateTime') {
-      formItem = `<u-date-time-picker clearable :value.sync="${valueExpression}" placeholder="请输入${label}" append-to="body" :autofocus="true" :opened="true" @blur="${nameGroup.viewLogicBlurUpdate}"></u-date-time-picker>`;
+      formItem = `<u-date-time-picker :clearable="true" :value.sync="${valueExpression}" placeholder="请输入${label}" appendTo="body" :autofocus="true" :opened="true" @blur="${nameGroup.viewLogicBlurUpdate}"></u-date-time-picker>`;
     } else {
       const namespaceArr = (propertyTypeNamespace && propertyTypeNamespace.split('.')) || [];
       const type = namespaceArr.pop();
@@ -477,13 +477,13 @@ export function genEditTableColumnComponent(app: App, entity: Entity, property:
         const namespace = enumeration?.getNamespace() || '';
         const name = enumeration?.name || '';
         const enumTypeAnnotationStr = `__enumTypeAnnotation_${namespace}.${name}`;
-        formItem += `<u-select clearable
-                :data-source="$utils.EnumToList('${enumTypeAnnotationStr}')" :page-size="50"
+        formItem += `<u-select :clearable="true"
+                :dataSource="$utils.EnumToList('${enumTypeAnnotationStr}')" :pageSize="50"
                 :value.sync="${valueExpression}" placeholder="请输入${label}"
-                :autofocus="true" :opened="true" append-to="body" @blur="${nameGroup.viewLogicBlurUpdate}" @select="${nameGroup.viewLogicBlurUpdate}">
+                :autofocus="true" :opened="true" appendTo="body" @blur="${nameGroup.viewLogicBlurUpdate}" @select="${nameGroup.viewLogicBlurUpdate}">
                 </u-select>`;
       } else {
-        formItem = `<u-validator placement="bottom" display="appear" @blur-valid="${nameGroup.viewLogicBlurUpdate}" style="width:100%" append-to="body">
+        formItem = `<u-validator placement="bottom" display="appear" @blur-valid="${nameGroup.viewLogicBlurUpdate}" style="width:100%" appendTo="body">
                     <u-input :value.sync="${valueExpression}" placeholder="请输入${label}" :autofocus="true" size="full"></u-input>
                 </u-validator>`;
       }

package/src/templator/genCurdMultipleKeyBlock.ts

@@ -69,8 +69,8 @@ function genFilterTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroup
               const selectNameGroup = selectNameGroupMap.get(key);
               let dataSourceValue = `(params) => ${selectNameGroup.logic}(elements.$ce.page, elements.$ce.size)`;
               formItem += `
-                        <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 clearable placeholder="请选择${label}" :dataSource="${dataSourceValue}" :pageSize="50"
+                            textField="${lowerEntityName}.${displayedProperty.name}" valueField="${lowerEntityName}.${relationProperty.name}" :pagination="true" v-model="${vModel}">
                         </u-select>
                     `;
             } else return '';
@@ -174,10 +174,10 @@ function genSaveModalTemplate(entity: Entity, nameGroup: NameGroup, selectNameGr
               const selectNameGroup = selectNameGroupMap.get(key);
               let dataSourceValue = `(params) => ${selectNameGroup.logic}(elements.$ce.page, elements.$ce.size)`;
               formItem += `
-                        <u-select clearable placeholder="请选择${label}"
-                            text-field="${lowerEntityName}.${displayedProperty.name}"
-                            value-field="${lowerEntityName}.${relationProperty.name}"
-                            :data-source="${dataSourceValue}" :page-size="50"
+                        <u-select :clearable="true" placeholder="请选择${label}"
+                            textField="${lowerEntityName}.${displayedProperty.name}"
+                            valueField="${lowerEntityName}.${relationProperty.name}"
+                            :dataSource="${dataSourceValue}" :pageSize="50"
                             :pagination="true"
                             ${property.primaryKey ? `:disabled="${nameGroup.viewVariableIsUpdate}"` : ''}
                             v-model="${vModel}">
@@ -187,9 +187,9 @@ function genSaveModalTemplate(entity: Entity, nameGroup: NameGroup, selectNameGr
           } else return '';
         } else if (propertyTypeName === 'Boolean') {
           formItem += `
-                        <u-select clearable v-model="${vModel}" placeholder="请输入${label}" ${
-                          property.primaryKey ? `:disabled="${nameGroup.viewVariableIsUpdate}"` : ''
-                        }>
+                        <u-select :clearable="true" v-model="${vModel}" placeholder="请输入${label}" ${
+            property.primaryKey ? `:disabled="${nameGroup.viewVariableIsUpdate}"` : ''
+          }>
                             <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>`;
@@ -210,7 +210,7 @@ function genSaveModalTemplate(entity: Entity, nameGroup: NameGroup, selectNameGr
             property.primaryKey ? `:disabled="${nameGroup.viewVariableIsUpdate}"` : ''
           }></u-textarea>`;
         } else if (propertyTypeName === 'Date') {
-          formItem += `<u-date-picker clearable :value.sync="${vModel}" placeholder="请输入${label}" ${
+          formItem += `<u-date-picker :clearable="true" :value.sync="${vModel}" placeholder="请输入${label}" ${
             property.primaryKey ? `:disabled="${nameGroup.viewVariableIsUpdate}"` : ''
           }></u-date-picker>`;
         } else if (propertyTypeName === 'Time') {
@@ -218,7 +218,7 @@ function genSaveModalTemplate(entity: Entity, nameGroup: NameGroup, selectNameGr
             property.primaryKey ? `:disabled="${nameGroup.viewVariableIsUpdate}"` : ''
           }></u-time-picker>`;
         } else if (propertyTypeName === 'DateTime') {
-          formItem += `<u-date-time-picker clearable :value.sync="${vModel}" placeholder="请输入${label}" ${
+          formItem += `<u-date-time-picker :clearable="true" :value.sync="${vModel}" placeholder="请输入${label}" ${
             property.primaryKey ? `:disabled="${nameGroup.viewVariableIsUpdate}"` : ''
           }></u-date-time-picker>`;
         } else {
@@ -695,7 +695,7 @@ export function genGridViewMultipleKeyBlock(entity: Entity, oldNode: ViewElement
     }
   });
   const allEntities = [...entitySet];
-  const entityLogic = genQueryLogic(allEntities, nameGroup, true, true, module);
+  const entityLogic = genQueryLogic(allEntities, nameGroup, true, false, module);
   newLogics.push(entityLogic);
 
   return `<template>
@@ -776,12 +776,6 @@ export function genReloadLogic(nameGroup: NameGroup) {
     name: nameGroup.viewLogicReload,
     params: [] as any[],
     returns: [] as any[],
-    variables: [
-      NaslNode.Variable({
-        name: 'validateResult',
-        typeAnnotation: NaslUITypeAnnotation.ValidateEvent,
-      }),
-    ],
     body: [NaslLogicItem.Start, genCallComponentLogic(nameGroup.viewElementMainView, 'reload'), NaslLogicItem.End],
     playground: [],
   });
@@ -792,12 +786,6 @@ export function genResetLogic(nameGroup: NameGroup) {
     name: nameGroup.viewLogicReset,
     params: [] as any[],
     returns: [] as any[],
-    variables: [
-      NaslNode.Variable({
-        name: 'validateResult',
-        typeAnnotation: NaslUITypeAnnotation.ValidateEvent,
-      }),
-    ],
     body: [
       NaslLogicItem.Start,
       NaslLogicItem.CallFunction({
@@ -992,7 +980,7 @@ function genDelModalSubmitLogic(entity: Entity, nameGroup: NameGroup) {
 
 export function genFilterTemplateTableDesigner(entity: Entity, nameGroup: NameGroup, selectNameGroupMap: Map<string, NameGroup>, optionsMap?: any) {
   const dataSource = entity.parentNode as DataSource;
-  const properties = entity.properties.filter(filterProperty('inFilter'));
+  const properties = entity.properties.filter(filterProperty('inFilter')).filter((it) => it?.typeAnnotation?.typeName !== 'List');
   const getCol = (code: string) => `<u-grid-layout-column span="6" style="padding: 10px 0;">${code}</u-grid-layout-column>`;
   return `<u-form style="margin-bottom: 6px;padding: 15px 15px 5px 15px;background: #fff;">
       <u-grid-layout>
@@ -1016,7 +1004,7 @@ export function genFilterTemplateTableDesigner(entity: Entity, nameGroup: NameGr
                 const options = optionsMap?.[property.name];
                 const multiple = property?.typeAnnotation?.typeName === 'List';
                 formItem += `
-                              <u-select clearable v-model="${vModel}" placeholder="请选择" ${multiple ? 'multiple' : ''}>
+                              <u-select :clearable="true" v-model="${vModel}" placeholder="请选择" ${multiple ? 'multiple' : ''}>
                                 ${options.map((option: any) => `<u-select-item value="${option.value}">${option.label}</u-select-item>`).join('')}
                               </u-select>
                           `;
@@ -1033,15 +1021,15 @@ export function genFilterTemplateTableDesigner(entity: Entity, nameGroup: NameGr
                     const selectNameGroup = selectNameGroupMap.get(key);
                     let dataSourceValue = `(params) => ${selectNameGroup.logic}(elements.$ce.page, elements.$ce.size)`;
                     formItem += `
-                              <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 :clearable="true" placeholder="请选择${label}" :dataSource="${dataSourceValue}" :pageSize="50"
+                                  textField="${lowerEntityName}.${displayedProperty.name}" valueField="${lowerEntityName}.${relationProperty.name}" :pagination="true" v-model="${vModel}">
                               </u-select>
                           `;
                   } else return '';
                 } else return '';
               } else if (propertyTypeName === 'Boolean') {
                 formItem += `
-                              <u-select clearable v-model="${vModel}" placeholder="请输入${label}">
+                              <u-select :clearable="true" 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>
@@ -1055,11 +1043,11 @@ export function genFilterTemplateTableDesigner(entity: Entity, nameGroup: NameGr
               } else if (propertyTypeName === 'String' && propertyTypeMaxLength > 256) {
                 formItem += `<u-textarea v-model="${vModel}" placeholder="请输入${label}"></u-textarea>`;
               } else if (propertyTypeName === 'Date') {
-                formItem += `<u-date-picker clearable :value.sync="${vModel}" placeholder="请输入${label}"></u-date-picker>`;
+                formItem += `<u-date-picker :clearable="true" :value.sync="${vModel}" placeholder="请输入${label}"></u-date-picker>`;
               } else if (propertyTypeName === 'Time') {
                 formItem += `<u-time-picker :value.sync="${vModel}" placeholder="请输入${label}"></u-time-picker>`;
               } else if (propertyTypeName === 'DateTime') {
-                formItem += `<u-date-time-picker clearable :value.sync="${vModel}" placeholder="请输入${label}"></u-date-time-picker>`;
+                formItem += `<u-date-time-picker :clearable="true" :value.sync="${vModel}" placeholder="请输入${label}"></u-date-time-picker>`;
               } else {
                 const namespaceArr = propertyTypeNamespace.split('.');
                 const type = namespaceArr.pop();
@@ -1132,10 +1120,10 @@ function genSaveModalTemplateDesigner(
             const selectNameGroup = selectNameGroupMap.get(key);
             let dataSourceValue = `(params) => ${selectNameGroup.logic}(elements.$ce.page, elements.$ce.size)`;
             formItem += `
-                      <u-select clearable placeholder="请选择${label}"
-                          text-field="${lowerEntityName}.${displayedProperty.name}"
-                          value-field="${lowerEntityName}.${relationProperty.name}"
-                          :data-source="${dataSourceValue}" :page-size="50"
+                      <u-select :clearable="true" placeholder="请选择${label}"
+                          textField="${lowerEntityName}.${displayedProperty.name}"
+                          valueField="${lowerEntityName}.${relationProperty.name}"
+                          :dataSource="${dataSourceValue}" :pageSize="50"
                           :pagination="true"
                           ${property.primaryKey ? `:disabled="${nameGroup.viewVariableIsUpdate}"` : ''}
                           v-model="${vModel}">
@@ -1145,9 +1133,9 @@ function genSaveModalTemplateDesigner(
         } else return '';
       } else if (propertyTypeName === 'Boolean') {
         formItem += `
-                      <u-select clearable v-model="${vModel}" placeholder="请输入${label}" ${
-                        property.primaryKey ? `:disabled="${nameGroup.viewVariableIsUpdate}"` : ''
-                      }>
+                      <u-select :clearable="true" v-model="${vModel}" placeholder="请输入${label}" ${
+          property.primaryKey ? `:disabled="${nameGroup.viewVariableIsUpdate}"` : ''
+        }>
                           <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>`;
@@ -1168,7 +1156,7 @@ function genSaveModalTemplateDesigner(
           property.primaryKey ? `:disabled="${nameGroup.viewVariableIsUpdate}"` : ''
         }></u-textarea>`;
       } else if (propertyTypeName === 'Date') {
-        formItem += `<u-date-picker clearable :value.sync="${vModel}" placeholder="请输入${label}" ${
+        formItem += `<u-date-picker :clearable="true" :value.sync="${vModel}" placeholder="请输入${label}" ${
           property.primaryKey ? `:disabled="${nameGroup.viewVariableIsUpdate}"` : ''
         }></u-date-picker>`;
       } else if (propertyTypeName === 'Time') {
@@ -1176,7 +1164,7 @@ function genSaveModalTemplateDesigner(
           property.primaryKey ? `:disabled="${nameGroup.viewVariableIsUpdate}"` : ''
         }></u-time-picker>`;
       } else if (propertyTypeName === 'DateTime') {
-        formItem += `<u-date-time-picker clearable :value.sync="${vModel}" placeholder="请输入${label}" ${
+        formItem += `<u-date-time-picker :clearable="true" :value.sync="${vModel}" placeholder="请输入${label}" ${
           property.primaryKey ? `:disabled="${nameGroup.viewVariableIsUpdate}"` : ''
         }></u-date-time-picker>`;
       } else {
@@ -1207,8 +1195,8 @@ function genSaveModalTemplateDesigner(
 
   return `
     <u-modal ref="${nameGroup.viewElementSaveModal}" @close="${nameGroup.viewLogicCloseModal}" size="huge" :show-foot="!${
-      nameGroup.viewVariablePreview
-    }">
+    nameGroup.viewVariablePreview
+  }">
         <template #title>
             <div v-if="${nameGroup.viewVariablePreview}">
               <u-text>详情</u-text>
@@ -1242,6 +1230,9 @@ export const genDelModalTemplate = (nameGroup: NameGroup) => {
     "
     icon="warning"
   >
+    <template #title>
+        <div>提示</div>
+    </template>
     <template #foot>
       <u-linear-layout style="text-align: right" :vusion-disabled-cut="true" justify="center">
         <u-button text="取 消" @click="${nameGroup.viewLogicCloseDelModal}"></u-button>
@@ -1266,12 +1257,11 @@ export const genDelModalTemplate = (nameGroup: NameGroup) => {
 // composedBy 节点组合属性
 export function genCurdMultipleKeyBlockForTableDesigner(
   entity: Entity,
-  oldNode: ViewElement,
+  view: View,
   SaveModalFormTemplate?: string,
   optionsMap?: any,
   composedBy?: string
 ) {
-  const { view } = oldNode;
   const dataSource = entity.parentNode as DataSource;
   const module = dataSource.app;
   const composedByOptionStr = composedBy && composedBy.length > 0 ? `"composedBy":${JSON.stringify(composedBy)},` : '';

package/src/templator/genEditTableBlock.ts

@@ -65,16 +65,16 @@ export function genEditTableColumnTemplate(
           const selectNameGroup = selectNameGroupMap.get(key);
           let dataSourceValue = `(params) => ${selectNameGroup.logic}(elements.$ce.page, elements.$ce.size)`
           formItem += `
-                        <u-select clearable placeholder="请选择${label}" :data-source="${dataSourceValue}" :page-size="50"
-                            :autofocus="true" :opened="true" append-to="body" @blur="${nameGroup.viewLogicBlurUpdate}" @select="${nameGroup.viewLogicBlurUpdate}"
-                            text-field="${lowerEntityName}.${displayedProperty.name}" value-field="${lowerEntityName}.${relationProperty.name}" :pagination="true" :value.sync="${valueExpression}">
+                        <u-select :clearable="true" placeholder="请选择${label}" :dataSource="${dataSourceValue}" :pageSize="50"
+                            :autofocus="true" :opened="true" appendTo="body" @blur="${nameGroup.viewLogicBlurUpdate}" @select="${nameGroup.viewLogicBlurUpdate}"
+                            textField="${lowerEntityName}.${displayedProperty.name}" valueField="${lowerEntityName}.${relationProperty.name}" :pagination="true" :value.sync="${valueExpression}">
                         </u-select>
                     `;
         } else return '';
       } else return '';
     } else if (propertyTypeName === 'Boolean') {
-      formItem += `<u-select clearable :value.sync="${valueExpression}" placeholder="请输入${label}"
-            :autofocus="true" :opened="true" append-to="body" @blur="${nameGroup.viewLogicBlurUpdate}" @select="${nameGroup.viewLogicBlurUpdate}">
+      formItem += `<u-select :clearable="true" :value.sync="${valueExpression}" placeholder="请输入${label}"
+            :autofocus="true" :opened="true" appendTo="body" @blur="${nameGroup.viewLogicBlurUpdate}" @select="${nameGroup.viewLogicBlurUpdate}">
                 <u-select-item :value="true" text="是">是</u-select-item>
                 <u-select-item :value="false" text="否">否</u-select-item>
             </u-select>`;
@@ -89,11 +89,11 @@ export function genEditTableColumnTemplate(
             <u-textarea :value.sync="${valueExpression}" placeholder="请输入${label}" :autofocus="true" size="full"></u-textarea>
             </u-validator>`;
     } else if (propertyTypeName === 'Date') {
-      formItem = `<u-date-picker clearable :value.sync="${valueExpression}" placeholder="请输入${label}" append-to="body" :autofocus="true" :opened="true" @blur="${nameGroup.viewLogicBlurUpdate}"></u-date-picker>`;
+      formItem = `<u-date-picker :clearable="true" :value.sync="${valueExpression}" placeholder="请输入${label}" appendTo="body" :autofocus="true" :opened="true" @blur="${nameGroup.viewLogicBlurUpdate}"></u-date-picker>`;
     } else if (propertyTypeName === 'Time') {
-      formItem = `<u-time-picker :value.sync="${valueExpression}" placeholder="请输入${label}" append-to="body" :autofocus="true" @blur="${nameGroup.viewLogicBlurUpdate}"></u-time-picker>`;
+      formItem = `<u-time-picker :value.sync="${valueExpression}" placeholder="请输入${label}" appendTo="body" :autofocus="true" @blur="${nameGroup.viewLogicBlurUpdate}"></u-time-picker>`;
     } else if (propertyTypeName === 'DateTime') {
-      formItem = `<u-date-time-picker clearable :value.sync="${valueExpression}" placeholder="请输入${label}" append-to="body" :autofocus="true" :opened="true" @blur="${nameGroup.viewLogicBlurUpdate}"></u-date-time-picker>`;
+      formItem = `<u-date-time-picker :clearable="true" :value.sync="${valueExpression}" placeholder="请输入${label}" appendTo="body" :autofocus="true" :opened="true" @blur="${nameGroup.viewLogicBlurUpdate}"></u-date-time-picker>`;
     } else {
       const namespaceArr = propertyTypeNamespace.split('.');
       const type = namespaceArr.pop();
@@ -102,13 +102,13 @@ export function genEditTableColumnTemplate(
         const namespace = enumeration?.getNamespace() || '';
         const name = enumeration?.name || '';
         const enumTypeAnnotationStr = `__enumTypeAnnotation_${namespace}.${name}`;
-        formItem += `<u-select clearable
-                :data-source="$utils.EnumToList('${enumTypeAnnotationStr}')" :page-size="50"
+        formItem += `<u-select :clearable="true"
+                :dataSource="$utils.EnumToList('${enumTypeAnnotationStr}')" :pageSize="50"
                 :value.sync="${valueExpression}" placeholder="请输入${label}"
-                :autofocus="true" :opened="true" append-to="body" @blur="${nameGroup.viewLogicBlurUpdate}" @select="${nameGroup.viewLogicBlurUpdate}">
+                :autofocus="true" :opened="true" appendTo="body" @blur="${nameGroup.viewLogicBlurUpdate}" @select="${nameGroup.viewLogicBlurUpdate}">
                 </u-select>`;
       } else {
-        formItem = `<u-validator placement="bottom" display="appear" @blur-valid="${nameGroup.viewLogicBlurUpdate}" style="width:100%" append-to="body">
+        formItem = `<u-validator placement="bottom" display="appear" @blur-valid="${nameGroup.viewLogicBlurUpdate}" style="width:100%" appendTo="body">
                     <u-input :value.sync="${valueExpression}" placeholder="请输入${label}" :autofocus="true" size="full"></u-input>
                 </u-validator>`;
       }
@@ -148,9 +148,9 @@ export function genEditTableTemplate(entity: Entity, nameGroup: NameGroup, newLo
   if (['genCurdEditMultipleKeyBlock'].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" :page-size="20" :page-number="1" :default-column-width="300" editable>
+  return `<u-table-view ref="${nameGroup.viewElementMainView}" :dataSource="${dataSourceValue}" dataSchema="${nameGroup.structure}"
+        valueField="${utils.firstLowerCase(entity.name)}.${entity.properties.find((p) => p.primaryKey)?.name || 'id'}"
+        :pagination="true" :showSizer="true" :pageSize="20" :pageNumber="1" :defaultColumnWidth="300" editable>
     <u-table-view-column type="index" width="60">
         <template #title><u-text text="序号"></u-text></template>
         <template #cell="current"></template>

package/src/templator/genEnumSelectBlock.ts

@@ -13,23 +13,23 @@ export function genEnumSelectBlock(enumeration: Enum, vModel?: string, size?: st
   const name = enumeration?.name || '';
   const enumTypeAnnotationStr = `__enumTypeAnnotation_${namespace}.${name}`;
   if (config.scope === 'h5')
-    return `<van-pickerson type="list" :show-toolbar="true" ${vModel ? ` v-model="${vModel}"` : ''}${
+    return `<van-pickerson type="list" :showToolbar="true" ${vModel ? ` v-model="${vModel}"` : ''}${
       placeholder ? ` title="${placeholder}" placeholder="${placeholder}"` : ''
     }
-        :data-source="$utils.EnumToList('${enumTypeAnnotationStr}')" :page-size="50" :notitleblock="${hiddenAll}"><template #title>${
+        :dataSource="$utils.EnumToList('${enumTypeAnnotationStr}')" :pageSize="50" :notitleblock="${hiddenAll}"><template #title>${
       !hiddenAll ? placeholder || '' : ''
     }</template>
       <template #pannel-title>
         <van-text text="${!hiddenAll ? placeholder || '' : ''}"></van-text>
       </template>
       <template #picker-top>
-        <van-picker-action-slot target-method="cancel">
+        <van-picker-action-slot targetMethod="cancel">
           <van-iconv name="left-arrow" icotype="only"></van-iconv>
         </van-picker-action-slot>
-        <van-picker-action-slot target-method="confirm"></van-picker-action-slot>
+        <van-picker-action-slot targetMethod="confirm"></van-picker-action-slot>
       </template>
       <template #picker-bottom>
-        <van-picker-action-slot target-method="cancel">
+        <van-picker-action-slot targetMethod="cancel">
           <van-button
             type="info_secondary"
             size="normal"
@@ -37,7 +37,7 @@ export function genEnumSelectBlock(enumeration: Enum, vModel?: string, size?: st
             squareroud="round"
           ></van-button>
         </van-picker-action-slot>
-        <van-picker-action-slot target-method="confirm">
+        <van-picker-action-slot targetMethod="confirm">
           <van-button
             type="info"
             size="normal"
@@ -47,10 +47,10 @@ export function genEnumSelectBlock(enumeration: Enum, vModel?: string, size?: st
         </van-picker-action-slot>
       </template></van-pickerson>`;
 
-  return `<u-select clearable${vModel ? ` v-model="${vModel}"` : ''}${size ? ` size="${size}"` : ''}${
+  return `<u-select :clearable="true"${vModel ? ` v-model="${vModel}"` : ''}${size ? ` size="${size}"` : ''}${
     placeholder ? ` placeholder="${placeholder}"` : ''
   }
-            :data-source="$utils.EnumToList('${enumTypeAnnotationStr}')" :page-size="50">
+            :dataSource="$utils.EnumToList('${enumTypeAnnotationStr}')" :pageSize="50">
                 ${hiddenAll ? '' : '<u-select-item text="全部"></u-select-item>'}
             </u-select>`;
 }