@lcap/nasl 2.20.1-beta.2 → 2.21.0-beta.1

package/src/service/storage/init.ts

@@ -3,6 +3,7 @@ import { getConceptConstructor } from '../../decorators';
 import { config } from '../../config';
 import Vue from 'vue';
 import storageService from './service';
+import { v4 as uuidv4 } from 'uuid';
 /// #if !process.env.NODE_ENV || process.env.BUILD_TARGET === 'node'
 import * as fs from 'fs-extra';
 import * as jsoner from './jsoner';
@@ -10,6 +11,9 @@ import * as jsoner from './jsoner';
 
 export const batchQuery = storageService.batchQuery;
 export const batchAction = storageService.batchAction;
+export const batchInstruct = storageService.batchInstruct;
+
+let tabTimestamp: string;
 
 function getLogic(key: string, app: any, diffLogicList: string[]) {
     if (!diffLogicList.includes(key)) {
@@ -88,7 +92,7 @@ function getStatement(state: any, app: any, diffLogicList: string[]) {
             logicItems = [...state.expressions];
             break;
         case 'NewComposite':
-            logicItems = [...state.rights.map((item:SelectMembers) => item.expression)];
+            logicItems = [...state.rights.map((item: SelectMembers) => item.expression)];
             break;
         case 'NewList':
             logicItems = [...state.items];
@@ -123,7 +127,6 @@ function getMiniAppChange(target: any, obj: any, action: string) {
  *  执行更新
  */
 async function doAction(app: any, actionItem: any) {
-    app.emit('saving');
     let hasFrontEnd = false;
     let hasBackEnd = false;
     const actionList: any[] = [];
@@ -265,9 +268,188 @@ async function doAction(app: any, actionItem: any) {
         }
     } catch (error) {
         console.log(error);
+        taskQueue.refreshNasl(app, {
+            errorInfo: {
+                message: error?.message,
+                stack: error?.stack,
+            },
+        });
+        return;
+    }
+
+    const instructList = [{
+        uuid: uuidv4().replace(/-/g, ''),
+        actions: actionList,
+    }];
+    saveNasl({app, hasFrontEnd, hasBackEnd, instructList });
+    
+    if (!app._historying) {
+        if (app._historyIndex !== app._historyList.length) {
+            app._historyList = app._historyList.splice(0, app._historyIndex);
+        }
+        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;
+    }
+}
+
+type Instruct = {
+    uuid: string,
+    actions: any[],
+};
+type TaskOption = { 
+    app: any, 
+    hasFrontEnd: boolean, 
+    hasBackEnd: boolean, 
+    instructList: Instruct[],
+};
+enum TaskQueueStatus {
+    ExceedMaxTaskCount,
+    Retrying,
+};
+type RefreshNaslOptions = {
+    errorInfo: {
+        message?: string,
+        stack?: string,
+    }
+};
+
+class TaskQueue {
+    queue: TaskOption[] = []
+    lastQueue: TaskOption[] = []
+    running: Boolean = false
+    maxTaskCount: number = 10
+    status?: TaskQueueStatus = undefined
+
+    addTask(task: TaskOption) {
+        this.queue.push(task);
+
+        if(this.queue.length >= this.maxTaskCount) {
+            this.status = TaskQueueStatus.ExceedMaxTaskCount;
+            task.app.emit('ExceedMaxTaskCount');
+        }
+            
+        this.run();
+    }
+
+    clear() {
+        this.queue = [];
+        this.lastQueue = [];
+        this.status = undefined;
+        this.running = false;
+    }
+
+    async run(queue = this.queue) {
+        if(this.running) return;
+        if(queue.length === 0) return;
+
+        const app = queue[0].app;
+        let hasFrontEnd = false;
+        let hasBackEnd = false;
+        let instructList: Instruct[] = [];
+
+        for(const task of queue) {
+            if(task.hasFrontEnd) hasFrontEnd = true;
+            if(task.hasBackEnd) hasBackEnd = true;
+            instructList = instructList.concat(task.instructList);
+        }
+
+        if(queue === this.queue) {
+            this.lastQueue = [...queue];
+            this.queue = [];
+        }
+
+        this.running = true;
+        const error = await _saveNasl({
+            app, hasFrontEnd, hasBackEnd, instructList,
+        });
+
+        // code: 401650, 检测到当前应用拉取操作已被强制结束, 用户确认后再刷新
+        // code: 500502  msg: "该应用已在新tab 页打开，请刷新!"      不重试或刷新
+        if(!error)
+            this.recover(app);
+        else if (![401650, 500502].includes(error.code)) { 
+            // 连接失败，或超时，或后端持久化异常
+            if((error.message === 'Network Error' || error.message?.includes('timeout') || error.code === 500500)
+                && this.status !== TaskQueueStatus.Retrying) {
+                this.running = false;
+                this.retry();
+            } else 
+                this.refreshNasl(app);
+
+            return;
+        }
+
+        this.running = false;
+
+        this.run();
+    }
+
+    retry() {
+        if(this.lastQueue.length === 0) return;
+
+        const app = this.lastQueue[0].app;
+        this.status = TaskQueueStatus.Retrying;
+        app.emit('Retrying');
+        this.run(this.lastQueue);
+    }
+
+    async refreshNasl(app: App, options: RefreshNaslOptions = { errorInfo: {} }) {
+        const failedQueue = this.lastQueue.map(({ hasFrontEnd, hasBackEnd, instructList }) => ({
+            hasFrontEnd, hasBackEnd, instructList,
+        }));
+        const queue = this.queue.map(({ hasFrontEnd, hasBackEnd, instructList }) => ({
+            hasFrontEnd, hasBackEnd, instructList,
+        }));
+        await storageService.saveFrontendNasl({
+            body: {
+                frontendDataDTO: {
+                    nasl: app.toJSON(),
+                    failedQueue,
+                    queue,
+                    errorInfo: options.errorInfo,
+                },
+            },
+        }).catch((err: any) => {
+            console.log('备份 nasl 失败：', err);
+        });
+        this.clear();
         app.emit('refresh');
     }
 
+    recover(app: App) {
+        switch(this.status) {
+            case TaskQueueStatus.ExceedMaxTaskCount:
+                app.emit('BelowMaxTaskCount');
+                this.status = undefined;
+                break;
+            case TaskQueueStatus.Retrying:
+                app.emit('SuccessRetry');
+                this.status = undefined;
+                break;
+        }        
+    }
+}
+
+export const taskQueue = new TaskQueue();
+async function saveNasl(options: TaskOption) {
+    taskQueue.addTask(options);
+}
+
+async function _saveNasl(options: TaskOption) {
+    const { app, hasFrontEnd, hasBackEnd, instructList } = options;
+    app.emit('saving');
     let ChangedNASLType = '';
     if (hasFrontEnd && hasBackEnd) {
         ChangedNASLType = 'both';
@@ -279,50 +461,35 @@ async function doAction(app: any, actionItem: any) {
     let err;
     if (config.storage.protocol === 'http') {
         try {
-            await storageService.batchAction({
-                body: actionList,
+            await storageService.batchInstruct({
+                body: instructList,
                 headers: {
                     appId: app.id,
                     ChangedNASLType,
+                    tabTimestamp,
                     // 其他封装在 storageService 里了
                 },
             });
         } catch (error) {
             err = error;
-
-            // 401650, 检测到当前应用拉取操作已被强制结束, 用户确认后再刷新
-            if (error?.code !== 401650)
-                app.emit('refresh');
         }
     } else if (config.storage.protocol === 'mock') {
         // Do nothing
     } else {
         const json = await fs.readJSON(config.storage.basePath);
+        
+        let actionList: any[] = [];
+        for(const { actions } of instructList) {
+            actionList = actionList.concat(actions);
+        }
+
         jsoner.batchAction(json, actionList);
         await fs.writeJSON(config.storage.basePath, json, {
             spaces: 4,
         });
     }
     app.emit('saved', err);
-    if (!app._historying) {
-        if (app._historyIndex !== app._historyList.length) {
-            app._historyList = app._historyList.splice(0, app._historyIndex);
-        }
-        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;
-    }
+    return err;
 }
 
 export function handleApp(app: any) {
@@ -354,7 +521,11 @@ export function handleApp(app: any) {
         if (!app._noTimer) {
             app._timer = setTimeout(() => {
                 console.error('收集超时，请及时排查原因');
-                app.emit('refresh');
+                taskQueue.refreshNasl(app, {
+                    errorInfo: {
+                        message: '收集超时，请及时排查原因',
+                    }
+                });
             }, 2500);
         }
         if (!app._isCollectingCount) {
@@ -382,7 +553,7 @@ export function handleApp(app: any) {
             app._action = '';
             app._noTimer = undefined;
             if (Array.isArray(collectingList) && collectingList.length) {
-                app.naslServer.embeddedTSEmitter.emit('change', {
+                app.naslServer?.embeddedTSEmitter?.emit('change', {
                     value: collectingList,
                 });
                 await doAction(app, {
@@ -403,7 +574,7 @@ export function handleApp(app: any) {
     app.on('storage', (event: any) => {
         // 是否正在收集
         if (app._isCollectingCount === 0) {
-            app.naslServer.embeddedTSEmitter.emit('change', {
+            app.naslServer?.embeddedTSEmitter?.emit('change', {
                 value: [event],
             });
             let actionMsg = '';
@@ -443,7 +614,7 @@ export async function loadApp(appId?: string) {
     let app: App;
     if (config.storage.protocol === 'http') {
         // 请求
-        const data = await storageService.batchQuery({
+        const res = await storageService.batchQuery({
             body: [
                 {
                     path: 'app',
@@ -452,23 +623,20 @@ export async function loadApp(appId?: string) {
             ],
             headers: {
                 appId,
+                checkTabOpenTime: 'true',
                 // 其他封装在 storageService 里了
             },
+            config: {
+                shortResponse: false,
+            },
         });
-        // const data = res?.data?.result;
-        // // mock数据，需要删除
-        // data[0].frontends = [];
-        // data?.[0].frontends.push({
-        //     id: '111',
-        //     concept: 'Frontend',
-        //     name: 'pcFrontend1',
-        //     title: 'pc端',
-        //     type: 'pc',
-        //     views: data?.[0].views,
-        //     variables: data?.[0].frontendVariables,
-        //     componentDependencies: data?.[0].componentDependencies,
-        // });
+        
+        tabTimestamp = res?.headers?.tabtimestamp;
+        const data = res?.data?.result;
         app = new App(Object.assign(data?.[0], { id: appId }));
+        if (!app.id) {
+            app.id = appId;
+        }
     } else if (config.storage.protocol === 'mock') {
         app = new App({
             id: appId,

package/src/service/storage/service.ts

@@ -4,7 +4,7 @@ import api from './api';
 const service = createService(api);
 
 export default {
-    batchQuery({ body, headers }: { body: Array<any>, headers: Record<string, string> }) {
+    batchQuery({ body, headers, config }: { body: Array<any>, headers: Record<string, string>, config?: object }) {
         const appData = (window as any).appData;
 
         return service.batchQuery({
@@ -15,6 +15,7 @@ export default {
                 'request-versionChangedTime': appData?.versionChangedTime || '',
                 operateArea: appData?.branchStatus === 'merging' ? 'merge_conflict' : '',
             }, headers),
+            config,
         });
     },
     batchAction({ body, headers }: { body: Array<any>, headers: Record<string, string> }) {
@@ -30,4 +31,31 @@ export default {
             }, headers),
         });
     },
+    batchInstruct({ body, headers }: { body: Array<any>, headers: Record<string, string> }) {
+        const appData = (window as any).appData;
+
+        return service.batchInstruct({
+            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),
+            config: {
+                timeout: 1000 * 60,
+            },
+        });
+    },
+    saveFrontendNasl({ body }: { body: any }) {
+        const appData = (window as any).appData;
+        
+        return service.saveFrontendNasl({ 
+            body,
+            headers: {
+                appId: appData?.appId,
+                skipVersionCheck: true,
+            },
+         });
+    }
 };

package/src/templator/dist/genEditTableBlock.js

@@ -0,0 +1,204 @@
+"use strict";
+exports.__esModule = true;
+exports.genBlurUpdateLogic = exports.genEditTableRemoveLogic = exports.genEditTableLoadLogic = exports.genEditTableTemplate = exports.genEditTableColumnTemplate = void 0;
+var utils = require("../utils");
+var _1 = require(".");
+var utils_1 = require("./utils");
+/**
+ * 根据实体属性生成表格列模板
+ * @param property 实体属性
+ */
+function genEditTableColumnTemplate(entity, property, nameGroup, selectNameGroupMap) {
+    var dataSource = entity.parentNode;
+    var lowerEntityName = utils.firstLowerCase(entity.name);
+    var valueExpression = "current.item." + lowerEntityName + "." + property.name;
+    var title = property.label || property.name;
+    var canEditable = function (property) { return !property.readonly; };
+    var getText = function (property) {
+        var propertyTypeName = property.typeAnnotation.typeName;
+        if (propertyTypeName === 'Boolean') {
+            return "\n            <u-text v-if=\"" + valueExpression + "\" text=\"\u662F\"></u-text>\n            <u-text v-if=\"!" + valueExpression + "\" text=\"\u5426\"></u-text>\n            ";
+        }
+        else {
+            return "<u-text :text=\"" + valueExpression + "\"></u-text>";
+        }
+    };
+    var genEditComponent = function (property) {
+        if (property.readonly)
+            return '';
+        var label = property.label || property.name;
+        var formItem = '';
+        var propertyTypeName = property.typeAnnotation.typeName;
+        if (property.relationEntity && selectNameGroupMap) {
+            // 有外键关联
+            var relationEntity = dataSource === null || dataSource === void 0 ? void 0 : dataSource.findEntityByName(property.relationEntity);
+            if (relationEntity) {
+                var relationProperty = relationEntity.properties.find(function (prop) { return prop.name === property.relationProperty; });
+                var displayedProperty = _1.getFirstDisplayedProperty(relationEntity);
+                if (displayedProperty) {
+                    var lowerEntityName_1 = utils.firstLowerCase(relationEntity.name);
+                    // 存在多个属性关联同一个实体的情况，因此加上属性名用以唯一标识
+                    var key = [property.name, relationEntity.name].join('-');
+                    var selectNameGroup = selectNameGroupMap.get(key);
+                    formItem += "\n                        <u-select clearable placeholder=\"\u8BF7\u9009\u62E9" + label + "\" :data-source=\"" + selectNameGroup.viewLogicLoad + "\"\n                            :autofocus=\"true\" :opened=\"true\" append-to=\"body\" @blur=\"" + nameGroup.viewLogicBlurUpdate + "\" @select=\"" + nameGroup.viewLogicBlurUpdate + "\"\n                            text-field=\"" + lowerEntityName_1 + "." + displayedProperty.name + "\" value-field=\"" + lowerEntityName_1 + "." + relationProperty.name + "\" :pageable=\"true\" :remote-paging=\"true\" :value.sync=\"" + valueExpression + "\">\n                        </u-select>\n                    ";
+                }
+                else
+                    return '';
+            }
+            else
+                return '';
+        }
+        else if (propertyTypeName === 'Boolean') {
+            formItem += "<u-select clearable :value.sync=\"" + valueExpression + "\" placeholder=\"\u8BF7\u8F93\u5165" + label + "\"\n            :autofocus=\"true\" :opened=\"true\" append-to=\"body\" @blur=\"" + nameGroup.viewLogicBlurUpdate + "\" @select=\"" + nameGroup.viewLogicBlurUpdate + "\">\n                <u-select-item :value=\"true\" text=\"\u662F\">\u662F</u-select-item>\n                <u-select-item :value=\"false\" text=\"\u5426\">\u5426</u-select-item>\n            </u-select>";
+        }
+        else if (propertyTypeName === 'Integer' || propertyTypeName === 'Long') {
+            formItem = "<u-number-input :value.sync=\"" + valueExpression + "\" placeholder=\"\u8BF7\u8F93\u5165" + label + "\" :autofocus=\"true\" @blur=\"" + nameGroup.viewLogicBlurUpdate + "\"></u-number-input>";
+        }
+        else if (propertyTypeName === 'Double') {
+            formItem = "<u-number-input :value.sync=\"" + valueExpression + "\" :precision=\"0\" :step=\"0\" placeholder=\"\u8BF7\u8F93\u5165" + label + "\" :autofocus=\"true\" @blur=\"" + nameGroup.viewLogicBlurUpdate + "\"></u-number-input>";
+        }
+        else if (propertyTypeName === 'Decimal') {
+            formItem = "<u-number-input :value.sync=\"" + valueExpression + "\" :precision=\"0\" :step=\"0\" placeholder=\"\u8BF7\u8F93\u5165" + label + "\" :autofocus=\"true\" @blur=\"" + nameGroup.viewLogicBlurUpdate + "\"></u-number-input>";
+        }
+        else if (propertyTypeName === 'Text') {
+            formItem = "<u-validator placement=\"bottom\" display=\"appear\" @blur-valid=\"" + nameGroup.viewLogicBlurUpdate + "\" style=\"width:100%\">\n            <u-textarea :value.sync=\"" + valueExpression + "\" placeholder=\"\u8BF7\u8F93\u5165" + label + "\" :autofocus=\"true\" size=\"full\"></u-textarea>\n            </u-validator>";
+        }
+        else if (propertyTypeName === 'Date') {
+            formItem = "<u-date-picker clearable :date.sync=\"" + valueExpression + "\" placeholder=\"\u8BF7\u8F93\u5165" + label + "\" append-to=\"body\" :autofocus=\"true\" :opened=\"true\" @blur=\"" + nameGroup.viewLogicBlurUpdate + "\"></u-date-picker>";
+        }
+        else if (propertyTypeName === 'Time') {
+            formItem = "<u-time-picker :time.sync=\"" + valueExpression + "\" placeholder=\"\u8BF7\u8F93\u5165" + label + "\" append-to=\"body\" :autofocus=\"true\" @blur=\"" + nameGroup.viewLogicBlurUpdate + "\"></u-time-picker>";
+        }
+        else if (propertyTypeName === 'DateTime') {
+            formItem = "<u-date-time-picker clearable :date.sync=\"" + valueExpression + "\" placeholder=\"\u8BF7\u8F93\u5165" + label + "\" append-to=\"body\" :autofocus=\"true\" :opened=\"true\" @blur=\"" + nameGroup.viewLogicBlurUpdate + "\"></u-date-time-picker>";
+        }
+        else {
+            formItem = "<u-validator placement=\"bottom\" display=\"appear\" @blur-valid=\"" + nameGroup.viewLogicBlurUpdate + "\" style=\"width:100%\" append-to=\"body\">\n                <u-input :value.sync=\"" + valueExpression + "\" placeholder=\"\u8BF7\u8F93\u5165" + label + "\" :autofocus=\"true\" size=\"full\"></u-input>\n            </u-validator>";
+        }
+        return "<template #editcell=\"current\">\n            <u-linear-layout gap=\"small\">\n                " + formItem + "\n            </u-linear-layout>\n        </template>";
+    };
+    return "<u-table-view-column field=\"" + utils.firstLowerCase(entity.name) + "." + property.name + "\" " + (canEditable(property) ? 'type="editable"' : '') + ">\n    <template #title><u-text text=\"" + title + "\"></u-text></template>\n    <template #cell=\"current\">\n        <u-linear-layout gap=\"small\">\n            " + getText(property) + "\n        </u-linear-layout>\n    </template>\n    " + genEditComponent(property) + "\n</u-table-view-column>";
+}
+exports.genEditTableColumnTemplate = genEditTableColumnTemplate;
+/**
+ * 生成表格模板
+ * @param entity 实体
+ * @param nameGroup 命名组
+ */
+function genEditTableTemplate(entity, nameGroup, selectNameGroupMap) {
+    var properties = entity.properties.filter(_1.filterProperty('inTable'));
+    return "<u-table-view ref=\"" + nameGroup.viewElementMainView + "\" :data-source=\"" + nameGroup.viewLogicLoad + "\" data-schema=\"" + nameGroup.structure + "\"\n        value-field=\"" + nameGroup.viewVariableEntity + ".id\"\n        :pageable=\"true\" :remote-paging=\"true\" :show-sizer=\"true\" :default-column-width=\"300\" editable>\n    <u-table-view-column type=\"index\" width=\"60\"><template #title><u-text text=\"\u5E8F\u53F7\"></u-text></template></u-table-view-column>\n\n    " + properties.map(function (property) { return genEditTableColumnTemplate(entity, property, nameGroup, selectNameGroupMap) + '\n'; }).join('') + "\n\n    <u-table-view-column>\n    <template #title><u-text text=\"\u64CD\u4F5C\"></u-text></template>\n        <template #cell=\"current\">\n            <u-linear-layout gap=\"small\">\n                <u-link @click=\"" + nameGroup.viewLogicRemove + "\">\u5220\u9664</u-link>\n            </u-linear-layout>\n        </template>\n    </u-table-view-column>\n</u-table-view>\n";
+}
+exports.genEditTableTemplate = genEditTableTemplate;
+/**
+ * 生成表格 load 逻辑
+ * @param entity 实体
+ */
+function genEditTableLoadLogic(entity, nameGroup, newLogic, supportFilter) {
+    var moduleNode = entity.app;
+    var moduleNamespace = moduleNode === null || moduleNode === void 0 ? void 0 : moduleNode.getNamespace();
+    var params = [
+        _1.genLogicParam("" + newLogic.params[0].name, 'params.page'),
+        _1.genLogicParam("" + newLogic.params[1].name, 'params.size'),
+        _1.genLogicParam("" + newLogic.params[2].name, 'params.sort'),
+        _1.genLogicParam("" + newLogic.params[3].name, 'params.order'),
+    ];
+    if (supportFilter)
+        params.push(_1.genLogicParam("" + newLogic.params[4].name, nameGroup.viewVariableFilter));
+    return utils_1.NaslNode.Logic({
+        name: nameGroup.viewLogicLoad,
+        params: [
+            utils_1.NaslNode.Param({
+                name: 'params',
+                typeAnnotation: utils_1.NaslUITypeAnnotation.DataSourceParams
+            }),
+        ],
+        returns: [
+            utils_1.NaslNode.Return({
+                name: 'result',
+                typeAnnotation: null
+            }),
+        ],
+        variables: [],
+        body: [
+            utils_1.NaslLogicItem.Start,
+            utils_1.NaslLogicItem.Assignment({
+                left: utils_1.NaslLogicItem.Identifier({
+                    name: 'result'
+                }),
+                right: utils_1.NaslLogicItem.CallLogic({
+                    calleeNamespace: moduleNamespace + ".logics",
+                    calleeName: newLogic.name,
+                    arguments: params
+                })
+            }),
+            utils_1.NaslLogicItem.End,
+        ]
+    });
+}
+exports.genEditTableLoadLogic = genEditTableLoadLogic;
+/**
+ * 生成表格 remove 逻辑
+ * @param entity 实体
+ */
+function genEditTableRemoveLogic(entity, nameGroup) {
+    var _a;
+    var lowerEntityName = utils.firstLowerCase(entity.name);
+    var ns = entity.ns;
+    var deleteLogic = (_a = ns === null || ns === void 0 ? void 0 : ns.logics) === null || _a === void 0 ? void 0 : _a.find(function (logic) { return logic.name === "delete"; });
+    var idPropertys = entity.properties.filter(function (property) { return property.primaryKey || property.name === 'id'; });
+    return utils_1.NaslNode.Logic({
+        name: nameGroup.viewLogicRemove,
+        params: [],
+        returns: [],
+        variables: [],
+        body: [
+            utils_1.NaslLogicItem.Start,
+            utils_1.NaslLogicItem.CallLogic({
+                calleeNamespace: deleteLogic.getNamespace(),
+                calleeName: deleteLogic.name,
+                arguments: idPropertys.map(function (idProperty) {
+                    var paramFromLogic = _1.getParamFromLogic(deleteLogic, idProperty.name);
+                    // 如果旧逻辑，但是新导入表中，id的name 不是id 的话，就直接使用名称叫id的
+                    if (!paramFromLogic) {
+                        paramFromLogic = _1.getParamFromLogic(deleteLogic, 'id');
+                    }
+                    return _1.genLogicParam(paramFromLogic.name, "current.item." + lowerEntityName + "." + paramFromLogic.name);
+                })
+            }),
+            _1.genCallComponentLogic(nameGroup.viewElementMainView, 'reload'),
+            utils_1.NaslLogicItem.End,
+        ]
+    });
+}
+exports.genEditTableRemoveLogic = genEditTableRemoveLogic;
+function genBlurUpdateLogic(entity, nameGroup) {
+    var _a;
+    var lowerEntityName = utils.firstLowerCase(entity.name);
+    var ns = entity.ns;
+    var updateLogic = (_a = ns === null || ns === void 0 ? void 0 : ns.logics) === null || _a === void 0 ? void 0 : _a.find(function (logic) { return logic.name === "update"; });
+    return utils_1.NaslNode.Logic({
+        name: nameGroup.viewLogicBlurUpdate,
+        params: [],
+        returns: [],
+        body: [
+            utils_1.NaslLogicItem.Start,
+            utils_1.NaslLogicItem.Assignment({
+                left: _1.genMemberExpression("current.item.editing", ['', '', nameGroup.structure + ".editing"]),
+                right: utils_1.NaslLogicItem.StringLiteral({
+                    value: ''
+                })
+            }),
+            utils_1.NaslLogicItem.CallLogic({
+                calleeNamespace: updateLogic.getNamespace(),
+                calleeName: updateLogic.name,
+                arguments: [
+                    _1.genLogicParam("" + updateLogic.params[0].name, "current.item." + lowerEntityName),
+                ]
+            }),
+            utils_1.NaslLogicItem.End,
+        ],
+        playground: []
+    });
+}
+exports.genBlurUpdateLogic = genBlurUpdateLogic;