@lcap/nasl 0.3.10-beta.8 → 0.3.10-beta.9

package/src/types/page/ViewVariable.ts

@@ -1,8 +1,7 @@
 import { immutable, excludedInJSON, action } from '../decorators';
-import { config, history, utils, LEVEL_ENUM, Vertex, Logic, Variable, View, Schema, ActionOptions } from '..';
-import { paramService } from '../../service/logic';
+import { config, utils, Logic, Variable, View, Schema, ActionOptions } from '..';
 import { viewService } from '../../service/page';
-import { convert2RefType, convert2SchemaType } from '../data/dataTypeUtils';
+import { convert2RefType } from '../data/dataTypeUtils';
 import { getBasicTypeDefaultValue } from '../data/basicTypes';
 import { schemaService } from '../../service/common';
 import { catchFn } from './ViewParam';
@@ -43,7 +42,7 @@ export class ViewVariable extends Variable {
 
         const body = this.toJSON('', ['ideVersion', 'editable']);
         body.viewId = this.view.id;
-        // convert2SchemaType(body.schema);
+
         utils.logger.debug('添加页面局部变量', body);
         const result: ViewVariable = await viewService.createViewVariable({
             headers: {
@@ -53,7 +52,6 @@ export class ViewVariable extends Variable {
             },
             body,
         }).catch(catchFn(this.view));
-        // convert2RefType(result.schema);
         this.deepPick(result, ['id']);
         this.assign({ code: this.genCode() });
 
@@ -74,16 +72,16 @@ export class ViewVariable extends Variable {
         config.defaultApp?.emit('saving');
 
         if (this.id) {
-                await viewService.deleteViewVariable({
-                    headers: {
-                        appId: config.defaultApp?.id,
-                        operationAction: actionOptions?.actionName || 'ViewVariable.delete',
-                        operationDesc: actionOptions?.actionDesc || `删除页面"${this.view.name}"局部变量"${this.name}"`,
-                    },
-                    query: {
-                        id: this.id,
-                    },
-                }).catch(catchFn(this.view));
+            await viewService.deleteViewVariable({
+                headers: {
+                    appId: config.defaultApp?.id,
+                    operationAction: actionOptions?.actionName || 'ViewVariable.delete',
+                    operationDesc: actionOptions?.actionDesc || `删除页面"${this.view.name}"局部变量"${this.name}"`,
+                },
+                query: {
+                    id: this.id,
+                },
+            }).catch(catchFn(this.view));
         }
 
         const { variables } = this.view.$def;
@@ -109,7 +107,6 @@ export class ViewVariable extends Variable {
         delete body.ideVersion;
         delete body.editable;
         body.viewId = this.view.id;
-        // convert2SchemaType(body.schema);
         utils.logger.debug('修改页面局部变量', body);
         const result = await viewService.updateViewVariable({
             headers: {
@@ -119,8 +116,6 @@ export class ViewVariable extends Variable {
             },
             body,
         }).catch(catchFn(this.view));
-        // convert2RefType(result.schema);
-        // this.plainAssign(result);
 
         await config.defaultApp?.history.load();
         config.defaultApp?.emit('saved');
@@ -186,7 +181,6 @@ export class ViewVariable extends Variable {
             typeInstantiation: undefined,
         });
         Object.assign(this.schema, schema);
-        // if (this.defaultValue)
         this.assign({ defaultValue: getBasicTypeDefaultValue() });
         try {
             await this.update(undefined, {

package/src/types/utils/index.ts

@@ -4,6 +4,11 @@ export * from './logger';
 
 import { traverse } from './traverse';
 import { isBasicType } from '../';
+import { cloneDeep } from 'lodash';
+
+export function getGlobalEnv() {
+    return typeof window !== 'undefined' ? (window as any).appInfo.env : (global as any).appInfoEnv;
+}
 
 /**
  * 用 lodash 的 throttle 好像有点问题，先临时做个处理
@@ -58,21 +63,25 @@ export function resolveParameter(params: Array<ParamStruts>): resolvedParameter
     };
     let hasBody = false;
     let hasParam = false;
-    params.forEach((p) => {
-        if (p.in === 'body') {
+    params.forEach((p) => { 
+        const pcopy = cloneDeep(p);
+        if(!pcopy.required) {
+            delete pcopy.defaultValue
+        }
+        if (pcopy.in === 'body') {
             hasBody = true;
-            requestBody.description.name = p.name;
-            if (!isBasicType(p.schema)) {
-                requestBody.content['application/json'] = p;
+            requestBody.description.name = pcopy.name;
+            if (!isBasicType(pcopy.schema)) {
+                requestBody.content['application/json'] = pcopy;
             } else {
                 requestBody.content['application/json'] = {
-                    schema: p.schema,
+                    schema: pcopy.schema,
                 };
             }
             requestBody.required = true;
         } else {
             hasParam = true;
-            parameters[p.name] = p;
+            parameters[pcopy.name] = pcopy;
         }
     });
     return {