@lcap/nasl 2.12.0-beta → 2.12.0-beta.1

package/out/templator/genQueryComponent.js.map

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

package/out/templator/genTableBlock.js

@@ -33,16 +33,20 @@ const utils_1 = require("./utils");
  */
 function genTableColumnTemplate(property) {
     const entity = property.entity;
+    const dataSource = entity.parentNode;
     const lowerEntityName = utils.firstLowerCase(entity.name);
     let expression = `scope.item.${lowerEntityName}.${property.name}`;
     const title = property.label || property.name;
     if (property.relationEntity) {
         const relationLowerEntityName = utils.firstLowerCase(property.relationEntity);
+        const relationEntity = dataSource?.findEntityByName(property.relationEntity);
+        const displayedProperty = (0, _1.getFirstDisplayedProperty)(relationEntity);
         // 有外键关联
-        expression = (0, _1.getExpression)(property, `scope.item.${relationLowerEntityName}.${property.relationProperty}`);
+        expression = (0, _1.getExpression)(property, `scope.item.${relationLowerEntityName}.${displayedProperty?.name || property.relationProperty}`);
     }
-    else
+    else {
         expression = (0, _1.getExpression)(property, `scope.item.${lowerEntityName}.${property.name}`);
+    }
     const getText = (property) => {
         if (property.typeAnnotation.typeName === 'Boolean') {
             return `
@@ -209,7 +213,8 @@ function genTableBlock(entity, view) {
     nameGroup.viewVariableEntity = view.getVariableUniqueName(utils.firstLowerCase(entity.name));
     nameGroup.viewLogicRemove = view.getLogicUniqueName('remove');
     // 收集所有和本实体关联的实体
-    const allEntities = [entity];
+    const entitySet = new Set();
+    entitySet.add(entity);
     const newStructures = [];
     const newLogics = [];
     entity.properties.forEach((property) => {
@@ -219,10 +224,11 @@ function genTableBlock(entity, view) {
             if (relationEntity) {
                 const displayedProperty = (0, _1.getFirstDisplayedProperty)(relationEntity);
                 if (displayedProperty)
-                    allEntities.push(relationEntity);
+                    entitySet.add(relationEntity);
             }
         }
     });
+    const allEntities = [...entitySet];
     const entityStructure = (0, _1.genQueryStructure)(allEntities, nameGroup);
     newStructures.push(entityStructure);
     const entityLogic = (0, _1.genQueryLogic)(allEntities, nameGroup, false, true, module);
@@ -255,7 +261,8 @@ function genTableColumnBlock(property, view) {
     nameGroup.viewVariableEntity = view.getVariableUniqueName(utils.firstLowerCase(entity.name));
     nameGroup.viewLogicRemove = view.getLogicUniqueName('remove');
     // 收集所有和本实体关联的实体
-    const allEntities = [entity];
+    const entitySet = new Set();
+    entitySet.add(entity);
     const newStructures = [];
     const newLogics = [];
     const properties = [property];
@@ -266,10 +273,11 @@ function genTableColumnBlock(property, view) {
             if (relationEntity) {
                 const displayedProperty = (0, _1.getFirstDisplayedProperty)(relationEntity);
                 if (displayedProperty)
-                    allEntities.push(relationEntity);
+                    entitySet.add(relationEntity);
             }
         }
     });
+    const allEntities = [...entitySet];
     const entityStructure = (0, _1.genQueryStructure)(allEntities, nameGroup);
     newStructures.push(entityStructure);
     const entityLogic = (0, _1.genQueryLogic)(allEntities, nameGroup, false, true, module);

package/out/templator/genTableBlock.js.map

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

package/out/templator/genUpdateBlock.js

@@ -56,7 +56,9 @@ function genUpdateFormTemplate(entity, nameGroup, selectNameGroupMap) {
                 const displayedProperty = (0, _1.getFirstDisplayedProperty)(relationEntity);
                 if (displayedProperty) {
                     const lowerEntityName = utils.firstLowerCase(relationEntity.name);
-                    const selectNameGroup = selectNameGroupMap.get(relationEntity.name);
+                    // 存在多个属性关联同一个实体的情况，因此加上属性名用以唯一标识
+                    const key = [property.name, relationEntity.name].join('-');
+                    const selectNameGroup = selectNameGroupMap.get(key);
                     formItem += `
                         <u-select clearable placeholder="请选择${label}" :data-source="${selectNameGroup.viewLogicLoad}"
                             text-field="${lowerEntityName}.${displayedProperty.name}" value-field="${lowerEntityName}.${relationProperty.name}" :pageable="true" :remote-paging="true" v-model="${vModel}">
@@ -138,13 +140,15 @@ function genH5UpdateFormTemplate(entity, nameGroup, selectNameGroupMap) {
                 const displayedProperty = (0, _1.getFirstDisplayedProperty)(relationEntity);
                 if (displayedProperty) {
                     const lowerEntityName = utils.firstLowerCase(relationEntity.name);
-                    const selectNameGroup = selectNameGroupMap.get(relationEntity.name);
+                    // 存在多个属性关联同一个实体的情况，因此加上属性名用以唯一标识
+                    const key = [property.name, relationEntity.name].join('-');
+                    const selectNameGroup = selectNameGroupMap.get(key);
                     formItem += `
-                        <template #input><van-cascader title="请选择${label}" placeholder="请选择${label}"
+                        <template #input><van-linear-layout style="width:100%;" direction="horizontal"><van-cascader title="请选择${label}" placeholder="请选择${label}"
                             v-model="${vModel}" :data-source="${selectNameGroup.viewLogicLoad}"
                             text-field="${lowerEntityName}.${displayedProperty.name}" value-field="${lowerEntityName}.${relationProperty.name}"
                             :notitleblock="true"
-                            :pageable="true" :remote-paging="true"></van-cascader></template>
+                            :pageable="true" input-align="left" :remote-paging="true"></van-cascader></van-linear-layout></template>
                     `;
                 }
                 else
@@ -154,35 +158,35 @@ function genH5UpdateFormTemplate(entity, nameGroup, selectNameGroupMap) {
                 return '';
         }
         else if (propertyTypeName === 'Boolean') {
-            formItem += `<template #input><van-switch v-model="${vModel}"></van-switch></template>`;
+            formItem += `<template #input><van-linear-layout style="width:100%;" direction="horizontal"><van-switch v-model="${vModel}"></van-switch></van-linear-layout></template>`;
         }
         else if (propertyTypeName === 'Integer' || propertyTypeName === 'Long') {
-            formItem += `<template #input><van-stepper v-model="${vModel}" placeholder="请输入${label}"></van-stepper></template>`;
+            formItem += `<template #input><van-linear-layout style="width:100%;" direction="horizontal"><van-stepper-new v-model="${vModel}" placeholder="请输入${label}" :showPlus="false" :showMinus="false" align="left"></van-stepper-new></van-linear-layout></template>`;
         }
         else if (propertyTypeName === 'Double') {
-            formItem += `<template #input><van-stepper v-model="${vModel}" placeholder="请输入${label}"></van-stepper></template>`;
+            formItem += `<template #input><van-linear-layout style="width:100%;" direction="horizontal"><van-stepper-new v-model="${vModel}" placeholder="请输入${label}" :showPlus="false" :showMinus="false" align="left"></van-stepper-new></van-linear-layout></template>`;
         }
         else if (propertyTypeName === 'Text') {
-            formItem += `<template #input><van-fieldtextarea v-model="${vModel}" placeholder="请输入${label}"></van-fieldtextarea></template>`;
+            formItem += `<template #input><van-linear-layout style="width:100%;" direction="horizontal"><van-fieldtextarea v-model="${vModel}" placeholder="请输入${label}"></van-fieldtextarea></van-linear-layout></template>`;
             // @TODO
         }
         else if (propertyTypeName === 'Date') {
-            formItem += `<template #input><van-calendar clearable :default-date.sync="${vModel}" placeholder="请输入${label}"></van-calendar></template>`;
+            formItem += `<template #input><van-linear-layout style="width:100%;" direction="horizontal"><van-calendar clearable :default-date.sync="${vModel}" placeholder="请输入${label}" input-align="left"></van-calendar></van-linear-layout></template>`;
         }
         else if (propertyTypeName === 'Time') {
-            formItem += `<template #input><van-datetime-picker type="time" v-model="${vModel}" title="请选择${label}" label-field=""></van-datetime-picker></template>`;
+            formItem += `<template #input><van-linear-layout style="width:100%;" direction="horizontal"><van-datetime-picker type="time" v-model="${vModel}" title="请选择${label}" label-field="" input-align="left"></van-datetime-picker></van-linear-layout></template>`;
         }
         else if (propertyTypeName === 'DateTime') {
-            formItem += `<template #input><van-datetime-picker type="datetime" v-model="${vModel}" title="请选择${label}" label-field=""></van-datetime-picker></template>`;
+            formItem += `<template #input><van-linear-layout style="width:100%;" direction="horizontal"><van-datetime-picker type="datetime" v-model="${vModel}" title="请选择${label}" label-field="" input-align="left"></van-datetime-picker></van-linear-layout></template>`;
         }
         else {
             const namespaceArr = propertyTypeNamespace.split('.');
             const type = namespaceArr.pop();
             if (type === 'enums') {
-                formItem += '<template #input>' + (0, _1.genEnumSelectBlock)(module.findEnumByName(propertyTypeName), `${vModel}`, '', `请选择${label}`, true) + '</template>';
+                formItem += '<template #input><van-linear-layout style="width:100%;" direction="horizontal">' + (0, _1.genEnumSelectBlock)(module.findEnumByName(propertyTypeName), `${vModel}`, '', `请选择${label}`, true) + '</van-linear-layout></template>';
             }
             else {
-                formItem += `<template #input><van-fieldinput v-model="${vModel}" placeholder="请输入${label}"></van-fieldinput></template>`;
+                formItem += `<template #input><van-linear-layout style="width:100%;" direction="horizontal"><van-fieldinput v-model="${vModel}" placeholder="请输入${label}"></van-fieldinput></van-linear-layout></template>`;
             }
         }
         formItem += `<template #title><van-text text="${label}"><van-text></template>`;
@@ -304,7 +308,9 @@ function genUpdateBlock(entity, view) {
                     const viewElementSelect = view.getViewElementUniqueName('select');
                     const selectNameGroup = (0, _1.genUniqueQueryNameGroup)(module, view, viewElementSelect, false, relationEntity.name);
                     selectNameGroup.viewElementSelect = viewElementSelect;
-                    selectNameGroupMap.set(relationEntity.name, selectNameGroup);
+                    // 存在多个属性关联同一个实体的情况，因此加上属性名用以唯一标识
+                    const key = [property.name, relationEntity.name].join('-');
+                    selectNameGroupMap.set(key, selectNameGroup);
                     const newStructure = (0, _1.genQueryStructure)([relationEntity], selectNameGroup);
                     const newLogic = (0, _1.genQueryLogic)([relationEntity], selectNameGroup, false, false, module);
                     newStructures.push(newStructure);

package/out/templator/genUpdateBlock.js.map

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

package/out/utils/index.d.ts

@@ -5,6 +5,7 @@ import { BaseNode } from '..';
 export declare function findClosestModule(node: BaseNode): BaseNode;
 export declare function findConceptKeyWordByNamespace(namespace: string): string;
 export declare function findConceptKeyWordIndexFromNamespace(namespace: string, keyword: string): number;
+export declare function findConceptValueFromNamespace(namespace: string, keyword: string): string;
 export declare function getGlobalEnv(): any;
 /**
  * 用 lodash 的 throttle 好像有点问题，先临时做个处理

package/out/utils/index.js

@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.shouldLoadCss = exports.specialOfficialCustoms = exports.officialCustoms = exports.waitPromise = exports.clearObjectDeep = exports.clearObject = exports.throttle = exports.getGlobalEnv = exports.findConceptKeyWordIndexFromNamespace = exports.findConceptKeyWordByNamespace = exports.findClosestModule = void 0;
+exports.shouldLoadCss = exports.specialOfficialCustoms = exports.officialCustoms = exports.waitPromise = exports.clearObjectDeep = exports.clearObject = exports.throttle = exports.getGlobalEnv = exports.findConceptValueFromNamespace = exports.findConceptKeyWordIndexFromNamespace = exports.findConceptKeyWordByNamespace = exports.findClosestModule = void 0;
 __exportStar(require("./string"), exports);
 __exportStar(require("./traverse"), exports);
 __exportStar(require("./logger"), exports);
@@ -51,6 +51,24 @@ function findConceptKeyWordIndexFromNamespace(namespace, keyword) {
     });
 }
 exports.findConceptKeyWordIndexFromNamespace = findConceptKeyWordIndexFromNamespace;
+// 从namespace中查找concept，返回找到类型对应的值
+// 如 namespace : app.datasource.defaultDS  keyword: datasource
+// 返回 defaultDS
+function findConceptValueFromNamespace(namespace, keyword) {
+    const namespaceArr = namespace?.split('.') || [];
+    const start = namespaceArr[0];
+    const mod = start === 'app' ? 1 : 0;
+    const findIndex = namespaceArr.findIndex((namespaceItem, index) => {
+        if (index % 2 === mod) {
+            return namespaceItem === keyword;
+        }
+        return false;
+    });
+    if (findIndex)
+        return namespaceArr[findIndex + 1];
+    return '';
+}
+exports.findConceptValueFromNamespace = findConceptValueFromNamespace;
 function getGlobalEnv() {
     return typeof window !== 'undefined' ? window.appInfo.env : global.appInfoEnv;
 }

package/out/utils/index.js.map

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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lcap/nasl",
   "description": "NetEase Application Specific Language",
-  "version": "2.12.0-beta",
+  "version": "2.12.0-beta.1",
   "author": "Forrest <rainforest92@126.com>",
   "scripts": {
     "dev": "tsc -watch -p ./",

package/src/automate/engine/index.js

@@ -3,8 +3,9 @@ import { BaseNode } from '../../common/BaseNode';
 import { tracking, TRACK_TYPE, IGNORE_PROPERTY } from './utils';
 import { getConceptConstructor, getConceptMeta } from '../../decorators/index';
 // import { unique, firstUpperCase } from '../../utils/string';
-import uniqueNameModule from './uniqueName';
-import operatorModule from './operators';
+import {uniqueName, componentUniqueName} from './uniqueName';
+import { ops as operatorModule, ComponentOps } from './operators';
+import { processComponent } from '../template/process';
 
 let id = 0;
 class TemplateMeta {
@@ -23,10 +24,12 @@ class TemplateMeta {
 
     addRootBinds(propertyName, templateMeta) {
         // App.[propertyName].push(templateMeta.name)
-        this.rootBinds.push({
-            propertyName,
-            value: templateMeta.name,
-        });
+        if(!this.rootBinds.find(b => b.propertyName === propertyName)) {
+            this.rootBinds.push({
+                propertyName,
+                value: templateMeta.name,
+            });
+        }
     }
 
     addBinds(type, propertyName, templateMeta) {
@@ -436,7 +439,18 @@ export function applyTemplate(script, app, rootBindCallback, roleCallback, final
     // 为了兼容 2.11 老模板
     if(importModule) {
         importModule('operators', operatorModule);
-        importModule('uniqueName', uniqueNameModule);
+        importModule('uniqueName', uniqueName);
     }
     execTemplate(app, getConceptConstructor, getConceptMeta, BaseNode, rootBindCallback, roleCallback, finalCallback);
 }
+
+export function applyDropComponent(app, view, element) {
+    const { execTemplate, importModule } = processComponent;
+    // 为了兼容 2.11 老模板
+    if (importModule) {
+        importModule('operators', ComponentOps);
+        importModule('uniqueName', componentUniqueName);
+    }
+    view.collectExistingViewElementName();
+    return execTemplate(app, view, element);
+}

package/src/automate/engine/operators.js

@@ -1,28 +1,76 @@
 import { BaseNode } from '../../common/BaseNode';
 import { getConceptConstructor, getConceptMeta } from '../../decorators/index';
-import { firstUpperCase } from '../../utils/string';
+import { firstUpperCase, unique } from '../../utils/string';
 
 function instanceOfBaseNode(item) {
     return (item instanceof BaseNode);
 }
-const ops = {
+export const ops = {
     _set(item, propertyName, value, callback) {
-        if(instanceOfBaseNode(value)) {
+        if (instanceOfBaseNode(value)) {
             value.parentNode = item;
             value.parentKey = propertyName;
         }
-        if(item[propertyName] !== value) {
+        if (item[propertyName] !== value) {
             item.update({
                 [propertyName]: value,
             });
-            
-            if(instanceOfBaseNode(value) && callback) {
+
+            if (instanceOfBaseNode(value) && callback) {
                 callback(item[propertyName]);
             }
         }
     },
     _push(item, propertyName, value) {
-        if(!item[propertyName]){
+        if (propertyName === 'dataSources' && value.concept === 'DataSource') {
+            // 合并策略
+            const exsitDataSource = item.dataSources.find((d) => d.name === value.name);
+            if (exsitDataSource) {
+                const nameSet = new Set(exsitDataSource.getEntityExistingNames());
+                value.entities.forEach((e) => {
+                    const n = unique(e.name, nameSet, 1, true);
+                    nameSet.add(n);
+                    e.update({
+                        name: n,
+                    });
+                    e.parentNode = exsitDataSource;
+                    exsitDataSource.entities.push(e);
+                    const index = exsitDataSource.entities.length;
+                    e.create({
+                        index,
+                        parentNode: exsitDataSource,
+                        parentKey: 'entities',
+                    });
+                });
+                return;
+            } else {
+                const dataSourceGroup = item.configuration?.getGroup('dataSource');
+                dataSourceGroup.addConfigProperty({
+                    name: value.name,
+                    description: '',
+                    values: [
+                        { env: 'dev', value: '', concept: 'ConfigPropertyValue' },
+                        { env: 'online', value: '', concept: 'ConfigPropertyValue' },
+                    ],
+                });
+            }
+        }
+        if (item.concept === 'App' && propertyName === 'entities' && value.concept === 'Entity') {
+            // 兼容 2.11之前无 datasource 模板
+            const defaultDS = item.dataSources.find((d) => d.name === 'defaultDS');
+            // defaultDS.addEntity(value);
+            value.parentNode = defaultDS;
+            value.parentKey = 'entities';
+            defaultDS.entities.push(value);
+            const index = defaultDS.entities.length;
+            value.create({
+                index,
+                parentNode: defaultDS,
+                parentKey: 'entities',
+            });
+            return;
+        }
+        if (!item[propertyName]) {
             item[propertyName] = [];
         }
         value.parentNode = item;
@@ -39,10 +87,10 @@ const ops = {
         const _ctor = getConceptConstructor(concept);
         const item = new _ctor();
         const { propertyMap } = getConceptMeta(concept);
-        for(const p of propertyMap) {
+        for (const p of propertyMap) {
             const [propertyName] = p;
             const t = item[propertyName];
-            if(Array.isArray(t)) {
+            if (Array.isArray(t)) {
                 ops._set(item, propertyName, []);
             }
         }
@@ -50,14 +98,63 @@ const ops = {
     },
     _addModule(app, name, belongs, data) {
         const ms = app[belongs];
-        const exist = ms.find(m => m.name === name);
-        if(!exist) {
-            app["addModuleIn" + firstUpperCase(belongs)](data);
+        const exist = ms.find((m) => m.name === name);
+        if (!exist) {
+            app['addModuleIn' + firstUpperCase(belongs)](data);
         }
     },
-    _bindRoles(){ 
-        return Array.prototype.map.call(arguments, r => r.name); 
-    }
-}
+    _bindRoles() {
+        return Array.prototype.map.call(arguments, (r) => r.name);
+    },
+};
+//组件模板的导入有些不同
+let handleDatas = [];
+let dynamicNames = {};
+export const ComponentOps = {
+    ...ops,
+    _set(item, propertyName, value, callback) {
+        if (instanceOfBaseNode(value)) {
+            value.parentNode = item;
+            value.parentKey = propertyName;
+        }
+        if (item[propertyName] !== value) {
+            //指view的全局逻辑或全局变量名称修改
+            if (propertyName === 'name' && dynamicNames[item.name]) {
+                dynamicNames[item.name] = value;
+            }
+            item.update({
+                [propertyName]: value,
+            });
+            //有函数或者组件引用了view的全局逻辑或全局变量名称
+            if ((propertyName === 'name' || propertyName === 'calleeName') && dynamicNames[value]
+                && item.parentKey !== 'property' && item.concept !== 'StructureProperty') {
+                handleDatas.push({
+                    item,
+                    propertyName,
+                });
+            }
+
+            if (instanceOfBaseNode(value) && callback) {
+                callback(item[propertyName]);
+            }
+        }
+    },
+    _rename() {
+        handleDatas.forEach(({ item, propertyName }) => {
+            const changeName = item[propertyName];
+            if (dynamicNames[changeName] && changeName !== dynamicNames[changeName])
+                item.update({
+                    [propertyName]: dynamicNames[changeName],
+                });
+        });
+        handleDatas = [];
+        dynamicNames = {};
+    },
+    _startNames(...initialNames) {
+        initialNames.forEach((name) => {
+            dynamicNames[name] = name;
+        });
+    },
+};
 
-export default ops;
+export default ops;