@ibiz-template/runtime 0.1.7 → 0.1.9

package/out/service/vo/tree-node-data/tree-data-set-node-data.d.ts

@@ -1,5 +1,5 @@
-import { IDETreeDataSetNode } from '@ibiz/model-core';
-import { ITreeNodeData } from '../../../interface';
+import { IDETreeDataSetNode, IDETreeNodeDataItem } from '@ibiz/model-core';
+import { IIcon, ITreeNodeData } from '../../../interface';
 import { TreeNodeData } from './tree-node-data';
 /**
  * 实体数据集树节点数据
@@ -20,5 +20,24 @@ export declare class TreeDataSetNodeData extends TreeNodeData implements ITreeNo
         navContext?: IParams;
         navParams?: IParams;
     });
+    protected calcIcon(model: IDETreeDataSetNode): IIcon | undefined;
+    /**
+     * 计算节点数据项的自定义脚本内容
+     * @author lxm
+     * @date 2023-08-15 02:37:29
+     * @protected
+     * @param {IDETreeNodeDataItem} dataItem
+     * @return {*}  {(string | undefined)}
+     */
+    protected calcDataItemScript(dataItem: IDETreeNodeDataItem): string | undefined;
+    /**
+     * 计算节点文本html内容
+     * @author lxm
+     * @date 2023-08-15 02:41:31
+     * @protected
+     * @param {IDETreeDataSetNode} model
+     * @return {*}  {(string | undefined)}
+     */
+    protected calcTextHtml(model: IDETreeDataSetNode): string | undefined;
 }
 //# sourceMappingURL=tree-data-set-node-data.d.ts.map

package/out/service/vo/tree-node-data/tree-data-set-node-data.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tree-data-set-node-data.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/tree-node-data/tree-data-set-node-data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD;;;;;;;GAOG;AACH,qBAAa,mBAAoB,SAAQ,YAAa,YAAW,aAAa;IAC5E,IAAI,EAAE,MAAM,CAAC;IAEb,EAAE,EAAE,MAAM,CAAC;IAEX,KAAK,EAAE,MAAM,CAAC;IAEd,MAAM,EAAE,KAAK,CAAC;gBAGZ,KAAK,EAAE,kBAAkB,EACzB,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE;QACJ,IAAI,EAAE,KAAK,CAAC;QACZ,IAAI,EAAE,OAAO,CAAC;QACd,UAAU,CAAC,EAAE,OAAO,CAAC;QACrB,SAAS,CAAC,EAAE,OAAO,CAAC;KACrB;CAwBJ"}
+{"version":3,"file":"tree-data-set-node-data.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/tree-node-data/tree-data-set-node-data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAC3E,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAG1D,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD;;;;;;;GAOG;AACH,qBAAa,mBAAoB,SAAQ,YAAa,YAAW,aAAa;IAC5E,IAAI,EAAE,MAAM,CAAC;IAEb,EAAE,EAAE,MAAM,CAAC;IAEX,KAAK,EAAE,MAAM,CAAC;IAEd,MAAM,EAAE,KAAK,CAAC;gBAGZ,KAAK,EAAE,kBAAkB,EACzB,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE;QACJ,IAAI,EAAE,KAAK,CAAC;QACZ,IAAI,EAAE,OAAO,CAAC;QACd,UAAU,CAAC,EAAE,OAAO,CAAC;QACrB,SAAS,CAAC,EAAE,OAAO,CAAC;KACrB;IA4BH,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,kBAAkB,GAAG,KAAK,GAAG,SAAS;IAiBhE;;;;;;;OAOG;IACH,SAAS,CAAC,kBAAkB,CAC1B,QAAQ,EAAE,mBAAmB,GAC5B,MAAM,GAAG,SAAS;IAYrB;;;;;;;OAOG;IACH,SAAS,CAAC,YAAY,CAAC,KAAK,EAAE,kBAAkB,GAAG,MAAM,GAAG,SAAS;CAStE"}

package/out/service/vo/tree-node-data/tree-data-set-node-data.js

@@ -1,4 +1,5 @@
 import { calcDeCodeNameById } from '../../../model';
+import { ScriptFactory } from '../../../utils';
 import { TreeNodeData } from './tree-node-data';
 /**
  * 实体数据集树节点数据
@@ -29,5 +30,54 @@ export class TreeDataSetNodeData extends TreeNodeData {
         }
         this.srfkey = this.deData.srfkey;
         this.srfmajortext = this.deData.srfmajortext;
+        this.icon = this.calcIcon(model);
+        this.textHtml = this.calcTextHtml(model);
+    }
+    calcIcon(model) {
+        const icon = super.calcIcon(model) || {};
+        const { iconAppDEFieldId, detreeNodeDataItems } = model;
+        if (iconAppDEFieldId && this.deData[iconAppDEFieldId]) {
+            icon.imagePath = this.deData[iconAppDEFieldId];
+        }
+        if (icon) {
+            this.icon = icon;
+        }
+        const iconDataItem = detreeNodeDataItems === null || detreeNodeDataItems === void 0 ? void 0 : detreeNodeDataItems.find(item => item.id === 'icon');
+        if (iconDataItem) {
+            icon.htmlStr = this.calcDataItemScript(iconDataItem);
+        }
+        return Object.values(icon).length > 0 ? icon : undefined;
+    }
+    /**
+     * 计算节点数据项的自定义脚本内容
+     * @author lxm
+     * @date 2023-08-15 02:37:29
+     * @protected
+     * @param {IDETreeNodeDataItem} dataItem
+     * @return {*}  {(string | undefined)}
+     */
+    calcDataItemScript(dataItem) {
+        if (dataItem.customCode && dataItem.scriptCode) {
+            return ScriptFactory.execScriptFn({ data: this.deData }, dataItem.scriptCode, {
+                isAsync: false,
+            });
+        }
+    }
+    /**
+     * 计算节点文本html内容
+     * @author lxm
+     * @date 2023-08-15 02:41:31
+     * @protected
+     * @param {IDETreeDataSetNode} model
+     * @return {*}  {(string | undefined)}
+     */
+    calcTextHtml(model) {
+        let html;
+        const { detreeNodeDataItems } = model;
+        const textDataItem = detreeNodeDataItems === null || detreeNodeDataItems === void 0 ? void 0 : detreeNodeDataItems.find(item => item.id === 'text');
+        if (textDataItem) {
+            html = this.calcDataItemScript(textDataItem);
+        }
+        return html;
     }
 }

package/out/service/vo/tree-node-data/tree-node-data.d.ts

@@ -1,5 +1,5 @@
 import { IDETreeNode } from '@ibiz/model-core';
-import { ITreeNodeData } from '../../../interface';
+import { IIcon, ITreeNodeData } from '../../../interface';
 /**
  * 树节点数据基类
  *
@@ -20,10 +20,21 @@ export declare abstract class TreeNodeData implements ITreeNodeData {
     context?: IParams;
     params?: IParams;
     parent?: ITreeNodeData;
+    icon?: IIcon;
+    textHtml?: string;
     constructor(model: IDETreeNode, parentNodeData: ITreeNodeData | undefined, opts: {
         leaf: boolean;
         navContext?: IParams;
         navParams?: IParams;
     });
+    /**
+     * 计算节点图标
+     * @author lxm
+     * @date 2023-08-15 02:24:55
+     * @protected
+     * @param {IDETreeNode} model
+     * @return {*}  {(IIcon | undefined)}
+     */
+    protected calcIcon(model: IDETreeNode): IIcon | undefined;
 }
 //# sourceMappingURL=tree-node-data.d.ts.map

package/out/service/vo/tree-node-data/tree-node-data.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tree-node-data.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/tree-node-data/tree-node-data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD;;;;;;GAMG;AACH,8BAAsB,YAAa,YAAW,aAAa;IACzD,EAAE,EAAG,MAAM,CAAC;IAEZ,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE3B,IAAI,EAAG,MAAM,CAAC;IAEd,QAAQ,CAAC,EAAE,aAAa,EAAE,GAAG,SAAS,CAAC;IAEvC,MAAM,CAAC,EAAE,KAAK,GAAG,SAAS,CAAC;IAE3B,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE5B,YAAY,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAElC,MAAM,EAAE,MAAM,CAAC;IAEf,IAAI,EAAE,OAAO,CAAS;IAEtB,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB,MAAM,CAAC,EAAE,OAAO,CAAC;IAEjB,MAAM,CAAC,EAAE,aAAa,CAAC;gBAGrB,KAAK,EAAE,WAAW,EAClB,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE;QAAE,IAAI,EAAE,OAAO,CAAC;QAAC,UAAU,CAAC,EAAE,OAAO,CAAC;QAAC,SAAS,CAAC,EAAE,OAAO,CAAA;KAAE;CAuBrE"}
+{"version":3,"file":"tree-node-data.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/tree-node-data/tree-node-data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAE1D;;;;;;GAMG;AACH,8BAAsB,YAAa,YAAW,aAAa;IACzD,EAAE,EAAG,MAAM,CAAC;IAEZ,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE3B,IAAI,EAAG,MAAM,CAAC;IAEd,QAAQ,CAAC,EAAE,aAAa,EAAE,GAAG,SAAS,CAAC;IAEvC,MAAM,CAAC,EAAE,KAAK,GAAG,SAAS,CAAC;IAE3B,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE5B,YAAY,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAElC,MAAM,EAAE,MAAM,CAAC;IAEf,IAAI,EAAE,OAAO,CAAS;IAEtB,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB,MAAM,CAAC,EAAE,OAAO,CAAC;IAEjB,MAAM,CAAC,EAAE,aAAa,CAAC;IAEvB,IAAI,CAAC,EAAE,KAAK,CAAC;IAEb,QAAQ,CAAC,EAAE,MAAM,CAAC;gBAGhB,KAAK,EAAE,WAAW,EAClB,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE;QAAE,IAAI,EAAE,OAAO,CAAC;QAAC,UAAU,CAAC,EAAE,OAAO,CAAC;QAAC,SAAS,CAAC,EAAE,OAAO,CAAA;KAAE;IAsBpE;;;;;;;OAOG;IACH,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,WAAW,GAAG,KAAK,GAAG,SAAS;CAa1D"}

package/out/service/vo/tree-node-data/tree-node-data.js

@@ -22,7 +22,26 @@ export class TreeNodeData {
             this.params = Object.assign({}, opts.navParams);
         }
         this.nodeId = model.id;
-        // todo 是否有自己点跟是否搜索有关
-        // this.leaf = model.tree.getChildNodes(model.id, opts.hasQuery).length === 0;
+    }
+    /**
+     * 计算节点图标
+     * @author lxm
+     * @date 2023-08-15 02:24:55
+     * @protected
+     * @param {IDETreeNode} model
+     * @return {*}  {(IIcon | undefined)}
+     */
+    calcIcon(model) {
+        const { sysImage } = model;
+        const icon = {};
+        if (sysImage) {
+            if (sysImage.cssClass) {
+                icon.cssClass = sysImage.cssClass;
+            }
+            if (sysImage.imagePath) {
+                icon.imagePath = sysImage.imagePath;
+            }
+        }
+        return Object.values(icon).length > 0 ? icon : undefined;
     }
 }

package/out/service/vo/tree-node-data/tree-static-node-data.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tree-static-node-data.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/tree-node-data/tree-static-node-data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD;;;;;;;GAOG;AACH,qBAAa,kBAAmB,SAAQ,YAAa,YAAW,aAAa;IAC3E,IAAI,EAAE,MAAM,CAAC;IAEb,EAAE,EAAE,MAAM,CAAC;IAEX,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,MAAM,CAAC,EAAE,KAAK,CAAC;gBAGb,KAAK,EAAE,iBAAiB,EACxB,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE;QAAE,gBAAgB,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,OAAO,CAAA;KAAE;CA6BrD"}
+{"version":3,"file":"tree-static-node-data.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/tree-node-data/tree-static-node-data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD;;;;;;;GAOG;AACH,qBAAa,kBAAmB,SAAQ,YAAa,YAAW,aAAa;IAC3E,IAAI,EAAE,MAAM,CAAC;IAEb,EAAE,EAAE,MAAM,CAAC;IAEX,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,MAAM,CAAC,EAAE,KAAK,CAAC;gBAGb,KAAK,EAAE,iBAAiB,EACxB,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE;QAAE,gBAAgB,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,OAAO,CAAA;KAAE;CA+BrD"}

package/out/service/vo/tree-node-data/tree-static-node-data.js

@@ -33,5 +33,6 @@ export class TreeStaticNodeData extends TreeNodeData {
         }
         this.srfkey = ((_a = this.deData) === null || _a === void 0 ? void 0 : _a.srfkey) || this.value;
         this.srfmajortext = ((_b = this.deData) === null || _b === void 0 ? void 0 : _b.srfmajortext) || this.text;
+        this.icon = this.calcIcon(model);
     }
 }

package/out/types.d.ts

@@ -1,10 +1,9 @@
 import { I18n } from '@ibiz-template/core/src/interface';
 import { EngineFactory } from './engine';
 import { GlobalUtil } from './global';
-import { IMessageUtil, INotificationUtil, IOpenViewUtil, IModalUtil, IConfirmUtil, ILoadingUtil, IPluginFactory, IOverlayController, IGlobalConfig, IAppHubService } from './interface';
+import { IMessageUtil, INotificationUtil, IOpenViewUtil, IModalUtil, IConfirmUtil, ILoadingUtil, IPluginFactory, IOverlayController, IGlobalConfig, IAppHubService, IAuthService } from './interface';
 import { LogicSchedulerCenter } from './logic-scheduler';
 import { RegisterCenter } from './register/register-center';
-import { AuthService } from './service';
 declare module '@ibiz-template/core' {
     interface IBizSys {
         /**
@@ -105,9 +104,9 @@ declare module '@ibiz-template/core' {
          *
          * @author chitanda
          * @date 2022-07-20 10:07:33
-         * @type {AuthService}
+         * @type {IAuthService}
          */
-        auth: AuthService;
+        auth: IAuthService;
         /**
          * 引擎工厂
          * @author lxm

package/out/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,mCAAmC,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AACtC,OAAO,EACL,YAAY,EACZ,iBAAiB,EACjB,aAAa,EACb,UAAU,EACV,YAAY,EACZ,YAAY,EACZ,cAAc,EACd,kBAAkB,EAClB,aAAa,EACb,cAAc,EACf,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAExC,OAAO,QAAQ,qBAAqB,CAAC;IACnC,UAAU,OAAO;QACf;;;;;;WAMG;QACH,OAAO,EAAE,YAAY,CAAC;QAEtB;;;;;;WAMG;QACH,GAAG,EAAE,cAAc,CAAC;QAEpB;;;;;;;WAOG;QACH,KAAK,EAAE,UAAU,CAAC;QAElB;;;;;;;WAOG;QACH,OAAO,EAAE,YAAY,CAAC;QAEtB;;;;;;;WAOG;QACH,OAAO,EAAE,YAAY,CAAC;QAEtB;;;;;;;WAOG;QACH,YAAY,EAAE,iBAAiB,CAAC;QAEhC;;;;;;;WAOG;QACH,QAAQ,EAAE,aAAa,CAAC;QAExB;;;;;;WAMG;QACH,OAAO,EAAE,kBAAkB,CAAC;QAE5B;;;;;;WAMG;QACH,MAAM,EAAE,cAAc,CAAC;QAEvB;;;;;;WAMG;QACH,QAAQ,EAAE,cAAc,CAAC;QAEzB;;;;;;WAMG;QACH,MAAM,EAAE,aAAa,CAAC;QAEtB;;;;;;WAMG;QACH,IAAI,EAAE,WAAW,CAAC;QAElB;;;;;WAKG;QACH,MAAM,EAAE,aAAa,CAAC;QAEtB;;;;;;WAMG;QACH,IAAI,EAAE,UAAU,CAAC;QAEjB;;;;;;WAMG;QACH,IAAI,EAAE,IAAI,CAAC;QAEX;;;;;WAKG;QACH,SAAS,EAAE,oBAAoB,CAAC;KACjC;CACF"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,mCAAmC,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AACtC,OAAO,EACL,YAAY,EACZ,iBAAiB,EACjB,aAAa,EACb,UAAU,EACV,YAAY,EACZ,YAAY,EACZ,cAAc,EACd,kBAAkB,EAClB,aAAa,EACb,cAAc,EACd,YAAY,EACb,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAE5D,OAAO,QAAQ,qBAAqB,CAAC;IACnC,UAAU,OAAO;QACf;;;;;;WAMG;QACH,OAAO,EAAE,YAAY,CAAC;QAEtB;;;;;;WAMG;QACH,GAAG,EAAE,cAAc,CAAC;QAEpB;;;;;;;WAOG;QACH,KAAK,EAAE,UAAU,CAAC;QAElB;;;;;;;WAOG;QACH,OAAO,EAAE,YAAY,CAAC;QAEtB;;;;;;;WAOG;QACH,OAAO,EAAE,YAAY,CAAC;QAEtB;;;;;;;WAOG;QACH,YAAY,EAAE,iBAAiB,CAAC;QAEhC;;;;;;;WAOG;QACH,QAAQ,EAAE,aAAa,CAAC;QAExB;;;;;;WAMG;QACH,OAAO,EAAE,kBAAkB,CAAC;QAE5B;;;;;;WAMG;QACH,MAAM,EAAE,cAAc,CAAC;QAEvB;;;;;;WAMG;QACH,QAAQ,EAAE,cAAc,CAAC;QAEzB;;;;;;WAMG;QACH,MAAM,EAAE,aAAa,CAAC;QAEtB;;;;;;WAMG;QACH,IAAI,EAAE,YAAY,CAAC;QAEnB;;;;;WAKG;QACH,MAAM,EAAE,aAAa,CAAC;QAEtB;;;;;;WAMG;QACH,IAAI,EAAE,UAAU,CAAC;QAEjB;;;;;;WAMG;QACH,IAAI,EAAE,IAAI,CAAC;QAEX;;;;;WAKG;QACH,SAAS,EAAE,oBAAoB,CAAC;KACjC;CACF"}

package/out/utils/open-redirect-view/open-redirect-view.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"open-redirect-view.d.ts","sourceRoot":"","sources":["../../../src/utils/open-redirect-view/open-redirect-view.ts"],"names":[],"mappings":"AACA,OAAO,EACL,kBAAkB,EAClB,cAAc,EACd,gBAAgB,EACjB,MAAM,kBAAkB,CAAC;AAI1B,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAK/D;;;;;;;;;;;GAWG;AACH,wBAAsB,gBAAgB,CACpC,OAAO,EAAE,gBAAgB,EACzB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,EACpB,IAAI,GAAE,gBAAqB,GAC1B,OAAO,CAAC,UAAU,CAAC,CAOrB;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,yBAAyB,CAC7C,OAAO,EAAE,QAAQ,EACjB,OAAO,EAAE,MAAM,EACf,IAAI,GAAE,gBAAqB,GAC1B,OAAO,CAAC,IAAI,CAAC,CAoDf;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,kBAAkB,EAC3B,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,EACpB,IAAI,GAAE,gBAAqB,GAC1B,OAAO,CAAC,UAAU,CAAC,CAyGrB;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,WAAW,CAC/B,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,kBAAkB,EAC1B,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,MAAM,CAAC,CA0CjB"}
+{"version":3,"file":"open-redirect-view.d.ts","sourceRoot":"","sources":["../../../src/utils/open-redirect-view/open-redirect-view.ts"],"names":[],"mappings":"AACA,OAAO,EACL,kBAAkB,EAClB,cAAc,EACd,gBAAgB,EACjB,MAAM,kBAAkB,CAAC;AAI1B,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAK/D;;;;;;;;;;;GAWG;AACH,wBAAsB,gBAAgB,CACpC,OAAO,EAAE,gBAAgB,EACzB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,EACpB,IAAI,GAAE,gBAAqB,GAC1B,OAAO,CAAC,UAAU,CAAC,CAOrB;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,yBAAyB,CAC7C,OAAO,EAAE,QAAQ,EACjB,OAAO,EAAE,MAAM,EACf,IAAI,GAAE,gBAAqB,GAC1B,OAAO,CAAC,IAAI,CAAC,CAoDf;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,kBAAkB,EAC3B,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,EACpB,IAAI,GAAE,gBAAqB,GAC1B,OAAO,CAAC,UAAU,CAAC,CAwGrB;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,WAAW,CAC/B,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,kBAAkB,EAC1B,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,MAAM,CAAC,CA4CjB"}

package/out/utils/open-redirect-view/open-redirect-view.js

@@ -146,8 +146,9 @@ export async function openDERedirectView(appView, context, params = {}, opts = {
     // 所有重定向引用视图
     const allRefViews = appView.redirectAppViewRefs;
     const refView = allRefViews === null || allRefViews === void 0 ? void 0 : allRefViews.find(view => {
+        const matchKey = view.name || view.id;
         // 特殊补充 wfRdTag 匹配，子流程应用特殊模式
-        return (view.name === deRdTag || view.name === rdTag || view.name === wfRdTag);
+        return matchKey === deRdTag || matchKey === rdTag || matchKey === wfRdTag;
     });
     if (refView) {
         const viewId = refView.refAppViewId;
@@ -185,16 +186,6 @@ export async function openDERedirectView(appView, context, params = {}, opts = {
  */
 export async function calcDERdTag(entity, rdView, params, data) {
     let rdTag = '';
-    const defView = `${ibiz.env.isMob ? 'MOB' : ''}EDITVIEW`;
-    // 如果流程步骤存在，按照工作流优先
-    const srfWf = params.srfwf;
-    if (notNilEmpty(srfWf)) {
-        if (notNilEmpty(params.wf)) {
-            return `${defView}:${srfWf.toUpperCase()}:${params.wf.toUpperCase()}`;
-        }
-        return `${defView}:${srfWf.toUpperCase()}`;
-    }
-    let typeValue = '';
     // 重定向视图自定义类别属性
     const typeFieldId = rdView.typeAppDEFieldId;
     // 自定义重定向
@@ -202,15 +193,24 @@ export async function calcDERdTag(entity, rdView, params, data) {
         const { codeName } = findFieldById(entity, typeFieldId);
         const value = data[codeName.toLowerCase()];
         if (notNilEmpty(value)) {
-            typeValue = value;
+            return `${value}`;
         }
+        ibiz.log.warn(`重定向视图[${rdView.name}]自定义类别属性[${typeFieldId}]值为空`, data);
     }
-    if (isNilOrEmpty(typeValue)) {
-        // 从索引属性获取重定向视图类型
-        if (entity.indexTypeAppDEFieldId) {
-            const { codeName } = findFieldById(entity, entity.indexTypeAppDEFieldId);
-            typeValue = data[codeName.toLowerCase()];
+    const defView = `${ibiz.env.isMob ? 'MOB' : ''}EDITVIEW`;
+    // 如果流程步骤存在，按照工作流优先
+    const srfWf = params.srfwf;
+    if (notNilEmpty(srfWf)) {
+        if (notNilEmpty(params.wf)) {
+            return `${defView}:${srfWf.toUpperCase()}:${params.wf.toUpperCase()}`;
         }
+        return `${defView}:${srfWf.toUpperCase()}`;
+    }
+    let typeValue = '';
+    // 从索引属性获取重定向视图类型
+    if (entity.indexTypeAppDEFieldId) {
+        const { codeName } = findFieldById(entity, entity.indexTypeAppDEFieldId);
+        typeValue = data[codeName.toLowerCase()];
     }
     if (isNilOrEmpty(typeValue)) {
         // 从多表单属性判断重定向视图类型

package/out/utils/script/script-function.d.ts

@@ -32,6 +32,15 @@ export declare class ScriptFunction {
      * @return {*}  {any[]}
      */
     protected convertArgs(params: IParams): any[];
+    /**
+     * 填充预置参数
+     * @author lxm
+     * @date 2023-08-21 04:07:50
+     * @protected
+     * @param {string} key
+     * @param {IParams} param
+     */
+    protected fillDefaultParams(key: string, param: IParams): void;
     /**
      * 执行脚本代码
      * @author lxm

package/out/utils/script/script-function.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"script-function.d.ts","sourceRoot":"","sources":["../../../src/utils/script/script-function.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAQtD,qBAAa,cAAc;IACzB,SAAS,CAAC,QAAQ,EAAE,QAAQ,CAAC;IAE7B,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,CAAM;IAEjC,SAAS,CAAC,OAAO,EAAE,mBAAmB,CAAC;gBAGrC,OAAO,EAAE,MAAM,EAAE,EACjB,UAAU,EAAE,MAAM,EAClB,OAAO,GAAE,mBAAoC;IAQ/C;;;;;;;;OAQG;IACH,SAAS,CAAC,UAAU,CAClB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,mBAAmB,GAC3B,MAAM;IAQT;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,mBAAmB,GAAG,IAAI;IAS5E;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,CAAC,MAAM,EAAE,OAAO,GAAG,GAAG,EAAE;IAoB7C;;;;;;OAMG;IACH,IAAI,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO;CAI/B"}
+{"version":3,"file":"script-function.d.ts","sourceRoot":"","sources":["../../../src/utils/script/script-function.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,mBAAmB,EAAmB,MAAM,iBAAiB,CAAC;AASvE,qBAAa,cAAc;IACzB,SAAS,CAAC,QAAQ,EAAE,QAAQ,CAAC;IAE7B,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,CAAM;IAEjC,SAAS,CAAC,OAAO,EAAE,mBAAmB,CAAC;gBAGrC,OAAO,EAAE,MAAM,EAAE,EACjB,UAAU,EAAE,MAAM,EAClB,OAAO,GAAE,mBAAoC;IAW/C;;;;;;;;OAQG;IACH,SAAS,CAAC,UAAU,CAClB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,mBAAmB,GAC3B,MAAM;IAWT;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,mBAAmB,GAAG,IAAI;IA4B5E;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,CAAC,MAAM,EAAE,OAAO,GAAG,GAAG,EAAE;IAuB7C;;;;;;;OAOG;IACH,SAAS,CAAC,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,IAAI;IAyC9D;;;;;;OAMG;IACH,IAAI,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO;CAI/B"}

package/out/utils/script/script-function.js

@@ -6,6 +6,7 @@ import { mergeRight } from 'ramda';
 const DefaultOptions = {
     /** 是否是单行脚本，并把表达式结果return */
     singleRowReturn: false,
+    isAsync: true,
 };
 export class ScriptFunction {
     constructor(argKeys, scriptCode, options = DefaultOptions) {
@@ -13,7 +14,10 @@ export class ScriptFunction {
         this.options = options;
         const code = this.formatCode(scriptCode, options);
         this.calcArgKeys(argKeys, options);
-        this.scriptFn = new Function(...this.argKeys, code);
+        const fn = new Function(...this.argKeys, code);
+        this.scriptFn = function callBack(...args) {
+            return fn.apply({}, args);
+        };
     }
     /**
      * 格式化脚本
@@ -29,6 +33,9 @@ export class ScriptFunction {
         if (options.singleRowReturn) {
             code = `return (${code})`;
         }
+        if (options.isAsync) {
+            code = `return (async function() { ${code}} )();`;
+        }
         return code;
     }
     /**
@@ -43,7 +50,26 @@ export class ScriptFunction {
         const keys = options.presetParams ? Object.keys(options.presetParams) : [];
         keys.push(...argKeys);
         // 预置提供的参数
-        keys.push('document', 'el', 'selector');
+        const presetArgsKeys = [
+            'document',
+            'el',
+            'selector',
+            'env',
+            'appSession',
+            'topViewSession',
+            'viewSession',
+            'context',
+            'viewParam',
+            'activeData',
+            'data',
+            'app',
+            'topView',
+            'parentView',
+            'view',
+            'parent',
+            'util',
+        ];
+        keys.push(...presetArgsKeys);
         // 除重
         this.argKeys = Array.from(new Set(keys));
     }
@@ -67,10 +93,61 @@ export class ScriptFunction {
         // 对象参数转数组
         const result = [];
         this.argKeys.forEach(key => {
+            if (_params[key] === undefined) {
+                this.fillDefaultParams(key, _params);
+            }
             result.push(_params[key]);
         });
         return result;
     }
+    /**
+     * 填充预置参数
+     * @author lxm
+     * @date 2023-08-21 04:07:50
+     * @protected
+     * @param {string} key
+     * @param {IParams} param
+     */
+    fillDefaultParams(key, param) {
+        const view = param.view;
+        switch (key) {
+            case 'util': // 工具类
+                param.util = {
+                    message: ibiz.message,
+                    notification: ibiz.notification,
+                    modal: ibiz.modal,
+                    confirm: ibiz.confirm,
+                    openView: ibiz.openView,
+                };
+                break;
+            case 'env': // 全局环境变量
+                param.env = ibiz.env;
+                break;
+            case 'app': // 应用级的控制器
+                param.app = ibiz.hub.controller;
+                break;
+            case 'parent': // 父容器控制器
+                param.parent = view === null || view === void 0 ? void 0 : view.parentView;
+                break;
+            case 'topView': // 顶级视图控制器
+                param.topView = view === null || view === void 0 ? void 0 : view.getTopView();
+                break;
+            case 'parentView': // 父级视图控制器
+                param.parentView = view === null || view === void 0 ? void 0 : view.parentView;
+                break;
+            case 'topViewSession': // 顶级视图共享数据对象
+                param.topViewSession = view === null || view === void 0 ? void 0 : view.getTopView().session;
+                break;
+            case 'viewSession': // 当前视图共享数据对象
+                param.viewSession = view === null || view === void 0 ? void 0 : view.session;
+                break;
+            case 'appSession': // 全局共享数据对象
+                param.appSession = ibiz.hub.controller.session;
+                break;
+            default:
+                break;
+        }
+    }
     /**
      * 执行脚本代码
      * @author lxm

package/out/utils/verify/de-rule-verify.js

@@ -361,7 +361,7 @@ function checkFieldScriptRule(value, data, scriptCode, errorInfo, primaryModel)
     };
     try {
         // 避免脚本内变量冲突
-        const result = ScriptFactory.execScriptFn({ value, data: source }, scriptCode);
+        const result = ScriptFactory.execScriptFn({ value, data: source }, scriptCode, { isAsync: false });
         if (typeof result === 'boolean') {
             resultBoolean = result;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.1.7",
+  "version": "0.1.9",
   "description": "控制器包",
   "type": "module",
   "main": "out/index.js",
@@ -29,7 +29,7 @@
   "author": "chitanda",
   "license": "MIT",
   "devDependencies": {
-    "@ibiz-template/core": "^0.1.7",
+    "@ibiz-template/core": "^0.1.8",
     "@ibiz/model-core": "^0.0.14",
     "@types/path-browserify": "^1.0.0",
     "@types/qs": "^6.9.7",
@@ -53,5 +53,5 @@
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
   },
-  "gitHead": "5e283e6c4cfad7a27402a60f96d4f628bf1dbb1a"
+  "gitHead": "996ad2a8bc9cd856f5a672ebdc97748124c07da1"
 }

package/src/app-hub.ts

@@ -3,6 +3,7 @@ import { RuntimeError } from '@ibiz-template/core';
 import { Application } from './application';
 import { IAppHubService, ModelLoaderProvider } from './interface';
 import { AppConfigService, Convert } from './hub';
+import { HubController } from './controller';
 
 /**
  * 运行时总集
@@ -22,6 +23,14 @@ export class AppHub implements IAppHubService {
    */
   readonly convert: Convert = new Convert();
 
+  /**
+   * 全局控制器，放置全局性的功能性方法
+   *
+   * @author chitanda
+   * @date 2023-08-21 15:08:48
+   */
+  readonly controller = new HubController();
+
   /**
    * 应用总集
    *

package/src/command/app/open-app-view/open-app-view.ts

@@ -100,7 +100,7 @@ export class OpenAppViewCommand {
     context: IContext,
     params: IParams = {},
   ): Promise<IModalData> {
-    return ibiz.openView.root(appView, context, params);
+    return ibiz.openView.root(appView.id, context, params);
   }
 
   /**
@@ -119,7 +119,7 @@ export class OpenAppViewCommand {
     context: IContext,
     params: IParams = {},
   ): Promise<IModalData> {
-    return ibiz.openView.modal(appView, context, params);
+    return ibiz.openView.modal(appView.id, context, params);
   }
 
   /**
@@ -142,7 +142,7 @@ export class OpenAppViewCommand {
     if (!event) {
       throw new RuntimeError('气泡打开缺少event');
     }
-    return ibiz.openView.popover(appView, event, context, params);
+    return ibiz.openView.popover(appView.id, event, context, params);
   }
 
   /**
@@ -161,7 +161,7 @@ export class OpenAppViewCommand {
     context: IContext,
     params: IParams = {},
   ): Promise<IModalData> {
-    return ibiz.openView.drawer(appView, context, params);
+    return ibiz.openView.drawer(appView.id, context, params);
   }
 
   /**
@@ -180,6 +180,6 @@ export class OpenAppViewCommand {
     context: IContext,
     params: IParams = {},
   ): Promise<IModalData> {
-    return ibiz.openView.custom(appView, context, params);
+    return ibiz.openView.custom(appView.id, context, params);
   }
 }

package/src/constant/sys-uiaction-tag.ts

@@ -143,6 +143,14 @@ export enum SysUIActionTag {
    * 行编辑
    */
   'TOGGLE_ROW_EDIT' = 'ToggleRowEdit',
+  /**
+   * 树界面_刷新全部操作
+   */
+  'REFRESH_ALL' = 'RefreshAll',
+  /**
+   * 树界面_刷新父节点操作
+   */
+  'REFRESH_PARENT' = 'RefreshParent',
 
   // 非预置界面行为 Start
 

package/src/controller/common/control/control.controller.ts

@@ -1,4 +1,4 @@
-import { IControl, IViewLayoutPanel } from '@ibiz/model-core';
+import { IControl, IControlLogic, IViewLayoutPanel } from '@ibiz/model-core';
 import { BaseController } from '..';
 import { CTX } from '../../ctx';
 import {
@@ -129,14 +129,7 @@ export class ControlController<
     }
 
     // 部件逻辑初始化
-    if (this.model.controlLogics?.length) {
-      this.scheduler = ibiz.scheduler.createControlScheduler(
-        this.model.controlLogics,
-      );
-      this.scheduler.defaultParamsCb = (): IUILogicParams => {
-        return this.getEventArgs();
-      };
-    }
+    this.initControlScheduler(this.model.controlLogics);
   }
 
   protected async onDestroyed(): Promise<void> {
@@ -225,4 +218,21 @@ export class ControlController<
       });
     }
   }
+
+  /**
+   * 初始化部件逻辑调度器
+   * @author lxm
+   * @date 2023-08-21 11:53:37
+   * @param {IControlLogic[]} logics
+   * @return {*}  {void}
+   */
+  protected initControlScheduler(logics: IControlLogic[] = []): void {
+    if (logics.length === 0) {
+      return;
+    }
+    this.scheduler = ibiz.scheduler.createControlScheduler(logics);
+    this.scheduler.defaultParamsCb = (): IUILogicParams => {
+      return this.getEventArgs();
+    };
+  }
 }