@lcap/nasl 0.3.12-beta → 0.3.12-beta.3

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

@@ -10,11 +10,11 @@ export * from './genGetBlock';
 export * from './genCreateBlock';
 export * from './genUpdateBlock';
 export * from './genSelectBlock';
-export * from './genCurdBlock';
 export * from './genListViewBlock';
 export * from './genGridViewBlock';
 export * from './genEditTableBlock';
-export * from './genCurdEditTableBlock';
+export * from './genCurdMultipleKeyBlock';
+export * from './genCurdEditMultipleKeyBlock';
 
 // eslint-disable-next-line prefer-const
 export let dragSource: Entity | EntityProperty = null;

package/src/types/index.ts

@@ -9,6 +9,7 @@ export { Service, WebService, MicroService, SERVICE_TYPE } from './app/Service';
 
 export { DataNode } from './data/DataNode';
 export { GlobalLogicNode } from './data/GlobalLogicNode';
+export { Module } from './data/Module';
 export { Entity, systemProperty } from './data/Entity';
 export { EntityProperty } from './data/EntityProperty';
 export { EntityIndex } from './data/EntityIndex';
@@ -84,6 +85,7 @@ export enum LEVEL_ENUM {
     dataNode = 'dataNode',
     gloablLogicNode = 'gloablLogicNode',
     category = 'category',
+    module = 'module',
     entity = 'entity',
     structure = 'structure',
     enum = 'enum',

package/src/types/logic/Logic.ts

@@ -144,6 +144,11 @@ export class Logic extends Vertex {
      */
     @immutable()
     public readonly moreChildrenFields: Array<string> = ['params', 'returns', 'variables'];
+    /**
+     * 归属的模块
+     */
+    @immutable()
+    public readonly moduleName: string = undefined;
     /**
      * @param source 需要合并的部分参数
      */

package/src/types/logic/LogicItem.ts

@@ -1,6 +1,6 @@
 import { immutable, excludedInJSON, action } from '../decorators';
 import { config, typeCheck, utils, Vertex, LEVEL_ENUM, Logic, Schema, ActionOptions, ACTION_MODE } from '..';
-import { logicService } from '../../service/logic';
+import { logicService, checkTypeClient } from '../../service/logic';
 import { traverse } from '../utils';
 import { vertexsMap } from '../cacheData';
 import { getSchemaOfExpressionNode } from './tools';
@@ -1051,20 +1051,27 @@ export class LogicItem extends Vertex {
     }
 
     private async _checkType(node: LogicItem) {
-        const res = await logicService.checkType({
-            query: {
+        if (checkTypeClient.connect) { 
+            checkTypeClient.client.emit('checktype', {
+                id: node.id,
+                type: 'logicItem',
                 logicId: this.logic && this.logic.id,
-                loItemId: node.id,
-            },
-        });
-        if (res) {
-            res.logicId = this.logic && this.logic.id;
-            typeCheck.pushAll([res]);
-
-            LogicItem.assignTypeCheckResult(node, res);
+            });
         }
-
-        return res;
+        // const res = await logicService.checkType({
+        //     query: {
+        //         logicId: this.logic && this.logic.id,
+        //         loItemId: node.id,
+        //     },
+        // });
+        // if (res) {
+        //     res.logicId = this.logic && this.logic.id;
+        //     typeCheck.pushAll([res]);
+
+        //     LogicItem.assignTypeCheckResult(node, res);
+        // }
+
+        // return res;
     }
 
     static assignTypeCheckResult(logicItem: LogicItem | LogicItem[], typeCheckResult: any) {

package/src/types/logic/Param.ts

@@ -96,7 +96,7 @@ export class Param extends BaseVariable {
         config.defaultApp?.emit('saved');
 
         // 更新所有调用此Logic的LogicItem
-        // await this.logic.callLogicUpdate();
+        await this.logic.callLogicUpdate();
         return this;
     }
     /**

package/src/types/logic/translator.js

@@ -604,7 +604,14 @@ export default function (source) {
             }
 
             if (node.type === 'BuiltInFunction') {
-                const params = (node.builtInFuncParams || []).map((param) => generateNode(param.builtInFuncParamValue));
+                let params = (node.builtInFuncParams || []).map((param) => generateNode(param.builtInFuncParamValue));
+                if (node.calleeCode === 'Split') {
+                    // Bug-34789: 参考 url 转义规则对 ' 转义
+                    // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/encodeURIComponent
+                    params = params.map((param) => (param.replace(/'(.*)'/, (match, p1) => `'${p1.replace(/'/g, '%27')}'`)));
+                    if (params.find((param) => param.includes('%27')))
+                        return `this.$utils['${node.calleeCode}'](${params.join(',')}).map((item) => item.replace(/%27/g, "'"))`;
+                }
                 return `this.$utils['${node.calleeCode}'](${params.join(',')})`;
             }
 

package/src/types/page/View.ts

@@ -180,7 +180,11 @@ export class View extends Block {
      * 在 loadDetail 的情况下使用
      * @returns
      */
-    load() {
+    load(enableCache = true) {
+        const isGONGHANG = utils.getGlobalEnv() === 'gonghang';
+        if (isGONGHANG) {
+            enableCache = false;
+        }
         // 如果有正在进行的 Promise，则直接返回它
         if (this.contentPromise)
             return this.contentPromise;
@@ -191,6 +195,9 @@ export class View extends Block {
                     path: {
                         id: this.id,
                     },
+                    query: {
+                        enableCache,
+                    },
                 });
 
                 const $def = result.$def;

package/src/types/process/ProcessParam.ts

@@ -68,7 +68,7 @@ export class ProcessParam extends Param {
         config.defaultApp?.emit('saved');
 
         // 更新所有调用此Logic的LogicItem
-        // await this.process.launchProcessInterface.logic.callLogicUpdate();
+        await this.process.launchProcessInterface.logic.callLogicUpdate();
         return this;
     }
     /**