@lcap/nasl 0.3.9-beta → 0.3.10-beta.oom2

package/src/service/logic/logic.js

@@ -85,4 +85,24 @@ export default {
             method: 'post',
         },
     },
+    //定时任务接口
+    validateTimer: {
+        url: {
+            path: '/api/v1/cron/validate',
+            method: 'post',
+        },
+    },
+    testTimer: {
+        url: {
+            path: '/api/v1/cron/test',
+            method: 'post',
+        },
+    },
+    //更新接口缓存
+    updateCronCache: {
+        url: {
+            path: '/proxy/graph/api/v1/graph/cache',
+            method: 'post',
+        },
+    },
 };

package/src/service/page/element.js

@@ -31,4 +31,10 @@ export default {
             method: 'delete',
         },
     },
+    load: {
+        url: {
+            path: '/proxy/graph/api/v1/graph/view/element',
+            method: 'get',
+        },
+    },
 };

package/src/service/permission/api.js

@@ -0,0 +1,38 @@
+export default {
+    attachPermissionResourceAction: {
+        url: {
+            method: 'put',
+            path: '/proxy/graph/api/v1/graph/role/attachResource',
+            query: {},
+        },
+    },
+    detachPermissionResourceAction: {
+        url: {
+            method: 'put',
+            path: '/proxy/graph/api/v1/graph/role/detachResource',
+            query: {},
+        },
+    },
+    getRoles: {
+        url: {
+            method: 'get',
+            path: '/proxy/graph/api/v1/graph/role/list',
+            query: {},
+        },
+    },
+    createRole: {
+        url: {
+            method: 'post',
+            path: '/proxy/graph/api/v1/graph/role/add',
+            query: {},
+        },
+    },
+    updateRole: {
+        url: {
+            method: 'put',
+            path: '/proxy/graph/api/v1/graph/role/update',
+            query: {},
+        },
+        config: { noErrorTip: true },
+    },
+};

package/src/service/permission/index.js

@@ -0,0 +1,13 @@
+import { createService } from '../create';
+import api from './api';
+
+// 兼容 node 运行环境
+const global = typeof window !== 'undefined' ? window : this;
+const service = createService(api, {
+    headers: {
+        // 单环境配置下默认使用生产环境
+        Env: !(global && global.appInfo && global.appInfo.multiEnvEnable) ? 'online' : 'dev',
+    },
+});
+
+export default service;

package/src/service/webFile/index.js

@@ -12,6 +12,11 @@ service.saveFile = async function (options) {
         },
     });
     if (!result) {
+        // 新应用可能会并发调用多次 saveFile, 导致创建多次
+        options = { ...options,
+            config: {
+                noErrorTip: true,
+            } };
         return service.createFile(options);
     } else {
         return service.updateFile(options);
@@ -20,4 +25,4 @@ service.saveFile = async function (options) {
 
 export default service;
 
-export const loadCacheService = createService(loadCacheApi);
+export const loadCacheService = createService(loadCacheApi);

package/src/types/app/App.ts

@@ -1,5 +1,5 @@
 import { excludedInJSON, immutable } from '../decorators';
-import { LEVEL_ENUM, Vertex, Service, WebService, MicroService, SERVICE_TYPE, utils, History, updateGenericTypeList } from '..';
+import { LEVEL_ENUM, Vertex, Service, WebService, MicroService, SERVICE_TYPE, utils, History, updateGenericTypeList, vertexsMap, Entity, Structure, Enum, dataTypesMap, BaseVariable, variablesMap, updateDataTypeList } from '..';
 import appService from '../../service/app';
 
 interface AppLoadAllOptions {
@@ -262,6 +262,37 @@ export class App extends Vertex {
     from(source: any) {
         return new App(source);
     }
+    /**
+     * 清理内存，避免内存泄漏
+     */
+    clear() {
+        function traverse(obj: any, callback: (obj: any) => void) {
+            if(typeof obj !== 'object' || obj === null) return;
+            if(obj.id && !vertexsMap.has(obj.id)) return;
+        
+            if(Array.isArray(obj))
+                obj.forEach((item) => {
+                    traverse(item, callback);
+                })
+            else {
+                callback(obj);
+                Object.values(obj).forEach((item) => {
+                    traverse(item, callback);
+                });
+            }
+        }
+        
+        traverse(this, (obj: any) => {
+            vertexsMap.delete(obj?.id);
+
+            if(obj instanceof Entity || obj instanceof Structure || obj instanceof Enum)
+                delete dataTypesMap[obj.schemaRef];
+
+            if(obj instanceof BaseVariable)
+                variablesMap.delete(obj.id);
+        });
+        updateDataTypeList();
+    }
 }
 
 export default App;

package/src/types/app/Service.ts

@@ -166,6 +166,11 @@ export class Service extends Vertex {
      * 加载服务所有的接口列表
      */
     async loadInterfaces() {
+        // 接口列表中的旧接口可能已经已经不存在，需要从 vetexsMap 中清理掉
+        this.interfaces.forEach((it) => {
+            it.destroy();
+        });
+
         const RESOLVER_NAMES = ['getAll', 'get', 'create', 'update', 'delete', 'count', 'import', 'export', 'batchDelete', 'batchCreate', 'batchUpdate'];
 
         let interfaces: Array<Interface> = await interfaceService.loadList({
@@ -379,10 +384,15 @@ ${Object.keys(themeVariables).map((key) => `    ${key}: ${themeVariables[key]};`
 `;
     }
 
-    async loadPages() {
+    async loadPages(enableCache = true) {
+        this.pages.forEach((page) => {
+            page.destroy();
+        });
+
         const result: Array<Page> = await pageService.loadPages({
             query: {
                 serviceId: this.id,
+                enableCache,
             },
             config: {
                 mock: config.mock,
@@ -768,17 +778,35 @@ export class MicroService extends Service {
     /**
      * 加载服务所有的接口列表
      */
-    async loadInterfaces() {
+    async loadInterfaces(enableCache = true) {
+        const logicMap = new Map();
+        // 旧接口列表中，可能存在已经被删掉的接口，需要从 vertexsMap 中删除
+        this.interfaces.forEach((it) => {
+            logicMap.set(it.id, it.logic);
+            it.destroy();
+        });
+
         let interfaces: Array<Interface> = await interfaceService.loadList({
             query: {
                 serviceId: this.id,
+                enableCache,
             },
             headers: {
                 IdeVersion: 2.3,
             },
         });
 
-        interfaces = interfaces.map((item) => Interface.from(item, this));
+        interfaces = interfaces.map((item) => {
+            if(logicMap.has(item.id)) {
+                item.logic = logicMap.get(item.id);
+                logicMap.delete(item.id);
+            }
+            return Interface.from(item, this);
+        });
+        // 清理掉已不存在的逻辑
+        for(const logic of logicMap.values()) {
+            logic.destroy();
+        }
 
         interfaces.forEach((i) => {
             if (i.serviceType === 'export') {
@@ -786,6 +814,7 @@ export class MicroService extends Service {
                 i.logic = logic;
             }
         });
+
         this.assign({ interfaces });
         this.mountResolverOnEntity();
         this.mountResolverOnInterface();

package/src/types/cache.ts

@@ -0,0 +1,50 @@
+import { config, View, Logic } from '.';
+import { BusinessCode } from './enum';
+
+export async function refreshInterfaces() {
+    await config.defaultApp?.firstMicroService?.loadInterfaces(false);
+    config.defaultApp?.firstMicroService?.emit('interfacesChange');
+    config.defaultApp?.emit('cache.refreshed');
+    config.defaultApp?.emit('cleanDesigners');
+}
+
+export async function refreshPages() {
+    await config.defaultApp?.firstWebService.loadPages(false);
+    await config.defaultApp?._loadViewsDetail();
+    config.defaultApp?.firstWebService.emit('pageTreeChange');
+    config.defaultApp?.emit('cache.refreshed');
+    config.defaultApp?.emit('cleanDesigners');
+}
+
+export async function refreshView(view: View) {
+    try {
+        await view.loadAll(false);
+        view.emit('change');
+        config.defaultApp?.emit('cache.refreshed');   
+        config.defaultApp?.emit('cleanDesigners');     
+    } catch(err: any) {
+        const code = err?.code;
+        if(code === BusinessCode.ElementNotExist)  // 节点不存在
+            await refreshPages();
+    }
+
+}
+
+export async function refreshHtml(view: View) {
+    try {
+        await view.$html?.load();
+        view.emit('change');
+        config.defaultApp?.emit('cache.refreshed');        
+    } catch(err: any) {
+        const code = err?.code;
+        if(code === BusinessCode.ElementNotExist)  // 节点不存在
+            await refreshView(view);        
+    }
+
+}
+
+export async function refreshLogic(logic: Logic) {
+    await logic.load();  // logic.load() 会根据后端返回的code, 调用 refreshView, refreshPages 或 refreshInterfaces
+    logic.emit('change');
+    config.defaultApp?.emit('cache.refreshed');        
+}

package/src/types/common/Vertex.ts

@@ -93,6 +93,36 @@ export class Vertex extends EventEmitter {
      */
     @excludedInJSON()
     public expanded: boolean = false;
+    /**
+     * 节点是否显示
+     * 前端 UI 状态
+     */
+     @excludedInJSON()
+     public hidden: boolean = false;
+    /**
+     * 页面树节点是否显示
+     * 前端 UI 状态
+     */
+    @excludedInJSON()
+    public pageTreeNodeHidden: boolean = false;
+     /**
+     * 逻辑树节点是否显示
+     * 前端 UI 状态
+     */
+    @excludedInJSON()
+    public logicTreeNodeHidden: boolean = false;
+    /**
+     * 数据树节点是否显示
+     * 前端 UI 状态
+     */
+    @excludedInJSON()
+    public dataTreeNodeHidden: boolean = false;
+    /**
+     * 数据树节点是否展开
+     * 前端 UI 状态
+     */
+    @excludedInJSON()
+    public logicTreeNodeExpanded: boolean = false;
     /**
      * 是否为叶子节点
      * 前端 UI 状态

package/src/types/data/Entity.ts

@@ -27,6 +27,7 @@ export const systemProperty: { [name: string]: any, } = {
         type: 'integer',
         format: 'long',
         editable: false,
+        required: true,
         display: {
             inTable: false,
             inFilter: false,

package/src/types/data/Enum.ts

@@ -66,6 +66,11 @@ export class Enum extends Vertex {
      */
     @immutable()
     public readonly service: Service = undefined;
+    /**
+     * 节点是否为叶子节点
+     * 前端 UI 状态
+     */
+    public isLeaf = true;
     /**
      * 父节点
      */

package/src/types/data/Interface.ts

@@ -5,6 +5,7 @@ import {
 } from '..';
 import { interfaceService } from '../../service/data';
 import { findUsageService } from '../../service/common';
+import { catchFn } from '../logic/Logic';
 
 /**
  * 接口类
@@ -199,9 +200,9 @@ export class Interface extends Vertex {
      */
     @action('删除接口')
     async delete(none?: void, actionOptions?: ActionOptions) {
-        config.defaultApp?.emit('saving');
+        if(this.id) config.defaultApp?.emit('saving');
 
-        if (this.logic)
+        if (this.logic && this.serviceType?.toLowerCase() !== 'export')
             await this.logic.delete();
 
         if (this.id) {
@@ -245,7 +246,7 @@ export class Interface extends Vertex {
                 operationDesc: actionOptions?.actionDesc || `修改接口"${this.name}"`,
             },
             body,
-        });
+        }).catch(catchFn(this.logic));
         await then?.();
         await config.defaultApp?.history.load();
         config.defaultApp?.emit('saved');

package/src/types/data/genBlock/genCreateBlock.ts

@@ -29,7 +29,7 @@ export function genCreateFormTemplate(entity: Entity, nameGroup: NameGroup, sele
                     const lowerEntityName = utils.firstLowerCase(relationEntity.name);
                     formItem += `
                         <u-select clearable placeholder="请选择${label}" :data-source="${selectNameGroupMap.get(relationEntity.id).load}"
-                            text-field="${lowerEntityName}.${displayedProperty.name}" value-field="${lowerEntityName}.${relationProperty.name}" pageable remote-paging v-model="${nameGroup.model}.${property.name}">
+                            text-field="${lowerEntityName}.${displayedProperty.name}" value-field="${lowerEntityName}.${relationProperty.name}" :pageable="true" :remote-paging="true" v-model="${nameGroup.model}.${property.name}">
                         </u-select>
                     `;
                 } else
@@ -51,7 +51,7 @@ export function genCreateFormTemplate(entity: Entity, nameGroup: NameGroup, sele
         } else if (property.typeKey === '#/basicTypes/DateTime') {
             formItem += `<u-date-time-picker clearable :date.sync="${nameGroup.model}.${property.name}" placeholder="请输入${label}"></u-date-time-picker>`;
         } else if (dataTypesMap[property.typeKey].type === 'enum') {
-            formItem += genEnumSelectBlock(dataTypesMap[property.typeKey] as Enum, `${nameGroup.model}.${property.name}`, '', `请选择${label}`);
+            formItem += genEnumSelectBlock(dataTypesMap[property.typeKey] as Enum, `${nameGroup.model}.${property.name}`, '', `请选择${label}`, true);
         } else {
             formItem += `<u-input v-model="${nameGroup.model}.${property.name}" placeholder="请输入${label}"></u-input>`;
         }
@@ -94,7 +94,7 @@ export function genH5CreateFormTemplate(entity: Entity, nameGroup: NameGroup, se
                         <template #input><van-cascader title="请选择${label}" placeholder="请选择${label}"
                             v-model="${nameGroup.model}.${property.name}" :data-source="${selectNameGroupMap.get(relationEntity.id).load}"
                             text-field="${lowerEntityName}.${displayedProperty.name}" value-field="${lowerEntityName}.${relationProperty.name}"
-                            pageable remote-paging></van-cascader></template>
+                            :pageable="true" :remote-paging="true"></van-cascader></template>
                     `;
                 } else
                     return '';
@@ -112,9 +112,9 @@ export function genH5CreateFormTemplate(entity: Entity, nameGroup: NameGroup, se
         } else if (property.typeKey === '#/basicTypes/Date') {
             formItem += `<template #input><van-calendar v-model="${nameGroup.model}.${property.name}" title="请输入${property.label || property.name}"></van-calendar></template>`;
         } else if (property.typeKey === '#/basicTypes/Time') {
-            formItem += `<template #input><van-datetime-picker type="time" v-model="${nameGroup.model}.${property.name}" title="请输入${property.label || property.name}"></van-datetime-picker></template>`;
+            formItem += `<template #input><van-datetime-picker type="time" v-model="${nameGroup.model}.${property.name}" title="请选择${property.label || property.name}" label-field=""></van-datetime-picker></template>`;
         } else if (property.typeKey === '#/basicTypes/DateTime') {
-            formItem += `<template #input><van-datetime-picker type="datetime" v-model="${nameGroup.model}.${property.name}" title="请输入${property.label || property.name}"></van-datetime-picker></template>`;
+            formItem += `<template #input><van-datetime-picker type="datetime" v-model="${nameGroup.model}.${property.name}" title="请选择${property.label || property.name}" label-field=""></van-datetime-picker></template>`;
         } else if (dataTypesMap[property.typeKey].type === 'enum') {
             formItem += '<template #input>' + genEnumSelectBlock(dataTypesMap[property.typeKey] as Enum, `${nameGroup.model}.${property.name}`, '', `请选择${property.label || property.name}`) + '</template>';
         } else {

package/src/types/data/genBlock/genCurdBlock.ts

@@ -25,7 +25,7 @@ function genFilterTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroup
                     const lowerEntityName = utils.firstLowerCase(relationEntity.name);
                     formItem += `
                         <u-select clearable placeholder="请选择${label}" :data-source="${selectNameGroupMap.get(relationEntity.id).load}"
-                            text-field="${lowerEntityName}.${displayedProperty.name}" value-field="${lowerEntityName}.${relationProperty.name}" pageable remote-paging v-model="filter.${property.name}">
+                            text-field="${lowerEntityName}.${displayedProperty.name}" value-field="${lowerEntityName}.${relationProperty.name}" :pageable="true" :remote-paging="true" v-model="filter.${property.name}">
                         </u-select>
                     `;
                 } else
@@ -111,7 +111,7 @@ function genSaveModalTemplate(entity: Entity, nameGroup: NameGroup, selectNameGr
                     const lowerEntityName = utils.firstLowerCase(relationEntity.name);
                     formItem += `
                         <u-select clearable placeholder="请选择${label}" :data-source="${selectNameGroupMap.get(relationEntity.id).load}"
-                            text-field="${lowerEntityName}.${displayedProperty.name}" value-field="${lowerEntityName}.${relationProperty.name}" pageable remote-paging v-model="input.${property.name}">
+                            text-field="${lowerEntityName}.${displayedProperty.name}" value-field="${lowerEntityName}.${relationProperty.name}" :pageable="true" :remote-paging="true" v-model="input.${property.name}">
                         </u-select>
                     `;
                 } else
@@ -137,7 +137,7 @@ function genSaveModalTemplate(entity: Entity, nameGroup: NameGroup, selectNameGr
         } else if (property.typeKey === '#/basicTypes/DateTime') {
             formItem += `<u-date-time-picker clearable :date.sync="input.${property.name}" placeholder="请输入${label}"></u-date-time-picker>`;
         } else if (dataTypesMap[property.typeKey].type === 'enum') {
-            formItem += genEnumSelectBlock(dataTypesMap[property.typeKey] as Enum, `input.${property.name}`, '', `请选择${label}`);
+            formItem += genEnumSelectBlock(dataTypesMap[property.typeKey] as Enum, `input.${property.name}`, '', `请选择${label}`, true);
         } else {
             formItem += `<u-input v-model="input.${property.name}" placeholder="请输入${label}"></u-input>`;
         }

package/src/types/data/genBlock/genEnumSelectBlock.ts

@@ -7,14 +7,14 @@ import { config, Enum } from '../..';
  * @param size 尺寸属性的内容
  * @param placeholder 占位符的内容
  */
-export function genEnumSelectBlock(enumeration: Enum, vModel?: string, size?: string, placeholder?: string) {
+export function genEnumSelectBlock(enumeration: Enum, vModel?: string, size?: string, placeholder?: string, hiddenAll?: boolean) {
     if (config.scope === 'h5')
         return `<van-cascader ${vModel ? ` v-model="${vModel}"` : ''}${placeholder ? ` title="${placeholder}" placeholder="${placeholder}"` : ''}
         :data-source="ID_ENUM_LIST_${enumeration.id}"></van-cascader>`;
 
     return `<u-select clearable${vModel ? ` v-model="${vModel}"` : ''}${size ? ` size="${size}"` : ''}${placeholder ? ` placeholder="${placeholder}"` : ''}
             :data-source="ID_ENUM_LIST_${enumeration.id}">
-                <u-select-item text="全部"></u-select-item>
+                ${hiddenAll ? '' : '<u-select-item text="全部"></u-select-item>'}
             </u-select>`;
 }
 

package/src/types/data/genBlock/genGridViewBlock.ts

@@ -31,8 +31,19 @@ export function genGridViewCardTemplate(property: EntityProperty) {
     } else
         expression = getExpression(property, `scope.item.${lowerEntityName}.${property.name}`);
 
+    const getText = (property: EntityProperty) => {
+        if (property.typeKey === '#/basicTypes/Boolean') {
+            return `
+                <u-text v-if="${expression}" text="是"></u-text>
+                <u-text v-if="!${expression}" text="否"></u-text>
+                `;
+        } else {
+            return `<u-text :text="${expression}"></u-text>`;
+        }
+    };
+
     return `<u-linear-layout gap="small">
-                <u-text text="${title}:"></u-text><u-text :text="${expression}"></u-text>
+                <u-text text="${title}:"></u-text>${getText(property)}
             </u-linear-layout>`;
 }
 

package/src/types/data/genBlock/genListViewBlock.ts

@@ -11,7 +11,7 @@ export function genListViewTemplate(property: EntityProperty, nameGroup: NameGro
 
     return `<u-list-view ref="listView" :data-source="${nameGroup.load}" data-schema="${nameGroup.structure}"
     text-field="${nameGroup.lowerEntity}.${property.name}"
-    value-field="${nameGroup.lowerEntity}.id" pageable remote-paging>
+    value-field="${nameGroup.lowerEntity}.id" :pageable="true" :remote-paging="true">
     <template #item="scope">
         <u-linear-layout>
             <u-text :text="${expression}"></u-text>
@@ -25,7 +25,7 @@ export function genH5ListViewTemplate(property: EntityProperty, nameGroup: NameG
 
     return `<van-list-view ref="listView" :data-source="${nameGroup.load}" data-schema="${nameGroup.structure}"
     text-field="${nameGroup.lowerEntity}.${property.name}"
-    value-field="${nameGroup.lowerEntity}.id" pageable="auto-more" remote-paging>
+    value-field="${nameGroup.lowerEntity}.id" pageable="auto-more" :remote-paging="true">
     <template #item="scope">
         <van-cell :value="${expression}" isLink></van-cell>
     </template>

package/src/types/data/genBlock/genSelectBlock.ts

@@ -8,14 +8,14 @@ import {
 export function genSelectTemplate(property: EntityProperty, nameGroup: NameGroup) {
     return `<u-select clearable placeholder="请选择" ref="select" :data-source="${nameGroup.load}" data-schema="${nameGroup.structure}"
     text-field="${nameGroup.lowerEntity}.${property.name}"
-    value-field="${nameGroup.lowerEntity}.id" pageable remote-paging>
+    value-field="${nameGroup.lowerEntity}.id" :pageable="true" :remote-paging="true">
 </u-select>`;
 }
 
 export function genH5SelectTemplate(property: EntityProperty, nameGroup: NameGroup) {
     return `<van-cascader title="请选择" placeholder="请选择" ref="select" :data-source="${nameGroup.load}" data-schema="${nameGroup.structure}"
     text-field="${nameGroup.lowerEntity}.${property.name}"
-    value-field="${nameGroup.lowerEntity}.id" pageable remote-paging>
+    value-field="${nameGroup.lowerEntity}.id" :pageable="true" :remote-paging="true">
 </van-cascader>`;
 }
 

package/src/types/data/genBlock/genTableBlock.ts

@@ -34,10 +34,21 @@ export function genTableColumnTemplate(property: EntityProperty) {
     } else
         expression = getExpression(property, `scope.item.${lowerEntityName}.${property.name}`);
 
+    const getText = (property: EntityProperty) => {
+        if (property.typeKey === '#/basicTypes/Boolean') {
+            return `
+            <u-text v-if="${expression}" text="是"></u-text>
+            <u-text v-if="!${expression}" text="否"></u-text>
+            `;
+        } else {
+            return `<u-text :text="${expression}"></u-text>`;
+        }
+    };
+
     return `<u-table-view-column title="${title}">
     <template #cell="scope">
         <u-linear-layout gap="small">
-            <u-text :text="${expression}"></u-text>
+            ${getText(property)}
         </u-linear-layout>
     </template>
 </u-table-view-column>`;
@@ -54,7 +65,7 @@ export function genTableTemplate(entity: Entity, nameGroup: NameGroup) {
 
     return `<u-table-view ref="tableView" :data-source="${nameGroup.load}" data-schema="${nameGroup.structure}"
         value-field="${nameGroup.lowerEntity}.id"
-        pageable remote-paging>
+        :pageable="true" :remote-paging="true" :show-sizer="true">
     <u-table-view-column type="index" width="60" title="序号"></u-table-view-column>
 
     ${propertyList.map((property) => genTableColumnTemplate(property) + '\n').join('')}
@@ -281,7 +292,7 @@ export function genTableColumnBlock(property: EntityProperty, view: View) {
 
     return `
 <template>
-    <u-table-view ref="tableView" :data-source="${nameGroup.load}" pageable remote-paging data-schema="${nameGroup.structure}">
+    <u-table-view ref="tableView" :data-source="${nameGroup.load}" :pageable="true" :remote-paging="true" :show-sizer="true" data-schema="${nameGroup.structure}">
         ${propertyList.map((property) => genTableColumnTemplate(property) + '\n').join('')}
     </u-table-view>
 </template>

package/src/types/data/genBlock/genUpdateBlock.ts

@@ -40,7 +40,7 @@ export function genUpdateFormTemplate(
                     const lowerEntityName = utils.firstLowerCase(relationEntity.name);
                     formItem += `
                         <u-select clearable placeholder="请选择${label}" :data-source="${selectNameGroupMap.get(relationEntity.id).load}"
-                            text-field="${lowerEntityName}.${displayedProperty.name}" value-field="${lowerEntityName}.${relationProperty.name}" pageable remote-paging v-model="${nameGroup.model}.${property.name}">
+                            text-field="${lowerEntityName}.${displayedProperty.name}" value-field="${lowerEntityName}.${relationProperty.name}" :pageable="true" :remote-paging="true" v-model="${nameGroup.model}.${property.name}">
                         </u-select>
                     `;
                 } else
@@ -62,7 +62,7 @@ export function genUpdateFormTemplate(
         } else if (property.typeKey === '#/basicTypes/DateTime') {
             formItem += `<u-date-time-picker clearable :date.sync="${nameGroup.model}.${property.name}" placeholder="请输入${label}"></u-date-time-picker>`;
         } else if (dataTypesMap[property.typeKey].type === 'enum') {
-            formItem += genEnumSelectBlock(dataTypesMap[property.typeKey] as Enum, `${nameGroup.model}.${property.name}`, '', `请选择${label}`);
+            formItem += genEnumSelectBlock(dataTypesMap[property.typeKey] as Enum, `${nameGroup.model}.${property.name}`, '', `请选择${label}`, true);
         } else {
             formItem += `<u-input v-model="${nameGroup.model}.${property.name}" placeholder="请输入${label}"></u-input>`;
         }
@@ -105,7 +105,7 @@ export function genH5UpdateFormTemplate(entity: Entity, nameGroup: NameGroup, se
                         <template #input><van-cascader title="请选择${label}" placeholder="请选择${label}"
                             v-model="${nameGroup.model}.${property.name}" :data-source="${selectNameGroupMap.get(relationEntity.id).load}"
                             text-field="${lowerEntityName}.${displayedProperty.name}" value-field="${lowerEntityName}.${relationProperty.name}"
-                            pageable remote-paging></van-cascader></template>
+                            :pageable="true" :remote-paging="true"></van-cascader></template>
                     `;
                 } else
                     return '';
@@ -125,9 +125,9 @@ export function genH5UpdateFormTemplate(entity: Entity, nameGroup: NameGroup, se
         } else if (property.typeKey === '#/basicTypes/Date') {
             formItem += `<template #input><van-calendar clearable :date.sync="${nameGroup.model}.${property.name}" placeholder="请输入${label}"></van-calendar></template>`;
         } else if (property.typeKey === '#/basicTypes/Time') {
-            formItem += `<template #input><van-datetime-picker type="time" v-model="${nameGroup.model}.${property.name}" title="请输入${label}"></van-datetime-picker></template>`;
+            formItem += `<template #input><van-datetime-picker type="time" v-model="${nameGroup.model}.${property.name}" title="请选择${label}" label-field=""></van-datetime-picker></template>`;
         } else if (property.typeKey === '#/basicTypes/DateTime') {
-            formItem += `<template #input><van-datetime-picker type="datetime" v-model="${nameGroup.model}.${property.name}" title="请输入${label}"></van-datetime-picker></template>`;
+            formItem += `<template #input><van-datetime-picker type="datetime" v-model="${nameGroup.model}.${property.name}" title="请选择${label}" label-field=""></van-datetime-picker></template>`;
         } else if (dataTypesMap[property.typeKey].type === 'enum') {
             formItem += '<template #input>' + genEnumSelectBlock(dataTypesMap[property.typeKey] as Enum, `${nameGroup.model}.${property.name}`, '', `请选择${label}`) + '</template>';
         } else {