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

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 {

package/src/types/data/systemTypes.ts

@@ -23,6 +23,7 @@ export const systemTypeList = [
     { kind: 'systemType', text: 'UploadEvent', value: '#/systemTypes/UploadEvent' },
     { kind: 'systemType', text: 'UploadErrorEvent', value: '#/systemTypes/UploadErrorEvent' },
     { kind: 'systemType', text: 'SortEvent', value: '#/systemTypes/SortEvent' },
+    { kind: 'systemType', text: 'PoiInfo', value: '#/systemTypes/PoiInfo' },
 ];
 
 export const systemTypeMap: { [name: string]: ObjectSchema } = {
@@ -1512,4 +1513,50 @@ export const systemTypeMap: { [name: string]: ObjectSchema } = {
             },
         ],
     },
+    '#/systemTypes/PoiInfo': {
+        name: 'PoiInfo',
+        type: 'object',
+        propertyList: [
+            {
+                typeKey: '#/basicTypes/String',
+                type: 'string',
+                format: '',
+                name: 'source',
+                description: '信息来源',
+                isLeaf: true,
+            },
+            {
+                typeKey: '#/basicTypes/String',
+                type: 'string',
+                format: '',
+                name: 'id',
+                description: 'POI点的id',
+                isLeaf: true,
+            },
+            {
+                typeKey: '#/basicTypes/String',
+                type: 'string',
+                format: '',
+                name: 'name',
+                description: '名称',
+                isLeaf: true,
+            },
+            {
+                typeKey: '#/basicTypes/String',
+                type: 'string',
+                format: '',
+                name: 'location',
+                description: '经纬度',
+                isLeaf: true,
+            },
+            {
+                typeKey: '#/basicTypes/String',
+                type: 'string',
+                format: '',
+                name: 'address',
+                description: '地址',
+                isLeaf: true,
+            },
+        ],
+    },
 };

package/src/types/enum.ts

@@ -0,0 +1,6 @@
+export enum BusinessCode {
+    ElementExist = 402002,
+    ElementNotExist = 402004,
+    ParentElementNotExist = 402006,
+    HasReferenced = 402005,
+}

package/src/types/generator/hotReload.ts

@@ -1,11 +1,21 @@
 import webFileService from '../../service/webFile';
 
+let saveLastModifiedEnabled = true;
+export function enableSaveLastModified() {
+    saveLastModifiedEnabled = true;
+}
+export function disableSaveLastModified() {
+    saveLastModifiedEnabled = false;
+}
+
 /**
  * 生成上次修改的缓存
  * @param serviceId
  * @param path
  */
 export function saveLastModified(serviceId: string, path?: string) {
+    if(!saveLastModifiedEnabled) return;
+
     return webFileService.saveFile({
         body: {
             serviceId,

package/src/types/index.ts

@@ -57,6 +57,7 @@ export { default as login } from './login';
 export * as utils from './utils';
 export * as genBlock from './data/genBlock';
 export * as generator from './generator';
+export { Permission } from './permission/Permission';
 
 /**
  * 层级枚举
@@ -75,6 +76,7 @@ export enum LEVEL_ENUM {
 
     logic = 'logic',
     param = 'param',
+    timer = 'timer',
     variable = 'variable',
     return = 'return',
     interface = 'interface',
@@ -104,6 +106,7 @@ export enum LEVEL_ENUM {
     processComponent = 'processComponent',
     processParam = 'processParam',
     processReturn = 'processReturn',
+    processTimer = 'processTimer',
     processProperty = 'processProperty',
     processComponentReturn = 'processComponentReturn',
     processComponentVariable = 'processComponentVariable',
@@ -121,6 +124,7 @@ export const LEVEL_NAME_MAP = {
 
     logic: '逻辑',
     param: '输入参数',
+    timer: '定时任务',
     variable: '局部变量',
     return: '输出参数',
     interface: '接口',

package/src/types/logic/Logic.ts

@@ -5,6 +5,30 @@ import View from '../page/View';
 import { ExpressionNode, LogicItem, LogicNode } from './LogicItem';
 import { convert2SchemaType } from '../data/dataTypeUtils';
 import { isPlainObject, throttle } from 'lodash';
+import { refreshInterfaces, refreshView, refreshPages } from '../cache';
+import { BusinessCode } from '../enum';
+
+export function catchFn(logic: Logic) {
+    return async (err: any) => {
+        const code = err?.code;
+        if([BusinessCode.ElementExist, BusinessCode.ElementNotExist].includes(code)) {
+            if(logic.interface) {
+                await refreshInterfaces();
+            } else if(logic.view) {
+                await refreshView(logic.view);
+            }
+        } else if(code === BusinessCode.ParentElementNotExist) {  // 父节点不存在。视图添加逻辑，发现视图不存在
+            if(logic.view) {
+                await refreshPages();
+            }
+        } else
+            config.defaultApp?.emit('saved', err);
+
+        config.defaultApp?.history.load();
+
+        throw err;
+    }
+}
 
 /**
  * 逻辑类
@@ -123,6 +147,19 @@ export class Logic extends Vertex {
     /**
      * @param source 需要合并的部分参数
      */
+    /**
+     * 逻辑配置的cron表达式
+     */
+    @immutable()
+    public cron: string = undefined;
+    /**
+     * 定时类型，当前只能是cronTrigger
+     */
+    @immutable()
+    public triggerType: string = undefined;
+    /**
+     * 定时任务
+     */
     constructor(source?: Partial<Logic>) {
         super();
         source && this.assign(source);
@@ -152,7 +189,7 @@ export class Logic extends Vertex {
                 operationDesc: actionOptions?.actionDesc || `添加逻辑"${this.name}"`,
             },
             body,
-        });
+        }).catch(catchFn(this));
         this.deepPick(result, ['id']);
         this.pick(result, ['playgroundId']);
         this.assign({ body: result.body.map((logicNode) => LogicNode.from(logicNode, this, null)) });
@@ -180,9 +217,8 @@ export class Logic extends Vertex {
      */
     @action('删除逻辑')
     async delete(none?: void, actionOptions?: ActionOptions) {
-        config.defaultApp?.emit('saving');
-
         if (this.id) {
+            config.defaultApp?.emit('saving');
             const body = this.toPlainJSON();
             if (this.view) {
                 body.moduleId = this.view.id;
@@ -191,19 +227,15 @@ export class Logic extends Vertex {
                 body.moduleId = this.interface.service.id;
                 body.moduleType = 'microService';
             }
-            try {
-                await logicService.delete({
-                    headers: {
-                        appId: config.defaultApp?.id,
-                        operationAction: actionOptions?.actionName || 'Logic.delete',
-                        operationDesc: actionOptions?.actionDesc || `删除逻辑"${this.name}"`,
-                    },
-                    body,
-                });
-            } catch (err) {
-                await config.defaultApp?.history.load();
-                throw err;
-            }
+
+            await logicService.delete({
+                headers: {
+                    appId: config.defaultApp?.id,
+                    operationAction: actionOptions?.actionName || 'Logic.delete',
+                    operationDesc: actionOptions?.actionDesc || `删除逻辑"${this.name}"`,
+                },
+                body,
+            }).catch(catchFn(this));
 
             if (this.view) {
                 const { logics } = this.view.$def;
@@ -249,7 +281,7 @@ export class Logic extends Vertex {
                 operationDesc: actionOptions?.actionDesc || `修改逻辑"${this.name}"`,
             },
             body,
-        });
+        }).catch(catchFn(this));
 
         await then?.();
         await config.defaultApp?.history.load();
@@ -305,17 +337,16 @@ export class Logic extends Vertex {
             return this.contentPromise;
 
         return this.contentPromise = (async () => {
-            try {
-                const result = await logicService.loadDetail({
-                    query: {
-                        moduleId: this.moduleId,
-                        moduleType: this.moduleType,
-                        id: this.id,
-                    },
-                });
-                const newLogic = Logic.from(result, this.interface || this.view || this.processComponent, this);
-                this.assign(newLogic);
-            } catch (err) {}
+            const result = await logicService.loadDetail({
+                query: {
+                    moduleId: this.moduleId,
+                    moduleType: this.moduleType,
+                    id: this.id,
+                },
+                config: { noErrorTip: true },
+            }).catch(catchFn(this));
+            const newLogic = Logic.from(result, this.interface || this.view || this.processComponent, this);
+            this.assign(newLogic);
             return this;
         })().finally(() => this.contentPromise = undefined);
     }
@@ -437,6 +468,56 @@ export class Logic extends Vertex {
 
         return logic;
     }
+    /**
+     * 更新定时任务
+     */
+    @action('更新定时任务')
+    async updateTimer(cron: string) {
+        this.assign({ cron });
+        this.triggerType = 'cronTrigger';
+        await this.update(undefined, {
+            actionDesc: `设置定时任务"为"${cron}"`,
+        });
+
+        if (this.view) {
+            this.view.page.service.emit('pageTreeChange');
+            this.emit('change');
+        }
+        return this;
+    }
+    /**
+     * 验证表达式正确与否
+     */
+    async validateTimer() {
+        const body = this.toPlainJSON();
+        const result = await logicService.validateTimer({
+            body,
+            config: {
+                noErrorTip: true,
+            },
+        });
+        return result;
+    }
+    /**
+     * 输出最近十次运行结果
+     */
+    async testTimer() {
+        const body = this.toPlainJSON();
+        const result = await logicService.testTimer({
+            body,
+        });
+        return result;
+    }
+    /**
+     * 更新接口缓存
+     */
+    async updateCronCache() {
+        const body = this.toPlainJSON();
+        const result = await logicService.updateCronCache({
+            body,
+        });
+        return result;
+    }
 }
 
 export default Logic;