@lcap/nasl 2.22.0-beta.0 → 2.22.0-beta.1

package/src/concepts/View__.ts

@@ -269,8 +269,6 @@ export class View extends BaseNode {
         });
     }
 
-    
-
     /**
     * 插入页面元素
     * @internal
@@ -404,7 +402,6 @@ export class View extends BaseNode {
         return node;
     }
 
-
     getParamUniqueName(name = 'param1') {
         return utils.unique(name, this.getVarExistingNames(), undefined, false);
     }
@@ -542,7 +539,6 @@ export class View extends BaseNode {
         return node;
     }
 
-
     getVariableUniqueName(name = 'variable1') {
         return utils.unique(name, this.getVarExistingNames(), undefined, false);
     }
@@ -680,7 +676,6 @@ export class View extends BaseNode {
         return node;
     }
 
-
     getLogicUniqueName(name = 'logic1') {
         return utils.unique(name, this.getLogicExistingNames(), undefined, false);
     }
@@ -818,7 +813,6 @@ export class View extends BaseNode {
         return node;
     }
 
-
     getBindEventExistingNames(excludedList: Array<BindEvent> = []) {
         const excludedSet = new Set(excludedList);
         return ((this.bindEvents as BindEvent[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -960,9 +954,6 @@ export class View extends BaseNode {
         return node;
     }
 
-
-
-
     getViewExistingNames(excludedList: Array<View> = []) {
         const excludedSet = new Set(excludedList);
         return ((this.children as View[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -1104,9 +1095,6 @@ export class View extends BaseNode {
         return node;
     }
 
-
-    
-
     /**
     * 删除页面元素
     * @param name 页面元素名称
@@ -1155,8 +1143,6 @@ export class View extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除输入参数
     * @param name 输入参数名称
@@ -1205,8 +1191,6 @@ export class View extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除变量
     * @param name 变量名称
@@ -1255,8 +1239,6 @@ export class View extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除逻辑
     * @param name 逻辑名称
@@ -1305,8 +1287,6 @@ export class View extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除元素绑定事件
     * @param name 元素绑定事件名称
@@ -1355,8 +1335,6 @@ export class View extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除页面
     * @param name 页面名称
@@ -1489,9 +1467,9 @@ export class View extends BaseNode {
         }
         const definitionStr = utils.sliceTagContent(code, 'definition') || '{}';
         const definition: any = JSON.parse(definitionStr);
-
+        let node = null;
         if (template) {
-            const node = ViewElement.fromHTML(template, {
+            node = ViewElement.fromHTML(template, {
                 view: this,
                 definition,
             });
@@ -1584,6 +1562,7 @@ export class View extends BaseNode {
                 }
             });
         }
+        return node;
     }
 
     onChange($event?: EventPayload): void {

package/src/concepts/basics/stdlib/nasl.ui.ts

@@ -921,6 +921,21 @@ export const uiStructures = [
             }),
         ],
     }),
+    new Structure({
+        name: 'ExpandEvent',
+        properties: [
+            new StructureProperty({
+                name: 'item',
+                description: '展开项相关对象',
+                typeAnnotation: TypeAnnotation.createPrimitive('String'),
+            }),
+            new StructureProperty({
+                name: 'expanded',
+                description: '展开状态值',
+                typeAnnotation: TypeAnnotation.createPrimitive('Boolean'),
+            }),
+        ],
+    }),
 ];
 
 export const uiTypeList: Array<TypeAnnotation> = reference2TypeAnnotationList(uiStructures, 'nasl.ui');

package/src/concepts/basics/stdlib/nasl.util.ts

@@ -14,6 +14,7 @@ import BooleanLiteral from '../../BooleanLiteral__';
 import StringLiteral from '../../StringLiteral__';
 import AnonymousFunction from '../../AnonymousFunction__';
 import StringInterpolation from '../../StringInterpolation__';
+import NewList from '../../NewList__';
 
 export default new Namespace({
     name: 'util',
@@ -1230,6 +1231,99 @@ export default new Namespace({
                 }),
             ],
         }),
+        new Function({
+            name: 'GetDateCount',
+            description: '按指定维度计算日期，如“所在年-第几周”',
+            params: [
+                new Param({
+                    name: '指定日期',
+                    description: '将被计算的日期',
+                    typeAnnotation: TypeAnnotation.createPrimitive('DateTime'),
+                }),
+                new Param({
+                    name: '根据指定日期计算',
+                    description: '获取指定日期的特定信息，如是其所在年的第几天',
+                    typeAnnotation: TypeAnnotation.createPrimitive('String'),
+                    defaultValue: 'week-year',
+                    defaultExpression: new StringLiteral({ value: 'week-year' }),
+                    cascader: true,
+                }),
+            ],
+        }),
+        new Function({
+            name: 'AlterDateTime',
+            description: '为指定日期时间调整增加（减少）时间',
+            params: [
+                new Param({
+                    name: '指定日期时间',
+                    description: '将被更改的日期时间或日期',
+                    typeAnnotation: TypeAnnotation.createPrimitive('DateTime'),
+                }),
+                new Param({
+                    name: '调整',
+                    description: '为指定的日期时间增加或减少指定的数量，只能填整数',
+                    typeAnnotation: TypeAnnotation.createPrimitive('String'),
+                    defaultValue: 'Increase',
+                    defaultExpression: new StringLiteral({ value: 'Increase' }),
+                    options: [
+                        { text: '增加', value: 'Increase' },
+                        { text: '减少', value: 'Decrease' },
+                    ],
+                }),
+                new Param({
+                    name: 'amount',
+                    typeAnnotation: TypeAnnotation.createPrimitive('Long'),
+                    defaultExpression: new NumericLiteral({ value: '0' }),
+                }),
+                new Param({
+                    name: '计算数',
+                    typeAnnotation: TypeAnnotation.createPrimitive('String'),
+                    defaultValue: 'day',
+                    defaultExpression: new StringLiteral({ value: 'day' }),
+                    options: [
+                        { text: '天', value: 'day' },
+                        { text: '周', value: 'week' },
+                        { text: '月', value: 'month' },
+                        { text: '季度', value: 'quarter' },
+                        { text: '年', value: 'year' },
+                    ],
+                }),
+            ],
+        }),
+        new Function({
+            name: 'GetSpecificDaysOfWeek',
+            description: '按“星期几”获取指定日期范围内的日子',
+            params: [
+                new Param({
+                    name: '起始',
+                    description: '起始日期（包含）',
+                    typeAnnotation: TypeAnnotation.createPrimitive('DateTime'),
+                }),
+                new Param({
+                    name: '结束',
+                    description: '结束日期（包含）',
+                    typeAnnotation: TypeAnnotation.createPrimitive('DateTime'),
+                }),
+                new Param({
+                    name: '指定',
+                    description: '指定的星期几，可多选',
+                    defaultExpression: new NewList({
+                        typeAnnotation: TypeAnnotation.createGeneric('List', {
+                            typeArguments: [TypeAnnotation.createPrimitive('Long')],
+                        }),
+                    }),
+                    options: [
+                        { text: '星期一', value: '1' },
+                        { text: '星期二', value: '2' },
+                        { text: '星期三', value: '3' },
+                        { text: '星期四', value: '4' },
+                        { text: '星期五', value: '5' },
+                        { text: '星期六', value: '6' },
+                        { text: '星期日', value: '7' },
+                    ],
+                }),
+            ],
+        }),
         new Function({
             name: 'Clone',
             description: '复制一个所选参数的实例',

package/src/concepts/index__.ts

@@ -2,6 +2,8 @@ export * from './App__';
 export * from './Module__';
 export * from './Namespace__';
 export * from './Frontend__';
+export * from './Integration__';
+export * from './MicroApp__';
 export * from './TypeAnnotation__';
 export * from './DatabaseTypeAnnotation__';
 export * from './TypeParam__';
@@ -56,6 +58,7 @@ export * from './ValidationRule__';
 export * from './Argument__';
 export * from './Anchor__';
 export * from './JSBlock__';
+export * from './JavaLogic__';
 export * from './Identifier__';
 export * from './NullLiteral__';
 export * from './BooleanLiteral__';

package/src/generator/genBundleFiles.ts

@@ -7,7 +7,7 @@ import * as JSON5 from 'json5';
 import * as UglifyJS from 'uglify-js-export';
 
 import { genMetaData } from './genMetaData';
-
+import { integrateMicroApp } from './microApp';
 export interface Route {
     path?: string;
     component?: RawOptions; // ExtendedVue<Vue, unknown, unknown, unknown, Record<never, any>>;
@@ -277,7 +277,18 @@ export function genBundleFiles(app: App, frontend: Frontend,
         var metaData = ${metaDataStr};
         var routes = ${routesStr};
 
-        window.createLcapApp = () => window.appVM = window.cloudAdminDesigner.init(platformConfig.appConfig, platformConfig, routes, metaData);
+        window.createLcapApp = () => {
+            appVM = window.cloudAdminDesigner.init(platformConfig.appConfig, platformConfig, routes, metaData);
+
+            try {
+                var push = appVM.$router.history.push;
+                appVM.$router.history.push = function (a, b) {
+                    push.apply(this, [a, b, console.warn]);
+                };
+            } catch (e) { console.error(e) }
+
+            return window.appVM = appVM;
+        };
         window.createLcapApp();
     })();`;
 
@@ -364,9 +375,16 @@ export function genBundleFiles(app: App, frontend: Frontend,
         bundleMinPath = `${baseUrl}${frontend.basePath}/bundle.${genHash(content)}.min.js`;
     }
     const otherJsList = (frontend as any)?.appletsConfig?.enable ? ['//res.wx.qq.com/open/js/jweixin-1.3.2.js'] : [];
+    
+    const microAppIntegration = integrateMicroApp(frontend);
+    
     const assetsContent = `(function() {
-    LazyLoad.js(${JSON5.stringify(assetsInfo.basic.js.concat(assetsInfo.custom.js, otherJsList).concat([bundleMinPath]))});
-    LazyLoad.css(${JSON5.stringify(assetsInfo.basic.css.concat(assetsInfo.custom.css))});
+    const loadAssets = () => {
+        LazyLoad.js(${JSON5.stringify(assetsInfo.basic.js.concat(assetsInfo.custom.js, otherJsList).concat([bundleMinPath]))});
+        LazyLoad.css(${JSON5.stringify(assetsInfo.basic.css.concat(assetsInfo.custom.css))});     
+    }
+
+    ${microAppIntegration || 'loadAssets();'}
 })()
 `;
     let minifyObj = { code: '' };

package/src/generator/genReleaseBody.ts

@@ -102,7 +102,7 @@ export async function genReleaseBody(app: App, {
 
     // 打印传给服务端的nasl,为了服务端排查问题方便
     if (globalThis.window) {
-        console.log(NaslAnnotatedJSON, '标注后的nasl');
+        console.info(NaslAnnotatedJSON, '标注后的nasl');
     }
     files.push({ name: 'nasl-annotated.json', content: jsonString });
 
@@ -210,7 +210,7 @@ function getAuthApiPathList(app: App, frontends: Array<Frontend>) {
                 return `/api/${_name}/${_path}:POST`;
             }
         } else {
-            return `/api/${logicName}:POST`;
+            return `/api/lcplogics/${logicName}:POST`;
         }
 
         function getName(name: string) {

package/src/generator/icestark.ts

@@ -0,0 +1,45 @@
+export default `
+    if(window.ICESTARK?.root) {
+        Object.assign(window.ICESTARK, {
+            appEnter({ container, customProps  }) {
+                window.LcapMicro = window.LcapMicro || {};
+                Object.assign(window.LcapMicro, {properties});
+            
+                if(window.LcapMicro.noAuthUrl && !window.LcapMicro.noAuthFn)
+                    window.LcapMicro.noAuthFn = () => {
+                        location.href = window.LcapMicro.noAuthUrl;
+                    };
+            
+                if(window.LcapMicro.loginUrl && !window.LcapMicro.loginFn)
+                    window.LcapMicro.loginFn = () => {
+                        location.href = window.LcapMicro.loginUrl;
+                    };
+
+                if(window.LcapMicro.notFoundUrl && !window.LcapMicro.notFoundFn)
+                    window.LcapMicro.notFoundFn = () => {
+                        location.href = window.LcapMicro.notFoundUrl;
+                    };
+                
+                // 兼容 ICESTARK 旧集成方式
+                if(!window.LcapMicro.loginFn)
+                    window.LcapMicro.loginFn = window.ICESTARK.loginFn;
+                if(!window.LcapMicro.routePrefix)
+                    window.LcapMicro.routePrefix = window.ICESTARK.basename;
+                if(!window.LcapMicro.proxyPrefix)
+                    window.LcapMicro.proxyPrefix = window.ICESTARK.proxyPrefix;
+
+                window.LcapMicro.container = container; 
+                window.LcapMicro.props = customProps;
+                loadAssets();
+            },
+            appLeave({ container }) {
+                container.innerHTML = null;
+                window.appVM?.$destroy();
+                document.querySelectorAll('script.lazyload').forEach((ele) => {
+                    ele.active = false;
+                });
+            },
+        });
+    } else
+        loadAssets();
+`;

package/src/generator/microApp.ts

@@ -0,0 +1,32 @@
+import qiankun from './qiankun';
+import icestark from './icestark';
+import { App, Frontend } from '../concepts';
+
+const framewords = {
+    qiankun, icestark,
+};
+
+export function integrateMicroApp(frontend: Frontend) {
+    if(frontend.type === 'h5') return '';
+
+    let { framework, name, routePrefix, proxyPrefix, loginUrl, noAuthUrl, notFoundUrl  } = frontend.app.integration?.microApp || {};
+    if(!framework) framework = 'icestark';  // 兼容 ICESTARK 旧集成方式
+
+    if(loginUrl === `${routePrefix}${frontend.basePath}/login`)
+        loginUrl = undefined;
+    if(noAuthUrl === `${routePrefix}${frontend.basePath}/noAuth`)
+        noAuthUrl = undefined;
+    if(notFoundUrl === `${routePrefix}${frontend.basePath}/notFound`)
+        notFoundUrl = undefined;    
+
+    const properties = JSON.stringify({
+        name: name || undefined,
+        routePrefix: routePrefix || undefined,
+        proxyPrefix: proxyPrefix || undefined,
+        loginUrl: loginUrl || undefined,
+        noAuthUrl: noAuthUrl || undefined,
+        notFoundUrl: notFoundUrl || undefined,
+    });
+    return framewords[framework].replace(/\{properties\}/g, properties);
+}
+

package/src/generator/permission.ts

@@ -115,8 +115,7 @@ function findResourcesOfUI(view: View | ViewElement) {
 
 function optimizeResourceData(resources: ResourceNode[][]) {
     let res = removeRedundantResourceData(resources);
-    res = removeRedundantResourceData2(res);
-    return res;
+    return res
 }
 
 // [['b'], ['a' ,'b']] 只需要保留 [['b']]
@@ -144,19 +143,6 @@ function removeRedundantResourceData(resources: ResourceNode[][]) {
     return res;
 }
 
-// 子页面有权限，父页面默认也有权限，所以不需要记录父页面权限；
-// 组件有权限，组件所在的页面默认也有权限，所以不需要记录页面权限
-function removeRedundantResourceData2(resources: ResourceNode[][]) {
-    return resources.map((resource) => {
-        if (resource.length <= 1)
-            return resource;
-
-        if (resource[0].type === 'page')
-            return resource.slice(0, 1);
-        else if (resource[0].type === 'component')
-            return resource.filter((item) => item.type === 'component');
-    });
-}
 
 async function findResourcesOfLogic(logic: Logic, uploaders: Map<string, ViewElement[]>) {
     const logics = await findViewLogicReferences(logic);

package/src/generator/qiankun.ts

@@ -0,0 +1,49 @@
+export default `
+    if(window.__POWERED_BY_QIANKUN__) {
+        window.LcapMicro = window.LcapMicro || {};
+        Object.assign(window.LcapMicro, {properties});
+        
+        window[window.LcapMicro.name] = {
+            bootstrap() {
+                return Promise.resolve();
+            },
+            mount(props) {   
+                window.LcapMicro = window.LcapMicro || {};
+                Object.assign(window.LcapMicro, {properties});
+            
+                if(window.LcapMicro.noAuthUrl && !window.LcapMicro.noAuthFn)
+                    window.LcapMicro.noAuthFn = () => {
+                        location.href = window.LcapMicro.noAuthUrl;
+                    };
+            
+                if(window.LcapMicro.loginUrl && !window.LcapMicro.loginFn)
+                    window.LcapMicro.loginFn = () => {
+                        location.href = window.LcapMicro.loginUrl;
+                    };
+
+                if(window.LcapMicro.notFoundUrl && !window.LcapMicro.notFoundFn)
+                    window.LcapMicro.notFoundFn = () => {
+                        location.href = window.LcapMicro.notFoundUrl;
+                    };
+                
+                const { container } = props;
+                window.LcapMicro.container = container.querySelector('#app'); 
+                window.LcapMicro.props = props;
+                if(window.createLcapApp)
+                    window.createLcapApp()
+                else
+                    loadAssets();
+                return Promise.resolve();
+            },
+            unmount({ container }) {
+                window.LcapMicro.container.innerHTML = null;
+                window.appVM?.$destroy();
+                document.querySelectorAll('script.lazyload').forEach((ele) => {
+                    ele.active = false;
+                })
+                return Promise.resolve();
+            },
+        };
+    } else
+        loadAssets();
+`;

package/src/index.ts

@@ -10,4 +10,5 @@ export * from './config';
 export * from './eventBus';
 export { loadApp, loadAppSync, handleApp, batchAction, batchQuery } from './service/storage/init';
 export { createService } from './service/creator';
+export * from './manager/stepRecorder';
 import './automate/engine';

package/src/manager/stepRecorder.ts

@@ -0,0 +1,112 @@
+import format from 'date-fns/format';
+
+export const stepRecorder = {
+    count: 0,
+    initialized: false,
+    init() {
+        this.count = this.getKeys().length;
+
+        const div = document.createElement('div');
+        div.id = 'recorder';
+        (div as any).style = 'position: fixed; top: -12px; right: 300px; z-index: 9999; background: #fffbd0; padding: 10px; border: 1px solid #ccc; border-radius: 5px;';
+
+        div.innerHTML = `<div><span style="color: red; font-size: 17px; vertical-align: -2px;">◉</span> 正在录制中…</div>
+<div style="margin-top: -2px;">当前应用的操作步骤数：<span id="recorder-count">${this.count}</span></div>
+<div style="margin-top: 4px;">
+    <button onclick="$data.nasl.stepRecorder.exportExcel()">下载数据</button>
+</div>
+`;
+        //     <button onclick="$data.nasl.stepRecorder.clear()">清除数据</button>
+        document.body.appendChild(div);
+
+        const script = document.createElement('script');
+        script.src = 'https://cdnjs.cloudflare.com/ajax/libs/xlsx-populate/1.21.0/xlsx-populate.min.js';
+        document.body.appendChild(script);
+
+        this.initialized = true;
+    },
+    clear() {
+        // eslint-disable-next-line no-alert
+        const result = confirm('确定要清空所有当前应用的操作记录吗？');
+        if (result) {
+            this.getKeys().forEach((key) => localStorage.removeItem(key));
+            this.count = 0;
+            document.getElementById('recorder-count').innerText = String(this.count);
+        }
+    },
+    getAppName() {
+        return location.search.match(/appId=([^-]+)/)[1];
+    },
+    getKeys() {
+        return Object.keys(localStorage).filter((key) => key.startsWith(`录-${this.getAppName()}-`));
+    },
+    record(actionMsg: string, actionItem: {
+        action: 'undo' | 'redo',
+    }, actionList: Array<{ action: string, path: string, object: { concept: string, name: string } }>) {
+        try {
+            const actionItemDetail = actionList?.[0];
+            const timestamp = new Date().toJSON();
+            // eslint-disable-next-line function-paren-newline
+            localStorage.setItem(`录-${this.getAppName()}-${this.count + 1}`, JSON.stringify(
+                // {
+                //     timestamp,
+                //     message: actionMsg + (actionItem?.action ? ' ' + actionItem.action : ''),
+                //     detail: {
+                //         action: actionItemDetail?.action,
+                //         path: actionItemDetail?.path,
+                //         object: {
+                //             concept: actionItemDetail?.object?.concept,
+                //             name: actionItemDetail?.object?.name,
+                //         }
+                //     },
+                // }
+                [
+                    timestamp,
+                    actionMsg,
+                    ({ undo: '撤销', redo: '重做' })[actionItem?.action],
+                    actionItemDetail?.action,
+                    actionItemDetail?.path,
+                    actionItemDetail?.object?.concept,
+                    actionItemDetail?.object?.name,
+                ]));
+            this.count++;
+            document.getElementById('recorder-count').innerText = String(this.count);
+        } catch (e) {
+            console.log(e);
+        }
+    },
+    exportExcel() {
+        (window as any).XlsxPopulate.fromBlankAsync()
+            .then((workbook: any) => {
+                const sheet = workbook.sheet(0);
+                const firstRowData = ['操作时间', '操作信息', '是否为撤销重做', '（详情）action', '（详情）path', '（详情）concept', '（详情）name'];
+                sheet.range(1, 1, 1, firstRowData.length).value([firstRowData]);
+                sheet.row(1).style({
+                    bold: true,
+                    fill: 'E1EAFF',
+                }).height(22);
+                [30, 30, 30, 14, 30, 18, 18].forEach((width, index) => sheet.column(index + 1).width(width));
+
+                this.getKeys().sort().forEach((key, index) => {
+                    const item = JSON.parse(localStorage[key]);
+                    item[0] = format(new Date(item[0]), 'yyyy-MM-dd HH:mm:ss');
+                    sheet.range(index + 2, 1, index + 2, firstRowData.length).value([item]);
+                });
+
+                // Write to file.
+                return workbook.outputAsync()
+                    .then((blob: Blob) => {
+                        const url = window.URL.createObjectURL(blob);
+                        const a = document.createElement('a');
+                        document.body.appendChild(a);
+                        a.href = url;
+                        a.download = `操作步骤统计-${this.getAppName()}-${format(new Date(), 'yyyyMMddHHmmss')}.xlsx`;
+                        a.click();
+                        window.URL.revokeObjectURL(url);
+                        document.body.removeChild(a);
+                    });
+            });
+    },
+};
+
+export default stepRecorder;

package/src/sentry/index.ts

@@ -1,3 +1,5 @@
+import axios from 'axios';
+
 export const CONSTRUCTOR_HOOK = 'constructor';
 export const BEFORE_HOOK = 'before';
 export const AFTER_HOOK = 'after';
@@ -5,6 +7,8 @@ export const AFTER_HOOK = 'after';
 export const NASL_NODE = 'nasl-node';
 export const TS_WORKER_MESSAGER = 'ts-worker-messager';
 
+export const getAxios = () => axios;
+
 type ClassType = { new(...args: any[]): any };
 
 type Source = {
@@ -19,6 +23,8 @@ type Listener = (source: Source) => void;
 
 type Monitor = (key: string) => <T extends ClassType>(SourceClass: T) => T;
 
+const passthroughProperties = ['constructor', 'getClassName'];
+
 const previousStore: { [key:string]: Source } = {};
 const listenersStore: { [key:string]: Listener[] } = {};
 
@@ -71,7 +77,7 @@ export const sentryMonitor: Monitor = (key) => (SourceClass) => {
 
     const properties = Object.getOwnPropertyNames(SourceClass.prototype);
     const names = properties.filter((property) => {
-        if (property === 'constructor') {
+        if (passthroughProperties.includes(property)) {
             return false;
         }
 
@@ -131,4 +137,4 @@ export const addListenerToNaslNode = addListener(NASL_NODE);
 export const addListenerToTSWorkerMessager = addListener(TS_WORKER_MESSAGER);
 
 export const sentryMonitorNaslNode = sentryMonitor(NASL_NODE);
-export const sentryMonitorTSWorkerMessager = sentryMonitor(TS_WORKER_MESSAGER);
+export const sentryMonitorTSWorkerMessager = sentryMonitor(TS_WORKER_MESSAGER);