@lcap/nasl 2.19.0-beta.1 → 2.19.0-beta.3

package/out/service/storage/service.d.ts

@@ -1,11 +1,19 @@
 declare const _default: {
-    batchQuery({ body, headers }: {
+    batchQuery({ body, headers, config }: {
         body: Array<any>;
         headers: Record<string, string>;
+        config?: object;
     }): any;
     batchAction({ body, headers }: {
         body: Array<any>;
         headers: Record<string, string>;
     }): any;
+    batchInstruct({ body, headers }: {
+        body: Array<any>;
+        headers: Record<string, string>;
+    }): any;
+    saveFrontendNasl({ body }: {
+        body: any;
+    }): any;
 };
 export default _default;

package/out/service/storage/service.js

@@ -7,7 +7,7 @@ const creator_1 = require("../creator");
 const api_1 = __importDefault(require("./api"));
 const service = (0, creator_1.createService)(api_1.default);
 exports.default = {
-    batchQuery({ body, headers }) {
+    batchQuery({ body, headers, config }) {
         const appData = window.appData;
         return service.batchQuery({
             body,
@@ -17,6 +17,7 @@ exports.default = {
                 'request-versionChangedTime': appData?.versionChangedTime || '',
                 operateArea: appData?.branchStatus === 'merging' ? 'merge_conflict' : '',
             }, headers),
+            config,
         });
     },
     batchAction({ body, headers }) {
@@ -31,5 +32,30 @@ exports.default = {
             }, headers),
         });
     },
+    batchInstruct({ body, headers }) {
+        const appData = window.appData;
+        return service.batchInstruct({
+            body,
+            headers: Object.assign({
+                appId: appData?.appId,
+                'request-appBaseVersion': window.appData?.baseVersion || '',
+                'request-versionChangedTime': window.appData?.versionChangedTime || '',
+                operateArea: window.appData?.branchStatus === 'merging' ? 'merge_conflict' : '',
+            }, headers),
+            config: {
+                timeout: 1000 * 60,
+            },
+        });
+    },
+    saveFrontendNasl({ body }) {
+        const appData = window.appData;
+        return service.saveFrontendNasl({
+            body,
+            headers: {
+                appId: appData?.appId,
+                skipVersionCheck: true,
+            },
+        });
+    }
 };
 //# sourceMappingURL=service.js.map

package/out/service/storage/service.js.map

@@ -1 +1 @@
-{"version":3,"file":"service.js","sourceRoot":"","sources":["../../../src/service/storage/service.ts"],"names":[],"mappings":";;;;;AAAA,wCAA2C;AAC3C,gDAAwB;AAExB,MAAM,OAAO,GAAG,IAAA,uBAAa,EAAC,aAAG,CAAC,CAAC;AAEnC,kBAAe;IACX,UAAU,CAAC,EAAE,IAAI,EAAE,OAAO,EAAyD;QAC/E,MAAM,OAAO,GAAI,MAAc,CAAC,OAAO,CAAC;QAExC,OAAO,OAAO,CAAC,UAAU,CAAC;YACtB,IAAI;YACJ,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC;gBACnB,KAAK,EAAE,OAAO,EAAE,KAAK;gBACrB,wBAAwB,EAAE,OAAO,EAAE,WAAW,IAAI,EAAE;gBACpD,4BAA4B,EAAE,OAAO,EAAE,kBAAkB,IAAI,EAAE;gBAC/D,WAAW,EAAE,OAAO,EAAE,YAAY,KAAK,SAAS,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE;aAC3E,EAAE,OAAO,CAAC;SACd,CAAC,CAAC;IACP,CAAC;IACD,WAAW,CAAC,EAAE,IAAI,EAAE,OAAO,EAAyD;QAChF,MAAM,OAAO,GAAI,MAAc,CAAC,OAAO,CAAC;QAExC,OAAO,OAAO,CAAC,WAAW,CAAC;YACvB,IAAI;YACJ,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC;gBACnB,KAAK,EAAE,OAAO,EAAE,KAAK;gBACrB,wBAAwB,EAAG,MAAc,CAAC,OAAO,EAAE,WAAW,IAAI,EAAE;gBACpE,4BAA4B,EAAG,MAAc,CAAC,OAAO,EAAE,kBAAkB,IAAI,EAAE;gBAC/E,WAAW,EAAG,MAAc,CAAC,OAAO,EAAE,YAAY,KAAK,SAAS,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE;aAC3F,EAAE,OAAO,CAAC;SACd,CAAC,CAAC;IACP,CAAC;CACJ,CAAC"}
+{"version":3,"file":"service.js","sourceRoot":"","sources":["../../../src/service/storage/service.ts"],"names":[],"mappings":";;;;;AAAA,wCAA2C;AAC3C,gDAAwB;AAExB,MAAM,OAAO,GAAG,IAAA,uBAAa,EAAC,aAAG,CAAC,CAAC;AAEnC,kBAAe;IACX,UAAU,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAA0E;QACxG,MAAM,OAAO,GAAI,MAAc,CAAC,OAAO,CAAC;QAExC,OAAO,OAAO,CAAC,UAAU,CAAC;YACtB,IAAI;YACJ,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC;gBACnB,KAAK,EAAE,OAAO,EAAE,KAAK;gBACrB,wBAAwB,EAAE,OAAO,EAAE,WAAW,IAAI,EAAE;gBACpD,4BAA4B,EAAE,OAAO,EAAE,kBAAkB,IAAI,EAAE;gBAC/D,WAAW,EAAE,OAAO,EAAE,YAAY,KAAK,SAAS,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE;aAC3E,EAAE,OAAO,CAAC;YACX,MAAM;SACT,CAAC,CAAC;IACP,CAAC;IACD,WAAW,CAAC,EAAE,IAAI,EAAE,OAAO,EAAyD;QAChF,MAAM,OAAO,GAAI,MAAc,CAAC,OAAO,CAAC;QAExC,OAAO,OAAO,CAAC,WAAW,CAAC;YACvB,IAAI;YACJ,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC;gBACnB,KAAK,EAAE,OAAO,EAAE,KAAK;gBACrB,wBAAwB,EAAG,MAAc,CAAC,OAAO,EAAE,WAAW,IAAI,EAAE;gBACpE,4BAA4B,EAAG,MAAc,CAAC,OAAO,EAAE,kBAAkB,IAAI,EAAE;gBAC/E,WAAW,EAAG,MAAc,CAAC,OAAO,EAAE,YAAY,KAAK,SAAS,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE;aAC3F,EAAE,OAAO,CAAC;SACd,CAAC,CAAC;IACP,CAAC;IACD,aAAa,CAAC,EAAE,IAAI,EAAE,OAAO,EAAyD;QAClF,MAAM,OAAO,GAAI,MAAc,CAAC,OAAO,CAAC;QAExC,OAAO,OAAO,CAAC,aAAa,CAAC;YACzB,IAAI;YACJ,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC;gBACnB,KAAK,EAAE,OAAO,EAAE,KAAK;gBACrB,wBAAwB,EAAG,MAAc,CAAC,OAAO,EAAE,WAAW,IAAI,EAAE;gBACpE,4BAA4B,EAAG,MAAc,CAAC,OAAO,EAAE,kBAAkB,IAAI,EAAE;gBAC/E,WAAW,EAAG,MAAc,CAAC,OAAO,EAAE,YAAY,KAAK,SAAS,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE;aAC3F,EAAE,OAAO,CAAC;YACX,MAAM,EAAE;gBACJ,OAAO,EAAE,IAAI,GAAG,EAAE;aACrB;SACJ,CAAC,CAAC;IACP,CAAC;IACD,gBAAgB,CAAC,EAAE,IAAI,EAAiB;QACpC,MAAM,OAAO,GAAI,MAAc,CAAC,OAAO,CAAC;QAExC,OAAO,OAAO,CAAC,gBAAgB,CAAC;YAC5B,IAAI;YACJ,OAAO,EAAE;gBACL,KAAK,EAAE,OAAO,EAAE,KAAK;gBACrB,gBAAgB,EAAE,IAAI;aACzB;SACH,CAAC,CAAC;IACR,CAAC;CACJ,CAAC"}

package/out/templator/genGetBlock.js

@@ -37,7 +37,7 @@ function genGetTemplate(entity, nameGroup) {
         .map((property) => {
         const valueExpression = `${nameGroup.viewVariableEntity}.${property.name}`;
         let formItem = `            <u-info-list-item><template #label><u-text text="${property.label || property.name}"></u-text></template>`;
-        formItem += `<u-text :text="'${valueExpression}'"></u-text>`;
+        formItem += `<u-text :text="${valueExpression}"></u-text>`;
         formItem += `            </u-info-list-item>\n`;
         return formItem;
     })

package/out/templator/genGetBlock.js.map

@@ -1 +1 @@
-{"version":3,"file":"genGetBlock.js","sourceRoot":"","sources":["../../src/templator/genGetBlock.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"genGetBlock.js","sourceRoot":"","sources":["../../src/templator/genGetBlock.ts"],"names":[],"mappings":"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"}

package/out/templator/genListViewBlock.js

@@ -57,6 +57,12 @@ function genH5ListViewTemplate(property, nameGroup) {
             <template #title>{{ ${valueExpression} }}</template>
         </van-cell>
     </template>
+    <template #prev>
+        上一页
+    </template>
+    <template #next>
+        下一页
+    </template>
 </van-list-view>`;
 }
 exports.genH5ListViewTemplate = genH5ListViewTemplate;

package/out/templator/genListViewBlock.js.map

@@ -1 +1 @@
-{"version":3,"file":"genListViewBlock.js","sourceRoot":"","sources":["../../src/templator/genListViewBlock.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"genListViewBlock.js","sourceRoot":"","sources":["../../src/templator/genListViewBlock.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lcap/nasl",
   "description": "NetEase Application Specific Language",
-  "version": "2.19.0-beta.1",
+  "version": "2.19.0-beta.3",
   "author": "Forrest <rainforest92@126.com>",
   "scripts": {
     "dev": "tsc -watch -p ./",
@@ -67,4 +67,4 @@
     "typedoc": "^0.22.17",
     "typescript": "^4.1.3"
   }
-}
+}

package/sandbox/stdlib/nasl.core.ts

@@ -136,6 +136,7 @@ declare namespace nasl.core {
     export function lessThanOrEqual(left: Integer, right: Integer): Boolean;
 
     export function ensureBoolean(value: Boolean): Boolean;
+    export function ensureVoid<T>(value: IsVoid<T>): Boolean
 
     export function isUnionType<T, S extends T>(obj: T): obj is S;
 
@@ -211,4 +212,5 @@ declare namespace nasl.core {
         accept: 'None';
     }
     export type Incompatible<A, B> = A extends B ? never : A
+    export type IsVoid<T> = T extends void ? never : T
 }

package/sandbox/stdlib/nasl.oql.ts

@@ -33,7 +33,7 @@ declare namespace nasl.oql {
     export function BIT_LENGTH(str: nasl.core.String | nasl.core.Text): nasl.core.Integer;
     export function CHAR(charset?: nasl.core.String | nasl.core.Text, ...exprs: Array<any>): nasl.core.String;
     export function CHAR_LENGTH(str: nasl.core.String | nasl.core.Text): nasl.core.Integer;
-    export function CONCAT(...strs: Array<nasl.core.String | nasl.core.Text>): nasl.core.String;
+    export function CONCAT(...strs: Array<any>): nasl.core.String;
     export function CONCAT_WS(seperator: nasl.core.String | nasl.core.Text, ...strs: Array<nasl.core.String | nasl.core.Text>): nasl.core.String;
     export function ELT(expr: nasl.core.Integer, ...strs: Array<nasl.core.String | nasl.core.Text>): nasl.core.String;
     export function EXPORT_SET(bits: nasl.core.Integer, on: nasl.core.String | nasl.core.Text, off: nasl.core.String | nasl.core.Text, separator?: nasl.core.String | nasl.core.Text, number_of_bits?: nasl.core.Integer): nasl.core.String;
@@ -45,7 +45,7 @@ declare namespace nasl.oql {
     export function INSERT(str: nasl.core.String | nasl.core.Text, pos: nasl.core.Integer, len: nasl.core.Integer, newStr: nasl.core.String | nasl.core.Text): nasl.core.String;
     export function INSTR(str: nasl.core.String | nasl.core.Text, newStr: nasl.core.String | nasl.core.Text): nasl.core.Integer;
     export function LCASE(str: nasl.core.String | nasl.core.Text): nasl.core.String;
-    export function LEFT(str: nasl.core.String | nasl.core.Text, len: nasl.core.Integer): nasl.core.String;
+    export function LEFT(str: nasl.core.String | nasl.core.Text | nasl.core.Date, len: nasl.core.Integer): nasl.core.String;
     export function LENGTH(str: nasl.core.String | nasl.core.Text): nasl.core.Integer;
     export function LOAD_FILE(fileName: nasl.core.String | nasl.core.Text): nasl.core.String;
     export function LOCATE(subStr: nasl.core.String | nasl.core.Text, str: nasl.core.String, pos?: nasl.core.Integer): nasl.core.Integer;
@@ -178,7 +178,7 @@ declare namespace nasl.oql {
     export function CURRENT_TIME(fsp: fsp): nasl.core.Double;
     export function DATE(expr: nasl.core.Date | nasl.core.DateTime): nasl.core.Date;
     export function DATEDIFF(expr1: nasl.core.Date | nasl.core.DateTime, expr2: nasl.core.Date | nasl.core.DateTime): nasl.core.Integer;
-    export function DATE_FORMAT(expr1: nasl.core.Date | nasl.core.DateTime, format: nasl.core.String): nasl.core.String;
+    export function DATE_FORMAT(expr1: nasl.core.Date | nasl.core.DateTime | nasl.core.Time, format: nasl.core.String): nasl.core.String;
     export function DAY(expr1: nasl.core.Date | nasl.core.DateTime): nasl.core.Integer;
     export function DAYNAME(expr1: nasl.core.Date | nasl.core.DateTime): nasl.core.String;
     export function DAYOFMONTH(expr1: nasl.core.Date | nasl.core.DateTime): nasl.core.Integer;
@@ -223,6 +223,7 @@ declare namespace nasl.oql {
     export function WEEKOFYEAR(date: nasl.core.Date | nasl.core.DateTime): nasl.core.Integer;
     export function YEAR(date: nasl.core.Date | nasl.core.DateTime): nasl.core.Integer;
     export function YEARWEEK(date: nasl.core.Date, mode?: nasl.core.Integer): nasl.core.Integer;
+    export function HOUR(date: nasl.core.Date | nasl.core.DateTime): nasl.core.Integer;
     export function NOW(): nasl.core.DateTime;
 
     // Comparison Functions
@@ -254,15 +255,24 @@ declare namespace nasl.oql {
     export function SUM(value: nasl.core.Long): nasl.core.Long;
     export function SUM(value: nasl.core.Double): nasl.core.Double;
     export function SUM(value: nasl.core.Decimal): nasl.core.Decimal;
-    export function AVG(value: nasl.core.Integer | nasl.core.Long | nasl.core.Double | nasl.core.Decimal): nasl.core.Integer | nasl.core.Long | nasl.core.Double | nasl.core.Decimal;
+    export function AVG(value: nasl.core.Integer | nasl.core.Long | nasl.core.Double): nasl.core.Double;
+    export function AVG(value: nasl.core.Decimal): nasl.core.Decimal;
     export function MAX(value: nasl.core.Integer): nasl.core.Integer;
     export function MAX(value: nasl.core.Long): nasl.core.Long;
     export function MAX(value: nasl.core.Double): nasl.core.Double;
     export function MAX(value: nasl.core.Decimal): nasl.core.Decimal;
+    export function MAX(value: nasl.core.Date): nasl.core.Date;
+    export function MAX(value: nasl.core.DateTime): nasl.core.DateTime;
+    export function MAX(value: nasl.core.Time): nasl.core.Time;
+    export function MAX(value: nasl.core.Boolean): nasl.core.Boolean;
     export function MIN(value: nasl.core.Integer): nasl.core.Integer;
     export function MIN(value: nasl.core.Long): nasl.core.Long;
     export function MIN(value: nasl.core.Double): nasl.core.Double;
     export function MIN(value: nasl.core.Decimal): nasl.core.Decimal;
+    export function MIN(value: nasl.core.Date): nasl.core.Date;
+    export function MIN(value: nasl.core.DateTime): nasl.core.DateTime;
+    export function MIN(value: nasl.core.Time): nasl.core.Time;
+    export function MIN(value: nasl.core.Boolean): nasl.core.Boolean;
 
     // self
     export function STARTWITH(str1: nasl.core.String, str2: nasl.core.String): nasl.core.Boolean;
@@ -272,6 +282,7 @@ declare namespace nasl.oql {
     export function IN_SUBQUERY<SelectRecord, T>(value: T, expr: Query<[SelectRecord]>): nasl.core.Boolean;
     export function COMPARE_SUBQUERY<SelectRecord, T extends SelectRecord>(value: T, expr: Query<[SelectRecord]>): nasl.core.Boolean;
     export function ISNULL(value: any): nasl.core.Boolean;
+    export function IFNULL<T1, T2>(expr1: T1, expr2: T2): T1 | T2;
     export function CASE_WHEN<THEN>(caseCase: any, caseElse: THEN, ...caseWhen: Array<[() => any, () => THEN]>): THEN;
     export function CASE_WHEN<THEN>(caseCase: any, ...caseWhen: Array<[() => any, () => THEN]>): THEN;
     export function BETWEEN_AND<T>(value: T, between: T, and: T): nasl.core.Boolean;
@@ -284,4 +295,5 @@ declare namespace nasl.oql {
     export function CONVERT<T>(value: T): T;
 
     export function EXISTS_EXPR<Record extends Array<any>>(value: Query<Record>): nasl.core.Boolean;
+    export function COALESCE<T>(...args: Array<T>): T
 }

package/sandbox/stdlib/nasl.util.ts

@@ -54,8 +54,9 @@ declare namespace nasl.util {
     export function ListProduct<T extends nasl.core.Integer | nasl.core.Long | nasl.core.Double | nasl.core.Decimal>(list: nasl.collection.List<T>): T;
     export function ListMax<T extends nasl.core.Integer | nasl.core.Long | nasl.core.Double | nasl.core.Decimal | nasl.core.String>(list: nasl.collection.List<T>): T;
     export function ListMin<T extends nasl.core.Integer | nasl.core.Long | nasl.core.Double | nasl.core.Decimal | nasl.core.String>(list: nasl.collection.List<T>): T;
-    export function ListAverage(list: nasl.collection.List<nasl.core.Decimal>): nasl.core.Decimal;
+
     export function ListAverage<T extends nasl.core.Integer | nasl.core.Long | nasl.core.Double>(list: nasl.collection.List<T>): nasl.core.Double;
+    export function ListAverage(list: nasl.collection.List<nasl.core.Decimal>): nasl.core.Decimal;
 
     export function ListSort<T>(list: nasl.collection.List<T>, by: (item: T) => any, sort: nasl.core.Boolean): void;
     export function ListFind<T>(list: nasl.collection.List<T>, by: (item: T) => nasl.core.Boolean): T;

package/src/common/BaseNode.ts

@@ -908,7 +908,9 @@ export class BaseNode extends EventEmitter {
                 const expIndex = parentNode[parentKey].findIndex((item: any) => item === oldNode);
                 const firstUpperText = parentKey[0].toUpperCase() + parentKey.slice(1, parentKey.length);
                 Object.assign(newNode, { offsetX, offsetY });
-                if (parentNode[`insertItemIn${firstUpperText}At`])
+                if (parentNode.concept === 'MatchCase') {
+                    parentKey === 'body' ? parentNode.insertItemInBodyAt(newNode, expIndex) : parentNode.insertLogicItemInPatternsAt(newNode, expIndex);
+                } else if (parentNode[`insertItemIn${firstUpperText}At`])
                     parentNode[`insertItemIn${firstUpperText}At`](newNode, expIndex);
                 else
                     parentNode.insertItemAt(newNode, expIndex);

package/src/concepts/App__.ts

@@ -208,6 +208,8 @@ export class App extends BaseNode {
     @property('Module')
     componentDependencies: Array<Module> = [];
 
+    
+
     /**
      * @param source 需要合并的部分参数
      */
@@ -256,7 +258,7 @@ export class App extends BaseNode {
         });
     }
 
-    getDataSourceUniqueName(name = 'dataSource1') {
+        getDataSourceUniqueName(name = 'dataSource1') {
         return utils.unique(name, this.getDataSourceExistingNames(), undefined, true);
     }
 
@@ -393,6 +395,7 @@ export class App extends BaseNode {
         return node;
     }
 
+
     getStructureExistingNames(excludedList: Array<Structure> = []) {
         const excludedSet = new Set(excludedList);
         return ((this.structures as Structure[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -534,6 +537,7 @@ export class App extends BaseNode {
         return node;
     }
 
+
     getEnumExistingNames(excludedList: Array<Enum> = []) {
         const excludedSet = new Set(excludedList);
         return ((this.enums as Enum[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -675,6 +679,7 @@ export class App extends BaseNode {
         return node;
     }
 
+
     getLogicExistingNames(excludedList: Array<Logic> = []) {
         const excludedSet = new Set(excludedList);
         return ((this.logics as Logic[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -816,6 +821,7 @@ export class App extends BaseNode {
         return node;
     }
 
+
     getInterfaceExistingNames(excludedList: Array<Interface> = []) {
         const excludedSet = new Set(excludedList);
         return ((this.interfaces as Interface[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -957,6 +963,7 @@ export class App extends BaseNode {
         return node;
     }
 
+
     getViewExistingNames(excludedList: Array<View> = []) {
         const excludedSet = new Set(excludedList);
         return ((this.views as View[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -1098,6 +1105,7 @@ export class App extends BaseNode {
         return node;
     }
 
+
     getVarExistingNames(excludedList: Array<Variable> = []) {
         const excludedSet = new Set(excludedList);
         return ((this.frontendVariables as Variable[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -1239,6 +1247,7 @@ export class App extends BaseNode {
         return node;
     }
 
+
     getProcessExistingNames(excludedList: Array<Process> = []) {
         const excludedSet = new Set(excludedList);
         return ((this.processes as Process[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -1380,6 +1389,7 @@ export class App extends BaseNode {
         return node;
     }
 
+
     getRoleExistingNames(excludedList: Array<Role> = []) {
         const excludedSet = new Set(excludedList);
         return ((this.roles as Role[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -1521,6 +1531,7 @@ export class App extends BaseNode {
         return node;
     }
 
+
     getModuleExistingNames(excludedList: Array<Module> = []) {
         const excludedSet = new Set(excludedList);
         return ((this.dependencies as Module[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -1928,6 +1939,9 @@ export class App extends BaseNode {
         return node;
     }
 
+
+    
+
     /**
     * 删除数据源
     * @param name 数据源名称
@@ -1976,6 +1990,8 @@ export class App extends BaseNode {
         return params;
     }
 
+
+
     /**
     * 删除数据结构
     * @param name 数据结构名称
@@ -2024,6 +2040,8 @@ export class App extends BaseNode {
         return params;
     }
 
+
+
     /**
     * 删除枚举
     * @param name 枚举名称
@@ -2072,6 +2090,8 @@ export class App extends BaseNode {
         return params;
     }
 
+
+
     /**
     * 删除逻辑
     * @param name 逻辑名称
@@ -2120,6 +2140,8 @@ export class App extends BaseNode {
         return params;
     }
 
+
+
     /**
     * 删除接口
     * @param name 接口名称
@@ -2168,6 +2190,8 @@ export class App extends BaseNode {
         return params;
     }
 
+
+
     /**
     * 删除页面
     * @param name 页面名称
@@ -2216,6 +2240,8 @@ export class App extends BaseNode {
         return params;
     }
 
+
+
     /**
     * 删除变量
     * @param name 变量名称
@@ -2264,6 +2290,8 @@ export class App extends BaseNode {
         return params;
     }
 
+
+
     /**
     * 删除流程
     * @param name 流程名称
@@ -2312,6 +2340,8 @@ export class App extends BaseNode {
         return params;
     }
 
+
+
     /**
     * 删除角色
     * @param name 角色名称
@@ -2360,6 +2390,8 @@ export class App extends BaseNode {
         return params;
     }
 
+
+
     /**
     * 删除主题
     * @param name 主题名称
@@ -2408,6 +2440,8 @@ export class App extends BaseNode {
         return params;
     }
 
+
+
     /**
     * 删除配置管理
     * @param name 配置管理名称
@@ -2456,6 +2490,8 @@ export class App extends BaseNode {
         return params;
     }
 
+
+
     /**
     * 删除模块
     * @param name 模块名称
@@ -2481,6 +2517,8 @@ export class App extends BaseNode {
         return module.delete();
     }
 
+    
+
     /**
     * 删除模块
     * @param name 模块名称
@@ -2506,6 +2544,8 @@ export class App extends BaseNode {
         return module.delete();
     }
 
+    
+
     /**
     * 删除模块
     * @param name 模块名称

package/src/concepts/BatchAssignment__.ts

@@ -634,7 +634,7 @@ export class BatchAssignment extends LogicItem {
         let count = 0;
         const typeAnnotationEnd = () => {
             const l = this.left.members.every((item) => item.__isCorrectTypeAnnotation);
-            const r = this.rights.every((right) => right.members.every((item) => item.__isCorrectTypeAnnotation));
+            const r = this.rights.every((right) => right.members.every((item) => item.__isCorrectTypeAnnotation) && right.expression.__isCorrectTypeAnnotation);
             count++;
             if (l && r) {
                 autoConnection();
@@ -780,7 +780,7 @@ export class BatchAssignment extends LogicItem {
         // 修改连线
         if (selectMember.parentKey === 'left') {
             members.forEach((item: any, index: any) => {
-                if (keepMembers.has(item.completeName)) {
+                if (keepMembers?.has(item.completeName)) {
                     const lines = this.findlines(item, selectMember);
                     lines.forEach((line) => {
                         const newLine = Object.assign({}, line, { leftIndex: [line.leftIndex[0], index] });
@@ -796,7 +796,7 @@ export class BatchAssignment extends LogicItem {
             const splitIndex = this.rights.findIndex((right) => selectMember === right);
             newLines = this.assignmentLines.filter(({ rightIndex }) => rightIndex[0] !== splitIndex);
             members.forEach((item, index) => {
-                if (keepMembers.has(item.completeName)) {
+                if (keepMembers?.has(item.completeName)) {
                     const lines = this.findlines(item, selectMember);
                     lines.forEach((line) => {
                         const newLine = Object.assign({}, line, { rightIndex: [line.rightIndex[0], index] });

package/src/concepts/CallFunction__.ts

@@ -66,7 +66,7 @@ export class CallFunction extends LogicItem {
     @property('Argument')
     arguments: Array<Argument> = [];
 
-
+    
 
     /**
      * @param source 需要合并的部分参数
@@ -81,12 +81,12 @@ export class CallFunction extends LogicItem {
         return super.from(source, parentNode, parentKey) as CallFunction;
     }
 
+    
+    
 
+    
 
-
-
-
-
+    
 
     /**
     * 插入类型标注
@@ -120,7 +120,7 @@ export class CallFunction extends LogicItem {
         return typeAnnotation;
     }
 
-
+    
 
     /**
      * 插入类型标注
@@ -144,7 +144,7 @@ export class CallFunction extends LogicItem {
         return node;
     }
 
-
+    
 
     /**
      * 添加类型标注
@@ -165,7 +165,7 @@ export class CallFunction extends LogicItem {
         return this._insertTypeAnnotationAt(options as any, index);
     }
 
-
+    
 
     /**
      * 添加类型标注
@@ -193,7 +193,7 @@ export class CallFunction extends LogicItem {
 
 
 
-
+    
 
     /**
     * 插入实际参数
@@ -227,7 +227,7 @@ export class CallFunction extends LogicItem {
         return argument;
     }
 
-
+    
 
     /**
      * 插入实际参数
@@ -251,7 +251,7 @@ export class CallFunction extends LogicItem {
         return node;
     }
 
-
+    
 
     /**
      * 添加实际参数
@@ -272,7 +272,7 @@ export class CallFunction extends LogicItem {
         return this._insertArgumentAt(options as any, index);
     }
 
-
+    
 
     /**
      * 添加实际参数
@@ -298,7 +298,7 @@ export class CallFunction extends LogicItem {
     }
 
 
-
+    
 
     /**
      * 删除类型标注
@@ -393,14 +393,28 @@ export class CallFunction extends LogicItem {
                         code += ', ';
                 });
             }
-            if (this.typeArguments && this.typeArguments.length) {
-                if (this.arguments?.length)
-                    code += ', ';
-                this.typeArguments?.forEach((arg, index) => {
-                    code += arg?.toJS().replace(/"/g, "'");
-                    if (index !== this.typeArguments?.length - 1)
+            const isStringConvert = ['ToString', 'FromString'].includes(this.calleeName);
+            let argTypeAnnotation;
+            if (isStringConvert) {
+                if (this.calleeName === 'ToString') {
+                    const arg = this.arguments[0];
+                    argTypeAnnotation = (arg as any).typeAnnotation || arg.__TypeAnnotation;
+                } else if (this.calleeName === 'FromString') {
+                    argTypeAnnotation = this.typeArguments?.[0];
+                }
+            }
+            if (argTypeAnnotation) {
+                code += `, '${argTypeAnnotation?.sortedTypeKey}'`;
+            } else {
+                if (this.typeArguments && this.typeArguments.length) {
+                    if (this.arguments?.length)
                         code += ', ';
-                });
+                    this.typeArguments?.forEach((arg, index) => {
+                        code += arg?.toJS().replace(/"/g, "'");
+                        if (index !== this.typeArguments?.length - 1)
+                            code += ', ';
+                    });
+                }
             }
             code += ')';
             return code;