@lcap/nasl 2.22.1 → 2.22.2

package/src/server/naslServer.ts

@@ -231,6 +231,8 @@ export class NaslServer {
                     const records = await this._resolveDiagnosticRecords(data.records);
                     this.diagnosticManager.pushAll(records);
                     try {
+                        // 结束诊断和标注
+                        invokeCommand('naslServer:endWork');
                         invokeCommand('naslServer:nodeChange');
                     } catch (e) { console.log('no "naslServer:nodeChange" event received'); }
                 }
@@ -872,6 +874,8 @@ export class NaslServer {
     }
 
     async getDiagnosticRecordsAndPushAll(fileNames?: Array<string>) {
+        // 开始诊断和标注
+        invokeCommand('naslServer:startWork');
         const records = await this.getDiagnosticRecords(fileNames);
         // diagnosticManager.pushAll(records);
     }

package/src/service/creator/errHandles.js

@@ -21,19 +21,24 @@ const versionStatus = {
     401013: 'version_inconsistent',
 };
 
+const FRONT_HANDLE_ERROR_MSG_CODE_LIST = [402201, 401356];
+
 export default {
     defaults({ config }, err = {}) {
         if (config.noErrorTip)
             return;
-
+        // 检测到数组内错误码的情况下，由前端处理返回错误信息，不反显后端错误信息
+        if (FRONT_HANDLE_ERROR_MSG_CODE_LIST.includes(err.code)) {
+            return;
+        }
         // 检测到当前应用拉取操作已被强制结束
-        if(err.code === 401650) {
+        if (err.code === 401650) {
             eventBus.emit('forceCancelPull');
             return;
         }
 
         // 检测到当前应用已在新 tab 页打开
-        if(err.code === 500502) {
+        if (err.code === 500502) {
             eventBus.emit('multiTabOpened');
             return;
         }

package/src/service/storage/dist/init.js

@@ -250,24 +250,25 @@ function doAction(app, actionItem) {
                             if (getMiniAppChange(emitTarget, (_c = event === null || event === void 0 ? void 0 : event.originEvent) === null || _c === void 0 ? void 0 : _c.object, (_d = event === null || event === void 0 ? void 0 : event.originEvent) === null || _d === void 0 ? void 0 : _d.action)) {
                                 hasBackEnd = true;
                             }
-                            var isDelete_1 = ((_e = event === null || event === void 0 ? void 0 : event.originEvent) === null || _e === void 0 ? void 0 : _e.action) === 'delete';
+                            var isDelete = ((_e = event === null || event === void 0 ? void 0 : event.originEvent) === null || _e === void 0 ? void 0 : _e.action) === 'delete';
                             var isUpdateAuth = ((_f = event === null || event === void 0 ? void 0 : event.originEvent) === null || _f === void 0 ? void 0 : _f.action) === 'update' && ((_g = event === null || event === void 0 ? void 0 : event.originEvent) === null || _g === void 0 ? void 0 : _g.object) && 'auth' in ((_h = event === null || event === void 0 ? void 0 : event.originEvent) === null || _h === void 0 ? void 0 : _h.object);
-                            if (isDelete_1 || isUpdateAuth) {
-                                var app_1 = emitTarget.app;
-                                var diffArr_3 = [];
-                                emitTarget.logics.forEach(function (logic) {
-                                    if (logic.body.length > 2) {
-                                        logic.body.forEach(function (it) {
-                                            itemloop(it, app_1, diffArr_3);
-                                        });
-                                    }
-                                });
-                                var result = diffArr_3.filter(function (item) { return item.startsWith('app') || item.startsWith('extensions'); });
-                                if (result.length) {
-                                    hasBackEnd = true;
-                                }
-                                emitTarget.children.forEach(function (item) { return loopEle(item, isDelete_1); });
-                                emitTarget.elements.forEach(function (item) { return loopEle(item, isDelete_1); });
+                            if (isDelete || isUpdateAuth) {
+                                hasBackEnd = true;
+                                // const app = emitTarget.app;
+                                // const diffArr: string[] = [];
+                                // emitTarget.logics.forEach((logic: Logic) => {
+                                //     if (logic.body.length > 2) {
+                                //         logic.body.forEach((it: LogicItem) => {
+                                //             itemloop(it, app, diffArr);
+                                //         });
+                                //     }
+                                // });
+                                // const result = diffArr.filter((item) => item.startsWith('app') || item.startsWith('extensions'));
+                                // if (result.length) {
+                                //     hasBackEnd = true;
+                                // }
+                                // emitTarget.children.forEach((item: View | ViewElement) => loopEle(item, isDelete));
+                                // emitTarget.elements.forEach((item: View | ViewElement) => loopEle(item, isDelete));
                             }
                             hasFrontEnd = true;
                         }
@@ -623,9 +624,8 @@ function handleApp(app) {
      */
     app.on('collect:end', function () { return __awaiter(_this, void 0, void 0, function () {
         var collectingList, actionMsg, action;
-        var _a, _b;
-        return __generator(this, function (_c) {
-            switch (_c.label) {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
                 case 0:
                     app._isCollectingCount--;
                     if (!(app._isCollectingCount === 0)) return [3 /*break*/, 3];
@@ -641,24 +641,27 @@ function handleApp(app) {
                     app._noTimer = undefined;
                     if (!(Array.isArray(collectingList) && collectingList.length)) return [3 /*break*/, 2];
                     mountDatabaseTypes(app);
-                    (_b = (_a = app.naslServer) === null || _a === void 0 ? void 0 : _a.embeddedTSEmitter) === null || _b === void 0 ? void 0 : _b.emit('change', {
-                        value: collectingList
-                    });
+                    //app.naslServer?.embeddedTSEmitter?.emit('change', {
+                    //    value: collectingList,
+                    //});
                     return [4 /*yield*/, doAction(app, {
                             list: collectingList,
                             actionMsg: actionMsg,
                             action: action
                         })];
                 case 1:
-                    _c.sent();
-                    _c.label = 2;
+                    //app.naslServer?.embeddedTSEmitter?.emit('change', {
+                    //    value: collectingList,
+                    //});
+                    _a.sent();
+                    _a.label = 2;
                 case 2: return [3 /*break*/, 4];
                 case 3:
                     if (app._isCollectingCount < 0) {
                         app._isCollectingCount = 0;
                         throw Error('关闭收集有问题，请排查');
                     }
-                    _c.label = 4;
+                    _a.label = 4;
                 case 4: return [2 /*return*/];
             }
         });
@@ -667,15 +670,14 @@ function handleApp(app) {
      * 有变更
      */
     app.on('storage', function (event) {
-        var _a, _b;
         // 是否正在收集
         if (app._isCollectingCount === 0) {
-            (_b = (_a = app.naslServer) === null || _a === void 0 ? void 0 : _a.embeddedTSEmitter) === null || _b === void 0 ? void 0 : _b.emit('change', {
-                value: [event]
-            });
+            //app.naslServer?.embeddedTSEmitter?.emit('change', {
+            //    value: [event],
+            //});
             var actionMsg = '';
-            var _c = event.originEvent || {}, action = _c.action, target = _c.target;
-            var _d = target || {}, concept = _d.concept, name = _d.name;
+            var _a = event.originEvent || {}, action = _a.action, target = _a.target;
+            var _b = target || {}, concept = _b.concept, name = _b.name;
             switch (action) {
                 case 'create':
                     actionMsg = '添加';

package/src/templator/genCreateBlock.ts

@@ -36,6 +36,7 @@ export function genCreateFormTemplate(entity: Entity, nameGroup: NameGroup, sele
 
             const { typeAnnotation } = property || {};
             const { typeName: propertyTypeName, typeNamespace: propertyTypeNamespace } = typeAnnotation || {};
+            const propertyTypeMaxLength:number = Number(property.rules.find((item) => item.indexOf('max') > -1)?.split('(')[1].slice(0, -1)) || 0;
             if (property.relationEntity) {
                 // 有外键关联
                 const relationEntity = dataSource?.findEntityByName(property.relationEntity);
@@ -69,7 +70,7 @@ export function genCreateFormTemplate(entity: Entity, nameGroup: NameGroup, sele
                 formItem += `<u-number-input v-model="${vModel}" :precision="0" :step="0" placeholder="请输入${label}"></u-number-input>`;
             } else if (propertyTypeName === 'Decimal') {
                 formItem += `<u-number-input v-model="${vModel}" :precision="0" :step="0" placeholder="请输入${label}"></u-number-input>`;
-            } else if (propertyTypeName === 'Text') {
+            } else if (propertyTypeName === 'String' && propertyTypeMaxLength > 255) {
                 formItem += `<u-textarea v-model="${vModel}" placeholder="请输入${label}"></u-textarea>`;
             } else if (propertyTypeName === 'Date') {
                 formItem += `<u-date-picker clearable :date.sync="${vModel}" placeholder="请输入${label}"></u-date-picker>`;

package/src/templator/genCurdEditMultipleKeyBlock.ts

@@ -40,6 +40,7 @@ function genFilterTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroup
 
             const { typeAnnotation } = property || {};
             const { typeName: propertyTypeName, typeNamespace: propertyTypeNamespace } = typeAnnotation || {};
+            const propertyTypeMaxLength:number = Number(property.rules.find((item) => item.indexOf('max') > -1)?.split('(')[1].slice(0, -1)) || 0;
             if (property.relationEntity) {
                 // 有外键关联
                 const relationEntity = dataSource?.findEntityByName(property.relationEntity);
@@ -73,7 +74,7 @@ function genFilterTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroup
                 formItem += `<u-number-input v-model="${vModel}" :precision="0" :step="0" placeholder="请输入${label}"></u-number-input>`;
             } else if (propertyTypeName === 'Decimal') {
                 formItem += `<u-number-input v-model="${vModel}" :precision="0" :step="0" placeholder="请输入${label}"></u-number-input>`;
-            } else if (propertyTypeName === 'Text') {
+            } else if (propertyTypeName === 'String' && propertyTypeMaxLength > 255) {
                 formItem += `<u-textarea v-model="${vModel}" placeholder="请输入${label}"></u-textarea>`;
             } else if (propertyTypeName === 'Date') {
                 formItem += `<u-date-picker clearable :date.sync="${vModel}" placeholder="请输入${label}"></u-date-picker>`;
@@ -139,6 +140,7 @@ function genSaveModalTemplate(entity: Entity, nameGroup: NameGroup, selectNameGr
 
             const { typeAnnotation } = property || {};
             const { typeName: propertyTypeName, typeNamespace: propertyTypeNamespace } = typeAnnotation || {};
+            const propertyTypeMaxLength:number = Number(property.rules.find((item) => item.indexOf('max') > -1)?.split('(')[1].slice(0, -1)) || 0;
             if (property.relationEntity) {
                 // 有外键关联
                 const relationEntity = dataSource?.findEntityByName(property.relationEntity);
@@ -171,7 +173,7 @@ function genSaveModalTemplate(entity: Entity, nameGroup: NameGroup, selectNameGr
                 formItem += `<u-number-input v-model="${vModel}" :precision="0" :step="0" placeholder="请输入${label}"></u-number-input>`;
             } else if (propertyTypeName === 'Decimal') {
                 formItem += `<u-number-input v-model="${vModel}" :precision="0" :step="0" placeholder="请输入${label}"></u-number-input>`;
-            } else if (propertyTypeName === 'Text') {
+            } else if (propertyTypeName === 'String' && propertyTypeMaxLength > 255) {
                 formItem += `<u-textarea v-model="${vModel}" placeholder="请输入${label}"></u-textarea>`;
             } else if (propertyTypeName === 'Date') {
                 formItem += `<u-date-picker clearable :date.sync="${vModel}" placeholder="请输入${label}"></u-date-picker>`;
@@ -393,6 +395,7 @@ export function genEditTableColumnComponent(app:App, entity: Entity, property: E
 
         const propertyTypeName = property.typeAnnotation.typeName;
         const propertyTypeNamespace = property.typeAnnotation.typeNamespace;
+        const propertyTypeMaxLength:number = Number(property.rules.find((item) => item.indexOf('max') > -1)?.split('(')[1].slice(0, -1)) || 0;
         if (property.relationEntity) {
             // 有外键关联
             const relationEntity = dataSource?.findEntityByName(property.relationEntity);
@@ -435,7 +438,7 @@ export function genEditTableColumnComponent(app:App, entity: Entity, property: E
             formItem = `<u-number-input :value.sync="${valueExpression}" :precision="0" :step="0" placeholder="请输入${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="请输入${label}" :autofocus="true" @blur="${nameGroup.viewLogicBlurUpdate}"></u-number-input>`;
-        } else if (propertyTypeName === 'Text') {
+        } else if (propertyTypeName === 'String' && propertyTypeMaxLength > 255) {
             formItem = `<u-validator placement="bottom" display="appear" @blur-valid="${nameGroup.viewLogicBlurUpdate}" style="width:100%">
             <u-textarea :value.sync="${valueExpression}" placeholder="请输入${label}" :autofocus="true" size="full"></u-textarea>
             </u-validator>`;

package/src/templator/genCurdMultipleKeyBlock.ts

@@ -34,6 +34,7 @@ function genFilterTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroup
                 typeName: propertyTypeName,
                 typeNamespace: propertyTypeNamespace,
             } = typeAnnotation || {};
+            const propertyTypeMaxLength:number = Number(property.rules.find((item) => item.indexOf('max') > -1)?.split('(')[1].slice(0, -1)) || 0;
             if (property.relationEntity) {
                 // 有外键关联
                 const relationEntity = dataSource?.findEntityByName(property.relationEntity);
@@ -67,7 +68,7 @@ function genFilterTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroup
                 formItem += `<u-number-input v-model="${vModel}" :precision="0" :step="0" placeholder="请输入${label}"></u-number-input>`;
             } else if (propertyTypeName === 'Decimal') {
                 formItem += `<u-number-input v-model="${vModel}" :precision="0" :step="0" placeholder="请输入${label}"></u-number-input>`;
-            } else if (propertyTypeName === 'Text') {
+            } else if (propertyTypeName === 'String' && propertyTypeMaxLength > 255) {
                 formItem += `<u-textarea v-model="${vModel}" placeholder="请输入${label}"></u-textarea>`;
             } else if (propertyTypeName === 'Date') {
                 formItem += `<u-date-picker clearable :date.sync="${vModel}" placeholder="请输入${label}"></u-date-picker>`;
@@ -132,6 +133,7 @@ function genSaveModalTemplate(entity: Entity, nameGroup: NameGroup, selectNameGr
                 typeName: propertyTypeName,
                 typeNamespace: propertyTypeNamespace,
             } = typeAnnotation || {};
+            const propertyTypeMaxLength:number = Number(property.rules.find((item) => item.indexOf('max') > -1)?.split('(')[1].slice(0, -1)) || 0;
             if (property.relationEntity) {
                 // 有外键关联
                 const relationEntity = dataSource?.findEntityByName(property.relationEntity);
@@ -172,7 +174,7 @@ function genSaveModalTemplate(entity: Entity, nameGroup: NameGroup, selectNameGr
             } else if (propertyTypeName === 'Decimal') {
                 formItem += `<u-number-input v-model="${vModel}" :precision="0" :step="0" placeholder="请输入${label}" ${property.primaryKey ? `:disabled="${nameGroup.viewVariableIsUpdate}"` : ''
                 }></u-number-input>`;
-            } else if (propertyTypeName === 'Text') {
+            } else if (propertyTypeName === 'String' && propertyTypeMaxLength > 255) {
                 formItem += `<u-textarea v-model="${vModel}" placeholder="请输入${label}" ${property.primaryKey ? `:disabled="${nameGroup.viewVariableIsUpdate}"` : ''}></u-textarea>`;
             } else if (propertyTypeName === 'Date') {
                 formItem += `<u-date-picker clearable :date.sync="${vModel}" placeholder="请输入${label}" ${property.primaryKey ? `:disabled="${nameGroup.viewVariableIsUpdate}"` : ''}></u-date-picker>`;

package/src/templator/genEditTableBlock.ts

@@ -36,6 +36,7 @@ export function genEditTableColumnTemplate(entity: Entity, property: EntityPrope
 
         const propertyTypeName = property.typeAnnotation.typeName;
         const propertyTypeNamespace = property.typeAnnotation.typeNamespace;
+        const propertyTypeMaxLength:number = Number(property.rules.find((item) => item.indexOf('max') > -1)?.split('(')[1].slice(0, -1)) || 0;
         if (property.relationEntity && selectNameGroupMap) {
             // 有外键关联
             const relationEntity = dataSource?.findEntityByName(property.relationEntity);
@@ -69,7 +70,7 @@ export function genEditTableColumnTemplate(entity: Entity, property: EntityPrope
             formItem = `<u-number-input :value.sync="${valueExpression}" :precision="0" :step="0" placeholder="请输入${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="请输入${label}" :autofocus="true" @blur="${nameGroup.viewLogicBlurUpdate}"></u-number-input>`;
-        } else if (propertyTypeName === 'Text') {
+        } else if (propertyTypeName === 'String' && propertyTypeMaxLength > 255) {
             formItem = `<u-validator placement="bottom" display="appear" @blur-valid="${nameGroup.viewLogicBlurUpdate}" style="width:100%">
             <u-textarea :value.sync="${valueExpression}" placeholder="请输入${label}" :autofocus="true" size="full"></u-textarea>
             </u-validator>`;

package/src/templator/genUpdateBlock.ts

@@ -36,6 +36,7 @@ export function genUpdateFormTemplate(entity: Entity, nameGroup: NameGroup, sele
 
             const { typeAnnotation } = property || {};
             const { typeName: propertyTypeName, typeNamespace: propertyTypeNamespace } = typeAnnotation || {};
+            const propertyTypeMaxLength:number = Number(property.rules.find((item) => item.indexOf('max') > -1)?.split('(')[1].slice(0, -1)) || 0;
             if (property.relationEntity) {
                 // 有外键关联
                 const relationEntity = dataSource?.findEntityByName(property.relationEntity);
@@ -69,7 +70,7 @@ export function genUpdateFormTemplate(entity: Entity, nameGroup: NameGroup, sele
                 formItem += `<u-number-input v-model="${vModel}" :precision="0" :step="0" placeholder="请输入${label}"></u-number-input>`;
             } else if (propertyTypeName === 'Decimal') {
                 formItem += `<u-number-input v-model="${vModel}" :precision="0" :step="0" placeholder="请输入${label}"></u-number-input>`;
-            } else if (propertyTypeName === 'Text') {
+            } else if (propertyTypeName === 'String' && propertyTypeMaxLength > 255) {
                 formItem += `<u-textarea v-model="${vModel}" placeholder="请输入${label}"></u-textarea>`;
             } else if (propertyTypeName === 'Date') {
                 formItem += `<u-date-picker clearable :date.sync="${vModel}" placeholder="请输入${label}"></u-date-picker>`;