@ibiz-template/runtime 0.6.17 → 0.7.0

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;AAElD,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;IAuC3B;;;;;;;;OAQG;cACa,kBAAkB,CAChC,QAAQ,EAAE,YAAY,EACtB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,YAAY,EAAE,CAAC;IAa1B;;;;;;;;;OASG;IACG,GAAG,CACP,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,QAAQ,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;AAElD,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;IAuC3B;;;;;;;;OAQG;cACa,kBAAkB,CAChC,QAAQ,EAAE,YAAY,EACtB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,YAAY,EAAE,CAAC;IAa1B;;;;;;;;;OASG;IACG,GAAG,CACP,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,QAAQ,EACjB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,SAAS,YAAY,EAAE,CAAC;IAenC;;;;;OAKG;IACG,mBAAmB,CACvB,GAAG,EAAE,MAAM,GACV,OAAO,CAAC,oBAAoB,GAAG,SAAS,CAAC;IAmB5C;;;;;OAKG;IACH,OAAO,IAAI,IAAI;CAQhB"}

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

@@ -165,4 +165,43 @@ export class CodeListService {
         // todo 预定义代码表
         return [];
     }
+    /**
+     * 获取代码表实例对象(动态代码表返回具体实例，静态代码表返回undefined)
+     *
+     * @param tag 代码表标识
+     * @returns 动态代码表实例|undefined
+     */
+    async getCodeListInstance(tag) {
+        let codeListInstance;
+        const codeList = this.allCodeLists.get(tag);
+        if (!codeList) {
+            throw new RuntimeError(`找不到${tag}代码表`);
+        }
+        if (codeList.codeListType === 'DYNAMIC') {
+            const codeName = codeList.codeName;
+            if (this.cache.has(codeName)) {
+                codeListInstance = this.cache.get(codeName);
+            }
+            else {
+                codeListInstance = new DynamicCodeListCache(codeList);
+                this.cache.set(codeName, codeListInstance);
+                await codeListInstance.init();
+            }
+        }
+        return codeListInstance;
+    }
+    /**
+     * 销毁(清除动态代码表监听)
+     *
+     * @author tony001
+     * @return {void}
+     */
+    destroy() {
+        const cacheList = Array.from(this.cache.values());
+        cacheList.forEach(item => {
+            if (item instanceof DynamicCodeListCache) {
+                item.destroy();
+            }
+        });
+    }
 }

package/out/service/service/control/md-control.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"md-control.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/control/md-control.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAgB,MAAM,qBAAqB,CAAC;AAClE,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAEjE,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD,qBAAa,gBAAgB,CAC3B,CAAC,SAAS,cAAc,GAAG,cAAc,CACzC,SAAQ,cAAc,CAAC,CAAC,CAAC;IACzB;;;;;;;;OAQG;IACG,KAAK,CACT,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,SAAS,EAAE,CAAC,CAAC;IAQtC;;;;;;;;OAQG;IACG,GAAG,CACP,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAOpC;;;;;;;;OAQG;IACG,QAAQ,CACZ,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAQpC;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC;IAOzB;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,SAAS,GACd,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAQpC;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,SAAS,GACd,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAQpC;;;;;;;;OAQG;IACG,WAAW,CACf,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,SAAS,EAAE,GAChB,OAAO,CAAC,aAAa,CAAC,SAAS,EAAE,CAAC,CAAC;IAYtC;;;;;;;;;OASG;IACG,UAAU,CACd,WAAW,EAAE,aAAa,EAC1B,QAAQ,EAAE,OAAO,EACjB,OAAO,GAAE,OAAY,GACpB,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;IAU/B;;;;;;;OAOG;IACH,cAAc,CAAC,QAAQ,EAAE,aAAa,GAAG,aAAa;CAwBvD"}
+{"version":3,"file":"md-control.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/control/md-control.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAgB,MAAM,qBAAqB,CAAC;AAClE,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAEjE,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD,qBAAa,gBAAgB,CAC3B,CAAC,SAAS,cAAc,GAAG,cAAc,CACzC,SAAQ,cAAc,CAAC,CAAC,CAAC;IACzB;;;;;;;;OAQG;IACG,KAAK,CACT,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,SAAS,EAAE,CAAC,CAAC;IAQtC;;;;;;;;OAQG;IACG,GAAG,CACP,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAOpC;;;;;;;;OAQG;IACG,QAAQ,CACZ,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAQpC;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC;IAOzB;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,SAAS,GACd,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAQpC;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,SAAS,GACd,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAQpC;;;;;;;;OAQG;IACG,WAAW,CACf,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,SAAS,EAAE,GAChB,OAAO,CAAC,aAAa,CAAC,SAAS,EAAE,CAAC,CAAC;IAYtC;;;;;;;;;OASG;IACG,UAAU,CACd,WAAW,EAAE,aAAa,EAC1B,QAAQ,EAAE,OAAO,EACjB,OAAO,GAAE,OAAY,GACpB,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;IAU/B;;;;;;;OAOG;IACH,cAAc,CAAC,QAAQ,EAAE,aAAa,GAAG,aAAa;CA2BvD"}

package/out/service/service/control/md-control.service.js

@@ -152,6 +152,9 @@ export class MDControlService extends ControlService {
             if (res.headers['x-total']) {
                 res.total = Number(res.headers['x-total']);
             }
+            if (res.headers['x-total-pages']) {
+                res.totalPages = Number(res.headers['x-total-pages']);
+            }
         }
         if (res.ok) {
             if (isArray(res.data)) {

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

@@ -1 +1 @@
-{"version":3,"file":"counter.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/counter/counter.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAE/D,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC;;;;;;;GAOG;AACH,qBAAa,cAAc;IACzB;;;;;;;;OAQG;IACH,SAAS,CAAC,MAAM,CAAC,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAa;IAEjE;;;;;;;OAOG;WACU,UAAU,CACrB,KAAK,EAAE,WAAW,EAClB,OAAO,CAAC,EAAE,QAAQ,EAClB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,UAAU,CAAC;IAgBtB;;;;;;;;;;OAUG;WACU,eAAe,CAC1B,KAAK,EAAE,cAAc,EACrB,OAAO,CAAC,EAAE,QAAQ,EAClB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,UAAU,CAAC;CAOvB"}
+{"version":3,"file":"counter.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/counter/counter.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAE/D,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC;;;;;;;GAOG;AACH,qBAAa,cAAc;IACzB;;;;;;;;OAQG;IACH,SAAS,CAAC,MAAM,CAAC,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAa;IAEjE;;;;;;;OAOG;WACU,UAAU,CACrB,KAAK,EAAE,WAAW,EAClB,OAAO,CAAC,EAAE,QAAQ,EAClB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,UAAU,CAAC;IAoBtB;;;;;;;;;;OAUG;WACU,eAAe,CAC1B,KAAK,EAAE,cAAc,EACrB,OAAO,CAAC,EAAE,QAAQ,EAClB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,UAAU,CAAC;CAOvB"}

package/out/service/service/counter/counter.service.js

@@ -19,7 +19,11 @@ export class CounterService {
      * @return {*}  {Promise<AppCounter>}
      */
     static async getCounter(model, context, params) {
-        const id = model.id;
+        let id = model.id;
+        // 可由外部传入自定义标识，应用同时存在子关系的A\B单数据页面，计数器对象应该不一样
+        if (params && params.customId) {
+            id = params.customId;
+        }
         if (this.counterMap.has(id)) {
             const counter = this.counterMap.get(id);
             if (counter.isDestroyed === false) {

package/out/service/utils/app-counter/app-counter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"app-counter.d.ts","sourceRoot":"","sources":["../../../../src/service/utils/app-counter/app-counter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,cAAc,EAAgB,MAAM,qBAAqB,CAAC;AAChF,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAe,OAAO,EAAE,MAAM,SAAS,CAAC;AAE/C,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAInD;;;;;;;GAOG;AACH,qBAAa,UAAU;IA0CF,KAAK,EAAE,WAAW;IAzCrC,SAAS,CAAC,GAAG,EAAG,WAAW,CAAC;IAE5B,SAAS,CAAC,aAAa,EAAE,OAAO,CAAC;IAEjC,SAAS,CAAC,SAAS,EAAE,OAAO,CAAS;IAErC;;;;;;;OAOG;IACH,IAAI,WAAW,IAAI,OAAO,CAEzB;IAED,SAAS,CAAC,OAAO,EAAE,QAAQ,CAAwB;IAEnD,SAAS,CAAC,MAAM,EAAE,OAAO,CAAM;IAE/B,SAAS,CAAC,GAAG,EAAE,OAAO,CAAC;QAAE,MAAM,EAAE,CAAC,IAAI,EAAE,KAAK,KAAK,IAAI,CAAA;KAAE,CAAC,CAAiB;IAE1E;;;;;;;OAOG;IACH,SAAS,CAAC,IAAI,EAAE,KAAK,CAAM;IAE3B;;;;;;OAMG;gBACgB,KAAK,EAAE,WAAW;IAIrC;;;;;;;OAOG;IACG,IAAI,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAS/D;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI;IAUhD;;;;;;;;OAQG;IACH,SAAS,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,IAAI;IAS/D;;;;;;OAMG;IACH,SAAS,CAAC,QAAQ,IAAI,IAAI;IAU1B;;;;;;OAMG;IACH,SAAS,CAAC,eAAe,IAAI,IAAI;IAOjC;;;;;;;OAOG;cACa,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC;IAItC;;;;;;;;OAQG;IACH,OAAO,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC;IAK7D;;;;;;;OAOG;IACH,QAAQ,CAAC,EAAE,EAAE,CAAC,IAAI,EAAE,KAAK,KAAK,IAAI,EAAE,SAAS,GAAE,OAAc,GAAG,IAAI;IAOpE;;;;;;OAMG;IACH,SAAS,CAAC,EAAE,EAAE,CAAC,IAAI,EAAE,KAAK,KAAK,IAAI,GAAG,IAAI;IAI1C;;;;;;;OAOG;IACH,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAI/B;;;;;OAKG;IACH,OAAO,IAAI,IAAI;CAOhB"}
+{"version":3,"file":"app-counter.d.ts","sourceRoot":"","sources":["../../../../src/service/utils/app-counter/app-counter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,cAAc,EAAgB,MAAM,qBAAqB,CAAC;AAChF,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAe,OAAO,EAAE,MAAM,SAAS,CAAC;AAE/C,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAInD;;;;;;;GAOG;AACH,qBAAa,UAAU;IA0CF,KAAK,EAAE,WAAW;IAzCrC,SAAS,CAAC,GAAG,EAAG,WAAW,CAAC;IAE5B,SAAS,CAAC,aAAa,EAAE,OAAO,CAAC;IAEjC,SAAS,CAAC,SAAS,EAAE,OAAO,CAAS;IAErC;;;;;;;OAOG;IACH,IAAI,WAAW,IAAI,OAAO,CAEzB;IAED,SAAS,CAAC,OAAO,EAAE,QAAQ,CAAwB;IAEnD,SAAS,CAAC,MAAM,EAAE,OAAO,CAAM;IAE/B,SAAS,CAAC,GAAG,EAAE,OAAO,CAAC;QAAE,MAAM,EAAE,CAAC,IAAI,EAAE,KAAK,KAAK,IAAI,CAAA;KAAE,CAAC,CAAiB;IAE1E;;;;;;;OAOG;IACH,SAAS,CAAC,IAAI,EAAE,KAAK,CAAM;IAE3B;;;;;;OAMG;gBACgB,KAAK,EAAE,WAAW;IAIrC;;;;;;;OAOG;IACG,IAAI,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAS/D;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI;IAchD;;;;;;;;OAQG;IACH,SAAS,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,IAAI;IAS/D;;;;;;OAMG;IACH,SAAS,CAAC,QAAQ,IAAI,IAAI;IAU1B;;;;;;OAMG;IACH,SAAS,CAAC,eAAe,IAAI,IAAI;IAOjC;;;;;;;OAOG;cACa,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC;IAItC;;;;;;;;OAQG;IACH,OAAO,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC;IAK7D;;;;;;;OAOG;IACH,QAAQ,CAAC,EAAE,EAAE,CAAC,IAAI,EAAE,KAAK,KAAK,IAAI,EAAE,SAAS,GAAE,OAAc,GAAG,IAAI;IAOpE;;;;;;OAMG;IACH,SAAS,CAAC,EAAE,EAAE,CAAC,IAAI,EAAE,KAAK,KAAK,IAAI,GAAG,IAAI;IAI1C;;;;;;;OAOG;IACH,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAI/B;;;;;OAKG;IACH,OAAO,IAAI,IAAI;CAOhB"}

package/out/service/utils/app-counter/app-counter.js

@@ -74,7 +74,9 @@ export class AppCounter {
         const data = msg.data;
         if (this.model.appDataEntityId) {
             const codeName = calcDeCodeNameById(this.model.appDataEntityId);
-            if (data && data.srfdecodename === codeName) {
+            if (data &&
+                data.srfdecodename &&
+                data.srfdecodename.toLowerCase() === codeName) {
                 this.refresh();
             }
         }
@@ -195,6 +197,6 @@ export class AppCounter {
         this.context.destroy();
         this.destroyInterval();
         this.evt.reset();
-        ibiz.mc.command.change.on(this.countChange);
+        ibiz.mc.command.change.off(this.countChange);
     }
 }

package/out/service/utils/dynamic-code-list/dynamic-code-list.d.ts

@@ -1,4 +1,6 @@
 import { IAppCodeList } from '@ibiz/model-core';
+import { IPortalMessage } from '@ibiz-template/core';
+import { QXEvent } from 'qx-util';
 import { Application } from '../../../application';
 import { CodeListItem } from '../../../interface';
 /**
@@ -70,6 +72,34 @@ export declare class DynamicCodeListCache {
      * @type {boolean}
      */
     protected isPredefined: boolean;
+    /**
+     * 应用上下文
+     *
+     * @author tony001
+     * @date 2024-04-10 15:04:25
+     * @protected
+     * @type {IContext}
+     */
+    protected context: IContext;
+    /**
+     * 视图参数
+     *
+     * @author tony001
+     * @date 2024-04-10 15:04:39
+     * @protected
+     * @type {IParams}
+     */
+    protected params: IParams;
+    /**
+     * 事件对象
+     *
+     * @author tony001
+     * @date 2024-04-10 17:04:00
+     * @protected
+     */
+    protected evt: QXEvent<{
+        change: (data: CodeListItem[]) => void;
+    }>;
     /**
      * 初始化promise
      *
@@ -79,6 +109,16 @@ export declare class DynamicCodeListCache {
      */
     protected initPromise?: Promise<void>;
     constructor(codeList: IAppCodeList);
+    /**
+     * 设置上下文以及查询参数
+     *
+     * @author tony001
+     * @date 2024-04-10 15:04:04
+     * @protected
+     * @param {IContext} [context]
+     * @param {IParams} [params]
+     */
+    protected setParams(context?: IContext, params?: IParams): void;
     /**
      * 初始化
      *
@@ -125,6 +165,47 @@ export declare class DynamicCodeListCache {
      * @returns {*}  {Promise<IData[]>}
      */
     get(context: IContext, params?: IParams): Promise<CodeListItem[]>;
+    /**
+     * 接受代码表实体数据变更，刷新代码表
+     *
+     * @author tony001
+     * @date 2024-04-10 15:04:42
+     * @protected
+     * @param {IPortalMessage} msg
+     */
+    protected codelistChange(msg: IPortalMessage): void;
+    /**
+     * 刷新代码表数据
+     *
+     * @author tony001
+     * @date 2024-04-10 17:04:20
+     * @return {*}  {Promise<void>}
+     */
+    refresh(): Promise<void>;
+    /**
+     * 代码表数据变更事件监听
+     *
+     * @author tony001
+     * @date 2024-04-10 17:04:52
+     * @param {(data: CodeListItem[]) => void} fn
+     * @param {boolean} [immediate=true] 当有数据时，立即触发一次回调
+     */
+    onChange(fn: (data: CodeListItem[]) => void, immediate?: boolean): void;
+    /**
+     * 取消代码表数据变更监听
+     *
+     * @author tony001
+     * @date 2024-04-10 17:04:57
+     * @param {(data: CodeListItem[]) => void} fn
+     */
+    offChange(fn: (data: CodeListItem[]) => void): void;
+    /**
+     * 销毁(取消数据变更监听)
+     *
+     * @author tony001
+     * @date 2024-04-10 15:04:11
+     */
+    destroy(): void;
 }
 export {};
 //# sourceMappingURL=dynamic-code-list.d.ts.map

package/out/service/utils/dynamic-code-list/dynamic-code-list.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dynamic-code-list.d.ts","sourceRoot":"","sources":["../../../../src/service/utils/dynamic-code-list/dynamic-code-list.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAGhD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAIlD;;;;;;GAMG;AACH,KAAK,SAAS,GAAG;IACf;;;;;;OAMG;IACH,cAAc,EAAE,MAAM,CAAC;IAEvB;;;;;;OAMG;IACH,KAAK,CAAC,EAAE,YAAY,EAAE,CAAC;IAEvB;;;;;;OAMG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC;CACnC,CAAC;AAEF;;;;;;;GAOG;AACH,qBAAa,oBAAoB;IAC/B,SAAS,CAAC,GAAG,EAAG,WAAW,CAAC;IAE5B;;;;;;;OAOG;IACH,SAAS,CAAC,QAAQ,EAAE,YAAY,CAAC;IAEjC;;;;;;OAMG;IACH,SAAS,CAAC,KAAK,yBAAgC;IAE/C;;;;;;;OAOG;IACH,SAAS,CAAC,YAAY,EAAE,OAAO,CAAS;IAExC;;;;;;OAMG;IACH,SAAS,CAAC,WAAW,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;gBAE1B,QAAQ,EAAE,YAAY;IAIlC;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAqB3B;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,CAAC,IAAI,EAAE,KAAK,GAAG,YAAY;IAwEhD,SAAS,CAAC,iBAAiB,CAAC,IAAI,EAAE,KAAK,GAAG,YAAY;IAetD,SAAS,CAAC,aAAa,CAAC,GAAG,EAAE,KAAK,EAAE,GAAG,KAAK,EAAE;IAS9C;;;;;;;;;OASG;cACa,IAAI,CAClB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,YAAY,EAAE,CAAC;IAuF1B;;;;OAIG;IACH,SAAS,CAAC,eAAe,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,YAAY,EAAE,GAAG,SAAS;IAmBrE;;;;;;;;OAQG;IACG,GAAG,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,GAAE,OAAY,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;CAyC5E"}
+{"version":3,"file":"dynamic-code-list.d.ts","sourceRoot":"","sources":["../../../../src/service/utils/dynamic-code-list/dynamic-code-list.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAEL,cAAc,EAGf,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAE,OAAO,EAAe,MAAM,SAAS,CAAC;AAC/C,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAe,MAAM,oBAAoB,CAAC;AAK/D;;;;;;GAMG;AACH,KAAK,SAAS,GAAG;IACf;;;;;;OAMG;IACH,cAAc,EAAE,MAAM,CAAC;IAEvB;;;;;;OAMG;IACH,KAAK,CAAC,EAAE,YAAY,EAAE,CAAC;IAEvB;;;;;;OAMG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC;CACnC,CAAC;AAEF;;;;;;;GAOG;AACH,qBAAa,oBAAoB;IAC/B,SAAS,CAAC,GAAG,EAAG,WAAW,CAAC;IAE5B;;;;;;;OAOG;IACH,SAAS,CAAC,QAAQ,EAAE,YAAY,CAAC;IAEjC;;;;;;OAMG;IACH,SAAS,CAAC,KAAK,yBAAgC;IAE/C;;;;;;;OAOG;IACH,SAAS,CAAC,YAAY,EAAE,OAAO,CAAS;IAExC;;;;;;;OAOG;IACH,SAAS,CAAC,OAAO,EAAE,QAAQ,CAAwB;IAEnD;;;;;;;OAOG;IACH,SAAS,CAAC,MAAM,EAAE,OAAO,CAAM;IAE/B;;;;;;OAMG;IACH,SAAS,CAAC,GAAG,EAAE,OAAO,CAAC;QAAE,MAAM,EAAE,CAAC,IAAI,EAAE,YAAY,EAAE,KAAK,IAAI,CAAA;KAAE,CAAC,CAClD;IAEhB;;;;;;OAMG;IACH,SAAS,CAAC,WAAW,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;gBAE1B,QAAQ,EAAE,YAAY;IAUlC;;;;;;;;OAQG;IACH,SAAS,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,IAAI;IAS/D;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAqB3B;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,CAAC,IAAI,EAAE,KAAK,GAAG,YAAY;IAwEhD,SAAS,CAAC,iBAAiB,CAAC,IAAI,EAAE,KAAK,GAAG,YAAY;IAetD,SAAS,CAAC,aAAa,CAAC,GAAG,EAAE,KAAK,EAAE,GAAG,KAAK,EAAE;IAS9C;;;;;;;;;OASG;cACa,IAAI,CAClB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,YAAY,EAAE,CAAC;IAwF1B;;;;OAIG;IACH,SAAS,CAAC,eAAe,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,YAAY,EAAE,GAAG,SAAS;IAmBrE;;;;;;;;OAQG;IACG,GAAG,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,GAAE,OAAY,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;IA0C3E;;;;;;;OAOG;IACH,SAAS,CAAC,cAAc,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI;IAenD;;;;;;OAMG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAS9B;;;;;;;OAOG;IACH,QAAQ,CACN,EAAE,EAAE,CAAC,IAAI,EAAE,YAAY,EAAE,KAAK,IAAI,EAClC,SAAS,GAAE,OAAc,GACxB,IAAI;IASP;;;;;;OAMG;IACH,SAAS,CAAC,EAAE,EAAE,CAAC,IAAI,EAAE,YAAY,EAAE,KAAK,IAAI,GAAG,IAAI;IAInD;;;;;OAKG;IACH,OAAO,IAAI,IAAI;CAMhB"}

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

@@ -1,7 +1,9 @@
-import { ModelError, RuntimeModelError } from '@ibiz-template/core';
-import { isNil } from 'ramda';
+import { IBizContext, ModelError, RuntimeModelError, } from '@ibiz-template/core';
+import { clone, isNil } from 'ramda';
+import { QXEvent, notNilEmpty } from 'qx-util';
 import { convertNavData, ScriptFactory } from '../../../utils';
 import { fieldValueToBoolean } from '../../utils';
+import { calcDeCodeNameById } from '../../../model';
 /**
  * 动态代码表缓存对象
  *
@@ -29,7 +31,56 @@ export class DynamicCodeListCache {
          * @type {boolean}
          */
         this.isPredefined = false;
+        /**
+         * 应用上下文
+         *
+         * @author tony001
+         * @date 2024-04-10 15:04:25
+         * @protected
+         * @type {IContext}
+         */
+        this.context = IBizContext.create();
+        /**
+         * 视图参数
+         *
+         * @author tony001
+         * @date 2024-04-10 15:04:39
+         * @protected
+         * @type {IParams}
+         */
+        this.params = {};
+        /**
+         * 事件对象
+         *
+         * @author tony001
+         * @date 2024-04-10 17:04:00
+         * @protected
+         */
+        this.evt = new QXEvent();
         this.codeList = codeList;
+        // 动态代码表监听数据变化
+        this.codelistChange = this.codelistChange.bind(this);
+        const { appDataEntityId, appDEDataSetId } = this.codeList;
+        if (appDataEntityId && appDEDataSetId) {
+            ibiz.mc.command.change.on(this.codelistChange);
+        }
+    }
+    /**
+     * 设置上下文以及查询参数
+     *
+     * @author tony001
+     * @date 2024-04-10 15:04:04
+     * @protected
+     * @param {IContext} [context]
+     * @param {IParams} [params]
+     */
+    setParams(context, params) {
+        if (context) {
+            this.context = clone(context);
+        }
+        if (params) {
+            this.params = clone(params);
+        }
     }
     /**
      * 初始化
@@ -148,6 +199,7 @@ export class DynamicCodeListCache {
      * @returns {*}  {Promise<CodeListItem[]>}
      */
     async load(context, params = {}) {
+        this.setParams(context, params);
         const app = ibiz.hub.getApp(context.srfappid);
         const { appDataEntityId, appDEDataSetId, minorSortAppDEFieldId, minorSortDir, pvalueAppDEFieldId, customCond, } = this.codeList;
         // *处理查询参数
@@ -283,4 +335,77 @@ export class DynamicCodeListCache {
         delete cacheData.promise;
         return result;
     }
+    /**
+     * 接受代码表实体数据变更，刷新代码表
+     *
+     * @author tony001
+     * @date 2024-04-10 15:04:42
+     * @protected
+     * @param {IPortalMessage} msg
+     */
+    codelistChange(msg) {
+        const data = msg.data;
+        const { appDataEntityId } = this.codeList;
+        if (appDataEntityId) {
+            const codeName = calcDeCodeNameById(appDataEntityId);
+            if (data &&
+                data.srfdecodename &&
+                data.srfdecodename.toLowerCase() === codeName) {
+                this.refresh();
+            }
+        }
+    }
+    /**
+     * 刷新代码表数据
+     *
+     * @author tony001
+     * @date 2024-04-10 17:04:20
+     * @return {*}  {Promise<void>}
+     */
+    async refresh() {
+        // 删除缓存数据
+        const key = JSON.stringify(this.context) + JSON.stringify(this.params);
+        this.cache.delete(key);
+        // 重新加载数据
+        const result = await this.get(this.context, this.params);
+        this.evt.emit('change', result);
+    }
+    /**
+     * 代码表数据变更事件监听
+     *
+     * @author tony001
+     * @date 2024-04-10 17:04:52
+     * @param {(data: CodeListItem[]) => void} fn
+     * @param {boolean} [immediate=true] 当有数据时，立即触发一次回调
+     */
+    onChange(fn, immediate = true) {
+        this.evt.on('change', fn);
+        const key = JSON.stringify(this.context) + JSON.stringify(this.params);
+        const cacheData = this.cache.get(key);
+        if (immediate && notNilEmpty(cacheData)) {
+            fn(cacheData.items);
+        }
+    }
+    /**
+     * 取消代码表数据变更监听
+     *
+     * @author tony001
+     * @date 2024-04-10 17:04:57
+     * @param {(data: CodeListItem[]) => void} fn
+     */
+    offChange(fn) {
+        this.evt.off('change', fn);
+    }
+    /**
+     * 销毁(取消数据变更监听)
+     *
+     * @author tony001
+     * @date 2024-04-10 15:04:11
+     */
+    destroy() {
+        const { appDataEntityId, appDEDataSetId } = this.codeList;
+        if (appDataEntityId && appDEDataSetId) {
+            ibiz.mc.command.change.off(this.codelistChange);
+        }
+    }
 }

package/out/ui-action/provider/front-ui-action-provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"front-ui-action-provider.d.ts","sourceRoot":"","sources":["../../../src/ui-action/provider/front-ui-action-provider.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,cAAc,EAAa,MAAM,kBAAkB,CAAC;AAG7D,OAAO,EAAE,cAAc,EAAE,eAAe,EAAc,MAAM,iBAAiB,CAAC;AAE9E,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE;;;;;;;;GAQG;AACH,qBAAa,qBAAsB,SAAQ,oBAAoB;IACvD,UAAU,CACd,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;IAoE3B;;;;;;;;OAQG;IACH,SAAS,CAAC,OAAO,CACf,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,eAAe;IAalB;;;;;;OAMG;cACa,YAAY,CAC1B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,IAAI,CAAC;IAiEhB;;;;;;OAMG;cACa,iBAAiB,CAC/B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;IA4C3B;;;;;;OAMG;cACa,iBAAiB,CAC/B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,IAAI,CAAC;IAoDhB;;;;;;;;OAQG;cACa,YAAY,CAC1B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;CAoD5B"}
+{"version":3,"file":"front-ui-action-provider.d.ts","sourceRoot":"","sources":["../../../src/ui-action/provider/front-ui-action-provider.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,cAAc,EAAa,MAAM,kBAAkB,CAAC;AAG7D,OAAO,EAAE,cAAc,EAAE,eAAe,EAAc,MAAM,iBAAiB,CAAC;AAE9E,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE;;;;;;;;GAQG;AACH,qBAAa,qBAAsB,SAAQ,oBAAoB;IACvD,UAAU,CACd,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;IAoE3B;;;;;;;;OAQG;IACH,SAAS,CAAC,OAAO,CACf,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,eAAe;IAalB;;;;;;OAMG;cACa,YAAY,CAC1B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,IAAI,CAAC;IAiEhB;;;;;;OAMG;cACa,iBAAiB,CAC/B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;IA4C3B;;;;;;OAMG;cACa,iBAAiB,CAC/B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,IAAI,CAAC;IAoDhB;;;;;;;;OAQG;cACa,YAAY,CAC1B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;CAmD5B"}

package/out/ui-action/provider/front-ui-action-provider.js

@@ -236,7 +236,6 @@ export class FrontUIActionProvider extends UIActionProviderBase {
      * @return {*}  {IUIActionResult}
      */
     async openEditForm(action, args) {
-        console.log(action.deeditForm, args);
         const actionResult = {};
         const { context, params, data, event } = args;
         if (!event) {

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

@@ -18,6 +18,13 @@ export declare class UILogicContext implements IUILogicContext {
      * @type {unknown}
      */
     lastReturn: unknown;
+    /**
+     * 逻辑操作的会话变量
+     * @author lxm
+     * @date 2024-04-07 11:55:01
+     * @type {IParams}
+     */
+    session: IParams;
     /**
      * 视图控制器
      *

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

@@ -1 +1 @@
-{"version":3,"file":"ui-logic-context.d.ts","sourceRoot":"","sources":["../../src/ui-logic/ui-logic-context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAChF,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D;;;;;;;GAOG;AACH,qBAAa,cAAe,YAAW,eAAe;IAwDlD,OAAO,CAAC,aAAa;IACd,UAAU,EAAE,cAAc;IAxDnC;;;;;OAKG;IACH,UAAU,EAAE,OAAO,CAAC;IAEpB;;;;;;;OAOG;IACH,IAAI,IAAI,IAAI,eAAe,CAE1B;IAED;;OAEG;IACH,IAAI,OAAO,IAAI,QAAQ,CAKtB;IAED;;OAEG;IACH,IAAI,IAAI,IAAI,KAAK,CAEhB;IAED;;OAEG;IACH,IAAI,SAAS,IAAI,OAAO,CAKvB;IAED;;;;;;OAMG;gBAEO,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,EACzC,UAAU,EAAE,cAAc;IAGnC;;;;;;;OAOG;IAEH,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAM;IAEjC;;;;;;OAMG;IACH,MAAM,EAAE,OAAO,CAAQ;IAEvB;;;;;;OAMG;IACH,SAAS,EAAE,OAAO,CAAS;IAE3B;;;;;;;OAOG;IACH,gBAAgB,EAAE,MAAM,CAAa;IAErC;;;;;;OAMG;IACH,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAI9B;;;;;;OAMG;IACH,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAI9B;;;;;;OAMG;IACH,aAAa,CAAC,KAAK,EAAE,OAAO,GAAG,IAAI;IAInC;;;;;;OAMG;IACH,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAQtC;;;;;;;OAOG;IACH,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;CAIxC"}
+{"version":3,"file":"ui-logic-context.d.ts","sourceRoot":"","sources":["../../src/ui-logic/ui-logic-context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAChF,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D;;;;;;;GAOG;AACH,qBAAa,cAAe,YAAW,eAAe;IAgElD,OAAO,CAAC,aAAa;IACd,UAAU,EAAE,cAAc;IAhEnC;;;;;OAKG;IACH,UAAU,EAAE,OAAO,CAAC;IAEpB;;;;;OAKG;IACH,OAAO,EAAE,OAAO,CAAM;IAEtB;;;;;;;OAOG;IACH,IAAI,IAAI,IAAI,eAAe,CAE1B;IAED;;OAEG;IACH,IAAI,OAAO,IAAI,QAAQ,CAKtB;IAED;;OAEG;IACH,IAAI,IAAI,IAAI,KAAK,CAEhB;IAED;;OAEG;IACH,IAAI,SAAS,IAAI,OAAO,CAKvB;IAED;;;;;;OAMG;gBAEO,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,EACzC,UAAU,EAAE,cAAc;IAGnC;;;;;;;OAOG;IAEH,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAM;IAEjC;;;;;;OAMG;IACH,MAAM,EAAE,OAAO,CAAQ;IAEvB;;;;;;OAMG;IACH,SAAS,EAAE,OAAO,CAAS;IAE3B;;;;;;;OAOG;IACH,gBAAgB,EAAE,MAAM,CAAa;IAErC;;;;;;OAMG;IACH,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAI9B;;;;;;OAMG;IACH,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAI9B;;;;;;OAMG;IACH,aAAa,CAAC,KAAK,EAAE,OAAO,GAAG,IAAI;IAInC;;;;;;OAMG;IACH,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAQtC;;;;;;;OAOG;IACH,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;CAIxC"}

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

@@ -52,6 +52,13 @@ export class UILogicContext {
     constructor(deLogicParams, parameters) {
         this.deLogicParams = deLogicParams;
         this.parameters = parameters;
+        /**
+         * 逻辑操作的会话变量
+         * @author lxm
+         * @date 2024-04-07 11:55:01
+         * @type {IParams}
+         */
+        this.session = {};
         /**
          * 界面逻辑参数
          *

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;IA0F/B;;;;;OAKG;IACH,KAAK,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI;CAiBjC"}
+{"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;IAqG/B;;;;;OAKG;IACH,KAAK,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI;CAiBjC"}

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

@@ -69,7 +69,11 @@ export class UILogicParam {
         }
         else if (m.appGlobalParam) {
             // 应用全局变量
-            ctx.params[tag] = ibiz.env;
+            let value = ibiz.util.getGlobalParam();
+            if (m.paramFieldName) {
+                value = value[m.paramFieldName];
+            }
+            ctx.params[tag] = value;
         }
         else if (m.applicationParam) {
             // 当前应用
@@ -80,7 +84,7 @@ export class UILogicParam {
             ctx.params[tag] = [];
         }
         else if (m.entityPageParam) {
-            ctx.params[tag] = {};
+            ctx.params[tag] = [];
         }
         else if (m.entityParam) {
             // 数据对象变量
@@ -95,7 +99,8 @@ export class UILogicParam {
             ctx.params[tag] = context;
         }
         else if (m.navViewParamParam) {
-            throw new ModelError(m, `未支持的逻辑参数类型: 视图路由参数`);
+            // 视图路由参数
+            ctx.params[tag] = ibiz.util.getRouterParams();
         }
         else if (m.routeViewSessionParam) {
             // 路由视图会话
@@ -129,6 +134,14 @@ export class UILogicParam {
             // 过滤器对象变量
             ctx.params[tag] = {};
         }
+        else if (m.envParam) {
+            // 应用环境变量
+            ctx.params[tag] = ibiz.env;
+        }
+        else if (m.sessionParam) {
+            // 操作会话变量
+            ctx.params[tag] = ctx.session;
+        }
         ibiz.log.debug(`计算界面逻辑参数，标识：${tag}`, `-值：`, ctx.params[tag]);
     }
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.6.17",
+  "version": "0.7.0",
   "description": "控制器包",
   "type": "module",
   "main": "out/index.js",
@@ -35,8 +35,8 @@
     "animejs": "^3.2.2"
   },
   "devDependencies": {
-    "@ibiz-template/core": "^0.6.17",
-    "@ibiz/model-core": "^0.1.19",
+    "@ibiz-template/core": "^0.7.0",
+    "@ibiz/model-core": "^0.1.20",
     "@types/animejs": "^3.1.12",
     "@types/path-browserify": "^1.0.2",
     "@types/qs": "^6.9.11",
@@ -54,7 +54,7 @@
   },
   "peerDependencies": {
     "@ibiz-template/core": "^0.6.0",
-    "@ibiz/model-core": "^0.1.19",
+    "@ibiz/model-core": "^0.1.20",
     "async-validator": "^4.2.5",
     "dayjs": "^1.11.7",
     "echarts": "^5.4.3",

package/out/controller/control/search-bar/use-searchcond.d.ts

@@ -1,33 +0,0 @@
-import { IFilterNode } from '../../../interface';
-/**
- * 获取初始过滤项树节点数据集合
- * @return {*}
- * @author: zhujiamin
- * @Date: 2023-12-21 17:29:47
- */
-export declare function getOriginFilterNodes(): IFilterNode[];
-/**
- * 格式化过滤项 （后续如果修改这里的逻辑记得把下方的反推函数parseFilters也跟着修改！）
- * @author lxm
- * @date 2023-10-16 03:45:41
- * @param {IFilterNode} node
- * @return {*}  {IData}
- */
-export declare function formatFilters(node: IFilterNode): IData;
-/**
- * 根据格式化后的过滤项反推出过滤项树节点数据集合
- * @param {IData} data
- * @return {*}
- * @author: zhujiamin
- * @Date: 2023-12-28 09:47:45
- */
-export declare function parseFilters(data: IData): IFilterNode;
-/**
- * 根据filterNodes计算出SearchConds
- * @param {IData} data
- * @return {*}
- * @author: zhujiamin
- * @Date: 2023-12-28 09:47:45
- */
-export declare function calcSearchConds(filterNodes: IFilterNode[]): IData[] | undefined;
-//# sourceMappingURL=use-searchcond.d.ts.map

package/out/controller/control/search-bar/use-searchcond.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"use-searchcond.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/search-bar/use-searchcond.ts"],"names":[],"mappings":"AAEA,OAAO,EAAmB,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAKlE;;;;;GAKG;AACH,wBAAgB,oBAAoB,IAAI,WAAW,EAAE,CAQpD;AAED;;;;;;GAMG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,WAAW,GAAG,KAAK,CA+BtD;AAED;;;;;;GAMG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,KAAK,GAAG,WAAW,CA+BrD;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAC7B,WAAW,EAAE,WAAW,EAAE,GACzB,KAAK,EAAE,GAAG,SAAS,CAoBrB"}