@ibiz-template/runtime 0.7.41-alpha.11 → 0.7.41-alpha.110

package/out/controller/notification/async-action.controller.js

@@ -111,7 +111,9 @@ export class AsyncActionController {
         // 非结束状态的消息加一
         if (!this.finishedStates.includes(action.actionstate)) {
             this.doingNum += 1;
-            ibiz.notice.showDoingNotice({ num: this.doingNum });
+            if (ibiz.config.common.enableAsyncActionNotice) {
+                ibiz.notice.showDoingNotice({ num: this.doingNum });
+            }
         }
         else {
             this.noticeResult(action);
@@ -133,7 +135,9 @@ export class AsyncActionController {
         if (this.finishedStates.includes(action.actionstate)) {
             this.doingNum -= 1;
             if (this.doingNum <= 0) {
-                ibiz.notice.closeDoingNotice();
+                if (ibiz.config.common.enableAsyncActionNotice) {
+                    ibiz.notice.closeDoingNotice();
+                }
             }
             this.noticeResult(action);
         }
@@ -141,6 +145,8 @@ export class AsyncActionController {
         this.evt.emit('dataChange');
     }
     noticeResult(action) {
-        ibiz.notice.showAsyncAction(action);
+        if (ibiz.config.common.enableAsyncActionNotice) {
+            ibiz.notice.showAsyncAction(action);
+        }
     }
 }

package/out/controller/notification/internal-message.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"internal-message.controller.d.ts","sourceRoot":"","sources":["../../../src/controller/notification/internal-message.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,EAEhB,SAAS,EACV,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EACL,0BAA0B,EAC1B,qBAAqB,EACrB,wBAAwB,EACzB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAC;AAQvD,qBAAa,yBAA0B,YAAW,0BAA0B;IAC1E,QAAQ,CAAC,GAAG,EAAE,OAAO,CAAC,qBAAqB,CAAC,CAAiB;IAE7D,KAAK,EAAE,MAAM,CAAK;IAElB,WAAW,EAAE,MAAM,CAAK;IAExB;;;;;OAKG;IACH,IAAI,EAAE,MAAM,CAAK;IAEjB,IAAI,EAAE,MAAM,CAAM;IAElB,QAAQ,EAAE,gBAAgB,EAAE,CAAM;IAElC,UAAU,UAAS;IAEnB,SAAS,CAAC,OAAO,yBAAgC;IAEjD,EAAE,EAAE,SAAS,GAAG,IAAI,CAAQ;IAE5B,QAAQ,EAAE,wBAAwB,GAAG,IAAI,CAAQ;IAE3C,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAKrB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAQrB,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAIzB,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC;IASzC;;;;;OAKG;IACH,gBAAgB,CAAC,GAAG,CAAC,EAAE,OAAO,GAAG,IAAI;cAUrB,KAAK,CAAC,QAAQ,GAAE,OAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IA6C/D;;;;;OAKG;IACH,SAAS,CAAC,UAAU,IAAI,IAAI;IA0CtB,QAAQ,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;IAkBxD;;;;;OAKG;IACG,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IAOpC;;;;;;OAMG;IACG,GAAG,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC;CAIjD"}
+{"version":3,"file":"internal-message.controller.d.ts","sourceRoot":"","sources":["../../../src/controller/notification/internal-message.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,EAEhB,SAAS,EACV,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EACL,0BAA0B,EAC1B,qBAAqB,EACrB,wBAAwB,EACzB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAC;AAQvD,qBAAa,yBAA0B,YAAW,0BAA0B;IAC1E,QAAQ,CAAC,GAAG,EAAE,OAAO,CAAC,qBAAqB,CAAC,CAAiB;IAE7D,KAAK,EAAE,MAAM,CAAK;IAElB,WAAW,EAAE,MAAM,CAAK;IAExB;;;;;OAKG;IACH,IAAI,EAAE,MAAM,CAAK;IAEjB,IAAI,EAAE,MAAM,CAAM;IAElB,QAAQ,EAAE,gBAAgB,EAAE,CAAM;IAElC,UAAU,UAAS;IAEnB,SAAS,CAAC,OAAO,yBAAgC;IAEjD,EAAE,EAAE,SAAS,GAAG,IAAI,CAAQ;IAE5B,QAAQ,EAAE,wBAAwB,GAAG,IAAI,CAAQ;IAE3C,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAKrB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAQrB,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAIzB,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC;IASzC;;;;;OAKG;IACH,gBAAgB,CAAC,GAAG,CAAC,EAAE,OAAO,GAAG,IAAI;cAUrB,KAAK,CAAC,QAAQ,GAAE,OAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAoD/D;;;;;OAKG;IACH,SAAS,CAAC,UAAU,IAAI,IAAI;IA0CtB,QAAQ,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;IAkBxD;;;;;OAKG;IACG,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IAOpC;;;;;;OAMG;IACG,GAAG,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC;CAIjD"}

package/out/controller/notification/internal-message.controller.js

@@ -65,6 +65,7 @@ export class InternalMessageController {
         this.load();
     }
     async fetch(loadMore = false) {
+        var _a;
         // *计算查询参数
         if (loadMore === false) {
             this.page = 0;
@@ -76,24 +77,32 @@ export class InternalMessageController {
             page: this.page,
             size: this.size,
             sort: 'timestamp,desc',
-        };
-        // 是否只搜索未读
-        if (this.unreadOnly) {
-            fetchParams.searchconds = [
+            searchconds: [
                 {
                     condtype: 'GROUP',
                     condop: 'AND',
                     bnotmode: false,
-                    searchconds: [
-                        {
-                            condop: 'EQ',
-                            condtype: 'DEFIELD',
-                            fieldname: 'status',
-                            value: 'RECEIVED',
-                        },
-                    ],
+                    searchconds: [],
                 },
-            ];
+            ],
+        };
+        // 不是门户应用只查询当前系统数据
+        if (!ibiz.env.isPortalApp) {
+            fetchParams.searchconds[0].searchconds.push({
+                condop: 'EQ',
+                condtype: 'DEFIELD',
+                fieldname: 'system_id',
+                value: (_a = ibiz.appData) === null || _a === void 0 ? void 0 : _a.context.srfsystemid,
+            });
+        }
+        // 是否只搜索未读
+        if (this.unreadOnly) {
+            fetchParams.searchconds[0].searchconds.push({
+                condop: 'EQ',
+                condtype: 'DEFIELD',
+                fieldname: 'status',
+                value: 'RECEIVED',
+            });
         }
         const res = await this.service.fetch(fetchParams);
         this.total = res.total;

package/out/controller/utils/button-state/ui-action-button.state.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ui-action-button.state.d.ts","sourceRoot":"","sources":["../../../../src/controller/utils/button-state/ui-action-button.state.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAI7D;;;;;;;GAOG;AACH,qBAAa,mBAAoB,YAAW,YAAY;IACtD,IAAI,EAAE,MAAM,CAAC;IAEb,QAAQ,EAAE,OAAO,CAAS;IAE1B,OAAO,EAAE,OAAO,CAAQ;IAExB,OAAO,EAAE,OAAO,CAAS;IAEzB;;OAEG;IACH,SAAS,CAAC,SAAS,EAAE,OAAO,CAAQ;IAEpC;;OAEG;IACH,SAAS,CAAC,kBAAkB,EAAE,OAAO,CAAQ;IAE7C;;;;;;;OAOG;IACH,SAAS,CAAC,cAAc,EAAE,OAAO,CAAS;IAE1C;;;;;;;OAOG;IACH,SAAS,CAAC,aAAa,EAAE,OAAO,CAAS;IAEzC;;OAEG;IACH,SAAS,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAEpC;;;;;;;OAOG;IACH,SAAS,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC;IAEhC;;OAEG;IACH,SAAS,CAAC,KAAK,EAAE,MAAM,CAAC;IAExB;;OAEG;IACH,SAAS,CAAC,KAAK,CAAC,EAAE,oBAAoB,CAAC;IAEvC;;OAEG;IACH,SAAS,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAE9B;;OAEG;IACH,SAAS,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAE7B;;OAEG;IACH,SAAS,CAAC,MAAM,EAAE,OAAO,CAAS;gBAGhC,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,EACb,UAAU,CAAC,EAAE,MAAM,EACnB,KAAK,CAAC,EAAE,oBAAoB;IAQ9B;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAsD3B;;;;;;;;OAQG;cACa,cAAc,CAC5B,OAAO,EAAE,QAAQ,EACjB,IAAI,CAAC,EAAE,KAAK,EACZ,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,IAAI,CAAC;IAoCV,gBAAgB,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,CAAC,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAWhE,iBAAiB,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,CAAC,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAUjE,MAAM,CACV,OAAO,EAAE,QAAQ,EACjB,IAAI,CAAC,EAAE,KAAK,EACZ,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,IAAI,CAAC;CAmBjB"}
+{"version":3,"file":"ui-action-button.state.d.ts","sourceRoot":"","sources":["../../../../src/controller/utils/button-state/ui-action-button.state.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAI7D;;;;;;;GAOG;AACH,qBAAa,mBAAoB,YAAW,YAAY;IACtD,IAAI,EAAE,MAAM,CAAC;IAEb,QAAQ,EAAE,OAAO,CAAS;IAE1B,OAAO,EAAE,OAAO,CAAQ;IAExB,OAAO,EAAE,OAAO,CAAS;IAEzB;;OAEG;IACH,SAAS,CAAC,SAAS,EAAE,OAAO,CAAQ;IAEpC;;OAEG;IACH,SAAS,CAAC,kBAAkB,EAAE,OAAO,CAAQ;IAE7C;;;;;;;OAOG;IACH,SAAS,CAAC,cAAc,EAAE,OAAO,CAAS;IAE1C;;;;;;;OAOG;IACH,SAAS,CAAC,aAAa,EAAE,OAAO,CAAS;IAEzC;;OAEG;IACH,SAAS,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAEpC;;;;;;;OAOG;IACH,SAAS,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC;IAEhC;;OAEG;IACH,SAAS,CAAC,KAAK,EAAE,MAAM,CAAC;IAExB;;OAEG;IACH,SAAS,CAAC,KAAK,CAAC,EAAE,oBAAoB,CAAC;IAEvC;;OAEG;IACH,SAAS,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAE9B;;OAEG;IACH,SAAS,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAE7B;;OAEG;IACH,SAAS,CAAC,MAAM,EAAE,OAAO,CAAS;gBAGhC,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,EACb,UAAU,CAAC,EAAE,MAAM,EACnB,KAAK,CAAC,EAAE,oBAAoB;IAQ9B;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAsD3B;;;;;;;;OAQG;cACa,cAAc,CAC5B,OAAO,EAAE,QAAQ,EACjB,IAAI,CAAC,EAAE,KAAK,EACZ,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,IAAI,CAAC;IAoCV,gBAAgB,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,CAAC,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAchE,iBAAiB,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,CAAC,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAUjE,MAAM,CACV,OAAO,EAAE,QAAQ,EACjB,IAAI,CAAC,EAAE,KAAK,EACZ,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,IAAI,CAAC;CAmBjB"}

package/out/controller/utils/button-state/ui-action-button.state.js

@@ -129,7 +129,10 @@ export class UIActionButtonState {
     // 计算启用逻辑
     async calcEnableScript(context, data) {
         if (this.model && this.model.enableScriptCode) {
-            this.visible = ScriptFactory.execScriptFn({ context, data }, this.model.enableScriptCode, { singleRowReturn: true });
+            const dynaEnable = ScriptFactory.execScriptFn({ context, data }, this.model.enableScriptCode, { singleRowReturn: true });
+            if (dynaEnable !== undefined) {
+                this.disabled = !dynaEnable;
+            }
         }
     }
     // 计算可见逻辑

package/out/controller/utils/code-list/code-list.js

@@ -76,7 +76,7 @@ export function useCalcOrMode(orMode, valueType = 'SIMPLE') {
                     if (codeList) {
                         const selects = valueType === 'SIMPLES'
                             ? strVal
-                            : strVal.split(valueSeparator);
+                            : strVal.toString().split(valueSeparator);
                         if (codeItemValueNumber) {
                             for (let i = 0, len = selects.length; i < len; i++) {
                                 selects[i] = Number(selects[i]);

package/out/controller/utils/data-file-util/data-file-util.d.ts

@@ -1,4 +1,4 @@
-import { IHttpResponse } from '@ibiz-template/core';
+import { IHttpResponse, SelectFileOpts } from '@ibiz-template/core';
 import { IAppDEDataImport, IAppDataEntity } from '@ibiz/model-core';
 export type ImportDataResult = {
     /**
@@ -104,6 +104,7 @@ export declare function getDataImportModels(opts: {
  *   dataImportViewId?: string;
  *   context: IContext;
  *   params: IParams;
+ *   viewOption?: IData;
  * }} opts
  * @return {*}  {Promise<void>}
  */
@@ -113,6 +114,8 @@ export declare function openDataImport(opts: {
     dataImportViewId?: string;
     context: IContext;
     params: IParams;
+    event?: MouseEvent;
+    viewOption?: IData;
 }): Promise<void>;
 /**
  * 下载导入模版文件
@@ -137,6 +140,7 @@ export declare function selectAndImport(opts: {
     dataImport?: IAppDEDataImport;
     context?: IContext;
     params?: IParams;
+    fileOpts?: SelectFileOpts;
 }): Promise<ImportDataResult>;
 /**
  * 自定义导入数据方法
@@ -197,6 +201,7 @@ export declare function calcImportSchemaData(opts: {
  *   appDataEntity?: IAppDataEntity;
  *   dataImport?: IAppDEDataImport;
  *   data: Partial<ImportSchemaData>;
+ *   context?: IContext;
  * }} opts
  * @return {*}
  */
@@ -204,6 +209,7 @@ export declare function createImportSchema(opts: {
     appDataEntity?: IAppDataEntity;
     dataImport?: IAppDEDataImport;
     data: Partial<ImportSchemaData>;
+    context?: IContext;
 }): Promise<IHttpResponse<IData>>;
 /**
  * 更新已有的schema
@@ -214,6 +220,7 @@ export declare function createImportSchema(opts: {
  *   appDataEntity?: IAppDataEntity;
  *   dataImport?: IAppDEDataImport;
  *   data: Partial<ImportSchemaData>;
+ *   context?: IContext;
  * }} opts
  * @return {*}
  */
@@ -221,6 +228,7 @@ export declare function updateImportSchema(opts: {
     appDataEntity?: IAppDataEntity;
     dataImport?: IAppDEDataImport;
     data: Partial<ImportSchemaData>;
+    context?: IContext;
 }): Promise<IHttpResponse<IData>>;
 /**
  * 获取指定id的schema数据
@@ -228,18 +236,20 @@ export declare function updateImportSchema(opts: {
  * @date 2024-04-18 04:47:03
  * @export
  * @param {string} id
+ * @param {IContext} [context]
  * @return {*}  {Promise<IHttpResponse<IData>>}
  */
-export declare function getImportSchema(id: string): Promise<IHttpResponse<IData>>;
+export declare function getImportSchema(id: string, context?: IContext): Promise<IHttpResponse<IData>>;
 /**
  * 删除指定id的schema数据
  * @author lxm
  * @date 2024-04-18 04:47:03
  * @export
  * @param {string} id
+ * @param {IContext} [context]
  * @return {*}  {Promise<IHttpResponse<IData>>}
  */
-export declare function deleteImportSchema(id: string): Promise<IHttpResponse<IData>>;
+export declare function deleteImportSchema(id: string, context?: IContext): Promise<IHttpResponse<IData>>;
 /**
  * 获取当前用户的指定实体和实体导入的schema集合数据
  * @author lxm
@@ -248,11 +258,13 @@ export declare function deleteImportSchema(id: string): Promise<IHttpResponse<ID
  * @param {{
  *   appDataEntity: IAppDataEntity;
  *   dataImport?: IAppDEDataImport;
+ *   context?: IContext;
  * }} opts
  * @return {*}  {Promise<IHttpResponse<IData[]>>}
  */
 export declare function fetchImportSchemas(opts: {
     appDataEntity: IAppDataEntity;
     dataImport?: IAppDEDataImport;
+    context?: IContext;
 }): Promise<IHttpResponse<IData[]>>;
 //# sourceMappingURL=data-file-util.d.ts.map

package/out/controller/utils/data-file-util/data-file-util.d.ts.map

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

package/out/controller/utils/data-file-util/data-file-util.js

@@ -63,7 +63,8 @@ export async function asyncImportData(file, appDataEntity, dataImport, context,
         const resPath = calcResPath(context, appDataEntity);
         url = resPath + url;
     }
-    const res = await ibiz.net.request(url, {
+    const app = ibiz.hub.getApp(context === null || context === void 0 ? void 0 : context.srfappid);
+    const res = await app.net.request(url, {
         method: 'post',
         data,
         params: queryParam,
@@ -104,7 +105,8 @@ export async function importData(file, appDataEntity, dataImport, context, param
         isAsync: false,
     };
     try {
-        const res = await ibiz.net.request(url, {
+        const app = ibiz.hub.getApp(context === null || context === void 0 ? void 0 : context.srfappid);
+        const res = await app.net.request(url, {
             method: 'post',
             data,
             params: queryParam,
@@ -214,6 +216,7 @@ export async function getDataImportModels(opts) {
  *   dataImportViewId?: string;
  *   context: IContext;
  *   params: IParams;
+ *   viewOption?: IData;
  * }} opts
  * @return {*}  {Promise<void>}
  */
@@ -235,7 +238,7 @@ export async function openDataImport(opts) {
         context.srfappdataentityid = appDataEntityId;
         context.srfdedataimportid = deDataImportId;
         // 走导入视图
-        return ibiz.commands.execute(OpenAppViewCommand.TAG, view.id, context, params, { openMode: 'POPUPMODAL' });
+        return ibiz.commands.execute(OpenAppViewCommand.TAG, view.id, context, params, Object.assign({ openMode: 'POPUPMODAL', event: opts.event }, opts.viewOption));
     }
     // 走自定义组件的导入
     const { deDataImport, appDataEntity } = await getDataImportModels({
@@ -281,7 +284,8 @@ export async function downloadImportTemplate(appDataEntity, dataImport, context,
         const resPath = calcResPath(context, appDataEntity);
         templateUrl = resPath + templateUrl;
     }
-    const res = await ibiz.net.request(templateUrl, {
+    const app = ibiz.hub.getApp(context === null || context === void 0 ? void 0 : context.srfappid);
+    const res = await app.net.request(templateUrl, {
         responseType: 'blob',
         params: queryParam,
     });
@@ -310,10 +314,7 @@ export async function downloadImportTemplate(appDataEntity, dataImport, context,
  */
 export async function selectAndImport(opts) {
     return new Promise(resolve => {
-        selectFile({
-            accept: '.xlsx, .xls',
-            multiple: false,
-            onSelected: async (files) => {
+        selectFile(Object.assign({ accept: '.xlsx, .xls', multiple: false, onSelected: async (files) => {
                 const result = await importData2({
                     selectedFile: files[0],
                     appDataEntity: opts.appDataEntity,
@@ -322,11 +323,9 @@ export async function selectAndImport(opts) {
                     params: opts.params,
                 });
                 resolve(result);
-            },
-            onCancel: () => {
+            }, onCancel: () => {
                 resolve({ cancel: true });
-            },
-        });
+            } }, opts.fileOpts));
     });
 }
 // 自定义导入相关
@@ -343,7 +342,7 @@ export async function selectAndImport(opts) {
  * }} opts
  */
 export async function asyncImportData2(opts) {
-    var _a;
+    var _a, _b;
     let path = `/${opts.appDataEntity.codeName2.toLowerCase()}`;
     if (opts.context) {
         const resPath = calcResPath(opts.context, opts.appDataEntity);
@@ -359,7 +358,8 @@ export async function asyncImportData2(opts) {
     if (srfimporttag) {
         Object.assign(queryData, { srfimporttag });
     }
-    await ibiz.net.request(url, {
+    const app = ibiz.hub.getApp((_b = opts.context) === null || _b === void 0 ? void 0 : _b.srfappid);
+    await app.net.request(url, {
         method: 'get',
         params: queryData,
     });
@@ -399,13 +399,16 @@ export function calcImportSchemaData(opts) {
  *   appDataEntity?: IAppDataEntity;
  *   dataImport?: IAppDEDataImport;
  *   data: Partial<ImportSchemaData>;
+ *   context?: IContext;
  * }} opts
  * @return {*}
  */
 export async function createImportSchema(opts) {
+    var _a;
     const data = calcImportSchemaData(opts);
     const url = `extension/import_schemas`;
-    const res = await ibiz.net.request(url, {
+    const app = ibiz.hub.getApp((_a = opts.context) === null || _a === void 0 ? void 0 : _a.srfappid);
+    const res = await app.net.request(url, {
         method: 'post',
         data,
     });
@@ -420,13 +423,16 @@ export async function createImportSchema(opts) {
  *   appDataEntity?: IAppDataEntity;
  *   dataImport?: IAppDEDataImport;
  *   data: Partial<ImportSchemaData>;
+ *   context?: IContext;
  * }} opts
  * @return {*}
  */
 export async function updateImportSchema(opts) {
+    var _a;
     const data = calcImportSchemaData(opts);
     const url = `extension/import_schemas/${data.id}`;
-    const res = await ibiz.net.request(url, {
+    const app = ibiz.hub.getApp((_a = opts.context) === null || _a === void 0 ? void 0 : _a.srfappid);
+    const res = await app.net.request(url, {
         method: 'put',
         data,
     });
@@ -438,11 +444,13 @@ export async function updateImportSchema(opts) {
  * @date 2024-04-18 04:47:03
  * @export
  * @param {string} id
+ * @param {IContext} [context]
  * @return {*}  {Promise<IHttpResponse<IData>>}
  */
-export async function getImportSchema(id) {
+export async function getImportSchema(id, context) {
     const url = `extension/import_schemas/${id}`;
-    const res = await ibiz.net.request(url, {
+    const app = ibiz.hub.getApp(context === null || context === void 0 ? void 0 : context.srfappid);
+    const res = await app.net.request(url, {
         method: 'get',
     });
     return res;
@@ -453,11 +461,13 @@ export async function getImportSchema(id) {
  * @date 2024-04-18 04:47:03
  * @export
  * @param {string} id
+ * @param {IContext} [context]
  * @return {*}  {Promise<IHttpResponse<IData>>}
  */
-export async function deleteImportSchema(id) {
+export async function deleteImportSchema(id, context) {
     const url = `extension/import_schemas/${id}`;
-    const res = await ibiz.net.request(url, {
+    const app = ibiz.hub.getApp(context === null || context === void 0 ? void 0 : context.srfappid);
+    const res = await app.net.request(url, {
         method: 'delete',
     });
     return res;
@@ -470,18 +480,20 @@ export async function deleteImportSchema(id) {
  * @param {{
  *   appDataEntity: IAppDataEntity;
  *   dataImport?: IAppDEDataImport;
+ *   context?: IContext;
  * }} opts
  * @return {*}  {Promise<IHttpResponse<IData[]>>}
  */
 export async function fetchImportSchemas(opts) {
-    var _a;
+    var _a, _b;
     const params = {
         n_import_tag_eq: opts.appDataEntity.defaultAppDEDataImportId,
         n_system_tag_eq: (_a = ibiz.appData) === null || _a === void 0 ? void 0 : _a.context.srfsystemid,
         n_data_entity_tag_eq: opts.appDataEntity.codeName,
     };
     const url = `extension/import_schemas/fetch_cur_user`;
-    const res = await ibiz.net.request(url, {
+    const app = ibiz.hub.getApp((_b = opts.context) === null || _b === void 0 ? void 0 : _b.srfappid);
+    const res = await app.net.request(url, {
         method: 'post',
         data: params,
     });

package/out/controller/utils/jsonschema/entity.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"entity.d.ts","sourceRoot":"","sources":["../../../../src/controller/utils/jsonschema/entity.ts"],"names":[],"mappings":"AAEA;;;;;;;;GAQG;AACH,wBAAsB,eAAe,CACnC,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,KAAK,CAAC,CAYhB"}
+{"version":3,"file":"entity.d.ts","sourceRoot":"","sources":["../../../../src/controller/utils/jsonschema/entity.ts"],"names":[],"mappings":"AAEA;;;;;;;;GAQG;AACH,wBAAsB,eAAe,CACnC,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,KAAK,CAAC,CAgBhB"}

package/out/controller/utils/jsonschema/entity.js

@@ -9,6 +9,10 @@ import qs from 'qs';
  * @return {*}  {Promise<IData>}
  */
 export async function getEntitySchema(entityId, context, params = {}) {
+    // [特殊参数识别]删除界面使用视图参数srfdefdata
+    if (params && Object.prototype.hasOwnProperty.call(params, 'srfdefdata')) {
+        delete params.srfdefdata;
+    }
     const strParams = qs.stringify(params);
     const app = ibiz.hub.getApp(context.srfappid);
     const entity = await ibiz.hub.getAppDataEntity(entityId, context.srfappid);

package/out/controller/utils/util/util.d.ts

@@ -41,27 +41,4 @@ export declare function getAllItems(items: IData[], childField?: string): IData[
  * @return {*}  {string[]}
  */
 export declare function formatSeparator(type: string, items: IData[] | undefined, state: IData | undefined, opts?: IData[] | undefined): string[];
-/**
- * @description 格式化日期
- * @export
- * @param {string} val
- * @param {('year' | 'quarter' | 'month' | 'week' | 'day')} format
- * @returns {*}  {string}
- */
-export declare function formatDate(val: string, format: 'year' | 'quarter' | 'month' | 'week' | 'day'): string;
-/**
- * @description 获取某年的总周数
- * @param {number} year 年份
- * @returns {*}  {number}
- */
-export declare function getWeeksInYear(year: number): number;
-/**
- * @description 生成年周数组
- * @export
- * @param {string} minYearWeek 最小年周
- * @param {string} maxYearWeek 最大年周
- * @param {number} [paddingWeeks=0] 前后范围
- * @returns {*}  {string[]}
- */
-export declare function generateYearWeekRange(minYearWeek: string, maxYearWeek: string, paddingWeeks?: number): string[];
 //# sourceMappingURL=util.d.ts.map

package/out/controller/utils/util/util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../../src/controller/utils/util/util.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE7C;;;;;;;;;;GAUG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAKtE;AAED;;;;;;;;;GASG;AACH,wBAAgB,aAAa,CAC3B,IAAI,EAAE,KAAK,GAAG,SAAS,GAAG,KAAK,EAAE,GAAG,SAAS,EAAE,GAC9C,KAAK,GAAG,SAAS,CAMnB;AAED;;;;;;GAMG;AACH,wBAAgB,WAAW,CACzB,KAAK,EAAE,KAAK,EAAE,EACd,UAAU,GAAE,MAAmB,GAC9B,KAAK,EAAE,CAaT;AAED;;;;;;;;;GASG;AACH,wBAAgB,eAAe,CAC7B,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,KAAK,EAAE,GAAG,SAAS,EAC1B,KAAK,EAAE,KAAK,GAAG,SAAS,EACxB,IAAI,CAAC,EAAE,KAAK,EAAE,GAAG,SAAS,GACzB,MAAM,EAAE,CAyGV;AAED;;;;;;GAMG;AACH,wBAAgB,UAAU,CACxB,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,GAAG,MAAM,GAAG,KAAK,GACpD,MAAM,CAyBR;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAInD;AAED;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CACnC,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,EACnB,YAAY,SAAI,GACf,MAAM,EAAE,CA0CV"}
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../../src/controller/utils/util/util.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE7C;;;;;;;;;;GAUG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAKtE;AAED;;;;;;;;;GASG;AACH,wBAAgB,aAAa,CAC3B,IAAI,EAAE,KAAK,GAAG,SAAS,GAAG,KAAK,EAAE,GAAG,SAAS,EAAE,GAC9C,KAAK,GAAG,SAAS,CAMnB;AAED;;;;;;GAMG;AACH,wBAAgB,WAAW,CACzB,KAAK,EAAE,KAAK,EAAE,EACd,UAAU,GAAE,MAAmB,GAC9B,KAAK,EAAE,CAaT;AAED;;;;;;;;;GASG;AACH,wBAAgB,eAAe,CAC7B,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,KAAK,EAAE,GAAG,SAAS,EAC1B,KAAK,EAAE,KAAK,GAAG,SAAS,EACxB,IAAI,CAAC,EAAE,KAAK,EAAE,GAAG,SAAS,GACzB,MAAM,EAAE,CAyGV"}

package/out/controller/utils/util/util.js

@@ -2,7 +2,6 @@
 /* eslint-disable no-case-declarations */
 /* eslint-disable no-restricted-globals */
 import { isNil } from 'ramda';
-import dayjs from 'dayjs';
 import { ControlVO } from '../../../service';
 /**
  * 表单表格里判断属性的值是否发生改变
@@ -172,90 +171,3 @@ export function formatSeparator(type, items, state, opts) {
     calcChildrenFormat(items);
     return hideSeparator;
 }
-/**
- * @description 格式化日期
- * @export
- * @param {string} val
- * @param {('year' | 'quarter' | 'month' | 'week' | 'day')} format
- * @returns {*}  {string}
- */
-export function formatDate(val, format) {
-    let value = val;
-    const date = new Date(val);
-    if (!val || isNaN(date.getTime()))
-        return value;
-    const year = dayjs(date).year();
-    switch (format) {
-        case 'year':
-            value = `${year}`;
-            break;
-        case 'quarter':
-            value = `${year} ${dayjs(date).quarter()}${ibiz.i18n.t('runtime.controller.utils.util.quarter')}`;
-            break;
-        case 'month':
-            value = `${year} ${dayjs(date).month() + 1}${ibiz.i18n.t('runtime.controller.utils.util.month')}`;
-            break;
-        case 'week':
-            value = `${year} ${dayjs(date).week()}${ibiz.i18n.t('runtime.controller.utils.util.week')}`;
-            break;
-        case 'day':
-            value = dayjs(date).format('YYYY-MM-DD');
-            break;
-        default:
-            break;
-    }
-    return value;
-}
-/**
- * @description 获取某年的总周数
- * @param {number} year 年份
- * @returns {*}  {number}
- */
-export function getWeeksInYear(year) {
-    const lastDayOfYear = dayjs(`${year}-12-31`);
-    const week = lastDayOfYear.isoWeek();
-    return week === 1 ? 52 : week;
-}
-/**
- * @description 生成年周数组
- * @export
- * @param {string} minYearWeek 最小年周
- * @param {string} maxYearWeek 最大年周
- * @param {number} [paddingWeeks=0] 前后范围
- * @returns {*}  {string[]}
- */
-export function generateYearWeekRange(minYearWeek, maxYearWeek, paddingWeeks = 0) {
-    // 1. 解析最小和最大年周
-    const [minYear, minWeek] = minYearWeek.split('-').map(Number);
-    const [maxYear, maxWeek] = maxYearWeek.split('-').map(Number);
-    // 2. 计算起始年周（minYearWeek - paddingWeeks）
-    let startYear = minYear;
-    let startWeek = minWeek - paddingWeeks;
-    while (startWeek < 1) {
-        startYear--;
-        startWeek += getWeeksInYear(startYear);
-    }
-    // 3. 计算结束年周（maxYearWeek + paddingWeeks）
-    let endYear = maxYear;
-    let endWeek = maxWeek + paddingWeeks;
-    const maxWeeksInEndYear = getWeeksInYear(endYear);
-    if (endWeek > maxWeeksInEndYear) {
-        endWeek -= maxWeeksInEndYear;
-        endYear++;
-    }
-    // 4. 生成从 startYear-startWeek 到 endYear-endWeek 的所有年周
-    const yearWeeks = [];
-    let currentYear = startYear;
-    let currentWeek = startWeek;
-    while (currentYear < endYear ||
-        (currentYear === endYear && currentWeek <= endWeek)) {
-        yearWeeks.push(`${currentYear}-${currentWeek}`);
-        currentWeek++;
-        const weeksInCurrentYear = getWeeksInYear(currentYear);
-        if (currentWeek > weeksInCurrentYear) {
-            currentYear++;
-            currentWeek = 1;
-        }
-    }
-    return yearWeeks;
-}

package/out/controller/utils/view-msg/view-msg-controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"view-msg-controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/utils/view-msg/view-msg-controller.ts"],"names":[],"mappings":"AACA,OAAO,EACL,cAAc,EACd,oBAAoB,EACpB,WAAW,EACX,gBAAgB,EAChB,sBAAsB,EACvB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAKlD,aAAa;AACb,eAAO,MAAM,eAAe,aAAa,CAAC;AAE1C,qBAAa,iBAAiB;IAyB1B,SAAS,CAAC,UAAU,EAAE,MAAM;IAxB9B;;;;;OAKG;IACH,QAAQ,EAAG,gBAAgB,CAAC;IAE5B;;;;OAIG;IACH,UAAU,2BAAkC;IAE5C;;;;;OAKG;IACH,SAAS,CAAC,GAAG,SAAM;gBAGP,UAAU,EAAE,MAAM,EAC5B,GAAG,GAAE,MAAW;IAKlB;;;;;;OAMG;IACG,IAAI,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAiC5C;;;;;;;;OAQG;IACH,cAAc,CACZ,aAAa,EAAE,cAAc,EAC7B,OAAO,CAAC,EAAE,MAAM,GACf,MAAM,GAAG,SAAS;IAOrB;;;;;;;;;OASG;WACU,YAAY,CACvB,QAAQ,EAAE,oBAAoB,EAC9B,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,KAAK,EAAE,CAAC;IAoBnB;;;;;;;OAOG;IACH,uBAAuB,CAAC,IAAI,EAAE,YAAY,GAAG,MAAM,GAAG,IAAI;IAO1D;;;;;;;OAOG;IACH,uBAAuB,CAAC,IAAI,EAAE,YAAY,GAAG,IAAI;IAOjD;;;;;;;;;;OAUG;IACG,kBAAkB,CACtB,KAAK,EAAE,WAAW,EAClB,IAAI,EAAE,KAAK,EACX,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,OAAO,CAAC;IAyDnB;;;;;;;OAOG;IACG,gBAAgB,CACpB,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,YAAY,EAAE,CAAC;IAwC1B;;;;;;;OAOG;IACH,SAAS,CAAC,aAAa,CAAC,MAAM,EAAE,sBAAsB,GAAG,YAAY;IAyCrE;;;;;;;;;OASG;cACa,YAAY,CAC1B,MAAM,EAAE,sBAAsB,EAC9B,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,YAAY,EAAE,CAAC;CAqF3B"}
+{"version":3,"file":"view-msg-controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/utils/view-msg/view-msg-controller.ts"],"names":[],"mappings":"AACA,OAAO,EACL,cAAc,EACd,oBAAoB,EACpB,WAAW,EACX,gBAAgB,EAChB,sBAAsB,EACvB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAKlD,aAAa;AACb,eAAO,MAAM,eAAe,aAAa,CAAC;AAE1C,qBAAa,iBAAiB;IAyB1B,SAAS,CAAC,UAAU,EAAE,MAAM;IAxB9B;;;;;OAKG;IACH,QAAQ,EAAG,gBAAgB,CAAC;IAE5B;;;;OAIG;IACH,UAAU,2BAAkC;IAE5C;;;;;OAKG;IACH,SAAS,CAAC,GAAG,SAAM;gBAGP,UAAU,EAAE,MAAM,EAC5B,GAAG,GAAE,MAAW;IAKlB;;;;;;OAMG;IACG,IAAI,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAyC5C;;;;;;;;OAQG;IACH,cAAc,CACZ,aAAa,EAAE,cAAc,EAC7B,OAAO,CAAC,EAAE,MAAM,GACf,MAAM,GAAG,SAAS;IAOrB;;;;;;;;;OASG;WACU,YAAY,CACvB,QAAQ,EAAE,oBAAoB,EAC9B,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,KAAK,EAAE,CAAC;IAoBnB;;;;;;;OAOG;IACH,uBAAuB,CAAC,IAAI,EAAE,YAAY,GAAG,MAAM,GAAG,IAAI;IAO1D;;;;;;;OAOG;IACH,uBAAuB,CAAC,IAAI,EAAE,YAAY,GAAG,IAAI;IAOjD;;;;;;;;;;OAUG;IACG,kBAAkB,CACtB,KAAK,EAAE,WAAW,EAClB,IAAI,EAAE,KAAK,EACX,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,OAAO,CAAC;IAyDnB;;;;;;;OAOG;IACG,gBAAgB,CACpB,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,YAAY,EAAE,CAAC;IAwC1B;;;;;;;OAOG;IACH,SAAS,CAAC,aAAa,CAAC,MAAM,EAAE,sBAAsB,GAAG,YAAY;IAyCrE;;;;;;;;;OASG;cACa,YAAY,CAC1B,MAAM,EAAE,sBAAsB,EAC9B,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,YAAY,EAAE,CAAC;CAqF3B"}

package/out/controller/utils/view-msg/view-msg-controller.js

@@ -31,7 +31,7 @@ export class ViewMsgController {
      * @return {*}  {Promise<void>}
      */
     async init(context) {
-        var _a, _b;
+        var _a, _b, _c;
         const appModel = ibiz.hub.getApp(context.srfappid).model;
         const msgGroup = (_a = appModel.appViewMsgGroups) === null || _a === void 0 ? void 0 : _a.find(item => item.id === this.msgGroupId);
         if (!msgGroup) {
@@ -40,10 +40,17 @@ export class ViewMsgController {
             }));
         }
         this.msgGroup = msgGroup;
-        const msgDetailsViewMsgIds = msgGroup.appViewMsgGroupDetails.map(item => item.appViewMsgId);
-        (_b = appModel.appViewMsgs) === null || _b === void 0 ? void 0 : _b.forEach(item => {
+        const msgDetailsViewMsgIds = (_b = msgGroup.appViewMsgGroupDetails) === null || _b === void 0 ? void 0 : _b.map(item => item.appViewMsgId);
+        if (!msgDetailsViewMsgIds)
+            return;
+        (_c = appModel.appViewMsgs) === null || _c === void 0 ? void 0 : _c.forEach(item => {
+            var _a;
             const index = msgDetailsViewMsgIds.indexOf(item.id);
             if (index !== -1) {
+                // 转换视图消息多语言
+                if ((_a = item.contentLanguageRes) === null || _a === void 0 ? void 0 : _a.lanResTag) {
+                    item.message = ibiz.i18n.t(item.contentLanguageRes.lanResTag, item.message);
+                }
                 this.viewMsgMap.set(item.id, item);
                 msgDetailsViewMsgIds.splice(index, 1);
             }

package/out/de-logic/de-logic-node/debug-param-node/debug-param-node.d.ts

@@ -0,0 +1,14 @@
+import { IDEDebugParamLogic } from '@ibiz/model-core';
+import { DELogicContext } from '../../de-logic-context';
+import { DELogicNode } from '../de-logic-node';
+/**
+ * @description 调试逻辑参数节点
+ * @export
+ * @class DebugParamNode
+ * @extends {DELogicNode}
+ */
+export declare class DebugParamNode extends DELogicNode {
+    model: IDEDebugParamLogic;
+    exec(ctx: DELogicContext): Promise<void>;
+}
+//# sourceMappingURL=debug-param-node.d.ts.map

package/out/de-logic/de-logic-node/debug-param-node/debug-param-node.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"debug-param-node.d.ts","sourceRoot":"","sources":["../../../../src/de-logic/de-logic-node/debug-param-node/debug-param-node.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C;;;;;GAKG;AACH,qBAAa,cAAe,SAAQ,WAAW;IACrC,KAAK,EAAE,kBAAkB,CAAC;IAE5B,IAAI,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;CAc/C"}

package/out/de-logic/de-logic-node/debug-param-node/debug-param-node.js

@@ -0,0 +1,18 @@
+import { RuntimeModelError } from '@ibiz-template/core';
+import { DELogicNode } from '../de-logic-node';
+/**
+ * @description 调试逻辑参数节点
+ * @export
+ * @class DebugParamNode
+ * @extends {DELogicNode}
+ */
+export class DebugParamNode extends DELogicNode {
+    async exec(ctx) {
+        const { dstDELogicParamId, name } = this.model;
+        if (!dstDELogicParamId) {
+            throw new RuntimeModelError(this.model, ibiz.i18n.t('runtime.deLogic.deLogicNode.missingConfiguration'));
+        }
+        const param = ctx.params[dstDELogicParamId];
+        ibiz.log.info(ibiz.i18n.t('runtime.deLogic.deLogicNode.logicalNodeOperation', { name }), param);
+    }
+}