@ibiz-template/runtime 0.7.41-alpha.13 → 0.7.41-alpha.130

package/out/controller/common/control/md-control.controller.js

@@ -1,6 +1,8 @@
 /* eslint-disable max-classes-per-file */
+/* eslint-disable @typescript-eslint/no-unused-vars */
 import { RuntimeError, isElementSame, RuntimeModelError, } from '@ibiz-template/core';
 import { isNil } from 'ramda';
+import { isArray } from 'lodash-es';
 import { calcDeCodeNameById } from '../../../model';
 import { Srfuf } from '../../../service';
 import { calcNavParams, handleAllSettled } from '../../../utils';
@@ -62,6 +64,46 @@ export class MDControlController extends ControlController {
         }
         return ibiz.config.mdctrlrefreshmode;
     }
+    /**
+     * 批操作工具栏显示模式
+     *
+     * @readonly
+     * @type {('default' | 'multiple')}
+     * @memberof MDControlController
+     */
+    get batchToolbarMode() {
+        if (this.controlParams.batchtoolbarmode) {
+            return this.controlParams.batchtoolbarmode;
+        }
+        return ibiz.config.common.batchToolbarMode;
+    }
+    /**
+     * @description 是否显示批操作工具栏
+     * @readonly
+     * @type {boolean}
+     * @memberof MDControlController
+     */
+    get showBatchToolbar() {
+        switch (this.batchToolbarMode) {
+            case 'multiple':
+                return this.state.selectedData.length >= 2;
+            case 'default':
+            default:
+                return this.state.selectedData.length > 0;
+        }
+    }
+    /**
+     * @description 分页显示模式，default：显示完整分页栏，simple：只显示总条数，上一页，页码栏，下一页
+     * @readonly
+     * @type {('default' | 'simple')}
+     * @memberof MDControlController
+     */
+    get paginationMode() {
+        if (this.controlParams.paginationmode) {
+            return this.controlParams.paginationmode;
+        }
+        return 'default';
+    }
     get _evt() {
         return this.evt;
     }
@@ -87,6 +129,7 @@ export class MDControlController extends ControlController {
         this.state.showRowDetail = navViewPos === 'ROWDETAIL';
         this.state.items = [];
         this.state.selectedData = [];
+        this.state.selectedKeys = [];
         this.state.searchParams = {};
         this.state.noSort = false;
         this.state.sortQuery = '';
@@ -100,6 +143,7 @@ export class MDControlController extends ControlController {
         this.state.groups = [];
         this.state.hideNoDataImage = false;
         this.state.enableGroup = !!this.model.enableGroup;
+        this.state.isSelectedAll = false;
     }
     /**
      * 批操作工具栏
@@ -130,6 +174,7 @@ export class MDControlController extends ControlController {
     async onCreated() {
         var _a;
         await super.onCreated();
+        await this.initUIActions();
         if (this.model.appDataEntityId) {
             // 初始化实体属性id和name的映射
             this.dataEntity = await ibiz.hub.getAppDataEntity(this.model.appDataEntityId, this.model.appId);
@@ -149,6 +194,12 @@ export class MDControlController extends ControlController {
             this.load({ isInitialLoad: true });
         }
     }
+    /**
+     * @description 初始化界面行为组
+     * @protected
+     * @memberof MDControlController
+     */
+    async initUIActions() { }
     /**
      * @description 执行多数据分组
      * - 子类实现
@@ -223,7 +274,8 @@ export class MDControlController extends ControlController {
                 this.state.sortQuery = localStorage.getItem(`${this.view.model.id}.${this.model.name}.sort`);
             }
             else if (minorSortAppDEFieldId && minorSortDir) {
-                const fieldName = this.fieldIdNameMap.get(minorSortAppDEFieldId);
+                const fieldName = this.fieldIdNameMap.get(minorSortAppDEFieldId) ||
+                    minorSortAppDEFieldId;
                 this.state.sortQuery = `${fieldName.toLowerCase()},${minorSortDir.toLowerCase()}`;
             }
             else if (ibiz.config.mdctrldefaultsort) {
@@ -264,27 +316,29 @@ export class MDControlController extends ControlController {
             resultParams.sort = sortQuery;
         }
         // *请求参数处理
-        await this._evt.emit('onBeforeLoad', undefined);
+        await this._evt.emit('onBeforeLoad', { params: resultParams });
         // 合并搜索条件参数，这些参数在onBeforeLoad监听里由外部填入
         Object.assign(resultParams, Object.assign({}, this.state.searchParams));
         // 额外附加参数
         if (extraParams) {
             Object.assign(resultParams, extraParams);
         }
-        // 门户过滤参数统一处理
+        // 门户过滤参数统一处理,部件引擎中搜索栏参数也在此处理
         if (resultParams.srfsearchconds) {
+            const srfsearchconds = isArray(resultParams.srfsearchconds)
+                ? resultParams.srfsearchconds
+                : [resultParams.srfsearchconds];
             if (resultParams.searchconds && resultParams.searchconds.length > 0) {
-                resultParams.searchconds = {
-                    condop: 'AND',
-                    condtype: 'GROUP',
-                    searchconds: [
-                        resultParams.srfsearchconds,
-                        ...resultParams.searchconds,
-                    ],
-                };
+                resultParams.searchconds = [
+                    {
+                        condop: 'AND',
+                        condtype: 'GROUP',
+                        searchconds: [...srfsearchconds, ...resultParams.searchconds],
+                    },
+                ];
             }
             else {
-                resultParams.searchconds = [resultParams.srfsearchconds];
+                resultParams.searchconds = [...srfsearchconds];
             }
             delete resultParams.srfsearchconds;
         }
@@ -380,6 +434,34 @@ export class MDControlController extends ControlController {
         this.actionNotification('FETCHSUCCESS');
         return this.state.items;
     }
+    /**
+     * @description 根据选中标识计算选中数据
+     * @protected
+     * @memberof MDControlController
+     */
+    calcSelectDataBySelectKey() {
+        if (!this.state.selectedKeys.length)
+            return;
+        const selectedData = this.state.items.filter(item => this.state.selectedKeys.includes(item.srfkey) &&
+            !this.state.selectedData.some(selected => selected.srfkey === item.srfkey));
+        this.state.selectedData.push(...selectedData);
+    }
+    /**
+     * @description 处理刷新模式
+     * @protected
+     * @param {MDCtrlLoadParams} args
+     * @memberof MDControlController
+     */
+    handleRefreshMode(args) {
+        // 初始化加载时需重置选中数据
+        if (args.isInitialLoad || this.refreshMode === 'nocache') {
+            this.state.selectedData = [];
+        }
+        else if (this.refreshMode === 'cache') {
+            // 重新计算选中数据
+            this.state.selectedData = this.state.items.filter(item => this.state.selectedData.find(select => select.srfkey === item.srfkey));
+        }
+    }
     /**
      * 部件加载后处理
      *
@@ -390,14 +472,8 @@ export class MDControlController extends ControlController {
      * @return {*}  {Promise<IData[]>} 返回给后续处理的数据
      */
     async afterLoad(args, items) {
-        // 初始化加载时需重置选中数据
-        if (args.isInitialLoad || this.refreshMode === 'nocache') {
-            this.state.selectedData = [];
-        }
-        else if (this.refreshMode === 'cache') {
-            // 重新计算选中数据
-            this.state.selectedData = this.state.items.filter(item => this.state.selectedData.find(select => select.tempsrfkey === item.tempsrfkey));
-        }
+        this.handleRefreshMode(args);
+        this.calcSelectDataBySelectKey();
         return items;
     }
     /**
@@ -489,10 +565,12 @@ export class MDControlController extends ControlController {
         });
     }
     /**
-     * 删除每一项
-     * @return {*}
-     * @author: zhujiamin
-     * @Date: 2024-02-27 09:47:52
+     * @description 处理项删除
+     * @param {IData} item
+     * @param {IContext} context
+     * @param {IParams} params
+     * @returns {*}  {Promise<boolean>}
+     * @memberof MDControlController
      */
     async handleItemRemove(item, context, params) {
         let needRefresh = false;
@@ -530,6 +608,17 @@ export class MDControlController extends ControlController {
     getData() {
         return this.state.selectedData || [];
     }
+    /**
+     * @description 设置选中数据
+     * @param {IData[]} items
+     * @memberof MDControlController
+     */
+    setSelectedData(items) {
+        this.state.selectedKeys = items
+            .filter(item => item.srfkey)
+            .map(item => item.srfkey);
+        this.state.selectedData = this.state.items.filter(item => this.state.selectedKeys.includes(item.srfkey));
+    }
     /**
      * 设置导航数据
      *
@@ -561,8 +650,8 @@ export class MDControlController extends ControlController {
         }
         // 根据数据计算工具栏权限和状态
         const data = selection === null || selection === void 0 ? void 0 : selection[0];
-        (_a = this.batchToolbarController) === null || _a === void 0 ? void 0 : _a.calcButtonState(data, this.model.appDataEntityId);
-        (_b = this.quickToolbarController) === null || _b === void 0 ? void 0 : _b.calcButtonState(data, this.model.appDataEntityId);
+        (_a = this.batchToolbarController) === null || _a === void 0 ? void 0 : _a.calcButtonState(data, this.model.appDataEntityId, { view: this.view, ctrl: this, data: selection });
+        (_b = this.quickToolbarController) === null || _b === void 0 ? void 0 : _b.calcButtonState(data, this.model.appDataEntityId, { view: this.view, ctrl: this, data: selection });
     }
     /**
      * 行单击事件
@@ -629,7 +718,7 @@ export class MDControlController extends ControlController {
     /**
      * 数据导出
      *
-     * @param {MouseEvent} event 原生js点击事件
+     * @param {{ event?: MouseEvent; params?: IApiExportParams }} _args 导出参数
      * @returns {*}  {Promise<void>}
      * @memberof MDControlController
      */
@@ -646,7 +735,7 @@ export class MDControlController extends ControlController {
         //   'DataExport',
         //   {
         //     dismiss: (result: unknown) => popover.dismiss(result),
-        //     maxRowCount: dataExport.maxRowCount || 1000,
+        //     maxRowCount: dataExport.maxRowCount || ibiz.config.common.maxExportRowsDefault,
         //     pageSize: this.state.size,
         //   },
         //   { autoClose: true, placement: 'bottom-end' },
@@ -683,7 +772,13 @@ export class MDControlController extends ControlController {
             return;
         }
         // 非这个实体的数据变更，则不处理
-        const data = msg.data;
+        let data;
+        try {
+            data = msg.data || (msg.content ? JSON.parse(msg.content) : undefined);
+        }
+        catch (error) {
+            ibiz.log.error(error);
+        }
         if (!data ||
             (!data.srfdecodename && !data.srfdename) ||
             (data.srfdecodename &&
@@ -692,7 +787,7 @@ export class MDControlController extends ControlController {
             return;
         }
         let isRefresh = false;
-        const { srfkey } = msg.data;
+        const { srfkey } = data;
         // 新增一定刷新，修改和删除只有当前多数据部件存在的数据命中后才刷新
         switch (msg.subtype) {
             case 'OBJECTCREATED':
@@ -840,4 +935,14 @@ export class MDControlController extends ControlController {
         const tempParams = Object.assign({}, resultParams);
         return { context: tempContext, params: tempParams };
     }
+    /**
+     * @description 新建行
+     * - 子类实现
+     * @param {MDCtrlLoadParams} [args={}]
+     * @returns {*}  {Promise<void>}
+     * @memberof MDControlController
+     */
+    async newRow(args = {}) {
+        throw new RuntimeError(ibiz.i18n.t('runtime.common.unrealized'));
+    }
 }

package/out/controller/common/editor/code-list-editor.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"code-list-editor.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/common/editor/code-list-editor.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACjE,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAEvD;;;;;;;;GAQG;AACH,qBAAa,wBAAwB,CACnC,CAAC,SAAS,eAAe,GAAG,eAAe,CAC3C,SAAQ,gBAAgB,CAAC,CAAC,CAAC;IAC3B;;;;;;OAMG;IACH,IAAI,qBAAqB,IAAI,OAAO,CAEnC;IAED;;;;;;OAMG;IACH,WAAW,CAAC,EAAE,YAAY,CAAC;IAE3B;;;;;;OAMG;IACH,QAAQ,EAAE,OAAO,CAAS;IAE1B;;;;;;OAMG;IACH,SAAS,EAAE,MAAM,CAAM;IAEvB;;;;;;OAMG;IACH,aAAa,EAAE,MAAM,CAAU;cAEf,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAgCvC;;;;;;;;;OASG;IACH,sBAAsB,CACpB,KAAK,EAAE,SAAS,YAAY,EAAE,GAC7B,SAAS,YAAY,EAAE;IAY1B;;;;;OAKG;IACU,YAAY,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,SAAS,YAAY,EAAE,CAAC;CAwBzE"}
+{"version":3,"file":"code-list-editor.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/common/editor/code-list-editor.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACjE,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAEvD;;;;;;;;GAQG;AACH,qBAAa,wBAAwB,CACnC,CAAC,SAAS,eAAe,GAAG,eAAe,CAC3C,SAAQ,gBAAgB,CAAC,CAAC,CAAC;IAC3B;;;;;;OAMG;IACH,IAAI,qBAAqB,IAAI,OAAO,CAEnC;IAED;;;;;;OAMG;IACH,WAAW,CAAC,EAAE,YAAY,CAAC;IAE3B;;;;;;OAMG;IACH,QAAQ,EAAE,OAAO,CAAS;IAE1B;;;;;;OAMG;IACH,SAAS,EAAE,MAAM,CAAM;IAEvB;;;;;;OAMG;IACH,aAAa,EAAE,MAAM,CAAU;cAEf,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAoCvC;;;;;;;;;OASG;IACH,sBAAsB,CACpB,KAAK,EAAE,SAAS,YAAY,EAAE,GAC7B,SAAS,YAAY,EAAE;IAY1B;;;;;OAKG;IACU,YAAY,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,SAAS,YAAY,EAAE,CAAC;CAyBzE"}

package/out/controller/common/editor/code-list-editor.controller.js

@@ -1,4 +1,3 @@
-import { RuntimeModelError } from '@ibiz-template/core';
 import { EditorController } from './editor.controller';
 /**
  * 代码表类编辑器控制器基类
@@ -69,10 +68,10 @@ export class CodeListEditorController extends EditorController {
                 this.allItems = this.toBoolean(this.editorParams.allitems);
             }
             if (this.editorParams.itemsText) {
-                this.itemsText = this.editorParams.itemsText;
+                this.itemsText = ibiz.appUtil.resolveI18nText(this.editorParams.itemsText);
             }
             if (this.editorParams.itemstext) {
-                this.itemsText = this.editorParams.itemstext;
+                this.itemsText = ibiz.appUtil.resolveI18nText(this.editorParams.itemstext);
             }
         }
     }
@@ -113,8 +112,10 @@ export class CodeListEditorController extends EditorController {
         }
         if (this.editorParams.enumOptions)
             return this.editorParams.enumOptions;
-        throw new RuntimeModelError(this.model, ibiz.i18n.t('runtime.controller.common.editor.editorNoConfigured', {
+        // 未配置代码表，控制台输出错误异常
+        ibiz.log.error(ibiz.i18n.t('runtime.controller.common.editor.editorNoConfigured', {
             editorType: this.model.editorType,
         }));
+        return [];
     }
 }

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

@@ -109,6 +109,19 @@ export declare class EditorController<T extends IEditor = IEditor> implements IE
      * @memberof EditorController
      */
     get emptyShowPlaceholder(): boolean;
+    /**
+     * @description 获取下载凭证参数
+     * @readonly
+     * @type {{
+     *     appEntityTag?: string;
+     *     dataFieldTag?: string;
+     *   }}
+     * @memberof EditorController
+     */
+    get downloadTicketParams(): {
+        appEntityTag?: string;
+        dataFieldTag?: string;
+    };
     /**
      * @description 当前视图
      * @readonly
@@ -140,6 +153,12 @@ export declare class EditorController<T extends IEditor = IEditor> implements IE
      */
     init(): Promise<void>;
     protected onInit(): Promise<void>;
+    /**
+     * @description 初始化额外参数
+     * @protected
+     * @memberof FormItemController
+     */
+    protected initExtraParams(): void;
     /**
      * 公共参数处理，计算上下文和视图参数
      *

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,EACL,OAAO,EAGR,MAAM,kBAAkB,CAAC;AAI1B,OAAO,EACL,eAAe,EACf,iBAAiB,EACjB,kBAAkB,EAClB,0BAA0B,EAC3B,MAAM,+BAA+B,CAAC;AAIvC;;;;;;;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;;;;;OAKG;IACI,WAAW,EAAE,KAAK,CAAM;IAE/B;;;;;;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;;;;;;OAMG;IACH,IAAI,WAAW,IAAI,MAAM,CAkBxB;IAED;;;;;;OAMG;IACH,IAAI,oBAAoB,IAAI,OAAO,CAUlC;IAED;;;;;OAKG;IACH,IAAI,IAAI,IAAI,eAAe,CAO1B;IAED;;;;;;OAMG;IACH,IAAI,IAAI,IAAI,kBAAkB,CAO7B;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;IA8CvC;;;;;;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"}
+{"version":3,"file":"editor.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/common/editor/editor.controller.ts"],"names":[],"mappings":"AACA,OAAO,EACL,OAAO,EAIR,MAAM,kBAAkB,CAAC;AAI1B,OAAO,EACL,eAAe,EACf,iBAAiB,EACjB,kBAAkB,EAClB,0BAA0B,EAC3B,MAAM,+BAA+B,CAAC;AAKvC;;;;;;;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;;;;;OAKG;IACI,WAAW,EAAE,KAAK,CAAM;IAE/B;;;;;;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;;;;;;OAMG;IACH,IAAI,WAAW,IAAI,MAAM,CAkBxB;IAED;;;;;;OAMG;IACH,IAAI,oBAAoB,IAAI,OAAO,CAUlC;IAED;;;;;;;;OAQG;IACH,IAAI,oBAAoB,IAAI;QAC1B,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,YAAY,CAAC,EAAE,MAAM,CAAC;KACvB,CAgBA;IAED;;;;;OAKG;IACH,IAAI,IAAI,IAAI,eAAe,CAO1B;IAED;;;;;;OAMG;IACH,IAAI,IAAI,IAAI,kBAAkB,CAO7B;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;IAgEvC;;;;OAIG;IACH,SAAS,CAAC,eAAe,IAAI,IAAI;IAwBjC;;;;;;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

@@ -2,6 +2,7 @@ import { DataTypes } from '@ibiz-template/core';
 import dayjs from 'dayjs';
 import { convertNavData } from '../../../utils';
 import { ValueExUtil } from '../../utils';
+import { PredefinedAttributes } from '../../../constant';
 /**
  * 编辑器控制器基类
  *
@@ -85,6 +86,32 @@ export class EditorController {
         }
         return ibiz.config.common.emptyShowMode === 'PLACEHOLDER';
     }
+    /**
+     * @description 获取下载凭证参数
+     * @readonly
+     * @type {{
+     *     appEntityTag?: string;
+     *     dataFieldTag?: string;
+     *   }}
+     * @memberof EditorController
+     */
+    get downloadTicketParams() {
+        const downloadTicketParams = {};
+        if (!this.model.editorParams) {
+            return downloadTicketParams;
+        }
+        if (this.model.editorParams.appentitytag) {
+            Object.assign(downloadTicketParams, {
+                appEntityTag: this.model.editorParams.appentitytag,
+            });
+        }
+        if (this.model.editorParams.datafieldtag) {
+            Object.assign(downloadTicketParams, {
+                dataFieldTag: this.model.editorParams.datafieldtag,
+            });
+        }
+        return downloadTicketParams;
+    }
     /**
      * @description 当前视图
      * @readonly
@@ -164,10 +191,14 @@ export class EditorController {
         await this.onInit();
     }
     async onInit() {
+        var _a, _b, _c, _d;
         // 异步初始化
         if (this.model.placeHolder) {
             this.placeHolder = this.model.placeHolder;
         }
+        if ((_a = this.model.phlanguageRes) === null || _a === void 0 ? void 0 : _a.lanResTag) {
+            this.placeHolder = ibiz.i18n.t((_b = this.model.phlanguageRes) === null || _b === void 0 ? void 0 : _b.lanResTag, this.placeHolder);
+        }
         if (this.model.editorParams) {
             Object.keys(this.model.editorParams).forEach(key => {
                 this.editorParams[key] = this.model.editorParams[key];
@@ -207,6 +238,42 @@ export class EditorController {
         if (this.model.editorItems) {
             this.model.editorItems = this.model.editorItems.filter((item) => item.id !== this.model.id);
         }
+        // 合并语义化埋点属性
+        const controlAttributes = ((_d = (_c = this.parent.model) === null || _c === void 0 ? void 0 : _c.controlAttributes) === null || _d === void 0 ? void 0 : _d.filter((item) => PredefinedAttributes.CLASSNAMES === item.attrName ||
+            PredefinedAttributes.STYLES === item.attrName)) || [];
+        if (controlAttributes.length) {
+            if (!this.model.controlAttributes)
+                this.model.controlAttributes = [];
+            this.model.controlAttributes.push(...controlAttributes);
+        }
+        this.initExtraParams();
+    }
+    /**
+     * @description 初始化额外参数
+     * @protected
+     * @memberof FormItemController
+     */
+    initExtraParams() {
+        var _a, _b;
+        // 额外参数
+        const extraParams = {};
+        // 是否隐藏无值的单位
+        let emptyHiddenUnit = true;
+        if (((_a = this.parent) === null || _a === void 0 ? void 0 : _a.emptyHiddenUnit) === false) {
+            emptyHiddenUnit = (_b = this.parent) === null || _b === void 0 ? void 0 : _b.emptyHiddenUnit;
+        }
+        // 编辑器参数优先级最高
+        const { EMPTYHIDDENUNIT, emptyhiddenunit } = this.editorParams;
+        if (EMPTYHIDDENUNIT) {
+            emptyHiddenUnit = Object.is(EMPTYHIDDENUNIT, 'true');
+        }
+        if (emptyhiddenunit) {
+            emptyHiddenUnit = Object.is(emptyhiddenunit, 'true');
+        }
+        Object.assign(extraParams, {
+            emptyHiddenUnit,
+        });
+        this.extraParams = extraParams;
     }
     /**
      * 公共参数处理，计算上下文和视图参数

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

@@ -3,6 +3,7 @@ export { MobViewController } from './view/mob-view.controller';
 export { ViewController } from './view/view.controller';
 export { WFStepTraceViewController } from './view/wf-step-trace-view.controller';
 export { MDCustomViewController } from './view/md-custom-view.controller';
+export { HtmlViewController } from './view/html-view.controller';
 export { BaseController } from './base.controller';
 export { EditorController } from './editor/editor.controller';
 export { CodeListEditorController } from './editor/code-list-editor.controller';

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/controller/common/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,2BAA2B,EAAE,MAAM,wCAAwC,CAAC;AACrF,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,yBAAyB,EAAE,MAAM,sCAAsC,CAAC;AACjF,OAAO,EAAE,sBAAsB,EAAE,MAAM,kCAAkC,CAAC;AAC1E,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAE,wBAAwB,EAAE,MAAM,sCAAsC,CAAC;AAChF,cAAc,WAAW,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/controller/common/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,2BAA2B,EAAE,MAAM,wCAAwC,CAAC;AACrF,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,yBAAyB,EAAE,MAAM,sCAAsC,CAAC;AACjF,OAAO,EAAE,sBAAsB,EAAE,MAAM,kCAAkC,CAAC;AAC1E,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAE,wBAAwB,EAAE,MAAM,sCAAsC,CAAC;AAChF,cAAc,WAAW,CAAC"}

package/out/controller/common/index.js

@@ -3,6 +3,7 @@ export { MobViewController } from './view/mob-view.controller';
 export { ViewController } from './view/view.controller';
 export { WFStepTraceViewController } from './view/wf-step-trace-view.controller';
 export { MDCustomViewController } from './view/md-custom-view.controller';
+export { HtmlViewController } from './view/html-view.controller';
 export { BaseController } from './base.controller';
 export { EditorController } from './editor/editor.controller';
 export { CodeListEditorController } from './editor/code-list-editor.controller';

package/out/controller/common/view/app-data-upload-view.controller.d.ts

@@ -1,4 +1,5 @@
 import { IAppView } from '@ibiz/model-core';
+import { SelectFileOpts } from '@ibiz-template/core';
 import { IAppDataUploadViewState, IViewController, IViewEvent } from '../../../interface';
 import { ViewController } from './view.controller';
 import { ImportDataResult } from '../../utils';
@@ -13,11 +14,12 @@ export declare class AppDataUploadViewController<T extends IAppView = IAppView,
     downloadTemplate(): void;
     /**
      * 选中导入文件并导入
+     * @param {SelectFileOpts} [fileOpts]
      * @author lxm
      * @date 2024-04-16 03:54:19
      * @return {*}
      */
-    selectAndImport(): Promise<ImportDataResult>;
+    selectAndImport(fileOpts?: SelectFileOpts): Promise<ImportDataResult>;
     /**
      * 自定义导入数据方法
      * @author lxm

package/out/controller/common/view/app-data-upload-view.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"app-data-upload-view.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/common/view/app-data-upload-view.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EACL,uBAAuB,EACvB,eAAe,EACf,UAAU,EACX,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EACL,gBAAgB,EAKjB,MAAM,aAAa,CAAC;AAErB,qBAAa,2BAA2B,CACpC,CAAC,SAAS,QAAQ,GAAG,QAAQ,EAC7B,CAAC,SAAS,uBAAuB,GAAG,uBAAuB,EAC3D,CAAC,SAAS,UAAU,GAAG,UAAU,CAEnC,SAAQ,cAAc,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAC9B,YAAW,eAAe,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAEnC,SAAS,CAAC,SAAS,IAAI,IAAI;cAIX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAc1C;;;;OAIG;IACH,gBAAgB,IAAI,IAAI;IAUxB;;;;;OAKG;IACG,eAAe,IAAI,OAAO,CAAC,gBAAgB,CAAC;IAclD;;;;;;;;;OASG;IACG,gBAAgB,CAAC,IAAI,EAAE;QAC3B,MAAM,EAAE,MAAM,CAAC;QACf,QAAQ,EAAE,MAAM,CAAC;KAClB,GAAG,OAAO,CAAC,IAAI,CAAC;CAQlB"}
+{"version":3,"file":"app-data-upload-view.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/common/view/app-data-upload-view.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EACL,uBAAuB,EACvB,eAAe,EACf,UAAU,EACX,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EACL,gBAAgB,EAKjB,MAAM,aAAa,CAAC;AAErB,qBAAa,2BAA2B,CACpC,CAAC,SAAS,QAAQ,GAAG,QAAQ,EAC7B,CAAC,SAAS,uBAAuB,GAAG,uBAAuB,EAC3D,CAAC,SAAS,UAAU,GAAG,UAAU,CAEnC,SAAQ,cAAc,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAC9B,YAAW,eAAe,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAEnC,SAAS,CAAC,SAAS,IAAI,IAAI;cAIX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAc1C;;;;OAIG;IACH,gBAAgB,IAAI,IAAI;IAUxB;;;;;;OAMG;IACG,eAAe,CAAC,QAAQ,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAe3E;;;;;;;;;OASG;IACG,gBAAgB,CAAC,IAAI,EAAE;QAC3B,MAAM,EAAE,MAAM,CAAC;QACf,QAAQ,EAAE,MAAM,CAAC;KAClB,GAAG,OAAO,CAAC,IAAI,CAAC;CAQlB"}

package/out/controller/common/view/app-data-upload-view.controller.js

@@ -27,16 +27,18 @@ export class AppDataUploadViewController extends ViewController {
     }
     /**
      * 选中导入文件并导入
+     * @param {SelectFileOpts} [fileOpts]
      * @author lxm
      * @date 2024-04-16 03:54:19
      * @return {*}
      */
-    async selectAndImport() {
+    async selectAndImport(fileOpts) {
         const result = await selectAndImport({
             appDataEntity: this.state.appDataEntity,
             dataImport: this.state.deDataImport,
             context: this.context,
             params: this.params,
+            fileOpts,
         });
         // 异步导入的时候直接关闭视图
         if (result.isAsync === true) {

package/out/controller/common/view/html-view.controller.d.ts

@@ -0,0 +1,17 @@
+import { IAppDEHtmlView } from '@ibiz/model-core';
+import { IHtmlViewState, IViewController, IViewEvent } from '../../../interface';
+import { ViewController } from './view.controller';
+/**
+ * @description 实体html视图
+ * @export
+ * @class HtmlViewController
+ * @extends {ViewController<T, S, E>}
+ * @implements {IViewController<T, S, E>}
+ * @template T
+ * @template S
+ * @template E
+ */
+export declare class HtmlViewController<T extends IAppDEHtmlView = IAppDEHtmlView, S extends IHtmlViewState = IHtmlViewState, E extends IViewEvent = IViewEvent> extends ViewController<T, S, E> implements IViewController<T, S, E> {
+    protected initState(): void;
+}
+//# sourceMappingURL=html-view.controller.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"html-view.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/common/view/html-view.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,OAAO,EACL,cAAc,EACd,eAAe,EACf,UAAU,EACX,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD;;;;;;;;;GASG;AACH,qBAAa,kBAAkB,CAC3B,CAAC,SAAS,cAAc,GAAG,cAAc,EACzC,CAAC,SAAS,cAAc,GAAG,cAAc,EACzC,CAAC,SAAS,UAAU,GAAG,UAAU,CAEnC,SAAQ,cAAc,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAC9B,YAAW,eAAe,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAEnC,SAAS,CAAC,SAAS,IAAI,IAAI;CAO5B"}

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

@@ -0,0 +1,21 @@
+import { StringUtil } from '@ibiz-template/core';
+import { ViewController } from './view.controller';
+/**
+ * @description 实体html视图
+ * @export
+ * @class HtmlViewController
+ * @extends {ViewController<T, S, E>}
+ * @implements {IViewController<T, S, E>}
+ * @template T
+ * @template S
+ * @template E
+ */
+export class HtmlViewController extends ViewController {
+    initState() {
+        const { htmlUrl } = this.model;
+        super.initState();
+        this.state.htmlUrl = htmlUrl
+            ? StringUtil.fill(htmlUrl, this.context, this.params)
+            : '';
+    }
+}

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

@@ -2,7 +2,7 @@
 import { IPortalMessage } from '@ibiz-template/core';
 import { IAppView } from '@ibiz/model-core';
 import { LoadingState } from '../../utils/loading/loading.state';
-import { IViewController, IViewEvent, IViewLayoutPanelController, IControlProvider, IModal, IModalData, IUIActionResult, IUILogicParams, IViewEngine, IViewMessage, IRedrawData, IApiViewMapping, IApiControlMapping } from '../../../interface';
+import { IViewController, IViewEvent, IViewLayoutPanelController, IControlProvider, IModal, IModalData, IUIActionResult, IUILogicParams, IViewEngine, IViewMessage, IRedrawData, IApiViewMapping, IApiControlMapping, ICtrlEngine } from '../../../interface';
 import { CTX } from '../../ctx';
 import { ControllerEvent } from '../../utils';
 import { BaseController } from '../base.controller';
@@ -26,6 +26,7 @@ export declare class ViewController<T extends IAppView = IAppView, S extends IVi
         [key: string]: IControlProvider;
     };
     engines: IViewEngine[];
+    ctrlEngines: ICtrlEngine[];
     error: IData;
     slotProps: {
         [key: string]: IData;
@@ -82,6 +83,13 @@ export declare class ViewController<T extends IAppView = IAppView, S extends IVi
      * @memberof ViewController
      */
     protected intervalTimer: NodeJS.Timeout | undefined;
+    /**
+     * @description 是否存在403错误未处理
+     * @protected
+     * @type {boolean}
+     * @memberof ViewController
+     */
+    protected hasPermErrPending: boolean;
     /**
      * 超时周期
      * - 默认300秒
@@ -122,6 +130,12 @@ export declare class ViewController<T extends IAppView = IAppView, S extends IVi
      * @type {ViewMsgController}
      */
     viewMsgController?: ViewMsgController;
+    /**
+     * @description 父视图数据
+     * @type {IData[]}
+     * @memberof ViewController
+     */
+    parentData?: IData[];
     /**
      * Creates an instance of ViewController.
      * @author lxm
@@ -203,7 +217,7 @@ export declare class ViewController<T extends IAppView = IAppView, S extends IVi
     callUIAction(key: string, args?: Partial<IUILogicParams>): Promise<IUIActionResult | null>;
     closeView(modalData?: IModalData): Promise<void>;
     redrawView(redrawData: IRedrawData): void;
-    startLoading(): void;
+    startLoading(loadingText?: string): void;
     endLoading(): void;
     /**
      * 设置布局面板控制器