@lcap/nasl 3.7.0-beta.4 → 3.7.0-beta.6

package/src/templator/genCreateBlock.ts

@@ -31,7 +31,7 @@ export function genCreateFormTemplate(entity: Entity, nameGroup: NameGroup, sele
         if (required) rules.push('required');
         const rulesStr = rules.join(' | ');
 
-        let formItem = `            <u-form-item ${required ? ' required' : ''}${rulesStr.length ? ` rules="${rulesStr}"` : ''
+        let formItem = `            <u-form-item ${required ? ' :required="true"' : ''}${rulesStr.length ? ` rules="${rulesStr}"` : ''
           } layout="center"><template #label><u-text text="${label}"></u-text></template>\n`;
 
         const { typeAnnotation } = property || {};
@@ -121,7 +121,7 @@ export function genH5CreateFormTemplate(entity: Entity, nameGroup: NameGroup, se
         if (required) rules.push('required');
         const rulesStr = rules.join(' | ');
 
-        let formItem = `            <van-field drole="other" ${required ? ' required' : ''}${rulesStr.length ? ` rules="${rulesStr}"` : ''}>\n`;
+        let formItem = `            <van-field drole="other" ${required ? ' :required="true"' : ''}${rulesStr.length ? ` rules="${rulesStr}"` : ''}>\n`;
         const { typeAnnotation } = property || {};
         const { typeNamespace: propertyTypeNamespace } = typeAnnotation || {};
         const propertyTypeName = transEntityMetadataTypes(typeAnnotation, dataSource.app);

package/src/templator/genCurdEditMultipleKeyBlock.ts

@@ -137,7 +137,7 @@ function genSaveModalTemplate(entity: Entity, nameGroup: NameGroup, selectNameGr
         const rulesStr = rules.join(' | ');
 
         let formItem = `<u-form-item
-                                    ${required ? 'required' : ''}
+                                    ${required ? ':required="true"' : ''}
                                     ${rulesStr.length ? `rules="${rulesStr}"` : ''}
                                     layout="center"
                                 ><template #label><u-text text="${label}"></u-text></template>`;

package/src/templator/genCurdMultipleKeyBlock.ts

@@ -147,7 +147,7 @@ function genSaveModalTemplate(entity: Entity, nameGroup: NameGroup, selectNameGr
         }
         if (required) rules.push('required');
         const rulesStr = rules.join(' | ');
-        let formItem = `<u-form-item ${required ? 'required' : ''}  ${
+        let formItem = `<u-form-item ${required ? ':required="true"' : ''}  ${
           rulesStr.length ? `rules="${rulesStr}"` : ''
         } layout="center"><template #label><u-text text="${label}"></u-text></template>`;
 
@@ -1094,7 +1094,7 @@ function genSaveModalTemplateDesigner(
       }
       if (required) rules.push('required');
       const rulesStr = rules.join(' | ');
-      let formItem = `<u-form-item ${required ? 'required' : ''}  ${
+      let formItem = `<u-form-item ${required ? ':required="true"' : ''}  ${
         rulesStr.length ? `rules="${rulesStr}"` : ''
       } layout="center"><template #label><u-text text="${label}"></u-text></template>`;
 
@@ -1410,7 +1410,6 @@ export function genCurdMultipleKeyBlockForTableDesigner(
     "viewBindEvents": [
         {
             "concept": "BindEvent",
-            ${composedByOptionStr}
             "arguments": [],
             "name": "created",
             "calleeNamespace": "",

package/src/templator/genUpdateBlock.ts

@@ -31,7 +31,7 @@ export function genUpdateFormTemplate(entity: Entity, nameGroup: NameGroup, sele
         if (required) rules.push('required');
         const rulesStr = rules.join(' | ');
 
-        let formItem = `            <u-form-item ${required ? ' required' : ''}${rulesStr.length ? ` rules="${rulesStr}"` : ''
+        let formItem = `            <u-form-item ${required ? ' :required="true"' : ''}${rulesStr.length ? ` rules="${rulesStr}"` : ''
           } layout="center"><template #label><u-text text="${label}"></u-text></template>\n`;
 
         const { typeAnnotation } = property || {};
@@ -55,9 +55,10 @@ export function genUpdateFormTemplate(entity: Entity, nameGroup: NameGroup, sele
               // 存在多个属性关联同一个实体的情况，因此加上属性名用以唯一标识
               const key = [property.name, relationEntity.name].join('-');
               const selectNameGroup = selectNameGroupMap.get(key);
+              let dataSourceValue = `(params) => ${selectNameGroup.logic}(elements.$ce.page, elements.$ce.size)`
               formItem += `
-                  <u-select :clearable="true" placeholder="请选择${label}" :dataSource="${selectNameGroup.viewLogicLoad}"
-                      textField="${lowerEntityName}.${displayedProperty.name}" valueField="${lowerEntityName}.${relationProperty.name}" :pagination="true" v-model="${vModel}">
+                  <u-select :clearable="true" placeholder="请选择${label}" :dataSource="${dataSourceValue}" :pageSize="50"
+                  textField="${lowerEntityName}.${displayedProperty.name}" valueField="${lowerEntityName}.${relationProperty.name}" :pagination="true" v-model="${vModel}">
                   </u-select>
               `;
             } else
@@ -124,7 +125,7 @@ export function genH5UpdateFormTemplate(entity: Entity, nameGroup: NameGroup, se
         if (required) rules.push('required');
         const rulesStr = rules.join(' | ');
 
-        let formItem = `            <van-field drole="other" ${required ? ' required' : ''}${rulesStr.length ? ` rules="${rulesStr}"` : ''}>\n`;
+        let formItem = `            <van-field drole="other" ${required ? ' :required="true"' : ''}${rulesStr.length ? ` rules="${rulesStr}"` : ''}>\n`;
 
         const { typeAnnotation } = property || {};
         const { typeNamespace: propertyTypeNamespace } = typeAnnotation || {};

package/src/utils/delay.ts

@@ -0,0 +1,41 @@
+import { isNode } from './env';
+
+/** 主线程延迟 */
+export function delay(time: number) {
+  return new Promise((resolve) => setTimeout(resolve, time));
+}
+
+let delaySwitch = (): void => void 0;
+let worker: Worker;
+
+if (!isNode) {
+  const workerCode = `
+self.onmessage = function({ data: delay }) {
+  setTimeout(function() {
+    self.postMessage('Delayed');
+  }, delay);
+}
+  `.trim();
+
+  worker = new Worker(URL.createObjectURL(new Blob([workerCode], { type: 'application/javascript' })));
+  worker.addEventListener('message', () => {
+    delaySwitch();
+  });
+}
+
+/**
+ * Web Worker 延迟
+ *
+ * @description 和 setTimeout 相比，它能无视页面在后台导致的 setTimeout 暂停问题
+ * @description 仅在浏览器环境下有效；Nodejs 环境下等同于 setTimeout
+ */
+export function delayInWorker(time = 0) {
+  if (isNode) {
+    return delay(time);
+  }
+
+  return new Promise<void>((resolve) => {
+    worker.postMessage(time);
+    delaySwitch = resolve;
+  });
+}

package/src/utils/env.ts

@@ -1,2 +1,9 @@
+/** 浏览器环境 */
+export const isBrowser = typeof window !== 'undefined' && typeof document !== 'undefined';
 /** Node 环境 */
 export const isNode = process.env.BUILD_TARGET === 'node' || !globalThis.window;
+/** 是否是浏览器测试环境 */
+export const isTestBrowser = isBrowser && (
+  /codewave-(test|dev)\.163yun\.com$/.test(location.hostname) ||
+  location.hostname.includes('localhost')
+);

package/src/utils/index.ts

@@ -1,6 +1,6 @@
 import { compare } from 'compare-versions';
 import { BaseNode, LogicItem, AnonymousFunction, Param } from '..';
-import type { ForEachStatement, Logic, View } from '..';
+import type { ForEachStatement, Logic, TypeAnnotation, View } from '..';
 import * as types from '../concepts/utils/types';
 import { getConceptPropertyMap } from '../decorators/index';
 import { traverse } from './traverse';
@@ -447,3 +447,38 @@ export function hasParamNameOfAnonymousFunction({
   const paramNames = new Set([...ancestorParamNames.values(), ...anonymousFnNodesParams.values()]);
   return paramNames.has(newName);
 }
+
+/**
+ * 目标类型列表是否和源类型列表一致
+ */
+export function isSameInType(source: TypeAnnotation[], target: TypeAnnotation[]): boolean {
+  if (source?.length !== target?.length) {
+    return false;
+  }
+  let flag = true;
+  source.forEach((item, index) => {
+    let { typeKind: sTypeKind, typeName: sTypeName, typeNamespace: sTypeNamespace } = item || {};
+    let { typeKind: tTypeKind, typeName: tTypeName, typeNamespace: tTypeNamespace } = target[index] || {};
+    // 范型不需要做对比
+    // 范型目前处理为string
+    if (sTypeKind === 'typeParam' || tTypeKind === 'typeParam') {
+      if (sTypeKind === 'typeParam') {
+        sTypeKind = 'primitive';
+        sTypeName = 'String';
+        sTypeNamespace = 'nasl.core';
+      }
+      if (tTypeKind === 'typeParam') {
+        tTypeKind = 'primitive';
+        tTypeName = 'String';
+        tTypeNamespace = 'nasl.core';
+      }
+      if (sTypeKind !== tTypeKind || sTypeName !== tTypeName || sTypeNamespace !== tTypeNamespace) {
+        flag = false;
+      }
+    }
+    if (sTypeKind !== tTypeKind || sTypeName !== tTypeName || sTypeNamespace !== tTypeNamespace) {
+      flag = false;
+    }
+  });
+  return flag;
+}

package/src/utils/time-slicing/controller.ts

@@ -1,4 +1,4 @@
-import { pageIsActive } from './page-state';
+import { isPageActive } from './page-state';
 import { Performance } from './performance';
 import {
   getFrameMark,
@@ -16,6 +16,7 @@ import {
   NextState,
   TheoreticalLimitCalculationCoefficient as Coefficient,
 } from './constant';
+import { delayInWorker } from '../delay';
 
 /** 时间分片控制器 */
 export class TimeSlicingController {
@@ -97,11 +98,12 @@ export class TimeSlicingController {
     const { frame, group, async } = this;
 
     // 页面处于活动状态
-    if (pageIsActive) {
+    if (isPageActive()) {
       /** 帧剩余时间 */
       const restFrameTime = Math.max(FrameMinTime - async.time - frame.time, 0);
       /** 是否使用下一帧 */
       const useNextFrame = restFrameTime < FrameIdleTime;
+      /** 下组任务状态 */
       const state = useNextFrame ? NextState.NextFrame : NextState.MicroTask;
       /** 增长系数计算的任务上限 */
       const taskNumberByRatio = this.increaseRatio(group.limit);
@@ -273,7 +275,7 @@ export class TimeSlicingController {
         }
         else {
           this.setFrameEnd();
-          requestAnimationFrame(runFrame);
+          delayInWorker(FrameIdleTime).then(runFrame);
         }
       };
       /** 运行任务组 */

package/src/utils/time-slicing/page-state.ts

@@ -1,12 +1,4 @@
 import { isNode } from '../env';
 
 /** 页面活动状态 */
-export let pageIsActive = false;
-
-// 浏览器环境需要监听页面活动状态
-if (!isNode) {
-  pageIsActive = !(document?.hidden ?? true);
-  document?.addEventListener('visibilitychange', () => {
-    pageIsActive = !document.hidden;
-  });
-}
+export const isPageActive = () => !isNode && !document.hidden;

package/test/concepts/view-element/__snapshots__/toVue.spec.ts.snap

@@ -103,7 +103,7 @@ exports[`view-element:toVue table-data-source-calllogic-with-server-validation 1
     >
       <u-table-view
         :ref=\\"\`tableView_1\`\\"
-        :data-source=\\"__tableView_1_dataSourceLoad\\"
+        :data-source=\\"(params) => __tableView_1_handleDataSourceLoad(params)\\"
         :data-schema=\\"\`LoadTestTableView_1Structure\`\\"
         :value-field=\\"\`entity1.id\`\\"
         :pagination=\\"true\\"
@@ -271,7 +271,7 @@ exports[`view-element:toVue with-table 1`] = `
       </u-linear-layout>
       <u-table-view
         :ref=\\"\`tableView\`\\"
-        :data-source=\\"__tableView_dataSourceLoad\\"
+        :data-source=\\"(params) => __tableView_handleDataSourceLoad(params)\\"
         :data-schema=\\"\`LoadTestTableView2Structure\`\\"
         :value-field=\\"\`entity2.id\`\\"
         :pagination=\\"true\\"

package/ts-worker/src/index.js

@@ -234,7 +234,7 @@ const context = {
                 console.error(e);
         }
     },
-    publishDiagnostics(remain) {
+    publishDiagnostics(remain, versions) {
         webHost.diagnosticRecords = [];
         for (let i = 0; i < remain; i++) {
           try {
@@ -250,6 +250,7 @@ const context = {
         this.messager.sendData({
           event: 'publishDiagnostics',
           records: webHost.diagnosticRecords,
+          versions
         });
     },
     geterr(files = []) {
@@ -257,7 +258,7 @@ const context = {
         //     count++;
         // }, 10)
     },
-    getDiagnosticRecords(filePaths = this.system.readDirectory('/embedded')) {
+    getDiagnosticRecords(filePaths = this.system.readDirectory('/embedded'), versions = []) {
         this._clearTimeout();
         this.session.executeCommand({
             seq: seq++,
@@ -271,7 +272,7 @@ const context = {
         webHost.diagnosticRecords = [];
         // this._reduceDiagnosticQueue(filePaths.length);
         // return webHost.diagnosticRecords;
-        this.publishDiagnostics(filePaths.length);
+        this.publishDiagnostics(filePaths.length, versions);
         return [];
     },
     fileReferences(filePath) {