@lcap/nasl 1.0.0-alpha.9 → 1.0.0

package/out/concepts/BindAttribute__.js

@@ -72,6 +72,10 @@ let BindAttribute = BindAttribute_1 = class BindAttribute extends BaseNode_1.def
      * 验证规则
      */
     rules = [];
+    /**
+     * 经办人
+     */
+    assignee = undefined;
     /**
      * 是否使用 v-model
      */
@@ -177,6 +181,20 @@ let BindAttribute = BindAttribute_1 = class BindAttribute extends BaseNode_1.def
             ...object,
         });
     }
+    /**
+     * 设置经办人
+     */
+    setAssignee(assignee) {
+        assignee._delete();
+        const relationOptions = { parentNode: this, parentKey: 'assignee' };
+        Object.assign(assignee, relationOptions);
+        const object = {
+            assignee,
+        };
+        this.update({
+            ...object,
+        });
+    }
     /**
      * 设置是否开启双向绑定
      */
@@ -212,7 +230,7 @@ let BindAttribute = BindAttribute_1 = class BindAttribute extends BaseNode_1.def
             }, this, 'rules');
         }
         else if (options instanceof ValidationRule__1.default) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             validationRule = options;
             Object.assign(validationRule, relationOptions);
         }
@@ -240,7 +258,7 @@ let BindAttribute = BindAttribute_1 = class BindAttribute extends BaseNode_1.def
     }
     addValidationRule(options) {
         const node = this._addValidationRule(options);
-        const index = this.rules.length;
+        const index = this.rules.indexOf(node);
         node.create({
             index,
             parentNode: this,
@@ -287,6 +305,19 @@ let BindAttribute = BindAttribute_1 = class BindAttribute extends BaseNode_1.def
         }
         return validationRule.delete();
     }
+    removeAssignee(options) {
+        let assignee;
+        if (typeof options === 'string') {
+            assignee = this.assignee;
+            if (!assignee) {
+                throw new Error('找不到经办人 ' + options);
+            }
+        }
+        else {
+            assignee = options;
+        }
+        return assignee.delete();
+    }
     __removeLogicItem(logicItem) {
         const parentKey = logicItem.parentKey;
         const params = {
@@ -336,19 +367,30 @@ let BindAttribute = BindAttribute_1 = class BindAttribute extends BaseNode_1.def
         if (value !== undefined && value !== null && typeof value === 'string') {
             value = value.replace(/"/g, "'");
         }
-        if (this.name === 'destination' && this.destination) {
-            return this.destination.toVue(options);
+        if (this.name === 'destination' && this.type === 'dynamic') {
+            return this.destination ? this.destination.toVue(options) : '';
         }
         else if (this.name === 'rules' && this.rules) {
-            const ruleStrs = this.rules.map((rule) => rule.toVue());
+            const ruleStrs = this.rules.map((rule) => rule.toVue(options));
             value = ruleStrs.join(' | ');
             return value !== undefined && value !== null ? `${this.name}="${value}"` : '';
         }
-        else if (this.type === 'string') {
-            return value !== undefined && value !== null ? `${this.name}="${value}"` : '';
-        }
         else {
-            return value !== undefined && value !== null && value !== '' ? `:${this.name}${this.sync ? '.sync' : ''}="${value}"` : '';
+            let str = '';
+            let name = this.name;
+            if (value !== undefined && value !== null && value !== '') {
+                if (name === 'download') {
+                    str += 'download="true" ';
+                    name = 'href';
+                }
+                if (this.type === 'string') {
+                    str += `${name}="${value}"`;
+                }
+                else {
+                    str += `:${name}${this.sync ? '.sync' : ''}="${value}"`;
+                }
+            }
+            return str;
         }
     }
     toEmbeddedTS(state) {
@@ -383,6 +425,9 @@ __decorate([
 __decorate([
     (0, decorators_1.property)('ValidationRule')
 ], BindAttribute.prototype, "rules", void 0);
+__decorate([
+    (0, decorators_1.property)('Assignee')
+], BindAttribute.prototype, "assignee", void 0);
 __decorate([
     (0, decorators_1.property)()
 ], BindAttribute.prototype, "model", void 0);

package/out/concepts/BindAttribute__.js.map

@@ -1 +1 @@
-{"version":3,"file":"BindAttribute__.js","sourceRoot":"","sources":["../../src/concepts/BindAttribute__.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8CAA2H;AAQ3H,8CAAkE;AAElE,gDAAkC;AAElC,kEAA0C;AAC1C,kEAA0C;AAG1C,yEAAgD;AAQhD;;GAEG;AAEH,IAAa,aAAa,qBAA1B,MAAa,aAAc,SAAQ,kBAAQ;IACvC;;OAEG;IAEH,OAAO,GAAoB,eAAe,CAAC;IAE3C;;OAEG;IAEH,IAAI,GAAW,SAAS,CAAC;IAEzB;;OAEG;IAEH,IAAI,GAAoC,SAAS,CAAC;IAElD;;OAEG;IAEH,KAAK,GAAW,SAAS,CAAC;IAE1B;;OAEG;IAEH,UAAU,GAAc,SAAS,CAAC;IAElC;;OAEG;IAEH,WAAW,GAAgB,SAAS,CAAC;IAErC;;OAEG;IAEH,KAAK,GAA0B,EAAE,CAAC;IAElC;;OAEG;IAEH,KAAK,GAAY,SAAS,CAAC;IAE3B;;OAEG;IAEH,IAAI,GAAY,SAAS,CAAC;IAE1B;;OAEG;IACH,IAAI,WAAW;QACX,OAAO,IAAI,CAAC,WAAW,CAAC,aAAa,CAAgB,CAAC;IAC1D,CAAC;IACD;;OAEG;IACH,IAAI,IAAI;QACJ,OAAO,IAAI,CAAC,WAAW,CAAC,MAAM,CAAS,CAAC;IAC5C,CAAC;IACD;;OAEG;IACH,IAAI,MAAM;QACN,OAAO,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAW,CAAC;IAChD,CAAC;IACD;;OAEG;IACH,IAAI,GAAG;QACH,OAAO,IAAI,CAAC,WAAW,CAAC,KAAK,CAAQ,CAAC;IAC1C,CAAC;IACD;;OAEG;IACH,IAAI,cAAc;QACd,OAAO,IAAI,CAAC,WAAW,CAAC,gBAAgB,CAAmB,CAAC;IAChE,CAAC;IACD;;OAEG;IACH,IAAI,OAAO;QACP,OAAO,IAAI,CAAC,WAAW,CAAC,SAAS,CAAY,CAAC;IAClD,CAAC;IAED;;OAEG;IACH,YAAY,MAA+B;QACvC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,eAAa,CAAC,iBAAiB,EAAE,EAAE,MAAM,CAAC,CAAC;QACtE,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;IACjC,CAAC;IAED,MAAM,CAAC,IAAI,CAAC,MAAW,EAAE,UAAgB,EAAE,SAAkB;QACzD,OAAO,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,UAAU,EAAE,SAAS,CAAkB,CAAC;IACtE,CAAC;IAED;;;OAGG;IACH,OAAO;QACH,IAAI,MAAM,GAAW,IAAI,CAAC;QAC1B,IAAI,IAAI,CAAC,UAAU,EAAE;YACjB,MAAM,GAAI,IAAI,CAAC,UAAkB,EAAE,qBAAqB,EAAE,CAAC,IAAI,CAAC,CAAC;SACpE;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;IACD;;OAEG;IACH,QAAQ,CAAC,KAAa;QAClB,MAAM,MAAM,GAAG;YACX,KAAK;SACR,CAAC;QACF,IAAI,CAAC,MAAM,CAAC;YACR,GAAG,MAAM;SACZ,CAAC,CAAC;IACP,CAAC;IAED;;OAEG;IACH,aAAa,CAAC,UAAqB;QAC/B,UAAU,CAAC,OAAO,EAAE,CAAC;QACrB,MAAM,eAAe,GAAG,EAAE,UAAU,EAAE,IAAI,EAAE,SAAS,EAAE,YAAY,EAAE,CAAC;QACtE,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,eAAe,CAAC,CAAC;QAC3C,MAAM,MAAM,GAAG;YACX,UAAU;SACb,CAAC;QACF,IAAI,CAAC,MAAM,CAAC;YACR,GAAG,MAAM;SACZ,CAAC,CAAC;IACP,CAAC;IAED;;OAEG;IACH,cAAc,CAAC,WAAwB;QACnC,WAAW,CAAC,OAAO,EAAE,CAAC;QACtB,MAAM,eAAe,GAAG,EAAE,UAAU,EAAE,IAAI,EAAE,SAAS,EAAE,aAAa,EAAE,CAAC;QACvE,MAAM,CAAC,MAAM,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC;QAC5C,MAAM,MAAM,GAAG;YACX,WAAW;SACd,CAAC;QACF,IAAI,CAAC,MAAM,CAAC;YACR,GAAG,MAAM;SACZ,CAAC,CAAC;IACP,CAAC;IAED;;OAEG;IACH,OAAO,CAAC,IAAa;QACjB,MAAM,MAAM,GAAG;YACX,IAAI;SACP,CAAC;QACF,IAAI,CAAC,MAAM,CAAC;YACR,GAAG,MAAM;SACZ,CAAC,CAAC;IACP,CAAC;IAEG,8BAA8B,CAAC,eAAsC,EAAE;QACvE,MAAM,WAAW,GAAG,IAAI,GAAG,CAAC,YAAY,CAAC,CAAC;QAC1C,OAAO,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAChG,CAAC;IACD,2BAA2B,CAAC,IAAI,GAAG,iBAAiB;QAChD,OAAO,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,8BAA8B,EAAE,CAAC,CAAC;IACrE,CAAC;IAuBD,uBAAuB,CAAC,OAA0D,EAAE,KAAa;QAC7F,MAAM,qBAAqB,GAAQ,EAAE,CAAC;QACtC,MAAM,eAAe,GAAG,EAAE,UAAU,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC;QACjE,IAAI,cAA8B,CAAC;QACnC,IAAI,CAAC,OAAO,EAAE;YACV,cAAc,GAAG,yBAAc,CAAC,IAAI,CAAC;gBACjC,GAAG,qBAAqB;gBACxB,IAAI,EAAE,IAAI,CAAC,2BAA2B,EAAE;aAC3C,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;SACrB;aAAM,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;YACpC,cAAc,GAAG,yBAAc,CAAC,IAAI,CAAC;gBACjC,GAAG,qBAAqB;gBACxB,IAAI,EAAE,OAAO;aAChB,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;SACrB;aAAM,IAAI,OAAO,YAAY,yBAAc,EAAE;YAC1C,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,cAAc;YAChC,cAAc,GAAG,OAAO,CAAC;YACzB,MAAM,CAAC,MAAM,CAAC,cAAc,EAAE,eAAe,CAAC,CAAC;SAClD;aAAM;YACH,cAAc,GAAG,yBAAc,CAAC,IAAI,CAAC;gBACjC,GAAG,qBAAqB;gBACxB,GAAG,OAAO;aACb,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;SACrB;QACD,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,EAAE,cAAc,CAAC,CAAC;QAC5C,OAAO,cAAc,CAAC;IAC1B,CAAC;IAoBD,sBAAsB,CAAC,OAA0D,EAAE,KAAa;QAC5F,MAAM,IAAI,GAAG,IAAI,CAAC,uBAAuB,CAAC,OAAc,EAAE,KAAK,CAAC,CAAC;QACjE,IAAI,CAAC,MAAM,CAAC;YACR,KAAK;YACL,UAAU,EAAE,IAAI;YAChB,SAAS,EAAE,OAAO;SACrB,CAAC,CAAC;QACH,OAAO,IAAI,CAAC;IAChB,CAAC;IAuBD,kBAAkB,CAAC,OAA2D;QAC1E,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC;QAChC,OAAO,IAAI,CAAC,uBAAuB,CAAC,OAAc,EAAE,KAAK,CAAC,CAAC;IAC/D,CAAC;IAqBD,iBAAiB,CAAC,OAA2D;QACzE,MAAM,IAAI,GAAG,IAAI,CAAC,kBAAkB,CAAC,OAAc,CAAC,CAAC;QACrD,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC;QAChC,IAAI,CAAC,MAAM,CAAC;YACR,KAAK;YACL,UAAU,EAAE,IAAI;YAChB,SAAS,EAAE,OAAO;SACrB,CAAC,CAAC;QACH,OAAO,IAAI,CAAC;IAChB,CAAC;IAiBD,gBAAgB,CAAC,OAA2B;QACxC,IAAI,UAAqB,CAAC;QAC1B,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;YAC7B,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;YAC7B,IAAI,CAAC,UAAU,EAAE;gBACb,MAAM,IAAI,KAAK,CAAC,SAAS,GAAG,OAAO,CAAC,CAAC;aACxC;SACJ;aAAM;YACH,UAAU,GAAG,OAAO,CAAC;SACxB;QACD,OAAO,UAAU,CAAC,MAAM,EAAE,CAAC;IAC/B,CAAC;IAgBD,iBAAiB,CAAC,OAA6B;QAC3C,IAAI,WAAwB,CAAC;QAC7B,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;YAC7B,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;YAC/B,IAAI,CAAC,WAAW,EAAE;gBACd,MAAM,IAAI,KAAK,CAAC,UAAU,GAAG,OAAO,CAAC,CAAC;aACzC;SACJ;aAAM;YACH,WAAW,GAAG,OAAO,CAAC;SACzB;QACD,OAAO,WAAW,CAAC,MAAM,EAAE,CAAC;IAChC,CAAC;IAgBD,2BAA2B,CAAC,OAAgC;QACxD,IAAI,cAA8B,CAAC;QACnC,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;YAC7B,cAAc,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC;YAClE,IAAI,CAAC,cAAc,EAAE;gBACjB,MAAM,IAAI,KAAK,CAAC,UAAU,GAAG,OAAO,CAAC,CAAC;aACzC;SACJ;aAAM;YACH,cAAc,GAAG,OAAO,CAAC;SAC5B;QACD,OAAO,cAAc,CAAC,MAAM,EAAE,CAAC;IACnC,CAAC;IAED,iBAAiB,CAAC,SAAoB;QAClC,MAAM,SAAS,GAAG,SAAS,CAAC,SAAS,CAAC;QACtC,MAAM,MAAM,GAAW;YACnB,UAAU,EAAE,IAAI;YAChB,SAAS;YACT,KAAK,EAAE,CAAC,CAAC;YACT,MAAM,EAAE,IAAI;YACZ,SAAS,EAAE,SAAS;SACvB,CAAC;QACF,IAAI,SAAS,EAAE;YACX,MAAM,CAAC,SAAS,GAAG,SAAS,CAAC;YAC7B,IAAI,KAAK,CAAC,OAAO,CAAE,IAAY,CAAC,SAAS,CAAC,CAAC,EAAE;gBACzC,MAAM,KAAK,GAAI,IAAY,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;gBAC1D,CAAC,KAAK,IAAK,IAAY,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;gBACpD,MAAM,CAAC,KAAK,GAAG,KAAK,CAAC;aACxB;iBAAM,IAAK,IAAY,CAAC,SAAS,CAAC,KAAK,SAAS,EAAE;gBAC/C,MAAM,CAAC,KAAK,GAAG,CAAC,CAAC;gBAChB,IAAY,CAAC,SAAS,CAAC,GAAG,SAAS,CAAC;aACxC;SACJ;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;IAED,kFAAkF;IAClF,gEAAgE;IAChE,uBAAuB;IACvB,kFAAkF;IAElF,QAAQ,CAAC,MAAqB;QAC1B,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IAChC,CAAC;IAED,YAAY,CAAC,MAA0B;QACnC,MAAM,MAAM,GAAG;YACX,GAAG,MAAM;SACZ,CAAC;QACF,IAAI,CAAC,MAAM,CAAC;YACR,GAAG,MAAM;SACZ,CAAC,CAAC;IACP,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,OAA6B;QAC/B,IAAI,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;QACvB,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS,IAAI,IAAI,CAAC,UAAU,EAAE;YAC5C,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;SAC1C;QACD,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YACpE,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;SACpC;QACD,IAAI,IAAI,CAAC,IAAI,KAAK,aAAa,IAAI,IAAI,CAAC,WAAW,EAAE;YACjD,OAAO,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;SAC1C;aAAM,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO,IAAI,IAAI,CAAC,KAAK,EAAE;YAC5C,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;YACxD,KAAK,GAAG,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAC7B,OAAO,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,IAAI,KAAK,KAAK,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;SACjF;aAAM,IAAI,IAAI,CAAC,IAAI,KAAK,QAAQ,EAAE;YAC/B,OAAO,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,IAAI,KAAK,KAAK,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;SACjF;aAAM;YACH,OAAO,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,KAAK,KAAK,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;SAC7H;IACL,CAAC;IAGD,YAAY,CAAC,KAAuB;QAChC,IAAI,IAAI,GAAG,EAAE,CAAC;QACd,IAAI,IAAI,CAAC,IAAI,KAAK,aAAa,EAAE;YAC7B,IAAI,IAAI,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,IAAA,uBAAU,EAAC,KAAK,EAAE,IAAI,EAAE,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;SAClG;aAAM,IAAI,IAAI,CAAC,UAAU,EAAE;YACxB,IAAI,IAAI,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,IAAA,uBAAU,EAAC,KAAK,EAAE,IAAI,EAAE,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;SACjG;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;CAKJ,CAAA;AAndG;IADC,IAAA,qBAAQ,GAAE;8CACgC;AAM3C;IADC,IAAA,qBAAQ,GAAE;2CACc;AAMzB;IADC,IAAA,qBAAQ,GAAE;2CACuC;AAMlD;IADC,IAAA,qBAAQ,GAAE;4CACe;AAM1B;IADC,IAAA,qBAAQ,EAAC,WAAW,CAAC;iDACY;AAMlC;IADC,IAAA,qBAAQ,EAAC,aAAa,CAAC;kDACa;AAMrC;IADC,IAAA,qBAAQ,EAAC,gBAAgB,CAAC;4CACO;AAMlC;IADC,IAAA,qBAAQ,GAAE;4CACgB;AAM3B;IADC,IAAA,qBAAQ,GAAE;2CACe;AAsZ1B;IADC,IAAA,0BAAa,GAAE;iDASf;AAndQ,aAAa;IADzB,IAAA,oBAAO,EAAC,QAAQ,CAAC;GACL,aAAa,CAwdzB;AAxdY,sCAAa;AA0d1B,kBAAQ,CAAC,eAAe,CAAC,GAAG,aAAa,CAAC;AAC1C,kBAAe,aAAa,CAAC;AAC7B,kFAAkF;AAClF,gEAAgE;AAChE,uBAAuB;AACvB,kFAAkF"}
+{"version":3,"file":"BindAttribute__.js","sourceRoot":"","sources":["../../src/concepts/BindAttribute__.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8CAA2H;AAQ3H,8CAAkE;AAElE,gDAAkC;AAElC,kEAA0C;AAC1C,kEAA0C;AAG1C,yEAAgD;AAShD;;GAEG;AAEH,IAAa,aAAa,qBAA1B,MAAa,aAAc,SAAQ,kBAAQ;IACvC;;OAEG;IAEH,OAAO,GAAoB,eAAe,CAAC;IAE3C;;OAEG;IAEH,IAAI,GAAW,SAAS,CAAC;IAEzB;;OAEG;IAEH,IAAI,GAAoC,SAAS,CAAC;IAElD;;OAEG;IAEH,KAAK,GAAW,SAAS,CAAC;IAE1B;;OAEG;IAEH,UAAU,GAAc,SAAS,CAAC;IAElC;;OAEG;IAEH,WAAW,GAAgB,SAAS,CAAC;IAErC;;OAEG;IAEH,KAAK,GAA0B,EAAE,CAAC;IAElC;;OAEG;IAEH,QAAQ,GAAa,SAAS,CAAC;IAE/B;;OAEG;IAEH,KAAK,GAAY,SAAS,CAAC;IAE3B;;OAEG;IAEH,IAAI,GAAY,SAAS,CAAC;IAE1B;;OAEG;IACH,IAAI,WAAW;QACX,OAAO,IAAI,CAAC,WAAW,CAAC,aAAa,CAAgB,CAAC;IAC1D,CAAC;IACD;;OAEG;IACH,IAAI,IAAI;QACJ,OAAO,IAAI,CAAC,WAAW,CAAC,MAAM,CAAS,CAAC;IAC5C,CAAC;IACD;;OAEG;IACH,IAAI,MAAM;QACN,OAAO,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAW,CAAC;IAChD,CAAC;IACD;;OAEG;IACH,IAAI,GAAG;QACH,OAAO,IAAI,CAAC,WAAW,CAAC,KAAK,CAAQ,CAAC;IAC1C,CAAC;IACD;;OAEG;IACH,IAAI,cAAc;QACd,OAAO,IAAI,CAAC,WAAW,CAAC,gBAAgB,CAAmB,CAAC;IAChE,CAAC;IACD;;OAEG;IACH,IAAI,OAAO;QACP,OAAO,IAAI,CAAC,WAAW,CAAC,SAAS,CAAY,CAAC;IAClD,CAAC;IAED;;OAEG;IACH,YAAY,MAA+B;QACvC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,eAAa,CAAC,iBAAiB,EAAE,EAAE,MAAM,CAAC,CAAC;QACtE,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;IACjC,CAAC;IAED,MAAM,CAAC,IAAI,CAAC,MAAW,EAAE,UAAgB,EAAE,SAAkB;QACzD,OAAO,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,UAAU,EAAE,SAAS,CAAkB,CAAC;IACtE,CAAC;IAED;;;OAGG;IACH,OAAO;QACH,IAAI,MAAM,GAAW,IAAI,CAAC;QAC1B,IAAI,IAAI,CAAC,UAAU,EAAE;YACjB,MAAM,GAAI,IAAI,CAAC,UAAkB,EAAE,qBAAqB,EAAE,CAAC,IAAI,CAAC,CAAC;SACpE;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;IACD;;OAEG;IACH,QAAQ,CAAC,KAAa;QAClB,MAAM,MAAM,GAAG;YACX,KAAK;SACR,CAAC;QACF,IAAI,CAAC,MAAM,CAAC;YACR,GAAG,MAAM;SACZ,CAAC,CAAC;IACP,CAAC;IAED;;OAEG;IACH,aAAa,CAAC,UAAqB;QAC/B,UAAU,CAAC,OAAO,EAAE,CAAC;QACrB,MAAM,eAAe,GAAG,EAAE,UAAU,EAAE,IAAI,EAAE,SAAS,EAAE,YAAY,EAAE,CAAC;QACtE,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,eAAe,CAAC,CAAC;QAC3C,MAAM,MAAM,GAAG;YACX,UAAU;SACb,CAAC;QACF,IAAI,CAAC,MAAM,CAAC;YACR,GAAG,MAAM;SACZ,CAAC,CAAC;IACP,CAAC;IAED;;OAEG;IACH,cAAc,CAAC,WAAwB;QACnC,WAAW,CAAC,OAAO,EAAE,CAAC;QACtB,MAAM,eAAe,GAAG,EAAE,UAAU,EAAE,IAAI,EAAE,SAAS,EAAE,aAAa,EAAE,CAAC;QACvE,MAAM,CAAC,MAAM,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC;QAC5C,MAAM,MAAM,GAAG;YACX,WAAW;SACd,CAAC;QACF,IAAI,CAAC,MAAM,CAAC;YACR,GAAG,MAAM;SACZ,CAAC,CAAC;IACP,CAAC;IAED;;OAEG;IACH,WAAW,CAAC,QAAkB;QAC1B,QAAQ,CAAC,OAAO,EAAE,CAAC;QACnB,MAAM,eAAe,GAAG,EAAE,UAAU,EAAE,IAAI,EAAE,SAAS,EAAE,UAAU,EAAE,CAAC;QACpE,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,eAAe,CAAC,CAAC;QACzC,MAAM,MAAM,GAAG;YACX,QAAQ;SACX,CAAC;QACF,IAAI,CAAC,MAAM,CAAC;YACR,GAAG,MAAM;SACZ,CAAC,CAAC;IACP,CAAC;IAED;;OAEG;IACH,OAAO,CAAC,IAAa;QACjB,MAAM,MAAM,GAAG;YACX,IAAI;SACP,CAAC;QACF,IAAI,CAAC,MAAM,CAAC;YACR,GAAG,MAAM;SACZ,CAAC,CAAC;IACP,CAAC;IAEG,8BAA8B,CAAC,eAAsC,EAAE;QACvE,MAAM,WAAW,GAAG,IAAI,GAAG,CAAC,YAAY,CAAC,CAAC;QAC1C,OAAO,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAChG,CAAC;IACD,2BAA2B,CAAC,IAAI,GAAG,iBAAiB;QAChD,OAAO,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,8BAA8B,EAAE,CAAC,CAAC;IACrE,CAAC;IAuBD,uBAAuB,CAAC,OAA0D,EAAE,KAAa;QAC7F,MAAM,qBAAqB,GAAQ,EAAE,CAAC;QACtC,MAAM,eAAe,GAAG,EAAE,UAAU,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC;QACjE,IAAI,cAA8B,CAAC;QACnC,IAAI,CAAC,OAAO,EAAE;YACV,cAAc,GAAG,yBAAc,CAAC,IAAI,CAAC;gBACjC,GAAG,qBAAqB;gBACxB,IAAI,EAAE,IAAI,CAAC,2BAA2B,EAAE;aAC3C,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;SACrB;aAAM,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;YACpC,cAAc,GAAG,yBAAc,CAAC,IAAI,CAAC;gBACjC,GAAG,qBAAqB;gBACxB,IAAI,EAAE,OAAO;aAChB,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;SACrB;aAAM,IAAI,OAAO,YAAY,yBAAc,EAAE;YAC1C,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC,cAAc;YACtC,cAAc,GAAG,OAAO,CAAC;YACzB,MAAM,CAAC,MAAM,CAAC,cAAc,EAAE,eAAe,CAAC,CAAC;SAClD;aAAM;YACH,cAAc,GAAG,yBAAc,CAAC,IAAI,CAAC;gBACjC,GAAG,qBAAqB;gBACxB,GAAG,OAAO;aACb,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;SACrB;QACD,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,EAAE,cAAc,CAAC,CAAC;QAC5C,OAAO,cAAc,CAAC;IAC1B,CAAC;IAoBD,sBAAsB,CAAC,OAA0D,EAAE,KAAa;QAC5F,MAAM,IAAI,GAAG,IAAI,CAAC,uBAAuB,CAAC,OAAc,EAAE,KAAK,CAAC,CAAC;QACjE,IAAI,CAAC,MAAM,CAAC;YACR,KAAK;YACL,UAAU,EAAE,IAAI;YAChB,SAAS,EAAE,OAAO;SACrB,CAAC,CAAC;QACH,OAAO,IAAI,CAAC;IAChB,CAAC;IAuBD,kBAAkB,CAAC,OAA2D;QAC1E,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC;QAChC,OAAO,IAAI,CAAC,uBAAuB,CAAC,OAAc,EAAE,KAAK,CAAC,CAAC;IAC/D,CAAC;IAqBD,iBAAiB,CAAC,OAA2D;QACzE,MAAM,IAAI,GAAG,IAAI,CAAC,kBAAkB,CAAC,OAAc,CAAC,CAAC;QACrD,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACvC,IAAI,CAAC,MAAM,CAAC;YACR,KAAK;YACL,UAAU,EAAE,IAAI;YAChB,SAAS,EAAE,OAAO;SACrB,CAAC,CAAC;QACH,OAAO,IAAI,CAAC;IAChB,CAAC;IAiBD,gBAAgB,CAAC,OAA2B;QACxC,IAAI,UAAqB,CAAC;QAC1B,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;YAC7B,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;YAC7B,IAAI,CAAC,UAAU,EAAE;gBACb,MAAM,IAAI,KAAK,CAAC,SAAS,GAAG,OAAO,CAAC,CAAC;aACxC;SACJ;aAAM;YACH,UAAU,GAAG,OAAO,CAAC;SACxB;QACD,OAAO,UAAU,CAAC,MAAM,EAAE,CAAC;IAC/B,CAAC;IAgBD,iBAAiB,CAAC,OAA6B;QAC3C,IAAI,WAAwB,CAAC;QAC7B,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;YAC7B,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;YAC/B,IAAI,CAAC,WAAW,EAAE;gBACd,MAAM,IAAI,KAAK,CAAC,UAAU,GAAG,OAAO,CAAC,CAAC;aACzC;SACJ;aAAM;YACH,WAAW,GAAG,OAAO,CAAC;SACzB;QACD,OAAO,WAAW,CAAC,MAAM,EAAE,CAAC;IAChC,CAAC;IAgBD,2BAA2B,CAAC,OAAgC;QACxD,IAAI,cAA8B,CAAC;QACnC,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;YAC7B,cAAc,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC;YAClE,IAAI,CAAC,cAAc,EAAE;gBACjB,MAAM,IAAI,KAAK,CAAC,UAAU,GAAG,OAAO,CAAC,CAAC;aACzC;SACJ;aAAM;YACH,cAAc,GAAG,OAAO,CAAC;SAC5B;QACD,OAAO,cAAc,CAAC,MAAM,EAAE,CAAC;IACnC,CAAC;IAgBD,cAAc,CAAC,OAA0B;QACrC,IAAI,QAAkB,CAAC;QACvB,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;YAC7B,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;YACzB,IAAI,CAAC,QAAQ,EAAE;gBACX,MAAM,IAAI,KAAK,CAAC,SAAS,GAAG,OAAO,CAAC,CAAC;aACxC;SACJ;aAAM;YACH,QAAQ,GAAG,OAAO,CAAC;SACtB;QACD,OAAO,QAAQ,CAAC,MAAM,EAAE,CAAC;IAC7B,CAAC;IAED,iBAAiB,CAAC,SAAoB;QAClC,MAAM,SAAS,GAAG,SAAS,CAAC,SAAS,CAAC;QACtC,MAAM,MAAM,GAAW;YACnB,UAAU,EAAE,IAAI;YAChB,SAAS;YACT,KAAK,EAAE,CAAC,CAAC;YACT,MAAM,EAAE,IAAI;YACZ,SAAS,EAAE,SAAS;SACvB,CAAC;QACF,IAAI,SAAS,EAAE;YACX,MAAM,CAAC,SAAS,GAAG,SAAS,CAAC;YAC7B,IAAI,KAAK,CAAC,OAAO,CAAE,IAAY,CAAC,SAAS,CAAC,CAAC,EAAE;gBACzC,MAAM,KAAK,GAAI,IAAY,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;gBAC1D,CAAC,KAAK,IAAK,IAAY,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;gBACpD,MAAM,CAAC,KAAK,GAAG,KAAK,CAAC;aACxB;iBAAM,IAAK,IAAY,CAAC,SAAS,CAAC,KAAK,SAAS,EAAE;gBAC/C,MAAM,CAAC,KAAK,GAAG,CAAC,CAAC;gBAChB,IAAY,CAAC,SAAS,CAAC,GAAG,SAAS,CAAC;aACxC;SACJ;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;IAED,kFAAkF;IAClF,gEAAgE;IAChE,uBAAuB;IACvB,kFAAkF;IAElF,QAAQ,CAAC,MAAqB;QAC1B,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IAChC,CAAC;IAED,YAAY,CAAC,MAA0B;QACnC,MAAM,MAAM,GAAG;YACX,GAAG,MAAM;SACZ,CAAC;QACF,IAAI,CAAC,MAAM,CAAC;YACR,GAAG,MAAM;SACZ,CAAC,CAAC;IACP,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,OAA6B;QAC/B,IAAI,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;QACvB,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS,IAAI,IAAI,CAAC,UAAU,EAAE;YAC5C,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;SAC1C;QACD,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YACpE,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;SACpC;QACD,IAAI,IAAI,CAAC,IAAI,KAAK,aAAa,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS,EAAE;YACxD,OAAO,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;SAClE;aAAM,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO,IAAI,IAAI,CAAC,KAAK,EAAE;YAC5C,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;YAC/D,KAAK,GAAG,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAC7B,OAAO,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,IAAI,KAAK,KAAK,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;SACjF;aAAM;YACH,IAAI,GAAG,GAAG,EAAE,CAAC;YACb,IAAI,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;YACrB,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,EAAE,EAAE;gBACvD,IAAI,IAAI,KAAK,UAAU,EAAE;oBACrB,GAAG,IAAI,kBAAkB,CAAC;oBAC1B,IAAI,GAAG,MAAM,CAAC;iBACjB;gBACD,IAAI,IAAI,CAAC,IAAI,KAAK,QAAQ,EAAE;oBACxB,GAAG,IAAI,GAAG,IAAI,KAAK,KAAK,GAAG,CAAC;iBAC/B;qBAAM;oBACH,GAAG,IAAI,IAAI,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,KAAK,KAAK,GAAG,CAAC;iBAC3D;aACJ;YACD,OAAO,GAAG,CAAC;SACd;IACL,CAAC;IAGD,YAAY,CAAC,KAAuB;QAChC,IAAI,IAAI,GAAG,EAAE,CAAC;QACd,IAAI,IAAI,CAAC,IAAI,KAAK,aAAa,EAAE;YAC7B,IAAI,IAAI,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,IAAA,uBAAU,EAAC,KAAK,EAAE,IAAI,EAAE,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;SAClG;aAAM,IAAI,IAAI,CAAC,UAAU,EAAE;YACxB,IAAI,IAAI,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,IAAA,uBAAU,EAAC,KAAK,EAAE,IAAI,EAAE,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;SACjG;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;CAKJ,CAAA;AA9gBG;IADC,IAAA,qBAAQ,GAAE;8CACgC;AAM3C;IADC,IAAA,qBAAQ,GAAE;2CACc;AAMzB;IADC,IAAA,qBAAQ,GAAE;2CACuC;AAMlD;IADC,IAAA,qBAAQ,GAAE;4CACe;AAM1B;IADC,IAAA,qBAAQ,EAAC,WAAW,CAAC;iDACY;AAMlC;IADC,IAAA,qBAAQ,EAAC,aAAa,CAAC;kDACa;AAMrC;IADC,IAAA,qBAAQ,EAAC,gBAAgB,CAAC;4CACO;AAMlC;IADC,IAAA,qBAAQ,EAAC,UAAU,CAAC;+CACU;AAM/B;IADC,IAAA,qBAAQ,GAAE;4CACgB;AAM3B;IADC,IAAA,qBAAQ,GAAE;2CACe;AA2c1B;IADC,IAAA,0BAAa,GAAE;iDASf;AA9gBQ,aAAa;IADzB,IAAA,oBAAO,EAAC,QAAQ,CAAC;GACL,aAAa,CAmhBzB;AAnhBY,sCAAa;AAqhB1B,kBAAQ,CAAC,eAAe,CAAC,GAAG,aAAa,CAAC;AAC1C,kBAAe,aAAa,CAAC;AAC7B,kFAAkF;AAClF,gEAAgE;AAChE,uBAAuB;AACvB,kFAAkF"}

package/out/concepts/BindDirective__.js

@@ -179,10 +179,30 @@ let BindDirective = BindDirective_1 = class BindDirective extends BaseNode_1.def
             if (this.expression.concept === 'StringLiteral') {
                 value = `'${value}'`;
             }
-            value = value.replace && value.replace(/"/g, "'");
+            value = value?.replace(/"/g, "'");
         }
         if (this.name === 'auth' && !!this.value) {
-            value = `'/${this.view.name}/${this.element.name}'`;
+            const regex = /(.\w+\[name=\w+\])/g;
+            const paths = this.element.nodePath.match(regex);
+            const regex1 = /\s*=(\w+)\]/;
+            let pathArr = [];
+            const isElement = paths.find((item) => {
+                if (item.startsWith('.elements')) {
+                    return true;
+                }
+                else {
+                    pathArr.push(item);
+                    return false;
+                }
+            });
+            if (isElement) {
+                pathArr = [...pathArr, ...paths.slice(-1)];
+            }
+            const _path = pathArr.reduce((str, item) => {
+                const c = item.match(regex1);
+                return str + '/' + c[1];
+            }, '');
+            value = `'${_path}'`;
         }
         return value !== '' && value !== undefined && value !== null ? `v-${this.name}${modifiersString}${this.arg ? ':' + this.arg : ''}="${value}"` : '';
     }

package/out/concepts/BindDirective__.js.map

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

package/out/concepts/BindEvent__.d.ts

@@ -121,12 +121,12 @@ export declare class BindEvent extends BaseNode {
      */
     removeArgument(argument: Argument): void;
     __removeLogicItem(logicItem: LogicItem): Params;
+    get calleewholeKey(): string;
     get tsCalleeNamespace(): string;
-    get tsName(): string;
     get calleeKey(): string;
     get randerValue(): string;
     toHump: (name: string) => string;
-    toEmbeddedTS(state?: TranslatorState): string;
+    toEmbeddedTS(state?: TranslatorState, isPageCycle?: Boolean): string;
     /**
      * 设置callee
      */

package/out/concepts/BindEvent__.js

@@ -125,7 +125,7 @@ let BindEvent = BindEvent_1 = class BindEvent extends BaseNode_1.default {
         const relationOptions = { parentNode: this, parentKey: 'arguments' };
         let argument;
         if (options instanceof Argument__1.default) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             argument = options;
             Object.assign(argument, relationOptions);
         }
@@ -153,7 +153,7 @@ let BindEvent = BindEvent_1 = class BindEvent extends BaseNode_1.default {
     }
     addArgument(options) {
         const node = this._addArgument(options);
-        const index = this.arguments.length;
+        const index = this.arguments.indexOf(node);
         node.create({
             index,
             parentNode: this,
@@ -192,6 +192,10 @@ let BindEvent = BindEvent_1 = class BindEvent extends BaseNode_1.default {
     // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
     // 自动生成的代码已结束。下面可以手动编写。
     //================================================================================
+    // 用于logic回填
+    get calleewholeKey() {
+        return this.calleeNamespace + '.' + this.calleeName;
+    }
     get tsCalleeNamespace() {
         if (this.calleeNamespace) {
             let tsCalleeNamespace = this.calleeNamespace;
@@ -201,22 +205,10 @@ let BindEvent = BindEvent_1 = class BindEvent extends BaseNode_1.default {
         }
         return '';
     }
-    get tsName() {
-        if (this.calleeName) {
-            let tsName = this.calleeName;
-            if (/^\d/.test(tsName)) {
-                tsName = '$' + tsName;
-            }
-            // 匹配所有特殊字符都转为_
-            tsName = tsName.replace(/\W/g, '_');
-            return tsName;
-        }
-        return '';
-    }
     get calleeKey() {
         const tsCalleeNamespace = this.tsCalleeNamespace;
         if (!tsCalleeNamespace) {
-            return `logics.${this.calleeName}`;
+            return `${this.calleeName}`;
         }
         // elements单独处理相对路径，和后缀的问题
         if (tsCalleeNamespace.startsWith('elements') && tsCalleeNamespace.endsWith('logics')) {
@@ -239,15 +231,22 @@ let BindEvent = BindEvent_1 = class BindEvent extends BaseNode_1.default {
         return `${randerNameSpace}.${this.calleeName}`;
     }
     // 绑定事件转驼峰
-    toHump = (name) => name ? name.replace(/\-(\w)/g, (all, letter) => letter.toUpperCase()) : '';
-    toEmbeddedTS(state) {
-        let code = `${this.toHump(this.name) || '__IDENTIFIER__'}: (event) => [\n`;
-        code += (0, translator_1.indent)(state.tabSize + 1);
-        code += `() => {${this.calleeKey}()}`;
-        code += '\n';
-        code += (0, translator_1.indent)(state.tabSize);
-        code += '],\n';
-        return code;
+    toHump = (name) => (name ? name.replace(/\-(\w)/g, (all, letter) => letter.toUpperCase()) : '');
+    toEmbeddedTS(state, isPageCycle) {
+        // 如果有绑定的事件名
+        if (this.calleeName) {
+            if (isPageCycle) {
+                return `${this.calleeKey}();`;
+            }
+            let code = `${this.toHump(this.name) || '__IDENTIFIER__'}: (event) => [\n`;
+            code += (0, translator_1.indent)(state.tabSize + 1);
+            code += `() => {${this.calleeKey}()}`;
+            code += '\n';
+            code += (0, translator_1.indent)(state.tabSize);
+            code += '],\n';
+            return code;
+        }
+        return '';
     }
     // @withSourceMap()
     // toObjectTS(state?: TranslatorState): string {
@@ -278,19 +277,53 @@ let BindEvent = BindEvent_1 = class BindEvent extends BaseNode_1.default {
      * 转换成 Vue 的模板格式
      */
     toVue(options) {
-        const calleeName = this.calleeName;
+        const calleeNamespace = this.calleeNamespace;
+        let isComponentLogic = false;
+        let componentName = '';
+        if (calleeNamespace) {
+            const namespaceArr = calleeNamespace.split('.');
+            const start = namespaceArr.shift();
+            if (start === 'elements' && namespaceArr.length === 2 && namespaceArr[1] === 'logics') {
+                isComponentLogic = true;
+                componentName = namespaceArr[0];
+            }
+        }
+        let callee = '';
+        if (isComponentLogic)
+            callee = `$refs.${componentName}.${this.calleeName}`;
+        else if (calleeNamespace?.startsWith('nasl.'))
+            callee = `$global.${this.calleeName}`;
+        else
+            callee = this.calleeName;
         let code = '';
-        if (calleeName) {
-            code += `@${this.name}="${calleeName}`;
-            if (Array.isArray(this.arguments)) {
-                code += '(';
-                this.arguments.forEach((arg, index) => {
-                    code += arg.toJS();
-                    if (index !== this.arguments.length - 1)
-                        code += ', ';
+        if (callee) {
+            code += `@${this.name}="${callee}`;
+            const argsList = [];
+            const argsMap = {};
+            if (Array.isArray(this.arguments) && this.arguments.length) {
+                this.arguments.forEach((arg) => {
+                    const argStr = arg.toJS();
+                    argsList.push(argStr);
+                    argsMap[argStr] = true;
                 });
-                code += ')';
             }
+            const additionalArgs = ['$event'];
+            if (Array.isArray(options?.scopeList) && options?.scopeList.length) {
+                additionalArgs.push(...options.scopeList);
+            }
+            additionalArgs.forEach((arg) => {
+                if (!argsMap[arg]) {
+                    argsList.push(arg);
+                    argsMap[arg] = true;
+                }
+            });
+            code += '(';
+            argsList.forEach((arg, index) => {
+                code += arg;
+                if (index !== argsList.length - 1)
+                    code += ', ';
+            });
+            code += ')';
             code += `"`;
         }
         return code;

package/out/concepts/BindEvent__.js.map

@@ -1 +1 @@
-{"version":3,"file":"BindEvent__.js","sourceRoot":"","sources":["../../src/concepts/BindEvent__.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"BindEvent__.js","sourceRoot":"","sources":["../../src/concepts/BindEvent__.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAIA,8CAA2H;AAO3H,8CAAkE;AAIlE,kEAA0C;AAC1C,kEAA0C;AAC1C,6DAAoC;AAMpC;;GAEG;AAEH,IAAa,SAAS,iBAAtB,MAAa,SAAU,SAAQ,kBAAQ;IACnC;;OAEG;IAEH,OAAO,GAAgB,WAAW,CAAC;IAEnC;;OAEG;IAEH,IAAI,GAAW,SAAS,CAAC;IAEzB;;OAEG;IAEH,eAAe,GAAW,SAAS,CAAC;IAEpC;;OAEG;IAEH,UAAU,GAAW,SAAS,CAAC;IAE/B;;OAEG;IAEH,SAAS,GAAoB,EAAE,CAAC;IAEhC;;OAEG;IACH,IAAI,OAAO;QACP,OAAO,IAAI,CAAC,WAAW,CAAC,aAAa,CAAgB,CAAC;IAC1D,CAAC;IACD;;OAEG;IACH,IAAI,IAAI;QACJ,OAAO,IAAI,CAAC,WAAW,CAAC,MAAM,CAAS,CAAC;IAC5C,CAAC;IACD;;OAEG;IACH,IAAI,MAAM;QACN,OAAO,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAW,CAAC;IAChD,CAAC;IACD;;OAEG;IACH,IAAI,GAAG;QACH,OAAO,IAAI,CAAC,WAAW,CAAC,KAAK,CAAQ,CAAC;IAC1C,CAAC;IAED;;OAEG;IACH,YAAY,MAA2B;QACnC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,WAAS,CAAC,iBAAiB,EAAE,EAAE,MAAM,CAAC,CAAC;QAClE,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;IACjC,CAAC;IAED,MAAM,CAAC,IAAI,CAAC,MAAW,EAAE,UAAgB,EAAE,SAAkB;QACzD,OAAO,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,UAAU,EAAE,SAAS,CAAc,CAAC;IAClE,CAAC;IAED;;;OAGG;IACH,OAAO;QACH,IAAI,MAAM,GAAW,IAAI,CAAC;QAC1B,IAAI,IAAI,CAAC,UAAU,EAAE;YACjB,MAAM,GAAI,IAAI,CAAC,UAAkB,EAAE,iBAAiB,EAAE,CAAC,IAAI,CAAC,CAAC;SAChE;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;IACD;;OAEG;IACH,OAAO,CAAC,IAAY;QAChB,MAAM,MAAM,GAAG;YACX,IAAI;SACP,CAAC;QACF,IAAI,CAAC,MAAM,CAAC;YACR,GAAG,MAAM;YACT,KAAK,EAAE,MAAM;SAChB,CAAC,CAAC;IACP,CAAC;IAED;;OAEG;IACH,kBAAkB,CAAC,eAAuB;QACtC,MAAM,MAAM,GAAG;YACX,eAAe;SAClB,CAAC;QACF,IAAI,CAAC,MAAM,CAAC;YACR,GAAG,MAAM;SACZ,CAAC,CAAC;IACP,CAAC;IAED;;OAEG;IACH,aAAa,CAAC,UAAkB;QAC5B,MAAM,MAAM,GAAG;YACX,UAAU;SACb,CAAC;QACF,IAAI,CAAC,MAAM,CAAC;YACR,GAAG,MAAM;SACZ,CAAC,CAAC;IACP,CAAC;IAoBD,iBAAiB,CAAC,OAAqC,EAAE,KAAa;QAClE,MAAM,eAAe,GAAQ,EAAE,CAAC;QAChC,MAAM,eAAe,GAAG,EAAE,UAAU,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,CAAC;QACrE,IAAI,QAAkB,CAAC;QACvB,IAAI,OAAO,YAAY,mBAAQ,EAAE;YAC7B,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC,cAAc;YACtC,QAAQ,GAAG,OAAO,CAAC;YACnB,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,eAAe,CAAC,CAAC;SAC5C;aAAM;YACH,QAAQ,GAAG,mBAAQ,CAAC,IAAI,CAAC;gBACrB,GAAG,eAAe;gBAClB,GAAG,OAAO;aACb,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC;SACzB;QACD,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,EAAE,QAAQ,CAAC,CAAC;QAC1C,OAAO,QAAQ,CAAC;IACpB,CAAC;IAgBD,gBAAgB,CAAC,OAAqC,EAAE,KAAa;QACjE,MAAM,IAAI,GAAG,IAAI,CAAC,iBAAiB,CAAC,OAAc,EAAE,KAAK,CAAC,CAAC;QAC3D,IAAI,CAAC,MAAM,CAAC;YACR,KAAK;YACL,UAAU,EAAE,IAAI;YAChB,SAAS,EAAE,WAAW;SACzB,CAAC,CAAC;QACH,OAAO,IAAI,CAAC;IAChB,CAAC;IAkBD,YAAY,CAAC,OAAsC;QAC/C,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC;QACpC,OAAO,IAAI,CAAC,iBAAiB,CAAC,OAAc,EAAE,KAAK,CAAC,CAAC;IACzD,CAAC;IAgBD,WAAW,CAAC,OAAsC;QAC9C,MAAM,IAAI,GAAG,IAAI,CAAC,YAAY,CAAC,OAAc,CAAC,CAAC;QAC/C,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAC3C,IAAI,CAAC,MAAM,CAAC;YACR,KAAK;YACL,UAAU,EAAE,IAAI;YAChB,SAAS,EAAE,WAAW;SACzB,CAAC,CAAC;QACH,OAAO,IAAI,CAAC;IAChB,CAAC;IAWD,cAAc,CAAC,OAAiB;QAC5B,IAAI,QAAQ,GAAa,OAAO,CAAC;QACjC,OAAO,QAAQ,CAAC,MAAM,EAAE,CAAC;IAC7B,CAAC;IAED,iBAAiB,CAAC,SAAoB;QAClC,MAAM,SAAS,GAAG,SAAS,CAAC,SAAS,CAAC;QACtC,MAAM,MAAM,GAAW;YACnB,UAAU,EAAE,IAAI;YAChB,SAAS;YACT,KAAK,EAAE,CAAC,CAAC;YACT,MAAM,EAAE,IAAI;YACZ,SAAS,EAAE,SAAS;SACvB,CAAC;QACF,IAAI,SAAS,EAAE;YACX,MAAM,CAAC,SAAS,GAAG,SAAS,CAAC;YAC7B,IAAI,KAAK,CAAC,OAAO,CAAE,IAAY,CAAC,SAAS,CAAC,CAAC,EAAE;gBACzC,MAAM,KAAK,GAAI,IAAY,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;gBAC1D,CAAC,KAAK,IAAK,IAAY,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;gBACpD,MAAM,CAAC,KAAK,GAAG,KAAK,CAAC;aACxB;iBAAM,IAAK,IAAY,CAAC,SAAS,CAAC,KAAK,SAAS,EAAE;gBAC/C,MAAM,CAAC,KAAK,GAAG,CAAC,CAAC;gBAChB,IAAY,CAAC,SAAS,CAAC,GAAG,SAAS,CAAC;aACxC;SACJ;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;IAED,kFAAkF;IAClF,gEAAgE;IAChE,uBAAuB;IACvB,kFAAkF;IAClF,YAAY;IACZ,IAAI,cAAc;QACd,OAAO,IAAI,CAAC,eAAe,GAAG,GAAG,GAAG,IAAI,CAAC,UAAU,CAAC;IACxD,CAAC;IACD,IAAI,iBAAiB;QACjB,IAAI,IAAI,CAAC,eAAe,EAAE;YACtB,IAAI,iBAAiB,GAAG,IAAI,CAAC,eAAe,CAAC;YAC7C,iBAAiB,GAAG,iBAAiB,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC;YACvF,iBAAiB,GAAG,iBAAiB,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;YACzD,OAAO,iBAAiB,CAAC;SAC5B;QACD,OAAO,EAAE,CAAC;IACd,CAAC;IAED,IAAI,SAAS;QACT,MAAM,iBAAiB,GAAG,IAAI,CAAC,iBAAiB,CAAC;QACjD,IAAI,CAAC,iBAAiB,EAAE;YACpB,OAAO,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;SAC/B;QACD,0BAA0B;QAC1B,IAAI,iBAAiB,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,iBAAiB,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;YAClF,MAAM,UAAU,GAAG,iBAAiB,CAAC,SAAS,CAAC,CAAC,EAAE,iBAAiB,CAAC,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC;YAC/F,OAAO,IAAI,GAAG,UAAU,GAAG,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;SACpD;QACD,OAAO,GAAG,iBAAiB,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;IACrD,CAAC;IACD,aAAa;IACb,IAAI,WAAW;QACX,MAAM,eAAe,GAAG,IAAI,CAAC,iBAAiB,CAAC;QAC/C,IAAI,CAAC,eAAe,EAAE;YAClB,OAAO,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC;SAC/B;QACD,0BAA0B;QAC1B,IAAI,eAAe,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,eAAe,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;YAC9E,MAAM,UAAU,GAAG,eAAe,CAAC,SAAS,CAAC,WAAW,CAAC,MAAM,EAAE,eAAe,CAAC,MAAM,CAAC,CAAC;YACzF,OAAO,QAAQ,GAAG,UAAU,GAAG,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;SACxD;QACD,OAAO,GAAG,eAAe,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;IACnD,CAAC;IACD,UAAU;IACV,MAAM,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IAGxG,YAAY,CAAC,KAAuB,EAAE,WAAqB;QACvD,YAAY;QACZ,IAAI,IAAI,CAAC,UAAU,EAAE;YACjB,IAAI,WAAW,EAAE;gBACb,OAAO,GAAG,IAAI,CAAC,SAAS,KAAK,CAAC;aACjC;YACD,IAAI,IAAI,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,gBAAgB,kBAAkB,CAAC;YAC3E,IAAI,IAAI,IAAA,mBAAM,EAAC,KAAK,CAAC,OAAO,GAAG,CAAC,CAAC,CAAC;YAClC,IAAI,IAAI,UAAU,IAAI,CAAC,SAAS,KAAK,CAAC;YACtC,IAAI,IAAI,IAAI,CAAC;YACb,IAAI,IAAI,IAAA,mBAAM,EAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YAC9B,IAAI,IAAI,MAAM,CAAC;YACf,OAAO,IAAI,CAAC;SACf;QACD,OAAO,EAAE,CAAC;IACd,CAAC;IAED,mBAAmB;IACnB,gDAAgD;IAChD,qBAAqB;IACrB,uBAAuB;IACvB,qEAAqE;IACrE,6CAA6C;IAC7C,yCAAyC;IACzC,wBAAwB;IACxB,yCAAyC;IACzC,0BAA0B;IAC1B,QAAQ;IACR,mBAAmB;IACnB,IAAI;IAEJ;;OAEG;IACH,SAAS,CAAC,KAAY;QAClB,MAAM,MAAM,GAAG;YACX,eAAe,EAAE,KAAK,CAAC,YAAY,EAAE;YACrC,UAAU,EAAE,KAAK,CAAC,IAAI;SACzB,CAAC;QACF,IAAI,CAAC,MAAM,CAAC;YACR,GAAG,MAAM;SACZ,CAAC,CAAC;IACP,CAAC;IACD;;OAEG;IACH,KAAK,CAAC,OAA6B;QAC/B,MAAM,eAAe,GAAG,IAAI,CAAC,eAAe,CAAC;QAC7C,IAAI,gBAAgB,GAAG,KAAK,CAAC;QAC7B,IAAI,aAAa,GAAG,EAAE,CAAC;QACvB,IAAI,eAAe,EAAE;YACjB,MAAM,YAAY,GAAG,eAAe,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAChD,MAAM,KAAK,GAAG,YAAY,CAAC,KAAK,EAAE,CAAC;YACnC,IAAI,KAAK,KAAK,UAAU,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,IAAI,YAAY,CAAC,CAAC,CAAC,KAAK,QAAQ,EAAE;gBACnF,gBAAgB,GAAG,IAAI,CAAC;gBACxB,aAAa,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC;aACnC;SACJ;QACD,IAAI,MAAM,GAAG,EAAE,CAAC;QAChB,IAAI,gBAAgB;YAChB,MAAM,GAAG,SAAS,aAAa,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;aACpD,IAAI,eAAe,EAAE,UAAU,CAAC,OAAO,CAAC;YACzC,MAAM,GAAG,WAAW,IAAI,CAAC,UAAU,EAAE,CAAC;;YAEtC,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC;QAC7B,IAAI,IAAI,GAAG,EAAE,CAAC;QACd,IAAI,MAAM,EAAE;YACR,IAAI,IAAI,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;YACnC,MAAM,QAAQ,GAAa,EAAE,CAAC;YAC9B,MAAM,OAAO,GAAQ,EAAE,CAAC;YACxB,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE;gBACxD,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;oBAC3B,MAAM,MAAM,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC;oBAC1B,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;oBACtB,OAAO,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC;gBAC3B,CAAC,CAAC,CAAC;aACN;YACD,MAAM,cAAc,GAAa,CAAC,QAAQ,CAAC,CAAC;YAC5C,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,EAAE,SAAS,CAAC,IAAI,OAAO,EAAE,SAAS,CAAC,MAAM,EAAE;gBAChE,cAAc,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;aAC7C;YACD,cAAc,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;gBAC3B,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;oBACf,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;oBACnB,OAAO,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC;iBACvB;YACL,CAAC,CAAC,CAAC;YACH,IAAI,IAAI,GAAG,CAAC;YACZ,QAAQ,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;gBAC5B,IAAI,IAAI,GAAG,CAAC;gBACZ,IAAI,KAAK,KAAK,QAAQ,CAAC,MAAM,GAAG,CAAC;oBAC7B,IAAI,IAAI,IAAI,CAAC;YACrB,CAAC,CAAC,CAAC;YACH,IAAI,IAAI,GAAG,CAAC;YACZ,IAAI,IAAI,GAAG,CAAC;SACf;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;CAKJ,CAAA;AApZG;IADC,IAAA,qBAAQ,GAAE;0CACwB;AAMnC;IADC,IAAA,qBAAQ,GAAE;uCACc;AAMzB;IADC,IAAA,qBAAQ,GAAE;kDACyB;AAMpC;IADC,IAAA,qBAAQ,GAAE;6CACoB;AAM/B;IADC,IAAA,qBAAQ,EAAC,UAAU,CAAC;4CACW;AAsRhC;IADC,IAAA,0BAAa,GAAE;6CAgBf;AAlUQ,SAAS;IADrB,IAAA,oBAAO,EAAC,QAAQ,CAAC;GACL,SAAS,CAyZrB;AAzZY,8BAAS;AA2ZtB,kBAAQ,CAAC,WAAW,CAAC,GAAG,SAAS,CAAC;AAClC,kBAAe,SAAS,CAAC;AACzB,kFAAkF;AAClF,gEAAgE;AAChE,uBAAuB;AACvB,kFAAkF"}

package/out/concepts/BooleanLiteral__.d.ts

@@ -21,5 +21,7 @@ export declare class BooleanLiteral extends LogicItem {
     toVue(options?: ElementToVueOptions): string;
     toUI(state?: TranslatorState): string;
     toJS(state?: TranslatorState): string;
+    toEmbeddedTS(state?: TranslatorState): string;
+    getValue(): string;
 }
 export default BooleanLiteral;

package/out/concepts/BooleanLiteral__.js

@@ -11,6 +11,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 var BooleanLiteral_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BooleanLiteral = void 0;
+const translator_1 = require("../translator");
 const decorators_1 = require("../decorators");
 const classMap_1 = __importDefault(require("../common/classMap"));
 const LogicItem__1 = __importDefault(require("./LogicItem__"));
@@ -50,6 +51,12 @@ let BooleanLiteral = BooleanLiteral_1 = class BooleanLiteral extends LogicItem__
     toJS(state) {
         return this.value;
     }
+    toEmbeddedTS(state) {
+        return this.value;
+    }
+    getValue() {
+        return this.value;
+    }
 };
 __decorate([
     (0, decorators_1.property)()
@@ -57,6 +64,9 @@ __decorate([
 __decorate([
     (0, decorators_1.property)()
 ], BooleanLiteral.prototype, "value", void 0);
+__decorate([
+    (0, translator_1.withSourceMap)()
+], BooleanLiteral.prototype, "toEmbeddedTS", null);
 BooleanLiteral = BooleanLiteral_1 = __decorate([
     (0, decorators_1.concept)('布尔型字面量')
 ], BooleanLiteral);

package/out/concepts/BooleanLiteral__.js.map

@@ -1 +1 @@
-{"version":3,"file":"BooleanLiteral__.js","sourceRoot":"","sources":["../../src/concepts/BooleanLiteral__.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAOA,8CAAkE;AAKlE,kEAA0C;AAC1C,+DAAsC;AAEtC;;GAEG;AAEH,IAAa,cAAc,sBAA3B,MAAa,cAAe,SAAQ,oBAAS;IACzC;;OAEG;IAEH,OAAO,GAAqB,gBAAgB,CAAC;IAE7C;;OAEG;IAEH,KAAK,GAAW,SAAS,CAAC;IAI1B;;OAEG;IACH,YAAY,MAAgC;QACxC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,gBAAc,CAAC,iBAAiB,EAAE,EAAE,MAAM,CAAC,CAAC;QACvE,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;IACjC,CAAC;IAED,MAAM,CAAC,IAAI,CAAC,MAAW,EAAE,UAAgB,EAAE,SAAkB;QACzD,OAAO,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,UAAU,EAAE,SAAS,CAAmB,CAAC;IACvE,CAAC;IASD,kFAAkF;IAClF,gEAAgE;IAChE,uBAAuB;IACvB,kFAAkF;IAClF,KAAK,CAAC,OAA6B;QAC/B,OAAO,IAAI,CAAC,KAAK,CAAC;IACtB,CAAC;IAED,IAAI,CAAC,KAAuB;QACxB,OAAO,IAAI,CAAC,KAAK,CAAC;IACtB,CAAC;IAED,IAAI,CAAC,KAAuB;QACxB,OAAO,IAAI,CAAC,KAAK,CAAC;IACtB,CAAC;CAMJ,CAAA;AAlDG;IADC,IAAA,qBAAQ,GAAE;+CACkC;AAM7C;IADC,IAAA,qBAAQ,GAAE;6CACe;AAXjB,cAAc;IAD1B,IAAA,oBAAO,EAAC,QAAQ,CAAC;GACL,cAAc,CAuD1B;AAvDY,wCAAc;AAyD3B,kBAAQ,CAAC,gBAAgB,CAAC,GAAG,cAAc,CAAC;AAC5C,kBAAe,cAAc,CAAC;AAC9B,kFAAkF;AAClF,gEAAgE;AAChE,uBAAuB;AACvB,kFAAkF"}
+{"version":3,"file":"BooleanLiteral__.js","sourceRoot":"","sources":["../../src/concepts/BooleanLiteral__.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,8CAA2E;AAO3E,8CAAkE;AAKlE,kEAA0C;AAC1C,+DAAsC;AAEtC;;GAEG;AAEH,IAAa,cAAc,sBAA3B,MAAa,cAAe,SAAQ,oBAAS;IACzC;;OAEG;IAEH,OAAO,GAAqB,gBAAgB,CAAC;IAE7C;;OAEG;IAEH,KAAK,GAAW,SAAS,CAAC;IAI1B;;OAEG;IACH,YAAY,MAAgC;QACxC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,gBAAc,CAAC,iBAAiB,EAAE,EAAE,MAAM,CAAC,CAAC;QACvE,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;IACjC,CAAC;IAED,MAAM,CAAC,IAAI,CAAC,MAAW,EAAE,UAAgB,EAAE,SAAkB;QACzD,OAAO,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,UAAU,EAAE,SAAS,CAAmB,CAAC;IACvE,CAAC;IASD,kFAAkF;IAClF,gEAAgE;IAChE,uBAAuB;IACvB,kFAAkF;IAClF,KAAK,CAAC,OAA6B;QAC/B,OAAO,IAAI,CAAC,KAAK,CAAC;IACtB,CAAC;IAED,IAAI,CAAC,KAAuB;QACxB,OAAO,IAAI,CAAC,KAAK,CAAC;IACtB,CAAC;IAED,IAAI,CAAC,KAAuB;QACxB,OAAO,IAAI,CAAC,KAAK,CAAC;IACtB,CAAC;IAGD,YAAY,CAAC,KAAuB;QAChC,OAAO,IAAI,CAAC,KAAK,CAAC;IACtB,CAAC;IACD,QAAQ;QACJ,OAAO,IAAI,CAAC,KAAK,CAAC;IACtB,CAAC;CAMJ,CAAA;AA1DG;IADC,IAAA,qBAAQ,GAAE;+CACkC;AAM7C;IADC,IAAA,qBAAQ,GAAE;6CACe;AAyC1B;IADC,IAAA,0BAAa,GAAE;kDAGf;AAtDQ,cAAc;IAD1B,IAAA,oBAAO,EAAC,QAAQ,CAAC;GACL,cAAc,CA+D1B;AA/DY,wCAAc;AAiE3B,kBAAQ,CAAC,gBAAgB,CAAC,GAAG,cAAc,CAAC;AAC5C,kBAAe,cAAc,CAAC;AAC9B,kFAAkF;AAClF,gEAAgE;AAChE,uBAAuB;AACvB,kFAAkF"}

package/out/concepts/CallFunction__.js

@@ -12,7 +12,9 @@ var CallFunction_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CallFunction = void 0;
 const translator_1 = require("../translator");
+const Identifier__1 = __importDefault(require("./Identifier__"));
 const decorators_1 = require("../decorators");
+const BaseNode_1 = __importDefault(require("../common/BaseNode"));
 const classMap_1 = __importDefault(require("../common/classMap"));
 const TypeAnnotation__1 = __importDefault(require("./TypeAnnotation__"));
 const Argument__1 = __importDefault(require("./Argument__"));
@@ -28,7 +30,7 @@ let CallFunction = CallFunction_1 = class CallFunction extends LogicItem__1.defa
     /**
      * 调用函数标题
      */
-    label = '调用逻辑';
+    label = '内置函数';
     /**
      * calleeNamespace
      */
@@ -65,7 +67,7 @@ let CallFunction = CallFunction_1 = class CallFunction extends LogicItem__1.defa
         const relationOptions = { parentNode: this, parentKey: 'typeArguments' };
         let typeAnnotation;
         if (options instanceof TypeAnnotation__1.default) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             typeAnnotation = options;
             Object.assign(typeAnnotation, relationOptions);
         }
@@ -93,7 +95,7 @@ let CallFunction = CallFunction_1 = class CallFunction extends LogicItem__1.defa
     }
     addTypeAnnotation(options) {
         const node = this._addTypeAnnotation(options);
-        const index = this.typeArguments.length;
+        const index = this.typeArguments.indexOf(node);
         node.create({
             index,
             parentNode: this,
@@ -106,7 +108,7 @@ let CallFunction = CallFunction_1 = class CallFunction extends LogicItem__1.defa
         const relationOptions = { parentNode: this, parentKey: 'arguments' };
         let argument;
         if (options instanceof Argument__1.default) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             argument = options;
             Object.assign(argument, relationOptions);
         }
@@ -134,7 +136,7 @@ let CallFunction = CallFunction_1 = class CallFunction extends LogicItem__1.defa
     }
     addArgument(options) {
         const node = this._addArgument(options);
-        const index = this.arguments.length;
+        const index = this.arguments.indexOf(node);
         node.create({
             index,
             parentNode: this,
@@ -203,20 +205,20 @@ let CallFunction = CallFunction_1 = class CallFunction extends LogicItem__1.defa
     toVue(options) {
         let code = `$utils['${this.calleeName}']`;
         code += '(';
-        this.arguments.forEach((arg, index) => {
-            code += arg.toVue(options);
-            if (index !== this.arguments.length - 1)
+        this.arguments?.forEach((arg, index) => {
+            code += arg?.toVue(options);
+            if (index !== this.arguments?.length - 1)
                 code += ', ';
         });
         code += ')';
         return code;
     }
     toUI() {
-        let code = `$utils['${this.calleeName}']`;
+        let code = this.calleeName;
         code += '(';
-        this.arguments.forEach((arg, index) => {
-            code += arg.toUI();
-            if (index !== this.arguments.length - 1)
+        this.arguments?.forEach((arg, index) => {
+            code += arg?.toUI();
+            if (index !== this.arguments?.length - 1)
                 code += ', ';
         });
         code += ')';
@@ -225,11 +227,19 @@ let CallFunction = CallFunction_1 = class CallFunction extends LogicItem__1.defa
     toJS(state) {
         let code = `this.$utils['${this.calleeName}']`;
         code += '(';
-        this.arguments.forEach((arg, index) => {
-            code += arg.toJS((0, translator_1.shiftState)(state, code));
-            if (index !== this.arguments.length - 1)
+        this.arguments?.forEach((arg, index) => {
+            code += arg?.toJS((0, translator_1.shiftState)(state, code));
+            if (index !== this.arguments?.length - 1)
                 code += ', ';
         });
+        if (this.typeArguments && this.typeArguments.length) {
+            code += ', ';
+            this.typeArguments?.forEach((arg, index) => {
+                code += arg?.toJS((0, translator_1.shiftState)(state, code));
+                if (index !== this.arguments?.length - 1)
+                    code += ', ';
+            });
+        }
         code += ')';
         return code;
     }
@@ -237,10 +247,10 @@ let CallFunction = CallFunction_1 = class CallFunction extends LogicItem__1.defa
         return this.calleeName ? `${this.calleeNamespace ? this.calleeNamespace + '.' : ''}${this.calleeName}` : '__IDENTIFIER__';
     }
     _setCallee(func) {
-        this.calleeNamespace = func.getNamespace();
-        this.calleeName = func.name;
+        this.calleeNamespace = func?.getNamespace();
+        this.calleeName = func?.name;
         this.arguments = [];
-        func.params.forEach((param) => {
+        func?.params?.forEach((param) => {
             this._addArgument(undefined);
         });
     }
@@ -252,6 +262,9 @@ let CallFunction = CallFunction_1 = class CallFunction extends LogicItem__1.defa
             const argument = Argument__1.default.from({
                 keyword: param.name,
             }, this);
+            if (param.defaultExpression instanceof Identifier__1.default) {
+                argument.expression = BaseNode_1.default.from(param.defaultExpression, argument, 'expression');
+            }
             Object.assign(argument, relationOptions);
             return argument;
         });
@@ -268,7 +281,7 @@ let CallFunction = CallFunction_1 = class CallFunction extends LogicItem__1.defa
             calleeNamespace,
             calleeName,
             arguments: params,
-            typeArguments
+            typeArguments,
         });
     }
     toEmbeddedTS(state) {
@@ -287,15 +300,20 @@ let CallFunction = CallFunction_1 = class CallFunction extends LogicItem__1.defa
             code += ')';
             // 如果有内容
             const typeAnnotation = this.typeArguments[0];
-            if (typeAnnotation.typeNamespace && typeAnnotation.typeName) {
-                code += `<${typeAnnotation.typeNamespace}.${typeAnnotation.typeName}>()`;
-            }
+            code += `<`;
+            code += `${typeAnnotation.toEmbeddedTS((0, translator_1.shiftState)(state, code, { tabSize: 0 }))}>()`;
             code += '\n';
         }
         else {
             code = this.calleeKey;
+            if (Array.isArray(this.typeArguments) && this.typeArguments.length) {
+                // 如果有内容
+                const typeAnnotation = this.typeArguments[0];
+                code += `<`;
+                code += `${typeAnnotation.toEmbeddedTS((0, translator_1.shiftState)(state, code, { tabSize: 0 }))}>`;
+            }
             code += '(';
-            this.arguments.forEach((arg, index) => {
+            Array.isArray(this.arguments) && this.arguments.forEach((arg, index) => {
                 code += arg.toEmbeddedTS((0, translator_1.shiftState)(state, code, { tabSize: 0 }));
                 if (index !== this.arguments.length - 1)
                     code += ', ';