@lcap/nasl 3.7.0-alpha.1 → 3.7.0-beta.1

package/out/concepts/PropDeclaration__.js

@@ -0,0 +1,183 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+var PropDeclaration_1;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PropDeclaration = void 0;
+const decorators_1 = require("../decorators");
+const BaseNode_1 = __importDefault(require("../common/BaseNode"));
+/**
+ * 组件属性
+ */
+let PropDeclaration = PropDeclaration_1 = class PropDeclaration extends BaseNode_1.default {
+    /**
+     * @param source 需要合并的部分参数
+     */
+    constructor(source) {
+        source = Object.assign({}, PropDeclaration_1.getDefaultOptions(), source);
+        super(source);
+        /**
+         * 组件属性名称
+         */
+        this.name = '';
+        /**
+         * 组件属性图标
+         */
+        this.icon = null;
+        /**
+         * 组件属性描述
+         */
+        this.description = null;
+        /**
+         * 工具提示链接
+         */
+        this.tooltipLink = null;
+        /**
+         * 文档描述
+         */
+        this.docDescription = null;
+        /**
+         * 默认值
+         */
+        this.defaultValue = null;
+        /**
+         * 渲染时的设计值
+         */
+        this.tsDesignerValue = null;
+        /**
+         * 是否显隐
+         */
+        this.tsIf = null;
+        /**
+         * 是否禁用
+         */
+        this.tsDisabledIf = null;
+        /**
+         * 在属性切换时发生的事件
+         */
+        this.tsOnChange = null;
+        super.subConstructor(source);
+    }
+    static from(source, parentNode, parentKey) {
+        return super.from(source, parentNode, parentKey);
+    }
+};
+/** 类名 */
+PropDeclaration.ConceptName = 'PropDeclaration';
+/**
+ * 是否为抽象类
+ * 抽象类不能产生 concept: string
+ */
+PropDeclaration.isAbstract = false;
+/** 继承链 */
+PropDeclaration.inheritanceChain = ['BaseNode'];
+__decorate([
+    (0, decorators_1.property)('concept')
+], PropDeclaration.prototype, "concept", void 0);
+__decorate([
+    (0, decorators_1.property)({
+        objectRef: '',
+    })
+], PropDeclaration.prototype, "name", void 0);
+__decorate([
+    (0, decorators_1.property)({
+        objectRef: '',
+    })
+], PropDeclaration.prototype, "title", void 0);
+__decorate([
+    (0, decorators_1.property)({
+        objectRef: '',
+    })
+], PropDeclaration.prototype, "group", void 0);
+__decorate([
+    (0, decorators_1.property)({
+        objectRef: '',
+    })
+], PropDeclaration.prototype, "icon", void 0);
+__decorate([
+    (0, decorators_1.property)({
+        objectRef: '',
+    })
+], PropDeclaration.prototype, "description", void 0);
+__decorate([
+    (0, decorators_1.property)({
+        objectRef: '',
+    })
+], PropDeclaration.prototype, "tsType", void 0);
+__decorate([
+    (0, decorators_1.property)({
+        objectRef: '',
+    })
+], PropDeclaration.prototype, "sync", void 0);
+__decorate([
+    (0, decorators_1.property)({
+        objectRef: '',
+    })
+], PropDeclaration.prototype, "tooltipLink", void 0);
+__decorate([
+    (0, decorators_1.property)({
+        objectRef: '',
+    })
+], PropDeclaration.prototype, "docDescription", void 0);
+__decorate([
+    (0, decorators_1.property)({
+        objectRef: '',
+    })
+], PropDeclaration.prototype, "bindHide", void 0);
+__decorate([
+    (0, decorators_1.property)({
+        objectRef: '',
+    })
+], PropDeclaration.prototype, "bindOpen", void 0);
+__decorate([
+    (0, decorators_1.property)({
+        objectRef: '',
+    })
+], PropDeclaration.prototype, "tabKind", void 0);
+__decorate([
+    (0, decorators_1.property)({
+        objectRef: 'BaseSetter',
+    })
+], PropDeclaration.prototype, "setter", void 0);
+__decorate([
+    (0, decorators_1.property)({
+        objectRef: 'DefaultValue',
+    })
+], PropDeclaration.prototype, "defaultValue", void 0);
+__decorate([
+    (0, decorators_1.property)({
+        objectRef: '',
+    })
+], PropDeclaration.prototype, "tsDesignerValue", void 0);
+__decorate([
+    (0, decorators_1.property)({
+        objectRef: '',
+    })
+], PropDeclaration.prototype, "tsIf", void 0);
+__decorate([
+    (0, decorators_1.property)({
+        objectRef: '',
+    })
+], PropDeclaration.prototype, "tsDisabledIf", void 0);
+__decorate([
+    (0, decorators_1.property)({
+        objectRef: '',
+    })
+], PropDeclaration.prototype, "tsOnChange", void 0);
+PropDeclaration = PropDeclaration_1 = __decorate([
+    (0, decorators_1.concept)('组件属性')
+], PropDeclaration);
+exports.PropDeclaration = PropDeclaration;
+exports.default = PropDeclaration;
+//================================================================================
+// ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
+// 自动生成的代码已结束。下面可以手动编写。
+//================================================================================
+//# sourceMappingURL=PropDeclaration__.js.map

package/out/concepts/PropDeclaration__.js.map

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

package/out/concepts/PropertySelectSetter__.d.ts

@@ -0,0 +1,25 @@
+import BaseSetter from './BaseSetter__';
+/**
+ * 属性选择设置器
+ */
+export declare class PropertySelectSetter extends BaseSetter {
+    /** 类名 */
+    static readonly ConceptName: string;
+    /**
+     * 是否为抽象类
+     * 抽象类不能产生 concept: string
+     */
+    static isAbstract: boolean;
+    /** 继承链 */
+    static readonly inheritanceChain: string[];
+    /**
+     * 产品概念
+     */
+    readonly concept: 'PropertySelectSetter';
+    /**
+     * @param source 需要合并的部分参数
+     */
+    constructor(source?: Partial<PropertySelectSetter>);
+    static from(source: any, parentNode?: any, parentKey?: string): PropertySelectSetter;
+}
+export default PropertySelectSetter;

package/out/concepts/PropertySelectSetter__.js

@@ -0,0 +1,53 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+var PropertySelectSetter_1;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PropertySelectSetter = void 0;
+const decorators_1 = require("../decorators");
+const BaseSetter__1 = __importDefault(require("./BaseSetter__"));
+/**
+ * 属性选择设置器
+ */
+let PropertySelectSetter = PropertySelectSetter_1 = class PropertySelectSetter extends BaseSetter__1.default {
+    /**
+     * @param source 需要合并的部分参数
+     */
+    constructor(source) {
+        source = Object.assign({}, PropertySelectSetter_1.getDefaultOptions(), source);
+        super(source);
+        super.subConstructor(source);
+    }
+    static from(source, parentNode, parentKey) {
+        return super.from(source, parentNode, parentKey);
+    }
+};
+/** 类名 */
+PropertySelectSetter.ConceptName = 'PropertySelectSetter';
+/**
+ * 是否为抽象类
+ * 抽象类不能产生 concept: string
+ */
+PropertySelectSetter.isAbstract = false;
+/** 继承链 */
+PropertySelectSetter.inheritanceChain = ['BaseSetter', 'BaseNode'];
+__decorate([
+    (0, decorators_1.property)('concept')
+], PropertySelectSetter.prototype, "concept", void 0);
+PropertySelectSetter = PropertySelectSetter_1 = __decorate([
+    (0, decorators_1.concept)('属性选择设置器')
+], PropertySelectSetter);
+exports.PropertySelectSetter = PropertySelectSetter;
+exports.default = PropertySelectSetter;
+//================================================================================
+// ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
+// 自动生成的代码已结束。下面可以手动编写。
+//================================================================================
+//# sourceMappingURL=PropertySelectSetter__.js.map

package/out/concepts/PropertySelectSetter__.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"PropertySelectSetter__.js","sourceRoot":"","sources":["../../src/concepts/PropertySelectSetter__.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAKA,8CAAyF;AAOzF,iEAAwC;AAExC;;GAEG;AAEH,IAAa,oBAAoB,4BAAjC,MAAa,oBAAqB,SAAQ,qBAAU;IAkBlD;;OAEG;IACH,YAAY,MAAsC;QAChD,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,sBAAoB,CAAC,iBAAiB,EAAE,EAAE,MAAM,CAAC,CAAC;QAC7E,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;IAC/B,CAAC;IAED,MAAM,CAAC,IAAI,CAAC,MAAW,EAAE,UAAgB,EAAE,SAAkB;QAC3D,OAAO,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,UAAU,EAAE,SAAS,CAAyB,CAAC;IAC3E,CAAC;CAWF,CAAA;AAvCC,SAAS;AACO,gCAAW,GAAW,sBAAuB,CAAA;AAC7D;;;GAGG;AACI,+BAAU,GAAY,KAAM,CAAA;AACnC,UAAU;AACM,qCAAgB,GAAa,CAAC,YAAY,EAAE,UAAU,CAAE,CAAA;AAOxE;IAFC,IAAA,qBAAQ,EAAC,SAAS,CAAC;qDAEsB;AAhB/B,oBAAoB;IADhC,IAAA,oBAAO,EAAC,SAAS,CAAC;GACN,oBAAoB,CAwChC;AAxCY,oDAAoB;AA0CjC,kBAAe,oBAAoB,CAAC;AACpC,kFAAkF;AAClF,gEAAgE;AAChE,uBAAuB;AACvB,kFAAkF"}

package/out/concepts/QueryAggregateExpression__.d.ts

@@ -1,13 +1,17 @@
 import { TranslatorState, TranslatorGenerator } from '../translator';
-import { Params } from '../common/EventEmitter';
+import QueryFieldExpression from './QueryFieldExpression__';
 import LogicItem from './LogicItem__';
-import type QueryFieldExpression from './QueryFieldExpression__';
 /**
  * 查询聚合函数
  */
 export declare class QueryAggregateExpression extends LogicItem {
     /** 类名 */
     static readonly ConceptName: string;
+    /**
+     * 是否为抽象类
+     * 抽象类不能产生 concept: string
+     */
+    static isAbstract: boolean;
     /** 继承链 */
     static readonly inheritanceChain: string[];
     /**
@@ -31,17 +35,6 @@ export declare class QueryAggregateExpression extends LogicItem {
      */
     constructor(source?: Partial<QueryAggregateExpression>);
     static from(source: any, parentNode?: any, parentKey?: string): QueryAggregateExpression;
-    /**
-     * 删除查询属性
-     * @param name 查询属性名称
-     */
-    removeAggregateParam(name: string): void;
-    /**
-     * 删除查询属性
-     * @param aggregateParam 已有的查询属性实例
-     */
-    removeAggregateParam(aggregateParam: QueryFieldExpression): void;
-    __removeLogicItem(logicItem: LogicItem): Params;
     static getDefaultOptions(): {
         aggregateName: string;
         aggregateParam: {

package/out/concepts/QueryAggregateExpression__.js

@@ -29,50 +29,6 @@ let QueryAggregateExpression = QueryAggregateExpression_1 = class QueryAggregate
     static from(source, parentNode, parentKey) {
         return super.from(source, parentNode, parentKey);
     }
-    removeAggregateParam(options) {
-        let aggregateParam;
-        if (typeof options === 'string') {
-            aggregateParam = this.aggregateParam;
-            if (!aggregateParam) {
-                throw new Error('找不到查询属性 ' + options);
-            }
-        }
-        else {
-            aggregateParam = options;
-        }
-        return aggregateParam.delete();
-    }
-    __removeLogicItem(logicItem) {
-        const parentKey = logicItem.parentKey;
-        const params = {
-            parentNode: this,
-            parentKey,
-            index: -1,
-            object: null,
-            oldObject: logicItem,
-        };
-        if (parentKey) {
-            params.parentKey = parentKey;
-            // @ts-ignore
-            const t = this.__v_raw || this;
-            // @ts-ignore
-            const n = logicItem.__v_raw || logicItem;
-            if (Array.isArray(t[parentKey])) {
-                // @ts-ignore
-                const index = t[parentKey].findIndex((el) => (el.__v_raw || el) === n);
-                ~index && this[parentKey].splice(index, 1);
-                params.index = index;
-            }
-            else {
-                const q = t[parentKey];
-                if ((q.__v_raw || q) === n) {
-                    params.index = 0;
-                    this[parentKey] = undefined;
-                }
-            }
-        }
-        return params;
-    }
     //================================================================================
     // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
     // 自动生成的代码已结束。下面可以手动编写。
@@ -109,16 +65,25 @@ let QueryAggregateExpression = QueryAggregateExpression_1 = class QueryAggregate
 };
 /** 类名 */
 QueryAggregateExpression.ConceptName = 'QueryAggregateExpression';
+/**
+ * 是否为抽象类
+ * 抽象类不能产生 concept: string
+ */
+QueryAggregateExpression.isAbstract = false;
 /** 继承链 */
 QueryAggregateExpression.inheritanceChain = ['LogicItem', 'BaseNode'];
 __decorate([
     (0, decorators_1.property)('concept')
 ], QueryAggregateExpression.prototype, "concept", void 0);
 __decorate([
-    (0, decorators_1.property)()
+    (0, decorators_1.property)({
+        objectRef: '',
+    })
 ], QueryAggregateExpression.prototype, "asName", void 0);
 __decorate([
-    (0, decorators_1.property)()
+    (0, decorators_1.property)({
+        objectRef: '',
+    })
 ], QueryAggregateExpression.prototype, "aggregateName", void 0);
 __decorate([
     (0, decorators_1.property)({

package/out/concepts/QueryAggregateExpression__.js.map

@@ -1 +1 @@
-{"version":3,"file":"QueryAggregateExpression__.js","sourceRoot":"","sources":["../../src/concepts/QueryAggregateExpression__.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"QueryAggregateExpression__.js","sourceRoot":"","sources":["../../src/concepts/QueryAggregateExpression__.ts"],"names":[],"mappings":";;;;;;;;;;;;;AACA,8CAOuB;AAMvB,8CAAyF;AAQzF,+DAAsC;AAEtC;;GAEG;AAEH,IAAa,wBAAwB,gCAArC,MAAa,wBAAyB,SAAQ,oBAAS;IAyCrD;;OAEG;IACH,YAAY,MAA0C;QACpD,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,0BAAwB,CAAC,iBAAiB,EAAE,EAAE,MAAM,CAAC,CAAC;QACjF,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;IAC/B,CAAC;IAED,MAAM,CAAC,IAAI,CAAC,MAAW,EAAE,UAAgB,EAAE,SAAkB;QAC3D,OAAO,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,UAAU,EAAE,SAAS,CAA6B,CAAC;IAC/E,CAAC;IAED,kFAAkF;IAClF,gEAAgE;IAChE,uBAAuB;IACvB,kFAAkF;IAE3E,MAAM,CAAC,iBAAiB;QAC7B,OAAO;YACL,aAAa,EAAE,EAAE;YACjB,cAAc,EAAE;gBACd,OAAO,EAAE,sBAAsB;aAChC;SACF,CAAC;IACJ,CAAC;IAGD,CAAC,YAAY,CAAC,KAAK,GAAG,IAAA,gCAAmB,GAAE;QACzC,0DAA0D;QAC1D,iBAAiB;QACjB,yCAAyC;QACzC,kDAAkD;QAClD,oEAAoE;QACpE,qBAAqB;QACrB,2DAA2D;QAC3D,SAAS;QACT,gDAAgD;QAEhD,eAAe;QACf,OAAO,KAAK,IAAI,CAAC,MAAM,IAAI,yBAAyB,EAAE,CAAC;IACzD,CAAC;IAED,OAAO,CAAC,MAAc;QACpB,MAAM,MAAM,GAAG;YACb,MAAM;SACP,CAAC;QACF,IAAI,CAAC,MAAM,CAAC;YACV,GAAG,MAAM;SACV,CAAC,CAAC;IACL,CAAC;CAMF,CAAA;AAhGC,SAAS;AACO,oCAAW,GAAW,0BAA2B,CAAA;AACjE;;;GAGG;AACI,mCAAU,GAAY,KAAM,CAAA;AACnC,UAAU;AACM,yCAAgB,GAAa,CAAC,WAAW,EAAE,UAAU,CAAE,CAAA;AAOvE;IAFC,IAAA,qBAAQ,EAAC,SAAS,CAAC;yDAE0B;AAO9C;IAHC,IAAA,qBAAQ,EAAC;QACR,SAAS,EAAE,EAAE;KACd,CAAC;wDACa;AAQf;IAHC,IAAA,qBAAQ,EAAC;QACR,SAAS,EAAE,EAAE;KACd,CAAC;+DACgE;AAQlE;IAHC,IAAA,qBAAQ,EAAC;QACR,SAAS,EAAE,sBAAsB;KAClC,CAAC;gEACmC;AA8BrC;IADC,mCAAsB;4DActB;AAlFU,wBAAwB;IADpC,IAAA,oBAAO,EAAC,QAAQ,CAAC;GACL,wBAAwB,CAiGpC;AAjGY,4DAAwB;AAmGrC,kBAAe,wBAAwB,CAAC;AACxC,kFAAkF;AAClF,gEAAgE;AAChE,uBAAuB;AACvB,kFAAkF"}

package/out/concepts/QueryFieldExpression__.d.ts

@@ -6,6 +6,11 @@ import LogicItem from './LogicItem__';
 export declare class QueryFieldExpression extends LogicItem {
     /** 类名 */
     static readonly ConceptName: string;
+    /**
+     * 是否为抽象类
+     * 抽象类不能产生 concept: string
+     */
+    static isAbstract: boolean;
     /** 继承链 */
     static readonly inheritanceChain: string[];
     /**

package/out/concepts/QueryFieldExpression__.js

@@ -110,22 +110,35 @@ let QueryFieldExpression = QueryFieldExpression_1 = class QueryFieldExpression e
 };
 /** 类名 */
 QueryFieldExpression.ConceptName = 'QueryFieldExpression';
+/**
+ * 是否为抽象类
+ * 抽象类不能产生 concept: string
+ */
+QueryFieldExpression.isAbstract = false;
 /** 继承链 */
 QueryFieldExpression.inheritanceChain = ['LogicItem', 'BaseNode'];
 __decorate([
     (0, decorators_1.property)('concept')
 ], QueryFieldExpression.prototype, "concept", void 0);
 __decorate([
-    (0, decorators_1.property)()
+    (0, decorators_1.property)({
+        objectRef: '',
+    })
 ], QueryFieldExpression.prototype, "isDotStar", void 0);
 __decorate([
-    (0, decorators_1.property)()
+    (0, decorators_1.property)({
+        objectRef: '',
+    })
 ], QueryFieldExpression.prototype, "asName", void 0);
 __decorate([
-    (0, decorators_1.property)()
+    (0, decorators_1.property)({
+        objectRef: '',
+    })
 ], QueryFieldExpression.prototype, "entityAsName", void 0);
 __decorate([
-    (0, decorators_1.property)()
+    (0, decorators_1.property)({
+        objectRef: '',
+    })
 ], QueryFieldExpression.prototype, "propertyName", void 0);
 __decorate([
     translator_1.withSourceMapGenerator

package/out/concepts/QueryFieldExpression__.js.map

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

package/out/concepts/QueryFromExpression__.d.ts

@@ -1,13 +1,17 @@
 import { TranslatorState, TranslatorGenerator } from '../translator';
-import { Params } from '../common/EventEmitter';
+import QueryJoinExpression from './QueryJoinExpression__';
 import LogicItem from './LogicItem__';
-import type QueryJoinExpression from './QueryJoinExpression__';
 /**
  * 查询 From 子句
  */
 export declare class QueryFromExpression extends LogicItem {
     /** 类名 */
     static readonly ConceptName: string;
+    /**
+     * 是否为抽象类
+     * 抽象类不能产生 concept: string
+     */
+    static isAbstract: boolean;
     /** 继承链 */
     static readonly inheritanceChain: string[];
     /**
@@ -88,7 +92,6 @@ export declare class QueryFromExpression extends LogicItem {
      * @param queryJoinExpression 已有的查询 Join 子句实例
      */
     removeJoinPart(queryJoinExpression: QueryJoinExpression): void;
-    __removeLogicItem(logicItem: LogicItem): Params;
     setEntityNameAndEffect(entityName: string): void;
     effect(): void;
     /**

package/out/concepts/QueryFromExpression__.js

@@ -115,37 +115,6 @@ let QueryFromExpression = QueryFromExpression_1 = class QueryFromExpression exte
         let queryJoinExpression = options;
         return queryJoinExpression.delete();
     }
-    __removeLogicItem(logicItem) {
-        const parentKey = logicItem.parentKey;
-        const params = {
-            parentNode: this,
-            parentKey,
-            index: -1,
-            object: null,
-            oldObject: logicItem,
-        };
-        if (parentKey) {
-            params.parentKey = parentKey;
-            // @ts-ignore
-            const t = this.__v_raw || this;
-            // @ts-ignore
-            const n = logicItem.__v_raw || logicItem;
-            if (Array.isArray(t[parentKey])) {
-                // @ts-ignore
-                const index = t[parentKey].findIndex((el) => (el.__v_raw || el) === n);
-                ~index && this[parentKey].splice(index, 1);
-                params.index = index;
-            }
-            else {
-                const q = t[parentKey];
-                if ((q.__v_raw || q) === n) {
-                    params.index = 0;
-                    this[parentKey] = undefined;
-                }
-            }
-        }
-        return params;
-    }
     //================================================================================
     // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
     // 自动生成的代码已结束。下面可以手动编写。
@@ -191,19 +160,30 @@ let QueryFromExpression = QueryFromExpression_1 = class QueryFromExpression exte
 };
 /** 类名 */
 QueryFromExpression.ConceptName = 'QueryFromExpression';
+/**
+ * 是否为抽象类
+ * 抽象类不能产生 concept: string
+ */
+QueryFromExpression.isAbstract = false;
 /** 继承链 */
 QueryFromExpression.inheritanceChain = ['LogicItem', 'BaseNode'];
 __decorate([
     (0, decorators_1.property)('concept')
 ], QueryFromExpression.prototype, "concept", void 0);
 __decorate([
-    (0, decorators_1.property)()
+    (0, decorators_1.property)({
+        objectRef: '',
+    })
 ], QueryFromExpression.prototype, "entityNamespace", void 0);
 __decorate([
-    (0, decorators_1.property)()
+    (0, decorators_1.property)({
+        objectRef: '',
+    })
 ], QueryFromExpression.prototype, "entityName", void 0);
 __decorate([
-    (0, decorators_1.property)()
+    (0, decorators_1.property)({
+        objectRef: '',
+    })
 ], QueryFromExpression.prototype, "asName", void 0);
 __decorate([
     (0, decorators_1.property)({

package/out/concepts/QueryFromExpression__.js.map

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

package/out/concepts/QueryGroupByExpression__.d.ts

@@ -1,5 +1,4 @@
 import { TranslatorGenerator } from '../translator';
-import { Params } from '../common/EventEmitter';
 import LogicItem from './LogicItem__';
 /**
  * 查询分组
@@ -7,6 +6,11 @@ import LogicItem from './LogicItem__';
 export declare class QueryGroupByExpression extends LogicItem {
     /** 类名 */
     static readonly ConceptName: string;
+    /**
+     * 是否为抽象类
+     * 抽象类不能产生 concept: string
+     */
+    static isAbstract: boolean;
     /** 继承链 */
     static readonly inheritanceChain: string[];
     /**
@@ -26,17 +30,6 @@ export declare class QueryGroupByExpression extends LogicItem {
      * 设置逻辑项
      */
     setGroupElement(groupElement: LogicItem): void;
-    /**
-     * 删除逻辑项
-     * @param name 逻辑项名称
-     */
-    removeGroupElement(name: string): void;
-    /**
-     * 删除逻辑项
-     * @param groupElement 已有的逻辑项实例
-     */
-    removeGroupElement(groupElement: LogicItem): void;
-    __removeLogicItem(logicItem: LogicItem): Params;
     static getDefaultOptions(): {
         groupElement: {
             kind: string;