@lcap/nasl 1.0.0 → 1.0.1

package/src/concepts/View__.ts

@@ -370,8 +370,12 @@ export class View extends BaseNode {
     }
 
 
+    getParamExistingNames(excludedList: Array<Param> = []) {
+        const excludedSet = new Set(excludedList);
+        return (this.params || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
+    }
     getParamUniqueName(name = 'param1') {
-        return utils.unique(name, this.getVarExistingNames());
+        return utils.unique(name, this.getParamExistingNames(), undefined, false);
     }
 
     /**
@@ -508,8 +512,12 @@ export class View extends BaseNode {
     }
 
 
+    getVariableExistingNames(excludedList: Array<Variable> = []) {
+        const excludedSet = new Set(excludedList);
+        return (this.variables || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
+    }
     getVariableUniqueName(name = 'variable1') {
-        return utils.unique(name, this.getVarExistingNames());
+        return utils.unique(name, this.getVariableExistingNames(), undefined, false);
     }
 
     /**
@@ -651,7 +659,7 @@ export class View extends BaseNode {
         return (this.logics || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
     getLogicUniqueName(name = 'logic1') {
-        return utils.unique(name, this.getLogicExistingNames());
+        return utils.unique(name, this.getLogicExistingNames(), undefined, false);
     }
 
     /**
@@ -793,7 +801,7 @@ export class View extends BaseNode {
         return (this.bindEvents || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
     getBindEventUniqueName(name = 'bindEvent1') {
-        return utils.unique(name, this.getBindEventExistingNames());
+        return utils.unique(name, this.getBindEventExistingNames(), undefined, false);
     }
 
     /**
@@ -937,7 +945,7 @@ export class View extends BaseNode {
         return (this.children || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
     getViewUniqueName(name = 'view1') {
-        return utils.unique(name, this.getViewExistingNames());
+        return utils.unique(name, this.getViewExistingNames(), undefined, false);
     }
 
     /**

package/src/enums/KEYWORDS.ts

@@ -130,8 +130,6 @@ export const KEYWORDS = [
     'out',
     'override',
     'package',
-    'param',
-    'params',
     'path',
     'pc',
     'private',

package/src/server/getScope.ts

@@ -1,4 +1,4 @@
-import { Logic, View, Process } from "..";
+import { Logic, View, Process } from '..';
 
 type wordScope = {
     Param?: string[]
@@ -7,44 +7,56 @@ type wordScope = {
     Constant?: string[]
 }
 
-export function getLogicScopeWords(logic: Logic): wordScope{
+export function getLogicScopeWords(logic: Logic): wordScope {
     const scope: wordScope = {
-        Param: logic.params.map(p => p.name),
-        Return: logic.returns.map(p => p.name),
-        Variable: logic.variables.map(p => p.name),
-    }
+        Param: logic.params.map((p) => p.name),
+        Return: logic.returns.map((p) => p.name),
+        Variable: logic.variables.map((p) => p.name),
+        Constant: [],
+    };
     return scope;
 }
 
-export function getViewScopeWords(view: View): wordScope{
+export function getViewScopeWords(view: View): wordScope {
     const scope: wordScope = {
-        Param: view.params.map(p => p.name),
-        // returns: View.returns.map(p => p.name),
-        Variable: view.variables.map(p => p.name),
-    }
+        Param: view.params.map((p) => p.name),
+        Variable: view.variables.map((p) => p.name),
+        Return: [],
+        Constant: [],
+    };
     return scope;
 }
 
-export function getProcessScopeWords(process: Process): wordScope{
+export function getProcessScopeWords(process: Process): wordScope {
     const processName = process.name;
     const scope: wordScope = {
-        Param: process.params.map(p => `${processName}.${p.name}`),
-        Return: process.returns.map(p => `${processName}.${p.name}`),
-        Constant: process.constants.map(p => `${processName}.${p.name}`),
+        Param: process.params.map((p) => `${processName}.${p.name}`),
+        Return: process.returns.map((p) => `${processName}.${p.name}`),
+        Constant: process.constants.map((p) => `${processName}.${p.name}`),
         Variable: [],
-    }
+    };
 
-    process.elements.forEach(el => {
+    process.elements.forEach((el) => {
         const elname = el.name;
-        el.variables.forEach(v => {
-            scope.Variable.push(`${processName}.${elname}.${v.name}`)
+        el.variables.forEach((v) => {
+            scope.Variable.push(`${processName}.${elname}.${v.name}`);
         });
-        el.returns.forEach(v => {
-            scope.Return.push(`${processName}.${elname}.${v.name}`)
+        el.returns.forEach((v) => {
+            scope.Return.push(`${processName}.${elname}.${v.name}`);
         });
-        el.constants.forEach(v => {
-            scope.Constant.push(`${processName}.${elname}.${v.name}`)
+        el.constants.forEach((v) => {
+            scope.Constant.push(`${processName}.${elname}.${v.name}`);
         });
-    })
+    });
+    return scope;
+}
+
+export function combineScope(a: wordScope, b: wordScope) : wordScope {
+    const scope: wordScope = {
+        Param: [...a.Param, ...b.Param],
+        Return: [...a.Return, ...b.Return],
+        Constant: [...a.Constant, ...b.Constant],
+        Variable: [...a.Variable, ...b.Variable],
+    };
     return scope;
 }

package/src/server/naslServer.ts

@@ -798,19 +798,26 @@ const naslServer = {
                     }
                     // 如果节点是MemberExpression表达式
                     if (minRange.node instanceof MemberExpression) {
-                        // 匹配到的内容，当前这一行的内容；
-                        // 因为要用下面的点位信息
-                        const a = record.lineText;
-                        // 之前的内容
-                        const oldValue = minRange.node.getValue();
-                        const index = a.indexOf(oldValue);
-                        const start = record.start.offset - index - 1;
-                        const end = record.end.offset - index - 1;
-                        const newTextValue = oldValue.substring(0, start) + newValue + oldValue.substring(end, oldValue.length);
-                        // MemberExpression可能改的是多层中的某一个
-                        // 倒序， 对比看是哪里发生了修改
-                        // 比较特殊就把新匹配到的值返回内部自己看要改那个地方的值
-                        minRange.newValue = newTextValue;
+                        // 枚举key的特殊性，因为它不是原来的key+value形式的
+                        // 是加了中括号啥的，所以直接赋值新值
+                        if (node instanceof EnumItem) {
+                            const newTextValue = node.parentNode.name + '.' + newValue;
+                            minRange.newValue = newTextValue;
+                        } else {
+                            // 匹配到的内容，当前这一行的内容；
+                            // 因为要用下面的点位信息
+                            const a = record.lineText;
+                            // 之前的内容
+                            const oldValue = minRange.node.getValue();
+                            const index = a.indexOf(oldValue);
+                            const start = record.start.offset - index - 1;
+                            const end = record.end.offset - index - 1;
+                            const newTextValue = oldValue.substring(0, start) + newValue + oldValue.substring(end, oldValue.length);
+                            // MemberExpression可能改的是多层中的某一个
+                            // 倒序， 对比看是哪里发生了修改
+                            // 比较特殊就把新匹配到的值返回内部自己看要改那个地方的值
+                            minRange.newValue = newTextValue;
+                        }
                     }
                     // 如果是修改实体，引发节点依赖实体发生改变的
                     if (minRange.node instanceof EntityProperty && node instanceof Entity) {
@@ -936,6 +943,10 @@ const naslServer = {
                         const newBindRoles = str.split(',');
                         minRange.newValue = newBindRoles;
                     }
+                    // 修改枚举值找到了EntityProperty就说明给了默认值
+                    if (minRange.node instanceof EntityProperty && node instanceof EnumItem) {
+                        minRange.setTypeMethods = 'setDefaultValue';
+                    }
                     if (minRange.node instanceof QueryFieldExpression && node instanceof Entity) {
                         minRange.setTypeMethods = 'setEntityAsName';
                     }
@@ -1387,11 +1398,19 @@ BaseNode.prototype.changeName = async function changeName(newValue: string, upda
              * 先修改之
              */
             const closeCallBack = () => {
-                const oldValue = this.name;
-                this.name = oldValue + ' ';
-                setTimeout(() => {
-                    this.name = oldValue;
-                }, 0);
+                if (this.concept === 'EnumItem') {
+                    const oldValue = (this as EnumItem).value;
+                    (this as EnumItem).value = oldValue + ' ';
+                    setTimeout(() => {
+                        (this as EnumItem).value = oldValue;
+                    }, 0);
+                } else {
+                    const oldValue = this.name;
+                    this.name = oldValue + ' ';
+                    setTimeout(() => {
+                        this.name = oldValue;
+                    }, 0);
+                }
             };
             updateAll ? callback(true) : invokeCommand('tsConfirm.open', confirmParms, callback, closeCallBack);
 

package/src/service/storage/init.ts

@@ -256,6 +256,7 @@ function handleApp(app: any) {
     app._historyList = [];
     app._historyIndex = 0;
     app._historying = false;
+    app._timer = null;
 
     app.on('undo', () => {
         app._historying = true;
@@ -269,6 +270,15 @@ function handleApp(app: any) {
      * 开启收集
      */
     app.on('collect:start', (event: any) => {
+        if (app._timer) {
+            clearTimeout(app._timer);
+        }
+        if (!event.noTimer) {
+            app._timer = setTimeout(() => {
+                console.error('收集超时，请及时排查原因');
+                app.emit('refresh');
+            }, 800);
+        }
         if (!app._isCollectingCount) {
             app._actionMsg = event?.actionMsg;
             app._action = event?.action;
@@ -282,6 +292,9 @@ function handleApp(app: any) {
     app.on('collect:end', async () => {
         app._isCollectingCount--;
         if (app._isCollectingCount === 0) {
+            if (app._timer) {
+                clearTimeout(app._timer);
+            }
             if (Array.isArray(app._collectingList) && app._collectingList.length) {
                 embeddedTSEmitter.emit('change', {
                     value: app._collectingList,

package/src/utils/index.ts

@@ -37,6 +37,9 @@ export const waitPromise = (wait: number) => new Promise((res) => setTimeout(()
 
 // 官方扩展组件暂时不包含 css 文件
 export const officialCustoms = [
+    'u-sider-modal',
+    'timer-count-down',
+    'u-calendar-table',
     'lcap-login',
     'lcap-video',
     'lcap-amap-nav',
@@ -45,12 +48,14 @@ export const officialCustoms = [
     'lcap-echarts-line',
     'lcap-echarts-pie',
     'lcap-report',
-    'lcap-h5-iframe',
     'lcap-wang-editor',
+    'lcap-clock',
 ];
 // 特殊官方组件，部分低版本有 css，高版本没有 css
 export const specialOfficialCustoms = [{ name: 'lcap-rich-text-editor', version: '1.3.10' }];
+// lcap-h5 开头表示官方 H5 扩展组件
 export const shouldLoadCss = (name: string, version: string): boolean => (!officialCustoms.includes(name)
+  && !/lcap-h5/.test(name)
   && !specialOfficialCustoms.find((extra) => extra.name === name && compare(version, extra.version, '>=')));
 
 // https://github.com/Microsoft/TypeScript/issues/27024#issuecomment-421529650

package/src/utils/string.ts

@@ -27,15 +27,45 @@ export const firstLowerCase = (value: string) => value.replace(/^\S/, (letter) =
  * @param set 数据集合，Array | Map | Set
  * @param start 数字起始
  */
-export function unique(key: string, set: Set<string> | Map<string, any> | Array<string> | { [name: string]: string }, start: number = 1) {
-    const has = (_key: string) => {
-        if (set instanceof Set || set instanceof Map)
-            return set.has(_key);
-        else if (Array.isArray(set))
-            return set.includes(_key);
-        else
-            return set[_key];
-    };
+export function unique(key: string,
+    set: Set<string> | Map<string, any> | Array<string> | { [name: string]: string },
+    start: number = 1,
+    insensitive: boolean = false) {
+    let has;
+    if (insensitive) {
+        has = (_key: string) => {
+            const lkey = _key.toLowerCase();
+            if (set instanceof Set || set instanceof Map) {
+                // return set.has(_key);
+                const iterator = set.keys();
+                let i = iterator.next();
+                while (!i.done) {
+                    const name = i.value;
+                    if (name.toLowerCase() === lkey) {
+                        return true;
+                    }
+                    i = iterator.next();
+                }
+                return false;
+            } else if (Array.isArray(set))
+                // return set.includes(_key);
+                return set.some((s) => s.toLowerCase() === lkey);
+            else {
+                // return set[_key];
+                const keys = Object.keys(set);
+                return keys.some((k) => k.toLowerCase() === lkey);
+            }
+        };
+    } else {
+        has = (_key: string) => {
+            if (set instanceof Set || set instanceof Map)
+                return set.has(_key);
+            else if (Array.isArray(set))
+                return set.includes(_key);
+            else
+                return set[_key];
+        };
+    }
 
     while (has(key))
         key = key.replace(/\d*$/, (m) => String(m === '' ? start : +m + 1));