@lcap/nasl 2.13.0-beta.1 → 2.13.0-beta.2

package/src/server/translator.ts

@@ -233,6 +233,11 @@ const TS_RULES: Array<{
         re: /No value exists in scope for the shorthand property '__(?:outOfProcess)__'. Either declare one or provide an initializer./,
         result: '节点未关联到流程图',
     },
+    {
+        re: /'(.+?)' is declared but its value is never read/,
+        result: "已添加'$1'，但从来没有使用过。",
+        transforms: [transformType, transformType],
+    },
     {
         re: /'(.+?)' has no exported member(?: named)? '(.+?)'/,
         result: '找不到$1 $2。',
@@ -296,10 +301,6 @@ const TS_RULES: Array<{
         result: '当前内容中有重复的 $1，可能会影响使用。',
         transforms: [outOriginalvalue],
     },
-    {
-        re: /'\$LogicEmpty' is declared but its value is never read./,
-        result: '逻辑为空，请编辑内容',
-    },
 ];
 
 const POST_RULES: Array<{
@@ -498,20 +499,12 @@ export function naslNodeTranslateMessage(minRange: MinRange, tsErrorDetail: Diag
         str = (node.parentNode as any).constructor.nodeTitle + '：' + str;
         tsErrorDetail.message = str;
     }
-    if (/'\$LogicEmpty' is declared but its value is never read./.exec(text)) {
-        if (node instanceof Logic) {
-            node.isSmpty = true;
-        }
-    }
+
     for (const rule of POST_RULES) {
         if (rule.re.test(tsErrorDetail.message))
             tsErrorDetail.message = tsErrorDetail.message.replace(rule.re, rule.result);
     }
     node.tsErrorDetail = tsErrorDetail;
-    // 如果logic中有报错就把标识置为true
-    if ((node as any).logic) {
-        (node as any).logic.haveError = true;
-    }
     return {
         node,
         ...tsErrorDetail,

package/src/service/storage/init.ts

@@ -10,6 +10,9 @@ import * as fs from 'fs-extra';
 import * as jsoner from './jsoner';
 /// #endif
 
+export const batchQuery = storageService.batchQuery;
+export const batchAction = storageService.batchAction;
+
 function getLogic(key: string, app: any, diffLogicList: string[]) {
     if (!diffLogicList.includes(key)) {
         diffLogicList.push(key);
@@ -217,9 +220,7 @@ async function doAction(app: any, actionItem: any) {
                 headers: {
                     appId: app.id,
                     ChangedNASLType,
-                    'request-appBaseVersion': (window as any).appData?.baseVersion || '',
-                    'request-versionChangedTime': (window as any).appData?.versionChangedTime || '',
-                    operateArea: (window as any).appData?.branchStatus === 'merging' ? 'merge_conflict' : '',
+                    // 其他封装在 storageService 里了
                 },
             });
         } catch (error) {
@@ -387,9 +388,7 @@ export async function loadApp(appId?: string) {
             ],
             headers: {
                 appId,
-                'request-appBaseVersion': (window as any).appData?.baseVersion || '',
-                'request-versionChangedTime': (window as any).appData?.versionChangedTime || '',
-                operateArea: (window as any).appData?.branchStatus === 'merging' ? 'merge_conflict' : '',
+                // 其他封装在 storageService 里了
             },
         });
         // const data = res?.data?.result;

package/src/service/storage/service.ts

@@ -3,4 +3,31 @@ import api from './api';
 
 const service = createService(api);
 
-export default service;
+export default {
+    batchQuery({ body, headers }: { body: Array<any>, headers: Record<string, string> }) {
+        const appData = (window as any).appData;
+
+        return service.batchQuery({
+            body,
+            headers: Object.assign({
+                appId: appData?.appId,
+                'request-appBaseVersion': appData?.baseVersion || '',
+                'request-versionChangedTime': appData?.versionChangedTime || '',
+                operateArea: appData?.branchStatus === 'merging' ? 'merge_conflict' : '',
+            }, headers),
+        });
+    },
+    batchAction({ body, headers }: { body: Array<any>, headers: Record<string, string> }) {
+        const appData = (window as any).appData;
+
+        return service.batchAction({
+            body,
+            headers: Object.assign({
+                appId: appData?.appId,
+                'request-appBaseVersion': (window as any).appData?.baseVersion || '',
+                'request-versionChangedTime': (window as any).appData?.versionChangedTime || '',
+                operateArea: (window as any).appData?.branchStatus === 'merging' ? 'merge_conflict' : '',
+            }, headers),
+        });
+    },
+};

package/src/templator/genCurdEditMultipleKeyBlock.ts

@@ -22,7 +22,6 @@ import {
     genEditQueryStructure,
     genQueryStructure,
     genLogicParam,
-    genReloadLogic,
 } from '.';
 
 function genFilterTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroupMap: Map<string, NameGroup>) {
@@ -98,7 +97,7 @@ function genFilterTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroup
         .join('')}
 
         <u-form-item>
-            <u-button color="primary" @click="${nameGroup.viewLogicReload}">查询</u-button>
+            <u-button color="primary" @click="$refs.${nameGroup.viewElementMainView}.reload()">查询</u-button>
         </u-form-item>
     </u-form>
 
@@ -356,7 +355,6 @@ export function genCurdEditMultipleKeyBlock(entity: Entity, view: View) {
     nameGroup.viewLogicCreate = view.getLogicUniqueName('create');
     nameGroup.viewLogicSubmit = view.getLogicUniqueName('submit');
     nameGroup.viewLogicBlurUpdate = view.getLogicUniqueName('blurUpdate');
-    nameGroup.viewLogicReload = view.getLogicUniqueName('reload');
     nameGroup.viewVariableEntity = view.getVariableUniqueName(utils.firstLowerCase(entity.name));
     nameGroup.viewVariableInput = view.getVariableUniqueName('input');
     nameGroup.viewVariableFilter = view.getVariableUniqueName('filter');
@@ -444,8 +442,7 @@ export function genCurdEditMultipleKeyBlock(entity: Entity, view: View) {
         ${JSON.stringify(genInitLogic(nameGroup))},
         ${JSON.stringify(genCreateLogic(nameGroup))},
         ${JSON.stringify(genSubmitLogic(entity, nameGroup))},
-        ${JSON.stringify(genBlurUpdateLogic(entity, nameGroup))},
-        ${JSON.stringify(genReloadLogic(nameGroup))}
+        ${JSON.stringify(genBlurUpdateLogic(entity, nameGroup))}
         ${newLoadSelectLogics.map((logic) => ',' + JSON.stringify(logic)).join('\n')}
     ],
     "viewBindEvents": [

package/src/templator/genCurdMultipleKeyBlock.ts

@@ -92,7 +92,7 @@ function genFilterTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroup
         .join('')}
 
         <u-form-item>
-            <u-button color="primary" @click="${nameGroup.viewLogicReload}">查询</u-button>
+            <u-button color="primary" @click="$refs.${nameGroup.viewElementMainView}.reload()">查询</u-button>
         </u-form-item>
     </u-form>
 
@@ -355,6 +355,19 @@ function genModifyLogic(entity: Entity, nameGroup: NameGroup) {
         name: nameGroup.viewLogicModify,
         description: '',
         params: [
+            NaslNode.Param({
+                name: 'event',
+                typeAnnotation: NaslCoreTypeAnnotation.String,
+            }),
+            NaslNode.Param({
+                name: 'scope',
+                typeAnnotation: NaslUITypeAnnotation.ScopeOf([
+                    NaslTypeAnnotation.Reference({
+                        typeNamespace: `${moduleNamespace}.structures`,
+                        typeName: nameGroup.structure,
+                    }),
+                ]),
+            }),
         ],
         returns: [] as any[],
         variables: [] as any[],
@@ -416,7 +429,6 @@ export function genCurdMultipleKeyBlock(entity: Entity, view: View) {
     nameGroup.viewLogicCreate = view.getLogicUniqueName('create');
     nameGroup.viewLogicModify = view.getLogicUniqueName('modify');
     nameGroup.viewLogicSubmit = view.getLogicUniqueName('submit');
-    nameGroup.viewLogicReload = view.getLogicUniqueName('reload');
     nameGroup.viewVariableEntity = view.getVariableUniqueName(utils.firstLowerCase(entity.name));
     nameGroup.viewVariableInput = view.getVariableUniqueName('input');
     nameGroup.viewVariableFilter = view.getVariableUniqueName('filter');
@@ -505,8 +517,7 @@ export function genCurdMultipleKeyBlock(entity: Entity, view: View) {
         ${JSON.stringify(genInitLogic(nameGroup))},
         ${JSON.stringify(genCreateLogic(nameGroup))},
         ${JSON.stringify(genModifyLogic(entity, nameGroup))},
-        ${JSON.stringify(genSubmitLogic(entity, nameGroup))},
-        ${JSON.stringify(genReloadLogic(nameGroup))}
+        ${JSON.stringify(genSubmitLogic(entity, nameGroup))}
         ${newLoadSelectLogics.map((logic) => ',' + JSON.stringify(logic)).join('\n')}
     ],
     "viewBindEvents": [
@@ -541,7 +552,6 @@ export function genGridViewMultipleKeyBlock(entity: Entity, view: View) {
     nameGroup.viewLogicCreate = view.getLogicUniqueName('create');
     nameGroup.viewLogicModify = view.getLogicUniqueName('modify');
     nameGroup.viewLogicSubmit = view.getLogicUniqueName('submit');
-    nameGroup.viewLogicReload = view.getLogicUniqueName('reload');
     nameGroup.viewVariableEntity = view.getVariableUniqueName(utils.firstLowerCase(entity.name));
     nameGroup.viewVariableInput = view.getVariableUniqueName('input');
     nameGroup.viewVariableFilter = view.getVariableUniqueName('filter');
@@ -634,8 +644,7 @@ export function genGridViewMultipleKeyBlock(entity: Entity, view: View) {
         ${JSON.stringify(genInitLogic(nameGroup))},
         ${JSON.stringify(genCreateLogic(nameGroup))},
         ${JSON.stringify(genModifyLogic(entity, nameGroup))},
-        ${JSON.stringify(genSubmitLogic(entity, nameGroup))},
-        ${JSON.stringify(genReloadLogic(nameGroup))}
+        ${JSON.stringify(genSubmitLogic(entity, nameGroup))}
         ${newLoadSelectLogics.map((logic) => ',' + JSON.stringify(logic)).join('\n')}
     ],
     "viewBindEvents": [
@@ -653,23 +662,3 @@ export function genGridViewMultipleKeyBlock(entity: Entity, view: View) {
 </definition>
 `;
 }
-
-export function genReloadLogic(nameGroup: NameGroup) {
-    return NaslNode.Logic({
-        name: nameGroup.viewLogicReload,
-        params: [] as any[],
-        returns: [] as any[],
-        variables: [
-            NaslNode.Variable({
-                name: 'validateResult',
-                typeAnnotation: NaslUITypeAnnotation.ValidateEvent,
-            }),
-        ],
-        body: [
-            NaslLogicItem.Start,
-            genCallComponentLogic(nameGroup.viewElementMainView, 'reload'),
-            NaslLogicItem.End,
-        ],
-        playground: [],
-    });
-}

package/src/templator/genEditTableBlock.ts

@@ -205,6 +205,19 @@ export function genEditTableRemoveLogic(entity: Entity, nameGroup: NameGroup) {
     return NaslNode.Logic({
         name: nameGroup.viewLogicRemove,
         params: [
+            NaslNode.Param({
+                name: 'event',
+                typeAnnotation: NaslCoreTypeAnnotation.String,
+            }),
+            NaslNode.Param({
+                name: 'scope',
+                typeAnnotation: NaslUITypeAnnotation.ScopeOf([
+                    NaslTypeAnnotation.Reference({
+                        typeNamespace: `${moduleNamespace}.structures`,
+                        typeName: nameGroup.structure,
+                    }),
+                ]),
+            }),
         ],
         returns: [] as Array<any>,
         variables: [] as Array<any>,
@@ -238,6 +251,20 @@ export function genBlurUpdateLogic(entity: Entity, nameGroup: NameGroup) {
     return NaslNode.Logic({
         name: nameGroup.viewLogicBlurUpdate,
         params: [
+            NaslNode.Param({
+                name: 'event',
+                typeAnnotation: NaslCoreTypeAnnotation.String,
+
+            }),
+            NaslNode.Param({
+                name: 'scope',
+                typeAnnotation: NaslUITypeAnnotation.ScopeOf([
+                    NaslTypeAnnotation.Reference({
+                        typeNamespace: `${moduleNamespace}.structures`,
+                        typeName: nameGroup.structure,
+                    }),
+                ]),
+            }),
         ],
         returns: [] as Array<any>,
         body: [

package/src/templator/genGridViewBlock.ts

@@ -212,6 +212,19 @@ export function genGridViewRemoveLogic(entity: Entity, nameGroup: NameGroup) {
     return NaslNode.Logic({
         name: nameGroup.viewLogicRemove,
         params: [
+            NaslNode.Param({
+                name: 'event',
+                typeAnnotation: NaslCoreTypeAnnotation.String,
+            }),
+            NaslNode.Param({
+                name: 'scope',
+                typeAnnotation: NaslUITypeAnnotation.ScopeOf([
+                    NaslTypeAnnotation.Reference({
+                        typeNamespace: `${moduleNamespace}.structures`,
+                        typeName: nameGroup.structure,
+                    }),
+                ]),
+            }),
         ],
         returns: [] as any[],
         variables: [] as any[],

package/src/templator/genTableBlock.ts

@@ -150,6 +150,19 @@ export function genTableRemoveLogic(entity: Entity, nameGroup: NameGroup) {
     return NaslNode.Logic({
         name: nameGroup.viewLogicRemove,
         params: [
+            NaslNode.Param({
+                name: 'event',
+                typeAnnotation: NaslCoreTypeAnnotation.String,
+            }),
+            NaslNode.Param({
+                name: 'scope',
+                typeAnnotation: NaslUITypeAnnotation.ScopeOf([
+                    NaslTypeAnnotation.Reference({
+                        typeNamespace: `${moduleNamespace}.structures`,
+                        typeName: nameGroup.structure,
+                    }),
+                ]),
+            }),
         ],
         returns: [] as any[],
         variables: [] as any[],

package/src/server/events.yaml

@@ -1,89 +0,0 @@
-- name: click
-  title: 点击
-  description: 在元素上按下并释放任意鼠标按钮时触发。 
-  params:
-    - name: $event
-      type: MouseEvent
-      description: 鼠标事件对象
-      schema:
-        $ref: "#/systemTypes/MouseEvent"
-- name: dblclick
-  title: 双击
-  description: 在元素上双击鼠标按钮时触发。 
-  params:
-    - name: $event
-      type: MouseEvent
-      description: 鼠标事件对象
-      schema:
-        $ref: "#/systemTypes/MouseEvent"
-- name: contextmenu
-  title: 右键点击
-  description: 在右键菜单显示前触发。 
-  params:
-    - name: $event
-      type: MouseEvent
-      description: 鼠标事件对象
-      schema:
-        $ref: "#/systemTypes/MouseEvent"
-- name: mousedown
-  title: 鼠标按下
-  description: 在元素上按下任意鼠标按钮时触发。 
-  params:
-    - name: $event
-      type: MouseEvent
-      description: 鼠标事件对象
-      schema:
-        $ref: "#/systemTypes/MouseEvent"
-- name: mouseup
-  title: 鼠标释放
-  description: 在元素上释放任意鼠标按钮时触发。 
-  params:
-    - name: $event
-      type: MouseEvent
-      description: 鼠标事件对象
-      schema:
-        $ref: "#/systemTypes/MouseEvent"
-- name: mouseenter
-  title: 鼠标移入
-  description: 鼠标移入元素时触发。 
-  params:
-    - name: $event
-      type: MouseEvent
-      description: 鼠标事件对象
-      schema:
-        $ref: "#/systemTypes/MouseEvent"
-- name: mouseleave
-  title: 鼠标移出
-  description: 鼠标移出元素时触发。 
-  params:
-    - name: $event
-      type: MouseEvent
-      description: 鼠标事件对象
-      schema:
-        $ref: "#/systemTypes/MouseEvent"
-- name: focus
-  title: 获得焦点
-  description: 获得焦点时触发。
-  params:
-    - name: $event
-      type: FocusEvent
-      description: 焦点事件对象
-      schema:
-        $ref: "#/systemTypes/FocusEvent"
-- name: blur
-  title: 失去焦点
-  description: 失去焦点时触发。
-  params:
-    - name: $event
-      type: FocusEvent
-      description: 焦点事件对象
-      schema:
-        $ref: "#/systemTypes/FocusEvent"
-- name: created
-  title: 进入时
-- name: mounted
-  title: 进入后
-- name: updated
-  title: 更新时
-- name: destroyed
-  title: 离开时