@lcap/nasl 0.3.10 → 0.3.11

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('')}
@@ -157,9 +168,7 @@ export function genTableRemoveLogic(entity: Entity, nameGroup: NameGroup) {
     const scopeStructureSchema = genGenericTypeSchema('ScopeOf', { T: { $ref: nameGroup.structure } });
     const deleteResolver = entity.resolvers.find((resolver) => resolver.name === 'delete');
     const deleteInterface = deleteResolver.interface;
-    const idParam = getParamFromResolver(deleteResolver, 'id');
-    const idProperty = entity.propertyList.find((property) => property.primaryKey || property.name === 'id');
-
+    const idPropertys = entity.propertyList.filter((property) => property.primaryKey);
     return {
         level: 'logic',
         name: nameGroup.remove,
@@ -180,13 +189,19 @@ export function genTableRemoveLogic(entity: Entity, nameGroup: NameGroup) {
             type: 'Start',
             label: '开始',
         },
-        genCallInterface(deleteInterface, [
-            genInterParam(
-                idParam.id,
-                `scope.item.${nameGroup.lowerEntity}.id`,
-                ['', '', `${nameGroup.structure}.${nameGroup.lowerEntity}`, idProperty.id],
-            ),
-        ]),
+        genCallInterface(deleteInterface,
+            idPropertys.map((idProperty) => {
+                let paramFromResolver = getParamFromResolver(deleteResolver, idProperty.name);
+                // 如果旧逻辑，但是新导入表中，id的name 不是id 的话，就直接使用名称叫id的
+                if (!paramFromResolver) {
+                    paramFromResolver = getParamFromResolver(deleteResolver, 'id');
+                }
+                return genInterParam(paramFromResolver.id,
+                    `scope.item.${nameGroup.lowerEntity}.id`,
+                    ['', '', `${nameGroup.structure}.${nameGroup.lowerEntity}`, idProperty.id],
+                )
+            }),
+        ),
         genCallComponentLogic('tableView', 'reload'),
         {
             level: 'logicNode',
@@ -281,7 +296,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/genBlock/index.ts

@@ -13,6 +13,8 @@ export * from './genSelectBlock';
 export * from './genCurdBlock';
 export * from './genListViewBlock';
 export * from './genGridViewBlock';
+export * from './genEditTableBlock';
+export * from './genCurdEditTableBlock';
 
 // eslint-disable-next-line prefer-const
 export let dragSource: Entity | EntityProperty = null;

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

@@ -169,6 +169,44 @@ export function genInterParam(paramIdOrName: string, expression: string, schemaR
     };
 }
 
+/**
+ * 生成接口 Param
+ * @param paramIdOrName 参数 id 或引用名称
+ * @param expression 表达式
+ * @param schemaChildren 数据结构
+ */
+export function genMemberExpression(expression: string, schemaRefs: Array<string> = []) {
+    const arr = expression.split('.');
+
+    let expressionNode: any;
+    arr.forEach((name, index) => {
+        const currentNode = {
+            level: LEVEL_ENUM.expressionNode,
+            type: 'Identifier',
+            name,
+            schemaRef: schemaRefs[index],
+        };
+        if (expressionNode) {
+            expressionNode = {
+                level: LEVEL_ENUM.expressionNode,
+                type: 'MemberExpression',
+                object: expressionNode,
+                property: {
+                    level: LEVEL_ENUM.expressionNode,
+                    type: 'Identifier',
+                    name,
+                    schemaRef: schemaRefs[index],
+                    code: schemaRefs[index] === '' ? '' : undefined,
+                },
+            };
+        } else {
+            expressionNode = currentNode;
+        }
+    });
+
+    return expressionNode;
+}
+
 /**
  * 命名组，主要承载一次 mergeBlock 中的逻辑名称
  */

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

@@ -22,7 +22,7 @@ export { Interface } from './data/Interface';
 export { Category } from './data/GlobalLogicNode';
 export { Logic } from './logic/Logic';
 export { LogicItem, LogicNode, ExpressionNode, evaluate } from './logic/LogicItem';
-export { BaseVariable, updateVariablesChildrenSchema, updateAllVariablesChildrenSchema } from './logic/BaseVariable';
+export { BaseVariable, updateVariablesChildrenSchema, updateAllVariablesChildrenSchema, variablesMap } from './logic/BaseVariable';
 export { Param } from './logic/Param';
 export { Variable } from './logic/Variable';
 export { Return } from './logic/Return';
@@ -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

@@ -1,10 +1,34 @@
 import { immutable, excludedInJSON, circular, action } from '../decorators';
-import { config, history, utils, Vertex, LEVEL_ENUM, Interface, Param, Return, Variable, vertexsMap, typeCheck, ProcessComponent, ProcessInterface, Process, ActionOptions } from '..';
+import { config, utils, Vertex, LEVEL_ENUM, Interface, Param, Return, Variable, vertexsMap, typeCheck, ProcessComponent, ProcessInterface, Process, ActionOptions } from '..';
 import { logicService, paramService } from '../../service/logic';
 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);
@@ -141,18 +178,16 @@ export class Logic extends Vertex {
         config.defaultApp?.emit('saving');
 
         const body = this.toJSON();
-        // body.params.forEach((param: any) => convert2SchemaType(param.schema));
-        // body.returns.forEach((ret: any) => convert2SchemaType(ret.schema));
-        // body.variables.forEach((variable: any) => convert2SchemaType(variable.schema));
         utils.logger.debug('添加逻辑', body);
         const result: Logic = await logicService.create({
             headers: {
+                moduleType: this.moduleType,
                 appId: config.defaultApp?.id,
                 operationAction: actionOptions?.actionName || 'Logic.create',
                 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 +215,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 +225,16 @@ 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: {
+                    moduleType: this.moduleType,
+                    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;
@@ -216,7 +247,6 @@ export class Logic extends Vertex {
                 typeCheck.delete(node.id);
             });
 
-            // const index =
             this.destroy();
             if (this.view) {
                 this.view.page.service.emit('pageTreeChange');
@@ -242,20 +272,50 @@ export class Logic extends Vertex {
 
         const body = this.toPlainJSON();
         utils.logger.debug('修改逻辑', body);
-        const result = await logicService.update({
+        await logicService.update({
             headers: {
+                moduleType: this.moduleType,
                 appId: config.defaultApp?.id,
                 operationAction: actionOptions?.actionName || 'Logic.update',
                 operationDesc: actionOptions?.actionDesc || `修改逻辑"${this.name}"`,
             },
             body,
-        });
+        }).catch(catchFn(this));
 
         await then?.();
         await config.defaultApp?.history.load();
         config.defaultApp?.emit('saved');
         return this;
     }
+    /**
+     * 更新所有调用了此Logic的LogicNode
+     */
+    async callLogicUpdate(actionOptions?: ActionOptions) {
+        config.defaultApp?.emit('saving');
+
+        const body = this.toPlainJSON();
+        body.params = this.params;
+        const result = await logicService.callLogicUpdate({
+            headers: {
+                appId: config.defaultApp?.id,
+                operationAction: actionOptions?.actionName || 'Logic.callLogicUpdate',
+                operationDesc: actionOptions?.actionDesc || `修改调用逻辑"${this.name}"`,
+            },
+            body,
+        }).catch((err: Error) => console.log(err)); // 报错不应影响参数的添加流程
+
+        (result || []).forEach(async (item: LogicNode) => {
+            if (vertexsMap.has(item.id)) {
+                const logicNode = vertexsMap.get(item.id) as LogicNode;
+                await logicNode.logic.load();
+                await logicNode.checkType();
+            }
+        });
+
+        // await config.defaultApp?.history.load();
+        config.defaultApp?.emit('saved');
+        return this;
+    }
     /**
      * 设置逻辑名称
      */
@@ -296,7 +356,7 @@ export class Logic extends Vertex {
     /**
      * 按当前 id 加载逻辑数据
      */
-    async load() {
+    load() {
         if (!this.id)
             return;
 
@@ -305,17 +365,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);
     }
@@ -333,6 +392,10 @@ export class Logic extends Vertex {
         });
 
         const results = await paramService.addList({
+            headers: {
+                moduleType: this.moduleType,
+                appId: config.defaultApp?.id,
+            },
             body,
         });
         params.forEach((param, index) => param.pick(results[index], ['id']));
@@ -346,10 +409,6 @@ export class Logic extends Vertex {
         if (isPlainObject(item)) {
             item = LogicItem.from(item, this, null);
         }
-        // if (!this.children.includes(child)) {
-        //     const index = child._posIndex === undefined ? this.children.length : child._posIndex;
-        //     this.children.splice(index, 0, child);
-        // }
         const parent = item.parentAttr ? vertexsMap.get(item.parentId) as LogicItem : undefined;
         return item.create({
             parent,
@@ -437,6 +496,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;