@ibiz-template/runtime 0.1.6 → 0.1.8

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":"AAEA,OAAO,EACL,cAAc,EACd,eAAe,EACf,oBAAoB,EACrB,MAAM,kBAAkB,CAAC;AAG1B,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;IA8CxD;;;;;;;;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

@@ -1,6 +1,3 @@
-/* eslint-disable no-await-in-loop */
-import { clone } from 'ramda';
-import { isNilOrEmpty } from 'qx-util';
 import { ModelError } from '@ibiz-template/core';
 import { AppDataEntity } from '../app-data-entity/app-data-entity';
 import { findModelChild } from '../../model';
@@ -40,24 +37,18 @@ export class MethodDto {
     async get(context, data) {
         const params = {};
         // 拷贝数据
-        const copyData = clone(data);
         for (let i = 0; i < this.fields.length; i++) {
             const field = this.fields[i];
             const key = field.codeName.toLowerCase();
             switch (field.type) {
                 case 'SIMPLE': {
-                    const val = copyData[key];
-                    if (isNilOrEmpty(val)) {
-                        params[key] = null;
-                    }
-                    else {
-                        params[key] = val;
-                    }
-                    // 取值后删除
-                    delete copyData[key];
                     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);
@@ -75,8 +66,7 @@ export class MethodDto {
             }
         }
         // 合并剩余参数
-        Object.assign(params, copyData);
-        return params;
+        return Object.assign(Object.assign({}, data), params);
     }
     /**
      * 设置本地 DTO 存储
@@ -94,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/code-list/code-list.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"code-list.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/code-list/code-list.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACzE,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAEnD;;;;;;;GAOG;AACH,qBAAa,eAAe;IAoBd,SAAS,CAAC,QAAQ,EAAE,YAAY;IAnB5C;;;;;OAKG;IACH,SAAS,CAAC,YAAY,4BAAmC;IAEzD;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,YAAY,EAAE,GAAG,oBAAoB,CAAC,CAChE;gBAEU,QAAQ,EAAE,YAAY;IAE5C;;;;;;;OAOG;IACH,SAAS,CAAC,SAAS,CAAC,QAAQ,EAAE,YAAY,GAAG,YAAY,EAAE;IAc3D;;;;;;;;OAQG;IACH,WAAW,CAAC,QAAQ,EAAE,YAAY,GAAG,IAAI;IAMzC;;;;;;;;OAQG;IACH,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS;IAIlD;;;;;;;;;OASG;IACH,SAAS,CAAC,iBAAiB,CACzB,SAAS,EAAE,SAAS,EAAE,EACtB,aAAa,EAAE,OAAO,GACrB,QAAQ,CAAC,YAAY,CAAC,EAAE;IAmB3B;;;;;;;;OAQG;cACa,kBAAkB,CAChC,QAAQ,EAAE,YAAY,EACtB,OAAO,GAAE,OAAY,EACrB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,YAAY,EAAE,CAAC;IAa1B;;;;;;;;;OASG;IACG,GAAG,CACP,GAAG,EAAE,MAAM,EACX,OAAO,CAAC,EAAE,OAAO,EACjB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,SAAS,YAAY,EAAE,CAAC;CAcpC"}
+{"version":3,"file":"code-list.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/code-list/code-list.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACzE,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAEnD;;;;;;;GAOG;AACH,qBAAa,eAAe;IAoBd,SAAS,CAAC,QAAQ,EAAE,YAAY;IAnB5C;;;;;OAKG;IACH,SAAS,CAAC,YAAY,4BAAmC;IAEzD;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,YAAY,EAAE,GAAG,oBAAoB,CAAC,CAChE;gBAEU,QAAQ,EAAE,YAAY;IAE5C;;;;;;;OAOG;IACH,SAAS,CAAC,SAAS,CAAC,QAAQ,EAAE,YAAY,GAAG,YAAY,EAAE;IAc3D;;;;;;;;OAQG;IACH,WAAW,CAAC,QAAQ,EAAE,YAAY,GAAG,IAAI;IAMzC;;;;;;;;OAQG;IACH,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS;IAIlD;;;;;;;;;OASG;IACH,SAAS,CAAC,iBAAiB,CACzB,SAAS,EAAE,SAAS,EAAE,EACtB,aAAa,EAAE,OAAO,GACrB,QAAQ,CAAC,YAAY,CAAC,EAAE;IA0B3B;;;;;;;;OAQG;cACa,kBAAkB,CAChC,QAAQ,EAAE,YAAY,EACtB,OAAO,GAAE,OAAY,EACrB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,YAAY,EAAE,CAAC;IAa1B;;;;;;;;;OASG;IACG,GAAG,CACP,GAAG,EAAE,MAAM,EACX,OAAO,CAAC,EAAE,OAAO,EACjB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,SAAS,YAAY,EAAE,CAAC;CAcpC"}

package/out/service/service/code-list/code-list.service.js

@@ -89,8 +89,12 @@ export class CodeListService {
         return codeItems.map(codeItem => {
             var _a;
             // todo代码项其他属性，表单数据
+            let text = codeItem.text;
+            if (codeItem.textLanguageRes) {
+                text = ibiz.i18n.t(codeItem.textLanguageRes.lanResTag, codeItem.textLanguageRes.defaultContent);
+            }
             const _codeItem = {
-                text: codeItem.text,
+                text,
                 value: isValueNumber ? Number(codeItem.value) : codeItem.value,
                 color: codeItem.color,
                 id: codeItem.codeName,

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,9 +1,9 @@
+import { I18n } from '@ibiz-template/core/src/interface';
 import { EngineFactory } from './engine';
 import { GlobalUtil } from './global';
-import { IMessageUtil, INotificationUtil, IOpenViewUtil, IModalUtil, 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 {
         /**
@@ -31,6 +31,15 @@ declare module '@ibiz-template/core' {
          * @type {IModalUtil}
          */
         modal: IModalUtil;
+        /**
+         * 确认框
+         *
+         * @description 需要用户确认收到提示消息时使用此工具
+         * @author chitanda
+         * @date 2022-08-17 16:08:10
+         * @type {IConfirmUtil}
+         */
+        confirm: IConfirmUtil;
         /**
          * 消息通知
          *
@@ -95,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
@@ -113,6 +122,14 @@ declare module '@ibiz-template/core' {
          * @type {GlobalUtil}
          */
         util: GlobalUtil;
+        /**
+         * 多语言
+         *
+         * @author chitanda
+         * @date 2023-08-11 16:08:15
+         * @type {I18n}
+         */
+        i18n: I18n;
         /**
          * 逻辑调度中心
          * @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,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,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,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;;;;;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/ui-logic/ui-logic-node/bind-param-node/bind-param-node.d.ts

@@ -0,0 +1,17 @@
+import { IDEUIBindParamLogic } from '@ibiz/model-core';
+import { UILogicContext } from '../../ui-logic-context';
+import { UILogicNode } from '../ui-logic-node';
+/**
+ * 绑定参数
+ *
+ * @author lxm
+ * @date 2023-02-09 21:02:20
+ * @export
+ * @class BindParamNode
+ * @extends {UILogicNode}
+ */
+export declare class BindParamNode extends UILogicNode {
+    model: IDEUIBindParamLogic;
+    exec(ctx: UILogicContext): Promise<void>;
+}
+//# sourceMappingURL=bind-param-node.d.ts.map

package/out/ui-logic/ui-logic-node/bind-param-node/bind-param-node.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"bind-param-node.d.ts","sourceRoot":"","sources":["../../../../src/ui-logic/ui-logic-node/bind-param-node/bind-param-node.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAExD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C;;;;;;;;GAQG;AACH,qBAAa,aAAc,SAAQ,WAAW;IACpC,KAAK,EAAE,mBAAmB,CAAC;IAE7B,IAAI,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;CAW/C"}

package/out/ui-logic/ui-logic-node/bind-param-node/bind-param-node.js

@@ -0,0 +1,22 @@
+import { RuntimeModelError } from '@ibiz-template/core';
+import { handleSrcVal } from '../../utils';
+import { UILogicNode } from '../ui-logic-node';
+/**
+ * 绑定参数
+ *
+ * @author lxm
+ * @date 2023-02-09 21:02:20
+ * @export
+ * @class BindParamNode
+ * @extends {UILogicNode}
+ */
+export class BindParamNode extends UILogicNode {
+    async exec(ctx) {
+        const { dstDEUILogicParamId, srcDEUILogicParamId } = this.model;
+        if (!dstDEUILogicParamId || !srcDEUILogicParamId) {
+            throw new RuntimeModelError(this.model, '缺少目标参数对象或者源参数对象配置');
+        }
+        const srcVal = handleSrcVal(ctx, this.model);
+        ctx.params[dstDEUILogicParamId] = srcVal;
+    }
+}

package/out/ui-logic/ui-logic-node/index.d.ts

@@ -5,4 +5,5 @@ export { EndNode } from './end-node/end-node';
 export { PrepareJSParamNode } from './prepare-js-param-node/prepare-js-param-node';
 export { UILogicNode } from './ui-logic-node';
 export { ViewCtrlInvokeNode } from './view-ctrl-invoke-node/view-ctrl-invoke-node';
+export { BindParamNode } from './bind-param-node/bind-param-node';
 //# sourceMappingURL=index.d.ts.map

package/out/ui-logic/ui-logic-node/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/ui-logic/ui-logic-node/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AACvE,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,+CAA+C,CAAC;AACnF,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,+CAA+C,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/ui-logic/ui-logic-node/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AACvE,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,+CAA+C,CAAC;AACnF,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,+CAA+C,CAAC;AACnF,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC"}

package/out/ui-logic/ui-logic-node/index.js

@@ -5,3 +5,4 @@ export { EndNode } from './end-node/end-node';
 export { PrepareJSParamNode } from './prepare-js-param-node/prepare-js-param-node';
 export { UILogicNode } from './ui-logic-node';
 export { ViewCtrlInvokeNode } from './view-ctrl-invoke-node/view-ctrl-invoke-node';
+export { BindParamNode } from './bind-param-node/bind-param-node';

package/out/ui-logic/ui-logic-param/ui-logic-param.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ui-logic-param.d.ts","sourceRoot":"","sources":["../../../src/ui-logic/ui-logic-param/ui-logic-param.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD;;;;;;;GAOG;AACH,qBAAa,YAAY;IAQJ,KAAK,EAAE,eAAe;IAPzC;;;;;;OAMG;gBACgB,KAAK,EAAE,eAAe;IAEzC;;;;;;OAMG;IACH,IAAI,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI;IA6D/B;;;;;OAKG;IACH,KAAK,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI;CAWjC"}
+{"version":3,"file":"ui-logic-param.d.ts","sourceRoot":"","sources":["../../../src/ui-logic/ui-logic-param/ui-logic-param.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD;;;;;;;GAOG;AACH,qBAAa,YAAY;IAQJ,KAAK,EAAE,eAAe;IAPzC;;;;;;OAMG;gBACgB,KAAK,EAAE,eAAe;IAEzC;;;;;;OAMG;IACH,IAAI,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI;IAgE/B;;;;;OAKG;IACH,KAAK,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI;CAWjC"}

package/out/ui-logic/ui-logic-param/ui-logic-param.js

@@ -1,4 +1,4 @@
-import { ModelError, RuntimeError } from '@ibiz-template/core';
+import { ModelError, RuntimeModelError } from '@ibiz-template/core';
 /**
  * 界面逻辑参数
  *
@@ -48,7 +48,7 @@ export class UILogicParam {
                 ctx.params[tag] = control;
             }
             else {
-                throw new RuntimeError(`没找到${m.codeName}指定部件对象`);
+                throw new RuntimeModelError(this.model, `视图逻辑初始化参数，未找到${m.codeName}指定部件对象`);
             }
         }
         else if (m.activeViewParam) {

package/out/ui-logic/ui-logic.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ui-logic.d.ts","sourceRoot":"","sources":["../../src/ui-logic/ui-logic.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAML,WAAW,EAEZ,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D;;;;;;;GAOG;AACH,qBAAa,OAAO;IA2BN,SAAS,CAAC,KAAK,EAAE,UAAU;IA1BvC;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAa;IAEtD;;;;;;;OAOG;IACH,SAAS,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAAa;IAExD;;;;;OAKG;gBACmB,KAAK,EAAE,UAAU;IA0DvC;;;;;;;;;;OAUG;IACH,SAAS,CAAC,eAAe,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI;IASpD;;;;;;;;;OASG;IACG,IAAI,CAAC,UAAU,EAAE,cAAc,GAAG,OAAO,CAAC,OAAO,CAAC;IAmBxD;;;;;;;;;;;;;OAaG;cACa,QAAQ,CACtB,IAAI,EAAE,WAAW,EACjB,GAAG,EAAE,cAAc,GAClB,OAAO,CAAC,IAAI,CAAC;CAiBjB"}
+{"version":3,"file":"ui-logic.d.ts","sourceRoot":"","sources":["../../src/ui-logic/ui-logic.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAOL,WAAW,EAEZ,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D;;;;;;;GAOG;AACH,qBAAa,OAAO;IA2BN,SAAS,CAAC,KAAK,EAAE,UAAU;IA1BvC;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAa;IAEtD;;;;;;;OAOG;IACH,SAAS,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAAa;IAExD;;;;;OAKG;gBACmB,KAAK,EAAE,UAAU;IA4DvC;;;;;;;;;;OAUG;IACH,SAAS,CAAC,eAAe,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI;IASpD;;;;;;;;;OASG;IACG,IAAI,CAAC,UAAU,EAAE,cAAc,GAAG,OAAO,CAAC,OAAO,CAAC;IAmBxD;;;;;;;;;;;;;OAaG;cACa,QAAQ,CACtB,IAAI,EAAE,WAAW,EACjB,GAAG,EAAE,cAAc,GAClB,OAAO,CAAC,IAAI,CAAC;CAiBjB"}

package/out/ui-logic/ui-logic.js

@@ -1,7 +1,7 @@
 /* eslint-disable no-await-in-loop */
 import { ModelError, RuntimeModelError } from '@ibiz-template/core';
 import { UILogicContext } from './ui-logic-context';
-import { DEActionNode, DEUIActionNode, EndNode, PrepareJSParamNode, StartNode, ViewCtrlInvokeNode, } from './ui-logic-node';
+import { BindParamNode, DEActionNode, DEUIActionNode, EndNode, PrepareJSParamNode, StartNode, ViewCtrlInvokeNode, } from './ui-logic-node';
 import { UILogicParam } from './ui-logic-param/ui-logic-param';
 /**
  * 界面逻辑
@@ -61,12 +61,14 @@ export class UILogic {
                 case 'PREPAREJSPARAM': // 准备参数
                     logicNode = new PrepareJSParamNode(node);
                     break;
-                case 'RESETPARAM': // 重置参数
-                case 'COPYPARAM': // 拷贝参数
                 case 'BINDPARAM': // 绑定参数
+                    logicNode = new BindParamNode(node);
+                    break;
                 case 'VIEWCTRLINVOKE': // 视图部件调用
                     logicNode = new ViewCtrlInvokeNode(node);
                     break;
+                case 'RESETPARAM': // 重置参数
+                case 'COPYPARAM': // 拷贝参数
                 case 'VIEWCTRLFIREEVENT': // 视图部件事件触发
                 case 'APPENDPARAM': // 附加到数组参数
                 case 'SORTPARAM': // 排序数组参数

package/out/ui-logic/utils/handle-src-val.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"handle-src-val.d.ts","sourceRoot":"","sources":["../../../src/ui-logic/utils/handle-src-val.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD,KAAK,YAAY,GAAG;IAClB;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B,CAAC;AAEF;;;;;;;;GAQG;AACH,wBAAgB,YAAY,CAC1B,GAAG,EAAE,cAAc,EACnB,YAAY,EAAE,YAAY,GACzB,OAAO,CA+CT"}
+{"version":3,"file":"handle-src-val.d.ts","sourceRoot":"","sources":["../../../src/ui-logic/utils/handle-src-val.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD,KAAK,YAAY,GAAG;IAClB;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B,CAAC;AAEF;;;;;;;;GAQG;AACH,wBAAgB,YAAY,CAC1B,GAAG,EAAE,cAAc,EACnB,YAAY,EAAE,YAAY,GACzB,OAAO,CA4CT"}

package/out/ui-logic/utils/handle-src-val.js

@@ -10,11 +10,9 @@ import { clone } from 'ramda';
  * @return {*}
  */
 export function handleSrcVal(ctx, srcValParams) {
-    const { srcDEUILogicParamId, srcValueType, srcFieldName, srcValue } = srcValParams;
+    const { srcDEUILogicParamId, srcFieldName, srcValue } = srcValParams;
     // 没有源值类型就是逻辑参数
-    if (!srcValParams.srcValueType) {
-        srcValParams.srcValueType = 'SRCDLPARAM';
-    }
+    const srcValueType = srcValParams.srcValueType || 'SRCDLPARAM';
     let value;
     switch (srcValueType) {
         // 源逻辑参数