@ibiz-template/runtime 0.5.3-beta.1 → 0.5.3-beta.10

package/out/app-hub.d.ts

@@ -54,6 +54,15 @@ export declare class AppHub implements IAppHubService {
      * @type {Map<string, string>} Map<视图 id, 视图所属应用>
      */
     protected view2appMap: Map<string, string>;
+    /**
+     * 当前注册的应用视图优先级
+     *
+     * @author chitanda
+     * @date 2024-01-15 15:01:57
+     * @protected
+     * @type {Map<string, number>}
+     */
+    protected view2appPriorityMap: Map<string, number>;
     /**
      * 实例化的应用视图模型
      *
@@ -133,11 +142,12 @@ export declare class AppHub implements IAppHubService {
      * 设置应用视图所属应用
      *
      * @author chitanda
-     * @date 2023-04-17 23:04:37
+     * @date 2024-01-15 15:01:41
      * @param {string} tag 视图 codeName 或者视图 id
      * @param {string} [appId=ibiz.env.appId]
+     * @param {number} [priority=-1] 视图的优先级，值越小优先级越高。1为最高优先级
      */
-    setAppView(tag: string, appId?: string): void;
+    setAppView(tag: string, appId?: string, priority?: number): void;
     /**
      * 判断应用视图是否存在
      *

package/out/app-hub.d.ts.map

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

package/out/app-hub.js

@@ -46,6 +46,15 @@ export class AppHub {
          * @type {Map<string, string>} Map<视图 id, 视图所属应用>
          */
         this.view2appMap = new Map();
+        /**
+         * 当前注册的应用视图优先级
+         *
+         * @author chitanda
+         * @date 2024-01-15 15:01:57
+         * @protected
+         * @type {Map<string, number>}
+         */
+        this.view2appPriorityMap = new Map();
         /**
          * 实例化的应用视图模型
          *
@@ -138,13 +147,24 @@ export class AppHub {
      * 设置应用视图所属应用
      *
      * @author chitanda
-     * @date 2023-04-17 23:04:37
+     * @date 2024-01-15 15:01:41
      * @param {string} tag 视图 codeName 或者视图 id
      * @param {string} [appId=ibiz.env.appId]
+     * @param {number} [priority=-1] 视图的优先级，值越小优先级越高。1为最高优先级
      */
-    setAppView(tag, appId = ibiz.env.appId) {
+    setAppView(tag, appId = ibiz.env.appId, priority = -1) {
         const id = this.calcAppViewId(tag);
+        if (this.view2appMap.has(id)) {
+            const _priority = this.view2appPriorityMap.get(id);
+            // 已经存在优先级高的视图直接跳过，若优先级相同或更高则覆盖
+            if (_priority && _priority < priority) {
+                return;
+            }
+        }
         this.view2appMap.set(id, appId);
+        if (priority !== -1) {
+            this.view2appPriorityMap.set(id, priority);
+        }
     }
     /**
      * 判断应用视图是否存在

package/out/application.js

@@ -56,7 +56,7 @@ export class Application {
     async init() {
         await this.authority.init();
         await this.loadAppModelStyle();
-        if (ibiz.env.enableMqtt && ibiz.appData) {
+        if (ibiz.env.enableMqtt && ibiz.appData && ibiz.auth.isAnonymous !== true) {
             this.mqtt = new MqttService(ibiz.appData.mqtttopic, getToken(), this.model.appId);
             this.mqtt.evt.on('message', message => {
                 ibiz.mc.command.asyncAction.next(message);

package/out/command/app/open-app-view/open-app-view.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"open-app-view.d.ts","sourceRoot":"","sources":["../../../../src/command/app/open-app-view/open-app-view.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAK/E;;;;;;;GAOG;AACH,qBAAa,kBAAkB;IAC7B,MAAM,CAAC,QAAQ,CAAC,GAAG,wBAAwB;;IAM3C;;;;;;;;;;OAUG;IACG,IAAI,CACR,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,QAAQ,EAClB,MAAM,GAAE,OAAY,EACpB,IAAI,GAAE,gBAAqB,GAC1B,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC;IA6D7B;;;;;;;;;OASG;IACH,SAAS,CAAC,gBAAgB,CACxB,OAAO,EAAE,WAAW,EACpB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,UAAU,CAAC;IAItB;;;;;;;;;;OAUG;cACa,SAAS,CACvB,OAAO,EAAE,WAAW,EACpB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,UAAU,CAAC;IAItB;;;;;;;;;;OAUG;cACa,WAAW,CACzB,OAAO,EAAE,WAAW,EACpB,KAAK,EAAE,UAAU,GAAG,SAAS,EAC7B,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,UAAU,CAAC;IAOtB;;;;;;;;;;OAUG;cACa,UAAU,CACxB,OAAO,EAAE,WAAW,EACpB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,UAAU,CAAC;IAItB;;;;;;;;;;OAUG;cACa,cAAc,CAC5B,OAAO,EAAE,WAAW,EACpB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,UAAU,CAAC;CAGvB"}
+{"version":3,"file":"open-app-view.d.ts","sourceRoot":"","sources":["../../../../src/command/app/open-app-view/open-app-view.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAK/E;;;;;;;GAOG;AACH,qBAAa,kBAAkB;IAC7B,MAAM,CAAC,QAAQ,CAAC,GAAG,wBAAwB;;IAM3C;;;;;;;;;;OAUG;IACG,IAAI,CACR,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,QAAQ,EAClB,MAAM,GAAE,OAAY,EACpB,IAAI,GAAE,gBAAqB,GAC1B,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC;IAoE7B;;;;;;;;;OASG;IACH,SAAS,CAAC,gBAAgB,CACxB,OAAO,EAAE,WAAW,EACpB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,UAAU,CAAC;IAItB;;;;;;;;;;OAUG;cACa,SAAS,CACvB,OAAO,EAAE,WAAW,EACpB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,UAAU,CAAC;IAItB;;;;;;;;;;OAUG;cACa,WAAW,CACzB,OAAO,EAAE,WAAW,EACpB,KAAK,EAAE,UAAU,GAAG,SAAS,EAC7B,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,UAAU,CAAC;IAOtB;;;;;;;;;;OAUG;cACa,UAAU,CACxB,OAAO,EAAE,WAAW,EACpB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,UAAU,CAAC;IAItB;;;;;;;;;;OAUG;cACa,cAAc,CAC5B,OAAO,EAAE,WAAW,EACpB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,UAAU,CAAC;CAGvB"}

package/out/command/app/open-app-view/open-app-view.js

@@ -51,7 +51,14 @@ export class OpenAppViewCommand {
             return openRedirectView(fullViewModel, context, params, opts);
         }
         const { openMode = 'INDEXVIEWTAB' } = appView;
-        switch (opts.openMode || openMode) {
+        const viewOpenMode = opts.openMode || openMode;
+        if (viewOpenMode !== undefined && viewOpenMode !== 'INDEXVIEWTAB') {
+            // 除了走路由的，其他情况toRouteDepth转为undefined，避免影响后续操作
+            if (context.toRouteDepth) {
+                context.toRouteDepth = undefined;
+            }
+        }
+        switch (viewOpenMode) {
             case 'INDEXVIEWTAB':
                 if (opts.noWaitRoute) {
                     this.openIndexViewTab(appView, context, params);

package/out/controller/common/editor/editor.controller.d.ts

@@ -70,6 +70,22 @@ export declare class EditorController<T extends IEditor = IEditor> implements IE
      * @readonly
      */
     get readonly(): boolean;
+    /**
+     * 值格式化
+     * @author lxm
+     * @date 2024-01-11 10:18:33
+     * @readonly
+     * @type {(string | undefined)}
+     */
+    get valueFormat(): string | undefined;
+    /**
+     * 数据类型
+     * @author lxm
+     * @date 2024-01-11 10:18:55
+     * @readonly
+     * @type {(number  | undefined)}
+     */
+    get dataType(): number | undefined;
     /**
      * Creates an instance of EditorController.
      * @author lxm
@@ -115,5 +131,13 @@ export declare class EditorController<T extends IEditor = IEditor> implements IE
      * @return {*}  {boolean}
      */
     toBoolean(value: string): boolean;
+    /**
+     * 值格式化
+     * @author lxm
+     * @date 2023-08-25 05:18:11
+     * @param {unknown} value
+     * @return {*}  {string}
+     */
+    formatValue(value?: unknown): string;
 }
 //# sourceMappingURL=editor.controller.d.ts.map

package/out/controller/common/editor/editor.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"editor.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/common/editor/editor.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAA2B,MAAM,kBAAkB,CAAC;AAEpE,OAAO,EACL,0BAA0B,EAC1B,iBAAiB,EAClB,MAAM,+BAA+B,CAAC;AAEvC;;;;;;;GAOG;AACH,qBAAa,gBAAgB,CAAC,CAAC,SAAS,OAAO,GAAG,OAAO,CACvD,YAAW,iBAAiB;IAE5B;;;;;;OAMG;IACH,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;IAElB;;;;;;OAMG;IACH,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAM;IAE3B;;;;;;OAMG;IACH,QAAQ,CAAC,OAAO,EAAG,QAAQ,CAAC;IAE5B;;;;;;OAMG;IACH,QAAQ,CAAC,MAAM,EAAG,OAAO,CAAC;IAE1B;;;;;OAKG;IACH,QAAQ,CAAC,MAAM,EAAE,0BAA0B,CAAC;IAE5C;;;;;OAKG;IACI,WAAW,SAAM;IAExB;;;;;OAKG;IACI,YAAY,EAAE,KAAK,CAAM;IAEhC;;;;;;OAMG;IACH,IAAI,QAAQ,IAAI,OAAO,CAEtB;IAED;;;;;OAKG;gBACS,KAAK,EAAE,CAAC,EAAE,MAAM,EAAE,0BAA0B;IAOxD;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;cAIX,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IA4BvC;;;;;;OAMG;IACI,kBAAkB,CACvB,IAAI,EAAE,KAAK,EACX,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd;QAAE,OAAO,EAAE,QAAQ,CAAC;QAAC,MAAM,EAAE,OAAO,CAAA;KAAE;IAgBzC;;;;;;;OAOG;IACH,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,KAAK,GAAG,KAAK,EAAE,GAAG,SAAS;IASjD;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO;CAGlC"}
+{"version":3,"file":"editor.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/common/editor/editor.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAA2B,MAAM,kBAAkB,CAAC;AAIpE,OAAO,EACL,0BAA0B,EAC1B,iBAAiB,EAClB,MAAM,+BAA+B,CAAC;AAGvC;;;;;;;GAOG;AACH,qBAAa,gBAAgB,CAAC,CAAC,SAAS,OAAO,GAAG,OAAO,CACvD,YAAW,iBAAiB;IAE5B;;;;;;OAMG;IACH,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;IAElB;;;;;;OAMG;IACH,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAM;IAE3B;;;;;;OAMG;IACH,QAAQ,CAAC,OAAO,EAAG,QAAQ,CAAC;IAE5B;;;;;;OAMG;IACH,QAAQ,CAAC,MAAM,EAAG,OAAO,CAAC;IAE1B;;;;;OAKG;IACH,QAAQ,CAAC,MAAM,EAAE,0BAA0B,CAAC;IAE5C;;;;;OAKG;IACI,WAAW,SAAM;IAExB;;;;;OAKG;IACI,YAAY,EAAE,KAAK,CAAM;IAEhC;;;;;;OAMG;IACH,IAAI,QAAQ,IAAI,OAAO,CAEtB;IAED;;;;;;OAMG;IACH,IAAI,WAAW,IAAI,MAAM,GAAG,SAAS,CAEpC;IAED;;;;;;OAMG;IACH,IAAI,QAAQ,IAAI,MAAM,GAAG,SAAS,CAEjC;IAED;;;;;OAKG;gBACS,KAAK,EAAE,CAAC,EAAE,MAAM,EAAE,0BAA0B;IAOxD;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;cAIX,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IA4BvC;;;;;;OAMG;IACI,kBAAkB,CACvB,IAAI,EAAE,KAAK,EACX,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd;QAAE,OAAO,EAAE,QAAQ,CAAC;QAAC,MAAM,EAAE,OAAO,CAAA;KAAE;IAgBzC;;;;;;;OAOG;IACH,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,KAAK,GAAG,KAAK,EAAE,GAAG,SAAS;IASjD;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO;IAIjC;;;;;;OAMG;IACH,WAAW,CAAC,KAAK,GAAE,OAAY,GAAG,MAAM;CAqBzC"}

package/out/controller/common/editor/editor.controller.js

@@ -1,4 +1,7 @@
+import { DataTypes } from '@ibiz-template/core';
+import dayjs from 'dayjs';
 import { convertNavData } from '../../../utils';
+import { ValueExUtil } from '../../utils';
 /**
  * 编辑器控制器基类
  *
@@ -18,6 +21,26 @@ export class EditorController {
     get readonly() {
         return !!this.model.readOnly;
     }
+    /**
+     * 值格式化
+     * @author lxm
+     * @date 2024-01-11 10:18:33
+     * @readonly
+     * @type {(string | undefined)}
+     */
+    get valueFormat() {
+        return this.parent.valueFormat;
+    }
+    /**
+     * 数据类型
+     * @author lxm
+     * @date 2024-01-11 10:18:55
+     * @readonly
+     * @type {(number  | undefined)}
+     */
+    get dataType() {
+        return this.parent.dataType;
+    }
     /**
      * Creates an instance of EditorController.
      * @author lxm
@@ -139,4 +162,31 @@ export class EditorController {
     toBoolean(value) {
         return Object.is('true', value);
     }
+    /**
+     * 值格式化
+     * @author lxm
+     * @date 2023-08-25 05:18:11
+     * @param {unknown} value
+     * @return {*}  {string}
+     */
+    formatValue(value = '') {
+        // 根据数据类型增强转换显示文本
+        if (this.model.valueType !== 'SIMPLE') {
+            return ValueExUtil.toText(this.model, value);
+        }
+        // 根据格式化配置格式化显示
+        const strVal = `${value}`;
+        if (!this.valueFormat) {
+            return strVal;
+        }
+        const isDate = DataTypes.isDate(this.dataType);
+        if (isDate) {
+            const formatVal = dayjs(strVal).format(this.valueFormat);
+            if (formatVal !== 'Invalid Date') {
+                return formatVal;
+            }
+            return strVal;
+        }
+        return ibiz.util.text.format(strVal, this.valueFormat);
+    }
 }

package/out/controller/common/view/view.controller.d.ts.map

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

package/out/controller/common/view/view.controller.js

@@ -231,6 +231,7 @@ export class ViewController extends BaseController {
         (_a = this.scheduler) === null || _a === void 0 ? void 0 : _a.startTimerTrigger();
     }
     async onDestroyed() {
+        const srfSessionId = this.context.srfsessionid;
         await super.onDestroyed();
         // 执行视图引擎的doDestroyed
         if (this.engines.length) {
@@ -242,8 +243,8 @@ export class ViewController extends BaseController {
             this.scheduler.destroy();
         }
         // 销毁界面域，谁创建谁销毁
-        if (this.id === this.context.srfsessionid) {
-            ibiz.uiDomainManager.destroy(this.context.srfsessionid);
+        if (this.id === srfSessionId) {
+            ibiz.uiDomainManager.destroy(srfSessionId);
         }
         this.context.destroy();
         ibiz.log.debug(`视图[${this.model.name}](${this.model.id})销毁`);

package/out/controller/constant/control/index.d.ts

@@ -1,4 +1,5 @@
 export * from './form/form-notify.state';
 export * from './grid/grid-notify.state';
 export * from './panel/panel-notify.state';
+export * from './tree-grid-ex/tree-grid-ex-notify.state';
 //# sourceMappingURL=index.d.ts.map

package/out/controller/constant/control/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/controller/constant/control/index.ts"],"names":[],"mappings":"AAAA,cAAc,0BAA0B,CAAC;AACzC,cAAc,0BAA0B,CAAC;AACzC,cAAc,4BAA4B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/controller/constant/control/index.ts"],"names":[],"mappings":"AAAA,cAAc,0BAA0B,CAAC;AACzC,cAAc,0BAA0B,CAAC;AACzC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,0CAA0C,CAAC"}

package/out/controller/constant/control/index.js

@@ -1,3 +1,4 @@
 export * from './form/form-notify.state';
 export * from './grid/grid-notify.state';
 export * from './panel/panel-notify.state';
+export * from './tree-grid-ex/tree-grid-ex-notify.state';

package/out/controller/constant/control/tree-grid-ex/tree-grid-ex-notify.state.d.ts

@@ -0,0 +1,5 @@
+export declare enum TreeGridExNotifyState {
+    LOAD = "LOAD",
+    SAVE = "SAVE"
+}
+//# sourceMappingURL=tree-grid-ex-notify.state.d.ts.map

package/out/controller/constant/control/tree-grid-ex/tree-grid-ex-notify.state.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tree-grid-ex-notify.state.d.ts","sourceRoot":"","sources":["../../../../../src/controller/constant/control/tree-grid-ex/tree-grid-ex-notify.state.ts"],"names":[],"mappings":"AACA,oBAAY,qBAAqB;IAC/B,IAAI,SAAS;IACb,IAAI,SAAS;CACd"}

package/out/controller/constant/control/tree-grid-ex/tree-grid-ex-notify.state.js

@@ -0,0 +1,6 @@
+/* eslint-disable no-shadow */
+export var TreeGridExNotifyState;
+(function (TreeGridExNotifyState) {
+    TreeGridExNotifyState["LOAD"] = "LOAD";
+    TreeGridExNotifyState["SAVE"] = "SAVE";
+})(TreeGridExNotifyState || (TreeGridExNotifyState = {}));

package/out/controller/control/chart/chart.controller.js

@@ -63,7 +63,7 @@ export class ChartController extends MDControlController {
         if (!this.options) {
             throw new RuntimeError('options还没计算');
         }
-        this.chart.setOption(this.options);
+        this.chart.setOption(this.options, { notMerge: true });
         this.resizeChart();
     }
     /**

package/out/controller/control/form/form/form.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"form.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/form/form/form.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACzE,OAAO,EACL,UAAU,EACV,UAAU,EACV,eAAe,EACf,qBAAqB,EACrB,mBAAmB,EACpB,MAAM,uBAAuB,CAAC;AAK/B,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,eAAe,EAAiB,MAAM,gBAAgB,CAAC;AAChE,OAAO,KAAK,EACV,wBAAwB,EACxB,kBAAkB,EAClB,oBAAoB,EACrB,MAAM,gBAAgB,CAAC;AAExB;;;;;;;;;GASG;AACH,8BAAsB,cAAc,CAChC,CAAC,SAAS,OAAO,GAAG,OAAO,EAC3B,CAAC,SAAS,UAAU,GAAG,UAAU,EACjC,CAAC,SAAS,UAAU,GAAG,UAAU,CAEnC,SAAQ,iBAAiB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CACjC,YAAW,eAAe,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAEnC,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,UAAU,CAAC,CAEhD;IAED;;;;;;OAMG;IACH,OAAO,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,qBAAqB,CAAA;KAAE,CAAM;IAEvD;;;;;;OAMG;IACH,SAAS,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,mBAAmB,CAAA;KAAE,CAAM;IAEvD;;;;;;OAMG;IACH,SAAS,EAAE,kBAAkB,EAAE,CAAM;IAErC;;;;;;OAMG;IACH,WAAW,EAAE,oBAAoB,EAAE,CAAM;IAEzC;;;;;;;OAOG;IACH,IAAI,IAAI,IAAI,KAAK,CAEhB;IAED,SAAS,CAAC,SAAS,IAAI,IAAI;IAQ3B;;;;;;OAMG;IACG,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAStD;;;;;OAKG;IACH,eAAe,CAAC,KAAK,EAAE,eAAe,GAAG,IAAI;IAM7C;;;;;;;OAOG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAuB1C;;;;;;OAMG;cACa,qBAAqB,CACnC,OAAO,GAAE,aAAa,EAA4B,EAClD,IAAI,GAAE,cAAqB,EAC3B,MAAM,GAAE,wBAAwB,GAAG,SAAqB,GACvD,OAAO,CAAC,IAAI,CAAC;IAwChB;;;;;;OAMG;IACH,QAAQ,CAAC,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC;IAE/B;;;;;;OAMG;IACH,OAAO,IAAI,KAAK,EAAE;IAIlB;;;;;;;OAOG;IACG,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAwBzD,cAAc,CAAC,iBAAiB,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAI9D;;;;;;OAMG;IACG,QAAQ,IAAI,OAAO,CAAC,OAAO,CAAC;IAWlC,kBAAkB,CAChB,GAAG,EAAE,MAAM,EACX,IAAI,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,KAAK,CAAA;KAAE,GACzC,IAAI;IAIP;;;;;;OAMG;IACH,SAAS,CAAC,oBAAoB,CAAC,MAAM,GAAE,aAAa,EAAO,GAAG,IAAI;CAgBnE"}
+{"version":3,"file":"form.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/form/form/form.controller.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACzE,OAAO,EACL,UAAU,EACV,UAAU,EACV,eAAe,EACf,qBAAqB,EACrB,mBAAmB,EACpB,MAAM,uBAAuB,CAAC;AAK/B,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,eAAe,EAAiB,MAAM,gBAAgB,CAAC;AAChE,OAAO,KAAK,EACV,wBAAwB,EACxB,kBAAkB,EAClB,oBAAoB,EACrB,MAAM,gBAAgB,CAAC;AAExB;;;;;;;;;GASG;AACH,8BAAsB,cAAc,CAChC,CAAC,SAAS,OAAO,GAAG,OAAO,EAC3B,CAAC,SAAS,UAAU,GAAG,UAAU,EACjC,CAAC,SAAS,UAAU,GAAG,UAAU,CAEnC,SAAQ,iBAAiB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CACjC,YAAW,eAAe,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAEnC,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,UAAU,CAAC,CAEhD;IAED;;;;;;OAMG;IACH,OAAO,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,qBAAqB,CAAA;KAAE,CAAM;IAEvD;;;;;;OAMG;IACH,SAAS,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,mBAAmB,CAAA;KAAE,CAAM;IAEvD;;;;;;OAMG;IACH,SAAS,EAAE,kBAAkB,EAAE,CAAM;IAErC;;;;;;OAMG;IACH,WAAW,EAAE,oBAAoB,EAAE,CAAM;IAEzC;;;;;;;OAOG;IACH,IAAI,IAAI,IAAI,KAAK,CAEhB;IAED,SAAS,CAAC,SAAS,IAAI,IAAI;IAQ3B;;;;;;OAMG;IACG,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAStD;;;;;OAKG;IACH,eAAe,CAAC,KAAK,EAAE,eAAe,GAAG,IAAI;IAM7C;;;;;;;OAOG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAuB1C;;;;;;OAMG;cACa,qBAAqB,CACnC,OAAO,GAAE,aAAa,EAA4B,EAClD,IAAI,GAAE,cAAqB,EAC3B,MAAM,GAAE,wBAAwB,GAAG,SAAqB,GACvD,OAAO,CAAC,IAAI,CAAC;IA8ChB;;;;;;OAMG;IACH,QAAQ,CAAC,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC;IAE/B;;;;;;OAMG;IACH,OAAO,IAAI,KAAK,EAAE;IAIlB;;;;;;;OAOG;IACG,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAwBzD,cAAc,CAAC,iBAAiB,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAI9D;;;;;;OAMG;IACG,QAAQ,IAAI,OAAO,CAAC,OAAO,CAAC;IAWlC,kBAAkB,CAChB,GAAG,EAAE,MAAM,EACX,IAAI,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,KAAK,CAAA;KAAE,GACzC,IAAI;IAIP;;;;;;OAMG;IACH,SAAS,CAAC,oBAAoB,CAAC,MAAM,GAAE,aAAa,EAAO,GAAG,IAAI;CAgBnE"}

package/out/controller/control/form/form/form.controller.js

@@ -1,5 +1,5 @@
 /* eslint-disable no-param-reassign */
-import { debounceAndAsyncMerge, recursiveIterate } from '@ibiz-template/core';
+import { RuntimeModelError, debounceAndAsyncMerge, recursiveIterate, } from '@ibiz-template/core';
 import { findChildFormDetails, isFormDataContainer } from '../../../../model';
 import { getFormDetailProvider } from '../../../../register';
 import { ControlVO } from '../../../../service';
@@ -132,6 +132,9 @@ export class FormController extends ControlController {
             if (!detailProvider) {
                 return;
             }
+            if (form.details[detail.id]) {
+                throw new RuntimeModelError(detail, `初始化异常: 表单成员[${detail.id}](${detail.detailType})已存在，表单项标识重复请检查配置`);
+            }
             form.providers[detail.id] = detailProvider;
             const detailController = await detailProvider.createController(detail, form, parent);
             form.details[detail.id] = detailController;

package/out/controller/control/form/form-detail/form-detail/form-detail.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"form-detail.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/form/form-detail/form-detail/form-detail.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EACL,qBAAqB,EACrB,8BAA8B,EAE/B,MAAM,0BAA0B,CAAC;AAGlC,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAE5C,qBAAa,oBAAoB,CAAC,CAAC,SAAS,aAAa,GAAG,aAAa,CACvE,YAAW,qBAAqB;IAEhC;;;;;;OAMG;IACH,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;IAElB;;;;;;OAMG;IACH,KAAK,EAAE,eAAe,CAAC;IAEvB;;;;;;OAMG;IACH,QAAQ,CAAC,IAAI,EAAE,cAAc,CAAC;IAE9B;;;;;;OAMG;IACH,QAAQ,CAAC,MAAM,CAAC,EAAE,8BAA8B,CAAC;IAEjD;;;;;;OAMG;IACH,IAAI,IAAI,IAAI,KAAK,CAEhB;IAED;;;;;;;OAOG;IACH,IAAI,OAAO,IAAI,QAAQ,CAEtB;IAED;;;;;;OAMG;IACH,IAAI,MAAM,IAAI,OAAO,CAEpB;IAED;;;;;;OAMG;IACH,IAAI,cAAc,IAAI,MAAM,EAAE,CAE7B;IAED;;;;;;OAMG;IACH,IAAI,UAAU,IAAI,MAAM,EAAE,CAEzB;IAED;;;;;OAKG;IACH,SAAS,CAAC,eAAe,EAAE;QACzB,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;QACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;KACpB,CAIC;IAEF;;;;;OAKG;gBAED,KAAK,EAAE,CAAC,EACR,IAAI,EAAE,cAAc,EACpB,MAAM,CAAC,EAAE,8BAA8B;IAQzC;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;cAIX,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IA8BvC;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,IAAI,eAAe;IAIxC;;;;;;OAMG;IACG,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAatD;;;;;OAKG;IACG,eAAe,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAa7D;;;;;;;;;OASG;IACH,SAAS,CAAC,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,QAAQ,GAAE,OAAe,GAAG,IAAI;IAmC5E;;;;;;OAMG;IACH,KAAK,CAAC,SAAS,CAAC,EAAE,MAAM,IAAI,GAAG,IAAI;IAKnC;;;;;OAKG;IACH,SAAS,CAAC,aAAa,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAW1C;;;;OAIG;IACH,kBAAkB,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAmBrC;;;;OAIG;IACH,iBAAiB,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAsBpC;;;;OAIG;IACH,kBAAkB,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAsBrC;;;;OAIG;IACG,OAAO,CAAC,KAAK,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;CAOjD"}
+{"version":3,"file":"form-detail.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/form/form-detail/form-detail/form-detail.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EACL,qBAAqB,EACrB,8BAA8B,EAE/B,MAAM,0BAA0B,CAAC;AAGlC,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAE5C,qBAAa,oBAAoB,CAAC,CAAC,SAAS,aAAa,GAAG,aAAa,CACvE,YAAW,qBAAqB;IAEhC;;;;;;OAMG;IACH,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;IAElB;;;;;;OAMG;IACH,KAAK,EAAE,eAAe,CAAC;IAEvB;;;;;;OAMG;IACH,QAAQ,CAAC,IAAI,EAAE,cAAc,CAAC;IAE9B;;;;;;OAMG;IACH,QAAQ,CAAC,MAAM,CAAC,EAAE,8BAA8B,CAAC;IAEjD;;;;;;OAMG;IACH,IAAI,IAAI,IAAI,KAAK,CAEhB;IAED;;;;;;;OAOG;IACH,IAAI,OAAO,IAAI,QAAQ,CAEtB;IAED;;;;;;OAMG;IACH,IAAI,MAAM,IAAI,OAAO,CAEpB;IAED;;;;;;OAMG;IACH,IAAI,cAAc,IAAI,MAAM,EAAE,CAE7B;IAED;;;;;;OAMG;IACH,IAAI,UAAU,IAAI,MAAM,EAAE,CAEzB;IAED;;;;;OAKG;IACH,SAAS,CAAC,eAAe,EAAE;QACzB,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;QACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;KACpB,CAIC;IAEF;;;;;OAKG;gBAED,KAAK,EAAE,CAAC,EACR,IAAI,EAAE,cAAc,EACpB,MAAM,CAAC,EAAE,8BAA8B;IAQzC;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;cAIX,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IA8BvC;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,IAAI,eAAe;IAIxC;;;;;;OAMG;IACG,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAatD;;;;;OAKG;IACG,eAAe,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAa7D;;;;;;;;;OASG;IACH,SAAS,CAAC,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,QAAQ,GAAE,OAAe,GAAG,IAAI;IAmC5E;;;;;;OAMG;IACH,KAAK,CAAC,SAAS,CAAC,EAAE,MAAM,IAAI,GAAG,IAAI;IAKnC;;;;;OAKG;IACH,SAAS,CAAC,aAAa,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAW1C;;;;OAIG;IACH,kBAAkB,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAmBrC;;;;OAIG;IACH,iBAAiB,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAsBpC;;;;OAIG;IACH,kBAAkB,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAsBrC;;;;OAIG;IACG,OAAO,CAAC,KAAK,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;CAWjD"}

package/out/controller/control/form/form-detail/form-detail/form-detail.controller.js

@@ -295,6 +295,10 @@ export class FormDetailController {
      * @date 2023-10-11 05:03:26
      */
     async onClick(event) {
+        if (event) {
+            // 阻止冒泡
+            event.stopPropagation();
+        }
         this.form.evt.emit('onFormDetailEvent', {
             formDetailName: this.model.id,
             formDetailEventName: FormDetailEventName.CLICK,

package/out/controller/control/form/form-detail/form-tab-page/form-tab-page.controller.d.ts

@@ -14,5 +14,13 @@ import { FormTabPageState } from './form-tab-page.state';
 export declare class FormTabPageController extends FormDetailController<IDEFormTabPage> implements IFormDetailContainerController {
     state: FormTabPageState;
     protected createState(): FormTabPageState;
+    /**
+     * 是否激活的分页
+     * @author lxm
+     * @date 2024-01-17 03:16:24
+     * @readonly
+     * @type {boolean}
+     */
+    get isActive(): boolean;
 }
 //# sourceMappingURL=form-tab-page.controller.d.ts.map

package/out/controller/control/form/form-detail/form-tab-page/form-tab-page.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"form-tab-page.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/form/form-detail/form-tab-page/form-tab-page.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,8BAA8B,EAAE,MAAM,0BAA0B,CAAC;AAC1E,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAEzD;;;;;;;;GAQG;AACH,qBAAa,qBACX,SAAQ,oBAAoB,CAAC,cAAc,CAC3C,YAAW,8BAA8B;IAEjC,KAAK,EAAE,gBAAgB,CAAC;IAEhC,SAAS,CAAC,WAAW,IAAI,gBAAgB;CAG1C"}
+{"version":3,"file":"form-tab-page.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/form/form-detail/form-tab-page/form-tab-page.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,8BAA8B,EAAE,MAAM,0BAA0B,CAAC;AAC1E,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAGzD;;;;;;;;GAQG;AACH,qBAAa,qBACX,SAAQ,oBAAoB,CAAC,cAAc,CAC3C,YAAW,8BAA8B;IAEjC,KAAK,EAAE,gBAAgB,CAAC;IAEhC,SAAS,CAAC,WAAW,IAAI,gBAAgB;IAIzC;;;;;;OAMG;IACH,IAAI,QAAQ,IAAI,OAAO,CAItB;CACF"}

package/out/controller/control/form/form-detail/form-tab-page/form-tab-page.controller.js

@@ -14,4 +14,14 @@ export class FormTabPageController extends FormDetailController {
         var _a;
         return new FormTabPageState((_a = this.parent) === null || _a === void 0 ? void 0 : _a.state);
     }
+    /**
+     * 是否激活的分页
+     * @author lxm
+     * @date 2024-01-17 03:16:24
+     * @readonly
+     * @type {boolean}
+     */
+    get isActive() {
+        return (this.parent.state.activeTab === this.model.id);
+    }
 }

package/out/controller/control/form/form-detail/form-tab-panel/form-tab-panel.controller.d.ts

@@ -14,5 +14,13 @@ import { FormTabPanelState } from './form-tab-panel.state';
 export declare class FormTabPanelController extends FormDetailController<IDEFormTabPanel> implements IFormDetailContainerController {
     state: FormTabPanelState;
     protected createState(): FormTabPanelState;
+    protected onInit(): Promise<void>;
+    /**
+     * 分页点击切换处理
+     * @author lxm
+     * @date 2024-01-17 02:59:38
+     * @param {string} tabId
+     */
+    onTabChange(tabId: string): void;
 }
 //# sourceMappingURL=form-tab-panel.controller.d.ts.map

package/out/controller/control/form/form-detail/form-tab-panel/form-tab-panel.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"form-tab-panel.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/form/form-detail/form-tab-panel/form-tab-panel.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,8BAA8B,EAAE,MAAM,0BAA0B,CAAC;AAC1E,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AACtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAE3D;;;;;;;;GAQG;AACH,qBAAa,sBACX,SAAQ,oBAAoB,CAAC,eAAe,CAC5C,YAAW,8BAA8B;IAEjC,KAAK,EAAE,iBAAiB,CAAC;IAEjC,SAAS,CAAC,WAAW,IAAI,iBAAiB;CAG3C"}
+{"version":3,"file":"form-tab-panel.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/form/form-detail/form-tab-panel/form-tab-panel.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,8BAA8B,EAAE,MAAM,0BAA0B,CAAC;AAC1E,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AACtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAE3D;;;;;;;;GAQG;AACH,qBAAa,sBACX,SAAQ,oBAAoB,CAAC,eAAe,CAC5C,YAAW,8BAA8B;IAEjC,KAAK,EAAE,iBAAiB,CAAC;IAEjC,SAAS,CAAC,WAAW,IAAI,iBAAiB;cAI1B,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAMvC;;;;;OAKG;IACH,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;CAGjC"}

package/out/controller/control/form/form-detail/form-tab-panel/form-tab-panel.controller.js

@@ -14,4 +14,19 @@ export class FormTabPanelController extends FormDetailController {
         var _a;
         return new FormTabPanelState((_a = this.parent) === null || _a === void 0 ? void 0 : _a.state);
     }
+    async onInit() {
+        var _a;
+        await super.onInit();
+        // 初始化默认的激活分页
+        this.state.activeTab = ((_a = this.model.deformTabPages) === null || _a === void 0 ? void 0 : _a[0].id) || '';
+    }
+    /**
+     * 分页点击切换处理
+     * @author lxm
+     * @date 2024-01-17 02:59:38
+     * @param {string} tabId
+     */
+    onTabChange(tabId) {
+        this.state.activeTab = tabId;
+    }
 }

package/out/controller/control/form/form-detail/form-tab-panel/form-tab-panel.state.d.ts

@@ -6,5 +6,12 @@ import { FormDetailState } from '../form-detail';
  * @Date: 2023-01-04 10:26:34
  */
 export declare class FormTabPanelState extends FormDetailState {
+    /**
+     * 当前激活的分页
+     * @author lxm
+     * @date 2024-01-17 02:05:58
+     * @type {string}
+     */
+    activeTab: string;
 }
 //# sourceMappingURL=form-tab-panel.state.d.ts.map

package/out/controller/control/form/form-detail/form-tab-panel/form-tab-panel.state.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"form-tab-panel.state.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/form/form-detail/form-tab-panel/form-tab-panel.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAEjD;;;;;GAKG;AACH,qBAAa,iBAAkB,SAAQ,eAAe;CAAG"}
+{"version":3,"file":"form-tab-panel.state.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/form/form-detail/form-tab-panel/form-tab-panel.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAEjD;;;;;GAKG;AACH,qBAAa,iBAAkB,SAAQ,eAAe;IACpD;;;;;OAKG;IACH,SAAS,EAAE,MAAM,CAAM;CACxB"}

package/out/controller/control/form/form-detail/form-tab-panel/form-tab-panel.state.js

@@ -6,4 +6,14 @@ import { FormDetailState } from '../form-detail';
  * @Date: 2023-01-04 10:26:34
  */
 export class FormTabPanelState extends FormDetailState {
+    constructor() {
+        super(...arguments);
+        /**
+         * 当前激活的分页
+         * @author lxm
+         * @date 2024-01-17 02:05:58
+         * @type {string}
+         */
+        this.activeTab = '';
+    }
 }

package/out/controller/control/grid/grid/grid.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"grid.service.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/grid/grid/grid.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAqB,MAAM,qBAAqB,CAAC;AACvE,OAAO,EAAE,OAAO,EAAsB,MAAM,kBAAkB,CAAC;AAC/D,OAAO,EAAE,gBAAgB,EAAc,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAE9E;;;;;;;GAOG;AACH,qBAAa,WAAY,SAAQ,gBAAgB,CAAC,OAAO,CAAC;IACxD;;;;;OAKG;IACH,aAAa,IAAI,IAAI;IA8CrB;;;;;;;;;OASG;IACG,kBAAkB,CACtB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;CASrC"}
+{"version":3,"file":"grid.service.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/grid/grid/grid.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAqB,MAAM,qBAAqB,CAAC;AACvE,OAAO,EAAE,OAAO,EAAsB,MAAM,kBAAkB,CAAC;AAC/D,OAAO,EAAE,gBAAgB,EAAc,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAE9E;;;;;;;GAOG;AACH,qBAAa,WAAY,SAAQ,gBAAgB,CAAC,OAAO,CAAC;IACxD;;;;;OAKG;IACH,aAAa,IAAI,IAAI;IAoCrB;;;;;;;;;OASG;IACG,kBAAkB,CACtB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;CASrC"}

package/out/controller/control/grid/grid/grid.service.js

@@ -20,7 +20,7 @@ export class GridService extends MDControlService {
         super.initUIDataMap();
         if (this.model.degridColumns) {
             const dataItems = this.model.degridDataItems || [];
-            // *初始化表格数据项的属性映射
+            // *初始化表格属性列和实体数据的属性映射
             (_a = this.model.degridColumns) === null || _a === void 0 ? void 0 : _a.forEach((column) => {
                 const uiKey = column.id.toLowerCase();
                 // 列映射应用实体属性
@@ -47,15 +47,6 @@ export class GridService extends MDControlService {
                 this.dataUIMap.set(uiKey, mapField);
             });
         }
-        //* 如果属性列和表格数据列名称不一致，补充不一致的属性列的名称映射
-        // this.model.fieldColumns.forEach(fieldColumn => {
-        //   if (fieldColumn.source.dataItemName !== fieldColumn.codeName) {
-        //     const value = this.dataUIMap.get(fieldColumn.source.dataItemName);
-        //     if (value) {
-        //       this.dataUIMap.set(fieldColumn.codeName, value);
-        //     }
-        //   }
-        // });
     }
     /**
      * 编辑列更新

package/out/controller/control/grid/grid-column/grid-field-column/grid-field-column.controller.d.ts

@@ -41,6 +41,13 @@ export declare class GridFieldColumnController extends GridColumnController<IDEG
      * @type {boolean}
      */
     get hasAction(): boolean;
+    /**
+     * 属性列对应值在数据里的属性字段名称
+     * @author lxm
+     * @date 2023-06-25 09:26:04
+     * @readonly
+     */
+    get fieldName(): string;
     protected onInit(): Promise<void>;
     /**
      * 初始化属性列界面行为组按钮状态

package/out/controller/control/grid/grid-column/grid-field-column/grid-field-column.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"grid-field-column.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/grid/grid-column/grid-field-column/grid-field-column.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,YAAY,EACZ,kBAAkB,EAClB,oBAAoB,EACrB,MAAM,kBAAkB,CAAC;AAK1B,OAAO,EAAE,YAAY,EAAc,MAAM,0BAA0B,CAAC;AASpE,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAEzD;;;;;GAKG;AACH,qBAAa,yBAA0B,SAAQ,oBAAoB,CAAC,kBAAkB,CAAC;IACrF;;;;;;OAMG;IACH,aAAa,CAAC,EAAE,SAAS,YAAY,EAAE,CAAC;IAExC;;;;;OAKG;IACH,QAAQ,EAAE,YAAY,GAAG,SAAS,CAAa;IAE/C;;;;;;OAMG;IACH,IAAI,YAAY,IAAI,OAAO,CAE1B;IAED;;;;;;;OAOG;IACH,IAAI,SAAS,IAAI,OAAO,CAEvB;cAEe,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAavC;;;;;;OAMG;IACH,gBAAgB,CAAC,GAAG,EAAE,YAAY,GAAG,IAAI;IAoBzC;;;;;;OAMG;IACH,SAAS,CAAC,GAAG,EAAE,YAAY,GAAG,OAAO;IAKrC;;;;;OAKG;IACI,kBAAkB,CACvB,IAAI,EAAE,KAAK,EACX,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd;QAAE,OAAO,EAAE,QAAQ,CAAC;QAAC,MAAM,EAAE,OAAO,CAAA;KAAE;IAoBzC;;;;;;;;OAQG;IACG,YAAY,CAAC,GAAG,EAAE,YAAY,EAAE,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAuCvE;;;;;;;;OAQG;IACG,aAAa,CAAC,GAAG,EAAE,YAAY,EAAE,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAexE;;;;;;OAMG;IACG,YAAY,IAAI,OAAO,CAAC,QAAQ,CAAC,YAAY,EAAE,CAAC,GAAG,SAAS,CAAC;IAqBnE;;;;;;;OAOG;IACH,YAAY,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,MAAM,GAAG,SAAS;IAqEhD;;;;;;OAMG;IACH,WAAW,CAAC,KAAK,GAAE,OAAY,GAAG,MAAM;IAsBxC;;;;;;;;;;OAUG;IACG,aAAa,CACjB,MAAM,EAAE,oBAAoB,EAC5B,GAAG,EAAE,YAAY,EACjB,KAAK,EAAE,UAAU,GAChB,OAAO,CAAC,IAAI,CAAC;CAcjB"}
+{"version":3,"file":"grid-field-column.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/grid/grid-column/grid-field-column/grid-field-column.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,YAAY,EACZ,kBAAkB,EAClB,oBAAoB,EACrB,MAAM,kBAAkB,CAAC;AAK1B,OAAO,EAAE,YAAY,EAAc,MAAM,0BAA0B,CAAC;AASpE,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAEzD;;;;;GAKG;AACH,qBAAa,yBAA0B,SAAQ,oBAAoB,CAAC,kBAAkB,CAAC;IACrF;;;;;;OAMG;IACH,aAAa,CAAC,EAAE,SAAS,YAAY,EAAE,CAAC;IAExC;;;;;OAKG;IACH,QAAQ,EAAE,YAAY,GAAG,SAAS,CAAa;IAE/C;;;;;;OAMG;IACH,IAAI,YAAY,IAAI,OAAO,CAE1B;IAED;;;;;;;OAOG;IACH,IAAI,SAAS,IAAI,OAAO,CAEvB;IAED;;;;;OAKG;IACH,IAAI,SAAS,IAAI,MAAM,CAEtB;cAEe,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAavC;;;;;;OAMG;IACH,gBAAgB,CAAC,GAAG,EAAE,YAAY,GAAG,IAAI;IAoBzC;;;;;;OAMG;IACH,SAAS,CAAC,GAAG,EAAE,YAAY,GAAG,OAAO;IAKrC;;;;;OAKG;IACI,kBAAkB,CACvB,IAAI,EAAE,KAAK,EACX,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd;QAAE,OAAO,EAAE,QAAQ,CAAC;QAAC,MAAM,EAAE,OAAO,CAAA;KAAE;IAoBzC;;;;;;;;OAQG;IACG,YAAY,CAAC,GAAG,EAAE,YAAY,EAAE,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAuCvE;;;;;;;;OAQG;IACG,aAAa,CAAC,GAAG,EAAE,YAAY,EAAE,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAexE;;;;;;OAMG;IACG,YAAY,IAAI,OAAO,CAAC,QAAQ,CAAC,YAAY,EAAE,CAAC,GAAG,SAAS,CAAC;IAqBnE;;;;;;;OAOG;IACH,YAAY,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,MAAM,GAAG,SAAS;IAqEhD;;;;;;OAMG;IACH,WAAW,CAAC,KAAK,GAAE,OAAY,GAAG,MAAM;IAsBxC;;;;;;;;;;OAUG;IACG,aAAa,CACjB,MAAM,EAAE,oBAAoB,EAC5B,GAAG,EAAE,YAAY,EACjB,KAAK,EAAE,UAAU,GAChB,OAAO,CAAC,IAAI,CAAC;CAcjB"}

package/out/controller/control/grid/grid-column/grid-field-column/grid-field-column.controller.js

@@ -47,6 +47,15 @@ export class GridFieldColumnController extends GridColumnController {
     get hasAction() {
         return !!this.model.deuiactionId;
     }
+    /**
+     * 属性列对应值在数据里的属性字段名称
+     * @author lxm
+     * @date 2023-06-25 09:26:04
+     * @readonly
+     */
+    get fieldName() {
+        return this.model.id.toLowerCase();
+    }
     async onInit() {
         await super.onInit();
         // 加载代码表防抖
@@ -87,7 +96,7 @@ export class GridFieldColumnController extends GridColumnController {
      * @readonly
      */
     clickable(row) {
-        const value = row.data[this.model.codeName];
+        const value = row.data[this.fieldName];
         return (this.isLinkColumn || this.hasAction) && value;
     }
     /**
@@ -125,7 +134,7 @@ export class GridFieldColumnController extends GridColumnController {
      * @returns {*}  {Promise<void>}
      */
     async openLinkView(row, event) {
-        const curValue = row.data[this.model.codeName];
+        const curValue = row.data[this.fieldName];
         if (!curValue) {
             // 当前值不存在，不继续走打开链接视图逻辑
             return;

package/out/controller/control/grid/grid-column/grid-field-edit-column/grid-field-edit-column.controller.d.ts

@@ -75,13 +75,6 @@ export declare class GridFieldEditColumnController extends GridFieldColumnContro
      * @type {(string | undefined)}
      */
     get valueItemName(): string | undefined;
-    /**
-     * 列数据属性字段名称
-     * @author lxm
-     * @date 2023-06-25 09:26:04
-     * @readonly
-     */
-    get fieldName(): string;
     /**
      * 初始化方法，生成表格编辑项控制器
      *

package/out/controller/control/grid/grid-column/grid-field-edit-column/grid-field-edit-column.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"grid-field-edit-column.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/grid/grid-column/grid-field-edit-column/grid-field-edit-column.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EAAoB,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAGrE,OAAO,EACL,0BAA0B,EAC1B,iBAAiB,EACjB,eAAe,EAChB,MAAM,0BAA0B,CAAC;AAKlC,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,yBAAyB,EAAE,MAAM,sBAAsB,CAAC;AAEjE;;;;;GAKG;AACH,qBAAa,6BACX,SAAQ,yBACR,YAAW,0BAA0B;IAErC;;;;;;OAMG;IACH,QAAQ,EAAG,eAAe,CAAC;IAE3B;;;;;;OAMG;IACH,MAAM,EAAG,iBAAiB,CAAC;IAE3B;;;;;;OAMG;IACH,cAAc,CAAC,EAAE,eAAe,CAAC;IAEjC;;;;;;OAMG;IACH,KAAK,EAAE,KAAK,EAAE,CAAM;IAEpB;;;;;;;OAOG;IACH,OAAO,CAAC,SAAS,CAAU;IAE3B;;;;;;OAMG;IACH,IAAI,QAAQ,IAAI,MAAM,GAAG,SAAS,CAEjC;IAED;;;;;;OAMG;IACH,IAAI,WAAW,IAAI,MAAM,GAAG,SAAS,CAEpC;IAED;;;;;;OAMG;IACH,IAAI,aAAa,IAAI,MAAM,GAAG,SAAS,CAKtC;IAED;;;;;OAKG;IACH,IAAI,SAAS,IAAI,MAAM,CAEtB;IAED;;;;;;;OAOG;cACa,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAuBvC;;;;;;;OAOG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAsB1C;;;;;;;;OAQG;IACG,WAAW,CACf,GAAG,EAAE,YAAY,EACjB,KAAK,EAAE,OAAO,EACd,IAAI,CAAC,EAAE,MAAM,GACZ,OAAO,CAAC,IAAI,CAAC;IAKhB;;;;;;;OAOG;IACG,gBAAgB,CAAC,GAAG,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAoDzE;;;;;OAKG;IACH,eAAe,CAAC,GAAG,EAAE,YAAY,EAAE,MAAM,EAAE,eAAe,GAAG,IAAI;IAMjE;;;;;OAKG;IACH,kBAAkB,CAAC,GAAG,EAAE,YAAY,GAAG,IAAI;IAiB3C;;;;;OAKG;IACH,kBAAkB,CAAC,GAAG,EAAE,YAAY,GAAG,IAAI;IAe3C;;;;;OAKG;IACH,kBAAkB,CAAC,GAAG,EAAE,YAAY,GAAG,IAAI;IAM3C;;;;;;;OAOG;IACH,cAAc,CAAC,GAAG,EAAE,YAAY,GAAG,OAAO;IAe1C;;;;;;OAMG;IACG,QAAQ,CAAC,GAAG,EAAE,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC;CAwBpD"}
+{"version":3,"file":"grid-field-edit-column.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/grid/grid-column/grid-field-edit-column/grid-field-edit-column.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EAAoB,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAGrE,OAAO,EACL,0BAA0B,EAC1B,iBAAiB,EACjB,eAAe,EAChB,MAAM,0BAA0B,CAAC;AAKlC,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,yBAAyB,EAAE,MAAM,sBAAsB,CAAC;AAEjE;;;;;GAKG;AACH,qBAAa,6BACX,SAAQ,yBACR,YAAW,0BAA0B;IAErC;;;;;;OAMG;IACH,QAAQ,EAAG,eAAe,CAAC;IAE3B;;;;;;OAMG;IACH,MAAM,EAAG,iBAAiB,CAAC;IAE3B;;;;;;OAMG;IACH,cAAc,CAAC,EAAE,eAAe,CAAC;IAEjC;;;;;;OAMG;IACH,KAAK,EAAE,KAAK,EAAE,CAAM;IAEpB;;;;;;;OAOG;IACH,OAAO,CAAC,SAAS,CAAU;IAE3B;;;;;;OAMG;IACH,IAAI,QAAQ,IAAI,MAAM,GAAG,SAAS,CAEjC;IAED;;;;;;OAMG;IACH,IAAI,WAAW,IAAI,MAAM,GAAG,SAAS,CAEpC;IAED;;;;;;OAMG;IACH,IAAI,aAAa,IAAI,MAAM,GAAG,SAAS,CAKtC;IAED;;;;;;;OAOG;cACa,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAuBvC;;;;;;;OAOG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAsB1C;;;;;;;;OAQG;IACG,WAAW,CACf,GAAG,EAAE,YAAY,EACjB,KAAK,EAAE,OAAO,EACd,IAAI,CAAC,EAAE,MAAM,GACZ,OAAO,CAAC,IAAI,CAAC;IAKhB;;;;;;;OAOG;IACG,gBAAgB,CAAC,GAAG,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAoDzE;;;;;OAKG;IACH,eAAe,CAAC,GAAG,EAAE,YAAY,EAAE,MAAM,EAAE,eAAe,GAAG,IAAI;IAMjE;;;;;OAKG;IACH,kBAAkB,CAAC,GAAG,EAAE,YAAY,GAAG,IAAI;IAiB3C;;;;;OAKG;IACH,kBAAkB,CAAC,GAAG,EAAE,YAAY,GAAG,IAAI;IAe3C;;;;;OAKG;IACH,kBAAkB,CAAC,GAAG,EAAE,YAAY,GAAG,IAAI;IAM3C;;;;;;;OAOG;IACH,cAAc,CAAC,GAAG,EAAE,YAAY,GAAG,OAAO;IAe1C;;;;;;OAMG;IACG,QAAQ,CAAC,GAAG,EAAE,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC;CAwBpD"}

package/out/controller/control/grid/grid-column/grid-field-edit-column/grid-field-edit-column.controller.js

@@ -59,15 +59,6 @@ export class GridFieldEditColumnController extends GridFieldColumnController {
         }
         return undefined;
     }
-    /**
-     * 列数据属性字段名称
-     * @author lxm
-     * @date 2023-06-25 09:26:04
-     * @readonly
-     */
-    get fieldName() {
-        return this.model.dataItemName;
-    }
     /**
      * 初始化方法，生成表格编辑项控制器
      *