@ibiz-template/runtime 0.1.7 → 0.1.8

package/out/register/helper/editor-register.js

@@ -24,7 +24,7 @@ function getProvider(key) {
  */
 export async function getEditorProvider(model) {
     let provider;
-    const { editorType, editorStyle } = model;
+    const { editorType, editorStyle, predefinedType } = model;
     // 再找编辑器类型和编辑器样式
     if (editorStyle && editorStyle !== 'DEFAULT') {
         const key = `${editorType}_${editorStyle}`;
@@ -33,6 +33,17 @@ export async function getEditorProvider(model) {
             ibiz.log.error(`找不到编辑器类型：[${editorType}]的编辑器样式：[${editorStyle}]对应的适配器`, model);
         }
     }
+    // 编辑器预置类型
+    if (predefinedType) {
+        let key = `${predefinedType}_${editorType}`;
+        if (editorStyle && editorStyle !== 'DEFAULT') {
+            key += `_${editorStyle}`;
+        }
+        provider = getProvider(key);
+        if (!provider) {
+            ibiz.log.error(`找不到编辑器类型：[${editorType}]的预置类型：[${predefinedType}]对应的适配器`, model);
+        }
+    }
     // 找编辑器类型
     if (!provider) {
         provider = getProvider(editorType);

package/out/service/dto/method.dto.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"method.dto.d.ts","sourceRoot":"","sources":["../../../src/service/dto/method.dto.ts"],"names":[],"mappings":"AACA,OAAO,EACL,cAAc,EACd,eAAe,EACf,oBAAoB,EACrB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AAGnE;;;;;;;GAOG;AACH,qBAAa,SAAS;IAYlB,SAAS,CAAC,MAAM,EAAE,cAAc;IAChC,SAAS,CAAC,GAAG,CAAC;IAZhB,SAAS,CAAC,GAAG,CAAC,EAAE,WAAW,CAAC;IAE5B,SAAS,CAAC,MAAM,EAAG,oBAAoB,EAAE,CAAC;IAE1C,SAAS,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAa;IAErD,IAAI,WAAW,IAAI,OAAO,CAEzB;gBAGW,MAAM,EAAE,cAAc,EACtB,GAAG,CAAC,6BAAiB;IAUjC;;;;;;;;OAQG;IACG,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;IAoCxD;;;;;;;;OAQG;IACG,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IA2BrE;;;;;;;;OAQG;cACa,WAAW,CAAC,KAAK,EAAE,oBAAoB,GAAG,OAAO,CAAC,SAAS,CAAC;CAgB7E"}
+{"version":3,"file":"method.dto.d.ts","sourceRoot":"","sources":["../../../src/service/dto/method.dto.ts"],"names":[],"mappings":"AACA,OAAO,EACL,cAAc,EACd,eAAe,EACf,oBAAoB,EACrB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AAGnE;;;;;;;GAOG;AACH,qBAAa,SAAS;IAYlB,SAAS,CAAC,MAAM,EAAE,cAAc;IAChC,SAAS,CAAC,GAAG,CAAC;IAZhB,SAAS,CAAC,GAAG,CAAC,EAAE,WAAW,CAAC;IAE5B,SAAS,CAAC,MAAM,EAAG,oBAAoB,EAAE,CAAC;IAE1C,SAAS,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAa;IAErD,IAAI,WAAW,IAAI,OAAO,CAEzB;gBAGW,MAAM,EAAE,cAAc,EACtB,GAAG,CAAC,6BAAiB;IAUjC;;;;;;;;OAQG;IACG,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;IAwCxD;;;;;;;;OAQG;IACG,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IA+BrE;;;;;;;;OAQG;cACa,WAAW,CAAC,KAAK,EAAE,oBAAoB,GAAG,OAAO,CAAC,SAAS,CAAC;CAgB7E"}

package/out/service/dto/method.dto.js

@@ -45,6 +45,10 @@ export class MethodDto {
                     break;
                 }
                 case 'DTOS': {
+                    // 没有实体id的不处理
+                    if (!field.refAppDataEntityId) {
+                        break;
+                    }
                     const dto = await this.getFieldDto(field);
                     const service = await this.app.deService.getService(field.refAppDataEntityId);
                     const items = service.local.getList(context);
@@ -80,6 +84,10 @@ export class MethodDto {
             const all = this.fields
                 .filter(field => field.type === 'DTOS')
                 .map(async (field) => {
+                // 没有实体id的不处理
+                if (!field.refAppDataEntityId) {
+                    return;
+                }
                 const key = field.codeName.toLowerCase();
                 const dto = await this.getFieldDto(field);
                 const items = datum[key];

package/out/service/service/auth/v7-auth.service.d.ts

@@ -0,0 +1,14 @@
+import { IAuthService } from '../../../interface';
+/**
+ * 认证服务
+ *
+ * @author chitanda
+ * @date 2022-07-19 18:07:51
+ * @export
+ * @class AuthService
+ */
+export declare class V7AuthService implements IAuthService {
+    login(loginname: string, password: string): Promise<boolean>;
+    logout(): Promise<boolean>;
+}
+//# sourceMappingURL=v7-auth.service.d.ts.map

package/out/service/service/auth/v7-auth.service.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"v7-auth.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/auth/v7-auth.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAElD;;;;;;;GAOG;AACH,qBAAa,aAAc,YAAW,YAAY;IAC1C,KAAK,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAqB5D,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC;CAcjC"}

package/out/service/service/auth/v7-auth.service.js

@@ -0,0 +1,47 @@
+import { CoreConst } from '@ibiz-template/core';
+import { clearCookie, setCookie } from 'qx-util';
+/**
+ * 认证服务
+ *
+ * @author chitanda
+ * @date 2022-07-19 18:07:51
+ * @export
+ * @class AuthService
+ */
+export class V7AuthService {
+    async login(loginname, password) {
+        // eslint-disable-next-line no-useless-catch
+        try {
+            const res = await ibiz.net.post('/v7/login', { loginname, password });
+            const { data } = res;
+            if (data && data.token) {
+                setCookie(CoreConst.TOKEN, data.token, 0, true);
+                const expiredDate = new Date().getTime() + (data.expirein || 7199) * 1000;
+                setCookie(CoreConst.TOKEN_EXPIRES, `${expiredDate}`, 0, true);
+            }
+            return true;
+        }
+        catch (err) {
+            ibiz.notification.error({
+                title: '登录失败',
+                desc: err.message || '',
+            });
+        }
+        return false;
+    }
+    async logout() {
+        try {
+            await ibiz.net.get('/v7/logout');
+            clearCookie(CoreConst.TOKEN);
+            clearCookie(CoreConst.TOKEN_EXPIRES);
+            return true;
+        }
+        catch (err) {
+            ibiz.notification.error({
+                title: '登出失败',
+                desc: err.message || '',
+            });
+        }
+        return false;
+    }
+}

package/out/service/service/index.d.ts

@@ -4,5 +4,5 @@ export { DEService } from './entity/de.service';
 export { WorkFlowService } from './work-flow/work-flow.service';
 export * from './control';
 export * from './authority';
-export { AuthService } from './auth/auth.service';
+export { V7AuthService } from './auth/v7-auth.service';
 //# sourceMappingURL=index.d.ts.map

package/out/service/service/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/service/service/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,cAAc,WAAW,CAAC;AAC1B,cAAc,aAAa,CAAC;AAC5B,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/service/service/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,cAAc,WAAW,CAAC;AAC1B,cAAc,aAAa,CAAC;AAC5B,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC"}

package/out/service/service/index.js

@@ -4,4 +4,4 @@ export { DEService } from './entity/de.service';
 export { WorkFlowService } from './work-flow/work-flow.service';
 export * from './control';
 export * from './authority';
-export { AuthService } from './auth/auth.service';
+export { V7AuthService } from './auth/v7-auth.service';

package/out/service/vo/control.vo.d.ts

@@ -120,5 +120,13 @@ export declare class ControlVO {
      * @param {IData} data
      */
     setOrigin(data: IData | ControlVO): void;
+    /**
+     * 克隆新的vo数据
+     *
+     * @author lxm
+     * @date 2023-08-16 11:08:29
+     * @return {*}  {ControlVO}
+     */
+    clone(): ControlVO;
 }
 //# sourceMappingURL=control.vo.d.ts.map

package/out/service/vo/control.vo.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"control.vo.d.ts","sourceRoot":"","sources":["../../../src/service/vo/control.vo.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C;;;;;;;GAOG;AACH,qBAAa,SAAS;IAEpB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,GAAG,CAAC;IAE5B;;;;;;;OAOG;IACK,OAAO,EAAE,KAAK,CAAC;IAEvB;;;;;;;OAOG;IACK,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAE5C;;;;;;OAMG;IACH,IAAI,KAAK,IAAI,KAAK,CAKjB;IAED;;;;;;OAMG;IACH,IAAI,MAAM,IAAI,MAAM,CAEnB;IAED;;;;;;OAMG;IACH,IAAI,YAAY,IAAI,MAAM,CAEzB;IAED;;;;;;OAMG;IACH,IAAI,OAAO,IAAI,MAAM,CAEpB;IAED;;;;;;OAMG;IACH,IAAI,aAAa,IAAI,MAAM,CAE1B;IAED;;;;;;OAMG;IACH,IAAI,UAAU,IAAI,MAAM,CAEvB;IAED;;;;;;OAMG;IACH,IAAI,YAAY,IAAI,MAAM,CAEzB;IAED;;;;;;OAMG;gBAED,OAAO,GAAE,KAAU,EACnB,UAAU,GAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAa;IA8BjD;;;;;;;;;;OAUG;IACH,OAAO,CAAC,YAAY;IAmCpB;;;;;;OAMG;IACH,SAAS,IAAI,KAAK;IAIlB;;;;;;OAMG;IACH,SAAS,CAAC,IAAI,EAAE,KAAK,GAAG,SAAS,GAAG,IAAI;CAGzC"}
+{"version":3,"file":"control.vo.d.ts","sourceRoot":"","sources":["../../../src/service/vo/control.vo.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C;;;;;;;GAOG;AACH,qBAAa,SAAS;IAEpB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,GAAG,CAAC;IAE5B;;;;;;;OAOG;IACK,OAAO,EAAE,KAAK,CAAC;IAEvB;;;;;;;OAOG;IACK,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAE5C;;;;;;OAMG;IACH,IAAI,KAAK,IAAI,KAAK,CAKjB;IAED;;;;;;OAMG;IACH,IAAI,MAAM,IAAI,MAAM,CAEnB;IAED;;;;;;OAMG;IACH,IAAI,YAAY,IAAI,MAAM,CAEzB;IAED;;;;;;OAMG;IACH,IAAI,OAAO,IAAI,MAAM,CAEpB;IAED;;;;;;OAMG;IACH,IAAI,aAAa,IAAI,MAAM,CAE1B;IAED;;;;;;OAMG;IACH,IAAI,UAAU,IAAI,MAAM,CAEvB;IAED;;;;;;OAMG;IACH,IAAI,YAAY,IAAI,MAAM,CAEzB;IAED;;;;;;OAMG;gBAED,OAAO,GAAE,KAAU,EACnB,UAAU,GAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAa;IA8BjD;;;;;;;;;;OAUG;IACH,OAAO,CAAC,YAAY;IAmCpB;;;;;;OAMG;IACH,SAAS,IAAI,KAAK;IAIlB;;;;;;OAMG;IACH,SAAS,CAAC,IAAI,EAAE,KAAK,GAAG,SAAS,GAAG,IAAI;IAIxC;;;;;;OAMG;IACH,KAAK,IAAI,SAAS;CAQnB"}

package/out/service/vo/control.vo.js

@@ -1,4 +1,4 @@
-import { isNil } from 'ramda';
+import { clone, isNil } from 'ramda';
 import { Srfuf } from '../constant';
 /**
  * 部件UI显示层数据转换
@@ -173,4 +173,19 @@ export class ControlVO {
     setOrigin(data) {
         this.$origin = data instanceof ControlVO ? data.getOrigin() : data;
     }
+    /**
+     * 克隆新的vo数据
+     *
+     * @author lxm
+     * @date 2023-08-16 11:08:29
+     * @return {*}  {ControlVO}
+     */
+    clone() {
+        const cloneOrigin = clone(this.$origin);
+        const newVal = new ControlVO(cloneOrigin, this.$dataUIMap);
+        Object.keys(this).forEach(key => {
+            newVal[key] = this[key];
+        });
+        return newVal;
+    }
 }

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

@@ -1 +1 @@
-{"version":3,"file":"tree-code-list-node-data.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/tree-node-data/tree-code-list-node-data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEjE,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD;;;;;;;GAOG;AACH,qBAAa,oBACX,SAAQ,YACR,YAAW,aAAa;IAExB,IAAI,EAAE,MAAM,CAAC;IAEb,EAAE,EAAE,MAAM,CAAC;IAEX,KAAK,EAAE,MAAM,CAAC;IAEd,MAAM,EAAE,YAAY,CAAC;gBAGnB,KAAK,EAAE,kBAAkB,EACzB,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE;QACJ,IAAI,EAAE,YAAY,CAAC;QACnB,IAAI,EAAE,OAAO,CAAC;QACd,UAAU,CAAC,EAAE,OAAO,CAAC;QACrB,SAAS,CAAC,EAAE,OAAO,CAAC;KACrB;CAwBJ"}
+{"version":3,"file":"tree-code-list-node-data.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/tree-node-data/tree-code-list-node-data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEjE,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD;;;;;;;GAOG;AACH,qBAAa,oBACX,SAAQ,YACR,YAAW,aAAa;IAExB,IAAI,EAAE,MAAM,CAAC;IAEb,EAAE,EAAE,MAAM,CAAC;IAEX,KAAK,EAAE,MAAM,CAAC;IAEd,MAAM,EAAE,YAAY,CAAC;gBAGnB,KAAK,EAAE,kBAAkB,EACzB,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE;QACJ,IAAI,EAAE,YAAY,CAAC;QACnB,IAAI,EAAE,OAAO,CAAC;QACd,UAAU,CAAC,EAAE,OAAO,CAAC;QACrB,SAAS,CAAC,EAAE,OAAO,CAAC;KACrB;CA0BJ"}

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

@@ -29,5 +29,6 @@ export class TreeCodeListNodeData extends TreeNodeData {
         }
         this.srfkey = this.value;
         this.srfmajortext = this.text;
+        this.icon = this.calcIcon(model);
     }
 }

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;IASrB;;;;;;;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,52 @@ 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);
+        }
+    }
+    /**
+     * 计算节点文本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.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,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;IAW/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"}

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

@@ -13,7 +13,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);
+        };
     }
     /**
      * 格式化脚本

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.1.7",
+  "version": "0.1.8",
   "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": "cb6f466a8477cdcf184a8be03b8c26bd67324a70"
 }

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/md-control.controller.ts

@@ -60,16 +60,25 @@ export class MDControlController<
     this.state.groups = [];
   }
 
+  protected async onCreated(): Promise<void> {
+    await super.onCreated();
+    // 设置默认排序
+    this.setSort();
+  }
+
   /**
    * 设置排序
+   * 无参数时设置的是默认排序。
    *
    * @author lxm
    * @date 2022-09-28 13:09:44
    * @param {string} key 排序字段
    * @param {string} order 排序顺序
    */
-  setSort(key: string, order: 'asc' | 'desc'): void {
-    this.state.sortQuery = `${key},${order}`;
+  setSort(key?: string, order?: 'asc' | 'desc'): void {
+    if (key && order) {
+      this.state.sortQuery = `${key},${order}`;
+    }
   }
 
   /**
@@ -189,14 +198,20 @@ export class MDControlController<
     if (!data?.length) {
       throw new RuntimeError('未选中数据');
     }
-    const del = await ibiz.confirm.error({
-      title: '数据删除',
-      desc: '确认删除数据？',
-    });
-    if (!del) {
-      return;
+
+    // 删除确认提示
+    if (args?.silent !== true) {
+      const del = await ibiz.confirm.error({
+        title: '数据删除',
+        desc: '确认删除数据？',
+      });
+      if (!del) {
+        return;
+      }
     }
+
     await this.startLoading();
+    let needRefresh = false;
     try {
       const deName = calcDeCodeNameById(this.model.appDataEntityId!);
       await Promise.allSettled(
@@ -207,17 +222,25 @@ export class MDControlController<
             tempContext[deName] = item.srfkey;
             // 删除后台的数据
             await this.service.remove(tempContext, params);
+            needRefresh = true;
           }
 
           this.afterRemove(data);
         }),
       );
-      ibiz.notification.success({
-        desc: `数据[${data
-          .map(item => item.srfmajortext)
-          .join('、')}]删除成功!`,
-      });
-      this.refresh();
+
+      if (args?.silent !== true) {
+        ibiz.notification.success({
+          desc: `数据[${data
+            .map(item => item.srfmajortext)
+            .join('、')}]删除成功!`,
+        });
+      }
+
+      // 刷新数据，补全这一页缺少的数据
+      if (needRefresh) {
+        this.refresh();
+      }
     } finally {
       await this.endLoading();
     }