@lcap/nasl 1.0.0-alpha → 1.0.0-alpha.11

package/src/service/storage/init.ts

@@ -1,6 +1,8 @@
 import { embeddedTSEmitter } from '../../translator';
 import { App } from '../../concepts';
+import { getConceptConstructor } from '../../decorators';
 import { config } from '../../config';
+import Vue from 'vue';
 /// #if process.env.NODE_ENV
 import axios from './';
 /// #else
@@ -11,41 +13,74 @@ import * as jsoner from './jsoner';
 /**
  *  执行更新
  */
-async function doAction(app: any, list: any[]) {
+async function doAction(app: any, actionItem: any) {
+    let hasFrontEnd = false;
+    let hasBackEnd = false;
     const actionList: any[] = [];
+    const { list, actionMsg, action } = actionItem || {};
     if (Array.isArray(list)) {
-        list.forEach(({ action, path, object: objItem }) => {
-            if (Array.isArray(objItem)) {
-                if (action === 'update') {
-                    actionList.push({
-                        action,
-                        path,
-                        node: objItem[0],
-                    });
-                } else {
-                    objItem.forEach((item, index) => {
+        list.forEach((event) => {
+            const emitTarget = event?.originEvent?.target;
+            if (emitTarget.concept === 'View' || emitTarget.view) {
+                hasFrontEnd = true;
+            } else {
+                hasBackEnd = true;
+            }
+            if (emitTarget.concept === 'CallLogic') {
+                hasBackEnd = true;
+            }
+            event.eventList.forEach(({
+                action,
+                path,
+                object: objItem,
+            }: {
+                action: string;
+                path: string;
+                object: any
+            }) => {
+                if (Array.isArray(objItem)) {
+                    if (action === 'update') {
                         actionList.push({
                             action,
                             path,
-                            node: item,
+                            node: objItem[0],
                         });
+                    } else {
+                        objItem.forEach((item, index) => {
+                            actionList.push({
+                                action,
+                                path,
+                                node: item,
+                            });
+                        });
+                    }
+                } else {
+                    actionList.push({
+                        action,
+                        path,
+                        object: objItem,
                     });
                 }
-            } else {
-                actionList.push({
-                    action,
-                    path,
-                    object: objItem,
-                });
-            }
+            });
         });
     }
+    let ChangedNASLType = '';
+    if (hasFrontEnd && hasBackEnd) {
+        ChangedNASLType = 'both';
+    } else if (hasFrontEnd) {
+        ChangedNASLType = 'web';
+    } else if (hasBackEnd) {
+        ChangedNASLType = 'backend';
+    }
     if (config.storage.protocol === 'http') {
         const res = await axios.post('/api/storage/batchAction', actionList, {
             headers: {
                 appId: app.id,
+                ChangedNASLType,
             },
         });
+    } else if (config.storage.protocol === 'mock') {
+        // Do nothing
     } else {
         const json = await fs.readJSON(config.storage.basePath);
         jsoner.batchAction(json, actionList);
@@ -53,51 +88,30 @@ async function doAction(app: any, list: any[]) {
             spaces: 4,
         });
     }
+
     if (!app._historying) {
         if (app._historyIndex !== app._historyList.length) {
             app._historyList = app._historyList.splice(0, app._historyIndex);
         }
-        app._historyList.push(list);
+        app._historyList.push({
+            actionMsg,
+            list: list.map((item: any) => item.originEvent),
+        });
         app._historyIndex = app._historyList.length;
     } else {
+        const actionMap = {
+            undo: '已撤销操作：',
+            redo: '已重做操作：',
+        };
+        let msg = actionMap[action as 'undo' | 'redo'];
+        msg += actionMsg;
+        Vue.prototype.$toast.info(msg);
         app._historying = false;
     }
 }
 
-/**
- * 加载 app
- * @param appId 如果是从文件读，就不需要传
- * @returns app 对象
- */
-export async function loadApp(appId?: string) {
-    let app: any;
-    if (config.storage.protocol === 'http') {
-        // 请求
-        const res = await axios.post('/api/storage/batchQuery', [
-            {
-                path: 'app',
-                excludes: ['views'],
-            },
-        ], {
-            headers: {
-                appId,
-            },
-        });
-        const data = res && res.data;
-
-        app = new App(data?.[0]);
-    } else {
-        const json = await fs.readJSON(config.storage.basePath);
-        // const result = jsoner.batchQuery(json, [
-        //     {
-        //         path: 'app',
-        //         excludes: ['views'],
-        //     },
-        // ]);
-        app = new App(json);
-    }
-
-    app._isCollecting = false;
+function handleApp(app: any) {
+    app._isCollectingCount = 0;
     app._collectingList = [];
     app._historyList = [];
     app._historyIndex = 0;
@@ -114,20 +128,30 @@ export async function loadApp(appId?: string) {
     /**
      * 开启收集
      */
-    app.on('collect:start', () => {
-        app._isCollecting = true;
+    app.on('collect:start', (event: any) => {
+        app._isCollectingCount++;
+        app._actionMsg = event?.actionMsg;
+        app._action = event?.action;
     });
 
     /**
      * 结束收集
      */
     app.on('collect:end', async () => {
-        app._isCollecting = false;
-        embeddedTSEmitter.emit('change', {
-            value: app._collectingList,
-        });
-        await doAction(app, app._collectingList);
+        if (Array.isArray(app._collectingList) && app._collectingList.length) {
+            embeddedTSEmitter.emit('change', {
+                value: app._collectingList,
+            });
+            await doAction(app, {
+                list: app._collectingList,
+                actionMsg: app._actionMsg,
+                action: app._action,
+            });
+        }
+        app._isCollectingCount--;
         app._collectingList = [];
+        app._actionMsg = '';
+        app._action = '';
     });
 
     /**
@@ -135,26 +159,97 @@ export async function loadApp(appId?: string) {
      */
     app.on('storage', (event: any) => {
         // 是否正在收集
-        if (!app._isCollecting) {
+        if (app._isCollectingCount === 0) {
             embeddedTSEmitter.emit('change', {
                 value: [event],
             });
-            const { action } = event;
+            let actionMsg = '';
+            const { action, target } = event.originEvent || {};
+            const { concept, name } = target || {};
             switch (action) {
                 case 'create':
-                    doAction(app, [event]);
+                    actionMsg = '添加';
                     break;
                 case 'delete':
-                    doAction(app, [event]);
+                    actionMsg = '删除';
                     break;
                 case 'update':
-                    doAction(app, [event]);
+                    actionMsg = '修改';
                     break;
             }
+            actionMsg += getConceptConstructor(concept).nodeTitle;
+            if (name) {
+                actionMsg += `“${name}”`;
+            }
+            doAction(app, {
+                list: [event],
+                actionMsg,
+            });
         } else {
             app._collectingList.push(event);
         }
     });
+}
 
+/**
+ * 加载 app
+ * @param appId 如果是从文件读，就不需要传
+ * @returns app 对象
+ */
+export async function loadApp(appId?: string) {
+    let app: App;
+    if (config.storage.protocol === 'http') {
+        // 请求
+        const res = await axios.post('/api/storage/batchQuery', [
+            {
+                path: 'app',
+                excludes: ['views'],
+            },
+        ], {
+            headers: {
+                appId,
+            },
+        });
+        const data = res?.data?.result;
+        app = new App(Object.assign(data?.[0], { id: appId }));
+    } else if (config.storage.protocol === 'mock') {
+        app = new App({
+            id: appId,
+            concept: 'App',
+            name: 'devapp',
+            title: '开发应用',
+            scope: 'pc',
+            envs: 'dev,online',
+            hasAuth: true,
+            entities: [],
+            structures: [],
+            enums: [],
+            logics: [],
+            interfaces: [],
+            views: [],
+            processes: [],
+            roles: [],
+            dependencies: [],
+            interfaceDependencies: [],
+            componentDependencies: [],
+        });
+    } else {
+        const json = await fs.readJSON(config.storage.basePath);
+        app = new App(Object.assign(json, { id: appId }));
+    }
+    config.scope = app.scope;
+    handleApp(app);
+    (app as any)._isCollectingCount = 0;
     return app as App;
 }
+
+/**
+ * 加载 app
+ * @returns app 对象
+ */
+export function loadAppSync() {
+    const json = fs.readJSONSync(config.storage.basePath);
+    const app = new App(json);
+    handleApp(app);
+    return app;
+}

package/src/templator/genCallComponentLogic.ts

@@ -8,8 +8,8 @@ import { NaslLogicItem } from './utils';
  */
 export function genCallComponentLogic(componentName: string, componentMethod: string, params: Array<string> = []) {
     return NaslLogicItem.CallLogic({
-        calleeNamespace: '',
-        calleeName: `$refs.${componentName}.${componentMethod}`,
+        calleeNamespace: `elements.${componentName}.logics`,
+        calleeName: componentMethod,
         arguments: params.map((param) => {
             if (typeof param === 'string')
                 return NaslLogicItem.Argument({

package/src/templator/genCreateBlock.ts

@@ -1,18 +1,22 @@
 import { config } from '../config';
 import * as utils from '../utils';
-import { App, Namespace, Entity, Logic, View } from '../concepts';
+import { App, Namespace, Entity, Logic, View, Enum } from '../concepts';
+import { NaslUITypeAnnotation, NaslTypeAnnotation, NaslLogicItem, NaslNode } from './utils';
 import {
-    NaslUITypeAnnotation, NaslTypeAnnotation, NaslLogicItem,
-    NaslNode,
-} from './utils';
-import {
-    NameGroup, genUniqueQueryNameGroup, filterProperty, genLogicParam,
-    getFirstDisplayedProperty, genCallComponentLogic,
-    genLoadSelectLogic, genQueryStructure, genQueryLogic,
+    NameGroup,
+    genUniqueQueryNameGroup,
+    filterProperty,
+    genLogicParam,
+    getFirstDisplayedProperty,
+    genCallComponentLogic,
+    genEnumSelectBlock,
+    genLoadSelectLogic,
+    genQueryStructure,
+    genQueryLogic,
 } from '.';
 
 export function genCreateFormTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroupMap: Map<string, NameGroup>) {
-    const parentNode = (entity.parentNode as App | Namespace);
+    const parentNode = entity.parentNode as App | Namespace;
     const properties = entity.properties.filter(filterProperty('inForm'));
 
     return `<u-form ref="${nameGroup.viewElementMainView}">
@@ -31,13 +35,14 @@ export function genCreateFormTemplate(entity: Entity, nameGroup: NameGroup, sele
 
             let formItem = `            <u-form-item label="${label}"${required ? ' required' : ''}${rulesStr.length ? ` rules="${rulesStr}"` : ''}>\n`;
 
-            const propertyTypeName = property.typeAnnotation.typeName;
+            const { typeAnnotation } = property || {};
+            const { typeName: propertyTypeName, typeNamespace: propertyTypeNamespace } = typeAnnotation || {};
             if (property.relationEntity) {
                 // 有外键关联
                 const relationEntity = parentNode?.findEntityByName(property.relationEntity);
                 if (relationEntity) {
                     const relationProperty = relationEntity.properties.find((prop) => prop.name === property.relationProperty);
-                    const displayedProperty = getFirstDisplayedProperty(relationEntity, 'inForm');
+                    const displayedProperty = getFirstDisplayedProperty(relationEntity);
                     if (displayedProperty) {
                         const lowerEntityName = utils.firstLowerCase(relationEntity.name);
                         const selectNameGroup = selectNameGroupMap.get(relationEntity.name);
@@ -65,9 +70,14 @@ export function genCreateFormTemplate(entity: Entity, nameGroup: NameGroup, sele
             } else if (propertyTypeName === 'DateTime') {
                 formItem += `<u-date-time-picker clearable :date.sync="${vModel}" placeholder="请输入${label}"></u-date-time-picker>`;
             } else {
-                formItem += `<u-input v-model="${vModel}" placeholder="请输入${label}"></u-input>`;
+                const namespaceArr = propertyTypeNamespace.split('.');
+                const type = namespaceArr.pop();
+                if (type === 'enums') {
+                    formItem += genEnumSelectBlock(parentNode.findEnumByName(propertyTypeName) as Enum, `${vModel}`, '', `请选择${label}`, true);
+                } else {
+                    formItem += `<u-input v-model="${vModel}" placeholder="请输入${label}"></u-input>`;
+                }
             }
-
             formItem += `            </u-form-item>\n`;
             return formItem;
         })
@@ -97,13 +107,14 @@ export function genH5CreateFormTemplate(entity: Entity, nameGroup: NameGroup, se
             const rulesStr = rules.join(' | ');
 
             let formItem = `            <van-field drole="other" label="${property.label || property.name}"${required ? ' required' : ''}${rulesStr.length ? ` rules="${rulesStr}"` : ''}>\n`;
-            const propertyTypeName = property.typeAnnotation.typeName;
+            const { typeAnnotation } = property || {};
+            const { typeName: propertyTypeName, typeNamespace: propertyTypeNamespace } = typeAnnotation || {};
             if (property.relationEntity) {
                 // 有外键关联
                 const relationEntity = parentNode?.findEntityByName(property.relationEntity);
                 if (relationEntity) {
                     const relationProperty = relationEntity.properties.find((prop) => prop.name === property.relationProperty);
-                    const displayedProperty = getFirstDisplayedProperty(relationEntity, 'inForm');
+                    const displayedProperty = getFirstDisplayedProperty(relationEntity);
                     if (displayedProperty) {
                         const lowerEntityName = utils.firstLowerCase(relationEntity.name);
                         const selectNameGroup = selectNameGroupMap.get(relationEntity.name);
@@ -125,20 +136,21 @@ export function genH5CreateFormTemplate(entity: Entity, nameGroup: NameGroup, se
                 formItem += `<template #input><van-stepper v-model="${vModel}" placeholder="请输入${property.label || property.name}"></van-stepper></template>`;
             } else if (propertyTypeName === 'Text') {
                 formItem = formItem.replace(/other/g, '');
-                formItem += `<van-input v-model="${vModel}" placeholder="请输入${property.label || property.name}"></van-input>`;
+                formItem += `<template #input><van-input v-model="${vModel}" placeholder="请输入${property.label || property.name}"></van-input></template>`;
             } else if (propertyTypeName === 'Date') {
                 formItem += `<template #input><van-calendar v-model="${vModel}" title="请输入${property.label || property.name}"></van-calendar></template>`;
             } else if (propertyTypeName === 'Time') {
-                formItem += `<template #input><van-datetime-picker type="time" v-model="${vModel}" title="请选择${
-                    property.label || property.name
-                }" label-field=""></van-datetime-picker></template>`;
+                formItem += `<template #input><van-datetime-picker type="time" v-model="${vModel}" title="请选择${property.label || property.name}" label-field=""></van-datetime-picker></template>`;
             } else if (propertyTypeName === 'DateTime') {
-                formItem += `<template #input><van-datetime-picker type="datetime" v-model="${vModel}" title="请选择${
-                    property.label || property.name
-                }" label-field=""></van-datetime-picker></template>`;
+                formItem += `<template #input><van-datetime-picker type="datetime" v-model="${vModel}" title="请选择${property.label || property.name}" label-field=""></van-datetime-picker></template>`;
             } else {
-                formItem = formItem.replace(/other/g, '');
-                formItem += `<van-input v-model="${vModel}" placeholder="请输入${property.label || property.name}"></van-input>`;
+                const namespaceArr = propertyTypeNamespace.split('.');
+                const type = namespaceArr.pop();
+                if (type === 'enums') {
+                    formItem += '<template #input>' + genEnumSelectBlock(parentNode.findEnumByName(propertyTypeName) as Enum, `${vModel}`, '', `请选择${label}`, true) + '</template>';
+                } else {
+                    formItem += `<template #input><van-fieldinput v-model="${vModel}" placeholder="请输入${property.label || property.name}"></van-fieldinput></template>`;
+                }
             }
 
             formItem += `            </van-field>\n`;
@@ -154,9 +166,7 @@ export function genH5CreateFormTemplate(entity: Entity, nameGroup: NameGroup, se
 }
 
 function genSubmitLogic(createLogic: Logic, nameGroup: NameGroup) {
-    const params = [
-        genLogicParam(`${createLogic.params[0].name}`, nameGroup.viewVariableEntity),
-    ];
+    const params = [genLogicParam(`${createLogic.params[0].name}`, nameGroup.viewVariableEntity)];
     return NaslNode.Logic({
         name: nameGroup.viewLogicSubmit,
         params: [],
@@ -193,7 +203,7 @@ function genSubmitLogic(createLogic: Logic, nameGroup: NameGroup) {
                     NaslLogicItem.CallLogic({
                         label: '弹出消息',
                         shortcut: true,
-                        calleeNamespace: 'nasl.ui.logics',
+                        calleeNamespace: 'nasl.ui',
                         calleeName: 'showMessage',
                         arguments: [
                             NaslLogicItem.Argument({
@@ -219,7 +229,7 @@ function genSubmitLogic(createLogic: Logic, nameGroup: NameGroup) {
 export function genCreateBlock(entity: Entity, view: View) {
     const parentNode = entity.parentNode as App | Namespace;
     const ns = entity.ns;
-    const createLogic = ns?.logics?.find((logic) => logic.name === `create${entity.name}`);
+    const createLogic = ns?.logics?.find((logic) => logic.name === `create`);
 
     const nameGroup: NameGroup = {};
     nameGroup.viewElementMainView = view.getLogicUniqueName('form1');

package/src/templator/genCurdEditMultipleKeyBlock.ts

@@ -4,14 +4,14 @@
  * 3. 先简单做后续在看如何优化
  */
 import * as utils from '../utils';
-import { App, Namespace, Entity, View } from '../concepts';
+import { App, Namespace, Entity, View, Enum } from '../concepts';
 import {
     NaslCoreTypeAnnotation, NaslUITypeAnnotation, NaslTypeAnnotation,
     NaslLogicItem, NaslNode,
 } from './utils';
 import {
     filterProperty, NameGroup, genUniqueQueryNameGroup, getFirstDisplayedProperty, genCallComponentLogic,
-    genQueryLogic, genEditTableTemplate, genEditTableLoadLogic, genTableRemoveLogic,
+    genQueryLogic, genEditTableTemplate, genEditTableLoadLogic, genTableRemoveLogic, genEnumSelectBlock,
     genLoadSelectLogic, genBlurUpdateLogic, genEditQueryStructure, genQueryStructure, genLogicParam,
 } from '.';
 
@@ -28,13 +28,17 @@ function genFilterTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroup
             const label = property.label || property.name;
             let formItem = `<u-form-item label="${label}">`;
 
-            const propertyTypeName = property.typeAnnotation.typeName;
+            const { typeAnnotation } = property || {};
+            const {
+                typeName: propertyTypeName,
+                typeNamespace: propertyTypeNamespace,
+            } = typeAnnotation || {};
             if (property.relationEntity) {
                 // 有外键关联
                 const relationEntity = parentNode?.findEntityByName(property.relationEntity);
                 if (relationEntity) {
                     const relationProperty = relationEntity.properties.find((prop) => prop.name === property.relationProperty);
-                    const displayedProperty = getFirstDisplayedProperty(relationEntity, 'inFilter');
+                    const displayedProperty = getFirstDisplayedProperty(relationEntity);
                     if (displayedProperty) {
                         const lowerEntityName = utils.firstLowerCase(relationEntity.name);
                         const selectNameGroup = selectNameGroupMap.get(relationEntity.name);
@@ -67,7 +71,13 @@ function genFilterTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroup
             } else if (propertyTypeName === 'DateTime') {
                 formItem += `<u-date-time-picker clearable :date.sync="${vModel}" placeholder="请输入${label}"></u-date-time-picker>`;
             } else {
-                formItem += `<u-input v-model="${vModel}" placeholder="请输入${label}"></u-input>`;
+                const namespaceArr = propertyTypeNamespace.split('.');
+                const type = namespaceArr.pop();
+                if (type === 'enums') {
+                    formItem += genEnumSelectBlock(parentNode.findEnumByName(propertyTypeName) as Enum, `${vModel}`, '', `请选择${label}`, true);
+                } else {
+                    formItem += `<u-input v-model="${vModel}" placeholder="请输入${label}"></u-input>`;
+                }
             }
 
             formItem += `</u-form-item>`;
@@ -116,13 +126,17 @@ function genSaveModalTemplate(entity: Entity, nameGroup: NameGroup, selectNameGr
                                     ${rulesStr.length ? `rules="${rulesStr}"` : ''}
                                 >`;
 
-            const propertyTypeName = property.typeAnnotation.typeName;
+            const { typeAnnotation } = property || {};
+            const {
+                typeName: propertyTypeName,
+                typeNamespace: propertyTypeNamespace,
+            } = typeAnnotation || {};
             if (property.relationEntity) {
                 // 有外键关联
                 const relationEntity = parentNode?.findEntityByName(property.relationEntity);
                 if (relationEntity) {
                     const relationProperty = relationEntity.properties.find((prop) => prop.name === property.relationProperty);
-                    const displayedProperty = getFirstDisplayedProperty(relationEntity, 'inForm');
+                    const displayedProperty = getFirstDisplayedProperty(relationEntity);
                     if (displayedProperty) {
                         const lowerEntityName = utils.firstLowerCase(relationEntity.name);
                         const selectNameGroup = selectNameGroupMap.get(relationEntity.name);
@@ -154,7 +168,13 @@ function genSaveModalTemplate(entity: Entity, nameGroup: NameGroup, selectNameGr
             } else if (propertyTypeName === 'DateTime') {
                 formItem += `<u-date-time-picker clearable :date.sync="${vModel}" placeholder="请输入${label}"></u-date-time-picker>`;
             } else {
-                formItem += `<u-input v-model="${vModel}" placeholder="请输入${label}"></u-input>`;
+                const namespaceArr = propertyTypeNamespace.split('.');
+                const type = namespaceArr.pop();
+                if (type === 'enums') {
+                    formItem += genEnumSelectBlock(parentNode.findEnumByName(propertyTypeName) as Enum, `${vModel}`, '', `请选择${label}`, true);
+                } else {
+                    formItem += `<u-input v-model="${vModel}" placeholder="请输入${label}"></u-input>`;
+                }
             }
 
             formItem += `</u-form-item>\n`;
@@ -241,8 +261,8 @@ function genCreateLogic(nameGroup: NameGroup) {
 
 function genSubmitLogic(entity: Entity, nameGroup: NameGroup) {
     const ns = entity.ns;
-    const updateLogic = ns?.logics?.find((logic) => logic.name === `update${entity.name}`);
-    const createLogic = ns?.logics?.find((logic) => logic.name === `create${entity.name}`);
+    const updateLogic = ns?.logics?.find((logic) => logic.name === `update`);
+    const createLogic = ns?.logics?.find((logic) => logic.name === `create`);
 
     return NaslNode.Logic({
         name: nameGroup.viewLogicSubmit,
@@ -419,7 +439,7 @@ export function genCurdEditMultipleKeyBlock(entity: Entity, view: View) {
             "concept": "BindEvent",
             "arguments": [],
             "name": "created",
-            "calleeNamespace": "${view.getNamespace()}.views.View_${view.name}.logics",
+            "calleeNamespace": "${view.getNamespace()}.views.${view.name}.logics",
             "calleeName": "${nameGroup.viewLogicInit}"
         }
     ],